You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2013/03/10 15:14:05 UTC
svn commit: r1454853 - in /webservices/axiom/trunk/modules/axiom-dom/src:
main/java/org/apache/axiom/soap/impl/dom/factory/
main/java/org/apache/axiom/soap/impl/dom/soap11/
main/java/org/apache/axiom/soap/impl/dom/soap12/
test/java/org/apache/axiom/soa...
Author: veithen
Date: Sun Mar 10 14:14:04 2013
New Revision: 1454853
URL: http://svn.apache.org/r1454853
Log:
AXIOM-448: Fixed DOOM's broken SOAPFactory#getDefaultFaultEnvelope method.
Modified:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/factory/DOMSOAPFactory.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java
webservices/axiom/trunk/modules/axiom-dom/src/test/java/org/apache/axiom/soap/impl/dom/SOAPImplementationTest.java
Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/factory/DOMSOAPFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/factory/DOMSOAPFactory.java?rev=1454853&r1=1454852&r2=1454853&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/factory/DOMSOAPFactory.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/factory/DOMSOAPFactory.java Sun Mar 10 14:14:04 2013
@@ -27,10 +27,7 @@ import org.apache.axiom.om.impl.dom.fact
import org.apache.axiom.om.impl.dom.factory.OMDOMMetaFactory;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.soap.SOAPFaultCode;
import org.apache.axiom.soap.SOAPFaultNode;
-import org.apache.axiom.soap.SOAPFaultReason;
import org.apache.axiom.soap.SOAPFaultSubCode;
import org.apache.axiom.soap.SOAPFaultText;
import org.apache.axiom.soap.SOAPFaultValue;
@@ -65,23 +62,6 @@ public abstract class DOMSOAPFactory ext
return env;
}
- public SOAPEnvelope getDefaultFaultEnvelope() throws SOAPProcessingException {
- SOAPEnvelope defaultEnvelope = getDefaultEnvelope();
- SOAPFault fault = createSOAPFault(defaultEnvelope.getBody());
-
- SOAPFaultCode faultCode = createSOAPFaultCode(fault);
- createSOAPFaultValue(faultCode);
-
- SOAPFaultReason reason = createSOAPFaultReason(fault);
- createSOAPFaultText(reason);
-
- createSOAPFaultNode(fault);
- createSOAPFaultRole(fault);
- createSOAPFaultDetail(fault);
-
- return defaultEnvelope;
- }
-
public final SOAPMessage createSOAPMessage() {
return new SOAPMessageImpl(this);
}
Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java?rev=1454853&r1=1454852&r2=1454853&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java Sun Mar 10 14:14:04 2013
@@ -260,5 +260,12 @@ public class SOAP11Factory extends DOMSO
return new SOAP11FaultImpl(this.getDefaultEnvelope().getBody(), this);
}
-
+ public SOAPEnvelope getDefaultFaultEnvelope() throws SOAPProcessingException {
+ SOAPEnvelope defaultEnvelope = getDefaultEnvelope();
+ SOAPFault fault = createSOAPFault(defaultEnvelope.getBody());
+ createSOAPFaultCode(fault);
+ createSOAPFaultReason(fault);
+ createSOAPFaultDetail(fault);
+ return defaultEnvelope;
+ }
}
Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java?rev=1454853&r1=1454852&r2=1454853&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java Sun Mar 10 14:14:04 2013
@@ -248,5 +248,18 @@ public class SOAP12Factory extends DOMSO
return new SOAP12FaultImpl(this.getDefaultEnvelope().getBody(), this);
}
+ public SOAPEnvelope getDefaultFaultEnvelope() throws SOAPProcessingException {
+ SOAPEnvelope defaultEnvelope = getDefaultEnvelope();
+ SOAPFault fault = createSOAPFault(defaultEnvelope.getBody());
+ SOAPFaultCode faultCode = createSOAPFaultCode(fault);
+ createSOAPFaultValue(faultCode);
+
+ SOAPFaultReason reason = createSOAPFaultReason(fault);
+ createSOAPFaultText(reason);
+
+ createSOAPFaultDetail(fault);
+
+ return defaultEnvelope;
+ }
}
Modified: webservices/axiom/trunk/modules/axiom-dom/src/test/java/org/apache/axiom/soap/impl/dom/SOAPImplementationTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/test/java/org/apache/axiom/soap/impl/dom/SOAPImplementationTest.java?rev=1454853&r1=1454852&r2=1454853&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/test/java/org/apache/axiom/soap/impl/dom/SOAPImplementationTest.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/test/java/org/apache/axiom/soap/impl/dom/SOAPImplementationTest.java Sun Mar 10 14:14:04 2013
@@ -23,9 +23,7 @@ import junit.framework.TestSuite;
import org.apache.axiom.om.impl.dom.factory.OMDOMMetaFactory;
import org.apache.axiom.ts.soap.SOAPTestSuiteBuilder;
-import org.apache.axiom.ts.soap.body.TestHasFaultAfterReplace;
import org.apache.axiom.ts.soap.envelope.TestSerialize;
-import org.apache.axiom.ts.soap.factory.TestGetDefaultFaultEnvelope;
import org.apache.axiom.ts.soap.faultdetail.TestWSCommons202;
import org.apache.axiom.ts.soap.faulttext.TestSetLang;
import org.apache.axiom.ts.soap12.fault.TestMoreChildrenAddition;
@@ -36,10 +34,6 @@ public class SOAPImplementationTest exte
SOAPTestSuiteBuilder builder = new SOAPTestSuiteBuilder(new OMDOMMetaFactory(), false, false);
builder.exclude(TestWSCommons202.class);
- // TODO: getDefaultFaultEnvelope is broken
- builder.exclude(TestGetDefaultFaultEnvelope.class, "(spec=soap11)");
- builder.exclude(TestHasFaultAfterReplace.class, "(spec=soap11)");
-
// TODO: not sure if this is an issue in DOOM or if the test case is wrong
builder.exclude(TestMoreChildrenAddition.class);