Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1631 changed remote-filename-expression to remote-filename-generation-expression, adjusted tests and docs

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-11-18 08:43:19 -05:00
parent 24781476f3
commit 454eed23d1
7 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapaterParserTests-context-fail-fileFileGen.xml
View File

@@ -24,9 +24,9 @@
session-factory="sftpSessionFactory"
channel="inputChannel"
charset="UTF-8"
filename-generator="fileNameGenerator"
remote-filename-generator="fileNameGenerator"
remote-directory-expression="'foo' + '/' + 'bar'"
remote-filename-expression="payload.getName() + '-foo'"/>
remote-filename-generator-expression="payload.getName() + '-foo'"/>
<bean id="fileNameGenerator" class="org.mockito.Mockito" factory-method="mock">

2
spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapaterParserTests-context-fail.xml
View File

@@ -24,7 +24,7 @@
session-factory="sftpSessionFactory"
channel="inputChannel"
charset="UTF-8"
filename-generator="fileNameGenerator"
remote-filename-generator="fileNameGenerator"
remote-directory="foo/bar"
remote-directory-expression="'foo'"/>

4
spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapaterParserTests-context.xml
View File

@@ -24,7 +24,7 @@
session-factory="sftpSessionFactory"
channel="inputChannel"
charset="UTF-8"
filename-generator="fileNameGenerator"
remote-filename-generator="fileNameGenerator"
remote-directory="foo/bar"/>
<int-sftp:outbound-channel-adapter id="sftpOutboundAdapterWithExpression"
@@ -32,7 +32,7 @@
channel="inputChannel"
charset="UTF-8"
remote-directory-expression="'foo' + '/' + 'bar'"
remote-filename-expression="payload.getName() + '-foo'"/>
remote-filename-generator-expression="payload.getName() + '-foo'"/>
<int-sftp:outbound-channel-adapter
session-factory="sftpSessionFactory"

19
spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundTransferSample-ignored.xml
View File

@@ -10,10 +10,8 @@
<bean id="sftpSessionFactory" class="org.springframework.integration.sftp.session.SftpSessionFactory">
<property name="host" value="localhost"/>
<!-- <property name="knownHosts" value="local, foo.com, bar.foo"/>-->
<property name="privateKey" value="file:/Users/ozhurakousky/.ssh/sftp_rsa"/>
<property name="privateKeyPassphrase" value="seva@1994"/>
<!-- <property name="password" value="hello"/>-->
<property name="privateKeyPassphrase" value="xxxx"/>
<property name="port" value="22"/>
<property name="user" value="ozhurakousky"/>
</bean>
@@ -24,18 +22,7 @@
session-factory="sftpSessionFactory"
channel="inputChannel"
charset="UTF-8"
remote-file-expression="payload.getName() + '_foo'"
remote-file-generator-expression="payload.getName() + '_foo'"
remote-directory="/Users/ozhurakousky/workspace-sts-2.3.3.M2/si/spring-integration/spring-integration-sftp/remote-test-dir"/>
<!-- <int-sftp:outbound-channel-adapter id="sftpOutboundAdapterWithExpression"-->
<!-- session-factory="sftpSessionFactory"-->
<!-- channel="inputChannel"-->
<!-- charset="UTF-8"-->
<!-- filename-generator="fileNameGenerator"-->
<!-- remote-directory-expression="'foo' + '/' + 'bar'"/>-->
<bean id="fileNameGenerator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.FileNameGenerator"/>
</bean>
</beans>