From b1571e2767f4af61a314a25843c6b348054d9f6f Mon Sep 17 00:00:00 2001 From: Josh Long Date: Wed, 18 Aug 2010 05:49:07 +0000 Subject: [PATCH] I can be so forgetful sometimes! I've just changed *SFTP* -> *Sftp* and *FTP* to *Ftp*. Looks *much* better now and feels more like the Spring I know and love. --- ...er.java => AbstractFtpFileListFilter.java} | 2 +- ...r.java => CompositeFtpFileListFilter.java} | 16 +++---- ...tory.java => DefaultFtpClientFactory.java} | 6 +-- .../ftp/FTPMessageSourceFactoryBean.java | 48 +++++++++---------- .../FTPSendingMessageHandlerFactoryBean.java | 26 +++++----- ...ientFactory.java => FtpClientFactory.java} | 2 +- ...{FTPClientPool.java => FtpClientPool.java} | 2 +- ...ListFilter.java => FtpFileListFilter.java} | 2 +- ...{FTPFileSource.java => FtpFileSource.java} | 16 +++---- ...nizer.java => FtpInboundSynchronizer.java} | 20 ++++---- ...ler.java => FtpSendingMessageHandler.java} | 12 ++--- ... => PatternMatchingFtpFileListFilter.java} | 2 +- ...ientPool.java => QueuedFtpClientPool.java} | 12 ++--- ...eHandler.java => FtpNamespaceHandler.java} | 2 +- .../main/resources/META-INF/spring.handlers | 2 +- .../ftp/config/spring-integration-ftp-2.0.xsd | 2 +- ...va => InboundFtpFileServiceActivator.java} | 2 +- ...TPExample.java => OutboundFtpExample.java} | 2 +- .../test/resources/inbound-ftp-context.xml | 4 +- .../config/spring-integration-sftp-2.0.xsd | 2 +- .../integration/sftp/TestInboundSftp.java | 2 +- ...estInboundSFTP.xml => TestInboundSftp.xml} | 0 ...tOutboundSFTP.xml => TestOutboundSftp.xml} | 0 23 files changed, 92 insertions(+), 92 deletions(-) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{AbstractFTPFileListFilter.java => AbstractFtpFileListFilter.java} (91%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{CompositeFTPFileListFilter.java => CompositeFtpFileListFilter.java} (60%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{DefaultFTPClientFactory.java => DefaultFtpClientFactory.java} (96%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{FTPClientFactory.java => FtpClientFactory.java} (96%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{FTPClientPool.java => FtpClientPool.java} (96%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{FTPFileListFilter.java => FtpFileListFilter.java} (87%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{FTPFileSource.java => FtpFileSource.java} (85%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{FTPInboundSynchronizer.java => FtpInboundSynchronizer.java} (90%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{FTPSendingMessageHandler.java => FtpSendingMessageHandler.java} (91%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{PatternMatchingFTPFileListFilter.java => PatternMatchingFtpFileListFilter.java} (93%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{QueuedFTPClientPool.java => QueuedFtpClientPool.java} (91%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/{FTPNamespaceHandler.java => FtpNamespaceHandler.java} (98%) rename spring-integration-ftp/src/test/java/org/springframework/integration/ftp/{InboundFTPFileServiceActivator.java => InboundFtpFileServiceActivator.java} (95%) rename spring-integration-ftp/src/test/java/org/springframework/integration/ftp/{OutboundFTPExample.java => OutboundFtpExample.java} (94%) rename spring-integration-sftp/src/test/resources/{TestInboundSFTP.xml => TestInboundSftp.xml} (100%) rename spring-integration-sftp/src/test/resources/{TestOutboundSFTP.xml => TestOutboundSftp.xml} (100%) diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/AbstractFTPFileListFilter.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/AbstractFtpFileListFilter.java similarity index 91% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/AbstractFTPFileListFilter.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/AbstractFtpFileListFilter.java index 87144af198..7eb08590c5 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/AbstractFTPFileListFilter.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/AbstractFtpFileListFilter.java @@ -11,7 +11,7 @@ import java.util.List; * * @author Josh Long */ -public abstract class AbstractFTPFileListFilter implements FTPFileListFilter { +public abstract class AbstractFtpFileListFilter implements FtpFileListFilter { /** * {@inheritDoc} */ diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/CompositeFTPFileListFilter.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/CompositeFtpFileListFilter.java similarity index 60% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/CompositeFTPFileListFilter.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/CompositeFtpFileListFilter.java index 2923f5e390..acb844fdc7 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/CompositeFTPFileListFilter.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/CompositeFtpFileListFilter.java @@ -11,17 +11,17 @@ import java.util.*; * * @author Josh Long */ -public class CompositeFTPFileListFilter implements FTPFileListFilter { - private Set filters; +public class CompositeFtpFileListFilter implements FtpFileListFilter { + private Set filters; - public CompositeFTPFileListFilter(FTPFileListFilter... ftpFileListFilter) { - this.filters = new LinkedHashSet(Arrays.asList(ftpFileListFilter)); + public CompositeFtpFileListFilter(FtpFileListFilter... ftpFileListFilter) { + this.filters = new LinkedHashSet(Arrays.asList(ftpFileListFilter)); } - public CompositeFTPFileListFilter(Collection ftpFileListFilter) { - this.filters = new LinkedHashSet(ftpFileListFilter); + public CompositeFtpFileListFilter(Collection ftpFileListFilter) { + this.filters = new LinkedHashSet(ftpFileListFilter); } - public void addFilter( FTPFileListFilter ftpFileListFilter ) { + public void addFilter( FtpFileListFilter ftpFileListFilter ) { this.filters.add(ftpFileListFilter); } public List filterFiles(FTPFile[] files) { @@ -29,7 +29,7 @@ public class CompositeFTPFileListFilter implements FTPFileListFilter { List leftOver = Arrays.asList(files); - for (FTPFileListFilter ff : this.filters) + for (FtpFileListFilter ff : this.filters) leftOver = ff.filterFiles(leftOver.toArray(new FTPFile[leftOver.size()])); return leftOver; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/DefaultFTPClientFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/DefaultFtpClientFactory.java similarity index 96% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/DefaultFTPClientFactory.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/DefaultFtpClientFactory.java index 9c110240d6..e3a778fa94 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/DefaultFTPClientFactory.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/DefaultFtpClientFactory.java @@ -30,12 +30,12 @@ import java.net.SocketException; /** - * Default implementation of FTPClientFactory. + * Default implementation of FtpClientFactory. * * @author iwein */ -public class DefaultFTPClientFactory implements FTPClientFactory { - private static final Log logger = LogFactory.getLog(FTPClientFactory.class); +public class DefaultFtpClientFactory implements FTPClientFactory { + private static final Log logger = LogFactory.getLog(FtpClientFactory.class); private static final String DEFAULT_REMOTE_WORKING_DIRECTORY = "/"; private FTPClientConfig config; private String username; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPMessageSourceFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPMessageSourceFactoryBean.java index 43c7cbda4a..16a55df217 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPMessageSourceFactoryBean.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPMessageSourceFactoryBean.java @@ -27,7 +27,7 @@ import java.util.regex.Pattern; * * @author Josh Long */ -public class FTPMessageSourceFactoryBean extends AbstractFactoryBean implements ResourceLoaderAware, ApplicationContextAware { +public class FTPMessageSourceFactoryBean extends AbstractFactoryBean implements ResourceLoaderAware, ApplicationContextAware { private int port; private boolean autoCreateDirectories; private String filenamePattern; @@ -38,7 +38,7 @@ public class FTPMessageSourceFactoryBean extends AbstractFactoryBean getObjectType() { - return FTPFileSource.class; + public Class getObjectType() { + return FtpFileSource.class; } public void setClientMode(int clientMode) { this.clientMode = clientMode; } - public void setFilter(FTPFileListFilter filter) { + public void setFilter(FtpFileListFilter filter) { this.filter = filter; } @Override - protected FTPFileSource createInstance() throws Exception { + protected FtpFileSource createInstance() throws Exception { // setup local dir if (!StringUtils.hasText(this.localWorkingDirectory)) { File tmp = SystemUtils.getJavaIoTmpDir(); @@ -118,21 +118,21 @@ public class FTPMessageSourceFactoryBean extends AbstractFactoryBean tss = null; @@ -155,17 +155,17 @@ public class FTPMessageSourceFactoryBean extends AbstractFactoryBean implements ResourceLoaderAware, ApplicationContextAware { +public class FTPSendingMessageHandlerFactoryBean extends AbstractFactoryBean implements ResourceLoaderAware, ApplicationContextAware { private int port; private String username; private String password; @@ -39,26 +39,26 @@ public class FTPSendingMessageHandlerFactoryBean extends AbstractFactoryBean getObjectType() { - return FTPSendingMessageHandler.class; + public Class getObjectType() { + return FtpSendingMessageHandler.class; } @Override - protected FTPSendingMessageHandler createInstance() + protected FtpSendingMessageHandler createInstance() throws Exception { // the dependencies for the outbound-adapter are much simpler // they only require an instance of the pool - DefaultFTPClientFactory defaultFTPClientFactory = new DefaultFTPClientFactory(); - defaultFTPClientFactory.setHost(this.host); - defaultFTPClientFactory.setPassword(this.password); - defaultFTPClientFactory.setPort(this.port); - defaultFTPClientFactory.setRemoteWorkingDirectory(this.remoteDirectory); - defaultFTPClientFactory.setUsername(this.username); - defaultFTPClientFactory.setClientMode(this.clientMode); + DefaultFtpClientFactory defaultFtpClientFactory = new DefaultFtpClientFactory(); + defaultFtpClientFactory.setHost(this.host); + defaultFtpClientFactory.setPassword(this.password); + defaultFtpClientFactory.setPort(this.port); + defaultFtpClientFactory.setRemoteWorkingDirectory(this.remoteDirectory); + defaultFtpClientFactory.setUsername(this.username); + defaultFtpClientFactory.setClientMode(this.clientMode); - QueuedFTPClientPool queuedFTPClientPool = new QueuedFTPClientPool(15, defaultFTPClientFactory); + QueuedFtpClientPool queuedFtpClientPool = new QueuedFtpClientPool(15, defaultFtpClientFactory); - FTPSendingMessageHandler ftpSendingMessageHandler = new FTPSendingMessageHandler(queuedFTPClientPool); + FtpSendingMessageHandler ftpSendingMessageHandler = new FtpSendingMessageHandler(queuedFtpClientPool); ftpSendingMessageHandler.afterPropertiesSet(); return ftpSendingMessageHandler; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPClientFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpClientFactory.java similarity index 96% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPClientFactory.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpClientFactory.java index c3697e8648..afceb56ce2 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPClientFactory.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpClientFactory.java @@ -25,7 +25,7 @@ import java.io.IOException; * * @author Iwein Fuld */ -public interface FTPClientFactory { +public interface FtpClientFactory { /** * @return Fully configured and connected FTPClient. Never null. * @throws IOException thrown when a networking IO subsystem error occurs diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPClientPool.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpClientPool.java similarity index 96% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPClientPool.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpClientPool.java index 8e12ee080c..e8d540c6f2 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPClientPool.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpClientPool.java @@ -24,7 +24,7 @@ import org.apache.commons.net.ftp.FTPClient; * * @author Iwein Fuld */ -public interface FTPClientPool extends FTPClientFactory { +public interface FtpClientPool extends FtpClientFactory { /** * Releases the client back to the pool. When calling this method the caller * is no longer responsible for the connection. The pool is free to do with diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPFileListFilter.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpFileListFilter.java similarity index 87% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPFileListFilter.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpFileListFilter.java index 77d013846a..bb92725a99 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPFileListFilter.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpFileListFilter.java @@ -9,6 +9,6 @@ import java.util.List; * * @author Josh Long */ -public interface FTPFileListFilter { +public interface FtpFileListFilter { List filterFiles (FTPFile [] files); } diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPFileSource.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpFileSource.java similarity index 85% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPFileSource.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpFileSource.java index 3d2a961d15..44cb3cb13b 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPFileSource.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpFileSource.java @@ -37,19 +37,19 @@ import java.util.regex.Pattern; * * @author Iwein Fuld */ -public class FTPFileSource implements MessageSource, InitializingBean, Lifecycle { +public class FtpFileSource implements MessageSource, InitializingBean, Lifecycle { private FileReadingMessageSource fileSource; - private FTPInboundSynchronizer synchronizer; + private FtpInboundSynchronizer synchronizer; - public FTPFileSource() { - this(new FileReadingMessageSource(), new FTPInboundSynchronizer()); + public FtpFileSource() { + this(new FileReadingMessageSource(), new FtpInboundSynchronizer()); } - public FTPFileSource(FileReadingMessageSource fileSource, FTPInboundSynchronizer synchronizer) { + public FtpFileSource(FileReadingMessageSource fileSource, FtpInboundSynchronizer synchronizer) { this.fileSource = fileSource; this.synchronizer = synchronizer; - Pattern completePattern = Pattern.compile("^.*(?, InitializingBean, Lif this.fileSource = fileSource; } - public void setSynchronizer(FTPInboundSynchronizer synchronizer) { + public void setSynchronizer(FtpInboundSynchronizer synchronizer) { this.synchronizer = synchronizer; } @@ -78,7 +78,7 @@ public class FTPFileSource implements MessageSource, InitializingBean, Lif synchronizer.setTaskScheduler(scheduler); } - public void setClientPool(FTPClientPool pool) { + public void setClientPool(FtpClientPool pool) { synchronizer.setClientPool(pool); } diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPInboundSynchronizer.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpInboundSynchronizer.java similarity index 90% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPInboundSynchronizer.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpInboundSynchronizer.java index 139a049b52..36c33731d2 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPInboundSynchronizer.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpInboundSynchronizer.java @@ -39,29 +39,29 @@ import java.util.concurrent.ScheduledFuture; /** - * FTPInboundSynchronizer will keep a local directory in sync with a remote Ftp directory. + * FtpInboundSynchronizer will keep a local directory in sync with a remote Ftp directory. * It will NOT move new files put into the local directory to the remote server. * * @author Iwein Fuld */ -public class FTPInboundSynchronizer implements InitializingBean, Lifecycle { - private static final Log logger = LogFactory.getLog(FTPInboundSynchronizer.class); +public class FtpInboundSynchronizer implements InitializingBean, Lifecycle { + private static final Log logger = LogFactory.getLog(FtpInboundSynchronizer.class); static final String INCOMPLETE_EXTENSION = ".INCOMPLETE"; private static final long DEFAULT_REFRESH_RATE = 10000; private volatile TaskScheduler taskScheduler; private volatile Trigger trigger = new PeriodicTrigger(DEFAULT_REFRESH_RATE); - private volatile FTPClientPool clientPool; + private volatile FtpClientPool clientPool; private volatile Resource localDirectory; private boolean running = false; private ScheduledFuture scheduledFuture; - private FTPFileListFilter filter; - private FTPFileListFilter acceptAllFTPFileListFilter = new FTPFileListFilter() { + private FtpFileListFilter filter; + private FtpFileListFilter acceptAllFtpFileListFilter = new FtpFileListFilter() { public List filterFiles(FTPFile[] files) { return Arrays.asList(files); } }; - public void setFilter(FTPFileListFilter filter) { + public void setFilter(FtpFileListFilter filter) { this.filter = filter; } @@ -77,7 +77,7 @@ public class FTPInboundSynchronizer implements InitializingBean, Lifecycle { this.localDirectory = localDirectory; } - public void setClientPool(FTPClientPool pool) { + public void setClientPool(FtpClientPool pool) { clientPool = pool; } @@ -85,14 +85,14 @@ public class FTPInboundSynchronizer implements InitializingBean, Lifecycle { Assert.notNull(localDirectory, "'localDirectory' is required."); if (this.filter == null) { - this.filter = acceptAllFTPFileListFilter; + this.filter = acceptAllFtpFileListFilter; } } private void synchronize() { try { FTPClient client = this.clientPool.getClient(); - Assert.state(client != null, FTPClientPool.class.getSimpleName() + " returned 'null' client this most likely a bug in the pool implementation."); + Assert.state(client != null, FtpClientPool.class.getSimpleName() + " returned 'null' client this most likely a bug in the pool implementation."); Collection fileList = this.filter.filterFiles(client.listFiles()); diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPSendingMessageHandler.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandler.java similarity index 91% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPSendingMessageHandler.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandler.java index 3329522d51..78b1839acd 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPSendingMessageHandler.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandler.java @@ -35,17 +35,17 @@ import java.net.SocketException; * @author Iwein Fuld * @author Mark Fisher */ -public class FTPSendingMessageHandler implements MessageHandler, InitializingBean { - private FTPClientPool ftpClientPool; +public class FtpSendingMessageHandler implements MessageHandler, InitializingBean { + private FtpClientPool ftpClientPool; - public FTPSendingMessageHandler() { + public FtpSendingMessageHandler() { } - public FTPSendingMessageHandler(FTPClientPool ftpClientPool) { + public FtpSendingMessageHandler(FtpClientPool ftpClientPool) { this.ftpClientPool = ftpClientPool; } - public void setFtpClientPool(FTPClientPool ftpClientPool) { + public void setFtpClientPool(FtpClientPool ftpClientPool) { this.ftpClientPool = ftpClientPool; } @@ -98,7 +98,7 @@ public class FTPSendingMessageHandler implements MessageHandler, InitializingBea private FTPClient getFtpClient() throws SocketException, IOException { FTPClient client; client = this.ftpClientPool.getClient(); - Assert.state(client != null, FTPClientPool.class.getSimpleName() + " returned 'null' client this most likely a bug in the pool implementation."); + Assert.state(client != null, FtpClientPool.class.getSimpleName() + " returned 'null' client this most likely a bug in the pool implementation."); return client; } diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/PatternMatchingFTPFileListFilter.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/PatternMatchingFtpFileListFilter.java similarity index 93% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/PatternMatchingFTPFileListFilter.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/PatternMatchingFtpFileListFilter.java index ccecb7de49..feab1f1d0f 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/PatternMatchingFTPFileListFilter.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/PatternMatchingFtpFileListFilter.java @@ -17,7 +17,7 @@ import java.util.regex.Pattern; * * @author Josh Long */ -public class PatternMatchingFTPFileListFilter extends AbstractFTPFileListFilter implements InitializingBean { +public class PatternMatchingFtpFileListFilter extends AbstractFtpFileListFilter implements InitializingBean { private Log logger = LogFactory.getLog(getClass()); diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/QueuedFTPClientPool.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/QueuedFtpClientPool.java similarity index 91% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/QueuedFTPClientPool.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/QueuedFtpClientPool.java index 123c02f748..3f47557094 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/QueuedFTPClientPool.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/QueuedFtpClientPool.java @@ -27,7 +27,7 @@ import java.util.concurrent.ArrayBlockingQueue; /** - * FTPClientPool implementation based on a Queue. This implementation has a + * FtpClientPool implementation based on a Queue. This implementation has a * default pool size of 5, but this is configurable with a constructor argument. *

