From be362f90c6b6a48027afb2595ce02faef79632c4 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@gopivotal.com>
Date: Mon, 7 Jul 2014 14:33:56 +0300
Subject: [PATCH] INT-3462: Polishing (s)ftp XSD

JIRA: https://jira.spring.io/browse/INT-3462
---
 .../ftp/config/spring-integration-ftp-4.1.xsd | 44 ++++++----
 .../FtpOutboundGatewayParserTests-context.xml | 83 ++++++++++---------
 .../config/spring-integration-sftp-4.1.xsd    | 53 +++++++-----
 ...SftpOutboundGatewayParserTests-context.xml |  6 ++
 4 files changed, 111 insertions(+), 75 deletions(-)

diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd
index 89d955e144..509fee981a 100644
--- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd
+++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd
@@ -26,6 +26,19 @@
 					<xsd:all>
 						<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType" minOccurs="0" maxOccurs="1" />
 					</xsd:all>
+					<xsd:attribute name="channel" type="xsd:string">
+						<xsd:annotation>
+							<xsd:appinfo>
+								<tool:annotation kind="ref">
+									<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
+								</tool:annotation>
+							</xsd:appinfo>
+							<xsd:documentation>
+								Identifies channel attached to this adapter. This channel could be the receiving
+								channel.
+							</xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
 					<xsd:attribute name="order" type="xsd:string">
 						<xsd:annotation>
 							<xsd:documentation>
@@ -65,6 +78,19 @@
 						<xsd:element ref="integration:poller" minOccurs="0"
 							maxOccurs="1" />
 					</xsd:sequence>
+					<xsd:attribute name="channel" type="xsd:string">
+						<xsd:annotation>
+							<xsd:appinfo>
+								<tool:annotation kind="ref">
+									<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
+								</tool:annotation>
+							</xsd:appinfo>
+							<xsd:documentation>
+								Identifies channel attached to this adapter. This channel where messages will be sent
+								to by this adapter.
+							</xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
 					<xsd:attribute name="filename-pattern" type="xsd:string">
 						<xsd:annotation>
 							<xsd:documentation>
@@ -204,7 +230,9 @@
 			<xsd:complexContent>
 				<xsd:extension base="base-ftp-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="command" use="required">
 						<xsd:annotation>
@@ -488,20 +516,6 @@
 						</xsd:documentation>
 					</xsd:annotation>
 				</xsd:attribute>
-				<xsd:attribute name="channel" type="xsd:string">
-					<xsd:annotation>
-						<xsd:appinfo>
-							<tool:annotation kind="ref">
-								<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
-							</tool:annotation>
-						</xsd:appinfo>
-						<xsd:documentation>
-							Identifies channel attached to this adapter. Depending on the type of the adapter
-							this channel could be the receiving channel (e.g., outbound-channel-adapter) or channel where
-							messages will be sent to by this adapter (e.g., inbound-channel-adapter).
-						</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
 				<xsd:attribute name="charset" type="xsd:string" default="UTF-8">
 					<xsd:annotation>
 						<xsd:documentation>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundGatewayParserTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundGatewayParserTests-context.xml
index 15b231ef42..fd86a2fd03 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundGatewayParserTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundGatewayParserTests-context.xml
@@ -15,22 +15,27 @@
 		<constructor-arg ref="sf"/>
 	</bean>
 
+	<int:channel id="inbound1">
+		<int:queue/>
+	</int:channel>
+
 	<int-ftp:outbound-gateway id="gateway1"
-		local-directory="local-test-dir"
-		session-factory="sf"
-		request-channel="inbound1"
-		reply-channel="outbound"
-		reply-timeout="777"
-		auto-create-local-directory="false"
-		auto-startup="false"
-		filename-pattern="*"
-		remote-file-separator="X"
-		command="ls"
-		command-options="-1 -f"
-		expression="payload"
-		order="1"
-		mput-regex=".*"
-		/>
+							  local-directory="local-test-dir"
+							  session-factory="sf"
+							  request-channel="inbound1"
+							  reply-channel="outbound"
+							  reply-timeout="777"
+							  auto-create-local-directory="false"
+							  auto-startup="false"
+							  filename-pattern="*"
+							  remote-file-separator="X"
+							  command="ls"
+							  command-options="-1 -f"
+							  expression="payload"
+							  order="1"
+							  mput-regex=".*">
+		<int:poller fixed-delay="1000"/>
+	</int-ftp:outbound-gateway>
 
 	<bean id="fooString" class="java.lang.String">
 		<constructor-arg value="foo" />
@@ -58,31 +63,33 @@
 	</int-ftp:outbound-gateway>
 
 	<int-ftp:outbound-gateway id="gateway3"
