Updated Branches: refs/heads/master 986a9e0b4 -> 3210a8d16
Fixed the compilation error by JsonPath karaf-itest. Also upgraded the karaf-itests to make use of Karaf "2.3.3". Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3210a8d1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3210a8d1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3210a8d1 Branch: refs/heads/master Commit: 3210a8d16a3360684d4a77ffa562735fff3a3d89 Parents: 986a9e0 Author: Babak Vahdat <bvah...@apache.org> Authored: Tue Oct 8 21:52:55 2013 +0200 Committer: Babak Vahdat <bvah...@apache.org> Committed: Tue Oct 8 21:52:55 2013 +0200 ---------------------------------------------------------------------- .../camel/itest/karaf/AbstractFeatureTest.java | 2 +- .../camel/itest/karaf/CamelJsonPathTest.java | 40 -------------------- .../camel/itest/karaf/CamelJsonpathTest.java | 40 ++++++++++++++++++++ 3 files changed, 41 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3210a8d1/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java index 25f5720..a280731 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java @@ -157,7 +157,7 @@ public abstract class AbstractFeatureTest { karafDistributionConfiguration().frameworkUrl( maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject()) //This version doesn't affect the version of karaf we use - .karafVersion("2.3.1").name("Apache Karaf") + .karafVersion("2.3.3").name("Apache Karaf") .unpackDirectory(new File("target/paxexam/unpack/")), KarafDistributionOption.keepRuntimeFolder(), http://git-wip-us.apache.org/repos/asf/camel/blob/3210a8d1/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonPathTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonPathTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonPathTest.java deleted file mode 100644 index a86cdde..0000000 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonPathTest.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * 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 CamelJsonpathTest extends AbstractFeatureTest { - - public static final String COMPONENT = extractName(CamelJsonpathTest.class); - - @Test - public void test() throws Exception { - testLanguage(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/3210a8d1/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java new file mode 100644 index 0000000..a86cdde --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.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 CamelJsonpathTest extends AbstractFeatureTest { + + public static final String COMPONENT = extractName(CamelJsonpathTest.class); + + @Test + public void test() throws Exception { + testLanguage(COMPONENT); + } + + @Configuration + public static Option[] configure() { + return configure(COMPONENT); + } + +} \ No newline at end of file
