From 061ce2f05d7c768fbb40fe47945136805c6f3ce1 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Fri, 28 Jan 2011 10:43:52 -0500
Subject: [PATCH] INT-1768 added support for propagating AcknowledgeMode to
 JmsTemplate when explicitly set on JMS inbound-channel-adapter

---
 .../jms/config/JmsAdapterParserUtils.java            |  7 ++++++-
 .../jms/config/spring-integration-jms-2.0.xsd        |  2 +-
 .../config/JmsInboundChannelAdapterParserTests.java  | 12 +++++++++++-
 .../jms/config/jmsInboundWithJmsTemplate.xml         |  5 +++++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsAdapterParserUtils.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsAdapterParserUtils.java
index 344d10f9b1..e2f466ca42 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsAdapterParserUtils.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsAdapterParserUtils.java
@@ -57,7 +57,7 @@ abstract class JmsAdapterParserUtils {
 
 	private static final String[] JMS_TEMPLATE_ATTRIBUTES = {
 		"connection-factory", "message-converter", "destination-resolver", "pub-sub-domain",
-		"time-to-live", "priority", "delivery-persistent", "explicit-qos-enabled"
+		"time-to-live", "priority", "delivery-persistent", "explicit-qos-enabled", "acknowledge"
 	};
 
 
@@ -123,6 +123,11 @@ abstract class JmsAdapterParserUtils {
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "priority");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "delivery-persistent");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "explicit-qos-enabled");
+		Integer acknowledgeMode = parseAcknowledgeMode(element, parserContext);
+		if (acknowledgeMode != null){
+			builder.addPropertyValue("sessionAcknowledgeMode", acknowledgeMode);
+		}
+	
 		return builder.getBeanDefinition();
 	}
 
diff --git a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd
index d8f547644d..aecb4abb50 100644
--- a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd
+++ b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd
@@ -872,7 +872,7 @@
 		</xsd:annotation>
 		<xsd:complexContent>
 			<xsd:extension base="jmsAdapterType">
-				<xsd:attribute name="acknowledge" default="auto">
+				<xsd:attribute name="acknowledge">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
 	The native JMS acknowledge mode: "auto", "client", "dups-ok" or "transacted".
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java
index e18630f1bf..f2930dc40d 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java
@@ -31,6 +31,7 @@ import org.springframework.integration.Message;
 import org.springframework.integration.core.PollableChannel;
 import org.springframework.integration.history.MessageHistory;
 import org.springframework.integration.test.util.TestUtils;
+import org.springframework.jms.core.JmsTemplate;
 
 /**
  * @author Mark Fisher
@@ -40,7 +41,7 @@ public class JmsInboundChannelAdapterParserTests {
 	long timeoutOnReceive = 3000;
 	
 	@Test
-	public void adapterWithJmsTemplate() {
+	public void adapterWithJmsTemplate() {  
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"jmsInboundWithJmsTemplate.xml", this.getClass());
 		PollableChannel output = (PollableChannel) context.getBean("output");
@@ -53,6 +54,15 @@ public class JmsInboundChannelAdapterParserTests {
 		assertNotNull("message should not be null", message);
 		assertEquals("polling-test", message.getPayload());
 	}
+	
+	@Test
+	public void adapterWithoutJmsTemplateAndAcknowlegeMode() {  
+		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
+				"jmsInboundWithJmsTemplate.xml", this.getClass());
+		JmsTemplate jmsTemplate = 
+			TestUtils.getPropertyValue(context.getBean("inboundAdapterWithoutJmsTemplate"), "source.jmsTemplate", JmsTemplate.class);
+		assertEquals(0, jmsTemplate.getSessionAcknowledgeMode());
+	}
 
 	@Test
 	public void adapterWithConnectionFactoryAndDestination() {
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml
index 0247d7200d..956cb91ee5 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml
@@ -13,7 +13,12 @@
 	<integration:message-history/>
 
 	<jms:inbound-channel-adapter id="inboundAdapter" jms-template="jmsTemplate" channel="output"/>
+	
+	<jms:inbound-channel-adapter id="inboundAdapterWithoutJmsTemplate" channel="outputA" acknowledge="transacted" 
+									destination-name="foo.bar"/>
 
+	<integration:channel id="outputA"/>
+			
 	<integration:channel id="output">
 		<integration:queue capacity="1"/>
 	</integration:channel>