Author: davsclaus
Date: Sat Nov 22 06:04:50 2008
New Revision: 719851
URL: http://svn.apache.org/viewvc?rev=719851&view=rev
Log:
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/trunk/components/ (props changed)
activemq/camel/trunk/components/camel-jms/pom.xml
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/NonTransactedInOutForJmsWithTxnMgrTest.java
activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml
activemq/camel/trunk/examples/ (props changed)
activemq/camel/trunk/pom.xml
activemq/camel/trunk/tests/ (props changed)
activemq/camel/trunk/tests/camel-itest-spring-2.0/pom.xml
activemq/camel/trunk/tests/camel-itest-spring-2.0/src/test/resources/log4j.properties
activemq/camel/trunk/tests/camel-itest/pom.xml
activemq/camel/trunk/tests/camel-itest/src/test/resources/log4j.properties
activemq/camel/trunk/tooling/ (props changed)
activemq/camel/trunk/tooling/archetypes/ (props changed)
activemq/camel/trunk/tooling/maven/ (props changed)
Propchange: activemq/camel/trunk/components/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Nov 22 06:04:50 2008
@@ -0,0 +1 @@
+target
Modified: activemq/camel/trunk/components/camel-jms/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/pom.xml?rev=719851&r1=719850&r2=719851&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jms/pom.xml Sat Nov 22 06:04:50 2008
@@ -94,6 +94,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-camel</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<exclusions>
Modified:
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=719851&r1=719850&r2=719851&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
Sat Nov 22 06:04:50 2008
@@ -299,6 +299,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/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/NonTransactedInOutForJmsWithTxnMgrTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/NonTransactedInOutForJmsWithTxnMgrTest.java?rev=719851&r1=719850&r2=719851&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/NonTransactedInOutForJmsWithTxnMgrTest.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/NonTransactedInOutForJmsWithTxnMgrTest.java
Sat Nov 22 06:04:50 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/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml?rev=719851&r1=719850&r2=719851&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
Sat Nov 22 06:04:50 2008
@@ -20,7 +20,7 @@
xmlns:broker="http://activemq.apache.org/schema/core";
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.5.xsd
- http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd";>
+ http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd";>
<broker:broker id="broker" useJmx="false" persistent="false"
dataDirectory="target/activemq">
<broker:transportConnectors>
Modified:
activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml?rev=719851&r1=719850&r2=719851&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml
Sat Nov 22 06:04:50 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/trunk/examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Nov 22 06:04:50 2008
@@ -0,0 +1 @@
+target
Modified: activemq/camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=719851&r1=719850&r2=719851&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Sat Nov 22 06:04:50 2008
@@ -41,7 +41,7 @@
<properties>
<compiler.fork>false</compiler.fork>
<!-- Note that activemq dependency is only used for testing! -->
- <activemq-version>5.1.0</activemq-version>
+ <activemq-version>5.2.0</activemq-version>
<apacheds-version>1.5.4</apacheds-version>
<cxf-version>2.1.3</cxf-version>
<felix-version>1.4.1</felix-version>
@@ -586,6 +586,11 @@
<version>${activemq-version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-camel</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean-spring-version}</version>
Propchange: activemq/camel/trunk/tests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Nov 22 06:04:50 2008
@@ -0,0 +1 @@
+target
Modified: activemq/camel/trunk/tests/camel-itest-spring-2.0/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest-spring-2.0/pom.xml?rev=719851&r1=719850&r2=719851&view=diff
==============================================================================
--- activemq/camel/trunk/tests/camel-itest-spring-2.0/pom.xml (original)
+++ activemq/camel/trunk/tests/camel-itest-spring-2.0/pom.xml Sat Nov 22
06:04:50 2008
@@ -106,5 +106,10 @@
<artifactId>activemq-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-camel</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
activemq/camel/trunk/tests/camel-itest-spring-2.0/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest-spring-2.0/src/test/resources/log4j.properties?rev=719851&r1=719850&r2=719851&view=diff
==============================================================================
---
activemq/camel/trunk/tests/camel-itest-spring-2.0/src/test/resources/log4j.properties
(original)
+++
activemq/camel/trunk/tests/camel-itest-spring-2.0/src/test/resources/log4j.properties
Sat Nov 22 06:04:50 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/trunk/tests/camel-itest/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/pom.xml?rev=719851&r1=719850&r2=719851&view=diff
==============================================================================
--- activemq/camel/trunk/tests/camel-itest/pom.xml (original)
+++ activemq/camel/trunk/tests/camel-itest/pom.xml Sat Nov 22 06:04:50 2008
@@ -69,6 +69,11 @@
<artifactId>activemq-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-camel</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
Modified:
activemq/camel/trunk/tests/camel-itest/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/src/test/resources/log4j.properties?rev=719851&r1=719850&r2=719851&view=diff
==============================================================================
--- activemq/camel/trunk/tests/camel-itest/src/test/resources/log4j.properties
(original)
+++ activemq/camel/trunk/tests/camel-itest/src/test/resources/log4j.properties
Sat Nov 22 06:04:50 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/trunk/tooling/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Nov 22 06:04:50 2008
@@ -0,0 +1 @@
+target
Propchange: activemq/camel/trunk/tooling/archetypes/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Nov 22 06:04:50 2008
@@ -0,0 +1 @@
+target
Propchange: activemq/camel/trunk/tooling/maven/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Nov 22 06:04:50 2008
@@ -0,0 +1 @@
+target
