From 387ab9965ca483dcc05ec0c1b4eaae63b0461291 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 3 Jul 2009 04:19:28 +0000
Subject: [PATCH] Added support for 'order' and 'auto-startup' on HTTP
 'outbound-gateway'.

---
 .../http/config/spring-integration-http-1.0.xsd          | 9 +++++++++
 .../config/HttpOutboundGatewayParserTests-context.xml    | 4 +++-
 .../http/config/HttpOutboundGatewayParserTests.java      | 6 ++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/org.springframework.integration.http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-1.0.xsd b/org.springframework.integration.http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-1.0.xsd
index b315361706..a83240a525 100644
--- a/org.springframework.integration.http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-1.0.xsd
+++ b/org.springframework.integration.http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-1.0.xsd
@@ -128,6 +128,15 @@
 							</xsd:appinfo>
 						</xsd:annotation>
 					</xsd:attribute>
+					<xsd:attribute name="order" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	Specifies the order for invocation when this gateway is connected as a
+	subscriber to a SubscribableChannel.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="auto-startup" type="xsd:string"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
diff --git a/org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests-context.xml b/org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests-context.xml
index 92f3248ae5..22ed8055a8 100644
--- a/org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests-context.xml
+++ b/org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests-context.xml
@@ -23,7 +23,9 @@
 		request-mapper="mapper"
 		request-executor="executor"
 		request-timeout="1234"
-		reply-channel="replies"/>
+		reply-channel="replies"
+		order="77"
+		auto-startup="false"/>
 
 	<outbound-gateway id="fullConfigWithoutMapper"
 		request-channel="requests"
diff --git a/org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java b/org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java
index 08db16a551..a5e2b97040 100644
--- a/org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java
+++ b/org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java
@@ -85,12 +85,14 @@ public class HttpOutboundGatewayParserTests {
 
 	@Test
 	public void fullConfigWithMapper() throws Exception {
-		HttpOutboundEndpoint gateway = (HttpOutboundEndpoint) new DirectFieldAccessor(
-				this.fullConfigWithMapperEndpoint).getPropertyValue("handler");
+		DirectFieldAccessor endpointAccessor = new DirectFieldAccessor(this.fullConfigWithMapperEndpoint);
+		HttpOutboundEndpoint gateway = (HttpOutboundEndpoint) endpointAccessor.getPropertyValue("handler");
 		MessageChannel requestChannel = (MessageChannel) new DirectFieldAccessor(
 				this.fullConfigWithMapperEndpoint).getPropertyValue("inputChannel");
 		assertEquals(this.applicationContext.getBean("requests"), requestChannel);
 		DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
+		assertEquals(77, accessor.getPropertyValue("order"));
+		assertEquals(Boolean.FALSE, endpointAccessor.getPropertyValue("autoStartup"));
 		Object replyChannel = accessor.getPropertyValue("outputChannel");
 		assertNotNull(replyChannel);
 		assertEquals(this.applicationContext.getBean("replies"), replyChannel);