Updated Branches: refs/heads/master f67b2b925 -> 993c3ca19
CAMEL-6638: Added vertx OSGi feature Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/993c3ca1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/993c3ca1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/993c3ca1 Branch: refs/heads/master Commit: 993c3ca19cc12e5a54f98ffba856486c6e5a15ca Parents: f67b2b9 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Aug 15 10:30:12 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Aug 15 10:30:12 2013 +0200 ---------------------------------------------------------------------- .../features/src/main/resources/features.xml | 10 +++++ .../camel/itest/karaf/CamelVertxTest.java | 40 ++++++++++++++++++++ 2 files changed, 50 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/993c3ca1/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 4a54dab..4e18ca0 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1019,6 +1019,16 @@ <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-urlrewrite/${project.version}</bundle> </feature> + <feature name='camel-vertx' version='${project.version}' resolver='(obr)' start-level='50'> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.hazelcast/hazelcast/${hazelcast-version}</bundle> + <!-- TODO: vertx is not OSGi bundle, see https://github.com/eclipse/vert.x/issues/708 --> + <bundle dependency='true'>wrap:mvn:io.vertx/vertx-core/${vertx-version}</bundle> + <feature version='${project.version}'>camel-core</feature> + <bundle>mvn:org.apache.camel/camel-vertx/${project.version}</bundle> + </feature> <feature name='camel-velocity' version='${project.version}' resolver='(obr)' start-level='50'> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-spec-version}</bundle> <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> http://git-wip-us.apache.org/repos/asf/camel/blob/993c3ca1/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java new file mode 100644 index 0000000..0169053 --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java @@ -0,0 +1,40 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.itest.karaf; + +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; + +@RunWith(JUnit4TestRunner.class) +public class CamelVertxTest extends AbstractFeatureTest { + + public static final String COMPONENT = extractName(CamelVertxTest.class); + + @Test + public void test() throws Exception { + testComponent(COMPONENT); + } + + @Configuration + public static Option[] configure() { + return configure(COMPONENT); + } + +} \ No newline at end of file
