From 36343efda8735acfc1179d3e245be4de49e02b12 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 19 Jun 2009 17:20:20 +0000
Subject: [PATCH] Factored common routing configuration into a reusable type in
 the schema.

---
 .../config/xml/spring-integration-1.0.xsd     | 64 +++++++------------
 1 file changed, 24 insertions(+), 40 deletions(-)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd
index 1a5a9a2cc3..cbab100f30 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd
@@ -842,7 +842,7 @@
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:complexContent>
-				<xsd:extension base="inputEndpointType">
+				<xsd:extension base="routerType">
 					<xsd:sequence>	
 						<xsd:element name="mapping" minOccurs="0" maxOccurs="unbounded">
 							<xsd:complexType>
@@ -858,18 +858,6 @@
 							]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
-					<xsd:attribute name="default-output-channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type
-										type="org.springframework.integration.core.MessageChannel" />
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="resolution-required" type="xsd:string"/>
-					<xsd:attribute name="ignore-channel-name-resolution-failures" type="xsd:string"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
@@ -884,7 +872,7 @@
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:complexContent>
-				<xsd:extension base="inputEndpointType">
+				<xsd:extension base="routerType">
 					<xsd:sequence>	
 						<xsd:element name="mapping" minOccurs="1" maxOccurs="unbounded">
 							<xsd:complexType>
@@ -893,18 +881,6 @@
 							</xsd:complexType>	
 						</xsd:element>
 					</xsd:sequence>
-					<xsd:attribute name="default-output-channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type
-										type="org.springframework.integration.core.MessageChannel" />
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="resolution-required" type="xsd:string"/>
-					<xsd:attribute name="ignore-channel-name-resolution-failures" type="xsd:string"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
@@ -913,22 +889,13 @@
 	<xsd:element name="router">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
-	Defines a Router.
+	Defines a Router that serves as an adapter for invoking a method on any
+	Spring-managed object as specified by the "ref" and "method" attributes.
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:complexContent>
-				<xsd:extension base="inputEndpointType">
-					<xsd:attribute name="default-output-channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type
-										type="org.springframework.integration.core.MessageChannel" />
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
+				<xsd:extension base="routerType">
 					<xsd:attribute name="ref" type="xsd:string">
 						<xsd:annotation>
 							<xsd:appinfo>
@@ -939,13 +906,30 @@
 						</xsd:annotation>
 					</xsd:attribute>
 					<xsd:attribute name="method" type="xsd:string"/>
-					<xsd:attribute name="resolution-required" type="xsd:string"/>
-					<xsd:attribute name="ignore-channel-name-resolution-failures" type="xsd:string"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
 
+	<xsd:complexType name="routerType">
+		<xsd:complexContent>
+			<xsd:extension base="inputEndpointType">
+				<xsd:attribute name="default-output-channel" type="xsd:string">
+					<xsd:annotation>
+						<xsd:appinfo>
+							<tool:annotation kind="ref">
+								<tool:expected-type
+									type="org.springframework.integration.core.MessageChannel" />
+							</tool:annotation>
+						</xsd:appinfo>
+					</xsd:annotation>
+				</xsd:attribute>
+				<xsd:attribute name="resolution-required" type="xsd:string"/>
+				<xsd:attribute name="ignore-channel-name-resolution-failures" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
 	<xsd:element name="splitter" type="handlerEndpointType">
 		<xsd:annotation>
 			<xsd:documentation>