Author: veithen
Date: Wed Nov 18 08:18:50 2015
New Revision: 1714947
URL: http://svn.apache.org/viewvc?rev=1714947&view=rev
Log:
Merge latest changes from trunk.
Added:
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultClassifierSupport.aj
- copied unchanged from r1714946,
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultClassifierSupport.aj
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAP12FaultClassifier.java
- copied unchanged from r1714946,
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAP12FaultClassifier.java
Modified:
webservices/axiom/branches/datatypes/ (props changed)
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultCodeSupport.aj
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/SOAP12Factory.java
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAP12FaultCode.java
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAP12FaultSubCode.java
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultCodeImpl.java
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultSubCodeImpl.java
webservices/axiom/branches/datatypes/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
webservices/axiom/branches/datatypes/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java
webservices/axiom/branches/datatypes/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java
Propchange: webservices/axiom/branches/datatypes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 18 08:18:50 2015
@@ -11,4 +11,4 @@
/webservices/axiom/branches/attrs-aspects:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1714490-1714865
+/webservices/axiom/trunk:1714490-1714946
Modified:
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultCodeSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultCodeSupport.aj?rev=1714947&r1=1714946&r2=1714947&view=diff
==============================================================================
---
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultCodeSupport.aj
(original)
+++
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultCodeSupport.aj
Wed Nov 18 08:18:50 2015
@@ -18,11 +18,39 @@
*/
package org.apache.axiom.soap.impl.common;
+import javax.xml.namespace.QName;
+
import org.apache.axiom.core.CoreNode;
+import org.apache.axiom.soap.SOAPFaultSubCode;
+import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.impl.intf.AxiomSOAP11FaultCode;
public aspect AxiomSOAP11FaultCodeSupport {
public final Class<? extends CoreNode>
AxiomSOAP11FaultCode.coreGetNodeClass() {
return AxiomSOAP11FaultCode.class;
}
+
+ public final SOAPFaultValue AxiomSOAP11FaultCode.getValue() {
+ return null;
+ }
+
+ public final void AxiomSOAP11FaultCode.setValue(SOAPFaultValue value) {
+ throw new UnsupportedOperationException();
+ }
+
+ public final SOAPFaultSubCode AxiomSOAP11FaultCode.getSubCode() {
+ return null;
+ }
+
+ public final void AxiomSOAP11FaultCode.setSubCode(SOAPFaultSubCode
subCode) {
+ throw new UnsupportedOperationException();
+ }
+
+ public final QName AxiomSOAP11FaultCode.getValueAsQName() {
+ return getTextAsQName();
+ }
+
+ public final void AxiomSOAP11FaultCode.setValue(QName value) {
+ setText(value);
+ }
}
Modified:
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/SOAP12Factory.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/SOAP12Factory.java?rev=1714947&r1=1714946&r2=1714947&view=diff
==============================================================================
---
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/SOAP12Factory.java
(original)
+++
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/SOAP12Factory.java
Wed Nov 18 08:18:50 2015
@@ -47,7 +47,7 @@ public class SOAP12Factory extends SOAPF
return SOAPHelper.SOAP12;
}
- private SOAPFaultValue internalCreateSOAPFaultValue(SOAPFaultClassifier
parent, OMXMLParserWrapper builder) {
+ final SOAPFaultValue internalCreateSOAPFaultValue(SOAPFaultClassifier
parent, OMXMLParserWrapper builder) {
return createSOAPElement(AxiomSOAP12FaultValue.class, parent,
SOAP12Constants.QNAME_FAULT_VALUE, builder);
}
Modified:
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAP12FaultCode.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAP12FaultCode.java?rev=1714947&r1=1714946&r2=1714947&view=diff
==============================================================================
---
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAP12FaultCode.java
(original)
+++
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAP12FaultCode.java
Wed Nov 18 08:18:50 2015
@@ -18,6 +18,6 @@
*/
package org.apache.axiom.soap.impl.intf;
-public interface AxiomSOAP12FaultCode extends AxiomSOAPFaultCode,
AxiomSOAP12Element {
+public interface AxiomSOAP12FaultCode extends AxiomSOAPFaultCode,
AxiomSOAP12FaultClassifier {
}
Modified:
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAP12FaultSubCode.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAP12FaultSubCode.java?rev=1714947&r1=1714946&r2=1714947&view=diff
==============================================================================
---
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAP12FaultSubCode.java
(original)
+++
webservices/axiom/branches/datatypes/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAP12FaultSubCode.java
Wed Nov 18 08:18:50 2015
@@ -20,6 +20,6 @@ package org.apache.axiom.soap.impl.intf;
import org.apache.axiom.soap.SOAPFaultSubCode;
-public interface AxiomSOAP12FaultSubCode extends AxiomSOAP12Element,
SOAPFaultSubCode {
+public interface AxiomSOAP12FaultSubCode extends AxiomSOAP12FaultClassifier,
SOAPFaultSubCode {
}
Modified:
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultCodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultCodeImpl.java?rev=1714947&r1=1714946&r2=1714947&view=diff
==============================================================================
---
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultCodeImpl.java
(original)
+++
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultCodeImpl.java
Wed Nov 18 08:18:50 2015
@@ -19,12 +19,8 @@
package org.apache.axiom.soap.impl.dom;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPFaultSubCode;
import org.apache.axiom.soap.impl.intf.AxiomSOAPFaultCode;
public abstract class SOAPFaultCodeImpl extends SOAPElement implements
AxiomSOAPFaultCode {
- public SOAPFaultSubCode getSubCode() {
- return
(SOAPFaultSubCode)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_SUBCODE);
- }
+
}
Modified:
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java?rev=1714947&r1=1714946&r2=1714947&view=diff
==============================================================================
---
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
(original)
+++
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
Wed Nov 18 08:18:50 2015
@@ -19,24 +19,12 @@
package org.apache.axiom.soap.impl.dom.soap11;
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.soap.SOAPFaultSubCode;
-import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.dom.SOAPFaultCodeImpl;
import org.apache.axiom.soap.impl.intf.AxiomSOAP11FaultCode;
public class SOAP11FaultCodeImpl extends SOAPFaultCodeImpl implements
AxiomSOAP11FaultCode {
- public void setSubCode(SOAPFaultSubCode subCode) throws
SOAPProcessingException {
- throw new UnsupportedOperationException();
- }
-
- public void setValue(SOAPFaultValue value) throws SOAPProcessingException {
- throw new UnsupportedOperationException();
- }
-
public void checkParent(OMElement parent) throws SOAPProcessingException {
if (!(parent instanceof SOAP11FaultImpl)) {
throw new SOAPProcessingException(
@@ -44,16 +32,4 @@ public class SOAP11FaultCodeImpl extends
"parent. But received some other implementation");
}
}
-
- public SOAPFaultValue getValue() {
- return null;
- }
-
- public void setValue(QName value) {
- setText(value);
- }
-
- public QName getValueAsQName() {
- return getTextAsQName();
- }
}
Modified:
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java?rev=1714947&r1=1714946&r2=1714947&view=diff
==============================================================================
---
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java
(original)
+++
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java
Wed Nov 18 08:18:50 2015
@@ -24,7 +24,6 @@ import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.ElementHelper;
import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultSubCode;
import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPProcessingException;
@@ -68,16 +67,7 @@ public class SOAP12FaultCodeImpl extends
return
(SOAPFaultValue)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_VALUE);
}
- public void setValue(QName value) {
- SOAPFaultValue valueElement = getValue();
- if (valueElement == null) {
- valueElement =
((SOAPFactory)getOMFactory()).createSOAPFaultValue(this);
- }
- valueElement.setText(value);
- }
-
- public QName getValueAsQName() {
- SOAPFaultValue value = getValue();
- return value == null ? null : value.getTextAsQName();
+ public SOAPFaultSubCode getSubCode() {
+ return
(SOAPFaultSubCode)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_SUBCODE);
}
}
Modified:
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultSubCodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultSubCodeImpl.java?rev=1714947&r1=1714946&r2=1714947&view=diff
==============================================================================
---
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultSubCodeImpl.java
(original)
+++
webservices/axiom/branches/datatypes/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultSubCodeImpl.java
Wed Nov 18 08:18:50 2015
@@ -19,12 +19,9 @@
package org.apache.axiom.soap.impl.dom.soap12;
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.ElementHelper;
import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultSubCode;
import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPProcessingException;
@@ -77,17 +74,4 @@ public class SOAP12FaultSubCodeImpl exte
}
return value;
}
-
- public void setValue(QName value) {
- SOAPFaultValue valueElement = getValue();
- if (valueElement == null) {
- valueElement =
((SOAPFactory)getOMFactory()).createSOAPFaultValue(this);
- }
- valueElement.setText(value);
- }
-
- public QName getValueAsQName() {
- SOAPFaultValue value = getValue();
- return value == null ? null : value.getTextAsQName();
- }
}
Modified:
webservices/axiom/branches/datatypes/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java?rev=1714947&r1=1714946&r2=1714947&view=diff
==============================================================================
---
webservices/axiom/branches/datatypes/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
(original)
+++
webservices/axiom/branches/datatypes/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
Wed Nov 18 08:18:50 2015
@@ -19,45 +19,16 @@
package org.apache.axiom.soap.impl.llom.soap11;
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.soap.SOAPFaultSubCode;
-import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.intf.AxiomSOAP11FaultCode;
import org.apache.axiom.soap.impl.llom.SOAPFaultCodeImpl;
public class SOAP11FaultCodeImpl extends SOAPFaultCodeImpl implements
AxiomSOAP11FaultCode {
- public void setSubCode(SOAPFaultSubCode subCode) throws
SOAPProcessingException {
- throw new UnsupportedOperationException();
- }
-
- public void setValue(SOAPFaultValue value) throws SOAPProcessingException {
- throw new UnsupportedOperationException();
- }
-
public void checkParent(OMElement parent) throws SOAPProcessingException {
if (!(parent instanceof SOAP11FaultImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP11FaultImpl, got " + parent.getClass());
}
}
-
- public SOAPFaultValue getValue() {
- return null;
- }
-
- public SOAPFaultSubCode getSubCode() {
- return null;
-// throw new UnsupportedOperationException("getSubCode() not supported
for SOAP 1.1 faults");
- }
-
- public void setValue(QName value) {
- setText(value);
- }
-
- public QName getValueAsQName() {
- return getTextAsQName();
- }
}
Modified:
webservices/axiom/branches/datatypes/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java?rev=1714947&r1=1714946&r2=1714947&view=diff
==============================================================================
---
webservices/axiom/branches/datatypes/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java
(original)
+++
webservices/axiom/branches/datatypes/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java
Wed Nov 18 08:18:50 2015
@@ -24,7 +24,6 @@ import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.ElementHelper;
import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultSubCode;
import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPProcessingException;
@@ -67,17 +66,4 @@ public class SOAP12FaultCodeImpl extends
public SOAPFaultSubCode getSubCode() {
return
(SOAPFaultSubCode)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_SUBCODE);
}
-
- public void setValue(QName value) {
- SOAPFaultValue valueElement = getValue();
- if (valueElement == null) {
- valueElement =
((SOAPFactory)getOMFactory()).createSOAPFaultValue(this);
- }
- valueElement.setText(value);
- }
-
- public QName getValueAsQName() {
- SOAPFaultValue value = getValue();
- return value == null ? null : value.getTextAsQName();
- }
}
Modified:
webservices/axiom/branches/datatypes/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java?rev=1714947&r1=1714946&r2=1714947&view=diff
==============================================================================
---
webservices/axiom/branches/datatypes/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java
(original)
+++
webservices/axiom/branches/datatypes/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java
Wed Nov 18 08:18:50 2015
@@ -19,12 +19,9 @@
package org.apache.axiom.soap.impl.llom.soap12;
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.ElementHelper;
import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFaultSubCode;
import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPProcessingException;
@@ -76,17 +73,4 @@ public class SOAP12FaultSubCodeImpl exte
}
return value;
}
-
- public void setValue(QName value) {
- SOAPFaultValue valueElement = getValue();
- if (valueElement == null) {
- valueElement =
((SOAPFactory)getOMFactory()).createSOAPFaultValue(this);
- }
- valueElement.setText(value);
- }
-
- public QName getValueAsQName() {
- SOAPFaultValue value = getValue();
- return value == null ? null : value.getTextAsQName();
- }
}
