From 66a4f2fa42c76bebb313e25602167179aceb0c74 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Tue, 27 Sep 2011 09:09:46 -0400
Subject: [PATCH] Only require 'queue-names' if no container ref

---
 .../amqp/config/AbstractAmqpInboundAdapterParser.java         | 4 ++++
 .../integration/amqp/config/spring-integration-amqp-2.1.xsd   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AbstractAmqpInboundAdapterParser.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AbstractAmqpInboundAdapterParser.java
index ccf9691bb9..94fea2a4bc 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AbstractAmqpInboundAdapterParser.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AbstractAmqpInboundAdapterParser.java
@@ -107,6 +107,10 @@ abstract class AbstractAmqpInboundAdapterParser extends AbstractSingleBeanDefini
 	protected abstract void configureChannels(Element element, ParserContext parserContext, BeanDefinitionBuilder builder);
 
 	private BeanDefinition buildListenerContainer(Element element, ParserContext parserContext) {
+		if (!element.hasAttribute("queue-names")) {
+			parserContext.getReaderContext().error("If no 'listener-container' reference is provided, " +
+					"the 'queue-names' attribute is required.", element);
+		}
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(
 				"org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer");
 		String connectionFactoryRef = element.getAttribute("connection-factory");
diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd
index 1b3a8dca8d..3525f85962 100644
--- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd
+++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd
@@ -412,7 +412,7 @@
 				</xsd:appinfo>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="queue-names" type="xsd:string" use="required">
+		<xsd:attribute name="queue-names" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation>
 	Names of the AMQP Queues from which Messages should be consumed (comma-separated list).