From 23f7d7d60b718051d0e65e621d1b80ab216dab8d Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 10 Nov 2010 14:49:50 -0500 Subject: [PATCH] INT-1562 restructuring packages for inbound/outbound --- ...pRemoteFileSystemSynchronizingMessageSourceFactoryBean.java | 3 +++ .../integration/ftp/FtpSendingMessageHandlerFactoryBean.java | 1 + .../integration/ftp/FtpsSendingMessageHandlerFactoryBean.java | 2 +- .../integration/ftp/config/FtpNamespaceHandler.java | 1 + .../ftp/{ => filters}/FtpPatternMatchingFileListFilter.java | 2 +- .../{ => inbound}/FtpInboundRemoteFileSystemSynchronizer.java | 2 +- .../FtpInboundRemoteFileSystemSynchronizingMessageSource.java | 3 ++- .../ftp/{ => outbound}/FtpSendingMessageHandler.java | 3 ++- .../integration/ftp/FtpParserOutboundTests.java | 1 + 9 files changed, 13 insertions(+), 5 deletions(-) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{ => filters}/FtpPatternMatchingFileListFilter.java (95%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{ => inbound}/FtpInboundRemoteFileSystemSynchronizer.java (98%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{ => inbound}/FtpInboundRemoteFileSystemSynchronizingMessageSource.java (93%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{ => outbound}/FtpSendingMessageHandler.java (98%) diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java index 6f41cb7bc1..59cdbcd64c 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java +++ b/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; /** diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java index 25321e32a0..1b15fc131e 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java +++ b/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 diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpsSendingMessageHandlerFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpsSendingMessageHandlerFactoryBean.java index e89447842d..38d2944482 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpsSendingMessageHandlerFactoryBean.java +++ b/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 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 index e2403b5e51..84249701d3 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 @@ -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; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpPatternMatchingFileListFilter.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/filters/FtpPatternMatchingFileListFilter.java similarity index 95% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpPatternMatchingFileListFilter.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/filters/FtpPatternMatchingFileListFilter.java index 4aa8069a23..c8ee914989 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpPatternMatchingFileListFilter.java +++ b/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; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpInboundRemoteFileSystemSynchronizer.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizer.java similarity index 98% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpInboundRemoteFileSystemSynchronizer.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizer.java index 17233791eb..4c5f098c93 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpInboundRemoteFileSystemSynchronizer.java +++ b/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; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpInboundRemoteFileSystemSynchronizingMessageSource.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizingMessageSource.java similarity index 93% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpInboundRemoteFileSystemSynchronizingMessageSource.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizingMessageSource.java index 9b48d4e055..b6b22cc113 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpInboundRemoteFileSystemSynchronizingMessageSource.java +++ b/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. 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/outbound/FtpSendingMessageHandler.java similarity index 98% 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/outbound/FtpSendingMessageHandler.java index b58e10a561..d1109af059 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/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; diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests.java index 73820956ff..14a7fb4f0f 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests.java +++ b/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;