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 2016/04/03 12:24:54 UTC

svn commit: r1737572 - in /webservices/axiom/trunk: aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/ implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/ implementations/axiom-impl/src/main/java/org/apache/axio...

Author: veithen
Date: Sun Apr  3 10:24:54 2016
New Revision: 1737572

URL: http://svn.apache.org/viewvc?rev=1737572&view=rev
Log:
Don't let SOAPFaultCode override getTextAsQName.

Modified:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
    webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java
    webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java
    webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj?rev=1737572&r1=1737571&r2=1737572&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj Sun Apr  3 10:24:54 2016
@@ -155,8 +155,7 @@ public aspect AxiomElementSupport {
         }
     }
     
-    // Note: must not be final because it is (incorrectly) overridden in the SOAPFaultCode implementation for SOAP 1.2
-    public QName AxiomElement.getTextAsQName() {
+    public final QName AxiomElement.getTextAsQName() {
         String childText = getText().trim();
         return childText.length() == 0 ? null : resolveQName(childText);
     }

Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java?rev=1737572&r1=1737571&r2=1737572&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java Sun Apr  3 10:24:54 2016
@@ -19,14 +19,9 @@
 
 package org.apache.axiom.soap.impl.dom.soap12;
 
-import javax.xml.namespace.QName;
-
 import org.apache.axiom.soap.impl.dom.SOAPFaultCodeImpl;
 import org.apache.axiom.soap.impl.intf.AxiomSOAP12FaultCode;
 
 public class SOAP12FaultCodeImpl extends SOAPFaultCodeImpl implements AxiomSOAP12FaultCode {
-    // TODO: For compatibility with Axiom 1.2.x; remove in Axiom 1.3
-    public QName getTextAsQName() {
-        return getValueAsQName();
-    }
+
 }

Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java?rev=1737572&r1=1737571&r2=1737572&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java Sun Apr  3 10:24:54 2016
@@ -19,14 +19,9 @@
 
 package org.apache.axiom.soap.impl.llom.soap12;
 
-import javax.xml.namespace.QName;
-
 import org.apache.axiom.soap.impl.intf.AxiomSOAP12FaultCode;
 import org.apache.axiom.soap.impl.llom.SOAPFaultCodeImpl;
 
 public class SOAP12FaultCodeImpl extends SOAPFaultCodeImpl implements AxiomSOAP12FaultCode {
-    // TODO: For compatibility with Axiom 1.2.x; remove in Axiom 1.3
-    public QName getTextAsQName() {
-        return getValueAsQName();
-    }
+
 }

Modified: webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md?rev=1737572&r1=1737571&r2=1737572&view=diff
==============================================================================
--- webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md (original)
+++ webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md Sun Apr  3 10:24:54 2016
@@ -129,6 +129,11 @@ Changes in this release
     DOM's `Node` interface. Note that these methods were already deprecated in
     Axiom 1.2.x, with alternative methods being available.
 
+*   The `SOAPFaultCode` implementations for SOAP 1.2 no longer override the
+    `getTextAsQName` method (which was an undocumented feature used by Axis2).
+    Use the `getValueAsQName` to retrieve the fault code value in a version
+    independent manner.
+
 *   In Axiom 1.2.x the `SOAPMessage` and `SOAPEnvelope` implementations had
     special serialization logic, causing the serialization of a `SOAPEnvelope`
     to emit an XML declaration by default and the serialization of a