From 3717556f191bd1493bf065707648e31218759154 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Mon, 24 Nov 2008 23:23:50 +0000
Subject: [PATCH] INT-494

---
 .../jms/config/JmsMessageDrivenEndpointParser.java  | 13 +++++++------
 .../jms/config/spring-integration-jms-1.0.xsd       | 10 ++++++++--
 .../config/jmsGatewayTransactionManagerTests.xml    |  4 ++--
 ...msGatewayWithConnectionFactoryAndDestination.xml |  2 +-
 ...tewayWithConnectionFactoryAndDestinationName.xml |  2 +-
 .../jms/config/jmsGatewayWithContainerSettings.xml  |  8 ++++----
 .../jmsGatewayWithDefaultConnectionFactory.xml      |  2 +-
 .../config/jmsGatewayWithEmptyConnectionFactory.xml |  2 +-
 .../jms/config/jmsGatewayWithMessageConverter.xml   |  2 +-
 .../jmsGatewaysWithExtractPayloadAttributes.xml     | 10 +++++-----
 .../integration/samples/jms/inboundGateway.xml      |  4 +++-
 11 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointParser.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointParser.java
index 32634faa41..96c6ba8c4c 100644
--- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointParser.java
+++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointParser.java
@@ -91,18 +91,19 @@ public class JmsMessageDrivenEndpointParser extends AbstractSingleBeanDefinition
 		}
 		// otherwise, we build a DefaultMessageListenerContainer instance
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(DefaultMessageListenerContainer.class);
-		String destination = element.getAttribute(JmsAdapterParserUtils.DESTINATION_ATTRIBUTE);
-		String destinationName = element.getAttribute(JmsAdapterParserUtils.DESTINATION_NAME_ATTRIBUTE);
+		String destinationAttribute = this.expectReply ? "request-destination" : "destination";
+		String destinationNameAttribute = this.expectReply ? "request-destination-name" : "destination-name";
+		String destination = element.getAttribute(destinationAttribute);
+		String destinationName = element.getAttribute(destinationNameAttribute);
 		Assert.isTrue(StringUtils.hasText(destination) ^ StringUtils.hasText(destinationName),
-				"Exactly one of '" + JmsAdapterParserUtils.DESTINATION_ATTRIBUTE +
-					"' or '" + JmsAdapterParserUtils.DESTINATION_NAME_ATTRIBUTE + "' is required.");
+				"Exactly one of '" + destinationAttribute + "' or '" + destinationNameAttribute + "' is required.");
 		builder.addPropertyReference(JmsAdapterParserUtils.CONNECTION_FACTORY_PROPERTY,
 				JmsAdapterParserUtils.determineConnectionFactoryBeanName(element));
 		if (StringUtils.hasText(destination)) {
-			builder.addPropertyReference(JmsAdapterParserUtils.DESTINATION_PROPERTY, destination);
+			builder.addPropertyReference("destination", destination);
 		}
 		else {
-			builder.addPropertyValue(JmsAdapterParserUtils.DESTINATION_NAME_PROPERTY, destinationName);
+			builder.addPropertyValue("destinationName", destinationName);
 		}
 		Integer acknowledgeMode = JmsAdapterParserUtils.parseAcknowledgeMode(element);
 		if (acknowledgeMode != null) {
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 1e271d61d2..9f09e484a6 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
@@ -27,6 +27,8 @@
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="jmsInboundAdapterType">
+					<xsd:attribute name="destination" type="xsd:string"/>
+					<xsd:attribute name="destination-name" type="xsd:string"/>
 					<xsd:attribute name="channel" type="xsd:string"/>
 					<xsd:attribute name="message-converter" type="xsd:string"/>
 					<xsd:attribute name="header-mapper" type="xsd:string"/>
@@ -55,6 +57,8 @@
 					<xsd:sequence>
 						<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 					</xsd:sequence>
+					<xsd:attribute name="destination" type="xsd:string"/>
+					<xsd:attribute name="destination-name" type="xsd:string"/>
 					<xsd:attribute name="channel" type="xsd:string"/>
 					<xsd:attribute name="header-mapper" type="xsd:string"/>
 					<xsd:attribute name="extract-payload" type="xsd:string" default="true"/>
@@ -73,6 +77,8 @@
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="jmsInboundAdapterType">
+					<xsd:attribute name="request-destination" type="xsd:string"/>
+					<xsd:attribute name="request-destination-name" type="xsd:string"/>
 					<xsd:attribute name="message-converter" type="xsd:string"/>
 					<xsd:attribute name="header-mapper" type="xsd:string"/>
 					<xsd:attribute name="extract-request-payload" type="xsd:string" default="true"/>
@@ -136,6 +142,8 @@
 					<xsd:sequence>
 						<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 					</xsd:sequence>
+					<xsd:attribute name="destination" type="xsd:string"/>
+					<xsd:attribute name="destination-name" type="xsd:string"/>
 					<xsd:attribute name="channel" type="xsd:string"/>
 					<xsd:attribute name="header-mapper" type="xsd:string"/>
 					<xsd:attribute name="extract-payload" type="xsd:string" default="true"/>
@@ -199,8 +207,6 @@
 		</xsd:annotation>
 		<xsd:attribute name="id" type="xsd:ID"/>
 		<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="destination-resolver" type="xsd:string"/>
 		<xsd:attribute name="pub-sub-domain" type="xsd:string"/>
 	</xsd:complexType>
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml
index 8912ed6423..5f05020e56 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml
@@ -16,12 +16,12 @@
 
 	<jms:inbound-gateway id="gatewayWithoutTransactionManager"
 	                     connection-factory="testConnectionFactory"
-	                     destination="testDestination"
+	                     request-destination="testDestination"
 	                     request-channel="requestChannel"/>
 
 	<jms:inbound-gateway id="gatewayWithTransactionManager"
 	                     connection-factory="testConnectionFactory"
-	                     destination="testDestination"
+	                     request-destination="testDestination"
 	                     request-channel="requestChannel"
 	                     transaction-manager="txManager"/>
 
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml
index 20a83a800f..e6177237a2 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml
@@ -16,7 +16,7 @@
 
 	<jms:inbound-gateway id="jmsGateway"
 	                 	 connection-factory="testConnectionFactory"
-	                 	 destination="testDestination"
+	                 	 request-destination="testDestination"
 	                 	 request-channel="requestChannel"/>
 
 	<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
index 44539ff112..25e559600a 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
@@ -16,7 +16,7 @@
 
 	<jms:inbound-gateway id="jmsGateway"
 	                     connection-factory="testConnectionFactory"
-	                     destination-name="testDestinationName"
+	                     request-destination-name="testDestinationName"
 	                     request-channel="requestChannel"/>
 
 	<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml
index 7c04cfe1f5..dc2c4872d7 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml
@@ -17,25 +17,25 @@
 	<jms:inbound-gateway id="gatewayWithConcurrentConsumers"
 		 			 	 connection-factory="testConnectionFactory"
 		 			 	 request-channel="requestChannel"
-		 			 	 destination-name="test"
+		 			 	 request-destination-name="test"
 		 			 	 concurrent-consumers="3"/>
 
 	<jms:inbound-gateway id="gatewayWithMaxConcurrentConsumers"
 				 	 	 connection-factory="testConnectionFactory"
 		 			 	 request-channel="requestChannel"
-		 			 	 destination-name="test"
+		 			 	 request-destination-name="test"
 		 				 max-concurrent-consumers="22"/>
 
 	<jms:inbound-gateway id="gatewayWithMaxMessagesPerTask"
 					 	 connection-factory="testConnectionFactory"
 		 			 	 request-channel="requestChannel"
-		 			 	 destination-name="test"
+		 			 	 request-destination-name="test"
 		 			 	 max-messages-per-task="99"/>
 
 	<jms:inbound-gateway id="gatewayWithIdleTaskExecutionLimit"
 					 	 connection-factory="testConnectionFactory"
 		 		   	 	 request-channel="requestChannel"
-		 			 	 destination-name="test"
+		 			 	 request-destination-name="test"
 		 				 idle-task-execution-limit="7"/>
 
 	<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
index 1f6c50cc59..6dc7b67b49 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
@@ -15,7 +15,7 @@
 	</si:channel>
 
 	<jms:inbound-gateway id="jmsGateway"
-					 	 destination-name="testDestinationName"
+					 	 request-destination-name="testDestinationName"
 					 	 request-channel="requestChannel"/>
 
 	<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml
index 8140bdf603..737d582d9e 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml
@@ -16,7 +16,7 @@
 
 	<jms:inbound-gateway id="jmsGateway"
 					 	 connection-factory=""
-						 destination-name="testDestinationName"
+						 request-destination-name="testDestinationName"
 					 	 request-channel="requestChannel"/>
 
 </beans>
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml
index bb9b9b3cf4..a8e5d2140b 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml
@@ -16,7 +16,7 @@
 
 	<jms:inbound-gateway id="jmsGateway"
 	                 	 connection-factory="testConnectionFactory"
-	                 	 destination="testDestination"
+	                 	 request-destination="testDestination"
 	                 	 message-converter="converter"
 	                 	 request-channel="requestChannel"/>
 
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExtractPayloadAttributes.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExtractPayloadAttributes.xml
index 4fdd996935..ad9b930953 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExtractPayloadAttributes.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExtractPayloadAttributes.xml
@@ -15,27 +15,27 @@
 	</si:channel>
 
 	<jms:inbound-gateway id="defaultGateway"
-	                     destination="testDestination"
+	                     request-destination="testDestination"
 	                     request-channel="requestChannel"/>
 
 	<jms:inbound-gateway id="extractReplyPayloadTrue"
-	                     destination="testDestination"
+	                     request-destination="testDestination"
 	                     request-channel="requestChannel"
 	                     extract-reply-payload="true"/>
 
 	<jms:inbound-gateway id="extractReplyPayloadFalse"
-	                     destination="testDestination"
+	                     request-destination="testDestination"
 	                     request-channel="requestChannel"
 	                     extract-reply-payload="false"/>
 
 
 	<jms:inbound-gateway id="extractRequestPayloadTrue"
-	                     destination="testDestination"
+	                     request-destination="testDestination"
 	                     request-channel="requestChannel"
 	                     extract-request-payload="true"/>
 
 	<jms:inbound-gateway id="extractRequestPayloadFalse"
-	                     destination="testDestination"
+	                     request-destination="testDestination"
 	                     request-channel="requestChannel"
 	                     extract-request-payload="false"/>
 
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml
index 6ab683de81..63f96ec6d8 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml
@@ -17,7 +17,9 @@
 
 	<context:component-scan base-package="org.springframework.integration.samples.jms"/>
 
-	<jms:inbound-gateway id="jmsin" destination="requestQueue" request-channel="demoChannel"/>
+	<jms:inbound-gateway id="jmsin"
+	                     request-destination="requestQueue"
+	                     request-channel="demoChannel"/>
 
 	<channel id="demoChannel"/>