* This implementation pools released clients, but gives no guarantee to the @@ -35,20 +35,20 @@ import java.util.concurrent.ArrayBlockingQueue; * * @author Iwein Fuld */ -public class QueuedFTPClientPool implements FTPClientPool { - private static final Log log = LogFactory.getLog(QueuedFTPClientPool.class); +public class QueuedFtpClientPool implements FtpClientPool { + private static final Log log = LogFactory.getLog(QueuedFtpClientPool.class); private static final int DEFAULT_POOL_SIZE = 5; private final Queue pool; - private final FTPClientFactory factory; + private final FtpClientFactory factory; - public QueuedFTPClientPool(FTPClientFactory factory) { + public QueuedFtpClientPool(FtpClientFactory factory) { this(DEFAULT_POOL_SIZE, factory); } /** * @param maxPoolSize the maximum size of the pool */ - public QueuedFTPClientPool(int maxPoolSize, FTPClientFactory factory) { + public QueuedFtpClientPool(int maxPoolSize, FtpClientFactory factory) { Assert.notNull(factory); this.factory = factory; pool = new ArrayBlockingQueue(maxPoolSize); diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FTPNamespaceHandler.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpNamespaceHandler.java similarity index 98% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FTPNamespaceHandler.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpNamespaceHandler.java index f90560c756..9e4d0f1e32 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FTPNamespaceHandler.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpNamespaceHandler.java @@ -35,7 +35,7 @@ import java.util.Map; * @author Josh Long (*heavily* influenced by the good done by iwein before) */ @SuppressWarnings("unused") -public class FTPNamespaceHandler extends NamespaceHandlerSupport { +public class FtpNamespaceHandler extends NamespaceHandlerSupport { private static final String PACKAGE_NAME = "org.springframework.integration.ftp"; static private Map CLIENT_MODES = new HashMap(); diff --git a/spring-integration-ftp/src/main/resources/META-INF/spring.handlers b/spring-integration-ftp/src/main/resources/META-INF/spring.handlers index a69f177414..db0a408e2a 100644 --- a/spring-integration-ftp/src/main/resources/META-INF/spring.handlers +++ b/spring-integration-ftp/src/main/resources/META-INF/spring.handlers @@ -1 +1 @@ -http\://www.springframework.org/schema/integration/ftp=org.springframework.integration.ftp.config.FTPNamespaceHandler \ No newline at end of file +http\://www.springframework.org/schema/integration/ftp=org.springframework.integration.ftp.config.FtpNamespaceHandler diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd index cf013408ef..cf4dbc9fb2 100644 --- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd +++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd @@ -138,7 +138,7 @@ - + diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/InboundFTPFileServiceActivator.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/InboundFtpFileServiceActivator.java similarity index 95% rename from spring-integration-ftp/src/test/java/org/springframework/integration/ftp/InboundFTPFileServiceActivator.java rename to spring-integration-ftp/src/test/java/org/springframework/integration/ftp/InboundFtpFileServiceActivator.java index 4f436d52cd..75ad88642e 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/InboundFTPFileServiceActivator.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/InboundFtpFileServiceActivator.java @@ -14,7 +14,7 @@ import java.io.File; * @author Josh Long */ -public class InboundFTPFileServiceActivator { +public class InboundFtpFileServiceActivator { @ServiceActivator public void onNewRemoteFTPFile(Message file) diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/OutboundFTPExample.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/OutboundFtpExample.java similarity index 94% rename from spring-integration-ftp/src/test/java/org/springframework/integration/ftp/OutboundFTPExample.java rename to spring-integration-ftp/src/test/java/org/springframework/integration/ftp/OutboundFtpExample.java index 3a6b6405e7..bd8d7cf939 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/OutboundFTPExample.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/OutboundFtpExample.java @@ -9,7 +9,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; * * @author Josh Long */ -public class OutboundFTPExample { +public class OutboundFtpExample { public static void main(String [] args ) throws Throwable { ClassPathXmlApplicationContext classPathXmlApplicationContext = new ClassPathXmlApplicationContext("outbound-ftp-context.xml"); } diff --git a/spring-integration-ftp/src/test/resources/inbound-ftp-context.xml b/spring-integration-ftp/src/test/resources/inbound-ftp-context.xml index b30314ffd5..d5251db6ee 100644 --- a/spring-integration-ftp/src/test/resources/inbound-ftp-context.xml +++ b/spring-integration-ftp/src/test/resources/inbound-ftp-context.xml @@ -13,7 +13,7 @@ ignore-unresolvable="true"/> - + @@ -31,7 +31,7 @@ + class="org.springframework.integration.ftp.InboundFtpFileServiceActivator"/> diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd index 23139da933..122986609c 100644 --- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd +++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd @@ -98,7 +98,7 @@ - + diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/TestInboundSftp.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/TestInboundSftp.java index 79a36f4373..dd13f032e4 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/TestInboundSftp.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/TestInboundSftp.java @@ -8,7 +8,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class TestInboundSftp { static public void main(String [] args) throws Throwable { - ClassPathXmlApplicationContext classPathXmlApplicationContext = new ClassPathXmlApplicationContext("TestInboundSFTP.xml"); + ClassPathXmlApplicationContext classPathXmlApplicationContext = new ClassPathXmlApplicationContext("TestInboundSftp.xml"); classPathXmlApplicationContext.start(); } } diff --git a/spring-integration-sftp/src/test/resources/TestInboundSFTP.xml b/spring-integration-sftp/src/test/resources/TestInboundSftp.xml similarity index 100% rename from spring-integration-sftp/src/test/resources/TestInboundSFTP.xml rename to spring-integration-sftp/src/test/resources/TestInboundSftp.xml diff --git a/spring-integration-sftp/src/test/resources/TestOutboundSFTP.xml b/spring-integration-sftp/src/test/resources/TestOutboundSftp.xml similarity index 100% rename from spring-integration-sftp/src/test/resources/TestOutboundSFTP.xml rename to spring-integration-sftp/src/test/resources/TestOutboundSftp.xml