svn commit: r1185978 - in /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: feature/PayLoadDataFormatFeature.java interceptors/SetSoapVersionInterceptor.java

[ff...@apache.org]

Author: ffang
Date: Wed Oct 19 05:39:18 2011
New Revision: 1185978

URL: http://svn.apache.org/viewvc?rev=1185978&view=rev
Log:
[CAMEL-4553]camel-cxf endpoint should be able to determine soap version from incoming message

Added:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/SetSoapVersionInterceptor.java
Modified:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java?rev=1185978&r1=1185977&r2=1185978&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java Wed Oct 19 05:39:18 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(), 

Added: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/SetSoapVersionInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/SetSoapVersionInterceptor.java?rev=1185978&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/SetSoapVersionInterceptor.java (added)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/SetSoapVersionInterceptor.java Wed Oct 19 05:39:18 2011
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.cxf.interceptors;
+
+import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
+import org.apache.cxf.binding.soap.interceptor.SoapOutInterceptor;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.phase.Phase;
+
+public class SetSoapVersionInterceptor extends AbstractSoapInterceptor {
+
+    public SetSoapVersionInterceptor() {
+        super(Phase.WRITE);
+        addBefore(SoapOutInterceptor.class.getName());
+    }
+    public void handleMessage(SoapMessage message) throws Fault {
+        if (message.getExchange() != null) { 
+            if (message.getExchange().getInMessage() instanceof SoapMessage) {
+                ((SoapMessage)message).setVersion(((SoapMessage)message.getExchange().getInMessage()).getVersion());
+            } 
+        }
+    }
+
+}