Repository: camel Updated Branches: refs/heads/master ff003cc57 -> b0e32148b
CAMEL-7227: Added camel-kafka feature Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b0e32148 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b0e32148 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b0e32148 Branch: refs/heads/master Commit: b0e32148b790f3c77e7e5789f94e3467f155c4a7 Parents: ff003cc Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Mar 11 13:57:46 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Mar 11 13:57:46 2014 +0100 ---------------------------------------------------------------------- parent/pom.xml | 2 + .../features/src/main/resources/features.xml | 9 +++++ .../camel/itest/karaf/CamelKafkaTest.java | 40 ++++++++++++++++++++ 3 files changed, 51 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b0e32148/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index caec474..666cad1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -252,6 +252,7 @@ <junit-version>4.11</junit-version> <jython-version>2.5.3</jython-version> <kafka-version>0.8.0</kafka-version> + <kafka-bundle-version>0.8.0_1</kafka-bundle-version> <karaf-version>2.3.3</karaf-version> <kie-version>6.0.0.Final</kie-version> <krati-version>0.4.9</krati-version> @@ -443,6 +444,7 @@ <xstream-bundle-version>1.4.7_1</xstream-bundle-version> <xstream-version>1.4.7</xstream-version> <xom-version>1.2.5</xom-version> + <yammer-metrics-version>2.2.0</yammer-metrics-version> <zookeeper-version>3.4.5</zookeeper-version> <!-- OSGi bundles properties --> http://git-wip-us.apache.org/repos/asf/camel/blob/b0e32148/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 8dcc77f..2c01c6a 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -659,6 +659,15 @@ <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-jxpath/${project.version}</bundle> </feature> + <feature name='camel-kafka' version='${project.version}' resolver='(obr)' start-level='50'> + <bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala-version}</bundle> + <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.yammer.metrics/metrics-core/${yammer-metrics-version}$Bundle-Version=${yammer-metrics-version}&Export-Package=*;-noimport:=true;version="${yammer-metrics-version}"</bundle> + <bundle dependency='true'>wrap:mvn:com.yammer.metrics/metrics-annotation/${yammer-metrics-version}$Bundle-Version=${yammer-metrics-version}&Export-Package=*;-noimport:=true;version="${yammer-metrics-version}"</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka_2.10/${kafka-bundle-version}</bundle> + <feature version='${project.version}'>camel-core</feature> + <bundle>mvn:org.apache.camel/camel-kafka/${project.version}</bundle> + </feature> <feature name='camel-kestrel' version='${project.version}' resolver='(obr)' start-level='50'> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spymemcached/${spymemcached-bundle-version}</bundle> <feature version='${project.version}'>camel-core</feature> http://git-wip-us.apache.org/repos/asf/camel/blob/b0e32148/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java new file mode 100644 index 0000000..d0e7587 --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.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 CamelKafkaTest extends AbstractFeatureTest { + + public static final String COMPONENT = extractName(CamelKafkaTest.class); + + @Test + public void test() throws Exception { + testComponent(COMPONENT); + } + + @Configuration + public static Option[] configure() { + return configure(COMPONENT); + } + +} \ No newline at end of file
