From 3cacd502534185b8285085de745f4301b3299b8c Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Tue, 15 May 2012 19:59:43 -0400
Subject: [PATCH] INTSAMPLES-74 2.2.0.M1 (SF 3.1.1) Compatibility

Change 'user' property to userid to avoid conflict
with environment property.
---
 basic/ftp/pom.xml                                               | 2 +-
 .../integration/FtpInboundChannelAdapterSample-context.xml      | 2 +-
 .../integration/FtpOutboundChannelAdapterSample-context.xml     | 2 +-
 .../spring/integration/FtpOutboundGatewaySample-context.xml     | 2 +-
 basic/ftp/src/test/resources/user.properties                    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml
index 23fe9f44..d4f87df1 100644
--- a/basic/ftp/pom.xml
+++ b/basic/ftp/pom.xml
@@ -7,7 +7,7 @@
 	<packaging>jar</packaging>
 	<properties>
 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.2.0.M1</spring.integration.version>
         <slf4j.version>1.6.4</slf4j.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 2f26da0e..a9ea0081 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
@@ -14,7 +14,7 @@
 	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpSessionFactory">
 		<property name="host" value="${host}"/>
 		<property name="port" value="${port}"/>
-		<property name="username" value="${user}"/>
+		<property name="username" value="${userid}"/>
 		<property name="password" value="${password}"/>
 	</bean>
 	
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 5e826178..d84e591a 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
@@ -14,7 +14,7 @@
 	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpSessionFactory">
 		<property name="host" value="${host}"/>
 		<property name="port" value="${port}"/>
-		<property name="username" value="${user}"/>
+		<property name="username" value="${userid}"/>
 		<property name="password" value="${password}"/>
 	</bean>
 	
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 50e4c4ff..8113bcb5 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
@@ -18,7 +18,7 @@
 		class="org.springframework.integration.ftp.session.DefaultFtpSessionFactory">
 		<property name="host" value="${host}"/>
 		<property name="port" value="${port}"/>
-		<property name="username" value="${user}"/>
+		<property name="username" value="${userid}"/>
 		<property name="password" value="${password}"/>
 	</bean>
 
diff --git a/basic/ftp/src/test/resources/user.properties b/basic/ftp/src/test/resources/user.properties
index 4d5a0693..c1502a1f 100644
--- a/basic/ftp/src/test/resources/user.properties
+++ b/basic/ftp/src/test/resources/user.properties
@@ -1,4 +1,4 @@
-user=demo
+userid=demo
 password=demo
 port=3333
 host=localhost
\ No newline at end of file