Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93 from markfisher/INT-2136

Browse Source 
Only require 'queue-names' if no container ref
This commit is contained in:
Mark Fisher
2011-09-27 09:54:59 -04:00
parent d358711ce9 66a4f2fa42
commit 3079fe9bf0
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AbstractAmqpInboundAdapterParser.java
View File

@@ -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");

2
spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd
View File

@@ -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).