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/ca14720c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ca14720c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ca14720c Branch: refs/remotes/origin/camel-2.13.x Commit: ca14720c727f2f26005f41135460223642b37cc3 Parents: 234df76 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Sun Sep 28 10:59:39 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Sun Sep 28 14:08:37 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/ca14720c/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 b4b63a1..9cf869f 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 @@ -392,8 +392,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/ca14720c/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/ca14720c/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>