-		session-factory="sf"
-		request-channel="inbound1"
-		reply-channel="outbound"
-		auto-startup="false"
-		command="mv"
-		expression="payload"
-		rename-expression="'foo'"
-		order="1"
-		/>
+							  session-factory="sf"
+							  request-channel="inbound1"
+							  reply-channel="outbound"
+							  auto-startup="false"
+							  command="mv"
+							  expression="payload"
+							  rename-expression="'foo'"
+							  order="1">
+		<int:poller fixed-delay="1000"/>
+	</int-ftp:outbound-gateway>
 
 	<int-ftp:outbound-gateway id="gateway4"
-		session-factory="csf"
-		request-channel="inbound1"
-		reply-channel="outbound"
-		command="mput"
-		expression="payload"
-		remote-directory="/foo"
-		remote-file-separator="X"
-		auto-create-directory="true"
-		remote-filename-generator="fileNameGenerator"
-		temporary-remote-directory="/bar"
-		rename-expression="'foo'"
-		order="1"
-		mput-regex=".*"
-		/>
+							  session-factory="csf"
+							  request-channel="inbound1"
+							  reply-channel="outbound"
+							  command="mput"
+							  expression="payload"
+							  remote-directory="/foo"
+							  remote-file-separator="X"
+							  auto-create-directory="true"
+							  remote-filename-generator="fileNameGenerator"
+							  temporary-remote-directory="/bar"
+							  rename-expression="'foo'"
+							  order="1"
+							  mput-regex=".*">
+		<int:poller fixed-delay="1000"/>
+	</int-ftp:outbound-gateway>
 
 	<bean id="fileNameGenerator" class="org.mockito.Mockito" factory-method="mock">
 		<constructor-arg value="org.springframework.integration.file.FileNameGenerator"/>
diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.1.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.1.xsd
index beec300df9..c8478689f7 100644
--- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.1.xsd
+++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.1.xsd
@@ -28,6 +28,21 @@
 						<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
 									 minOccurs="0" maxOccurs="1" />
 					</xsd:all>
+					<xsd:attribute name="channel" type="xsd:string">
+						<xsd:annotation>
+							<xsd:appinfo>
+								<tool:annotation kind="ref">
+									<tool:expected-type
+											type="org.springframework.messaging.MessageChannel" />
+								</tool:annotation>
+							</xsd:appinfo>
+							<xsd:documentation>
+								Identifies channel attached to this adapter.
+								This channel could be the receiving channel.
+							</xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+
 					<xsd:attribute name="order" type="xsd:string">
 						<xsd:annotation>
 							<xsd:documentation>
@@ -67,6 +82,19 @@
 						<xsd:element ref="integration:poller" minOccurs="0"
 							maxOccurs="1" />
 					</xsd:sequence>
+					<xsd:attribute name="channel" type="xsd:string">
+						<xsd:annotation>
+							<xsd:appinfo>
+								<tool:annotation kind="ref">
+									<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
+								</tool:annotation>
+							</xsd:appinfo>
+							<xsd:documentation>
+								Identifies channel attached to this adapter. This channel where messages will be sent
+								to by this adapter.
+							</xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
 					<xsd:attribute name="comparator" type="xsd:string">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
@@ -206,7 +234,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="command" use="required">
 						<xsd:annotation>
@@ -488,27 +518,6 @@
 						</xsd:documentation>
 					</xsd:annotation>
 				</xsd:attribute>
-				<xsd:attribute name="channel" type="xsd:string">
-					<xsd:annotation>
-						<xsd:appinfo>
-							<tool:annotation kind="ref">
-								<tool:expected-type
-									type="org.springframework.messaging.MessageChannel" />
-							</tool:annotation>
-						</xsd:appinfo>
-						<xsd:documentation>
-							Identifies channel attached to this adapter.
-							Depending on the type of the
-							adapter
-							this channel could be the
-							receiving channel (e.g.,
-							outbound-channel-adapter) or channel
-							where
-							messages will be sent to by this adapter (e.g.,
-							inbound-channel-adapter).
-						</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
 				<xsd:attribute name="charset" type="xsd:string"
 					default="UTF-8">
 					<xsd:annotation>
diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests-context.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests-context.xml
index e056a39e0a..da3573d29a 100644
--- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests-context.xml
+++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests-context.xml
@@ -15,6 +15,12 @@
 		<constructor-arg ref="sf"/>
 	</bean>
 
+	<int:channel id="inbound1">
+		<int:queue/>
+	</int:channel>
+
+	<int:poller fixed-delay="1000" default="true"/>
+
 	<int-sftp:outbound-gateway id="gateway1"
 		local-directory="local-test-dir"
 		session-factory="sf"