INT-1562 restructuring packages for inbound/outbound

spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java

@@ -30,6 +30,9 @@ import org.springframework.core.io.ResourceEditor;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.integration.file.filters.CompositeFileListFilter;
 import org.springframework.integration.file.filters.FileListFilter;
+import org.springframework.integration.ftp.filters.FtpPatternMatchingFileListFilter;
+import org.springframework.integration.ftp.inbound.FtpInboundRemoteFileSystemSynchronizer;
+import org.springframework.integration.ftp.inbound.FtpInboundRemoteFileSystemSynchronizingMessageSource;
 import org.springframework.util.StringUtils;
 
 /**

spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java

@@ -19,6 +19,7 @@ package org.springframework.integration.ftp;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 
 import org.springframework.integration.file.FileNameGenerator;
+import org.springframework.integration.ftp.outbound.FtpSendingMessageHandler;
 
 /**
  * A factory bean implementation that handles constructing an outbound FTP

spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpsSendingMessageHandlerFactoryBean.java

@@ -20,7 +20,7 @@ import javax.net.ssl.KeyManager;
 import javax.net.ssl.TrustManager;
 
 /**
- * Sends files to a remote FTPS file system. Based heavily on {@link org.springframework.integration.ftp.FtpSendingMessageHandler}
+ * Sends files to a remote FTPS file system. Based heavily on {@link org.springframework.integration.ftp.outbound.FtpSendingMessageHandler}
  *
  * @author Josh Long
  * @author Iwein Fuld

spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpNamespaceHandler.java

@@ -17,6 +17,7 @@
 package org.springframework.integration.ftp.config;
 
 import org.apache.commons.net.ftp.FTP;
+
 import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHandler;
 
 import java.util.HashMap;

spring-integration-ftp/src/main/java/org/springframework/integration/ftp/filters/FtpPatternMatchingFileListFilter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.ftp;
+package org.springframework.integration.ftp.filters;
 
 import java.util.regex.Pattern;
 

spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.ftp;
+package org.springframework.integration.ftp.inbound;
 
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPFile;

spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizingMessageSource.java

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.ftp;
+package org.springframework.integration.ftp.inbound;
 
 import org.apache.commons.net.ftp.FTPFile;
 
 import org.springframework.integration.file.synchronization.AbstractInboundRemoteFileSystemSynchronizingMessageSource;
+import org.springframework.integration.ftp.FtpClientPool;
 
 /**
  * A {@link org.springframework.integration.core.MessageSource} implementation for FTP.

spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.ftp;
+package org.springframework.integration.ftp.outbound;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,6 +33,7 @@ import org.springframework.integration.Message;
 import org.springframework.integration.MessageDeliveryException;
 import org.springframework.integration.file.DefaultFileNameGenerator;
 import org.springframework.integration.file.FileNameGenerator;
+import org.springframework.integration.ftp.FtpClientPool;
 import org.springframework.integration.handler.AbstractMessageHandler;
 import org.springframework.util.Assert;
 import org.springframework.util.FileCopyUtils;

spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests.java

@@ -28,6 +28,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.Message;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
 import org.springframework.integration.file.FileNameGenerator;
+import org.springframework.integration.ftp.outbound.FtpSendingMessageHandler;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.test.util.TestUtils;