From 505bfac2f86c3d29634c3878a15c40fb8dbba0a3 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Wed, 10 Jun 2015 10:15:04 -0400
Subject: [PATCH] INT-3735: (S)FTP Fix Schema Expected Type

JIRA: https://jira.spring.io/browse/INT-3735
---
 .../ftp/config/spring-integration-ftp-4.2.xsd            | 9 +++++----
 .../sftp/config/spring-integration-sftp-4.2.xsd          | 7 ++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.2.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.2.xsd
index 60671ffc0d..8a97bbdd77 100644
--- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.2.xsd
+++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.2.xsd
@@ -524,7 +524,7 @@
 					</xsd:annotation>
 				</xsd:attribute>
 			</xsd:extension>
-        </xsd:complexContent>
+		</xsd:complexContent>
 	</xsd:complexType>
 
 	<xsd:complexType name="base-adapter-type">
@@ -535,12 +535,13 @@
 				<xsd:appinfo>
 					<tool:annotation kind="ref">
 						<tool:expected-type
-							type="org.springframework.integration.ftp.session.DefaultFtpSessionFactory" />
+							type="org.springframework.integration.file.remote.session.SessionFactory" />
 					</tool:annotation>
 				</xsd:appinfo>
 				<xsd:documentation><![CDATA[
-                Reference to a [org.springframework.integration.ftp.session.DefaultFtpSessionFactory] bean.
-            ]]></xsd:documentation>
+					Reference to an [org.springframework.integration.file.remote.session.SessionFactory] bean with
+					an [org.apache.commons.net.ftp.FTPFile] generic type parameter.
+				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="temporary-file-suffix" type="xsd:string">
diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.2.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.2.xsd
index 885e888c65..8e5d3379b8 100644
--- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.2.xsd
+++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.2.xsd
@@ -539,12 +539,13 @@
 				<xsd:appinfo>
 					<tool:annotation kind="ref">
 						<tool:expected-type
-							type="org.springframework.integration.sftp.session.DefaultSftpSessionFactory" />
+							type="org.springframework.integration.file.remote.session.SessionFactory" />
 					</tool:annotation>
 				</xsd:appinfo>
 				<xsd:documentation><![CDATA[
-                Reference to a [org.springframework.integration.sftp.session.DefaultSftpSessionFactory] bean.
-            ]]></xsd:documentation>
+					Reference to an [org.springframework.integration.file.remote.session.SessionFactory] bean with
+					a [com.jcraft.jsch.ChannelSftp$LsEntry] generic type parameter.
+				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="temporary-file-suffix" type="xsd:string">