From 103df7ada2c908200d756bd3ceec4f5a822eb4f3 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Mon, 24 Aug 2009 21:01:55 +0000
Subject: [PATCH] INT-763 The 'container' attribute is no longer available for
 a non-message-driven 'inbound-channel-adapter' element (where it would have
 no effect).

---
 .../jms/config/spring-integration-jms-1.0.xsd | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd b/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
index d332952434..a066b27b98 100644
--- a/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
+++ b/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
@@ -27,7 +27,7 @@
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:complexContent>
-				<xsd:extension base="jmsInboundAdapterType">
+				<xsd:extension base="jmsMessageDrivenInboundAdapterType">
 					<xsd:attribute name="destination" type="xsd:string">
 						<xsd:annotation>
 							<xsd:appinfo>
@@ -148,7 +148,7 @@
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:complexContent>
-				<xsd:extension base="jmsInboundAdapterType">
+				<xsd:extension base="jmsMessageDrivenInboundAdapterType">
 					<xsd:attribute name="request-destination" type="xsd:string">
 						<xsd:annotation>
 							<xsd:appinfo>
@@ -388,14 +388,14 @@
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:complexType name="jmsInboundAdapterType">
+	<xsd:complexType name="jmsMessageDrivenInboundAdapterType">
 		<xsd:annotation>
 			<xsd:documentation>
-	Common configuration for inbound JMS-based adapters.
+	Common configuration for message-driven inbound JMS-based adapters.
 			</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexContent>
-			<xsd:extension base="jmsAdapterType">
+			<xsd:extension base="jmsInboundAdapterType">
 				<xsd:attribute name="container" type="xsd:string">
 					<xsd:annotation>
 						<xsd:appinfo>
@@ -405,6 +405,18 @@
 						</xsd:appinfo>
 					</xsd:annotation>
 				</xsd:attribute>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:complexType name="jmsInboundAdapterType">
+		<xsd:annotation>
+			<xsd:documentation>
+	Common configuration for inbound JMS-based adapters.
+			</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexContent>
+			<xsd:extension base="jmsAdapterType">
 				<xsd:attribute name="acknowledge" default="auto">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[