From da8aa2bf0f8d2a13a7b75c53e71482d94e2e0582 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 10 Nov 2010 17:19:05 -0500 Subject: [PATCH] INT-1562 moved FactoryBeans into the 'config' package --- .../config/FtpMessageSendingConsumerBeanDefinitionParser.java | 1 - .../ftp/config/FtpMessageSourceBeanDefinitionParser.java | 1 - ...RemoteFileSystemSynchronizingMessageSourceFactoryBean.java | 4 +++- .../FtpSendingMessageHandlerFactoryBean.java | 3 ++- .../FtpsMessageSendingConsumerBeanDefinitionParser.java | 1 - .../ftp/config/FtpsMessageSourceBeanDefinitionParser.java | 1 - ...RemoteFileSystemSynchronizingMessageSourceFactoryBean.java | 2 +- .../FtpsSendingMessageHandlerFactoryBean.java | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{inbound => config}/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java (96%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{outbound => config}/FtpSendingMessageHandlerFactoryBean.java (96%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{inbound => config}/FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.java (98%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{outbound => config}/FtpsSendingMessageHandlerFactoryBean.java (98%) diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpMessageSendingConsumerBeanDefinitionParser.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpMessageSendingConsumerBeanDefinitionParser.java index d10c3ca3f8..347fb68d26 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpMessageSendingConsumerBeanDefinitionParser.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpMessageSendingConsumerBeanDefinitionParser.java @@ -21,7 +21,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser; import org.springframework.integration.config.xml.IntegrationNamespaceUtils; -import org.springframework.integration.ftp.outbound.FtpSendingMessageHandlerFactoryBean; import org.w3c.dom.Element; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpMessageSourceBeanDefinitionParser.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpMessageSourceBeanDefinitionParser.java index 62f092fdd3..50863b8512 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpMessageSourceBeanDefinitionParser.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpMessageSourceBeanDefinitionParser.java @@ -29,7 +29,6 @@ import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.config.xml.AbstractPollingInboundChannelAdapterParser; import org.springframework.integration.config.xml.IntegrationNamespaceUtils; -import org.springframework.integration.ftp.inbound.FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean; /** * Parser for the FTP inbound-channel-adapter. diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java similarity index 96% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java index 84dc827915..870f2aa7b2 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.ftp.inbound; +package org.springframework.integration.ftp.config; import java.io.File; @@ -34,6 +34,8 @@ import org.springframework.integration.ftp.client.AbstractFtpClientFactory; import org.springframework.integration.ftp.client.DefaultFtpClientFactory; import org.springframework.integration.ftp.client.QueuedFtpClientPool; 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/outbound/FtpSendingMessageHandlerFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpSendingMessageHandlerFactoryBean.java similarity index 96% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandlerFactoryBean.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpSendingMessageHandlerFactoryBean.java index 6a8ff07afa..a215b61546 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandlerFactoryBean.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpSendingMessageHandlerFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.ftp.outbound; +package org.springframework.integration.ftp.config; import org.springframework.beans.factory.config.AbstractFactoryBean; @@ -22,6 +22,7 @@ import org.springframework.integration.file.FileNameGenerator; import org.springframework.integration.ftp.client.AbstractFtpClientFactory; import org.springframework.integration.ftp.client.DefaultFtpClientFactory; import org.springframework.integration.ftp.client.QueuedFtpClientPool; +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/config/FtpsMessageSendingConsumerBeanDefinitionParser.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsMessageSendingConsumerBeanDefinitionParser.java index f4d1783583..bd3d432434 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsMessageSendingConsumerBeanDefinitionParser.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsMessageSendingConsumerBeanDefinitionParser.java @@ -23,7 +23,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser; import org.springframework.integration.config.xml.IntegrationNamespaceUtils; -import org.springframework.integration.ftp.outbound.FtpsSendingMessageHandlerFactoryBean; /** * Parser for the FTPS outbound-channel-adapter diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsMessageSourceBeanDefinitionParser.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsMessageSourceBeanDefinitionParser.java index 3b085b6795..c15c65bbc1 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsMessageSourceBeanDefinitionParser.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsMessageSourceBeanDefinitionParser.java @@ -27,7 +27,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.config.xml.AbstractPollingInboundChannelAdapterParser; import org.springframework.integration.config.xml.IntegrationNamespaceUtils; -import org.springframework.integration.ftp.inbound.FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean; /** * Parser for the FTPS inbound-channel-adapter diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.java similarity index 98% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.java index 762f2bbdad..b931a84cdb 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.ftp.inbound; +package org.springframework.integration.ftp.config; import org.apache.commons.net.ftp.FTPClient; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpsSendingMessageHandlerFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsSendingMessageHandlerFactoryBean.java similarity index 98% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpsSendingMessageHandlerFactoryBean.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsSendingMessageHandlerFactoryBean.java index 1f76b51456..d6d5d89477 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpsSendingMessageHandlerFactoryBean.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsSendingMessageHandlerFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.ftp.outbound; +package org.springframework.integration.ftp.config; import javax.net.ssl.KeyManager; import javax.net.ssl.TrustManager;