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 2014/06/23 18:25:14 UTC
svn commit: r1604866 - in /webservices/axiom/trunk:
modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/
modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/
modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/...
Author: veithen
Date: Mon Jun 23 16:25:13 2014
New Revision: 1604866
URL: http://svn.apache.org/r1604866
Log:
Added missing SOAPElementType (for s:Fault) and fixed an issue in the DOOM factories.
Modified:
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-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPElementTypeAdapterFactory.java
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPElementType.java
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java
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=1604866&r1=1604865&r2=1604866&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 Mon Jun 23 16:25:13 2014
@@ -235,7 +235,7 @@ public class SOAP11Factory extends SOAPF
}
public SOAPFault createSOAPFault() throws SOAPProcessingException {
- return new SOAP11FaultImpl(this.getDefaultEnvelope().getBody(), this);
+ return new SOAP11FaultImpl(null, getNamespace(), null, this, true);
}
public SOAPEnvelope getDefaultFaultEnvelope() throws SOAPProcessingException {
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=1604866&r1=1604865&r2=1604866&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 Mon Jun 23 16:25:13 2014
@@ -256,7 +256,7 @@ public class SOAP12Factory extends SOAPF
}
public SOAPFault createSOAPFault() throws SOAPProcessingException {
- return new SOAP12FaultImpl(this.getDefaultEnvelope().getBody(), this);
+ return new SOAP12FaultImpl(null, getNamespace(), null, this, true);
}
public SOAPEnvelope getDefaultFaultEnvelope() throws SOAPProcessingException {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPElementTypeAdapterFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPElementTypeAdapterFactory.java?rev=1604866&r1=1604865&r2=1604866&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPElementTypeAdapterFactory.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPElementTypeAdapterFactory.java Mon Jun 23 16:25:13 2014
@@ -53,6 +53,12 @@ public class SOAPElementTypeAdapterFacto
return factory.createSOAPBody();
}
});
+ } else if (type == SOAPElementType.FAULT) {
+ adapters.add(new SOAPElementTypeAdapter(SOAPFault.class) {
+ public OMElement create(SOAPFactory factory) {
+ return factory.createSOAPFault();
+ }
+ });
} else if (type == SOAPFaultChild.CODE) {
adapters.add(new SOAPFaultChildAdapter(SOAPFaultCode.class) {
public OMElement create(SOAPFactory factory) {
Modified: webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPElementType.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPElementType.java?rev=1604866&r1=1604865&r2=1604866&view=diff
==============================================================================
--- webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPElementType.java (original)
+++ webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPElementType.java Mon Jun 23 16:25:13 2014
@@ -39,6 +39,12 @@ public abstract class SOAPElementType ex
}
};
+ public static final SOAPElementType FAULT = new SOAPElementType() {
+ public QName getQName(SOAPSpec spec) {
+ return spec.getFaultQName();
+ }
+ };
+
public static final SOAPElementType VALUE = new SOAPElementType() {
public QName getQName(SOAPSpec spec) {
return spec.getFaultValueQName();
@@ -61,6 +67,7 @@ public abstract class SOAPElementType ex
SOAPElementType.ENVELOPE,
SOAPElementType.HEADER,
SOAPElementType.BODY,
+ SOAPElementType.FAULT,
SOAPFaultChild.CODE,
SOAPElementType.VALUE,
SOAPElementType.SUB_CODE,
Modified: webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java?rev=1604866&r1=1604865&r2=1604866&view=diff
==============================================================================
--- webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java (original)
+++ webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java Mon Jun 23 16:25:13 2014
@@ -79,6 +79,7 @@ public abstract class SOAPSpec extends A
private final QName envelopeQName;
private final QName headerQName;
private final QName bodyQName;
+ private final QName faultQName;
private final QName faultCodeQName;
private final QName faultValueQName;
private final QName faultSubCodeQName;
@@ -101,6 +102,7 @@ public abstract class SOAPSpec extends A
envelopeQName = new QName(envelopeNamespaceURI, "Envelope");
headerQName = new QName(envelopeNamespaceURI, "Header");
bodyQName = new QName(envelopeNamespaceURI, "Body");
+ faultQName = new QName(envelopeNamespaceURI, "Fault");
this.faultCodeQName = faultCodeQName;
this.faultValueQName = faultValueQName;
this.faultSubCodeQName = faultSubCodeQName;
@@ -142,6 +144,10 @@ public abstract class SOAPSpec extends A
return bodyQName;
}
+ public final QName getFaultQName() {
+ return faultQName;
+ }
+
public final QName getFaultCodeQName() {
return faultCodeQName;
}