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 2014/08/21 08:17:27 UTC
[1/3] git commit: CAMEL-7728 Setup the TCCL before create the
instance from the BaseResolver
Repository: camel
Updated Branches:
refs/heads/master 2cff2f15f -> 546a8ad67
CAMEL-7728 Setup the TCCL before create the instance from the BaseResolver
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/546a8ad6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/546a8ad6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/546a8ad6
Branch: refs/heads/master
Commit: 546a8ad67fc6060bd6e7d338b992a62bf5663d9a
Parents: 42473e5
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Aug 21 14:16:14 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Aug 21 14:16:41 2014 +0800
----------------------------------------------------------------------
.../main/java/org/apache/camel/impl/osgi/Activator.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/546a8ad6/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
index 7ef56f5..9502a1d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
@@ -387,7 +387,17 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer {
}
URL url = bundle.getEntry(path);
LOG.trace("The entry {}'s url is {}", name, url);
- return createInstance(name, url, context.getInjector());
+ //Setup the TCCL with Camel context application class loader
+ ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
+ try {
+ ClassLoader newClassLoader = context.getApplicationContextClassLoader();
+ if (newClassLoader != null) {
+ Thread.currentThread().setContextClassLoader(newClassLoader);
+ }
+ return createInstance(name, url, context.getInjector());
+ } finally {
+ Thread.currentThread().setContextClassLoader(oldClassLoader);
+ }
}
@SuppressWarnings("unchecked")
[2/3] git commit: Disable the JMX by default in camel-sjms
Posted by ni...@apache.org.
Disable the JMX by default in camel-sjms
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/42473e56
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/42473e56
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/42473e56
Branch: refs/heads/master
Commit: 42473e56c90b20f31e10de691bea32a2beaaa299
Parents: 410beed
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Aug 21 11:58:01 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Aug 21 14:16:41 2014 +0800
----------------------------------------------------------------------
.../org/apache/camel/component/sjms/support/JmsTestSupport.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/42473e56/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
index b4cdf3c..7919e28 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
@@ -59,7 +59,8 @@ public class JmsTestSupport extends CamelTestSupport {
broker = new BrokerService();
final int port = AvailablePortFinder.getNextAvailable(33333);
brokerUri = "tcp://localhost:" + port;
- broker.getManagementContext().setConnectorPort(AvailablePortFinder.getNextAvailable(port + 1));
+ //Disable the JMX by default
+ broker.setUseJmx(false);
configureBroker(broker);
startBroker();
}
[3/3] git commit: Improved JMX handling on ActiveMQ broker for tests
Posted by ni...@apache.org.
Improved JMX handling on ActiveMQ broker for tests
Disabled jmx for tests that don't need to use it and also add
AvailablePortFinder to dinamically assing JMX connector port when
needed.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/410beed2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/410beed2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/410beed2
Branch: refs/heads/master
Commit: 410beed21f5a0bfadda3274ae8944b54d6a32ddf
Parents: 2cff2f1
Author: Cristiano Nicolai <cr...@gmail.com>
Authored: Thu Aug 21 02:06:18 2014 +1000
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Aug 21 14:16:41 2014 +0800
----------------------------------------------------------------------
.../apache/camel/component/sjms/SimpleJmsComponentTest.java | 2 +-
.../camel/component/sjms/consumer/AsyncConsumerFalseTest.java | 2 +-
.../camel/component/sjms/consumer/AsyncConsumerInOutTest.java | 2 +-
.../sjms/consumer/InOnlyTopicDurableConsumerTest.java | 2 +-
.../component/sjms/jms/ConnectionFactoryResourceTest.java | 2 +-
.../org/apache/camel/component/sjms/jms/SessionPoolTest.java | 2 +-
.../apache/camel/component/sjms/support/JmsTestSupport.java | 6 +++---
.../sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java | 2 +-
.../BatchTransactedConcurrentMultipleRouteConsumersTest.java | 2 +-
.../component/sjms/tx/BatchTransactedQueueConsumerTest.java | 2 +-
.../component/sjms/tx/BatchTransactedQueueProducerTest.java | 2 +-
.../sjms/tx/BatchTransactedTopicConsumerMultipleRouteTest.java | 2 +-
.../component/sjms/tx/BatchTransactedTopicConsumerTest.java | 2 +-
.../component/sjms/tx/BatchTransactedTopicProducerTest.java | 2 +-
.../component/sjms/tx/TransactedConcurrentConsumersTest.java | 2 +-
.../sjms/tx/TransactedConsumersMultipleRouteTest.java | 2 +-
.../camel/component/sjms/tx/TransactedQueueConsumerTest.java | 2 +-
.../camel/component/sjms/tx/TransactedQueueProducerTest.java | 2 +-
.../camel/component/sjms/tx/TransactedTopicConsumerTest.java | 2 +-
.../camel/component/sjms/tx/TransactedTopicProducerTest.java | 2 +-
20 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java
index 5ae1dab..bb519ec 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java
@@ -34,7 +34,7 @@ public class SimpleJmsComponentTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=true");
+ ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
SjmsComponent component = new SjmsComponent();
component.setConnectionFactory(connectionFactory);
getContext().addComponent("sjms", component);
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java
index 594522e..ce0642f 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java
@@ -46,7 +46,7 @@ public class AsyncConsumerFalseTest extends CamelTestSupport {
camelContext.addComponent("async", new MyAsyncComponent());
ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(
- "vm://broker?broker.persistent=false");
+ "vm://broker?broker.persistent=false&broker.useJmx=false");
SjmsComponent component = new SjmsComponent();
component.setConnectionFactory(connectionFactory);
camelContext.addComponent("sjms", component);
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
index 4cefd1e..940c8f2 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
@@ -50,7 +50,7 @@ public class AsyncConsumerInOutTest extends CamelTestSupport {
camelContext.addComponent("async", new MyAsyncComponent());
ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(
- "vm://broker?broker.persistent=false");
+ "vm://broker?broker.persistent=false&broker.useJmx=false");
SjmsComponent component = new SjmsComponent();
component.setConnectionFactory(connectionFactory);
camelContext.addComponent("sjms", component);
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
index 2420476..6c3a92f 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
public class InOnlyTopicDurableConsumerTest extends CamelTestSupport {
private static final String CONNECTION_ID = "test-connection-1";
- private static final String BROKER_URI = "vm://durable.broker?broker.persistent=false&broker.useJmx=true";
+ private static final String BROKER_URI = "vm://durable.broker?broker.persistent=false&broker.useJmx=false";
@Override
protected boolean useJmx() {
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java
index 79aa04d..fa295bb 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java
@@ -34,7 +34,7 @@ public class ConnectionFactoryResourceTest {
@Before
public void setup() {
- connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false");
+ connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
}
@After
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/SessionPoolTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/SessionPoolTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/SessionPoolTest.java
index 2e41eea..dead399 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/SessionPoolTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/SessionPoolTest.java
@@ -36,7 +36,7 @@ public class SessionPoolTest {
@Before
public void setup() {
- connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false");
+ connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
}
@After
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
index 7b3e1f7..b4cdf3c 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
@@ -56,10 +56,10 @@ public class JmsTestSupport extends CamelTestSupport {
@Override
protected void doPreSetup() throws Exception {
deleteDirectory("target/activemq-data");
-
- brokerUri = "tcp://localhost:" + AvailablePortFinder.getNextAvailable(33333);
-
broker = new BrokerService();
+ final int port = AvailablePortFinder.getNextAvailable(33333);
+ brokerUri = "tcp://localhost:" + port;
+ broker.getManagementContext().setConnectorPort(AvailablePortFinder.getNextAvailable(port + 1));
configureBroker(broker);
startBroker();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
index 440def5..ba62001 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
*/
public class BatchTransactedConcurrentMultipleConsumerTest extends TransactedConsumerSupport {
- private static final String BROKER_URI = "vm://btcmc_test_broker?broker.persistent=false&broker.useJmx=true";
+ private static final String BROKER_URI = "vm://btcmc_test_broker?broker.persistent=false&broker.useJmx=false";
/**
* We want to verify that when consuming from a single destination with
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
index 2c04ea7..b853ac2 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
*/
public class BatchTransactedConcurrentMultipleRouteConsumersTest extends TransactedConsumerSupport {
- private static final String BROKER_URI = "vm://btcmrc_test_broker?broker.persistent=false&broker.useJmx=true";
+ private static final String BROKER_URI = "vm://btcmrc_test_broker?broker.persistent=false&broker.useJmx=false";
/**
* We want to verify that when consuming from a single destination with
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueConsumerTest.java
index 8fbd662..d7c8f62 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueConsumerTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
*/
public class BatchTransactedQueueConsumerTest extends TransactedConsumerSupport {
- private static final String BROKER_URI = "vm://btqc_test_broker?broker.persistent=false&broker.useJmx=true";
+ private static final String BROKER_URI = "vm://btqc_test_broker?broker.persistent=false&broker.useJmx=false";
/**
* We want to verify that when consuming from a single destination with
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueProducerTest.java
index ea7209e..fe40725 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueProducerTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
* for a Queue Producer.
*/
public class BatchTransactedQueueProducerTest extends BatchTransactedProducerSupport {
- private static final String BROKER_URI = "vm://btqpt_test_broker?broker.persistent=false&broker.useJmx=true";
+ private static final String BROKER_URI = "vm://btqpt_test_broker?broker.persistent=false&broker.useJmx=false";
/**
* Verify that after processing a {@link BatchMessage} twice with 30
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerMultipleRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerMultipleRouteTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerMultipleRouteTest.java
index 1e9cc5b..21aaa6e 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerMultipleRouteTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerMultipleRouteTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
*/
public class BatchTransactedTopicConsumerMultipleRouteTest extends TransactedConsumerSupport {
- private static final String BROKER_URI = "vm://bttcmr_test_broker?broker.persistent=false&broker.useJmx=true";
+ private static final String BROKER_URI = "vm://bttcmr_test_broker?broker.persistent=false&broker.useJmx=false";
/**
* We want to verify that when consuming from a single destination with
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java
index 24ac52e..062decb 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
*/
public class BatchTransactedTopicConsumerTest extends TransactedConsumerSupport {
- private static final String BROKER_URI = "vm://bttc_test_broker?broker.persistent=false&broker.useJmx=true";
+ private static final String BROKER_URI = "vm://bttc_test_broker?broker.persistent=false&broker.useJmx=false";
/**
* We want to verify that when consuming from a single destination with
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicProducerTest.java
index 31b26e7..c494973 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicProducerTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
* for a Topic Producer.
*/
public class BatchTransactedTopicProducerTest extends BatchTransactedProducerSupport {
- private static final String BROKER_URI = "vm://bttpt_test_broker?broker.persistent=false&broker.useJmx=true";
+ private static final String BROKER_URI = "vm://bttpt_test_broker?broker.persistent=false&broker.useJmx=false";
/**
* Verify that after processing a {@link BatchMessage} twice with 30
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
index e97769b..35ebf96 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
*/
public class TransactedConcurrentConsumersTest extends TransactedConsumerSupport {
- private static final String BROKER_URI = "vm://btqc_test_broker?broker.persistent=false&broker.useJmx=true";
+ private static final String BROKER_URI = "vm://btqc_test_broker?broker.persistent=false&broker.useJmx=false";
/**
* We want to verify that when consuming from a single destination with
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java
index 34c004c..f2b491a 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
*/
public class TransactedConsumersMultipleRouteTest extends TransactedConsumerSupport {
- private static final String BROKER_URI = "vm://btqc_test_broker?broker.persistent=false&broker.useJmx=true";
+ private static final String BROKER_URI = "vm://btqc_test_broker?broker.persistent=false&broker.useJmx=false";
/**
* We want to verify that when consuming from a single destination with
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
index 8f3f51a..0080df9 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
public class TransactedQueueConsumerTest extends TransactedConsumerSupport {
- private static final String BROKER_URI = "vm://tqc_test_broker?broker.persistent=false&broker.useJmx=true";
+ private static final String BROKER_URI = "vm://tqc_test_broker?broker.persistent=false&broker.useJmx=false";
/**
* We want to verify that when consuming from a single destination with
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
index 5cdf3e4..6fae5e0 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
@@ -61,7 +61,7 @@ public class TransactedQueueProducerTest extends CamelTestSupport {
*/
@Override
protected CamelContext createCamelContext() throws Exception {
- ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=true");
+ ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
CamelContext camelContext = super.createCamelContext();
SjmsComponent component = new SjmsComponent();
component.setConnectionFactory(connectionFactory);
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
index 99cc3d4..c2104e6 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
public class TransactedTopicConsumerTest extends TransactedConsumerSupport {
- private static final String BROKER_URI = "vm://ttc_test_broker?broker.persistent=false&broker.useJmx=true";
+ private static final String BROKER_URI = "vm://ttc_test_broker?broker.persistent=false&broker.useJmx=false";
/**
* We want to verify that when consuming from a single destination with
http://git-wip-us.apache.org/repos/asf/camel/blob/410beed2/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
index ddc0f63..5d90ce7 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
@@ -62,7 +62,7 @@ public class TransactedTopicProducerTest extends CamelTestSupport {
*/
@Override
protected CamelContext createCamelContext() throws Exception {
- ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=true");
+ ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
ConnectionFactoryResource connectionResource = new ConnectionFactoryResource();
connectionResource.setConnectionFactory(connectionFactory);
connectionResource.setClientId("test-connection-1");