From a1cbb51da87b19c16c5701175903d42c30615e21 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Tue, 18 Oct 2011 13:54:36 -0400
Subject: [PATCH] backport INT-2103

---
 .../integration/ftp/config/spring-integration-ftp-2.0.xsd | 8 ++++++++
 .../FtpInboundChannelAdapterParserTests-context.xml       | 1 +
 .../ftp/config/FtpInboundChannelAdapterParserTests.java   | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd
index 4715bb9010..eadf80d7f7 100644
--- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd
+++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd
@@ -116,6 +116,14 @@ endpoint itself is a Polling Consumer for a channel with a queue.
 			            	</xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
+					<xsd:attribute name="auto-startup" type="xsd:string" default="true">
+						<xsd:annotation>
+							<xsd:documentation>
+								Lifecycle attribute signaling if this component should be started during Application Context startup.
+								Default is 'true'.
+							</xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
 					<xsd:attribute name="comparator" type="xsd:string">
 		                <xsd:annotation>
 		                    <xsd:documentation><![CDATA[
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests-context.xml
index cf8c71a119..b66bf31fd5 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests-context.xml
@@ -16,6 +16,7 @@
 				cache-sessions="false"
 				charset="UTF-8"
 				auto-create-local-directory="true"
+				auto-startup="false"
 				delete-remote-files="true"
 				filename-pattern="*.txt"
 				local-directory="."
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java
index f2b3d1d783..ec4a2def89 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java
@@ -18,6 +18,8 @@ package org.springframework.integration.ftp.config;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
+
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -52,6 +54,7 @@ public class FtpInboundChannelAdapterParserTests {
 		ApplicationContext ac = 
 			new ClassPathXmlApplicationContext("FtpInboundChannelAdapterParserTests-context.xml", this.getClass());
 		SourcePollingChannelAdapter adapter = ac.getBean("ftpInbound", SourcePollingChannelAdapter.class);
+		assertFalse(TestUtils.getPropertyValue(adapter, "autoStartup", Boolean.class));
 		Comparator<File> comparator = TestUtils.getPropertyValue(adapter, "source.fileSource.toBeReceived.q.comparator", Comparator.class);
 		assertNotNull(comparator);
 		assertEquals("ftpInbound", adapter.getComponentName());