Repository: camel Updated Branches: refs/heads/master b1bceaf9a -> 00fd56fce
CAMEL-8736 - Include camel-jcaache in distribution and provide Karaf features Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/00fd56fc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/00fd56fc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/00fd56fc Branch: refs/heads/master Commit: 00fd56fcea09fa8d5e9892357f5492701f67bcea Parents: b1bceaf Author: lburgazzoli <lburgazz...@gmail.com> Authored: Fri Feb 19 17:03:42 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Feb 19 17:07:16 2016 +0100 ---------------------------------------------------------------------- apache-camel/pom.xml | 4 ++ .../src/main/descriptors/common-bin.xml | 1 + parent/pom.xml | 5 +++ .../src/main/resources/bundles.properties | 1 + .../features/src/main/resources/features.xml | 5 +++ .../camel/itest/karaf/CamelJCacheTest.java | 40 ++++++++++++++++++++ 6 files changed, 56 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/00fd56fc/apache-camel/pom.xml ---------------------------------------------------------------------- diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index 4ba0d8c..c404de6 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -385,6 +385,10 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-jcache</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-jclouds</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/00fd56fc/apache-camel/src/main/descriptors/common-bin.xml ---------------------------------------------------------------------- diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml index 19ad7c7..865300d 100644 --- a/apache-camel/src/main/descriptors/common-bin.xml +++ b/apache-camel/src/main/descriptors/common-bin.xml @@ -110,6 +110,7 @@ <include>org.apache.camel:camel-jaxb</include> <include>org.apache.camel:camel-jbpm</include> <include>org.apache.camel:camel-jcr</include> + <include>org.apache.camel:camel-jcache</include> <include>org.apache.camel:camel-jclouds</include> <include>org.apache.camel:camel-jdbc</include> <include>org.apache.camel:camel-jetty-common</include> http://git-wip-us.apache.org/repos/asf/camel/blob/00fd56fc/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index acb8cec..13e2963 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1089,6 +1089,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-jcache</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-jcr</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/00fd56fc/platforms/karaf/features/src/main/resources/bundles.properties ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/bundles.properties b/platforms/karaf/features/src/main/resources/bundles.properties index 8c7e448..28082d4 100644 --- a/platforms/karaf/features/src/main/resources/bundles.properties +++ b/platforms/karaf/features/src/main/resources/bundles.properties @@ -48,6 +48,7 @@ org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibat org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}/jar org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}/jar org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcr-api/${jcr-bundle-version}/jar +org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-cache-api/${jcache-bundle-version}/jar org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}/jar org.apache.servicemix.bundles/org.apache.servicemix.bundles.jettison/${jettison-bundle-version}/jar org.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}/jar http://git-wip-us.apache.org/repos/asf/camel/blob/00fd56fc/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 ea57b0a..b3e89d7 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -794,6 +794,11 @@ <bundle dependency='true'>wrap:mvn:org.kie.remote/kie-remote-client/${jbpm-version}</bundle> <bundle>mvn:org.apache.camel/camel-jbpm/${project.version}</bundle> </feature> + <feature name='camel-jcache' version='${project.version}' resolver='(obr)' start-level='50'> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-cache-api/${jcache-bundle-version}</bundle> + <feature version='${project.version}'>camel-core</feature> + <bundle>mvn:org.apache.camel/camel-jcache/${project.version}</bundle> + </feature> <feature name='camel-jclouds' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${jclouds-version}'>jclouds</feature> <feature version='${jclouds-version}'>jclouds-blobstore</feature> http://git-wip-us.apache.org/repos/asf/camel/blob/00fd56fc/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJCacheTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJCacheTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJCacheTest.java new file mode 100644 index 0000000..9e615a3 --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJCacheTest.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.Configuration; +import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.junit.PaxExam; + +@RunWith(PaxExam.class) +public class CamelJCacheTest extends AbstractFeatureTest { + + public static final String COMPONENT = extractName(CamelJCacheTest.class); + + @Test + public void test() throws Exception { + testComponent(COMPONENT); + } + + @Configuration + public static Option[] configure() { + return configure(COMPONENT); + } + +} \ No newline at end of file
