CAMEL-9429: Upgrade to ActiveMQ 5.13.1. Thanks to Dejan for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/940334b6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/940334b6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/940334b6 Branch: refs/heads/master Commit: 940334b6728b3855b8b4865dcc461fa1fe461399 Parents: c11b6c1 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Feb 11 12:28:11 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Feb 11 12:28:11 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/itest/CamelJmsTestHelper.java | 2 ++ .../itest/greeter/CamelGreeterConsumerTest-context.xml | 11 ++++++++--- .../camel/itest/greeter/CxfToJmsInOutTest-context.xml | 7 ++++++- .../camel/itest/greeter/JmsToCxfInOutTest-context.xml | 7 ++++++- 4 files changed, 22 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/940334b6/tests/camel-itest/src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java index 1bb277c..a44fb95 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java @@ -52,6 +52,7 @@ public final class CamelJmsTestHelper { connectionFactory.setCopyMessageOnSend(false); connectionFactory.setOptimizeAcknowledge(true); connectionFactory.setOptimizedMessageDispatch(true); + connectionFactory.setTrustAllPackages(true); // When using asyncSend, producers will not be guaranteed to send in the order we // have in the tests (which may be confusing for queues) so we need this set to false. @@ -90,6 +91,7 @@ public final class CamelJmsTestHelper { connectionFactory.setOptimizedMessageDispatch(true); connectionFactory.setUseAsyncSend(true); connectionFactory.setAlwaysSessionAsync(false); + connectionFactory.setTrustAllPackages(true); // use a pooled connection factory PooledConnectionFactory pooled = new PooledConnectionFactory(connectionFactory); http://git-wip-us.apache.org/repos/asf/camel/blob/940334b6/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml index 76e1a4c..ab20972 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml @@ -39,9 +39,14 @@ <bean id="jmsPrepareRequest" class="org.apache.camel.itest.greeter.JmsPrepareRequest"/> <bean id="jmsPrepareResponse" class="org.apache.camel.itest.greeter.JmsPrepareResponse"/> - - <bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent"> - <property name="brokerURL" value="vm://localhost?broker.persistent=false"/> + + <bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent"> + <property name="connectionFactory"> + <bean class="org.apache.activemq.spring.ActiveMQConnectionFactory"> + <property name="brokerURL" value="vm://localhost?broker.persistent=false"/> + <property name="trustAllPackages" value="true"/> + </bean> + </property> </bean> <!-- START SNIPPET: example --> http://git-wip-us.apache.org/repos/asf/camel/blob/940334b6/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CxfToJmsInOutTest-context.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CxfToJmsInOutTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CxfToJmsInOutTest-context.xml index 0357de9..247f866 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CxfToJmsInOutTest-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CxfToJmsInOutTest-context.xml @@ -40,7 +40,12 @@ <bean id="prepareResponse" class="org.apache.camel.itest.greeter.PrepareResponse"/> <bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent"> - <property name="brokerURL" value="vm://localhost?broker.persistent=false"/> + <property name="connectionFactory"> + <bean class="org.apache.activemq.spring.ActiveMQConnectionFactory"> + <property name="brokerURL" value="vm://localhost?broker.persistent=false"/> + <property name="trustAllPackages" value="true"/> + </bean> + </property> </bean> <camelContext xmlns="http://camel.apache.org/schema/spring";> http://git-wip-us.apache.org/repos/asf/camel/blob/940334b6/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JmsToCxfInOutTest-context.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JmsToCxfInOutTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JmsToCxfInOutTest-context.xml index d352441..ddd4e87 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JmsToCxfInOutTest-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JmsToCxfInOutTest-context.xml @@ -48,7 +48,12 @@ <bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent"> - <property name="brokerURL" value="vm://localhost?broker.persistent=false"/> + <property name="connectionFactory"> + <bean class="org.apache.activemq.spring.ActiveMQConnectionFactory"> + <property name="brokerURL" value="vm://localhost?broker.persistent=false"/> + <property name="trustAllPackages" value="true"/> + </bean> + </property> </bean> <camelContext xmlns="http://camel.apache.org/schema/spring";>
