You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2011/10/20 12:00:26 UTC
svn commit: r1186705 - in /camel/branches/camel-2.8.x: ./
components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/
components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/
Author: ffang
Date: Thu Oct 20 10:00:25 2011
New Revision: 1186705
URL: http://svn.apache.org/viewvc?rev=1186705&view=rev
Log:
Merged revisions 1185978 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1185978 | ffang | 2011-10-19 13:39:18 +0800 (δΈ‰, 19 10 2011) | 1 line
[CAMEL-4553]camel-cxf endpoint should be able to determine soap version from incoming message
........
Added:
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/SetSoapVersionInterceptor.java
- copied unchanged from r1185978, camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/SetSoapVersionInterceptor.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java?rev=1186705&r1=1186704&r2=1186705&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java (original)
+++ camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java Thu Oct 20 10:00:25 2011
@@ -25,8 +25,10 @@ import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import org.apache.camel.component.cxf.interceptors.ConfigureDocLitWrapperInterceptor;
+import org.apache.camel.component.cxf.interceptors.SetSoapVersionInterceptor;
import org.apache.cxf.Bus;
import org.apache.cxf.binding.Binding;
+import org.apache.cxf.binding.soap.SoapBinding;
import org.apache.cxf.binding.soap.interceptor.SoapHeaderInterceptor;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
@@ -93,6 +95,9 @@ public class PayLoadDataFormatFeature ex
@Override
public void initialize(Server server, Bus bus) {
server.getEndpoint().getBinding().getInInterceptors().add(new ConfigureDocLitWrapperInterceptor(true));
+ if (server.getEndpoint().getBinding() instanceof SoapBinding) {
+ server.getEndpoint().getBinding().getOutInterceptors().add(new SetSoapVersionInterceptor());
+ }
// Need to remove some interceptors that are incompatible
// See above.
removeInterceptor(server.getEndpoint().getInInterceptors(),