Repository: karaf Updated Branches: refs/heads/master 6520b08b5 -> 2decd42af
[KARAF-5121] Use non XA ConnectionFactory as the jms commands do not work for XA Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2decd42a Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2decd42a Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2decd42a Branch: refs/heads/master Commit: 2decd42af76361857bfc0865717cbe5a60914011 Parents: 6520b08 Author: Christian Schneider <[email protected]> Authored: Wed May 17 19:16:41 2017 +0200 Committer: Christian Schneider <[email protected]> Committed: Wed May 17 19:17:03 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/karaf/itests/JmsTest.java | 51 ++++++-------------- .../jms/internal/connectionfactory-activemq.xml | 16 ++---- 2 files changed, 19 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/2decd42a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java index e363b70..41933b9 100644 --- a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java @@ -13,65 +13,46 @@ */ package org.apache.karaf.itests; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.MavenUtils; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerClass; - -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; +import static org.junit.Assert.assertTrue; -import javax.jms.ConnectionFactory; -import javax.management.MBeanServer; -import javax.management.ObjectName; import java.lang.management.ManagementFactory; import java.net.Socket; import java.net.URI; -import java.util.Arrays; -import java.util.LinkedList; import java.util.List; +import javax.jms.ConnectionFactory; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.ops4j.pax.exam.junit.PaxExam; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerClass; + @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public class JmsTest extends KarafTestSupport { - @Configuration - public Option[] config() { - String version = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf"); - List<Option> result = new LinkedList<>(Arrays.asList(super.config())); - result.add(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresRepositories", - "mvn:org.apache.karaf.features/framework/" + version + "/xml/features, " + - "mvn:org.apache.karaf.features/spring/" + version + "/xml/features, " + - "mvn:org.apache.karaf.features/spring-legacy/" + version + "/xml/features, " + - "mvn:org.apache.karaf.features/enterprise/" + version + "/xml/features, " + - "mvn:org.apache.karaf.features/enterprise-legacy/" + version + "/xml/features, " + - "mvn:org.apache.karaf.features/standard/" + version + "/xml/features")); - return result.toArray(new Option[result.size()]); - } - @Before public void installJmsFeatureAndActiveMQBroker() throws Exception { installAndAssertFeature("jms"); featureService - .addRepository(new URI("mvn:org.apache.activemq/activemq-karaf/5.10.0/xml/features")); + .addRepository(new URI("mvn:org.apache.activemq/activemq-karaf/5.14.4/xml/features")); installAndAssertFeature("activemq-broker-noweb"); // check if ActiveMQ is completely started System.out.println("Waiting for the ActiveMQ transport connector on 61616 ..."); boolean bound = false; while (!bound) { try { - Thread.sleep(2000); Socket socket = new Socket("localhost", 61616); + socket.close(); bound = true; } catch (Exception e) { // wait the connection + Thread.sleep(500); } } } @@ -91,7 +72,7 @@ public class JmsTest extends KarafTestSupport { String info = executeCommand("jms:info test"); System.out.println(info); assertContains("ActiveMQ", info); - assertContains("5.10.0", info); + assertContains("5.14.4", info); // jms:send command System.out.println(executeCommand("jms:send test queue message")); // jms:count command http://git-wip-us.apache.org/repos/asf/karaf/blob/2decd42a/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml ---------------------------------------------------------------------- diff --git a/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml b/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml index b4610ec..d770734 100644 --- a/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml +++ b/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml @@ -17,27 +17,17 @@ --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";> - <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQXAConnectionFactory"> + <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory"> <property name="brokerURL" value="${url}" /> <property name="userName" value="${username}" /> <property name="password" value="${password}" /> </bean> - <bean id="pooledConnectionFactory" class="org.apache.activemq.jms.pool.JcaPooledConnectionFactory"> + <bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"> <property name="maxConnections" value="8" /> - <property name="connectionFactory" ref="activemqConnectionFactory" /> - <property name="transactionManager" ref="transactionManager" /> - <property name="name" value="${name}"/> + <property name="connectionFactory" ref="connectionFactory" /> </bean> - <bean id="resourceManager" class="org.apache.activemq.pool.ActiveMQResourceManager" init-method="recoverResource"> - <property name="transactionManager" ref="transactionManager" /> - <property name="connectionFactory" ref="activemqConnectionFactory" /> - <property name="resourceName" value="activemq.${name}" /> - </bean> - - <reference id="transactionManager" interface="javax.transaction.TransactionManager" /> - <service ref="pooledConnectionFactory" interface="javax.jms.ConnectionFactory"> <service-properties> <entry key="name" value="${name}" />
