From 77de5f6d937edb5ea6165e28c04cf6019c7205a4 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Fri, 8 Jul 2011 10:07:42 -0400
Subject: [PATCH] INT-1965 fixed XSDs in FTP and SFTP modules to make sure they
 are PropertyPlaceholder compatible (e.g., xsd:string instead of xsd:boolean)

---
 .../integration/ftp/config/spring-integration-ftp-2.0.xsd | 6 +++---
 .../sftp/config/spring-integration-sftp-2.0.xsd           | 8 ++++----
 .../config/InboundChannelAdapterParserTests-context.xml   | 4 +++-
 3 files changed, 10 insertions(+), 8 deletions(-)

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 d484bab46e..4715bb9010 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
@@ -165,14 +165,14 @@ endpoint itself is a Polling Consumer for a channel with a queue.
 							</xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
-					<xsd:attribute name="auto-create-local-directory" type="xsd:boolean">
+					<xsd:attribute name="auto-create-local-directory" type="xsd:string">
 						<xsd:annotation>
 							<xsd:documentation>
 							Tells this adapter if local directory must be auto-created if it doesn''t exist. Default is TRUE.
 							</xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
-					<xsd:attribute name="delete-remote-files" type="xsd:boolean">
+					<xsd:attribute name="delete-remote-files" type="xsd:string">
 						<xsd:annotation>
 							<xsd:documentation>
 								Specify whether to delete the remote source file after copying.
@@ -201,7 +201,7 @@ endpoint itself is a Polling Consumer for a channel with a queue.
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="cache-sessions" type="xsd:boolean" default="true">
+		<xsd:attribute name="cache-sessions" type="xsd:string" default="true">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 				Specify whether the Sessions should be cached. Default is true.
diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd
index 1058e4e31c..d59efb52bb 100644
--- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd
+++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd
@@ -34,7 +34,7 @@
             			]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="cache-sessions" type="xsd:boolean" default="true">
+			<xsd:attribute name="cache-sessions" type="xsd:string" default="true">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 				Specify whether the Sessions should be cached. Default is true.
@@ -165,7 +165,7 @@ endpoint itself is a Polling Consumer for a channel with a queue.
 					]]></xsd:documentation>
                 </xsd:annotation>
             </xsd:attribute>
-			<xsd:attribute name="cache-sessions" type="xsd:boolean" default="true">
+			<xsd:attribute name="cache-sessions" type="xsd:string" default="true">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 				Specify whether the Sessions should be cached. Default is true.
@@ -251,14 +251,14 @@ endpoint itself is a Polling Consumer for a channel with a queue.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="auto-create-local-directory" type="xsd:boolean">
+			<xsd:attribute name="auto-create-local-directory" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
 					Tells this adapter if local directory must be auto-created if it doesn''t exist. Default is TRUE.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="delete-remote-files" type="xsd:boolean">
+			<xsd:attribute name="delete-remote-files" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
 						Specify whether to delete the remote source file after copying.
diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests-context.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests-context.xml
index 1f1f4471f6..90fb7372d3 100644
--- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests-context.xml
@@ -17,6 +17,8 @@
 						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd
 						http://www.springframework.org/schema/integration/sftp http://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.0.xsd">
 
+	<context:property-placeholder location="classpath:org/springframework/integration/sftp/config/sftp.properties"/>
+
 	<channel id="requestChannel">
 		<queue/>
 	</channel>
@@ -45,7 +47,7 @@
 			remote-file-separator="."
 			temporary-file-suffix=".bar"
 			comparator="comparator"
-			delete-remote-files="false">
+			delete-remote-files="${delete.remote.files}">
 		<poller fixed-rate="1000"/>
 	</sftp:inbound-channel-adapter>