From ed736aa499d14046a477160479f75c5b7437aa30 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@gopivotal.com>
Date: Thu, 5 Sep 2013 11:11:09 -0400
Subject: [PATCH] INTSAMPLES-117 Remove cache-sessions - FTP Sample

Compatibility with SI 3.0; also bump to 3.0.0.M3.
---
 basic/ftp/pom.xml                                           | 2 +-
 .../integration/FtpInboundChannelAdapterSample-context.xml  | 2 +-
 .../integration/FtpOutboundChannelAdapterSample-context.xml | 2 +-
 .../spring/integration/FtpOutboundGatewaySample-context.xml | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml
index 8757a430..87cc6e79 100644
--- a/basic/ftp/pom.xml
+++ b/basic/ftp/pom.xml
@@ -13,7 +13,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.M3</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml
index a94a3cbd..9e200408 100644
--- a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml
+++ b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml
@@ -18,7 +18,7 @@
 		<property name="password" value="${password}"/>
 	</bean>
 
-	<int-ftp:inbound-channel-adapter id="ftpInbound" cache-sessions="false"
+	<int-ftp:inbound-channel-adapter id="ftpInbound"
 				channel="ftpChannel"
 				session-factory="ftpClientFactory"
 				filename-pattern="*.txt"
diff --git a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml
index f5b98b16..15e390ab 100644
--- a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml
+++ b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml
@@ -20,7 +20,7 @@
 
 	<int:channel id="ftpChannel"/>
 
-	<int-ftp:outbound-channel-adapter  id="ftpOutbound" cache-sessions="false"
+	<int-ftp:outbound-channel-adapter  id="ftpOutbound"
 				channel="ftpChannel"
 				remote-directory="/"
 				session-factory="ftpClientFactory" />
diff --git a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml
index 0c43a090..2c40a6e5 100644
--- a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml
+++ b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml
@@ -22,7 +22,7 @@
 		<property name="password" value="${password}"/>
 	</bean>
 
-	<int-ftp:outbound-gateway id="gatewayLS" cache-sessions="false"
+	<int-ftp:outbound-gateway id="gatewayLS"
 		session-factory="ftpSessionFactory"
 		request-channel="inbound"
 		command="ls"
@@ -40,7 +40,7 @@
 
 	<int:splitter id="splitter" input-channel="toSplitter" output-channel="toGet"/>
 
-	<int-ftp:outbound-gateway id="gatewayGET" cache-sessions="false"
+	<int-ftp:outbound-gateway id="gatewayGET"
 		local-directory="#{ T(org.springframework.integration.samples.ftp.TestSuite).LOCAL_FTP_TEMP_DIR}/gatewayGET"
 		session-factory="ftpSessionFactory"
 		request-channel="toGet"
@@ -58,7 +58,7 @@
 	<int:logging-channel-adapter id="logger2" log-full-message="true"/>
 
 	<int-ftp:outbound-gateway id="gatewayRM"
-		session-factory="ftpSessionFactory" cache-sessions="false"
+		session-factory="ftpSessionFactory"
 		expression="headers['file_remoteDirectory'] + '/' + headers['file_remoteFile']"
 		request-channel="toRemoveChannel"
 		command="rm"