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/05/31 15:28:08 UTC
svn commit: r1598869 - in /webservices/axiom/trunk/modules:
axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/
axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/
Author: veithen
Date: Sat May 31 13:28:08 2014
New Revision: 1598869
URL: http://svn.apache.org/r1598869
Log:
Also remove the SOAP 1.1 SOAPFaultText implementation from LLOM.
Removed:
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultTextImpl.java
Modified:
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java?rev=1598869&r1=1598868&r2=1598869&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java (original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java Sat May 31 13:28:08 2014
@@ -228,11 +228,11 @@ public class SOAP11Factory extends OMLin
public SOAPFaultText createSOAPFaultText(SOAPFaultReason parent)
throws SOAPProcessingException {
- return new SOAP11FaultTextImpl(parent, this);
+ throw new UnsupportedOperationException();
}
public SOAPFaultText createSOAPFaultText() throws SOAPProcessingException {
- return new SOAP11FaultTextImpl(this);
+ throw new UnsupportedOperationException();
}
public SOAPFaultNode createSOAPFaultNode(SOAPFault parent)
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java?rev=1598869&r1=1598868&r2=1598869&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java Sat May 31 13:28:08 2014
@@ -39,7 +39,7 @@ import org.apache.axiom.soap.SOAPVersion
*/
public abstract class SOAPSpec {
public static final SOAPSpec SOAP11 = new SOAPSpec(SOAP11Version.getSingleton(),
- new BooleanLiteral[] { BooleanLiteral.ONE, BooleanLiteral.ZERO }) {
+ new BooleanLiteral[] { BooleanLiteral.ONE, BooleanLiteral.ZERO }, null) {
public String getName() {
return "soap11";
}
@@ -62,7 +62,8 @@ public abstract class SOAPSpec {
};
public static final SOAPSpec SOAP12 = new SOAPSpec(SOAP12Version.getSingleton(),
- new BooleanLiteral[] { BooleanLiteral.TRUE, BooleanLiteral.FALSE, BooleanLiteral.ONE, BooleanLiteral.ZERO }) {
+ new BooleanLiteral[] { BooleanLiteral.TRUE, BooleanLiteral.FALSE, BooleanLiteral.ONE, BooleanLiteral.ZERO },
+ new QName(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI, SOAP12Constants.SOAP_FAULT_TEXT_LOCAL_NAME)) {
public String getName() {
return "soap12";
}
@@ -85,11 +86,13 @@ public abstract class SOAPSpec {
};
private final SOAPVersion version;
- private final BooleanLiteral[] booleanLiterals;
+ private final BooleanLiteral[] booleanLiterals;
+ private final QName faultTextQName;
- public SOAPSpec(SOAPVersion version, BooleanLiteral[] booleanLiterals) {
+ public SOAPSpec(SOAPVersion version, BooleanLiteral[] booleanLiterals, QName faultTextQName) {
this.version = version;
this.booleanLiterals = booleanLiterals;
+ this.faultTextQName = faultTextQName;
}
public abstract String getName();
@@ -126,6 +129,10 @@ public abstract class SOAPSpec {
return version.getFaultDetailQName();
}
+ public final QName getFaultTextQName() {
+ return faultTextQName;
+ }
+
/**
* Get the boolean literals recognized by this SOAP version. While SOAP 1.2 refers to the
* <tt>xs:boolean</tt> type and therefore recognizes <tt>true</tt>, <tt>false</tt>, <tt>1</tt>
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java?rev=1598869&r1=1598868&r2=1598869&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java Sat May 31 13:28:08 2014
@@ -204,7 +204,9 @@ public class SOAPTestSuiteBuilder extend
addTest(new org.apache.axiom.ts.soap.faultdetail.TestGetAllDetailEntriesWithParser(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.faultdetail.TestSerialization(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.faultdetail.TestWSCommons202(metaFactory, spec));
- addTest(new org.apache.axiom.ts.soap.faulttext.TestSetLang(metaFactory, spec));
+ if (spec.getFaultTextQName() != null) {
+ addTest(new org.apache.axiom.ts.soap.faulttext.TestSetLang(metaFactory, spec));
+ }
addTest(new org.apache.axiom.ts.soap.header.TestAddHeaderBlock(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.header.TestAddHeaderBlockFromQName(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.header.TestAddHeaderBlockFromQNameWithoutNamespace(metaFactory, spec));