From 3e0ca28288554aad00497eb3d00dd12e483fe04c Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 20 Nov 2008 14:18:17 +0000
Subject: [PATCH] Added namespace support for the 'pub-sub-domain' attribute
 for both JmsInboundGateway and JmsOutboundGateway (INT-482). This is most
 likely an interim step while refactoring continues with the ultimate goal of
 providing a clearer separation between the MessageListener container and
 MessageListener implementation. This will also be relevant for INT-477.

---
 .../integration/jms/config/JmsInboundGatewayParser.java        | 1 +
 .../integration/jms/config/JmsOutboundGatewayParser.java       | 1 +
 .../integration/jms/config/spring-integration-jms-1.0.xsd      | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsInboundGatewayParser.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsInboundGatewayParser.java
index 833676767a..90be775a28 100644
--- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsInboundGatewayParser.java
+++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsInboundGatewayParser.java
@@ -96,6 +96,7 @@ public class JmsInboundGatewayParser extends AbstractSingleBeanDefinitionParser
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "request-timeout");
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "reply-channel");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "reply-timeout");
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "pub-sub-domain");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "concurrent-consumers");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "max-concurrent-consumers");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "max-messages-per-task");
diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java
index 5f446892a9..79d8b02b2b 100644
--- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java
+++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java
@@ -48,6 +48,7 @@ public class JmsOutboundGatewayParser extends AbstractConsumerEndpointParser {
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "extract-request-payload");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "extract-reply-payload");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "receive-timeout");
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "pub-sub-domain");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "delivery-mode");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "time-to-live");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "priority");
diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
index 5f0cb2fd47..caaca3ee4c 100644
--- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
+++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
@@ -80,6 +80,7 @@
 			<xsd:attribute name="reply-timeout" type="xsd:string"/>
 			<xsd:attribute name="request-destination" type="xsd:string" use="required"/>
 			<xsd:attribute name="reply-destination" type="xsd:string"/>
+			<xsd:attribute name="pub-sub-domain" type="xsd:string"/>
 			<xsd:attribute name="connection-factory" type="xsd:string" default="connectionFactory"/>
 			<xsd:attribute name="message-converter" type="xsd:string"/>
 			<xsd:attribute name="header-mapper" type="xsd:string"/>
@@ -120,6 +121,7 @@
 		</xsd:annotation>
 		<xsd:complexContent>
 			<xsd:extension base="jmsAdapterType">
+				<xsd:attribute name="container" type="xsd:string"/>
 				<xsd:attribute name="acknowledge" default="auto">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
@@ -168,6 +170,7 @@
 		<xsd:attribute name="connection-factory" type="xsd:string"/>
 		<xsd:attribute name="destination" type="xsd:string"/>
 		<xsd:attribute name="destination-name" type="xsd:string"/>
+		<xsd:attribute name="pub-sub-domain" type="xsd:string"/>
 	</xsd:complexType>
 
 	<xsd:complexType name="transformerType">