Updated Branches: refs/heads/master cd40b7120 -> 191809883
CAMEL-6774: Fixed the remaining two karaf tests failing. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/19180988 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/19180988 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/19180988 Branch: refs/heads/master Commit: 1918098837f82c935e479718a196ced8b692ecf8 Parents: cd40b71 Author: Babak Vahdat <bvah...@apache.org> Authored: Wed Oct 23 22:42:14 2013 +0200 Committer: Babak Vahdat <bvah...@apache.org> Committed: Wed Oct 23 22:42:14 2013 +0200 ---------------------------------------------------------------------- parent/pom.xml | 17 ++++++------- .../features/src/main/resources/features.xml | 4 +++- tests/camel-itest-karaf/pom.xml | 8 ++----- .../camel/itest/karaf/AbstractFeatureTest.java | 11 ++++----- tests/camel-itest-osgi/pom.xml | 25 ++++++++++---------- .../itest/osgi/OSGiIntegrationTestSupport.java | 11 ++++----- .../osgi/servlet/ServletComponentTest.java | 2 +- .../itest/osgi/servlet/ServletServicesTest.java | 2 +- 8 files changed, 36 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/19180988/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 2e4b608..fa70831 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -317,9 +317,9 @@ <paranamer-bundle-version>2.4_1</paranamer-bundle-version> <pax-exam-version>2.6.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-runner-version>1.7.6</pax-runner-version> <pax-tiny-bundle-version>1.3.1</pax-tiny-bundle-version> - <pax-logging-version>1.6.10</pax-logging-version> + <pax-logging-version>1.7.1</pax-logging-version> <pdfbox-version>1.6.0</pdfbox-version> <plexus-container-default-version>1.0-alpha-48</plexus-container-default-version> <plexus-utils-version>1.5.6</plexus-utils-version> @@ -1797,11 +1797,6 @@ <!-- optional Pax support --> <dependency> <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam</artifactId> - <version>${pax-exam-version}</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> <version>${pax-exam-version}</version> </dependency> @@ -1815,10 +1810,12 @@ <artifactId>pax-swissbox-tinybundles</artifactId> <version>${pax-tiny-bundle-version}</version> </dependency> + + <!-- optional Karaf test support --> <dependency> - <groupId>org.openengsb.labs.paxexam.karaf</groupId> - <artifactId>paxexam-karaf-container</artifactId> - <version>${paxexam-karaf-container-version}</version> + <groupId>org.apache.karaf.tooling.exam</groupId> + <artifactId>org.apache.karaf.tooling.exam.container</artifactId> + <version>${karaf-version}</version> </dependency> <!-- optional Saxon support --> http://git-wip-us.apache.org/repos/asf/camel/blob/19180988/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index c02dbe1..3e9239d 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -180,8 +180,9 @@ </feature> <feature name='camel-cometd' version='${project.version}' resolver='(obr)' start-level='50'> <feature>jetty</feature> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}</bundle> <feature version='${project.version}'>camel-core</feature> + <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-cometd/${project.version}</bundle> </feature> <feature name='camel-context' version='${project.version}' resolver='(obr)' start-level='50'> @@ -1110,6 +1111,7 @@ <feature name='camel-websocket' version='${project.version}' resolver='(obr)' start-level='50'> <feature>jetty</feature> <feature version='${project.version}'>camel-core</feature> + <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> <bundle>mvn:org.apache.camel/camel-websocket/${project.version}</bundle> </feature> <feature name='camel-xmlbeans' version='${project.version}' resolver='(obr)' start-level='50'> http://git-wip-us.apache.org/repos/asf/camel/blob/19180988/tests/camel-itest-karaf/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml index 1a0928b..b32d674 100644 --- a/tests/camel-itest-karaf/pom.xml +++ b/tests/camel-itest-karaf/pom.xml @@ -47,8 +47,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.openengsb.labs.paxexam.karaf</groupId> - <artifactId>paxexam-karaf-container</artifactId> + <groupId>org.apache.karaf.tooling.exam</groupId> + <artifactId>org.apache.karaf.tooling.exam.container</artifactId> <scope>test</scope> </dependency> <dependency> @@ -137,10 +137,6 @@ <forkMode>pertest</forkMode> <redirectTestOutputToFile>true</redirectTestOutputToFile> <argLine>-Xmx256m</argLine> - <excludes> - <!-- CXF test will hang with the Spring3, need to check Cxf feature with karaf later --> - <exclude>**/*Cxf*.*</exclude> - </excludes> <systemPropertyVariables> <karafVersion>${karaf-version}</karafVersion> </systemPropertyVariables> http://git-wip-us.apache.org/repos/asf/camel/blob/19180988/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java index a280731..bc1987a 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java @@ -24,20 +24,20 @@ import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultRouteContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.osgi.CamelContextFactory; +import org.apache.karaf.tooling.exam.options.KarafDistributionOption; +import org.apache.karaf.tooling.exam.options.LogLevelOption; import org.junit.After; import org.junit.Before; -import org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption; -import org.openengsb.labs.paxexam.karaf.options.LogLevelOption; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.options.UrlReference; import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration; +import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel; +import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.replaceConfigurationFile; import static org.junit.Assert.assertNotNull; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.karafDistributionConfiguration; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.replaceConfigurationFile; import static org.ops4j.pax.exam.CoreOptions.maven; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.scanFeatures; @@ -156,7 +156,6 @@ public abstract class AbstractFeatureTest { new Option[]{ karafDistributionConfiguration().frameworkUrl( maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject()) - //This version doesn't affect the version of karaf we use .karafVersion("2.3.3").name("Apache Karaf") .unpackDirectory(new File("target/paxexam/unpack/")), http://git-wip-us.apache.org/repos/asf/camel/blob/19180988/tests/camel-itest-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml index f7823b7..cb80d70 100644 --- a/tests/camel-itest-osgi/pom.xml +++ b/tests/camel-itest-osgi/pom.xml @@ -54,8 +54,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.openengsb.labs.paxexam.karaf</groupId> - <artifactId>paxexam-karaf-container</artifactId> + <groupId>org.apache.karaf.tooling.exam</groupId> + <artifactId>org.apache.karaf.tooling.exam.container</artifactId> <scope>test</scope> </dependency> <dependency> @@ -93,16 +93,16 @@ <artifactId>activemq-broker</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-spring</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-kahadb-store</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-spring</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-kahadb-store</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> @@ -413,7 +413,6 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> - <version>1.2</version> <executions> <execution> <id>generate-depends-file</id> http://git-wip-us.apache.org/repos/asf/camel/blob/19180988/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java index 84980e2..5e8282c 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java @@ -25,8 +25,8 @@ import javax.inject.Inject; import org.apache.camel.CamelContext; import org.apache.camel.osgi.CamelContextFactory; import org.apache.camel.test.junit4.CamelTestSupport; -import org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption; -import org.openengsb.labs.paxexam.karaf.options.LogLevelOption; +import org.apache.karaf.tooling.exam.options.KarafDistributionOption; +import org.apache.karaf.tooling.exam.options.LogLevelOption; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.options.MavenArtifactProvisionOption; @@ -36,9 +36,9 @@ import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.karafDistributionConfiguration; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.replaceConfigurationFile; +import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration; +import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel; +import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.replaceConfigurationFile; import static org.ops4j.pax.exam.CoreOptions.maven; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.scanFeatures; @@ -132,7 +132,6 @@ public class OSGiIntegrationTestSupport extends CamelTestSupport { new Option[] { karafDistributionConfiguration() .frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject()) - // This version is not actual karaf version that we use. .karafVersion("2.3.3") .name("Apache Karaf") .useDeployFolder(false).unpackDirectory(new File("target/paxexam/unpack/")), http://git-wip-us.apache.org/repos/asf/camel/blob/19180988/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java index 53202f2..acdbcc8 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java @@ -17,9 +17,9 @@ package org.apache.camel.itest.osgi.servlet; import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; +import org.apache.karaf.tooling.exam.options.KarafDistributionOption; import org.junit.Test; import org.junit.runner.RunWith; -import org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; http://git-wip-us.apache.org/repos/asf/camel/blob/19180988/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java index 54b0530..2f08818 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java @@ -17,9 +17,9 @@ package org.apache.camel.itest.osgi.servlet; import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; +import org.apache.karaf.tooling.exam.options.KarafDistributionOption; import org.junit.Test; import org.junit.runner.RunWith; -import org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner;
