Author: davsclaus
Date: Wed Jul 4 13:36:51 2012
New Revision: 1357260
URL: http://svn.apache.org/viewvc?rev=1357260&view=rev
Log:
CAMEL-5419: Fixed soap data format to use consistent soap 1.1 namespace when
setting fault.
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedFault.xml
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/responseFault.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1357254
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java?rev=1357260&r1=1357259&r2=1357260&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
Wed Jul 4 13:36:51 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/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedFault.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedFault.xml?rev=1357260&r1=1357259&r2=1357260&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedFault.xml
(original)
+++
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedFault.xml
Wed Jul 4 13:36:51 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/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/responseFault.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/responseFault.xml?rev=1357260&r1=1357259&r2=1357260&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/responseFault.xml
(original)
+++
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/responseFault.xml
Wed Jul 4 13:36:51 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>
