Updated Branches: refs/heads/master 717219295 -> 40d788766
CAMEL-6165: camel-stomp works with OSGi. Thansk to Dejan for contribution. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/40d78876 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/40d78876 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/40d78876 Branch: refs/heads/master Commit: 40d788766894cf3cf67b52352137e59b75257efe Parents: 7172192 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Aug 7 08:12:24 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Aug 7 08:12:24 2013 +0200 ---------------------------------------------------------------------- parent/pom.xml | 2 +- .../features/src/main/resources/features.xml | 2 - .../camel/itest/karaf/CamelGeocoderTest.java | 40 ++++++++++++++++++++ .../camel/itest/karaf/CamelStompTest.java | 40 ++++++++++++++++++++ 4 files changed, 81 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/40d78876/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 727e795..92236ac 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -371,7 +371,7 @@ <spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!-- FIXME cmueller: not in sync! --> <spymemcached-version>2.8.4</spymemcached-version> <sshd-version>0.8.0</sshd-version> - <stompjms-version>1.13</stompjms-version> + <stompjms-version>1.17</stompjms-version> <stax-api-version>1.0.1</stax-api-version> <stax2-api-bundle-version>3.1.1</stax2-api-bundle-version> <stringtemplate-bundle-version>4.0.2_2</stringtemplate-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/40d78876/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 864aeef..009a285 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -961,7 +961,6 @@ <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-stream/${project.version}</bundle> </feature> -<!-- TODO: stompjms need a new release to fix bad OSGi MANIFEST.MF data <feature name='camel-stomp' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle> @@ -971,7 +970,6 @@ <bundle dependency='true'>mvn:org.fusesource.hawtdispatch/hawtdispatch-transport/${hawtdispatch-version}</bundle> <bundle>mvn:org.apache.camel/camel-stomp/${project.version}</bundle> </feature> ---> <feature name='camel-string-template' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle> http://git-wip-us.apache.org/repos/asf/camel/blob/40d78876/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java new file mode 100644 index 0000000..6f3382a --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.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 CamelGeocoderTest extends AbstractFeatureTest { + + public static final String COMPONENT = extractName(CamelGeocoderTest.class); + + @Test + public void test() throws Exception { + testComponent(COMPONENT); + } + + @Configuration + public static Option[] configure() { + return configure(COMPONENT); + } + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/40d78876/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.java new file mode 100644 index 0000000..ff5093e --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.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 CamelStompTest extends AbstractFeatureTest { + + public static final String COMPONENT = extractName(CamelStompTest.class); + + @Test + public void test() throws Exception { + testComponent(COMPONENT); + } + + @Configuration + public static Option[] configure() { + return configure(COMPONENT); + } + +} \ No newline at end of file
