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

INT-3426: Add <r-h-a-c> for all outbound-c-a

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3426

Provide other fixes for XSD. E.g. not all adapter have had `<poller>`
This commit is contained in:
Artem Bilan
2014-07-02 16:02:55 +03:00
parent ca0bcf2174
commit 58932dc31f
16 changed files with 187 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.1.xsd
View File

@@ -24,7 +24,9 @@
<xsd:complexContent>
<xsd:extension base="base-sftp-adapter-type">
<xsd:all>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType" minOccurs="0" maxOccurs="1" />
<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" maxOccurs="1" />
</xsd:all>
<xsd:attribute name="order" type="xsd:string">
<xsd:annotation>

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

@@ -41,9 +41,9 @@
remote-directory-expression="'foo' + '/' + 'bar'"
remote-filename-generator-expression="payload.getName() + '-foo'"
order="12"/>
<int-sftp:outbound-channel-adapter
session-factory="sftpSessionFactory"
<int-sftp:outbound-channel-adapter
session-factory="sftpSessionFactory"
channel="inputChannel"
charset="UTF-8"
remote-directory="foo/bar"/>
@@ -55,17 +55,22 @@
use-temporary-file-name="false"
remote-directory="foo/bar"/>
<int:channel id="queueChannel">
<int:queue/>
</int:channel>
<int-sftp:outbound-channel-adapter id="advised"
session-factory="sftpSessionFactory"
channel="inputChannel"
channel="queueChannel"
charset="UTF-8"
use-temporary-file-name="false"
remote-directory="foo/bar">
<int:poller fixed-delay="1000"/>
<int-sftp:request-handler-advice-chain>
<bean class="org.springframework.integration.sftp.config.OutboundChannelAdapterParserTests$FooAdvice" />
</int-sftp:request-handler-advice-chain>
</int-sftp:outbound-channel-adapter>
<bean id="fileNameGenerator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.FileNameGenerator"/>
</bean>