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 2015/09/07 20:32:57 UTC
svn commit: r1701661 - in /webservices/axiom/trunk/aspects:
core-aspects/src/main/java/org/apache/axiom/core/
om-aspects/src/main/java/org/apache/axiom/soap/impl/common/
Author: veithen
Date: Mon Sep 7 18:32:57 2015
New Revision: 1701661
URL: http://svn.apache.org/r1701661
Log:
Generalize the initAncillaryData method to all node types.
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElementSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNodeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPHeaderBlockSupport.aj
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElementSupport.aj?rev=1701661&r1=1701660&r2=1701661&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElementSupport.aj Mon Sep 7 18:32:57 2015
@@ -264,13 +264,9 @@ public aspect CoreElementSupport {
attr = attr.coreGetNextAttribute();
}
}
- initAncillaryData(policy, options, o);
}
// This is basically a hook for OMSourcedElement
public <T> void CoreElement.initSource(ClonePolicy<T> policy, T options, CoreElement other) {
}
-
- public <T> void CoreElement.initAncillaryData(ClonePolicy<T> policy, T options, CoreElement other) {
- }
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNodeSupport.aj?rev=1701661&r1=1701660&r2=1701661&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNodeSupport.aj Mon Sep 7 18:32:57 2015
@@ -70,6 +70,7 @@ public aspect CoreNodeSupport {
public final <T> CoreNode CoreNode.shallowClone(ClonePolicy<T> policy, T options) {
CoreNode clone = coreGetNodeFactory().createNode(policy.getTargetNodeClass(options, this));
clone.init(policy, options, this);
+ clone.initAncillaryData(policy, options, this);
return clone;
}
@@ -86,4 +87,7 @@ public aspect CoreNodeSupport {
public final <T> CoreNode CoreNode.coreClone(ClonePolicy<T> policy, T options) {
return internalClone(policy, options, null);
}
+
+ public <T> void CoreNode.initAncillaryData(ClonePolicy<T> policy, T options, CoreNode other) {
+ }
}
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=1701661&r1=1701660&r2=1701661&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 Mon Sep 7 18:32:57 2015
@@ -21,7 +21,7 @@ package org.apache.axiom.soap.impl.commo
import javax.xml.namespace.QName;
import org.apache.axiom.core.ClonePolicy;
-import org.apache.axiom.core.CoreElement;
+import org.apache.axiom.core.CoreNode;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMDataSourceExt;
import org.apache.axiom.soap.SOAPCloneOptions;
@@ -121,7 +121,7 @@ public aspect AxiomSOAPHeaderBlockSuppor
}
}
- public final <T> void AxiomSOAPHeaderBlock.initAncillaryData(ClonePolicy<T> policy, T options, CoreElement other) {
+ public final <T> void AxiomSOAPHeaderBlock.initAncillaryData(ClonePolicy<T> policy, T options, CoreNode other) {
// 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;