This is an automated email from the ASF dual-hosted git repository.
orpiske 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 787648c4d48 (chores) camel-jms: adjusted spring tests to use the
classes in test-infra
787648c4d48 is described below
commit 787648c4d48fb5ec96f8564f53b6835328db3407
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Wed Aug 17 16:08:17 2022 +0200
(chores) camel-jms: adjusted spring tests to use the classes in test-infra
---
.../test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java | 4 ----
.../apache/camel/component/jms/JmsSpringLoadBalanceFailoverTest.xml | 2 +-
.../org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.xml | 2 +-
.../org/apache/camel/component/jms/SpringJmsSelectorTest.xml | 2 +-
.../org/apache/camel/component/jms/SpringJmsXPathHeaderTest.xml | 2 +-
.../src/test/resources/org/apache/camel/component/jms/bind/spring.xml | 2 +-
.../camel/component/jms/issues/JmsInOutWithSpringRestartIssueTest.xml | 2 +-
.../apache/camel/component/jms/issues/JmsResequencerTest-context.xml | 2 +-
.../jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml | 2 +-
.../org/apache/camel/component/jms/jmsHeaderFilteringWithSpring.xml | 2 +-
.../resources/org/apache/camel/component/jms/jmsRouteUsingSpring.xml | 2 +-
.../org/apache/camel/component/jms/jmsRouteUsingSpringAndJmsName.xml | 2 +-
.../org/apache/camel/component/jms/jmsRouteUsingSpringJMSTemplate.xml | 2 +-
.../apache/camel/component/jms/jmsRouteUsingSpringWithAutoWire.xml | 2 +-
.../src/test/resources/org/apache/camel/component/jms/spring.xml | 2 +-
.../camel/component/jms/tuning/PerformanceRoutePojoTest-context.xml | 2 +-
.../camel/component/jms/tx/ActiveMQWithoutTransactionManager.xml | 2 +-
.../apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.xml | 2 +-
.../component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml | 2 +-
.../org/apache/camel/component/jms/tx/JMSTransactionRollbackTest.xml | 2 +-
.../component/jms/tx/JMSTransactionThrottlingRoutePolicyTest.xml | 2 +-
.../org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml | 2 +-
.../camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.xml | 2 +-
.../org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyTest.xml | 2 +-
.../component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.xml | 2 +-
.../component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.xml | 2 +-
.../org/apache/camel/component/jms/tx/JmsToJmsTransactedTest.xml | 2 +-
.../org/apache/camel/component/jms/tx/JmsTransacted-context.xml | 2 +-
.../org/apache/camel/component/jms/tx/RouteIdTransactedTest.xml | 2 +-
.../apache/camel/component/jms/tx/TransactedAsyncUsingThreadsTest.xml | 2 +-
.../jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml | 2 +-
.../jms/tx/TransactionErrorHandlerCustomerSpringParserTest.xml | 2 +-
.../camel/component/jms/tx/TransactionInterceptSendToEndpointTest.xml | 2 +-
.../camel/component/jms/tx/TransactionMinimalConfigurationTest.xml | 2 +-
34 files changed, 33 insertions(+), 37 deletions(-)
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java
index 0851b5158fd..6303b0b734a 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java
@@ -114,10 +114,6 @@ public final class CamelJmsTestHelper {
return connectionFactory;
}
- public static String createBrokerUrl() {
- return createBrokerUrl(null);
- }
-
@Deprecated
private static String createBrokerUrl(String options) {
// using a unique broker name improves testing when running the entire
test suite in the same JVM
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/JmsSpringLoadBalanceFailoverTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/JmsSpringLoadBalanceFailoverTest.xml
index 9b1e46bd869..14304d52f99 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/JmsSpringLoadBalanceFailoverTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/JmsSpringLoadBalanceFailoverTest.xml
@@ -28,7 +28,7 @@
<property name="connectionFactory">
<bean class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean
class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
<!-- need to trust when serializing java objects over JMS -->
<property name="trustAllPackages" value="true"/>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.xml
index 0d8da4606b8..38f41215b16 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.xml
@@ -30,7 +30,7 @@
<property name="connectionFactory">
<bean class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
</property>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsSelectorTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsSelectorTest.xml
index 5d083ccb001..e6d8d103302 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsSelectorTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsSelectorTest.xml
@@ -40,7 +40,7 @@
<property name="connectionFactory">
<bean class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean
class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
</property>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsXPathHeaderTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsXPathHeaderTest.xml
index 7ebbb6d7339..07fc39ce440 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsXPathHeaderTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsXPathHeaderTest.xml
@@ -28,7 +28,7 @@
<property name="connectionFactory">
<bean class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean
class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
</property>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/bind/spring.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/bind/spring.xml
index 4dec0b5c8b3..5df40372152 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/bind/spring.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/bind/spring.xml
@@ -36,7 +36,7 @@
<property name="connectionFactory">
<bean class="org.apache.activemq.spring.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
</property>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsInOutWithSpringRestartIssueTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsInOutWithSpringRestartIssueTest.xml
index 979e75b822b..9d0969c254b 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsInOutWithSpringRestartIssueTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsInOutWithSpringRestartIssueTest.xml
@@ -35,7 +35,7 @@ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/came
<property name="connectionFactory">
<bean class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
</property>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsResequencerTest-context.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsResequencerTest-context.xml
index 973ee203769..ad9f6f198e3 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsResequencerTest-context.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsResequencerTest-context.xml
@@ -34,7 +34,7 @@ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/came
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml
index 6f200341048..7264364b436 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml
@@ -58,7 +58,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsHeaderFilteringWithSpring.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsHeaderFilteringWithSpring.xml
index 673777df5fa..79426ae7270 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsHeaderFilteringWithSpring.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsHeaderFilteringWithSpring.xml
@@ -32,7 +32,7 @@
<property name="connectionFactory">
<bean class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean
class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
</property>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpring.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpring.xml
index 8cdb91b2031..dba6cdba904 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpring.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpring.xml
@@ -33,7 +33,7 @@
<property name="connectionFactory">
<bean class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
</property>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringAndJmsName.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringAndJmsName.xml
index 0fba14afa98..cb17bba5205 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringAndJmsName.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringAndJmsName.xml
@@ -33,7 +33,7 @@
<property name="connectionFactory">
<bean class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
</property>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringJMSTemplate.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringJMSTemplate.xml
index d583255cfec..2b548e0f0b3 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringJMSTemplate.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringJMSTemplate.xml
@@ -41,7 +41,7 @@
<bean id="connectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringWithAutoWire.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringWithAutoWire.xml
index ae737db74cb..ab3e749eef5 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringWithAutoWire.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringWithAutoWire.xml
@@ -31,7 +31,7 @@
<bean id="connectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
<!-- END SNIPPET: example -->
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/spring.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/spring.xml
index 33eeb666eb7..83e6f2fb16c 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/spring.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/spring.xml
@@ -50,7 +50,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory" depends-on="broker">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tuning/PerformanceRoutePojoTest-context.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tuning/PerformanceRoutePojoTest-context.xml
index 1009e886677..307adba0ee9 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tuning/PerformanceRoutePojoTest-context.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tuning/PerformanceRoutePojoTest-context.xml
@@ -51,7 +51,7 @@
<property name="connectionFactory">
<bean class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean
class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
</property>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/ActiveMQWithoutTransactionManager.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/ActiveMQWithoutTransactionManager.xml
index 31f34d4f42c..f666c8610ab 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/ActiveMQWithoutTransactionManager.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/ActiveMQWithoutTransactionManager.xml
@@ -30,7 +30,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.xml
index 1fbc765667d..a763d15d51e 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.xml
@@ -33,7 +33,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml
index d2c6269589c..e906242e994 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml
@@ -31,7 +31,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl">
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl">
<constructor-arg name="options" value="broker.useJmx=true"/>
</bean>
</property>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionRollbackTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionRollbackTest.xml
index f9796cd7ace..995fe980ba0 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionRollbackTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionRollbackTest.xml
@@ -31,7 +31,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionThrottlingRoutePolicyTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionThrottlingRoutePolicyTest.xml
index a72f134c04d..b38770e1417 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionThrottlingRoutePolicyTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionThrottlingRoutePolicyTest.xml
@@ -31,7 +31,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml
index 1d87f3d9954..f44b58b5be4 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml
@@ -57,7 +57,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.xml
index 11fc9f97111..dff3d7dfa0d 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.xml
@@ -67,7 +67,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyTest.xml
index f55f3175319..ddcbfaa8bf4 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyTest.xml
@@ -31,7 +31,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.xml
index 978eecdb7dd..9271f5839a8 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.xml
@@ -31,7 +31,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.xml
index 28693eb1bde..5c89dd903e1 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.xml
@@ -31,7 +31,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JmsToJmsTransactedTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JmsToJmsTransactedTest.xml
index 8f69aef0600..8b568a36aa8 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JmsToJmsTransactedTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JmsToJmsTransactedTest.xml
@@ -31,7 +31,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JmsTransacted-context.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JmsTransacted-context.xml
index c8519a5ed84..776b970fbfe 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JmsTransacted-context.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JmsTransacted-context.xml
@@ -26,7 +26,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/RouteIdTransactedTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/RouteIdTransactedTest.xml
index 846ef0f2eb9..a8a8fb999c1 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/RouteIdTransactedTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/RouteIdTransactedTest.xml
@@ -31,7 +31,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactedAsyncUsingThreadsTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactedAsyncUsingThreadsTest.xml
index 846ef0f2eb9..a8a8fb999c1 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactedAsyncUsingThreadsTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactedAsyncUsingThreadsTest.xml
@@ -31,7 +31,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml
index cfecb8c9f20..329be0fd340 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml
@@ -81,7 +81,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerCustomerSpringParserTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerCustomerSpringParserTest.xml
index 4299b5b070e..2b16361d5d0 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerCustomerSpringParserTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerCustomerSpringParserTest.xml
@@ -79,7 +79,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionInterceptSendToEndpointTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionInterceptSendToEndpointTest.xml
index 438e04723e1..d365f73fa76 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionInterceptSendToEndpointTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionInterceptSendToEndpointTest.xml
@@ -31,7 +31,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.xml
index d9af08f9c4d..b5ad37308c5 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.xml
@@ -33,7 +33,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.CamelJmsTestHelper"
factory-method="createBrokerUrl"/>
+ <bean
class="org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker"
factory-method="createBrokerUrl"/>
</property>
</bean>
