CAMEL-5828 Added camel-disruptor features and updated the OSGi tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2cce9b0c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2cce9b0c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2cce9b0c Branch: refs/heads/master Commit: 2cce9b0c48030f600758a2a00bbed83bfb6e162b Parents: 881dfc6 Author: Willem Jiang <ningji...@apache.org> Authored: Wed May 22 18:45:36 2013 +0800 Committer: Willem Jiang <ningji...@apache.org> Committed: Wed May 22 18:46:27 2013 +0800 ---------------------------------------------------------------------- parent/pom.xml | 4 +- .../karaf/features/src/main/resources/features.xml | 6 +++++ tests/camel-itest-osgi/pom.xml | 4 +- .../camel/itest/osgi/disruptor/DisruptorTest.java | 15 ++++++++++++ .../itest/osgi/disruptor/vm/DisruptorVmTest.java | 18 +++++++++++++++ 5 files changed, 43 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2cce9b0c/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index d352cad..7933ec7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -108,7 +108,7 @@ <cxf-xjc-utils-version>2.6.0</cxf-xjc-utils-version> <deltaspike-version>0.3-incubating</deltaspike-version> <derby-version>10.10.1.1</derby-version> - <disruptor.version>3.0.1</disruptor.version> + <disruptor-version>3.0.1</disruptor-version> <dnsjava-version>2.1.1</dnsjava-version> <dnsjava-bundle-version>2.1.1_1</dnsjava-bundle-version> <dom4j-bundle-version>1.6.1_5</dom4j-bundle-version> @@ -1596,7 +1596,7 @@ <dependency> <groupId>com.lmax</groupId> <artifactId>disruptor</artifactId> - <version>${disruptor.version}</version> + <version>${disruptor-version}</version> </dependency> <!-- optional dozer dependencies --> http://git-wip-us.apache.org/repos/asf/camel/blob/2cce9b0c/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 933b64a..c099630 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -217,6 +217,12 @@ <bundle>mvn:org.apache.camel/camel-cxf-transport/${project.version}</bundle> <bundle>mvn:org.apache.camel/camel-cxf/${project.version}</bundle> </feature> + <feature name='camel-disruptor' version='${project.version}' resolver='(obr)' start-level='50'> + <bundle dependency='true'>mvn:com.lmax/disruptor/${disruptor-version}</bundle> + <feature version='${project.version}'>camel-core</feature> + <bundle>mvn:org.apache.camel/camel-disruptor/${project.version}</bundle> +</feature> + <feature name='camel-dns' version='${project.version}' resolver='(obr)' start-level='50'> <details>The camel-dns feature can only run on a SUN JVM. You need to ddd the package sun.net.spi.nameservice to the java platform packages in the etc/jre.properties file.</details> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dnsjava/${dnsjava-bundle-version}</bundle> http://git-wip-us.apache.org/repos/asf/camel/blob/2cce9b0c/tests/camel-itest-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml index 9307e7c..4a95650 100644 --- a/tests/camel-itest-osgi/pom.xml +++ b/tests/camel-itest-osgi/pom.xml @@ -30,11 +30,11 @@ <description>Performs OSGi compliance integration tests</description> <repositories> - <repository> + <!--repository> <id>hapi</id> <name>HAPI Maven Repository</name> <url>http://hl7api.sourceforge.net/m2/</url> - </repository> + </repository--> </repositories> <dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/2cce9b0c/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/DisruptorTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/DisruptorTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/DisruptorTest.java index aa11f4f..5961674 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/DisruptorTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/DisruptorTest.java @@ -22,8 +22,13 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; 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 static org.ops4j.pax.exam.OptionUtils.combine; + + /** * @version */ @@ -62,5 +67,15 @@ public class DisruptorTest extends OSGiIntegrationTestSupport { assertTrue(name1.startsWith(id)); assertTrue(name2.startsWith(id)); } + + @Configuration + public static Option[] configure() { + Option[] options = combine( + getDefaultCamelKarafOptions(), + // using the features to install the other camel components + loadCamelFeatures("camel-disruptor")); + + return options; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2cce9b0c/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/vm/DisruptorVmTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/vm/DisruptorVmTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/vm/DisruptorVmTest.java index 36b0a84..dcc7f70 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/vm/DisruptorVmTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/vm/DisruptorVmTest.java @@ -20,8 +20,14 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; 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 static org.ops4j.pax.exam.OptionUtils.combine; + + + /** * @version */ @@ -57,4 +63,16 @@ public class DisruptorVmTest extends OSGiIntegrationTestSupport { assertMockEndpointsSatisfied(); } + + + @Configuration + public static Option[] configure() { + Option[] options = combine( + getDefaultCamelKarafOptions(), + // using the features to install the other camel components + loadCamelFeatures("camel-disruptor")); + + return options; + } + } \ No newline at end of file
