This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new b06152b5f36 CAMEL-18921: Use Artemis and JmsComponent (#9103)
b06152b5f36 is described below
commit b06152b5f360990010898f82e70dce8e4c853cb5
Author: Federico Mariani <[email protected]>
AuthorDate: Sat Jan 14 18:31:08 2023 +0100
CAMEL-18921: Use Artemis and JmsComponent (#9103)
---
camel-dependencies/pom.xml | 2 +-
parent/pom.xml | 2 +-
tests/camel-itest/pom.xml | 27 ++++++++++++-
.../org/apache/camel/itest/CamelJmsTestHelper.java | 23 +++++++++--
.../itest/jms/AdviceWithTransactionIssueTest.java | 4 +-
.../jms/JMSNestedTransactionRollbackTest.java | 2 +-
.../JMSTransactionIsTransactedRedeliveredTest.java | 2 +-
.../camel/itest/jms/JmsConsumerShutdownTest.java | 6 +--
.../camel/itest/jms/JmsPollingConsumerTest.java | 6 +--
.../FromJmsToJdbcIdempotentConsumerToJmsTest.java | 9 ++++-
...FromJmsToJdbcIdempotentConsumerToJmsXaTest.java | 5 +++
.../apache/camel/itest/tx/Jms2RequiresNewTest.java | 7 +++-
.../utils/extensions/JmsServiceExtension.java | 44 +++++++++++++++++++++-
.../greeter/CamelGreeterConsumerTest-context.xml | 7 ++--
.../itest/greeter/CamelGreeterTest-context.xml | 8 +++-
.../itest/greeter/CxfToJmsInOutTest-context.xml | 7 ++--
.../itest/greeter/JmsToCxfInOutTest-context.xml | 7 ++--
.../JettyJmsShutdownInProgressTest-context.xml | 5 +--
.../itest/jetty/JettyJmsShutdownTest-context.xml | 5 +--
.../camel/itest/jetty/JettyJmsTest-context.xml | 4 +-
.../itest/jetty/JettyJmsTwowayTest-context.xml | 4 +-
.../jetty/JettyMulticastJmsFileTest-context.xml | 4 +-
.../itest/jms/AdviceWithTransactionIssueTest.xml | 10 ++---
.../camel/itest/jms/FileToJmsTest-context.xml | 12 +++---
.../itest/jms/JMSNestedTransactionTest-context.xml | 14 +++----
.../JMSTransactionIsTransactedRedeliveredTest.xml | 10 ++---
.../itest/jms/JmsConsumerShutdownTest-context.xml | 6 +--
.../itest/jms/JmsPollingConsumerTest-context.xml | 10 ++---
.../camel/itest/jms/SpringJmsValidatorTest.xml | 8 +++-
.../FromJmsToJdbcIdempotentConsumerToJmsTest.xml | 17 +++------
.../FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml | 17 +++------
.../camel/itest/tx/Jms2RequiresNewTest-context.xml | 17 +++------
.../camel/itest/tx/JmsToHttpTXTest-context.xml | 8 ++--
...ansactionErrorHandlerConfiguredTest-context.xml | 8 ++--
.../tx/JmsToHttpTXWithOnExceptionTest-context.xml | 8 ++--
.../tx/JmsToHttpTXWithRollbackTest-context.xml | 8 ++--
.../spring-config/jms-applicationContext.xml | 5 +--
37 files changed, 211 insertions(+), 137 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 9612c38f624..e8e016b8201 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -286,7 +286,7 @@
<jboss-el-api_3.0_spec-version>2.0.0.Final</jboss-el-api_3.0_spec-version>
<jboss-logging-version>3.4.3.Final</jboss-logging-version>
<jboss-marshalling-version>1.4.10.Final</jboss-marshalling-version>
-
<jboss-transaction-spi.version>7.5.1.Final</jboss-transaction-spi.version>
+
<jboss-transaction-spi.version>7.6.1.Final</jboss-transaction-spi.version>
<jboss-xnio-version>3.3.8.Final</jboss-xnio-version>
<jcache-bundle-version>1.1.1_1</jcache-bundle-version>
<jcommander-version>1.72</jcommander-version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 8d4976acb1f..3fb79a10588 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -281,7 +281,7 @@
<jboss-el-api_3.0_spec-version>2.0.0.Final</jboss-el-api_3.0_spec-version>
<jboss-logging-version>3.4.3.Final</jboss-logging-version>
<jboss-marshalling-version>1.4.10.Final</jboss-marshalling-version>
-
<jboss-transaction-spi.version>7.5.1.Final</jboss-transaction-spi.version>
+
<jboss-transaction-spi.version>7.6.1.Final</jboss-transaction-spi.version>
<jboss-xnio-version>3.3.8.Final</jboss-xnio-version>
<jcache-bundle-version>1.1.1_1</jcache-bundle-version>
<jcommander-version>1.72</jcommander-version>
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 41cb90b7af4..498b4b10eb6 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -248,6 +248,23 @@
<artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-jakarta-server</artifactId>
+ <version>${activemq-artemis-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-jakarta-client</artifactId>
+ <version>${activemq-artemis-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.messaginghub</groupId>
+ <artifactId>pooled-jms</artifactId>
+ <version>${pooled-jms-version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
@@ -321,6 +338,12 @@
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>jdbc</artifactId>
<version>${narayana-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.narayana.jta</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.narayana.jta</groupId>
@@ -329,12 +352,12 @@
</dependency>
<dependency>
<groupId>org.jboss.narayana.jta</groupId>
- <artifactId>jta</artifactId>
+ <artifactId>narayana-jta-jakarta</artifactId>
<version>${narayana-version}</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
- <artifactId>jboss-transaction-spi</artifactId>
+ <artifactId>jboss-transaction-spi-jakarta</artifactId>
<version>${jboss-transaction-spi.version}</version>
</dependency>
<dependency>
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 41253f7a2a1..1b8d19cc14f 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
@@ -20,6 +20,9 @@ import java.util.concurrent.atomic.AtomicInteger;
import jakarta.jms.ConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.messaginghub.pooled.jms.JmsPoolConnectionFactory;
+
/**
* A helper for unit testing with Apache ActiveMQ as embedded JMS broker.
*/
@@ -30,12 +33,24 @@ public final class CamelJmsTestHelper {
private CamelJmsTestHelper() {
}
- public static ConnectionFactory createConnectionFactory() {
- return createConnectionFactory(null);
+ public static ConnectionFactory createConnectionFactory(String brokerUrl) {
+ return createConnectionFactory(brokerUrl, null);
}
- public static ConnectionFactory createConnectionFactory(String options) {
- throw new UnsupportedOperationException();
+ public static ConnectionFactory createConnectionFactory(String brokerUrl,
String options) {
+ // using a unique broker name improves testing when running the entire
test suite in the same JVM
+ int id = counter.incrementAndGet();
+ String url = brokerUrl +
"?broker.persistent=false&broker.useJmx=false";
+ if (options != null) {
+ url = url + "&" + options;
+ }
+ ActiveMQConnectionFactory connectionFactory = new
ActiveMQConnectionFactory(url);
+
+ // use a pooled connection factory
+ JmsPoolConnectionFactory pooled = new JmsPoolConnectionFactory();
+ pooled.setConnectionFactory(connectionFactory);
+ pooled.setMaxConnections(8);
+ return pooled;
}
@Deprecated
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.java
index 4d6fa5d20bd..82dfb2dc4ef 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.java
@@ -54,7 +54,7 @@ public class AdviceWithTransactionIssueTest extends
CamelSpringTestSupport {
mockLast.expectedBodiesReceived("bar");
mockLast.setExpectedMessageCount(1);
- template.sendBody("activemq:queue:start", "bar");
+ template.sendBody("jms:queue:start", "bar");
MockEndpoint.assertIsSatisfied(context);
}
@@ -73,7 +73,7 @@ public class AdviceWithTransactionIssueTest extends
CamelSpringTestSupport {
mockLast.expectedBodiesReceived("bar");
mockLast.setExpectedMessageCount(1);
- template.sendBody("activemq:queue:start", "bar");
+ template.sendBody("jms:queue:start", "bar");
MockEndpoint.assertIsSatisfied(context);
}
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSNestedTransactionRollbackTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSNestedTransactionRollbackTest.java
index 94f5ae5f72f..352727a4fb4 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSNestedTransactionRollbackTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSNestedTransactionRollbackTest.java
@@ -49,7 +49,7 @@ public class JMSNestedTransactionRollbackTest extends
CamelSpringTestSupport {
mock.expectedMessageCount(0);
mock.setAssertPeriod(100);
- template.sendBody("activemq:queue:okay", "test");
+ template.sendBody("jms:queue:okay", "test");
error.assertIsSatisfied();
mock.assertIsSatisfied();
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java
index 610340a7ffd..7efd7f563e3 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java
@@ -80,7 +80,7 @@ public class JMSTransactionIsTransactedRedeliveredTest
extends CamelSpringTestSu
MockEndpoint jetty = getMockEndpoint("mock:jetty");
jetty.expectedMessageCount(1);
- template.sendBody("activemq:queue:okay", "Hello World");
+ template.sendBody("jms:queue:okay", "Hello World");
mock.assertIsSatisfied();
jetty.assertIsSatisfied();
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java
index 93bd17dbadf..18258486f42 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java
@@ -36,7 +36,7 @@ public class JmsConsumerShutdownTest {
@RegisterExtension
public static JmsServiceExtension jmsServiceExtension =
JmsServiceExtension.createExtension();
- @Produce("activemq:start")
+ @Produce("jms:start")
protected ProducerTemplate activemq;
@Produce("seda:start")
@@ -62,7 +62,7 @@ public class JmsConsumerShutdownTest {
}
});
- activemq.sendBody("activemq:start", "Hello");
+ activemq.sendBody("jms:start", "Hello");
end.assertIsSatisfied();
}
@@ -90,7 +90,7 @@ public class JmsConsumerShutdownTest {
public static class MyRouteBuilder extends RouteBuilder {
@Override
public void configure() {
- from("activemq:start")
+ from("jms:start")
.to("direct:dir")
.to("mock:end");
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollingConsumerTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollingConsumerTest.java
index 910eec16330..120c7dfff83 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollingConsumerTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollingConsumerTest.java
@@ -38,13 +38,13 @@ public class JmsPollingConsumerTest {
@RegisterExtension
public static JmsServiceExtension jmsServiceExtension =
JmsServiceExtension.createExtension();
- @Produce("activemq:JmsPollingConsumerTestStartConsumer")
+ @Produce("jms:JmsPollingConsumerTestStartConsumer")
protected ProducerTemplate startConsumer;
@Produce("direct:JmsPollingConsumerTestStartConsumer")
protected ProducerTemplate startDirectConsumer;
- @Produce("activemq:JmsPollingConsumerTestQueue")
+ @Produce("jms:JmsPollingConsumerTestQueue")
protected ProducerTemplate queue;
@EndpointInject("mock:JmsPollingConsumerTestResult")
@@ -95,7 +95,7 @@ public class JmsPollingConsumerTest {
StringBuilder result = new StringBuilder();
Exchange exchange;
- while ((exchange =
consumer.receive("activemq:JmsPollingConsumerTestQueue", 2000)) != null) {
+ while ((exchange =
consumer.receive("jms:JmsPollingConsumerTestQueue", 2000)) != null) {
result.append(exchange.getIn().getBody(String.class));
}
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
index d753f31be89..9ffa799cd78 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
@@ -27,10 +27,12 @@ import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.ITestSupport;
+import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractApplicationContext;
@@ -46,6 +48,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class FromJmsToJdbcIdempotentConsumerToJmsTest extends
CamelSpringTestSupport {
+ @RegisterExtension
+ public static JmsServiceExtension jmsServiceExtension =
JmsServiceExtension.createExtension();
+
// this logger is used both by this class as well as
FromJmsToJdbcIdempotentConsumerToJmsXaTest, so why not static
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -121,7 +126,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
assertNull(consumer.receiveBody("activemq2:queue:outbox", 3000));
// the message should have been moved to the AMQ DLQ queue
- assertEquals("A", consumer.receiveBody("activemq2:queue:ActiveMQ.DLQ",
3000));
+ assertEquals("A", consumer.receiveBody("activemq2:queue:DLQ", 3000));
}
@Test
@@ -147,7 +152,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
assertNull(consumer.receiveBody("activemq2:queue:outbox", 3000));
// the message should have been moved to the AMQ DLQ queue
- assertEquals("B", consumer.receiveBody("activemq2:queue:ActiveMQ.DLQ",
3000));
+ assertEquals("B", consumer.receiveBody("activemq2:queue:DLQ", 3000));
}
@Test
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java
index c2d29030afb..ee6785ca79d 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java
@@ -20,8 +20,10 @@ import java.sql.DriverManager;
import java.sql.SQLException;
import org.apache.camel.itest.ITestSupport;
+import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -34,6 +36,9 @@ import static org.junit.jupiter.api.Assertions.fail;
*/
public class FromJmsToJdbcIdempotentConsumerToJmsXaTest extends
FromJmsToJdbcIdempotentConsumerToJmsTest {
+ @RegisterExtension
+ public static JmsServiceExtension jmsServiceExtension =
JmsServiceExtension.createExtension();
+
@Override
@BeforeEach
public void setUp() throws Exception {
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/Jms2RequiresNewTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/Jms2RequiresNewTest.java
index 3581f997b8c..5b5d2cc5acd 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/Jms2RequiresNewTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/Jms2RequiresNewTest.java
@@ -23,9 +23,11 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.ITestSupport;
+import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
import org.apache.camel.test.spring.junit5.CamelSpringTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
@@ -39,6 +41,9 @@ import org.springframework.test.context.ContextConfiguration;
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
public class Jms2RequiresNewTest {
+ @RegisterExtension
+ public static JmsServiceExtension jmsServiceExtension =
JmsServiceExtension.createExtension();
+
private static final int PORT3 = ITestSupport.getPort3();
@Autowired
@@ -67,7 +72,7 @@ public class Jms2RequiresNewTest {
from("direct:start").transacted("PROPAGATION_REQUIRES_NEW").to("activemq:queue:start");
from("activemq:queue:result1").transacted("PROPAGATION_REQUIRES_NEW").to("mock:result1");
from("activemq:queue:result2").transacted("PROPAGATION_REQUIRES_NEW").to("mock:result2");
-
from("activemq:queue:ActiveMQ.DLQ").transacted("PROPAGATION_REQUIRES_NEW").to("mock:dlq");
+
from("activemq:queue:DLQ").transacted("PROPAGATION_REQUIRES_NEW").to("mock:dlq");
from("activemq:queue:start")
.transacted("PROPAGATION_REQUIRES_NEW")
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/JmsServiceExtension.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/JmsServiceExtension.java
index 9e34a4c6901..7a02c12672d 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/JmsServiceExtension.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/JmsServiceExtension.java
@@ -16,9 +16,17 @@
*/
package org.apache.camel.itest.utils.extensions;
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.itest.CamelJmsTestHelper;
import org.junit.jupiter.api.extension.AfterAllCallback;
@@ -31,15 +39,48 @@ import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknow
import static org.junit.jupiter.api.Assertions.fail;
public final class JmsServiceExtension implements BeforeAllCallback,
AfterAllCallback {
+
private static final Logger LOG =
LoggerFactory.getLogger(JmsServiceExtension.class);
private static JmsServiceExtension instance;
private JmsComponent amq;
+ private EmbeddedActiveMQ embeddedBrokerService;
+
+ private Configuration artemisConfiguration;
+ private String brokerURL;
+
private JmsServiceExtension() throws JMSException {
+ embeddedBrokerService = new EmbeddedActiveMQ();
+
+ artemisConfiguration = new ConfigurationImpl();
+ artemisConfiguration.setSecurityEnabled(false);
+ artemisConfiguration.setBrokerInstance(new File("target",
"artemis-itest-jms"));
+ artemisConfiguration.setJMXManagementEnabled(false);
+ artemisConfiguration.setPersistenceEnabled(false);
+ brokerURL = "vm://itest-jms";
+ try {
+ artemisConfiguration.addAcceptorConfiguration("in-vm", brokerURL);
+ } catch (Exception e) {
+ LOG.warn(e.getMessage(), e);
+ fail("vm acceptor cannot be configured");
+ }
+ artemisConfiguration.addAddressSetting("#",
+ new AddressSettings()
+
.setDeadLetterAddress(SimpleString.toSimpleString("DLQ"))
+
.setExpiryAddress(SimpleString.toSimpleString("ExpiryQueue")));
+
+ embeddedBrokerService.setConfiguration(artemisConfiguration);
+
+ try {
+ embeddedBrokerService.start();
+ embeddedBrokerService.getActiveMQServer().waitForActivation(10,
TimeUnit.SECONDS);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
LOG.info("Creating a new reusable AMQ component");
- ConnectionFactory connectionFactory =
CamelJmsTestHelper.createConnectionFactory();
+ ConnectionFactory connectionFactory =
CamelJmsTestHelper.createConnectionFactory(brokerURL);
amq = jmsComponentAutoAcknowledge(connectionFactory);
@@ -48,7 +89,6 @@ public final class JmsServiceExtension implements
BeforeAllCallback, AfterAllCal
@Override
public void afterAll(ExtensionContext extensionContext) throws Exception {
-
}
@Override
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 32290ea4faf..d667e220b66 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
@@ -42,11 +42,10 @@
<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.camel.component.activemq.ActiveMQComponent">
+ <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
<property name="connectionFactory">
- <bean class="org.apache.activemq.spring.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
- <property name="trustAllPackages" value="true"/>
+ <bean
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="vm://itest-jms"/>
</bean>
</property>
</bean>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
index 74e9ed02799..f1c694aaf63 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
@@ -41,8 +41,12 @@
<bean id="prepareRequest"
class="org.apache.camel.itest.greeter.PrepareRequest"/>
<bean id="prepareResponse"
class="org.apache.camel.itest.greeter.PrepareResponse"/>
- <bean id="jms"
class="org.apache.camel.component.activemq.ActiveMQComponent">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
+ <bean id="jmsConnectionFactory"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="vm://itest-jms"/>
+ </bean>
+
+ <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
+ <property name="connectionFactory" ref="jmsConnectionFactory"/>
</bean>
<!-- START SNIPPET: example -->
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 0571de66d65..cb9f1c53d4f 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
@@ -41,11 +41,10 @@
<bean id="prepareRequest"
class="org.apache.camel.itest.greeter.PrepareRequest"/>
<bean id="prepareResponse"
class="org.apache.camel.itest.greeter.PrepareResponse"/>
- <bean id="jms"
class="org.apache.camel.component.activemq.ActiveMQComponent">
+ <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
<property name="connectionFactory">
- <bean class="org.apache.activemq.spring.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
- <property name="trustAllPackages" value="true"/>
+ <bean
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="vm://itest-jms"/>
</bean>
</property>
</bean>
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 14026a7a5a6..e6c4f90aabd 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
@@ -49,11 +49,10 @@
</cxf:cxfEndpoint>
- <bean id="jms"
class="org.apache.camel.component.activemq.ActiveMQComponent">
+ <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
<property name="connectionFactory">
- <bean class="org.apache.activemq.spring.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
- <property name="trustAllPackages" value="true"/>
+ <bean
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="vm://itest-jms"/>
</bean>
</property>
</bean>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml
index 5f915a4672a..15a0afea62a 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml
@@ -24,9 +24,8 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
<bean id="properties"
class="org.apache.camel.component.properties.PropertiesComponent"/>
- <bean id="jms"
class="org.apache.camel.component.activemq.ActiveMQComponent">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
- <property name="acceptMessagesWhileStopping" value="true"/>
+ <bean id="jms"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<camelContext xmlns="http://camel.apache.org/schema/spring";>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownTest-context.xml
index a1aab3f5a60..c87cdb8ef15 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownTest-context.xml
@@ -26,9 +26,8 @@
<bean id="properties"
class="org.apache.camel.component.properties.PropertiesComponent"/>
- <bean id="jms"
class="org.apache.camel.component.activemq.ActiveMQComponent">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
- <property name="acceptMessagesWhileStopping" value="true"/>
+ <bean id="jms"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<camelContext xmlns="http://camel.apache.org/schema/spring";>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
index fcc43699424..ef24c91d71a 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
@@ -25,8 +25,8 @@
">
<bean id="properties"
class="org.apache.camel.component.properties.PropertiesComponent"/>
- <bean id="jms"
class="org.apache.camel.component.activemq.ActiveMQComponent">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
+ <bean id="jms"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<bean id="setExchangePatternProcessor"
class="org.apache.camel.itest.jetty.SetExchangePatternProcessor"/>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml
index 0e90f9fd73a..b709371778e 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml
@@ -27,8 +27,8 @@
<bean id="properties"
class="org.apache.camel.component.properties.PropertiesComponent"/>
- <bean id="jms"
class="org.apache.camel.component.activemq.ActiveMQComponent">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
+ <bean id="jms"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<bean id="setResponseProcessor"
class="org.apache.camel.itest.jetty.SetResponseProcessor"/>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest-context.xml
index 6d50b4ad8e0..6399ac5225e 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest-context.xml
@@ -26,8 +26,8 @@
">
<bean id="properties"
class="org.apache.camel.component.properties.PropertiesComponent"/>
- <bean id="jms"
class="org.apache.camel.component.activemq.ActiveMQComponent">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
+ <bean id="jms"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<camelContext xmlns="http://camel.apache.org/schema/spring"; trace="true">
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.xml
index 143febb7ced..155851a9800 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.xml
@@ -23,20 +23,20 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <bean id="poolConnectionFactory"
class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start"
destroy-method="stop">
+ <bean id="poolConnectionFactory"
class="org.messaginghub.pooled.jms.JmsPoolConnectionFactory"
init-method="start" destroy-method="stop">
<property name="maxConnections" value="8"/>
<property name="connectionFactory" ref="jmsConnectionFactory"/>
</bean>
- <bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
+ <bean id="jmsConnectionFactory"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<bean id="jmsTransactionManager"
class="org.springframework.jms.connection.JmsTransactionManager">
<property name="connectionFactory" ref="poolConnectionFactory"/>
</bean>
- <bean id="activemq"
class="org.apache.camel.component.activemq.ActiveMQComponent">
+ <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
<property name="connectionFactory" ref="poolConnectionFactory"/>
<property name="transacted" value="true"/>
<property name="transactionManager" ref="jmsTransactionManager"/>
@@ -48,7 +48,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route id="route1">
- <from uri="activemq:queue:start"/>
+ <from uri="jms:queue:start"/>
<transacted/>
<to id="mock-a" uri="mock:a"/>
<to id="mock-b" uri="mock:b"/>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml
index b43d79d600a..55da05f873f 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml
@@ -23,13 +23,13 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
<!-- camel stuff below to send and listen to broker with a spring JMS
transaction manager -->
- <bean id="poolConnectionFactory"
class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start"
destroy-method="stop">
+ <bean id="poolConnectionFactory"
class="org.messaginghub.pooled.jms.JmsPoolConnectionFactory"
init-method="start" destroy-method="stop">
<property name="maxConnections" value="8"/>
<property name="connectionFactory" ref="jmsConnectionFactory"/>
</bean>
- <bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
+ <bean id="jmsConnectionFactory"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<bean id="jmsTransactionManager"
class="org.springframework.jms.connection.JmsTransactionManager">
@@ -43,7 +43,7 @@
<property name="concurrentConsumers" value="1"/>
</bean>
- <bean id="activemq"
class="org.apache.camel.component.activemq.ActiveMQComponent">
+ <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
<property name="connectionFactory" ref="poolConnectionFactory"/>
</bean>
@@ -53,11 +53,11 @@
<route>
<from
uri="file://target/jmsfile?initialDelay=1000&delay=5000"/>
- <to uri="activemq:queue:foo"/>
+ <to uri="jms:queue:foo"/>
</route>
<route>
- <from uri="activemq:queue:foo"/>
+ <from uri="jms:queue:foo"/>
<to uri="mock:result"/>
</route>
</camelContext>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSNestedTransactionTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSNestedTransactionTest-context.xml
index 5b87ce0599f..df612d22157 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSNestedTransactionTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSNestedTransactionTest-context.xml
@@ -25,13 +25,13 @@
<bean id="properties"
class="org.apache.camel.component.properties.PropertiesComponent"/>
- <bean id="poolConnectionFactory"
class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start"
destroy-method="stop">
+ <bean id="poolConnectionFactory"
class="org.messaginghub.pooled.jms.JmsPoolConnectionFactory"
init-method="start" destroy-method="stop">
<property name="maxConnections" value="8"/>
<property name="connectionFactory" ref="jmsConnectionFactory"/>
</bean>
- <bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
+ <bean id="jmsConnectionFactory"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<bean id="jmsTransactionManager"
class="org.springframework.jms.connection.JmsTransactionManager">
@@ -44,7 +44,7 @@
<property name="propagationBehaviorName" value="PROPAGATION_REQUIRES_NEW"/>
</bean>
- <bean id="activemq"
class="org.apache.camel.component.activemq.ActiveMQComponent">
+ <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
<property name="connectionFactory" ref="poolConnectionFactory"/>
<property name="transacted" value="true"/>
<property name="transactionManager" ref="jmsTransactionManager"/>
@@ -64,14 +64,14 @@
</route>
<route errorHandlerRef="txEH">
- <from uri="activemq:queue:okay"/>
+ <from uri="jms:queue:okay"/>
<transacted ref="transactionPolicy"/>
- <to uri="activemq:queue:not-okay"/>
+ <to uri="jms:queue:not-okay"/>
<process ref="errorProducer"/>
</route>
<route errorHandlerRef="txEH">
- <from uri="activemq:queue:not-okay"/>
+ <from uri="jms:queue:not-okay"/>
<to uri="mock:not-okay"/>
</route>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.xml
index d69878c2cd2..0776a850094 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.xml
@@ -25,20 +25,20 @@
<bean id="properties"
class="org.apache.camel.component.properties.PropertiesComponent"/>
- <bean id="poolConnectionFactory"
class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start"
destroy-method="stop">
+ <bean id="poolConnectionFactory"
class="org.messaginghub.pooled.jms.JmsPoolConnectionFactory"
init-method="start" destroy-method="stop">
<property name="maxConnections" value="8"/>
<property name="connectionFactory" ref="jmsConnectionFactory"/>
</bean>
- <bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
+ <bean id="jmsConnectionFactory"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<bean id="jmsTransactionManager"
class="org.springframework.jms.connection.JmsTransactionManager">
<property name="connectionFactory" ref="poolConnectionFactory"/>
</bean>
- <bean id="activemq"
class="org.apache.camel.component.activemq.ActiveMQComponent">
+ <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
<property name="connectionFactory" ref="poolConnectionFactory"/>
<property name="transacted" value="true"/>
<property name="transactionManager" ref="jmsTransactionManager"/>
@@ -55,7 +55,7 @@
</errorHandler>
<route errorHandlerRef="txEH">
- <from uri="activemq:queue:okay"/>
+ <from uri="jms:queue:okay"/>
<transacted/>
<to uri="mock:before"/>
<process ref="myBeforeProcessor"/>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsConsumerShutdownTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsConsumerShutdownTest-context.xml
index fc471c7944d..9678e053497 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsConsumerShutdownTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsConsumerShutdownTest-context.xml
@@ -24,8 +24,8 @@
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
+ <bean id="jmsConnectionFactory"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<bean id="jmsConfig"
class="org.apache.camel.component.jms.JmsConfiguration">
@@ -34,7 +34,7 @@
<property name="concurrentConsumers" value="1"/>
</bean>
- <bean id="activemq"
class="org.apache.camel.component.activemq.ActiveMQComponent">
+ <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
<property name="configuration" ref="jmsConfig"/>
</bean>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsPollingConsumerTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsPollingConsumerTest-context.xml
index a67c8191d7b..b0772d6ae89 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsPollingConsumerTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsPollingConsumerTest-context.xml
@@ -23,13 +23,13 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
<!-- camel stuff below to send and listen to broker with a spring JMS
transaction manager -->
- <bean id="poolConnectionFactory"
class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start"
destroy-method="stop">
+ <bean id="poolConnectionFactory"
class="org.messaginghub.pooled.jms.JmsPoolConnectionFactory"
init-method="start" destroy-method="stop">
<property name="maxConnections" value="8"/>
<property name="connectionFactory" ref="jmsConnectionFactory"/>
</bean>
- <bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
+ <bean id="jmsConnectionFactory"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<bean id="jmsTransactionManager"
class="org.springframework.jms.connection.JmsTransactionManager">
@@ -43,7 +43,7 @@
<property name="concurrentConsumers" value="1"/>
</bean>
- <bean id="activemq"
class="org.apache.camel.component.activemq.ActiveMQComponent">
+ <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
<property name="configuration" ref="jmsConfig"/>
</bean>
@@ -61,7 +61,7 @@
<consumerTemplate id="consumerTemplate"/>
<route>
- <from uri="activemq:JmsPollingConsumerTestStartConsumer"/>
+ <from uri="jms:JmsPollingConsumerTestStartConsumer"/>
<delay>
<constant>1000</constant>
</delay>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/SpringJmsValidatorTest.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/SpringJmsValidatorTest.xml
index 28a7ff18796..ea4baa34f58 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/SpringJmsValidatorTest.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/SpringJmsValidatorTest.xml
@@ -23,8 +23,12 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <bean id="jms"
class="org.apache.camel.component.activemq.ActiveMQComponent">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false"/>
+ <bean id="jmsConnectionFactory"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
+ </bean>
+
+ <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
+ <property name="connectionFactory" ref="jmsConnectionFactory"/>
</bean>
<camelContext xmlns="http://camel.apache.org/schema/spring";>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.xml
index 47b55b3027e..63901ec9c6b 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.xml
@@ -43,31 +43,24 @@
<!-- this is the Spring JmsTransactionManager which under the hood uses
Atomikos -->
<bean id="jmsTransactionManager2"
- class="org.springframework.jms.connection.JmsTransactionManager"
depends-on="my-broker2">
+ class="org.springframework.jms.connection.JmsTransactionManager">
<property name="connectionFactory" ref="jmsConnectionFactory2"/>
</bean>
<!-- Is the ConnectionFactory to connect to the JMS broker -->
- <bean id="jmsConnectionFactory2"
class="org.apache.activemq.ActiveMQConnectionFactory" depends-on="my-broker2">
- <property name="brokerURL"
value="tcp://localhost:${ITestSupport.port3}"/>
+ <bean id="jmsConnectionFactory2"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<!-- define the activemq Camel component so we can integrate with the AMQ
broker below -->
- <bean id="activemq2"
class="org.apache.camel.component.activemq.ActiveMQComponent"
depends-on="my-broker2">
- <property name="brokerURL"
value="tcp://localhost:${ITestSupport.port3}"/>
+ <bean id="activemq2" class="org.apache.camel.component.jms.JmsComponent">
+ <property name="connectionFactory" ref="jmsConnectionFactory2"/>
<!-- must indicate that we use transacted acknowledge mode -->
<property name="transacted" value="true"/>
<!-- refer to the transaction manager -->
<property name="transactionManager" ref="jmsTransactionManager2"/>
</bean>
- <!-- setup a local JMS Broker for testing purpose -->
- <broker:broker id="my-broker2" useJmx="false" persistent="false"
brokerName="localhost">
- <broker:transportConnectors>
- <broker:transportConnector
uri="tcp://localhost:${ITestSupport.port3}"/>
- </broker:transportConnectors>
- </broker:broker>
-
<!-- datasource used to create the database tables -->
<jdbc:embedded-database id="myNonXADataSource" type="DERBY"/>
</beans>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml
index af9e0a7fc14..45b915e913c 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml
@@ -45,33 +45,26 @@
<bean id="narayanaUserTransaction"
class="com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple"
/>
<!-- this is the Spring JtaTransactionManager which under the hood uses
Narayana -->
- <bean id="jtaTransactionManager"
class="org.springframework.transaction.jta.JtaTransactionManager"
depends-on="my-broker">
+ <bean id="jtaTransactionManager"
class="org.springframework.transaction.jta.JtaTransactionManager">
<property name="transactionManager" ref="narayanaTransactionManager"/>
<property name="userTransaction" ref="narayanaUserTransaction"/>
</bean>
<!-- Is the ConnectionFactory to connect to the JMS broker -->
<!-- notice how we must use the XA connection factory -->
- <bean id="jmsXaConnectionFactory"
class="org.apache.activemq.ActiveMQXAConnectionFactory" depends-on="my-broker">
- <property name="brokerURL"
value="tcp://localhost:${ITestSupport.port3}"/>
+ <bean id="jmsXaConnectionFactory"
class="org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory">
+ <property name="brokerURL" value="vm://itest-jms"/>
</bean>
<!-- define the activemq Camel component so we can integrate with the AMQ
broker below -->
- <bean id="activemq2"
class="org.apache.camel.component.activemq.ActiveMQComponent"
depends-on="my-broker">
- <property name="brokerURL"
value="tcp://localhost:${ITestSupport.port3}"/>
+ <bean id="activemq2" class="org.apache.camel.component.jms.JmsComponent">
+ <property name="connectionFactory" ref="jmsXaConnectionFactory"/>
<!-- must indicate that we use transacted acknowledge mode -->
<property name="transacted" value="true"/>
<!-- refer to the transaction manager -->
<property name="transactionManager" ref="jtaTransactionManager"/>
</bean>
- <!-- setup a local JMS Broker for testing purpose -->
- <broker:broker id="my-broker" useJmx="false" persistent="false"
brokerName="localhost">
- <broker:transportConnectors>
- <broker:transportConnector
uri="tcp://localhost:${ITestSupport.port3}"/>
- </broker:transportConnectors>
- </broker:broker>
-
<!-- XA datasource used to create the database tables -->
<bean id="myXADataSource"
class="org.apache.derby.jdbc.EmbeddedXADataSource">
<property name="databaseName" value="target/testdb;create=true"/>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/Jms2RequiresNewTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/Jms2RequiresNewTest-context.xml
index dac32e5fc71..aa867edf60b 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/Jms2RequiresNewTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/Jms2RequiresNewTest-context.xml
@@ -37,33 +37,26 @@
<bean id="narayanaUserTransaction"
class="com.arjuna.ats.jta.UserTransaction" factory-method="userTransaction" />
<!-- this is the Spring JtaTransactionManager which under the hood uses
Narayana -->
- <bean id="jtaTransactionManager"
class="org.springframework.transaction.jta.JtaTransactionManager"
depends-on="my-broker">
+ <bean id="jtaTransactionManager"
class="org.springframework.transaction.jta.JtaTransactionManager">
<property name="transactionManager" ref="narayanaTransactionManager"/>
<property name="userTransaction" ref="narayanaUserTransaction"/>
</bean>
<!-- Is the ConnectionFactory to connect to the JMS broker -->
<!-- notice how we must use the XA connection factory -->
- <bean id="jmsXaConnectionFactory"
class="org.apache.activemq.ActiveMQXAConnectionFactory" depends-on="my-broker">
- <property name="brokerURL"
value="tcp://localhost:${ITestSupport.port3}"/>
+ <bean id="jmsXaConnectionFactory"
class="org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory">
+ <property name="brokerURL" value="vm://itest-jms"/>
</bean>
<!-- define the activemq Camel component so we can integrate with the AMQ
broker below -->
- <bean id="activemq"
class="org.apache.camel.component.activemq.ActiveMQComponent"
depends-on="my-broker">
- <property name="brokerURL"
value="tcp://localhost:${ITestSupport.port3}"/>
+ <bean id="activemq" class="org.apache.camel.component.jms.JmsComponent">
+ <property name="connectionFactory" ref="jmsXaConnectionFactory"/>
<!-- must indicate that we use transacted acknowledge mode -->
<property name="transacted" value="true"/>
<!-- refer to the transaction manager -->
<property name="transactionManager" ref="jtaTransactionManager"/>
</bean>
- <!-- setup a local JMS Broker for testing purpose -->
- <broker id="my-broker" useJmx="false" persistent="false"
brokerName="localhost" xmlns="http://activemq.apache.org/schema/core";>
- <transportConnectors>
- <transportConnector uri="tcp://localhost:${ITestSupport.port3}"/>
- </transportConnectors>
- </broker>
-
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
</camelContext>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXTest-context.xml
index bef850eed10..c4fe6c98412 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXTest-context.xml
@@ -24,13 +24,13 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
<!-- ActiveMQ connection factory -->
- <bean id="poolConnectionFactory"
class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start"
destroy-method="stop">
+ <bean id="poolConnectionFactory"
class="org.messaginghub.pooled.jms.JmsPoolConnectionFactory"
init-method="start" destroy-method="stop">
<property name="maxConnections" value="8"/>
<property name="connectionFactory" ref="jmsConnectionFactory"/>
</bean>
- <bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&broker.useJmx=false"/>
+ <bean id="jmsConnectionFactory"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<!-- Spring JMX TX manager -->
@@ -52,7 +52,7 @@
</bean>
<!-- ActiveMQ component to be used in Camel -->
- <bean id="activemq"
class="org.apache.camel.component.activemq.ActiveMQComponent">
+ <bean id="activemq" class="org.apache.camel.component.jms.JmsComponent">
<property name="connectionFactory" ref="poolConnectionFactory"/>
<property name="configuration" ref="jmsConfig"/>
</bean>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml
index 991bfc195a2..f7b2a73ce9a 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml
@@ -24,13 +24,13 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
<!-- ActiveMQ connection factory -->
- <bean id="poolConnectionFactory"
class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start"
destroy-method="stop">
+ <bean id="poolConnectionFactory"
class="org.messaginghub.pooled.jms.JmsPoolConnectionFactory"
init-method="start" destroy-method="stop">
<property name="maxConnections" value="8"/>
<property name="connectionFactory" ref="jmsConnectionFactory"/>
</bean>
- <bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&broker.useJmx=false"/>
+ <bean id="jmsConnectionFactory"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<!-- Spring JMX TX manager -->
@@ -52,7 +52,7 @@
</bean>
<!-- ActiveMQ component to be used in Camel -->
- <bean id="activemq"
class="org.apache.camel.component.activemq.ActiveMQComponent">
+ <bean id="activemq" class="org.apache.camel.component.jms.JmsComponent">
<property name="connectionFactory" ref="poolConnectionFactory"/>
<property name="configuration" ref="jmsConfig"/>
</bean>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml
index 2a7f22494cc..e69c86ed995 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml
@@ -24,13 +24,13 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
<!-- ActiveMQ connection factory -->
- <bean id="poolConnectionFactory"
class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start"
destroy-method="stop">
+ <bean id="poolConnectionFactory"
class="org.messaginghub.pooled.jms.JmsPoolConnectionFactory"
init-method="start" destroy-method="stop">
<property name="maxConnections" value="8"/>
<property name="connectionFactory" ref="jmsConnectionFactory"/>
</bean>
- <bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&broker.useJmx=false"/>
+ <bean id="jmsConnectionFactory"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<!-- Spring JMX TX manager -->
@@ -52,7 +52,7 @@
</bean>
<!-- ActiveMQ component to be used in Camel -->
- <bean id="activemq"
class="org.apache.camel.component.activemq.ActiveMQComponent">
+ <bean id="activemq" class="org.apache.camel.component.jms.JmsComponent">
<property name="connectionFactory" ref="poolConnectionFactory"/>
<property name="configuration" ref="jmsConfig"/>
</bean>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest-context.xml
index a6de8ffdc49..4f49538b05b 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest-context.xml
@@ -24,13 +24,13 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
<!-- ActiveMQ connection factory -->
- <bean id="poolConnectionFactory"
class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start"
destroy-method="stop">
+ <bean id="poolConnectionFactory"
class="org.messaginghub.pooled.jms.JmsPoolConnectionFactory"
init-method="start" destroy-method="stop">
<property name="maxConnections" value="8"/>
<property name="connectionFactory" ref="jmsConnectionFactory"/>
</bean>
- <bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&broker.useJmx=false"/>
+ <bean id="jmsConnectionFactory"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
</bean>
<!-- Spring JMX TX manager -->
@@ -52,7 +52,7 @@
</bean>
<!-- ActiveMQ component to be used in Camel -->
- <bean id="activemq"
class="org.apache.camel.component.activemq.ActiveMQComponent">
+ <bean id="activemq" class="org.apache.camel.component.jms.JmsComponent">
<property name="connectionFactory" ref="poolConnectionFactory"/>
<property name="configuration" ref="jmsConfig"/>
</bean>
diff --git
a/tests/camel-itest/src/test/resources/spring-config/jms-applicationContext.xml
b/tests/camel-itest/src/test/resources/spring-config/jms-applicationContext.xml
index fead1ee9a02..982f05a2e59 100644
---
a/tests/camel-itest/src/test/resources/spring-config/jms-applicationContext.xml
+++
b/tests/camel-itest/src/test/resources/spring-config/jms-applicationContext.xml
@@ -27,9 +27,8 @@
<property name="useMessageIDAsCorrelationID" value="true" />
</bean>
- <bean id="jmsConnectionFactory"
- class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&create=false" />
+ <bean id="jmsConnectionFactory"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="vm://itest-jms"/>
</bean>
</beans>
