You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/10/14 11:22:07 UTC
[1/2] git commit: Fixed test when using AMQ 5.9.0
Updated Branches:
refs/heads/camel-2.12.x 4969138e3 -> 0fc72e85a
refs/heads/master 47e76f104 -> 45dea9ae5
Fixed test when using AMQ 5.9.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/45dea9ae
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/45dea9ae
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/45dea9ae
Branch: refs/heads/master
Commit: 45dea9ae5a0c50ca8c5c16e84a3fb2a7f1a86e9b
Parents: 47e76f1
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Oct 14 11:20:55 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Oct 14 11:21:42 2013 +0200
----------------------------------------------------------------------
.../apache/camel/component/jms/TwoConsumerOnSameQueueTest.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/45dea9ae/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
index 55f73db..ecc7ebe 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
@@ -18,11 +18,9 @@ package org.apache.camel.component.jms;
import javax.jms.ConnectionFactory;
-import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
import org.junit.Test;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -94,7 +92,7 @@ public class TwoConsumerOnSameQueueTest extends CamelTestSupport {
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false"); //CamelJmsTestHelper.createConnectionFactory();
+ ConnectionFactory connectionFactory = CamelJmsTestHelper.createConnectionFactory();
camelContext.addComponent("activemq", jmsComponentAutoAcknowledge(connectionFactory));
return camelContext;
[2/2] git commit: Fixed test when using AMQ 5.9.0
Posted by da...@apache.org.
Fixed test when using AMQ 5.9.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0fc72e85
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0fc72e85
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0fc72e85
Branch: refs/heads/camel-2.12.x
Commit: 0fc72e85a8a539803e638edefe7d3f0bdd93246f
Parents: 4969138
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Oct 14 11:20:55 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Oct 14 11:22:10 2013 +0200
----------------------------------------------------------------------
.../apache/camel/component/jms/TwoConsumerOnSameQueueTest.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0fc72e85/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
index 55f73db..ecc7ebe 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
@@ -18,11 +18,9 @@ package org.apache.camel.component.jms;
import javax.jms.ConnectionFactory;
-import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
import org.junit.Test;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -94,7 +92,7 @@ public class TwoConsumerOnSameQueueTest extends CamelTestSupport {
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false"); //CamelJmsTestHelper.createConnectionFactory();
+ ConnectionFactory connectionFactory = CamelJmsTestHelper.createConnectionFactory();
camelContext.addComponent("activemq", jmsComponentAutoAcknowledge(connectionFactory));
return camelContext;