Repository: activemq Updated Branches: refs/heads/trunk d8f9686d2 -> 9743dbddb
move to pax exam 3.4.0 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/9743dbdd Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/9743dbdd Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/9743dbdd Branch: refs/heads/trunk Commit: 9743dbddb6ed175045fbc5c6246c4fb6c0f946fe Parents: d8f9686 Author: gtully <gary.tu...@gmail.com> Authored: Fri Aug 1 13:17:34 2014 +0100 Committer: gtully <gary.tu...@gmail.com> Committed: Fri Aug 1 13:17:34 2014 +0100 ---------------------------------------------------------------------- activemq-karaf-itest/pom.xml | 17 +++++++++-- .../karaf/itest/AbstractFeatureTest.java | 31 ++++++++------------ .../itest/ActiveMQAMQPBrokerFeatureTest.java | 6 ++-- .../karaf/itest/ActiveMQBrokerFeatureTest.java | 6 ++-- .../itest/ActiveMQBrokerNdCamelFeatureTest.java | 10 +++---- ...ctiveMQBrokerNdExternalCamelFeatureTest.java | 6 ++-- .../ActiveMQBrokerNdWebConsoleFeatureTest.java | 6 ++-- .../itest/ActiveMQBrokerRuntimeConfigTest.java | 4 +-- .../karaf/itest/ActiveMQClientBundleTest.java | 6 ++-- .../activemq/karaf/itest/ObrFeatureTest.java | 2 +- .../activemq/karaf/itest/config.properties | 1 + pom.xml | 4 +-- 12 files changed, 52 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/9743dbdd/activemq-karaf-itest/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml index 23c67ce..383959d 100644 --- a/activemq-karaf-itest/pom.xml +++ b/activemq-karaf-itest/pom.xml @@ -51,6 +51,17 @@ <version>1.6.2</version> </dependency> <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + </dependency> + <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> <version>${pax-exam-version}</version> @@ -105,9 +116,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.openengsb.labs.paxexam.karaf</groupId> - <artifactId>paxexam-karaf-container</artifactId> - <version>${paxexam-karaf-container-version}</version> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-container-karaf</artifactId> + <version>${pax-exam-version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq/blob/9743dbdd/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java index 6bd9174..367feae 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java @@ -21,10 +21,11 @@ import org.apache.felix.service.command.CommandSession; import org.apache.karaf.features.FeaturesService; import org.junit.After; import org.junit.Before; -import org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.TestProbeBuilder; -import org.ops4j.pax.exam.junit.ProbeBuilder; +import org.ops4j.pax.exam.ProbeBuilder; +import org.ops4j.pax.exam.karaf.options.KarafDistributionOption; +import org.ops4j.pax.exam.karaf.options.LogLevelOption; import org.ops4j.pax.exam.options.UrlReference; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; @@ -45,10 +46,12 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.karafDistributionConfiguration; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.replaceConfigurationFile; import static org.ops4j.pax.exam.CoreOptions.*; import static org.junit.Assert.assertTrue; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceConfigurationFile; public abstract class AbstractFeatureTest { @@ -152,19 +155,9 @@ public abstract class AbstractFeatureTest { public static String karafVersion() { - return System.getProperty("karafVersion", "2.3.3"); + return System.getProperty("karafVersion", "unknown-need-env-var"); } - public static String activemqVersion() { - Package p = Package.getPackage("org.apache.activemq"); - String version=null; - if (p != null) { - version = p.getImplementationVersion(); - } - return System.getProperty("activemqVersion", version); - } - - public static UrlReference getActiveMQKarafFeatureUrl() { String type = "xml/features"; return mavenBundle().groupId("org.apache.activemq"). @@ -220,15 +213,15 @@ public abstract class AbstractFeatureTest { new Option[]{ karafDistributionConfiguration().frameworkUrl( maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").version(karafVersion())) - //This version doesn't affect the version of karaf we use + //This version doesn't affect the version of karaf we use .karafVersion(karafVersion()).name("Apache Karaf") .unpackDirectory(new File("target/paxexam/unpack/")), - + KarafDistributionOption.keepRuntimeFolder(), - //logLevel(LogLevelOption.LogLevel.DEBUG), + logLevel(LogLevelOption.LogLevel.INFO), replaceConfigurationFile("etc/config.properties", new File(basedir+"/target/classes/org/apache/activemq/karaf/itest/config.properties")), replaceConfigurationFile("etc/custom.properties", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/custom.properties")), - scanFeatures(getActiveMQKarafFeatureUrl(), f.toArray(new String[f.size()]))}; + features(getActiveMQKarafFeatureUrl(), f.toArray(new String[f.size()]))}; return options; } http://git-wip-us.apache.org/repos/asf/activemq/blob/9743dbdd/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java index 9dc2328..d85b37e 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java @@ -20,14 +20,14 @@ import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl; import org.junit.runner.RunWith; import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.options.MavenArtifactProvisionOption; import javax.jms.Connection; import javax.jms.JMSException; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class ActiveMQAMQPBrokerFeatureTest extends ActiveMQBrokerFeatureTest { private static final Integer AMQP_PORT = 61636; http://git-wip-us.apache.org/repos/asf/activemq/blob/9743dbdd/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java index bdc0cd7..de9edc9 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java @@ -20,13 +20,13 @@ import java.util.concurrent.Callable; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class ActiveMQBrokerFeatureTest extends AbstractJmsFeatureTest { @Configuration http://git-wip-us.apache.org/repos/asf/activemq/blob/9743dbdd/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java index bddb43e..d46fce7 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java @@ -21,21 +21,21 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.MavenUtils; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.ops4j.pax.exam.CoreOptions.scanFeatures; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class ActiveMQBrokerNdCamelFeatureTest extends AbstractJmsFeatureTest { @Configuration public static Option[] configure() { Option[] baseOptions = configure("activemq", "activemq-camel"); - return configureBrokerStart(append(scanFeatures(getCamelFeatureUrl( + return configureBrokerStart(append(features(getCamelFeatureUrl( MavenUtils.getArtifactVersion("org.apache.camel.karaf", "apache-camel") ), "activemq-camel"), baseOptions), "activemq-nd-camel"); } http://git-wip-us.apache.org/repos/asf/activemq/blob/9743dbdd/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java index 6bd4411..a5fb02b 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java @@ -28,8 +28,8 @@ import org.ops4j.pax.exam.junit.JUnit4TestRunner; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.replaceConfigurationFile; -import static org.ops4j.pax.exam.CoreOptions.scanFeatures; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceConfigurationFile; @RunWith(JUnit4TestRunner.class) public class ActiveMQBrokerNdExternalCamelFeatureTest extends AbstractJmsFeatureTest { @@ -40,7 +40,7 @@ public class ActiveMQBrokerNdExternalCamelFeatureTest extends AbstractJmsFeature Option[] baseOptions = append( replaceConfigurationFile("data/tmp/camel.xml", new File(basedir + "/src/test/resources/org/apache/activemq/karaf/itest/camel.xml")), configure("activemq", "activemq-camel")); - return configureBrokerStart(append(scanFeatures(getCamelFeatureUrl( + return configureBrokerStart(append(features(getCamelFeatureUrl( MavenUtils.getArtifactVersion("org.apache.camel.karaf", "apache-camel") ), "activemq-camel"), baseOptions)); } http://git-wip-us.apache.org/repos/asf/activemq/blob/9743dbdd/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdWebConsoleFeatureTest.java ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdWebConsoleFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdWebConsoleFeatureTest.java index 5067fc5..bc0ef16 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdWebConsoleFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdWebConsoleFeatureTest.java @@ -26,12 +26,12 @@ import org.junit.Ignore; import org.junit.runner.RunWith; import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; import static org.junit.Assert.assertEquals; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("Can fail sometimes. Old web-console is also @deprecated") public class ActiveMQBrokerNdWebConsoleFeatureTest extends ActiveMQBrokerFeatureTest { http://git-wip-us.apache.org/repos/asf/activemq/blob/9743dbdd/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerRuntimeConfigTest.java ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerRuntimeConfigTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerRuntimeConfigTest.java index 2324e45..4389294 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerRuntimeConfigTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerRuntimeConfigTest.java @@ -30,8 +30,8 @@ import org.ops4j.pax.exam.junit.JUnit4TestRunner; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.editConfigurationFilePut; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.replaceConfigurationFile; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceConfigurationFile; @RunWith(JUnit4TestRunner.class) public class ActiveMQBrokerRuntimeConfigTest extends AbstractJmsFeatureTest { http://git-wip-us.apache.org/repos/asf/activemq/blob/9743dbdd/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientBundleTest.java ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientBundleTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientBundleTest.java index 78a9ab4..c85aede 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientBundleTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientBundleTest.java @@ -20,10 +20,10 @@ import org.apache.activemq.ActiveMQConnectionFactory; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class ActiveMQClientBundleTest extends AbstractFeatureTest { @Configuration http://git-wip-us.apache.org/repos/asf/activemq/blob/9743dbdd/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java index df82739..25a2bd3 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java @@ -25,7 +25,7 @@ import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.editConfigurationFilePut; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; @RunWith(JUnit4TestRunner.class) http://git-wip-us.apache.org/repos/asf/activemq/blob/9743dbdd/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/config.properties ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/config.properties b/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/config.properties index 4f07a79..1a4892f 100644 --- a/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/config.properties +++ b/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/config.properties @@ -75,6 +75,7 @@ org.osgi.framework.system.packages= \ org.osgi.util.tracker;uses:="org.osgi.framework";version="1.5.1", \ org.apache.karaf.jaas.boot;version="${karaf-version}", \ org.apache.karaf.jaas.boot.principal;version="${karaf-version}", \ + org.apache.karaf.management.boot;version="${karaf-version}", \ org.apache.karaf.version;version="${karaf-version}", \ ${jre-${java.specification.version}} http://git-wip-us.apache.org/repos/asf/activemq/blob/9743dbdd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f986da0..010d310 100755 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ <jaxb-basics-version>0.6.4</jaxb-basics-version> <stompjms-version>1.19</stompjms-version> - <pax-exam-version>2.6.0</pax-exam-version> + <pax-exam-version>3.4.0</pax-exam-version> <paxexam-karaf-container-version>1.0.0</paxexam-karaf-container-version> <pax-runner-version>1.6.1</pax-runner-version> <pax-tiny-bundle-version>1.3.1</pax-tiny-bundle-version> @@ -151,7 +151,7 @@ <maven-release-plugin-version>2.4.1</maven-release-plugin-version> <maven-eclipse-plugin-version>2.9</maven-eclipse-plugin-version> <maven-war-plugin-version>2.4</maven-war-plugin-version> - <maven-compiler-plugin-version>2.5.1</maven-compiler-plugin-version> + <maven-compiler-plugin-version>3.1</maven-compiler-plugin-version> <maven-jar-plugin-version>2.4</maven-jar-plugin-version> <maven-archiver-version>2.5</maven-archiver-version> <maven-source-plugin-version>2.2.1</maven-source-plugin-version>