camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject git commit: Reverted the camel-cxf patch which should not be committed
Date Wed, 04 Sep 2013 02:43:14 GMT
Updated Branches:
  refs/heads/camel-2.12.x 692bf5eb4 -> 80d6b6641


Reverted the camel-cxf patch which should not be committed


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/80d6b664
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/80d6b664
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/80d6b664

Branch: refs/heads/camel-2.12.x
Commit: 80d6b6641d6d29e460891ba454af4b58d0065ab1
Parents: 692bf5e
Author: Willem Jiang <ningjiang@apache.org>
Authored: Wed Sep 4 10:39:19 2013 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Wed Sep 4 10:41:22 2013 +0800

----------------------------------------------------------------------
 .../camel/component/cxf/feature/CXFMessageDataFormatFeature.java | 2 --
 .../camel/component/cxf/wssecurity/camel/camel-context.xml       | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/80d6b664/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
index 846564e..ad1147d 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
@@ -23,7 +23,6 @@ import java.util.Collection;
 import javax.xml.soap.SOAPMessage;
 import javax.xml.transform.Source;
 
-import org.apache.camel.component.cxf.interceptors.SoapMessageRedirectInterceptor;
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.Binding;
 import org.apache.cxf.binding.soap.SoapBinding;
@@ -86,7 +85,6 @@ public class CXFMessageDataFormatFeature extends AbstractDataFormatFeature
{
             ep.getInInterceptors().add(new SAAJInInterceptor());          
             SAAJOutInterceptor out = new SAAJOutInterceptor();
             ep.getOutInterceptors().add(out);
-            ep.getOutInterceptors().add(new SoapMessageRedirectInterceptor());
             ep.getOutInterceptors().add(new MessageModeOutInterceptor(out, ep.getBinding().getBindingInfo().getName()));
             fmt = SOAPMessage.class;
         } else {

http://git-wip-us.apache.org/repos/asf/camel/blob/80d6b664/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
index 3bbdbff..c8eb963 100644
--- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
+++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
@@ -68,9 +68,9 @@
   <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
    <route errorHandlerRef="noErrorHandler">
        <from uri="cxf:bean:route" />
-       <!-- process ref="myProcessor" /-->
+       <process ref="myProcessor" />
        <to uri="cxf:bean:service"/>
-       <!-- process ref="myProcessor" /-->
+       <process ref="myProcessor" />
    </route>
 
   </camelContext>


Mime
View raw message