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 2014/09/28 05:01:40 UTC
[1/2] git commit: CAMEL-7856 Fixed the test error with JDK7
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 01136bfcc -> daeb5595b
refs/heads/camel-2.14.x ce90e4379 -> fbc22e54c
CAMEL-7856 Fixed the test error with JDK7
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fbc22e54
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fbc22e54
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fbc22e54
Branch: refs/heads/camel-2.14.x
Commit: fbc22e54cabe120ab497be5949cdbaeb9d2f3a51
Parents: ce90e43
Author: Willem Jiang <wi...@gmail.com>
Authored: Sun Sep 28 10:59:39 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Sep 28 11:00:46 2014 +0800
----------------------------------------------------------------------
.../org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java | 4 ++--
.../org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml | 4 ++--
.../camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml | 6 +-----
3 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fbc22e54/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
index 1a04617..8e7eca0 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
@@ -406,8 +406,8 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate
return ignoreDeleteMethodMessageBody;
}
- public void setIgnoreDELETEMethodMessageBody(boolean ignoreDELETEMethodMessageBody) {
- this.ignoreDeleteMethodMessageBody = ignoreDELETEMethodMessageBody;
+ public void setIgnoreDeleteMethodMessageBody(boolean ignoreDeleteMethodMessageBody) {
+ this.ignoreDeleteMethodMessageBody = ignoreDeleteMethodMessageBody;
}
public BindingStyle getBindingStyle() {
http://git-wip-us.apache.org/repos/asf/camel/blob/fbc22e54/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml
index 172aac1..52d9d7f 100644
--- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml
+++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml
@@ -64,9 +64,9 @@
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
<route>
<!-- Just need to ignoreDeleteMethodMessageBody -->
- <from uri="cxfrs://bean://rsServer?ignoreDeleteMethodMessageBody=true"/>
+ <from uri="cxfrs://bean://rsServer"/>
<to uri="log:body?level=INFO"/>
- <to uri="cxfrs://bean://rsClient"/>
+ <to uri="cxfrs://bean://rsClient?ignoreDeleteMethodMessageBody=true"/>
</route>
</camelContext>
http://git-wip-us.apache.org/repos/asf/camel/blob/fbc22e54/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml
index 074bf89..0a2adce 100644
--- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml
+++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml
@@ -52,11 +52,7 @@
<route>
<!-- Jetty server can be used to proxy the request to cxfrs client -->
<from uri="jetty://http://localhost:{{CXFTestSupport.port5}}/CxfRsRouterTest/route?matchOnUriPrefix=true&bridgeEndpoint=true"/>
- <!-- We can remove this configure as the CXFRS producer is using the HttpAPI by default -->
- <setHeader headerName="CamelCxfRsUsingHttpAPI">
- <constant>True</constant>
- </setHeader>
- <to uri="cxfrs://bean://rsClient"/>
+ <to uri="cxfrs://bean://rsClient?ignoreDeleteMethodMessageBody=true"/>
</route>
</camelContext>
[2/2] git commit: CAMEL-7856 Fixed the test error with JDK7
Posted by ni...@apache.org.
CAMEL-7856 Fixed the test error with JDK7
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/daeb5595
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/daeb5595
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/daeb5595
Branch: refs/heads/camel-2.12.x
Commit: daeb5595b0d588b9a8231c0f232adaaa124bd38d
Parents: 01136bf
Author: Willem Jiang <wi...@gmail.com>
Authored: Sun Sep 28 10:59:39 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Sep 28 11:01:16 2014 +0800
----------------------------------------------------------------------
.../org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java | 4 ++--
.../org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml | 4 ++--
.../camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml | 6 +-----
3 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/daeb5595/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
index cd84fb2..f56bca8 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
@@ -394,8 +394,8 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate
return ignoreDeleteMethodMessageBody;
}
- public void setIgnoreDELETEMethodMessageBody(boolean ignoreDELETEMethodMessageBody) {
- this.ignoreDeleteMethodMessageBody = ignoreDELETEMethodMessageBody;
+ public void setIgnoreDeleteMethodMessageBody(boolean ignoreDeleteMethodMessageBody) {
+ this.ignoreDeleteMethodMessageBody = ignoreDeleteMethodMessageBody;
}
public BindingStyle getBindingStyle() {
http://git-wip-us.apache.org/repos/asf/camel/blob/daeb5595/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml
index 8661382..b829898 100644
--- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml
+++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml
@@ -56,9 +56,9 @@
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
<route>
<!-- Just need to ignoreDeleteMethodMessageBody -->
- <from uri="cxfrs://bean://rsServer?ignoreDeleteMethodMessageBody=true"/>
+ <from uri="cxfrs://bean://rsServer"/>
<to uri="log:body?level=INFO"/>
- <to uri="cxfrs://bean://rsClient"/>
+ <to uri="cxfrs://bean://rsClient?ignoreDeleteMethodMessageBody=true"/>
</route>
</camelContext>
http://git-wip-us.apache.org/repos/asf/camel/blob/daeb5595/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml
index 074bf89..0a2adce 100644
--- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml
+++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml
@@ -52,11 +52,7 @@
<route>
<!-- Jetty server can be used to proxy the request to cxfrs client -->
<from uri="jetty://http://localhost:{{CXFTestSupport.port5}}/CxfRsRouterTest/route?matchOnUriPrefix=true&bridgeEndpoint=true"/>
- <!-- We can remove this configure as the CXFRS producer is using the HttpAPI by default -->
- <setHeader headerName="CamelCxfRsUsingHttpAPI">
- <constant>True</constant>
- </setHeader>
- <to uri="cxfrs://bean://rsClient"/>
+ <to uri="cxfrs://bean://rsClient?ignoreDeleteMethodMessageBody=true"/>
</route>
</camelContext>