From 2f20973b16b73c7f33b39d928ab33ff6986692cd Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Tue, 30 Nov 2010 13:49:17 -0500
Subject: [PATCH] INT-1649 consolidated XMPP schema

---
 .../config/spring-integration-xmpp-2.0.xsd    | 159 ++++++------------
 1 file changed, 52 insertions(+), 107 deletions(-)

diff --git a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd
index b002222398..faf098f56f 100644
--- a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd
+++ b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd
@@ -43,7 +43,7 @@
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="host" type="xsd:string">
+			<xsd:attribute name="host" type="xsd:string" use="required">
 				<xsd:annotation>
 					<xsd:documentation>
 						The host name to connect TO
@@ -97,6 +97,53 @@
 			</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="xmppInboundAdapterType"/>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="outbound-channel-adapter">
+		<xsd:annotation>
+			<xsd:documentation>
+				Outbound Channel Adapter that sends chat messages.
+			</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="xmppOutboundAdapterType"/>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="presence-inbound-channel-adapter">
+		<xsd:annotation>
+			<xsd:documentation>
+				Configures an endpoint that will forward Presence state changes to a MessageChannel.
+			</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="xmppInboundAdapterType"/>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="presence-outbound-channel-adapter">
+		<xsd:annotation>
+			<xsd:documentation>
+				Configures an endpoint that will publish an updated {@link org.jivesoftware.smack.packet.Presence} state on your {@link XMPPConnection } object.
+			</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="xmppOutboundAdapterType"/>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+	
+	
+	<xsd:complexType name="xmppInboundAdapterType">
 			<xsd:attribute name="id" type="xsd:string"/>
 			<xsd:attribute name="extract-payload" type="xsd:string" default="true">
 				<xsd:annotation>
@@ -139,17 +186,10 @@
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="outbound-channel-adapter">
-		<xsd:annotation>
-			<xsd:documentation>
-				Outbound Channel Adapter that sends chat messages.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence>
+	</xsd:complexType>
+	
+	<xsd:complexType name="xmppOutboundAdapterType">
+		<xsd:sequence>
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
 			</xsd:sequence>
 			<xsd:attribute name="id" type="xsd:string"/>
@@ -180,101 +220,6 @@
 				</xsd:annotation>
 			</xsd:attribute>
 		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="presence-inbound-channel-adapter">
-		<xsd:annotation>
-			<xsd:documentation>
-				Configures an endpoint that will forward Presence state changes to a MessageChannel.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:string"/>
-			<xsd:attribute name="extract-payload" type="xsd:string" default="true">
-				<xsd:annotation>
-					<xsd:documentation>
-					Specifies if generated Message payload should consist of only 
-					the text of the XMPP Presence message or the entire XMPP Presence (Smack API specific) message. 
-					Default is TRUE.
-					</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="channel" use="required" 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:documentation>
-					Identifies channel attached to this adapter. Depending on the type of the adapter 
-					this channel could be the receiving channel (e.g., outbound-channel-adapter) or channel where 
-					messages will be sent to by this adapter (e.g., inbound-channel-adapter).
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="xmpp-connection" type="xsd:string" use="required">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.jivesoftware.smack.XMPPConnection"/>
-						</tool:annotation>
-					</xsd:appinfo>
-					<xsd:documentation>
-						Reference to XMPP connection bean
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="presence-outbound-channel-adapter">
-		<xsd:annotation>
-			<xsd:documentation>
-				Configures an endpoint that will publish an updated {@link org.jivesoftware.smack.packet.Presence} state on your {@link XMPPConnection } object.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
-			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:string"/>
-			<xsd:attribute name="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:documentation>
-					Identifies channel attached to this adapter. Depending on the type of the adapter 
-					this channel could be the receiving channel (e.g., outbound-channel-adapter) or channel where 
-					messages will be sent to by this adapter (e.g., inbound-channel-adapter).
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="xmpp-connection" type="xsd:string" use="required">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.jivesoftware.smack.XMPPConnection"/>
-						</tool:annotation>
-					</xsd:appinfo>
-					<xsd:documentation>
-						Reference to XMPP connection bean
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
 
 	<xsd:element name="header-enricher">
 		<xsd:complexType>