From 4f4c25a8dd3f7a9d901904b14594c7a7d6330f2a Mon Sep 17 00:00:00 2001 From: Josh Long Date: Wed, 18 Aug 2010 06:22:05 +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. --- ...ourceFactoryBean.java => FtpMessageSourceFactoryBean.java} | 4 ++-- ...toryBean.java => FtpSendingMessageHandlerFactoryBean.java} | 2 +- .../integration/ftp/config/FtpNamespaceHandler.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{FTPMessageSourceFactoryBean.java => FtpMessageSourceFactoryBean.java} (98%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/{FTPSendingMessageHandlerFactoryBean.java => FtpSendingMessageHandlerFactoryBean.java} (97%) 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 similarity index 98% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPMessageSourceFactoryBean.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpMessageSourceFactoryBean.java index 16a55df217..c13ace9d46 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 @@ -23,11 +23,11 @@ import java.util.regex.Pattern; /** - * Makes it easier to assemble the moving pieces involved in standing up an {@link org.springframework.integration.ftp.FTPMessageSourceFactoryBean} + * Makes it easier to assemble the moving pieces involved in standing up an {@link FtpMessageSourceFactoryBean} * * @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; 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 similarity index 97% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FTPSendingMessageHandlerFactoryBean.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java index 63e1bde78e..bebbff17dc 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 @@ -13,7 +13,7 @@ import org.springframework.core.io.ResourceLoader; * * @author Josh Long */ -public class FTPSendingMessageHandlerFactoryBean extends AbstractFactoryBean implements ResourceLoaderAware, ApplicationContextAware { +public class FtpSendingMessageHandlerFactoryBean extends AbstractFactoryBean implements ResourceLoaderAware, ApplicationContextAware { private int port; private String username; private String password; 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 9e4d0f1e32..d72823110a 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 @@ -57,7 +57,7 @@ public class FtpNamespaceHandler extends NamespaceHandlerSupport { private static class FTPMessageSendingConsumerBeanDefinitionParser extends AbstractOutboundChannelAdapterParser { @Override protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) { - BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(PACKAGE_NAME + ".FTPSendingMessageHandlerFactoryBean"); + BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(PACKAGE_NAME + ".FtpSendingMessageHandlerFactoryBean"); for (String p : "auto-create-directories,username,port,password,host,key-file,key-file-password,remote-directory".split(",")) { IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, p); @@ -79,7 +79,7 @@ public class FtpNamespaceHandler extends NamespaceHandlerSupport { @Override @SuppressWarnings("unused") protected String parseSource(Element element, ParserContext parserContext) { - BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(PACKAGE_NAME + ".FTPMessageSourceFactoryBean"); + BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(PACKAGE_NAME + ".FtpMessageSourceFactoryBean"); // reference IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element,"filter");