You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/07/04 15:29:27 UTC
svn commit: r1357254 - in /camel/trunk/components/camel-soap/src:
main/java/org/apache/camel/dataformat/soap/
test/resources/org/apache/camel/dataformat/soap/
Author: davsclaus
Date: Wed Jul 4 13:29:27 2012
New Revision: 1357254
URL: http://svn.apache.org/viewvc?rev=1357254&view=rev
Log:
CAMEL-5419: Fixed soap data format to use consistent soap 1.1 namespace when setting fault.
Modified:
camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedFault.xml
camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/responseFault.xml
Modified: camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java?rev=1357254&r1=1357253&r2=1357254&view=diff
==============================================================================
--- camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java (original)
+++ camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java Wed Jul 4 13:29:27 2012
@@ -64,7 +64,7 @@ public class SoapJaxbDataFormat extends
private static final String SOAP_PACKAGE_NAME = Envelope.class.getPackage().getName();
- private static final QName FAULT_CODE_SERVER = new QName("http://www.w3.org/2003/05/soap-envelope", "Receiver");
+ private static final QName FAULT_CODE_SERVER = new QName("http://schemas.xmlsoap.org/soap/envelope/", "Receiver");
protected final transient Logger log = LoggerFactory.getLogger(getClass());
Modified: camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedFault.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedFault.xml?rev=1357254&r1=1357253&r2=1357254&view=diff
==============================================================================
--- camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedFault.xml (original)
+++ camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedFault.xml Wed Jul 4 13:29:27 2012
@@ -20,7 +20,7 @@
<ns2:Envelope xmlns:ns2="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns3="http://customerservice.example.com/">
<ns2:Body>
<ns2:Fault>
- <faultcode xmlns:ns4="http://www.w3.org/2003/05/soap-envelope">ns4:Receiver</faultcode>
+ <faultcode>ns2:Receiver</faultcode>
<faultstring>No customer found</faultstring>
<detail>
<ns3:NoSuchCustomer>
Modified: camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/responseFault.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/responseFault.xml?rev=1357254&r1=1357253&r2=1357254&view=diff
==============================================================================
--- camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/responseFault.xml (original)
+++ camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/responseFault.xml Wed Jul 4 13:29:27 2012
@@ -20,7 +20,7 @@
<ns2:Envelope xmlns:ns2="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns3="http://customerservice.example.com/">
<ns2:Body>
<ns2:Fault>
- <faultcode xmlns:ns4="http://www.w3.org/2003/05/soap-envelope">ns4:Receiver</faultcode>
+ <faultcode>ns2:Receiver</faultcode>
<faultstring>Customer not found</faultstring>
<detail>
<ns3:NoSuchCustomer>