From 832b3433ee0377eb2447a1c1ea5d77e2bab930a8 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Sat, 30 Apr 2011 10:56:44 -0400
Subject: [PATCH] INT-1848 Add order Attribute (stream)

---
 .../stream/config/spring-integration-stream-2.0.xsd       | 8 ++++++++
 .../config/ConsoleOutboundChannelAdapterParserTests.java  | 5 ++++-
 .../config/consoleOutboundChannelAdapterParserTests.xml   | 4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.0.xsd b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.0.xsd
index 67f72550a3..dc5a0f9701 100644
--- a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.0.xsd
+++ b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.0.xsd
@@ -68,6 +68,14 @@
 		<xsd:attribute name="charset" type="xsd:string"/>
 		<xsd:attribute name="append-newline" type="xsd:string" default="false"/>
 		<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
+		<xsd:attribute name="order">
+			<xsd:annotation>
+				<xsd:documentation>
+					Specifies the order for invocation when this endpoint is connected as a
+					subscriber to a SubscribableChannel.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
 	</xsd:complexType>
 
 </xsd:schema>
diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParserTests.java b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParserTests.java
index 2b3ba39f23..f8f02d586f 100644
--- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParserTests.java
+++ b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ import org.springframework.integration.stream.CharacterStreamWritingMessageHandl
 
 /**
  * @author Mark Fisher
+ * @author Gary Russell
  */
 public class ConsoleOutboundChannelAdapterParserTests {
 
@@ -75,6 +76,7 @@ public class ConsoleOutboundChannelAdapterParserTests {
 		handler.handleMessage(new GenericMessage<String>("foo"));
 		assertEquals("foo", out.toString());
 		assertEquals("", err.toString());
+		assertEquals(23, accessor.getPropertyValue("order"));
 	}
 
 	@Test
@@ -131,6 +133,7 @@ public class ConsoleOutboundChannelAdapterParserTests {
 		handler.handleMessage(new GenericMessage<String>("bad"));
 		assertEquals("", out.toString());
 		assertEquals("bad", err.toString());
+		assertEquals(34, accessor.getPropertyValue("order"));		
 	}
 
     @Test
diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/consoleOutboundChannelAdapterParserTests.xml b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/consoleOutboundChannelAdapterParserTests.xml
index 7f11fa6ab2..95492bb297 100644
--- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/consoleOutboundChannelAdapterParserTests.xml
+++ b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/consoleOutboundChannelAdapterParserTests.xml
@@ -12,11 +12,11 @@
 
 	<integration:channel id="testChannel"/>
 
-	<stdout-channel-adapter id="stdoutAdapterWithDefaultCharset" channel="testChannel"/>
+	<stdout-channel-adapter id="stdoutAdapterWithDefaultCharset" channel="testChannel" order="23"/>
 
 	<stdout-channel-adapter id="stdoutAdapterWithProvidedCharset" charset="UTF-8" channel="testChannel"/>
 
-	<stderr-channel-adapter id="stderrAdapter" channel="testChannel"/>
+	<stderr-channel-adapter id="stderrAdapter" channel="testChannel" order="34"/>
 
 	<stdout-channel-adapter id="newlineAdapter" append-newline="true" channel="testChannel"/>