You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/03/06 20:26:43 UTC
svn commit: r751044 - in /cxf/branches/2.0.x-fixes: ./
rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/
rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/
Author: dkulp
Date: Fri Mar 6 19:26:42 2009
New Revision: 751044
URL: http://svn.apache.org/viewvc?rev=751044&view=rev
Log:
Merged revisions 750980 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................
r750980 | dkulp | 2009-03-06 11:58:22 -0500 (Fri, 06 Mar 2009) | 9 lines
Merged revisions 749890 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r749890 | dkulp | 2009-03-03 22:38:10 -0500 (Tue, 03 Mar 2009) | 2 lines
Fix issues where the response code for faults is potentially set AFTER data has already started to stream back to the client.
........
................
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 6 19:26:42 2009
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes: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,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747464,747466,747471,747477,747817,748248,748324,748605,748607-748608,749372,750958,750971,750973,750977
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374,747217,747386,747406,747454,747766,748223,748305,748313,748603-748604,748768,749511,749584,749767,749771
+/cxf/branches/2.1.x-fixes: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,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747464,747466,747471,747477,747817,748248,748324,748605,748607-748608,749372,750958,750971,750973,750977,750980
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374,747217,747386,747406,747454,747766,748223,748305,748313,748603-748604,748768,749511,749584,749767,749771,749890
/incubator/cxf/trunk:434594-651668
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java?rev=751044&r1=751043&r2=751044&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java (original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java Fri Mar 6 19:26:42 2009
@@ -44,101 +44,110 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(Soap11FaultOutInterceptor.class);
public Soap11FaultOutInterceptor() {
- super(Phase.MARSHAL);
+ super(Phase.PREPARE_SEND);
}
-
public void handleMessage(SoapMessage message) throws Fault {
message.put(org.apache.cxf.message.Message.RESPONSE_CODE, new Integer(500));
-
- XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
- Fault f = (Fault) message.getContent(Exception.class);
-
- SoapFault fault = SoapFault.createFault(f, message.getVersion());
-
- try {
- Map<String, String> namespaces = fault.getNamespaces();
- for (Map.Entry<String, String> e : namespaces.entrySet()) {
- writer.writeNamespace(e.getKey(), e.getValue());
- }
-
- String ns = message.getVersion().getNamespace();
- String defaultPrefix = writer.getPrefix(ns);
- if (defaultPrefix == null) {
- defaultPrefix = StaxUtils.getUniquePrefix(writer, ns, false);
- writer.writeStartElement(defaultPrefix, "Fault", ns);
- writer.writeNamespace(defaultPrefix, ns);
- } else {
- writer.writeStartElement(defaultPrefix, "Fault", ns);
- }
-
- writer.writeStartElement("faultcode");
-
- String codeString = fault.getCodeString(getFaultCodePrefix(writer, fault.getFaultCode()),
- defaultPrefix);
-
- writer.writeCharacters(codeString);
- writer.writeEndElement();
-
- writer.writeStartElement("faultstring");
- if (fault.getMessage() != null) {
- writer.writeCharacters(fault.getMessage());
- } else {
- writer.writeCharacters("Fault occurred while processing.");
- }
- writer.writeEndElement();
- String config = (String)message.getContextualProperty(
- org.apache.cxf.message.Message.FAULT_STACKTRACE_ENABLED);
- if (config != null && Boolean.valueOf(config).booleanValue() && fault.getCause() != null) {
- StringBuffer sb = new StringBuffer();
- for (StackTraceElement ste : fault.getCause().getStackTrace()) {
- sb.append(ste.getClassName() + "!" + ste.getMethodName() + "!" + ste.getFileName()
- + "!" + ste.getLineNumber() + "\n");
- }
- try {
- Element detail = fault.getDetail();
- if (detail == null) {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- Document doc = factory.newDocumentBuilder().newDocument();
- Element stackTrace = doc.createElementNS(Soap11.SOAP_NAMESPACE, Fault.STACKTRACE);
- stackTrace.setTextContent(sb.toString());
- detail = doc.createElementNS(Soap11.SOAP_NAMESPACE, "detail");
- fault.setDetail(detail);
- detail.appendChild(stackTrace);
- } else {
- Element stackTrace = detail.getOwnerDocument().createElementNS(
- Soap11.SOAP_NAMESPACE, Fault.STACKTRACE);
- detail.appendChild(stackTrace);
- }
- } catch (ParserConfigurationException pe) {
- // move on...
+ message.getInterceptorChain().add(Soap11FaultOutInterceptorInternal.INSTANCE);
+ }
+
+ static class Soap11FaultOutInterceptorInternal extends AbstractSoapInterceptor {
+ static final Soap11FaultOutInterceptorInternal INSTANCE = new Soap11FaultOutInterceptorInternal();
+
+ public Soap11FaultOutInterceptorInternal() {
+ super(Phase.MARSHAL);
+ }
+ public void handleMessage(SoapMessage message) throws Fault {
+ XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
+ Fault f = (Fault) message.getContent(Exception.class);
+
+ SoapFault fault = SoapFault.createFault(f, message.getVersion());
+
+ try {
+ Map<String, String> namespaces = fault.getNamespaces();
+ for (Map.Entry<String, String> e : namespaces.entrySet()) {
+ writer.writeNamespace(e.getKey(), e.getValue());
}
- }
-
- if (fault.hasDetails()) {
- Element detail = fault.getDetail();
- writer.writeStartElement("detail");
-
- Node node = detail.getFirstChild();
- while (node != null) {
- StaxUtils.writeNode(node, writer, true);
- node = node.getNextSibling();
+
+ String ns = message.getVersion().getNamespace();
+ String defaultPrefix = writer.getPrefix(ns);
+ if (defaultPrefix == null) {
+ defaultPrefix = StaxUtils.getUniquePrefix(writer, ns, false);
+ writer.writeStartElement(defaultPrefix, "Fault", ns);
+ writer.writeNamespace(defaultPrefix, ns);
+ } else {
+ writer.writeStartElement(defaultPrefix, "Fault", ns);
}
-
- // Details
+
+ writer.writeStartElement("faultcode");
+
+ String codeString = fault.getCodeString(getFaultCodePrefix(writer, fault.getFaultCode()),
+ defaultPrefix);
+
+ writer.writeCharacters(codeString);
writer.writeEndElement();
- }
-
- if (fault.getRole() != null) {
- writer.writeStartElement("faultactor");
- writer.writeCharacters(fault.getRole());
+
+ writer.writeStartElement("faultstring");
+ if (fault.getMessage() != null) {
+ writer.writeCharacters(fault.getMessage());
+ } else {
+ writer.writeCharacters("Fault occurred while processing.");
+ }
+ writer.writeEndElement();
+ String config = (String)message.getContextualProperty(
+ org.apache.cxf.message.Message.FAULT_STACKTRACE_ENABLED);
+ if (config != null && Boolean.valueOf(config).booleanValue() && fault.getCause() != null) {
+ StringBuffer sb = new StringBuffer();
+ for (StackTraceElement ste : fault.getCause().getStackTrace()) {
+ sb.append(ste.getClassName() + "!" + ste.getMethodName() + "!" + ste.getFileName()
+ + "!" + ste.getLineNumber() + "\n");
+ }
+ try {
+ Element detail = fault.getDetail();
+ if (detail == null) {
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ Document doc = factory.newDocumentBuilder().newDocument();
+ Element stackTrace = doc.createElementNS(Soap11.SOAP_NAMESPACE, Fault.STACKTRACE);
+ stackTrace.setTextContent(sb.toString());
+ detail = doc.createElementNS(Soap11.SOAP_NAMESPACE, "detail");
+ fault.setDetail(detail);
+ detail.appendChild(stackTrace);
+ } else {
+ Element stackTrace = detail.getOwnerDocument().createElementNS(
+ Soap11.SOAP_NAMESPACE, Fault.STACKTRACE);
+ detail.appendChild(stackTrace);
+ }
+ } catch (ParserConfigurationException pe) {
+ // move on...
+ }
+ }
+
+ if (fault.hasDetails()) {
+ Element detail = fault.getDetail();
+ writer.writeStartElement("detail");
+
+ Node node = detail.getFirstChild();
+ while (node != null) {
+ StaxUtils.writeNode(node, writer, true);
+ node = node.getNextSibling();
+ }
+
+ // Details
+ writer.writeEndElement();
+ }
+
+ if (fault.getRole() != null) {
+ writer.writeStartElement("faultactor");
+ writer.writeCharacters(fault.getRole());
+ writer.writeEndElement();
+ }
+
+ // Fault
writer.writeEndElement();
+ } catch (XMLStreamException xe) {
+ throw new Fault(new Message("XML_WRITE_EXC", BUNDLE), xe);
}
-
- // Fault
- writer.writeEndElement();
- } catch (XMLStreamException xe) {
- throw new Fault(new Message("XML_WRITE_EXC", BUNDLE), xe);
}
}
}
Modified: cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java?rev=751044&r1=751043&r2=751044&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java (original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java Fri Mar 6 19:26:42 2009
@@ -34,97 +34,108 @@
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.staxutils.StaxUtils;
public class Soap12FaultOutInterceptor extends AbstractSoapInterceptor {
- private static final Logger LOG = LogUtils.getL7dLogger(URIMappingInterceptor.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(Soap12FaultOutInterceptor.class);
public Soap12FaultOutInterceptor() {
- super(Phase.MARSHAL);
+ super(Phase.PREPARE_SEND);
}
-
public void handleMessage(SoapMessage message) throws Fault {
- LOG.info(getClass() + (String) message.get(SoapMessage.CONTENT_TYPE));
message.put(org.apache.cxf.message.Message.RESPONSE_CODE, new Integer(500));
+ message.getInterceptorChain().add(Soap12FaultOutInterceptorInternal.INSTANCE);
+ }
+
+ static class Soap12FaultOutInterceptorInternal extends AbstractSoapInterceptor {
+ static final Soap12FaultOutInterceptorInternal INSTANCE = new Soap12FaultOutInterceptorInternal();
- XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
- Fault f = (Fault)message.getContent(Exception.class);
-
- SoapFault fault = SoapFault.createFault(f, message.getVersion());
-
- try {
- Map<String, String> namespaces = fault.getNamespaces();
- for (Map.Entry<String, String> e : namespaces.entrySet()) {
- writer.writeNamespace(e.getKey(), e.getValue());
- }
-
- String ns = message.getVersion().getNamespace();
- String defaultPrefix = StaxUtils.getUniquePrefix(writer, ns, true);
-
- writer.writeStartElement(defaultPrefix, "Fault", ns);
-
- writer.writeStartElement(defaultPrefix, "Code", ns);
- writer.writeStartElement(defaultPrefix, "Value", ns);
-
- writer.writeCharacters(fault.getCodeString(getFaultCodePrefix(writer, fault.getFaultCode()),
- defaultPrefix));
- writer.writeEndElement();
+ public Soap12FaultOutInterceptorInternal() {
+ super(Phase.MARSHAL);
+ }
+ public void handleMessage(SoapMessage message) throws Fault {
+ LOG.info(getClass() + (String) message.get(SoapMessage.CONTENT_TYPE));
+ message.put(org.apache.cxf.message.Message.RESPONSE_CODE, new Integer(500));
- if (fault.getSubCode() != null) {
- writer.writeStartElement(defaultPrefix, "Subcode", ns);
+ XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
+ Fault f = (Fault)message.getContent(Exception.class);
+
+ SoapFault fault = SoapFault.createFault(f, message.getVersion());
+
+ try {
+ Map<String, String> namespaces = fault.getNamespaces();
+ for (Map.Entry<String, String> e : namespaces.entrySet()) {
+ writer.writeNamespace(e.getKey(), e.getValue());
+ }
+
+ String ns = message.getVersion().getNamespace();
+ String defaultPrefix = StaxUtils.getUniquePrefix(writer, ns, true);
+
+ writer.writeStartElement(defaultPrefix, "Fault", ns);
+
+ writer.writeStartElement(defaultPrefix, "Code", ns);
writer.writeStartElement(defaultPrefix, "Value", ns);
- writer.writeCharacters(fault.getSubCodeString(getFaultCodePrefix(writer, fault.getSubCode()),
- defaultPrefix));
+
+ writer.writeCharacters(fault.getCodeString(getFaultCodePrefix(writer, fault.getFaultCode()),
+ defaultPrefix));
writer.writeEndElement();
+
+ if (fault.getSubCode() != null) {
+ writer.writeStartElement(defaultPrefix, "Subcode", ns);
+ writer.writeStartElement(defaultPrefix, "Value", ns);
+ writer.writeCharacters(fault.getSubCodeString(getFaultCodePrefix(writer,
+ fault.getSubCode()),
+ defaultPrefix));
+ writer.writeEndElement();
+ writer.writeEndElement();
+ }
writer.writeEndElement();
- }
- writer.writeEndElement();
-
- writer.writeStartElement(defaultPrefix, "Reason", ns);
- writer.writeStartElement(defaultPrefix, "Text", ns);
- writer.writeAttribute("xml", "http://www.w3.org/XML/1998/namespace", "lang ", getLangCode());
- if (fault.getMessage() != null) {
- writer.writeCharacters(fault.getMessage());
- } else {
- writer.writeCharacters("Fault occurred while processing.");
- }
- writer.writeEndElement();
- writer.writeEndElement();
-
- if (fault.hasDetails()) {
- Element detail = fault.getDetail();
- writer.writeStartElement(defaultPrefix, "Detail", ns);
-
- Node node = detail.getFirstChild();
- while (node != null) {
- StaxUtils.writeNode(node, writer, true);
- node = node.getNextSibling();
+
+ writer.writeStartElement(defaultPrefix, "Reason", ns);
+ writer.writeStartElement(defaultPrefix, "Text", ns);
+ writer.writeAttribute("xml", "http://www.w3.org/XML/1998/namespace", "lang ", getLangCode());
+ if (fault.getMessage() != null) {
+ writer.writeCharacters(fault.getMessage());
+ } else {
+ writer.writeCharacters("Fault occurred while processing.");
}
-
- // Details
writer.writeEndElement();
- }
-
- if (fault.getRole() != null) {
- writer.writeStartElement("faultactor");
- writer.writeCharacters(fault.getRole());
writer.writeEndElement();
+
+ if (fault.hasDetails()) {
+ Element detail = fault.getDetail();
+ writer.writeStartElement(defaultPrefix, "Detail", ns);
+
+ Node node = detail.getFirstChild();
+ while (node != null) {
+ StaxUtils.writeNode(node, writer, true);
+ node = node.getNextSibling();
+ }
+
+ // Details
+ writer.writeEndElement();
+ }
+
+ if (fault.getRole() != null) {
+ writer.writeStartElement("faultactor");
+ writer.writeCharacters(fault.getRole());
+ writer.writeEndElement();
+ }
+
+ // Fault
+ writer.writeEndElement();
+ } catch (XMLStreamException xe) {
+ throw new Fault(new Message("XML_WRITE_EXC", LOG), xe);
}
-
- // Fault
- writer.writeEndElement();
- } catch (XMLStreamException xe) {
- throw new Fault(new Message("XML_WRITE_EXC", LOG), xe);
}
- }
-
- private String getLangCode() {
- String code = LOG.getResourceBundle().getLocale().getDisplayLanguage();
- if (StringUtils.isEmpty(code)) {
- return "en";
+
+ private String getLangCode() {
+ String code = LOG.getResourceBundle().getLocale().getDisplayLanguage();
+ if (StringUtils.isEmpty(code)) {
+ return "en";
+ }
+ return code;
}
- return code;
}
-}
+}
\ No newline at end of file
Modified: cxf/branches/2.0.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java?rev=751044&r1=751043&r2=751044&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java (original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java Fri Mar 6 19:26:42 2009
@@ -32,6 +32,8 @@
import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.binding.soap.interceptor.Soap11FaultOutInterceptor.Soap11FaultOutInterceptorInternal;
+import org.apache.cxf.binding.soap.interceptor.Soap12FaultOutInterceptor.Soap12FaultOutInterceptorInternal;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.ExchangeImpl;
@@ -58,8 +60,7 @@
m.setContent(XMLStreamWriter.class, writer);
- Soap11FaultOutInterceptor interceptor = new Soap11FaultOutInterceptor();
- interceptor.handleMessage(m);
+ Soap11FaultOutInterceptorInternal.INSTANCE.handleMessage(m);
writer.writeEndElement();
writer.writeEndDocument();
@@ -103,8 +104,7 @@
m.setContent(XMLStreamWriter.class, writer);
- Soap12FaultOutInterceptor interceptor = new Soap12FaultOutInterceptor();
- interceptor.handleMessage(m);
+ Soap12FaultOutInterceptorInternal.INSTANCE.handleMessage(m);
writer.writeEndElement();
writer.writeEndDocument();