You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/04/14 08:08:33 UTC
[1/3] camel git commit: Fixed the rest test errors of camel-core when
the CI box have trouble to resolve its hostname
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 7f052361f -> bb3e39951
Fixed the rest test errors of camel-core when the CI box have trouble to resolve its hostname
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2449075c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2449075c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2449075c
Branch: refs/heads/camel-2.15.x
Commit: 2449075c3b360385c6ef5d534336d02332d3e844
Parents: 7f05236
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Apr 14 11:40:33 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Apr 14 14:08:04 2015 +0800
----------------------------------------------------------------------
.../apache/camel/component/rest/FromRestExplicitComponentTest.java | 2 +-
.../org/apache/camel/component/rest/FromRestGetCorsCustomTest.java | 1 +
.../java/org/apache/camel/component/rest/FromRestGetCorsTest.java | 2 +-
.../apache/camel/component/rest/FromRestGetEmbeddedRouteTest.java | 1 +
.../org/apache/camel/component/rest/FromRestGetEndPathTest.java | 1 +
.../apache/camel/component/rest/FromRestGetHttpErrorCodeTest.java | 1 +
.../org/apache/camel/component/rest/FromRestGetInterceptTest.java | 1 +
.../apache/camel/component/rest/FromRestGetOnExceptionTest.java | 1 +
.../camel/component/rest/FromRestGetRouteOnExceptionTest.java | 1 +
.../test/java/org/apache/camel/component/rest/FromRestGetTest.java | 1 +
.../apache/camel/component/rest/FromRestIdAndDescriptionTest.java | 1 +
.../org/apache/camel/component/rest/FromRestUriPrefixTest.java | 1 +
.../camel/management/ManagedFromRestGetEmbeddedRouteTest.java | 1 +
.../java/org/apache/camel/management/ManagedFromRestGetTest.java | 1 +
.../java/org/apache/camel/management/ManagedRestRegistryTest.java | 1 +
15 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2449075c/camel-core/src/test/java/org/apache/camel/component/rest/FromRestExplicitComponentTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestExplicitComponentTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestExplicitComponentTest.java
index 0f98be2..c775504 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestExplicitComponentTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestExplicitComponentTest.java
@@ -26,7 +26,7 @@ public class FromRestExplicitComponentTest extends FromRestGetTest {
@Override
public void configure() throws Exception {
// configure to use dummy-rest
- restConfiguration().component("dummy-rest");
+ restConfiguration().component("dummy-rest").host("localhost");
rest("/say/hello")
.get().to("direct:hello");
http://git-wip-us.apache.org/repos/asf/camel/blob/2449075c/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsCustomTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsCustomTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsCustomTest.java
index 997fbbf..c47ffc2 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsCustomTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsCustomTest.java
@@ -57,6 +57,7 @@ public class FromRestGetCorsCustomTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ restConfiguration().host("localhost");
restConfiguration().enableCORS(true).corsHeaderProperty("Access-Control-Allow-Origin", "myserver");
restConfiguration().enableCORS(true).corsHeaderProperty("Access-Control-Max-Age", "180");
http://git-wip-us.apache.org/repos/asf/camel/blob/2449075c/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsTest.java
index b0b213c..894f220 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsTest.java
@@ -57,7 +57,7 @@ public class FromRestGetCorsTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- restConfiguration().enableCORS(true);
+ restConfiguration().host("localhost").enableCORS(true);
rest("/say/hello")
.get().to("direct:hello");
http://git-wip-us.apache.org/repos/asf/camel/blob/2449075c/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEmbeddedRouteTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEmbeddedRouteTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEmbeddedRouteTest.java
index 071c22e..df9fe91 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEmbeddedRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEmbeddedRouteTest.java
@@ -70,6 +70,7 @@ public class FromRestGetEmbeddedRouteTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ restConfiguration().host("localhost");
rest("/say/hello")
.get()
.route()
http://git-wip-us.apache.org/repos/asf/camel/blob/2449075c/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEndPathTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEndPathTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEndPathTest.java
index a3108c1..14f8b8d 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEndPathTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEndPathTest.java
@@ -57,6 +57,7 @@ public class FromRestGetEndPathTest extends FromRestGetTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ restConfiguration().host("localhost");
rest("/say/hello")
.get().to("direct:hello");
http://git-wip-us.apache.org/repos/asf/camel/blob/2449075c/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetHttpErrorCodeTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetHttpErrorCodeTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetHttpErrorCodeTest.java
index 0ae4b61..d91247c 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetHttpErrorCodeTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetHttpErrorCodeTest.java
@@ -51,6 +51,7 @@ public class FromRestGetHttpErrorCodeTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ restConfiguration().host("localhost");
rest("/say/bye")
.get().route()
.choice()
http://git-wip-us.apache.org/repos/asf/camel/blob/2449075c/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetInterceptTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetInterceptTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetInterceptTest.java
index e0e6f77..62ed09c 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetInterceptTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetInterceptTest.java
@@ -45,6 +45,7 @@ public class FromRestGetInterceptTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ restConfiguration().host("localhost");
intercept().to("mock:intercept");
rest("/say/hello")
http://git-wip-us.apache.org/repos/asf/camel/blob/2449075c/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetOnExceptionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetOnExceptionTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetOnExceptionTest.java
index 365d826..f15df4a 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetOnExceptionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetOnExceptionTest.java
@@ -43,6 +43,7 @@ public class FromRestGetOnExceptionTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ restConfiguration().host("localhost");
onException(IllegalArgumentException.class).handled(true).transform().constant("Handled the error");
rest("/say/hello")
http://git-wip-us.apache.org/repos/asf/camel/blob/2449075c/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetRouteOnExceptionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetRouteOnExceptionTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetRouteOnExceptionTest.java
index a98945d..eba27b1 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetRouteOnExceptionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetRouteOnExceptionTest.java
@@ -25,6 +25,7 @@ public class FromRestGetRouteOnExceptionTest extends FromRestGetOnExceptionTest
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ restConfiguration().host("localhost");
rest("/say/hello")
.get().route()
.onException(IllegalArgumentException.class).handled(true).transform().constant("Handled the error").end()
http://git-wip-us.apache.org/repos/asf/camel/blob/2449075c/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java
index f6f73ec..f332d9a 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java
@@ -70,6 +70,7 @@ public class FromRestGetTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ restConfiguration().host("localhost");
rest("/say/hello")
.get().to("direct:hello");
http://git-wip-us.apache.org/repos/asf/camel/blob/2449075c/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java
index 3547e77..6dc90b7 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java
@@ -45,6 +45,7 @@ public class FromRestIdAndDescriptionTest extends FromRestGetTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ restConfiguration().host("localhost");
rest("/say/hello").id("hello").description("Hello Service")
.get().id("get-say").description("Says hello to you").to("direct:hello");
http://git-wip-us.apache.org/repos/asf/camel/blob/2449075c/camel-core/src/test/java/org/apache/camel/component/rest/FromRestUriPrefixTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestUriPrefixTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestUriPrefixTest.java
index 7eade0c..d71dad3 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestUriPrefixTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestUriPrefixTest.java
@@ -54,6 +54,7 @@ public class FromRestUriPrefixTest extends FromRestGetTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ restConfiguration().host("localhost");
// we have logic to cleanup those paths so there is only one / between the paths
rest("/say/")
.get("/hello").to("direct:hello")
http://git-wip-us.apache.org/repos/asf/camel/blob/2449075c/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetEmbeddedRouteTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetEmbeddedRouteTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetEmbeddedRouteTest.java
index bfce4a1..6df0782 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetEmbeddedRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetEmbeddedRouteTest.java
@@ -73,6 +73,7 @@ public class ManagedFromRestGetEmbeddedRouteTest extends ManagementTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ restConfiguration().host("localhost");
rest("/say/hello")
.get()
.route()
http://git-wip-us.apache.org/repos/asf/camel/blob/2449075c/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java
index 6bc98be..7b7a2f2 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java
@@ -72,6 +72,7 @@ public class ManagedFromRestGetTest extends ManagementTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ restConfiguration().host("localhost");
rest("/say/hello")
.get().to("direct:hello");
http://git-wip-us.apache.org/repos/asf/camel/blob/2449075c/camel-core/src/test/java/org/apache/camel/management/ManagedRestRegistryTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRestRegistryTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRestRegistryTest.java
index e0a6d90..a6976be 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedRestRegistryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRestRegistryTest.java
@@ -80,6 +80,7 @@ public class ManagedRestRegistryTest extends ManagementTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ restConfiguration().host("localhost");
rest("/say/hello/{name}")
.get().to("direct:hello").description("Calling direct route");
[2/3] camel git commit: Skip the mongodb unit test in HP-UX as there
is no embed.mongo support
Posted by ni...@apache.org.
Skip the mongodb unit test in HP-UX as there is no embed.mongo support
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3161e05c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3161e05c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3161e05c
Branch: refs/heads/camel-2.15.x
Commit: 3161e05c8b54f9a010fcc7f8a645556c443bfc36
Parents: 2449075
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Apr 14 11:55:57 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Apr 14 14:08:12 2015 +0800
----------------------------------------------------------------------
components/camel-mongodb/pom.xml | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3161e05c/components/camel-mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml
index e02b7ea..f860e8c 100644
--- a/components/camel-mongodb/pom.xml
+++ b/components/camel-mongodb/pom.xml
@@ -79,7 +79,7 @@
</dependency>
</dependencies>
- <!-- skip tests on AIX -->
+ <!-- skip tests on AIX and HP-UX -->
<profiles>
<profile>
<id>aix</id>
@@ -92,6 +92,17 @@
<skipTests>true</skipTests>
</properties>
</profile>
+ <profile>
+ <id>hpux</id>
+ <activation>
+ <os>
+ <family>HP-UX</family>
+ </os>
+ </activation>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ </profile>
</profiles>
</project>
[3/3] camel git commit: Skip the unit tests of camel-leveldb in HP-UX
Posted by ni...@apache.org.
Skip the unit tests of camel-leveldb in HP-UX
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bb3e3995
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bb3e3995
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bb3e3995
Branch: refs/heads/camel-2.15.x
Commit: bb3e39951c0b12a36352effcbd4f4693d0b39400
Parents: 3161e05
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Apr 14 13:48:56 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Apr 14 14:08:21 2015 +0800
----------------------------------------------------------------------
components/camel-leveldb/pom.xml | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bb3e3995/components/camel-leveldb/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index c4945fb..f275296 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -87,7 +87,7 @@
</plugins>
</build>
- <!-- skip tests on Windows and AIX -->
+ <!-- skip tests on Windows, AIX and HP-UX -->
<profiles>
<profile>
<id>windows</id>
@@ -111,5 +111,16 @@
<skipTests>true</skipTests>
</properties>
</profile>
+ <profile>
+ <id>hpux</id>
+ <activation>
+ <os>
+ <family>HP-UX</family>
+ </os>
+ </activation>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ </profile>
</profiles>
</project>