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/02/10 12:27:45 UTC
svn commit: r1729582 - in /webservices/axiom/trunk:
aspects/core-aspects/src/main/java/org/apache/axiom/core/
aspects/core-aspects/src/main/java/org/apache/axiom/core/builder/
aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/
aspects...
Author: veithen
Date: Wed Feb 10 11:27:44 2016
New Revision: 1729582
URL: http://svn.apache.org/viewvc?rev=1729582&view=rev
Log:
Remove references to OMContainer from core-aspects.
Added:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java
- copied, changed from r1729546, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/builder/Builder.java
Removed:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/builder/Builder.java
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractBuilder.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractPushBuilder.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/PullThroughWrapper.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
Copied: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java (from r1729546, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/builder/Builder.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java&p1=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/builder/Builder.java&r1=1729546&r2=1729582&rev=1729582&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/builder/Builder.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java Wed Feb 10 11:27:44 2016
@@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.core.builder;
+package org.apache.axiom.core;
import javax.xml.stream.XMLStreamReader;
-import org.apache.axiom.om.OMContainer;
-
public interface Builder {
int next();
boolean isCompleted();
@@ -39,9 +37,9 @@ public interface Builder {
XMLStreamReader disableCaching();
- void reenableCaching(OMContainer container);
+ void reenableCaching(CoreParentNode container);
- void discard(OMContainer container);
+ void discard(CoreParentNode container);
- void debugDiscarded(Object container);
+ void debugDiscarded(CoreParentNode container);
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java?rev=1729582&r1=1729581&r2=1729582&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java Wed Feb 10 11:27:44 2016
@@ -18,8 +18,6 @@
*/
package org.apache.axiom.core;
-import org.apache.axiom.core.builder.Builder;
-
/**
* Interface for parent nodes.
*/
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj?rev=1729582&r1=1729581&r2=1729582&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj Wed Feb 10 11:27:44 2016
@@ -19,6 +19,7 @@
package org.apache.axiom.core.impl.mixin;
import org.apache.axiom.core.Axis;
+import org.apache.axiom.core.Builder;
import org.apache.axiom.core.CharacterData;
import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.Content;
@@ -37,7 +38,6 @@ import org.apache.axiom.core.Mapper;
import org.apache.axiom.core.NodeFilter;
import org.apache.axiom.core.NodeIterator;
import org.apache.axiom.core.Semantics;
-import org.apache.axiom.core.builder.Builder;
import org.apache.axiom.core.impl.ElementsIterator;
import org.apache.axiom.core.impl.Flags;
import org.apache.axiom.core.impl.NodesIterator;
@@ -218,7 +218,7 @@ public aspect CoreParentNodeSupport {
if (lastChild instanceof CoreParentNode) {
((CoreParentNode)lastChild).build();
}
- coreGetBuilder().discard((OMContainer)this);
+ coreGetBuilder().discard(this);
updateState = true;
} else {
updateState = false;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj?rev=1729582&r1=1729581&r2=1729582&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj Wed Feb 10 11:27:44 2016
@@ -18,8 +18,8 @@
*/
package org.apache.axiom.core.impl.mixin;
+import org.apache.axiom.core.Builder;
import org.apache.axiom.core.DeferringParentNode;
-import org.apache.axiom.core.builder.Builder;
public aspect DeferringParentNodeSupport {
private Builder DeferringParentNode.builder;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj?rev=1729582&r1=1729581&r2=1729582&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj Wed Feb 10 11:27:44 2016
@@ -18,8 +18,8 @@
*/
package org.apache.axiom.core.impl.mixin;
+import org.apache.axiom.core.Builder;
import org.apache.axiom.core.NonDeferringParentNode;
-import org.apache.axiom.core.builder.Builder;
public aspect NonDeferringParentNodeSupport {
public final Builder NonDeferringParentNode.coreGetBuilder() {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractBuilder.java?rev=1729582&r1=1729581&r2=1729582&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractBuilder.java Wed Feb 10 11:27:44 2016
@@ -18,8 +18,8 @@
*/
package org.apache.axiom.om.impl.common.builder;
+import org.apache.axiom.core.Builder;
import org.apache.axiom.core.NodeFactory;
-import org.apache.axiom.core.builder.Builder;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.intf.AxiomDocument;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractPushBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractPushBuilder.java?rev=1729582&r1=1729581&r2=1729582&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractPushBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractPushBuilder.java Wed Feb 10 11:27:44 2016
@@ -20,8 +20,8 @@ package org.apache.axiom.om.impl.common.
import javax.xml.stream.XMLStreamReader;
+import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.core.NodeFactory;
-import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.impl.intf.AxiomSourcedElement;
@@ -89,16 +89,16 @@ public abstract class AbstractPushBuilde
}
@Override
- public final void reenableCaching(OMContainer container) {
+ public final void reenableCaching(CoreParentNode container) {
throw new UnsupportedOperationException();
}
@Override
- public final void discard(OMContainer container) {
+ public final void discard(CoreParentNode container) {
throw new UnsupportedOperationException();
}
@Override
- public final void debugDiscarded(Object container) {
+ public final void debugDiscarded(CoreParentNode container) {
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java?rev=1729582&r1=1729581&r2=1729582&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java Wed Feb 10 11:27:44 2016
@@ -24,9 +24,9 @@ import java.util.Map;
import javax.xml.stream.XMLStreamConstants;
+import org.apache.axiom.core.Builder;
import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.core.NodeFactory;
-import org.apache.axiom.core.builder.Builder;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMException;
@@ -80,7 +80,7 @@ public final class BuilderHandler implem
* Stores the stack trace of the code that caused a node to be discarded or consumed. This is
* only used if debug logging was enabled when builder was created.
*/
- public Map<OMContainer,Throwable> discardTracker = log.isDebugEnabled() ? new LinkedHashMap<OMContainer,Throwable>() : null;
+ public Map<CoreParentNode,Throwable> discardTracker = log.isDebugEnabled() ? new LinkedHashMap<CoreParentNode,Throwable>() : null;
private ArrayList<NodePostProcessor> nodePostProcessors;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java?rev=1729582&r1=1729581&r2=1729582&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java Wed Feb 10 11:27:44 2016
@@ -19,6 +19,7 @@
package org.apache.axiom.om.impl.common.builder;
+import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.core.NodeFactory;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
@@ -77,14 +78,14 @@ public class StAXOMBuilder extends Abstr
this(nodeFactory, parser, true, null, null, PlainXMLModel.INSTANCE, PayloadSelector.DEFAULT, element);
}
- private void discarded(AxiomContainer container) {
- container.discarded();
+ private void discarded(CoreParentNode container) {
+ ((AxiomContainer)container).discarded();
if (builderHandler.discardTracker != null) {
builderHandler.discardTracker.put(container, new Throwable());
}
}
- public final void debugDiscarded(Object container) {
+ public final void debugDiscarded(CoreParentNode container) {
if (log.isDebugEnabled() && builderHandler.discardTracker != null) {
Throwable t = builderHandler.discardTracker.get(container);
if (t != null) {
@@ -95,11 +96,11 @@ public class StAXOMBuilder extends Abstr
// For compatibility only
public final void discard(OMElement element) throws OMException {
- discard((OMContainer)element);
+ discard((CoreParentNode)element);
element.discard();
}
- public final void discard(OMContainer container) {
+ public final void discard(CoreParentNode container) {
int targetElementLevel = builderHandler.elementLevel;
AxiomContainer current = builderHandler.target;
while (current != container) {
@@ -241,7 +242,7 @@ public class StAXOMBuilder extends Abstr
// This method expects that the parser is currently positioned on the
// end event corresponding to the container passed as parameter
- public final void reenableCaching(OMContainer container) {
+ public final void reenableCaching(CoreParentNode container) {
AxiomContainer current = builderHandler.target;
while (true) {
discarded(current);
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java?rev=1729582&r1=1729581&r2=1729582&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java Wed Feb 10 11:27:44 2016
@@ -33,6 +33,7 @@ import javax.xml.stream.XMLStreamConstan
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.apache.axiom.core.Builder;
import org.apache.axiom.core.CoreAttribute;
import org.apache.axiom.core.CoreCharacterDataContainer;
import org.apache.axiom.core.CoreChildNode;
@@ -42,7 +43,6 @@ import org.apache.axiom.core.CoreNSAware
import org.apache.axiom.core.CoreNamespaceDeclaration;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.CoreParentNode;
-import org.apache.axiom.core.builder.Builder;
import org.apache.axiom.ext.stax.CharacterDataReader;
import org.apache.axiom.ext.stax.DTDReader;
import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
@@ -654,7 +654,7 @@ final class Navigator extends PullSerial
if (log.isDebugEnabled()) {
log.debug("Switching to pull-through mode; first event is " + XMLEventUtils.getEventTypeString(reader.getEventType()) + "; depth is " + depth);
}
- PullThroughWrapper wrapper = new PullThroughWrapper(serializer, builder, (OMContainer)container, reader, depth);
+ PullThroughWrapper wrapper = new PullThroughWrapper(serializer, builder, container, reader, depth);
serializer.pushState(wrapper);
node = container;
visited = true;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/PullThroughWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/PullThroughWrapper.java?rev=1729582&r1=1729581&r2=1729582&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/PullThroughWrapper.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/PullThroughWrapper.java Wed Feb 10 11:27:44 2016
@@ -21,15 +21,15 @@ package org.apache.axiom.om.impl.common.
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.axiom.core.builder.Builder;
-import org.apache.axiom.om.OMContainer;
+import org.apache.axiom.core.Builder;
+import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.om.OMDocument;
final class PullThroughWrapper extends AbstractWrapper {
private final Builder builder;
- private final OMContainer container;
+ private final CoreParentNode container;
- PullThroughWrapper(PullSerializer serializer, Builder builder, OMContainer container, XMLStreamReader reader, int startDepth) {
+ PullThroughWrapper(PullSerializer serializer, Builder builder, CoreParentNode container, XMLStreamReader reader, int startDepth) {
super(serializer, reader, startDepth);
this.builder = builder;
this.container = container;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj?rev=1729582&r1=1729581&r2=1729582&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj Wed Feb 10 11:27:44 2016
@@ -30,11 +30,11 @@ import javax.xml.transform.sax.SAXResult
import javax.xml.transform.sax.SAXSource;
import org.apache.axiom.core.Axis;
+import org.apache.axiom.core.Builder;
import org.apache.axiom.core.CoreNSAwareElement;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.ElementMatcher;
import org.apache.axiom.core.Mapper;
-import org.apache.axiom.core.builder.Builder;
import org.apache.axiom.om.NodeUnavailableException;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj?rev=1729582&r1=1729581&r2=1729582&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj Wed Feb 10 11:27:44 2016
@@ -18,10 +18,10 @@
*/
package org.apache.axiom.om.impl.mixin;
+import org.apache.axiom.core.Builder;
import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.CoreElement;
import org.apache.axiom.core.CoreNode;
-import org.apache.axiom.core.builder.Builder;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMDataSourceExt;
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=1729582&r1=1729581&r2=1729582&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 Wed Feb 10 11:27:44 2016
@@ -19,7 +19,7 @@
package org.apache.axiom.soap.impl.llom;
-import org.apache.axiom.core.builder.Builder;
+import org.apache.axiom.core.Builder;
import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;