From fb0ae7332b3b04edc5a3c6acb1d08ddd226cb1ff Mon Sep 17 00:00:00 2001
From: Josh Long <josh.long@springsource.com>
Date: Mon, 4 Oct 2010 00:30:04 -0700
Subject: [PATCH] i had to undo some changes we had before to make sure my
 class name refactorings would work, and now i am reapplying them for INT-1471

---
 .../integration/ftp/config/FtpNamespaceParserSupport.java       | 2 +-
 .../integration/ftp/config/spring-integration-ftp-2.0.xsd       | 1 +
 .../integration/ftp/config/spring-integration-ftps-2.0.xsd      | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpNamespaceParserSupport.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpNamespaceParserSupport.java
index 747eb673b6..3564747110 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpNamespaceParserSupport.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpNamespaceParserSupport.java
@@ -10,7 +10,7 @@ import org.w3c.dom.Element;
  * A lot of parsers need to support the same set of core attributes, so I'm hiding that logic here
  *
  * @author Josh Long
- * 
+ *
  */
 public class FtpNamespaceParserSupport {
     /**
diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd
index 4b7473aca0..b4f5863958 100644
--- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd
+++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd
@@ -55,6 +55,7 @@
 			<xsd:attribute name="remote-directory" type="xsd:string" use="required"/>
 			<xsd:attribute name="host" type="xsd:string" use="required"/>
 			<xsd:attribute name="password" type="xsd:string"/>
+            <xsd:attribute name="charset" type="xsd:string" default="UTF-8"/>
 			<xsd:attribute name="port" type="xsd:int" default="22"/>
 			<xsd:attribute use="optional" name="client-mode" default="active-local-data-connection-mode">
 				<xsd:annotation>
diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftps-2.0.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftps-2.0.xsd
index 2bba87f6fd..0a1fd09f52 100644
--- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftps-2.0.xsd
+++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftps-2.0.xsd
@@ -55,6 +55,7 @@
 			<xsd:attribute name="remote-directory" type="xsd:string" use="required"/>
 			<xsd:attribute name="host" type="xsd:string" use="required"/>
 			<xsd:attribute name="password" type="xsd:string"/>
+            <xsd:attribute name="charset" type="xsd:string" default="UTF-8"/>
 			<xsd:attribute name="port" type="xsd:int" default="22"/>
 			<xsd:attribute use="optional" name="client-mode" default="active-local-data-connection-mode">
 				<xsd:annotation>