Author: dkulp
Date: Mon Aug 11 13:59:54 2008
New Revision: 684926
URL: http://svn.apache.org/viewvc?rev=684926&view=rev
Log:
Merged revisions 684895,684918 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r684895 | dkulp | 2008-08-11 15:53:58 -0400 (Mon, 11 Aug 2008) | 2 lines
Fix for NPE I'm getting in one of the bundles
........
r684918 | dkulp | 2008-08-11 16:52:26 -0400 (Mon, 11 Aug 2008) | 2 lines
[CXF-1716] Map internal codes to proper soap:fault codes
........
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 11 13:59:54 2008
@@ -1 +1 @@
-/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862
+/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 11 13:59:54 2008
@@ -1 +1 @@
-/cxf/trunk:1-684862
+/cxf/trunk:1-684881,684883-684884,684886-684888,684890-684892,684894-684923
Modified:
cxf/branches/2.0.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java?rev=684926&r1=684925&r2=684926&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
(original)
+++
cxf/branches/2.0.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
Mon Aug 11 13:59:54 2008
@@ -80,7 +80,7 @@
}
public boolean hasTransformedResource() {
- return true;
+ return doc != null;
}
public void modifyOutputStream(JarOutputStream jos) throws IOException {
Modified:
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java?rev=684926&r1=684925&r2=684926&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
(original)
+++
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
Mon Aug 11 13:59:54 2008
@@ -148,6 +148,17 @@
public static SoapFault createFault(Fault f, SoapVersion v) {
if (f instanceof SoapFault) {
+ //make sure the fault code is per spec
+ //if it's one of our internal codes, map it to the proper soap code
+ if
(f.getFaultCode().getNamespaceURI().equals(Fault.FAULT_CODE_CLIENT.getNamespaceURI()))
{
+ QName fc = f.getFaultCode();
+ if (Fault.FAULT_CODE_CLIENT.equals(fc)) {
+ fc = v.getSender();
+ } else if (Fault.FAULT_CODE_SERVER.equals(fc)) {
+ fc = v.getReceiver();
+ }
+ f.setFaultCode(fc);
+ }
return (SoapFault)f;
}
