You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/11/27 12:15:11 UTC
svn commit: r721157 - in /activemq/camel/branches/camel-1.x: ./ components/
components/camel-jms/src/main/java/org/apache/camel/component/jms/
components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/
components/camel-jms/src/test/resources...
Author: ningjiang
Date: Thu Nov 27 03:15:10 2008
New Revision: 721157
URL: http://svn.apache.org/viewvc?rev=721157&view=rev
Log:
Merged revisions 719851 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r719851 | davsclaus | 2008-11-22 22:04:50 +0800 (Sat, 22 Nov 2008) | 1 line
CAMEL-1109, CAMEL-1120: Upgrade to ActiveMQ and fixed setting acknowledgementMode on inout mep for JMSProducer when transactedInOut is false (phew this issue surfaced in ActiveMQ 5.2.0)
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/ (props changed)
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/tx/NonTransactedInOutForJmsWithTxnMgrTest.java
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml
activemq/camel/branches/camel-1.x/examples/ (props changed)
activemq/camel/branches/camel-1.x/tests/ (props changed)
activemq/camel/branches/camel-1.x/tests/camel-itest-spring-2.0/src/test/resources/log4j.properties
activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/log4j.properties
activemq/camel/branches/camel-1.x/tooling/ (props changed)
activemq/camel/branches/camel-1.x/tooling/archetypes/ (props changed)
activemq/camel/branches/camel-1.x/tooling/maven/ (props changed)
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 27 03:15:10 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,719163-719184,719334,719339,719524,719662,719848,719864,719978-719979,720207,720435-720437,720806
+/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,719334,719339,719524,719662,719848,719851,719864,719978-719979,720207,720435-720437,720806
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Propchange: activemq/camel/branches/camel-1.x/components/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 27 03:15:10 2008
@@ -0,0 +1 @@
+target
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=721157&r1=721156&r2=721157&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 27 03:15:10 2008
@@ -304,6 +304,18 @@
jmsTemplate.setExplicitQosEnabled(true);
jmsTemplate.setTimeToLive(requestTimeout);
jmsTemplate.setSessionTransacted(isTransactedInOut());
+ if (isTransactedInOut()) {
+ jmsTemplate.setSessionAcknowledgeMode(Session.SESSION_TRANSACTED);
+ } else {
+ if (acknowledgementMode >= 0) {
+ jmsTemplate.setSessionAcknowledgeMode(acknowledgementMode);
+ } else if (acknowledgementModeName != null) {
+ jmsTemplate.setSessionAcknowledgeModeName(acknowledgementModeName);
+ } else {
+ // default to AUTO
+ jmsTemplate.setSessionAcknowledgeMode(Session.AUTO_ACKNOWLEDGE);
+ }
+ }
}
return answer;
}
Modified: activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/NonTransactedInOutForJmsWithTxnMgrTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/NonTransactedInOutForJmsWithTxnMgrTest.java?rev=721157&r1=721156&r2=721157&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/NonTransactedInOutForJmsWithTxnMgrTest.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/NonTransactedInOutForJmsWithTxnMgrTest.java Thu Nov 27 03:15:10 2008
@@ -18,9 +18,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.spring.SpringRouteBuilder;
Modified: activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.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/nonTxInOutJmsTest.xml?rev=721157&r1=721156&r2=721157&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml (original)
+++ activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml Thu Nov 27 03:15:10 2008
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
<import resource="classpath:org/apache/camel/component/jms/tx/activemq.xml" />
Propchange: activemq/camel/branches/camel-1.x/examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 27 03:15:10 2008
@@ -0,0 +1 @@
+target
Propchange: activemq/camel/branches/camel-1.x/tests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 27 03:15:10 2008
@@ -0,0 +1 @@
+target
Modified: activemq/camel/branches/camel-1.x/tests/camel-itest-spring-2.0/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/tests/camel-itest-spring-2.0/src/test/resources/log4j.properties?rev=721157&r1=721156&r2=721157&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/tests/camel-itest-spring-2.0/src/test/resources/log4j.properties (original)
+++ activemq/camel/branches/camel-1.x/tests/camel-itest-spring-2.0/src/test/resources/log4j.properties Thu Nov 27 03:15:10 2008
@@ -34,5 +34,5 @@
log4j.appender.out=org.apache.log4j.FileAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=target/camel-test.log
+log4j.appender.out.file=target/camel-itest-spring-2.0-test.log
log4j.appender.out.append=true
Modified: activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/log4j.properties?rev=721157&r1=721156&r2=721157&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/log4j.properties (original)
+++ activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/log4j.properties Thu Nov 27 03:15:10 2008
@@ -25,7 +25,14 @@
#log4j.logger.org.apache.camel=DEBUG
# CONSOLE appender not used by default
-log4j.appender.out=org.apache.log4j.ConsoleAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.out=org.apache.log4j.FileAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.out.file=target/camel-itest-test.log
+log4j.appender.out.append=true
Propchange: activemq/camel/branches/camel-1.x/tooling/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 27 03:15:10 2008
@@ -0,0 +1 @@
+target
Propchange: activemq/camel/branches/camel-1.x/tooling/archetypes/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 27 03:15:10 2008
@@ -0,0 +1 @@
+target
Propchange: activemq/camel/branches/camel-1.x/tooling/maven/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 27 03:15:10 2008
@@ -0,0 +1 @@
+target