From 6c959e601079d1e2794be4c61710d636183c2af0 Mon Sep 17 00:00:00 2001
From: Josh Long <josh.long@springsource.com>
Date: Sun, 12 Sep 2010 13:06:01 -0700
Subject: [PATCH] fixing issues related to fileType not propagating in the ftp
 handler

---
 .../integration/ftp/ClientFactorySupport.java            | 3 ++-
 .../ftp/FtpSendingMessageHandlerFactoryBean.java         | 9 ++++++++-
 .../ftp/FtpsSendingMessageHandlerFactoryBean.java        | 3 +++
 .../src/test/resources/outbound-ftp-context.xml          | 1 +
 .../src/test/resources/outbound-ftps-context.xml         | 1 +
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/ClientFactorySupport.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/ClientFactorySupport.java
index 6ba29e5e87..0140ded251 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/ClientFactorySupport.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/ClientFactorySupport.java
@@ -71,7 +71,7 @@ public class ClientFactorySupport {
         return defaultFtpClientFactory;
     }
 
-    public static DefaultFtpClientFactory ftpClientFactory(String host, int port, String remoteDir, String user, String pw, int clientMode) {
+    public static DefaultFtpClientFactory ftpClientFactory(String host, int port, String remoteDir, String user, String pw, int clientMode, int fileType) {
         DefaultFtpClientFactory defaultFtpClientFactory = new DefaultFtpClientFactory();
         defaultFtpClientFactory.setHost(host);
         defaultFtpClientFactory.setPassword(pw);
@@ -79,6 +79,7 @@ public class ClientFactorySupport {
         defaultFtpClientFactory.setRemoteWorkingDirectory(remoteDir);
         defaultFtpClientFactory.setUsername(user);
         defaultFtpClientFactory.setClientMode(clientMode);
+	    defaultFtpClientFactory.setFileType( fileType );
 
         return defaultFtpClientFactory;
     }
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 26782253f5..603175e8b3 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
@@ -23,6 +23,12 @@ public class FtpSendingMessageHandlerFactoryBean extends AbstractFactoryBean<Ftp
     protected String remoteDirectory;
     protected int clientMode;
 
+	public void setFileType(int fileType) {
+		this.fileType = fileType;
+	}
+
+	private int fileType ;
+
     // private vars
     private ResourceLoader resourceLoader;
     private ApplicationContext applicationContext;
@@ -46,7 +52,7 @@ public class FtpSendingMessageHandlerFactoryBean extends AbstractFactoryBean<Ftp
     }
 
     protected AbstractFtpClientFactory clientFactory() {
-      return ClientFactorySupport.ftpClientFactory( this.host,   this.port ,  this.remoteDirectory , this.username , this.password , this.clientMode );
+      return ClientFactorySupport.ftpClientFactory( this.host,   this.port ,  this.remoteDirectory , this.username , this.password , this.clientMode, this.fileType );
     }
 
     @Override
@@ -59,6 +65,7 @@ public class FtpSendingMessageHandlerFactoryBean extends AbstractFactoryBean<Ftp
         QueuedFtpClientPool queuedFtpClientPool = new QueuedFtpClientPool(15, defaultFtpClientFactory);
 
         FtpSendingMessageHandler ftpSendingMessageHandler = new FtpSendingMessageHandler(queuedFtpClientPool);
+
         ftpSendingMessageHandler.afterPropertiesSet();
 
         return ftpSendingMessageHandler;
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 d74ccfb216..97725ba138 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
@@ -14,6 +14,9 @@ public class FtpsSendingMessageHandlerFactoryBean extends FtpSendingMessageHandl
 	   */
 	  protected volatile String protocol;
 
+
+
+
 	  /**
 	   * "P"
 	   */
diff --git a/spring-integration-ftp/src/test/resources/outbound-ftp-context.xml b/spring-integration-ftp/src/test/resources/outbound-ftp-context.xml
index 278b3b2110..d5002bcabb 100644
--- a/spring-integration-ftp/src/test/resources/outbound-ftp-context.xml
+++ b/spring-integration-ftp/src/test/resources/outbound-ftp-context.xml
@@ -29,6 +29,7 @@
 			remote-directory="${ftp.remotedir}"
 			channel="ftpOutbound"
 			host="${ftp.host}"
+			file-type="binary-file-type"
 			username="${ftp.username}"
 			password="${ftp.password}" port="2222"
 			client-mode="passive-local-data-connection-mode"
diff --git a/spring-integration-ftp/src/test/resources/outbound-ftps-context.xml b/spring-integration-ftp/src/test/resources/outbound-ftps-context.xml
index 6eb2275a70..7fb84efb39 100644
--- a/spring-integration-ftp/src/test/resources/outbound-ftps-context.xml
+++ b/spring-integration-ftp/src/test/resources/outbound-ftps-context.xml
@@ -29,6 +29,7 @@
 	<ftps:outbound-channel-adapter
 			remote-directory="${ftp.remotedir}"
 			channel="ftpOutbound"
+			file-type="binary-file-type"
 			host="${ftp.host}"
 			username="${ftp.username}"
 			password="${ftp.password}" port="21"