Author: ningjiang
Date: Thu Nov 20 00:29:08 2008
New Revision: 719196
URL: http://svn.apache.org/viewvc?rev=719196&view=rev
Log:
Merged revisions 719163,719184 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r719163 | ningjiang | 2008-11-20 13:03:14 +0800 (Thu, 20 Nov 2008) | 1 line
CAMEL-959 only inject the TransactionManager into the
MessageListenerContainer when transacted and transactedInOut are true
........
r719184 | ningjiang | 2008-11-20 14:49:38 +0800 (Thu, 20 Nov 2008) | 1 line
CAMEL-959 fixed the test error of TransactedJmsRouteTest
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/AbstractTransactionTest.xml
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 20 00:29:08 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java?rev=719196&r1=719195&r2=719196&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
Thu Nov 20 00:29:08 2008
@@ -127,6 +127,7 @@
JmsConfiguration template = new JmsConfiguration(connectionFactory);
template.setTransactionManager(transactionManager);
template.setTransacted(true);
+ template.setTransactedInOut(true);
return jmsComponent(template);
}
@@ -388,7 +389,7 @@
// lets make sure we copy the configuration as each endpoint can
// customize its own version
- JmsConfiguration newConfiguration = getConfiguration().copy();
+ JmsConfiguration newConfiguration = getConfiguration().copy();
JmsEndpoint endpoint;
if (pubSubDomain) {
if (tempDestination) {
Modified:
activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=719196&r1=719195&r2=719196&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
Thu Nov 20 00:29:08 2008
@@ -33,6 +33,7 @@
import org.apache.commons.logging.LogFactory;
import org.springframework.core.task.TaskExecutor;
import org.springframework.jms.JmsException;
+import org.springframework.jms.connection.JmsResourceHolder;
import org.springframework.jms.core.JmsOperations;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.core.JmsTemplate102;
@@ -867,8 +868,8 @@
container.setAcceptMessagesWhileStopping(acceptMessagesWhileStopping);
container.setExposeListenerSession(exposeListenerSession);
- container.setSessionTransacted(transacted);
- if (transacted) {
+ container.setSessionTransacted(transacted && transactedInOut);
+ if (transacted && transactedInOut) {
container.setSessionAcknowledgeMode(Session.SESSION_TRANSACTED);
} else {
if (acknowledgementMode >= 0) {
@@ -917,9 +918,9 @@
listenerContainer.setTaskExecutor(taskExecutor);
}
PlatformTransactionManager tm = getTransactionManager();
- if (tm != null) {
+ if (tm != null && (transacted && transactedInOut)) {
listenerContainer.setTransactionManager(tm);
- } else if (transacted) {
+ } else if (transacted && transactedInOut) {
throw new IllegalArgumentException("Property transacted is
enabled but a transactionManager was not injected!");
}
if (transactionName != null) {
Modified:
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java?rev=719196&r1=719195&r2=719196&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
Thu Nov 20 00:29:08 2008
@@ -146,8 +146,9 @@
// inbound was not transacted.
JmsEndpoint endpoint =
(JmsEndpoint)endpoint("activemq:queue:e");
endpoint.getConfiguration().setTransacted(false);
-
endpoint.getConfiguration().setAcknowledgementMode(Session.AUTO_ACKNOWLEDGE);
-
from(endpoint).policy(requried).policy(rollback).to("activemq:queue:mock.a",
"mock:b");
+
endpoint.getConfiguration().setAcknowledgementMode(Session.AUTO_ACKNOWLEDGE);
+ // since the endpoint of activemq:queue:e is not managed by
the TransactionManager, let's create a new transaction
+
from(endpoint).policy(requirenew).policy(rollback).to("activemq:queue:mock.a",
"mock:b");
//
// Sets up 2 consumers on single topic, one being transacted
the
Modified:
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml?rev=719196&r1=719195&r2=719196&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml
Thu Nov 20 00:29:08 2008
@@ -61,6 +61,7 @@
<property name="connectionFactory" ref="jmsConnectionFactory"/>
<property name="transactionManager" ref="jmsTransactionManager"/>
<property name="transacted" value="true"/>
+ <property name="transactedInOut" value="true"/>
<property name="concurrentConsumers" value="1"/>
</bean>
Modified:
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/AbstractTransactionTest.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/AbstractTransactionTest.xml?rev=719196&r1=719195&r2=719196&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/AbstractTransactionTest.xml
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/AbstractTransactionTest.xml
Thu Nov 20 00:29:08 2008
@@ -41,6 +41,7 @@
<property name="connectionFactory" ref="jmsConnectionFactory"/>
<property name="transactionManager" ref="jmsTransactionManager"/>
<property name="transacted" value="true"/>
+ <property name="transactedInOut" value="true"/>
<property name="concurrentConsumers" value="1"/>
</bean>
@@ -48,6 +49,7 @@
<property name="connectionFactory" ref="jmsConnectionFactory-1"/>
<property name="transactionManager" ref="jmsTransactionManager-1"/>
<property name="transacted" value="true"/>
+ <property name="transactedInOut" value="true"/>
<property name="concurrentConsumers" value="1"/>
</bean>
Modified:
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml?rev=719196&r1=719195&r2=719196&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml
Thu Nov 20 00:29:08 2008
@@ -55,6 +55,7 @@
<property name="connectionFactory" ref="jmsConnectionFactory"/>
<property name="transactionManager" ref="jmsTransactionManager"/>
<property name="transacted" value="true"/>
+ <property name="transactedInOut" value="true"/>
<property name="concurrentConsumers" value="1"/>
</bean>
Modified:
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml?rev=719196&r1=719195&r2=719196&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml
Thu Nov 20 00:29:08 2008
@@ -92,6 +92,7 @@
<property name="connectionFactory" ref="jmsConnectionFactory"/>
<property name="transactionManager" ref="jmsTransactionManager"/>
<property name="transacted" value="true"/>
+ <property name="transactedInOut" value="true"/>
<property name="concurrentConsumers" value="1"/>
</bean>
