From 81cf46af708c7cbc88671d832ed75d32b3a2fdee Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Fri, 31 Aug 2012 09:28:14 -0400
Subject: [PATCH] INT-2532 AMQP Schema Doc Clarification

Can't use <rabbit:listener-container/> when injecting an
external container into an endpoint.
---
 .../amqp/config/spring-integration-amqp-2.2.xsd           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd
index 67612af0e8..5a30583d7e 100644
--- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd
+++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd
@@ -505,13 +505,17 @@ this list can also be simple patterns to be matched against the header names (e.
 		</xsd:attribute>
 		<xsd:attribute name="listener-container" type="xsd:string">
 			<xsd:annotation>
-				<xsd:documentation>
+				<xsd:documentation><![CDATA[
 	Reference to the MessageListener container to use for receiving AMQP Messages. If this attribute is provided,
 	then no other attribute related to the listener container configuration should be provided. In other words, by
 	setting this reference, you must take full responsibility of the listener container configuration. The only
 	exception is the MessageListener itself. Since that is actually the core responsibility of this Channel Adapter
 	implementation, the referenced listener container must NOT already have its own MessageListener configured.
-				</xsd:documentation>
+	Note that this means that the external listener container must be configured using standard Spring <bean/>
+	(or @Bean) syntax. You cannot use the <rabbit:listener-container/> XML namespace support because it requires
+	attributes such as queue names to be specified on a child <listener/> element and, as stated above, the
+	container must not have a MessageListener defined.
+				]]></xsd:documentation>
 				<xsd:appinfo>
 					<tool:annotation kind="ref">
 						<tool:expected-type type="org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer"/>