From 45f865e34f1e30e8be34fd9fb7ed6a0ed73348d8 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Thu, 18 Nov 2010 08:45:57 -0500
Subject: [PATCH] INSAMPLES-12 changed remote-filename-expression to be
 remote-filename-generator-expression to compliant with changes in INT-1631

---
 basic/sftp/.settings/com.springsource.sts.config.flow.prefs   | 4 ++--
 basic/sftp/readme.txt                                         | 2 +-
 .../spring/integration/SftpOutboundTransferSample-context.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/basic/sftp/.settings/com.springsource.sts.config.flow.prefs b/basic/sftp/.settings/com.springsource.sts.config.flow.prefs
index 8d8e7fad..3371fee7 100644
--- a/basic/sftp/.settings/com.springsource.sts.config.flow.prefs
+++ b/basic/sftp/.settings/com.springsource.sts.config.flow.prefs
@@ -1,5 +1,5 @@
-#Thu Nov 18 07:42:11 EST 2010
+#Thu Nov 18 08:44:54 EST 2010
 //com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/sftp/src/main/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="InboundChannelAdapterModelElement" type\="inbound-channel-adapter">\n<structure end\="1954" endstart\="1919" start\="1487" startend\="1857"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="2022" endstart\="2008" start\="1958" startend\="1991"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n</graph>
 //com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="InboundChannelAdapterModelElement" type\="inbound-channel-adapter">\n<structure end\="1961" endstart\="1926" start\="1487" startend\="1864"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="2029" endstart\="2015" start\="1965" startend\="1998"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1355" endstart\="1355" start\="1323" startend\="1355"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="OutboundChannelAdapterModelElement" type\="outbound-channel-adapter">\n<structure end\="1654" endstart\="1654" start\="1359" startend\="1654"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n</graph>
+//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1355" endstart\="1355" start\="1323" startend\="1355"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="OutboundChannelAdapterModelElement" type\="outbound-channel-adapter">\n<structure end\="1664" endstart\="1664" start\="1359" startend\="1664"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n</graph>
 eclipse.preferences.version=1
diff --git a/basic/sftp/readme.txt b/basic/sftp/readme.txt
index 8c922ee5..d94508f2 100644
--- a/basic/sftp/readme.txt
+++ b/basic/sftp/readme.txt
@@ -30,7 +30,7 @@ The output should look like this:
 Successfully transfered 'readme.txt' file to a remote location under the name 'readme.txt_foo'
 =====
 
-NOTE: You can see that we are using SpEL via 'remote-filename-expression' attribute to define the remote file name by
+NOTE: You can see that we are using SpEL via 'remote-filename-generator-expression' attribute to define the remote file name by
 simply appending '_foo' to the original file name.
 
 	
diff --git a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml
index 08b1f774..21b72981 100644
--- a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml
+++ b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml
@@ -24,7 +24,7 @@
 	<int-sftp:outbound-channel-adapter id="sftpOutboundAdapter"
 				session-factory="sftpSessionFactory"
 				channel="inputChannel"
-				remote-filename-expression="payload.getName() + '_foo'"
+				remote-filename-generator-expression="payload.getName() + '_foo'"
 				remote-directory="/Users/ozhurakousky/workspace-sts-2.3.3.M2/si/samples/basic/sftp/remote-target-dir"/>
 	
 </beans>