Author: veithen
Date: Thu Aug 27 22:48:31 2015
New Revision: 1698235
URL: http://svn.apache.org/r1698235
Log:
For SOAP nodes, adopt the cloning strategy used by DOOM.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPHeaderBlockSupport.aj
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareElement.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultCodeImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultReasonImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultNodeImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultTextImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultValueImpl.java
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
Thu Aug 27 22:48:31 2015
@@ -39,6 +39,7 @@ import org.apache.axiom.core.IdentityMap
import org.apache.axiom.core.NodeMigrationException;
import org.apache.axiom.core.NodeMigrationPolicy;
import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
@@ -557,4 +558,17 @@ public aspect AxiomElementSupport {
}
}
}
+
+ public final AxiomElement
AxiomElement.shallowCloneWithoutAttributes(OMCloneOptions options,
CoreParentNode targetParent, boolean namespaceRepairing) {
+ AxiomElement clone =
coreGetNodeFactory().createNSAwareElement(options.isPreserveModel() ?
getElementType() : AxiomElement.class);
+ if (targetParent != null) {
+ targetParent.coreAppendChild(clone, false);
+ }
+ clone.initName(getLocalName(), getNamespace(), namespaceRepairing);
+ copyData(options, clone);
+ return clone;
+ }
+
+ public void AxiomElement.copyData(OMCloneOptions options, AxiomElement
clone) {
+ }
}
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPHeaderBlockSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPHeaderBlockSupport.aj?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPHeaderBlockSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPHeaderBlockSupport.aj
Thu Aug 27 22:48:31 2015
@@ -20,8 +20,12 @@ package org.apache.axiom.soap.impl.commo
import javax.xml.namespace.QName;
+import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMDataSourceExt;
+import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.soap.SOAPCloneOptions;
+import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.SOAPVersion;
@@ -116,4 +120,13 @@ public aspect AxiomSOAPHeaderBlockSuppor
_setAttributeValue(attributeQName, helper.formatBoolean(relay));
}
}
+
+ public final void AxiomSOAPHeaderBlock.copyData(OMCloneOptions options,
AxiomElement clone) {
+ // Copy the processed flag. The other SOAPHeaderBlock information
+ // (e.g. role, mustUnderstand) are attributes on the tag and are
copied elsewhere.
+ Boolean processedFlag = options instanceof SOAPCloneOptions ?
((SOAPCloneOptions)options).getProcessedFlag() : null;
+ if ((processedFlag == null && isProcessed()) || (processedFlag != null
&& processedFlag.booleanValue())) {
+ ((SOAPHeaderBlock)clone).setProcessed();
+ }
+ }
}
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareElement.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareElement.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareElement.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareElement.java
Thu Aug 27 22:48:31 2015
@@ -72,18 +72,9 @@ public class NSAwareElement extends Elem
@Override
final ElementImpl createClone(OMCloneOptions options, ParentNode
targetParent, boolean namespaceRepairing) {
- NSAwareElement clone =
(NSAwareElement)coreGetNodeFactory().createNSAwareElement(options.isPreserveModel()
? getElementType() : AxiomElement.class);
- if (targetParent != null) {
- targetParent.coreAppendChild(clone, false);
- }
- clone.initName(getLocalName(), getNamespace(), namespaceRepairing);
- copyData(options, clone);
- return clone;
+ return (ElementImpl)shallowCloneWithoutAttributes(options,
targetParent, namespaceRepairing);
}
- protected void copyData(OMCloneOptions options, NSAwareElement clone) {
- }
-
public void setLineNumber(int lineNumber) {
this.lineNumber = lineNumber;
}
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
Thu Aug 27 22:48:31 2015
@@ -19,12 +19,9 @@
package org.apache.axiom.soap.impl.dom;
-import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.impl.dom.NSAwareElement;
-import org.apache.axiom.soap.SOAPCloneOptions;
-import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.soap.impl.common.AxiomSOAPHeaderBlock;
public abstract class SOAPHeaderBlockImpl extends NSAwareElement implements
AxiomSOAPHeaderBlock {
@@ -47,14 +44,4 @@ public abstract class SOAPHeaderBlockImp
public Object getObject(Class dataSourceClass) {
throw new UnsupportedOperationException();
}
-
- @Override
- protected final void copyData(OMCloneOptions options, NSAwareElement
clone) {
- // Copy the processed flag. The other SOAPHeaderBlock information
- // (e.g. role, mustUnderstand) are attributes on the tag and are
copied elsewhere.
- Boolean processedFlag = options instanceof SOAPCloneOptions ?
((SOAPCloneOptions)options).getProcessedFlag() : null;
- if ((processedFlag == null && isProcessed()) || (processedFlag != null
&& processedFlag.booleanValue())) {
- ((SOAPHeaderBlock)clone).setProcessed();
- }
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
Thu Aug 27 22:48:31 2015
@@ -88,12 +88,7 @@ public class OMElementImpl extends OMNod
}
final OMNode defaultClone(OMCloneOptions options, AxiomContainer
targetParent) {
- AxiomElement targetElement;
- if (options.isPreserveModel()) {
- targetElement = (AxiomElement)createClone(options, targetParent);
- } else {
- targetElement =
(AxiomElement)getOMFactory().createOMElement(getLocalName(), getNamespace(),
targetParent);
- }
+ AxiomElement targetElement = shallowCloneWithoutAttributes(options,
targetParent, true);
for (Iterator it = getAllDeclaredNamespaces(); it.hasNext(); ) {
OMNamespace ns = (OMNamespace)it.next();
targetElement.declareNamespace(ns);
@@ -108,10 +103,6 @@ public class OMElementImpl extends OMNod
return targetElement;
}
- protected OMElement createClone(OMCloneOptions options, AxiomContainer
targetParent) {
- return getOMFactory().createOMElement(getLocalName(), getNamespace(),
targetParent);
- }
-
public final void setLineNumber(int lineNumber) {
this.lineNumber = lineNumber;
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java
Thu Aug 27 22:48:31 2015
@@ -19,19 +19,15 @@
package org.apache.axiom.soap.impl.llom;
-import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.impl.common.AxiomContainer;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPConstants;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
@@ -163,8 +159,4 @@ public abstract class SOAPBodyImpl exten
this.enableLookAhead = false;
super.addChild(child, fromBuilder);
}
-
- protected OMElement createClone(OMCloneOptions options, AxiomContainer
targetParent) {
- return
((SOAPFactory)getOMFactory()).createSOAPBody((SOAPEnvelope)targetParent);
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
Thu Aug 27 22:48:31 2015
@@ -21,7 +21,6 @@ package org.apache.axiom.soap.impl.llom;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
@@ -31,7 +30,6 @@ import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.builder.StAXBuilder;
-import org.apache.axiom.om.impl.common.AxiomContainer;
import org.apache.axiom.om.impl.common.serializer.push.OutputException;
import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.soap.SOAP11Constants;
@@ -39,7 +37,6 @@ import org.apache.axiom.soap.SOAP12Const
import org.apache.axiom.soap.SOAP12Version;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPConstants;
-import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPProcessingException;
@@ -273,12 +270,4 @@ public class SOAPEnvelopeImpl extends SO
}
return null;
}
-
- protected OMElement createClone(OMCloneOptions options, AxiomContainer
targetParent) {
- SOAPEnvelope clone =
((SOAPFactory)getOMFactory()).createSOAPEnvelope(getNamespace());
- if (targetParent != null) {
- targetParent.addChild(clone);
- }
- return clone;
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultCodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultCodeImpl.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultCodeImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultCodeImpl.java
Thu Aug 27 22:48:31 2015
@@ -19,20 +19,11 @@
package org.apache.axiom.soap.impl.llom;
-import org.apache.axiom.om.OMCloneOptions;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.common.AxiomContainer;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.impl.common.AxiomSOAPFaultCode;
public abstract class SOAPFaultCodeImpl extends SOAPElement implements
AxiomSOAPFaultCode {
public SOAPFaultCodeImpl(OMFactory factory) {
super(factory);
}
-
- protected OMElement createClone(OMCloneOptions options, AxiomContainer
targetParent) {
- return
((SOAPFactory)getOMFactory()).createSOAPFaultCode((SOAPFault)targetParent);
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
Thu Aug 27 22:48:31 2015
@@ -19,20 +19,11 @@
package org.apache.axiom.soap.impl.llom;
-import org.apache.axiom.om.OMCloneOptions;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.common.AxiomContainer;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.impl.common.AxiomSOAPFaultDetail;
public abstract class SOAPFaultDetailImpl extends SOAPElement implements
AxiomSOAPFaultDetail {
public SOAPFaultDetailImpl(OMFactory factory) {
super(factory);
}
-
- protected OMElement createClone(OMCloneOptions options, AxiomContainer
targetParent) {
- return
((SOAPFactory)getOMFactory()).createSOAPFaultDetail((SOAPFault)targetParent);
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
Thu Aug 27 22:48:31 2015
@@ -19,20 +19,11 @@
package org.apache.axiom.soap.impl.llom;
-import org.apache.axiom.om.OMCloneOptions;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.common.AxiomContainer;
-import org.apache.axiom.soap.SOAPBody;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.impl.common.AxiomSOAPFault;
public abstract class SOAPFaultImpl extends SOAPElement implements
AxiomSOAPFault {
public SOAPFaultImpl(OMFactory factory) {
super(factory);
}
-
- protected OMElement createClone(OMCloneOptions options, AxiomContainer
targetParent) {
- return ((SOAPFactory)getOMFactory()).createSOAPFault((SOAPBody)
targetParent);
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultReasonImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultReasonImpl.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultReasonImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultReasonImpl.java
Thu Aug 27 22:48:31 2015
@@ -19,13 +19,8 @@
package org.apache.axiom.soap.impl.llom;
-import org.apache.axiom.om.OMCloneOptions;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.impl.common.AxiomContainer;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultText;
import org.apache.axiom.soap.impl.common.AxiomSOAPFaultReason;
@@ -62,8 +57,4 @@ public abstract class SOAPFaultReasonImp
return null;
}
-
- protected OMElement createClone(OMCloneOptions options, AxiomContainer
targetParent) {
- return
((SOAPFactory)getOMFactory()).createSOAPFaultReason((SOAPFault)targetParent);
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java
Thu Aug 27 22:48:31 2015
@@ -19,12 +19,7 @@
package org.apache.axiom.soap.impl.llom;
-import org.apache.axiom.om.OMCloneOptions;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.common.AxiomContainer;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.impl.common.AxiomSOAPFaultRole;
public abstract class SOAPFaultRoleImpl extends SOAPElement
@@ -33,8 +28,4 @@ public abstract class SOAPFaultRoleImpl
public SOAPFaultRoleImpl(OMFactory factory) {
super(factory);
}
-
- protected OMElement createClone(OMCloneOptions options, AxiomContainer
targetParent) {
- return
((SOAPFactory)getOMFactory()).createSOAPFaultRole((SOAPFault)targetParent);
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
Thu Aug 27 22:48:31 2015
@@ -26,12 +26,8 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMSourcedElement;
-import org.apache.axiom.om.impl.common.AxiomContainer;
import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
-import org.apache.axiom.soap.SOAPCloneOptions;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPHeader;
-import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.soap.impl.common.AxiomSOAPHeaderBlock;
/** Class SOAPHeaderBlockImpl */
@@ -59,24 +55,9 @@ public abstract class SOAPHeaderBlockImp
}
}
- protected OMElement createClone(OMCloneOptions options, AxiomContainer
targetParent) {
- SOAPHeaderBlock clone =
((SOAPFactory)getOMFactory()).createSOAPHeaderBlock(getLocalName(),
getNamespace(), (SOAPHeader)targetParent);
- copyData(options, clone);
- return clone;
- }
-
protected OMSourcedElement createClone(OMCloneOptions options,
OMDataSource ds) {
- SOAPHeaderBlock clone =
((SOAPFactory)getOMFactory()).createSOAPHeaderBlock(ds);
+ AxiomSOAPHeaderBlock clone =
(AxiomSOAPHeaderBlock)((SOAPFactory)getOMFactory()).createSOAPHeaderBlock(ds);
copyData(options, clone);
return clone;
}
-
- private void copyData(OMCloneOptions options, SOAPHeaderBlock targetSHB) {
- // Copy the processed flag. The other SOAPHeaderBlock information
- // (e.g. role, mustUnderstand) are attributes on the tag and are
copied elsewhere.
- Boolean processedFlag = options instanceof SOAPCloneOptions ?
((SOAPCloneOptions)options).getProcessedFlag() : null;
- if ((processedFlag == null && isProcessed()) || (processedFlag != null
&& processedFlag.booleanValue())) {
- targetSHB.setProcessed();
- }
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java
Thu Aug 27 22:48:31 2015
@@ -19,16 +19,13 @@
package org.apache.axiom.soap.impl.llom;
-import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.OMNodeEx;
-import org.apache.axiom.om.impl.common.AxiomContainer;
import org.apache.axiom.soap.RolePlayer;
-import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.soap.SOAPProcessingException;
@@ -189,8 +186,4 @@ public abstract class SOAPHeaderImpl ext
String text = sw.getBuffer().toString();
return text;
}
-
- protected OMElement createClone(OMCloneOptions options, AxiomContainer
targetParent) {
- return
((SOAPFactory)getOMFactory()).createSOAPHeader((SOAPEnvelope)targetParent);
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultNodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultNodeImpl.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultNodeImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultNodeImpl.java
Thu Aug 27 22:48:31 2015
@@ -19,12 +19,8 @@
package org.apache.axiom.soap.impl.llom.soap12;
-import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.common.AxiomContainer;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAP12FaultNode;
import org.apache.axiom.soap.impl.llom.SOAPElement;
@@ -56,8 +52,4 @@ public class SOAP12FaultNodeImpl extends
public String getNodeValue() {
return getFaultNodeValue();
}
-
- protected OMElement createClone(OMCloneOptions options, AxiomContainer
targetParent) {
- return
((SOAPFactory)getOMFactory()).createSOAPFaultNode((SOAPFault)targetParent);
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java
Thu Aug 27 22:48:31 2015
@@ -21,14 +21,11 @@ package org.apache.axiom.soap.impl.llom.
import javax.xml.namespace.QName;
-import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.common.AxiomContainer;
import org.apache.axiom.om.util.ElementHelper;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFaultCode;
import org.apache.axiom.soap.SOAPFaultSubCode;
import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPProcessingException;
@@ -97,12 +94,4 @@ public class SOAP12FaultSubCodeImpl exte
SOAPFaultValue value = getValue();
return value == null ? null : value.getTextAsQName();
}
-
- protected OMElement createClone(OMCloneOptions options, AxiomContainer
targetParent) {
- if (targetParent instanceof SOAPFaultSubCode) {
- return
((SOAPFactory)getOMFactory()).createSOAPFaultSubCode((SOAPFaultSubCode)targetParent);
- } else {
- return
((SOAPFactory)getOMFactory()).createSOAPFaultSubCode((SOAPFaultCode)targetParent);
- }
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultTextImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultTextImpl.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultTextImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultTextImpl.java
Thu Aug 27 22:48:31 2015
@@ -22,15 +22,11 @@ package org.apache.axiom.soap.impl.llom.
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.impl.common.AxiomContainer;
import org.apache.axiom.om.impl.llom.OMAttributeImpl;
import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFaultReason;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAP12FaultText;
import org.apache.axiom.soap.impl.llom.SOAPElement;
@@ -77,8 +73,4 @@ public class SOAP12FaultTextImpl extends
return langAttr == null ? null : langAttr.getAttributeValue();
}
-
- protected OMElement createClone(OMCloneOptions options, AxiomContainer
targetParent) {
- return
((SOAPFactory)getOMFactory()).createSOAPFaultText((SOAPFaultReason)targetParent);
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultValueImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultValueImpl.java?rev=1698235&r1=1698234&r2=1698235&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultValueImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultValueImpl.java
Thu Aug 27 22:48:31 2015
@@ -19,13 +19,8 @@
package org.apache.axiom.soap.impl.llom.soap12;
-import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.common.AxiomContainer;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFaultCode;
-import org.apache.axiom.soap.SOAPFaultSubCode;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAP12FaultValue;
import org.apache.axiom.soap.impl.llom.SOAPElement;
@@ -43,12 +38,4 @@ public class SOAP12FaultValueImpl extend
parent.getClass());
}
}
-
- protected OMElement createClone(OMCloneOptions options, AxiomContainer
targetParent) {
- if (targetParent instanceof SOAPFaultCode) {
- return
((SOAPFactory)getOMFactory()).createSOAPFaultValue((SOAPFaultCode)targetParent);
- } else {
- return
((SOAPFactory)getOMFactory()).createSOAPFaultValue((SOAPFaultSubCode)targetParent);
- }
- }
}
