You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/03/14 08:49:34 UTC
[1/4] camel git commit: CAMEL-10987: Ignore CamelSpringRedisTest due
to CAMEL-10363
Repository: camel
Updated Branches:
refs/heads/master 885785144 -> 6d052f093
CAMEL-10987: Ignore CamelSpringRedisTest due to CAMEL-10363
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6d052f09
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6d052f09
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6d052f09
Branch: refs/heads/master
Commit: 6d052f09333d11e67840d54648503677ed082ca6
Parents: 5036306
Author: Tadayoshi Sato <sa...@gmail.com>
Authored: Tue Mar 14 15:59:48 2017 +0900
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 14 09:49:22 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6d052f09/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java
index 5fc0851..a630809 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java
@@ -16,11 +16,13 @@
*/
package org.apache.camel.itest.karaf;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
+@Ignore("CAMEL-10363 camel-spring-redis - Cannot install in Karaf")
public class CamelSpringRedisTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelSpringRedisTest.class);
@@ -30,5 +32,4 @@ public class CamelSpringRedisTest extends BaseKarafTest {
testComponent(COMPONENT);
}
-
-}
\ No newline at end of file
+}
[4/4] camel git commit: CAMEL-10987: Move
DuplicateNamespacePrefixIssueTest from camel-itest-karaf to camel-itest-osgi
Posted by da...@apache.org.
CAMEL-10987: Move DuplicateNamespacePrefixIssueTest from camel-itest-karaf to camel-itest-osgi
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/44451ab4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/44451ab4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/44451ab4
Branch: refs/heads/master
Commit: 44451ab4f095ece4bf94ef8df09a12dd65d9bcb1
Parents: 8857851
Author: Tadayoshi Sato <sa...@gmail.com>
Authored: Tue Mar 14 14:33:00 2017 +0900
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 14 09:49:22 2017 +0100
----------------------------------------------------------------------
tests/camel-itest-karaf/run-tests.sh | 2 +-
.../DuplicateNamespacePrefixIssueTest.java | 70 ------------------
tests/camel-itest-osgi/pom.xml | 5 ++
.../DuplicateNamespacePrefixIssueTest.java | 77 ++++++++++++++++++++
4 files changed, 83 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/44451ab4/tests/camel-itest-karaf/run-tests.sh
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/run-tests.sh b/tests/camel-itest-karaf/run-tests.sh
index 25f1145..471ac08 100755
--- a/tests/camel-itest-karaf/run-tests.sh
+++ b/tests/camel-itest-karaf/run-tests.sh
@@ -49,7 +49,7 @@ do
fi
fi
- if [ $found -eq 1 ] && [ $testname != "AbstractFeatureTest" ]
+ if [ $found -eq 1 ] && [ $testname != "BaseKarafTest" ]
then
echo "*******************************************************************"
echo "Running test $testname"
http://git-wip-us.apache.org/repos/asf/camel/blob/44451ab4/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/issues/DuplicateNamespacePrefixIssueTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/issues/DuplicateNamespacePrefixIssueTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/issues/DuplicateNamespacePrefixIssueTest.java
deleted file mode 100644
index 0e42bf5..0000000
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/issues/DuplicateNamespacePrefixIssueTest.java
+++ /dev/null
@@ -1,70 +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.issues;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.blueprint.BlueprintCamelContext;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.itest.karaf.BaseKarafTest;
-import org.apache.camel.model.ModelHelper;
-import org.apache.camel.model.RoutesDefinition;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-
-/**
- * CAMEL-10817: dumpModelAsXml can return invalid XML namespace xmlns:xmlns
- */
-
-@RunWith(PaxExam.class)
-public class DuplicateNamespacePrefixIssueTest extends BaseKarafTest {
-
- @Test
- public void testRoutesNamespacePrefixesNotDuplicated() throws Exception {
- CamelContext context = new BlueprintCamelContext(bundleContext, blueprintContainer);
- context.addRoutes(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("direct:foo").id("foo")
- .choice()
- .when(xpath("foo:foo/foo:foo = 'foo'"))
- .log("Matched foo")
- .when(xpath("foo:foo/foo:bar = 'bar'"))
- .log("Matched bar")
- .when(xpath("foo:foo/foo:cheese = 'cheese'"))
- .log("Matched cheese");
- }
- });
-
- // Dump the model XML
- String originalModelXML = ModelHelper.dumpModelAsXml(context, context.getRouteDefinition("foo"));
-
- // Reload routes from dumped XML
- InputStream stream = new ByteArrayInputStream(originalModelXML.getBytes("UTF-8"));
- RoutesDefinition routesDefinition = ModelHelper.loadRoutesDefinition(context, stream);
-
- // Verify namespaces are as we expect
- String modifiedModelXML = ModelHelper.dumpModelAsXml(context, routesDefinition);
- String modifiedRoutesElementXML = modifiedModelXML.split("\n")[1];
- String expectedRoutesElementXML = "<routes xmlns=\"http://camel.apache.org/schema/spring\">";
- Assert.assertEquals(expectedRoutesElementXML, modifiedRoutesElementXML);
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/44451ab4/tests/camel-itest-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index 48a40fb..8f4eda3 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -38,6 +38,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-blueprint</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-jackson</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/44451ab4/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/DuplicateNamespacePrefixIssueTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/DuplicateNamespacePrefixIssueTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/DuplicateNamespacePrefixIssueTest.java
new file mode 100644
index 0000000..3f5488a
--- /dev/null
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/DuplicateNamespacePrefixIssueTest.java
@@ -0,0 +1,77 @@
+/**
+ * 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;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.blueprint.BlueprintCamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.ModelHelper;
+import org.apache.camel.model.RoutesDefinition;
+import org.apache.camel.test.karaf.AbstractFeatureTest;
+import org.junit.Assert;
+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;
+
+/**
+ * CAMEL-10817: dumpModelAsXml can return invalid XML namespace xmlns:xmlns
+ */
+
+@RunWith(PaxExam.class)
+public class DuplicateNamespacePrefixIssueTest extends AbstractFeatureTest {
+
+ @Test
+ public void testRoutesNamespacePrefixesNotDuplicated() throws Exception {
+ CamelContext context = new BlueprintCamelContext(bundleContext, blueprintContainer);
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:foo").id("foo")
+ .choice()
+ .when(xpath("foo:foo/foo:foo = 'foo'"))
+ .log("Matched foo")
+ .when(xpath("foo:foo/foo:bar = 'bar'"))
+ .log("Matched bar")
+ .when(xpath("foo:foo/foo:cheese = 'cheese'"))
+ .log("Matched cheese");
+ }
+ });
+
+ // Dump the model XML
+ String originalModelXML = ModelHelper.dumpModelAsXml(context, context.getRouteDefinition("foo"));
+
+ // Reload routes from dumped XML
+ InputStream stream = new ByteArrayInputStream(originalModelXML.getBytes("UTF-8"));
+ RoutesDefinition routesDefinition = ModelHelper.loadRoutesDefinition(context, stream);
+
+ // Verify namespaces are as we expect
+ String modifiedModelXML = ModelHelper.dumpModelAsXml(context, routesDefinition);
+ String modifiedRoutesElementXML = modifiedModelXML.split("\n")[1];
+ String expectedRoutesElementXML = "<routes xmlns=\"http://camel.apache.org/schema/spring\">";
+ Assert.assertEquals(expectedRoutesElementXML, modifiedRoutesElementXML);
+ }
+
+ @Configuration
+ public Option[] configure() {
+ return AbstractFeatureTest.configure();
+ }
+}
[2/4] camel git commit: CAMEL-10987: Downgrade JGroups version that
Infinispan depends on to fix CamelInfinispanTest
Posted by da...@apache.org.
CAMEL-10987: Downgrade JGroups version that Infinispan depends on to fix CamelInfinispanTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/146bdc85
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/146bdc85
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/146bdc85
Branch: refs/heads/master
Commit: 146bdc85998e8d7c28e0932df68675b2c374d030
Parents: 44451ab
Author: Tadayoshi Sato <sa...@gmail.com>
Authored: Tue Mar 14 14:57:25 2017 +0900
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 14 09:49:22 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/146bdc85/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cf601ce..0b7a154 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -346,6 +346,7 @@
<jettison-version>1.3.8</jettison-version>
<jgit-version>4.6.1.201703071140-r</jgit-version>
<jgroups-version>4.0.1.Final</jgroups-version>
+ <jgroups-infinispan-version>3.6.13.Final</jgroups-infinispan-version>
<libthrift-version>0.9.3</libthrift-version>
<jibx-version>1.2.6</jibx-version>
<jing-bundle-version>20030619_5</jing-bundle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/146bdc85/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 4caccfc..c4bf366 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -887,7 +887,7 @@
<bundle dependency='true'>mvn:org.infinispan/infinispan-commons/${infinispan-version}</bundle>
<bundle dependency='true'>mvn:org.infinispan/infinispan-query-dsl/${infinispan-version}</bundle>
<bundle dependency='true'>mvn:org.infinispan/infinispan-client-hotrod/${infinispan-version}</bundle>
- <bundle dependency='true'>mvn:org.jgroups/jgroups/${jgroups-version}</bundle>
+ <bundle dependency='true'>mvn:org.jgroups/jgroups/${jgroups-infinispan-version}</bundle>
<bundle dependency='true'>mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.jboss.marshalling/jboss-marshalling-osgi/${jboss-marshalling-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.jboss.marshalling/jboss-marshalling-river/${jboss-marshalling-version}</bundle>
[3/4] camel git commit: CAMEL-10987: Fix CamelMongodbGridfsTest
Posted by da...@apache.org.
CAMEL-10987: Fix CamelMongodbGridfsTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5036306d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5036306d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5036306d
Branch: refs/heads/master
Commit: 5036306d3dbadf4400fc72e783eec6c684e6c1bb
Parents: 146bdc8
Author: Tadayoshi Sato <sa...@gmail.com>
Authored: Tue Mar 14 15:22:05 2017 +0900
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 14 09:49:22 2017 +0100
----------------------------------------------------------------------
.../org/apache/camel/itest/karaf/CamelMongodbGridfsTest.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5036306d/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbGridfsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbGridfsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbGridfsTest.java
index c59fc0b..2a10b0d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbGridfsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbGridfsTest.java
@@ -23,12 +23,11 @@ import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelMongodbGridfsTest extends BaseKarafTest {
- public static final String COMPONENT = "gridfs"; //extractName(CamelMongodbGridfsTest.class);
+ public static final String COMPONENT = extractName(CamelMongodbGridfsTest.class);
@Test
public void test() throws Exception {
- testComponent("mongodb-gridfs", "gridfs");
+ testComponent(COMPONENT);
}
-
-}
\ No newline at end of file
+}