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/28 10:50:07 UTC
svn commit: r1732707 [1/2] - in
/webservices/axiom/branches/maven-site-plugin-3.5: ./
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/apa...
Author: veithen
Date: Sun Feb 28 09:50:05 2016
New Revision: 1732707
URL: http://svn.apache.org/viewvc?rev=1732707&view=rev
Log:
Merge latest changes from trunk.
Added:
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreModelStreamException.java
- copied unchanged from r1732706, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreModelStreamException.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/InputContext.java
- copied unchanged from r1732706, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/InputContext.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/TreeWalkerImpl.java
- copied unchanged from r1732706, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/TreeWalkerImpl.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/DocumentElementExtractingFilterHandler.java
- copied unchanged from r1732706, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/DocumentElementExtractingFilterHandler.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/util/
- copied from r1732706, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/util/
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/
- copied from r1732706, webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/StAXPullInput.java
- copied unchanged from r1732706, webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/StAXPullInput.java
webservices/axiom/branches/maven-site-plugin-3.5/testing/xml-testsuite/src/main/resources/org/apache/axiom/ts/xml/bulk/adjacent-cdata-sections.xml
- copied unchanged from r1732706, webservices/axiom/trunk/testing/xml-testsuite/src/main/resources/org/apache/axiom/ts/xml/bulk/adjacent-cdata-sections.xml
webservices/axiom/branches/maven-site-plugin-3.5/testing/xml-testsuite/src/main/resources/org/apache/axiom/ts/xml/bulk/large-cdata-section.xml
- copied unchanged from r1732706, webservices/axiom/trunk/testing/xml-testsuite/src/main/resources/org/apache/axiom/ts/xml/bulk/large-cdata-section.xml
Removed:
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNode.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/NonDeferringParentNode.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/builder/
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushOMDataSourceInput.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushOMDataSourceReader.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushOMDataSourceStreamWriter.java
Modified:
webservices/axiom/branches/maven-site-plugin-3.5/ (props changed)
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CharacterData.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNode.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNode.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCDATASectionSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCharacterDataNodeSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCommentSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentFragmentSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentTypeDeclarationSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreEntityReferenceSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSAwareAttributeSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSAwareElementSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSUnawareAttributeSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSUnawareElementSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNamespaceDeclarationSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreProcessingInstructionSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlHandler.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlHandlerWrapper.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlReader.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/ContentHandlerXmlHandler.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/SAXReader.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/XmlHandlerContentHandler.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/SAXResultContentHandler.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/Context.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXHelper.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/XMLReaderImpl.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/stax/StAXSerializer.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomDocument.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomElement.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomAttributeSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCharacterDataNodeSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomEntityReferenceSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamespaceDeclarationSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/XmlHandlerStreamWriter.java
webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPBodySupport.aj
webservices/axiom/branches/maven-site-plugin-3.5/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java
webservices/axiom/branches/maven-site-plugin-3.5/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox4Dialect.java
webservices/axiom/branches/maven-site-plugin-3.5/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
webservices/axiom/branches/maven-site-plugin-3.5/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
webservices/axiom/branches/maven-site-plugin-3.5/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSUnawareAttribute.java
webservices/axiom/branches/maven-site-plugin-3.5/src/site/markdown/release-notes/1.3.0.md
webservices/axiom/branches/maven-site-plugin-3.5/systests/old-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java
webservices/axiom/branches/maven-site-plugin-3.5/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAndConsumeWithOMSEInBody.java
webservices/axiom/branches/maven-site-plugin-3.5/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/StAXXML.java
Propchange: webservices/axiom/branches/maven-site-plugin-3.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 28 09:50:05 2016
@@ -13,4 +13,4 @@
/webservices/axiom/branches/attrs-aspects:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1731125-1732529
+/webservices/axiom/trunk:1731125-1732706
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CharacterData.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CharacterData.java?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CharacterData.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CharacterData.java Sun Feb 28 09:50:05 2016
@@ -29,4 +29,5 @@ public interface CharacterData {
<T> CharacterData clone(ClonePolicy<T> policy, T options);
String toString();
void writeTo(Writer writer) throws IOException;
+ void appendTo(StringBuilder buffer);
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java Sun Feb 28 09:50:05 2016
@@ -18,10 +18,7 @@
*/
package org.apache.axiom.core;
-import org.apache.axiom.core.stream.StreamException;
-import org.apache.axiom.core.stream.XmlHandler;
-
-public interface CoreAttribute extends NonDeferringParentNode, CoreCharacterDataContainingParentNode {
+public interface CoreAttribute extends CoreCharacterDataContainingParentNode {
/**
* Get the owner element of this attribute.
*
@@ -62,6 +59,4 @@ public interface CoreAttribute extends N
* of its owner element or if the attribute has no owner element
*/
CoreAttribute coreGetPreviousAttribute();
-
- void coreSerialize(XmlHandler handler) throws CoreModelException, StreamException;
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNode.java?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNode.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNode.java Sun Feb 28 09:50:05 2016
@@ -18,6 +18,6 @@
*/
package org.apache.axiom.core;
-public interface CoreCharacterDataContainingParentNode extends CoreCharacterDataContainer, NonDeferringParentNode {
+public interface CoreCharacterDataContainingParentNode extends CoreCharacterDataContainer, CoreParentNode {
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java Sun Feb 28 09:50:05 2016
@@ -18,6 +18,6 @@
*/
package org.apache.axiom.core;
-public interface CoreDocumentFragment extends CoreMixedContentContainer, NonDeferringParentNode {
+public interface CoreDocumentFragment extends CoreMixedContentContainer {
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java Sun Feb 28 09:50:05 2016
@@ -20,7 +20,7 @@ package org.apache.axiom.core;
import java.util.Iterator;
-public interface CoreElement extends CoreChildNode, CoreMixedContentContainer, CoreNamedNode, DeferringParentNode {
+public interface CoreElement extends CoreChildNode, CoreMixedContentContainer, CoreNamedNode {
/**
* Get the first attribute of this element.
*
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNode.java?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNode.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNode.java Sun Feb 28 09:50:05 2016
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.core;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
+
public interface CoreNode {
void coreSetOwnerDocument(CoreDocument document);
@@ -45,4 +48,6 @@ public interface CoreNode {
<T> void init(ClonePolicy<T> policy, T options, CoreNode other) throws CoreModelException;
<T> void cloneChildrenIfNecessary(ClonePolicy<T> policy, T options, CoreNode clone) throws CoreModelException;
+
+ void internalSerialize(XmlHandler handler, boolean cache) throws CoreModelException, StreamException;
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java Sun Feb 28 09:50:05 2016
@@ -29,7 +29,8 @@ public interface CoreParentNode extends
int COMPACT = 4;
Builder coreGetBuilder();
- void coreSetBuilder(Builder builder);
+ InputContext coreGetInputContext();
+ void coreSetInputContext(InputContext context);
int getState();
void coreSetState(int state);
void build();
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCDATASectionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCDATASectionSupport.aj?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCDATASectionSupport.aj (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCDATASectionSupport.aj Sun Feb 28 09:50:05 2016
@@ -20,8 +20,11 @@ package org.apache.axiom.core.impl.mixin
import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.CoreCDATASection;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreCDATASectionSupport {
public final NodeType CoreCDATASection.coreGetNodeType() {
@@ -30,4 +33,12 @@ public aspect CoreCDATASectionSupport {
public final <T> void CoreCDATASection.init(ClonePolicy<T> policy, T options, CoreNode other) {
}
+
+ public final void CoreCDATASection.serializeStartEvent(XmlHandler handler) throws CoreModelException, StreamException {
+ handler.startCDATASection();
+ }
+
+ public final void CoreCDATASection.serializeEndEvent(XmlHandler handler) throws StreamException {
+ handler.endCDATASection();
+ }
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCharacterDataNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCharacterDataNodeSupport.aj?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCharacterDataNodeSupport.aj (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCharacterDataNodeSupport.aj Sun Feb 28 09:50:05 2016
@@ -25,6 +25,8 @@ import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeType;
import org.apache.axiom.core.Semantics;
import org.apache.axiom.core.impl.Flags;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreCharacterDataNodeSupport {
/**
@@ -61,4 +63,8 @@ public aspect CoreCharacterDataNodeSuppo
data = o.data instanceof CharacterData ? ((CharacterData)o.data).clone(policy, options) : o.data;
coreSetIgnorable(o.coreIsIgnorable());
}
+
+ public final void CoreCharacterDataNode.internalSerialize(XmlHandler handler, boolean cache) throws StreamException {
+ handler.processCharacterData(coreGetCharacterData(), coreIsIgnorable());
+ }
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCommentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCommentSupport.aj?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCommentSupport.aj (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCommentSupport.aj Sun Feb 28 09:50:05 2016
@@ -20,8 +20,11 @@ package org.apache.axiom.core.impl.mixin
import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.CoreComment;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreCommentSupport {
public final NodeType CoreComment.coreGetNodeType() {
@@ -30,4 +33,12 @@ public aspect CoreCommentSupport {
public final <T> void CoreComment.init(ClonePolicy<T> policy, T options, CoreNode other) {
}
+
+ public final void CoreComment.serializeStartEvent(XmlHandler handler) throws CoreModelException, StreamException {
+ handler.startComment();
+ }
+
+ public final void CoreComment.serializeEndEvent(XmlHandler handler) throws StreamException {
+ handler.endComment();
+ }
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentFragmentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentFragmentSupport.aj?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentFragmentSupport.aj (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentFragmentSupport.aj Sun Feb 28 09:50:05 2016
@@ -21,8 +21,11 @@ package org.apache.axiom.core.impl.mixin
import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.CoreDocument;
import org.apache.axiom.core.CoreDocumentFragment;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreDocumentFragmentSupport {
private CoreDocument CoreDocumentFragment.ownerDocument;
@@ -45,4 +48,9 @@ public aspect CoreDocumentFragmentSuppor
public final <T> void CoreDocumentFragment.init(ClonePolicy<T> policy, T options, CoreNode other) {
}
+
+ public final void CoreDocumentFragment.internalSerialize(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
+ // TODO
+ throw new UnsupportedOperationException();
+ }
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentSupport.aj?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentSupport.aj (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentSupport.aj Sun Feb 28 09:50:05 2016
@@ -25,6 +25,8 @@ import org.apache.axiom.core.CoreElement
import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreDocumentSupport {
private String CoreDocument.inputEncoding;
@@ -96,4 +98,12 @@ public aspect CoreDocumentSupport {
coreSetStandalone(o.coreIsStandalone());
coreSetInputEncoding(o.coreGetInputEncoding());
}
+
+ public final void CoreDocument.serializeStartEvent(XmlHandler handler) throws CoreModelException, StreamException {
+ handler.startDocument(coreGetInputEncoding(), coreGetXmlVersion(), coreGetXmlEncoding(), coreIsStandalone());
+ }
+
+ public final void CoreDocument.serializeEndEvent(XmlHandler handler) throws StreamException {
+ handler.endDocument();
+ }
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentTypeDeclarationSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentTypeDeclarationSupport.aj?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentTypeDeclarationSupport.aj (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentTypeDeclarationSupport.aj Sun Feb 28 09:50:05 2016
@@ -22,6 +22,8 @@ import org.apache.axiom.core.ClonePolicy
import org.apache.axiom.core.CoreDocumentTypeDeclaration;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreDocumentTypeDeclarationSupport {
private String CoreDocumentTypeDeclaration.rootName;
@@ -72,4 +74,8 @@ public aspect CoreDocumentTypeDeclaratio
coreSetSystemId(o.coreGetSystemId());
coreSetInternalSubset(o.coreGetInternalSubset());
}
+
+ public final void CoreDocumentTypeDeclaration.internalSerialize(XmlHandler handler, boolean cache) throws StreamException {
+ handler.processDocumentTypeDeclaration(coreGetRootName(), coreGetPublicId(), coreGetSystemId(), coreGetInternalSubset());
+ }
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreEntityReferenceSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreEntityReferenceSupport.aj?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreEntityReferenceSupport.aj (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreEntityReferenceSupport.aj Sun Feb 28 09:50:05 2016
@@ -22,6 +22,8 @@ import org.apache.axiom.core.ClonePolicy
import org.apache.axiom.core.CoreEntityReference;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreEntityReferenceSupport {
private String CoreEntityReference.name;
@@ -52,4 +54,8 @@ public aspect CoreEntityReferenceSupport
coreSetName(o.coreGetName());
coreSetReplacementText(o.coreGetReplacementText());
}
+
+ public final void CoreEntityReference.internalSerialize(XmlHandler handler, boolean cache) throws StreamException {
+ handler.processEntityReference(coreGetName(), coreGetReplacementText());
+ }
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSAwareAttributeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSAwareAttributeSupport.aj?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSAwareAttributeSupport.aj (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSAwareAttributeSupport.aj Sun Feb 28 09:50:05 2016
@@ -29,7 +29,7 @@ public aspect CoreNSAwareAttributeSuppor
return NodeType.NS_AWARE_ATTRIBUTE;
}
- public final void CoreNSAwareAttribute.coreSerialize(XmlHandler handler) throws CoreModelException, StreamException {
+ public final void CoreNSAwareAttribute.internalSerialize(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
handler.processAttribute(coreGetNamespaceURI(), coreGetLocalName(), coreGetPrefix(), coreGetCharacterData().toString(), coreGetType(), coreGetSpecified());
}
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSAwareElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSAwareElementSupport.aj?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSAwareElementSupport.aj (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSAwareElementSupport.aj Sun Feb 28 09:50:05 2016
@@ -18,12 +18,15 @@
*/
package org.apache.axiom.core.impl.mixin;
-import org.apache.axiom.core.CoreAttribute;
import org.apache.axiom.core.CoreModelException;
+import org.apache.axiom.core.CoreModelStreamException;
import org.apache.axiom.core.CoreNSAwareElement;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.impl.TreeWalkerImpl;
import org.apache.axiom.core.stream.StreamException;
import org.apache.axiom.core.stream.XmlHandler;
+import org.apache.axiom.core.stream.XmlInput;
+import org.apache.axiom.core.stream.XmlReader;
public aspect CoreNSAwareElementSupport {
public final NodeType CoreNSAwareElement.coreGetNodeType() {
@@ -38,13 +41,26 @@ public aspect CoreNSAwareElementSupport
return namespaceURI.equals(coreGetNamespaceURI()) ? coreGetPrefix() : null;
}
- public final void CoreNSAwareElement.coreSerializeStartPart(XmlHandler handler) throws CoreModelException, StreamException {
+ public XmlInput CoreNSAwareElement.getXmlInput(boolean cache) throws StreamException {
+ return null;
+ }
+
+ public final void CoreNSAwareElement.serializeStartEvent(XmlHandler handler) throws CoreModelException, StreamException {
handler.startElement(coreGetNamespaceURI(), coreGetLocalName(), coreGetPrefix());
- CoreAttribute attr = coreGetFirstAttribute();
- while (attr != null) {
- attr.coreSerialize(handler);
- attr = attr.coreGetNextAttribute();
+ }
+
+ public final void CoreNSAwareElement.serializeEndEvent(XmlHandler handler) throws StreamException {
+ handler.endElement();
+ }
+
+ public final void CoreNSAwareElement.internalSerialize(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
+ try {
+ XmlReader reader = new TreeWalkerImpl(handler, this, cache);
+ while (!reader.proceed()) {
+ // Just loop
+ }
+ } catch (CoreModelStreamException ex) {
+ throw ex.getCoreModelException();
}
- handler.attributesCompleted();
}
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSUnawareAttributeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSUnawareAttributeSupport.aj?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSUnawareAttributeSupport.aj (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSUnawareAttributeSupport.aj Sun Feb 28 09:50:05 2016
@@ -29,7 +29,7 @@ public aspect CoreNSUnawareAttributeSupp
return NodeType.NS_UNAWARE_ATTRIBUTE;
}
- public final void CoreNSUnawareAttribute.coreSerialize(XmlHandler handler) throws CoreModelException, StreamException {
+ public final void CoreNSUnawareAttribute.internalSerialize(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
// TODO
throw new UnsupportedOperationException();
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSUnawareElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSUnawareElementSupport.aj?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSUnawareElementSupport.aj (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSUnawareElementSupport.aj Sun Feb 28 09:50:05 2016
@@ -19,8 +19,11 @@
package org.apache.axiom.core.impl.mixin;
import org.apache.axiom.core.CoreElement;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNSUnawareElement;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreNSUnawareElementSupport {
public final NodeType CoreNSUnawareElement.coreGetNodeType() {
@@ -38,4 +41,9 @@ public aspect CoreNSUnawareElementSuppor
final void CoreNSUnawareElement.copyName(CoreElement clone) {
((CoreNSUnawareElement)clone).coreSetName(coreGetName());
}
+
+ public final void CoreNSUnawareElement.internalSerialize(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
+ // TODO
+ throw new UnsupportedOperationException();
+ }
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNamespaceDeclarationSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNamespaceDeclarationSupport.aj?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNamespaceDeclarationSupport.aj (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNamespaceDeclarationSupport.aj Sun Feb 28 09:50:05 2016
@@ -36,7 +36,7 @@ public aspect CoreNamespaceDeclarationSu
coreSetDeclaredNamespace(((CoreNamespaceDeclaration)other).coreGetDeclaredPrefix(), "");
}
- public final void CoreNamespaceDeclaration.coreSerialize(XmlHandler handler) throws CoreModelException, StreamException {
+ public final void CoreNamespaceDeclaration.internalSerialize(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
handler.processNamespaceDeclaration(coreGetDeclaredPrefix(), coreGetCharacterData().toString());
}
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj Sun Feb 28 09:50:05 2016
@@ -35,6 +35,7 @@ import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.core.ElementAction;
import org.apache.axiom.core.ElementMatcher;
+import org.apache.axiom.core.InputContext;
import org.apache.axiom.core.Mapper;
import org.apache.axiom.core.NodeConsumedException;
import org.apache.axiom.core.NodeFilter;
@@ -43,8 +44,11 @@ import org.apache.axiom.core.Semantics;
import org.apache.axiom.core.impl.ElementsIterator;
import org.apache.axiom.core.impl.Flags;
import org.apache.axiom.core.impl.NodesIterator;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreParentNodeSupport {
+ private InputContext CoreParentNode.context;
private Object CoreParentNode.content;
// TODO: rename & make final
@@ -61,6 +65,20 @@ public aspect CoreParentNodeSupport {
}
public void CoreParentNode.forceExpand() {}
+
+ public final Builder CoreParentNode.coreGetBuilder() {
+ forceExpand();
+ return context == null ? null : context.getBuilder();
+ }
+
+ public final InputContext CoreParentNode.coreGetInputContext() {
+ return context;
+ }
+
+ public final void CoreParentNode.coreSetInputContext(InputContext context) {
+ this.context = context;
+ coreSetState(context == null ? COMPLETE : INCOMPLETE);
+ }
final Content CoreParentNode.getContent(boolean create) {
if (getState() == COMPACT) {
@@ -340,4 +358,50 @@ public aspect CoreParentNodeSupport {
}
}
}
+
+ public void CoreParentNode.serializeStartEvent(XmlHandler handler) throws CoreModelException, StreamException {
+ throw new UnsupportedOperationException();
+ }
+
+ public void CoreParentNode.serializeEndEvent(XmlHandler handler) throws StreamException {
+ throw new UnsupportedOperationException();
+ }
+
+ public void CoreParentNode.internalSerialize(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
+ serializeStartEvent(handler);
+ serializeChildren(handler, cache);
+ serializeEndEvent(handler);
+ }
+
+ public final void CoreParentNode.serializeChildren(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
+ if (getState() == DISCARDED) {
+ Builder builder = coreGetBuilder();
+ if (builder != null) {
+ builder.debugDiscarded(this);
+ }
+ throw new NodeConsumedException();
+ }
+ if (cache) {
+ CoreChildNode child = coreGetFirstChild();
+ while (child != null) {
+ child.internalSerialize(handler, true);
+ child = child.coreGetNextSibling();
+ }
+ } else {
+ // First, recursively serialize all child nodes that have already been created
+ CoreChildNode child = coreGetFirstChildIfAvailable();
+ while (child != null) {
+ child.internalSerialize(handler, cache);
+ child = child.coreGetNextSiblingIfAvailable();
+ }
+ InputContext context = coreGetInputContext();
+ if (context != null) {
+ context.setPassThroughHandler(handler);
+ Builder builder = context.getBuilder();
+ do {
+ builder.next();
+ } while (coreGetInputContext() != null);
+ }
+ }
+ }
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreProcessingInstructionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreProcessingInstructionSupport.aj?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreProcessingInstructionSupport.aj (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreProcessingInstructionSupport.aj Sun Feb 28 09:50:05 2016
@@ -19,9 +19,12 @@
package org.apache.axiom.core.impl.mixin;
import org.apache.axiom.core.ClonePolicy;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.CoreProcessingInstruction;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreProcessingInstructionSupport {
private String CoreProcessingInstruction.target;
@@ -41,4 +44,12 @@ public aspect CoreProcessingInstructionS
public final <T> void CoreProcessingInstruction.init(ClonePolicy<T> policy, T options, CoreNode other) {
target = ((CoreProcessingInstruction)other).target;
}
+
+ public final void CoreProcessingInstruction.serializeStartEvent(XmlHandler handler) throws CoreModelException, StreamException {
+ handler.startProcessingInstruction(coreGetTarget() + " ");
+ }
+
+ public final void CoreProcessingInstruction.serializeEndEvent(XmlHandler handler) throws StreamException {
+ handler.endProcessingInstruction();
+ }
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlHandler.java?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlHandler.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlHandler.java Sun Feb 28 09:50:05 2016
@@ -76,11 +76,55 @@ public interface XmlHandler {
void processCharacterData(Object data, boolean ignorable) throws StreamException;
- void processProcessingInstruction(String piTarget, String piData) throws StreamException;
+ /**
+ * Notify the handler of the beginning of a processing instruction.
+ *
+ * @param target
+ * the target of the processing instruction
+ * @throws StreamException
+ * if an error occurs when processing the event
+ */
+ void startProcessingInstruction(String target) throws StreamException;
- void processComment(String content) throws StreamException;
+ /**
+ * Notify the handler of the end of a processing instruction.
+ *
+ * @throws StreamException
+ * if an error occurs when processing the event
+ */
+ void endProcessingInstruction() throws StreamException;
- void processCDATASection(String content) throws StreamException;
+ /**
+ * Notify the handler of the beginning of a comment.
+ *
+ * @throws StreamException
+ * if an error occurs when processing the event
+ */
+ void startComment() throws StreamException;
+
+ /**
+ * Notify the handler of the end of a comment.
+ *
+ * @throws StreamException
+ * if an error occurs when processing the event
+ */
+ void endComment() throws StreamException;
+
+ /**
+ * Notify the handler of the beginning of a CDATA section.
+ *
+ * @throws StreamException
+ * if an error occurs when processing the event
+ */
+ void startCDATASection() throws StreamException;
+
+ /**
+ * Notify the handler of the end of a CDATA section.
+ *
+ * @throws StreamException
+ * if an error occurs when processing the event
+ */
+ void endCDATASection() throws StreamException;
void processEntityReference(String name, String replacementText) throws StreamException;
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlHandlerWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlHandlerWrapper.java?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlHandlerWrapper.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlHandlerWrapper.java Sun Feb 28 09:50:05 2016
@@ -70,17 +70,28 @@ public class XmlHandlerWrapper implement
parent.processCharacterData(data, ignorable);
}
- public void processProcessingInstruction(String piTarget, String piData)
- throws StreamException {
- parent.processProcessingInstruction(piTarget, piData);
+ public void startProcessingInstruction(String target) throws StreamException {
+ parent.startProcessingInstruction(target);
}
- public void processComment(String content) throws StreamException {
- parent.processComment(content);
+ public void endProcessingInstruction() throws StreamException {
+ parent.endProcessingInstruction();
}
- public void processCDATASection(String content) throws StreamException {
- parent.processCDATASection(content);
+ public void startComment() throws StreamException {
+ parent.startComment();
+ }
+
+ public void endComment() throws StreamException {
+ parent.endComment();
+ }
+
+ public void startCDATASection() throws StreamException {
+ parent.startCDATASection();
+ }
+
+ public void endCDATASection() throws StreamException {
+ parent.endCDATASection();
}
public void processEntityReference(String name, String replacementText) throws StreamException {
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlReader.java?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlReader.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlReader.java Sun Feb 28 09:50:05 2016
@@ -19,5 +19,5 @@
package org.apache.axiom.core.stream;
public interface XmlReader {
- void proceed() throws StreamException;
+ boolean proceed() throws StreamException;
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/ContentHandlerXmlHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/ContentHandlerXmlHandler.java?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/ContentHandlerXmlHandler.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/ContentHandlerXmlHandler.java Sun Feb 28 09:50:05 2016
@@ -24,12 +24,15 @@ import java.util.Stack;
import org.apache.axiom.core.CharacterData;
import org.apache.axiom.core.stream.StreamException;
import org.apache.axiom.core.stream.XmlHandler;
+import org.apache.axiom.core.stream.util.CharacterDataAccumulator;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.AttributesImpl;
public class ContentHandlerXmlHandler implements XmlHandler {
+ private enum CharacterDataMode { PASS_THROUGH, BUFFER, SKIP, ACCUMULATE };
+
private final ContentHandler contentHandler;
private final LexicalHandler lexicalHandler;
private String[] prefixStack = new String[16];
@@ -43,6 +46,11 @@ public class ContentHandlerXmlHandler im
private String elementLocalName;
private String elementQName;
private final AttributesImpl attributes = new AttributesImpl();
+ private CharacterDataMode characterDataMode = CharacterDataMode.PASS_THROUGH;
+ private char[] buffer = new char[4096];
+ private int bufferPos;
+ private CharacterDataAccumulator accumulator;
+ private String piTarget;
public ContentHandlerXmlHandler(ContentHandler contentHandler, LexicalHandler lexicalHandler) {
this.contentHandler = contentHandler;
@@ -151,27 +159,55 @@ public class ContentHandlerXmlHandler im
}
}
+ private void writeToBuffer(String data) {
+ int dataLen = data.length();
+ if (buffer.length-bufferPos < dataLen) {
+ int newLength = buffer.length;
+ do {
+ newLength *= 2;
+ } while (newLength-bufferPos < dataLen);
+ char[] newBuffer = new char[newLength];
+ System.arraycopy(buffer, 0, newBuffer, 0, bufferPos);
+ buffer = newBuffer;
+ }
+ data.getChars(0, dataLen, buffer, bufferPos);
+ bufferPos += dataLen;
+ }
+
public void processCharacterData(Object data, boolean ignorable) throws StreamException {
try {
- if (ignorable) {
- char[] ch = data.toString().toCharArray();
- contentHandler.ignorableWhitespace(ch, 0, ch.length);
- } else if (data instanceof CharacterData) {
- try {
- ((CharacterData)data).writeTo(new ContentHandlerWriter(contentHandler));
- } catch (IOException ex) {
- Throwable cause = ex.getCause();
- SAXException saxException;
- if (cause instanceof SAXException) {
- saxException = (SAXException)cause;
+ switch (characterDataMode) {
+ case PASS_THROUGH:
+ if (ignorable) {
+ writeToBuffer(data.toString());
+ contentHandler.ignorableWhitespace(buffer, 0, bufferPos);
+ bufferPos = 0;
+ } else if (data instanceof CharacterData) {
+ try {
+ ((CharacterData)data).writeTo(new ContentHandlerWriter(contentHandler));
+ } catch (IOException ex) {
+ Throwable cause = ex.getCause();
+ SAXException saxException;
+ if (cause instanceof SAXException) {
+ saxException = (SAXException)cause;
+ } else {
+ saxException = new SAXException(ex);
+ }
+ throw new StreamException(saxException);
+ }
} else {
- saxException = new SAXException(ex);
+ writeToBuffer(data.toString());
+ contentHandler.characters(buffer, 0, bufferPos);
+ bufferPos = 0;
}
- throw new StreamException(saxException);
- }
- } else {
- char[] ch = data.toString().toCharArray();
- contentHandler.characters(ch, 0, ch.length);
+ break;
+ case BUFFER:
+ writeToBuffer(data.toString());
+ break;
+ case ACCUMULATE:
+ accumulator.append(data);
+ break;
+ case SKIP:
}
} catch (SAXException ex) {
throw new StreamException(ex);
@@ -179,13 +215,19 @@ public class ContentHandlerXmlHandler im
}
@Override
- public void processCDATASection(String content) throws StreamException {
+ public void startCDATASection() throws StreamException {
try {
if (lexicalHandler != null) {
lexicalHandler.startCDATA();
}
- char[] ch = content.toCharArray();
- contentHandler.characters(ch, 0, ch.length);
+ } catch (SAXException ex) {
+ throw new StreamException(ex);
+ }
+ }
+
+ @Override
+ public void endCDATASection() throws StreamException {
+ try {
if (lexicalHandler != null) {
lexicalHandler.endCDATA();
}
@@ -194,20 +236,40 @@ public class ContentHandlerXmlHandler im
}
}
- public void processComment(String data) throws StreamException {
+ @Override
+ public void startComment() throws StreamException {
+ characterDataMode = lexicalHandler == null ? CharacterDataMode.SKIP : CharacterDataMode.BUFFER;
+ }
+
+ @Override
+ public void endComment() throws StreamException {
if (lexicalHandler != null) {
- char[] ch = data.toCharArray();
try {
- lexicalHandler.comment(ch, 0, ch.length);
+ lexicalHandler.comment(buffer, 0, bufferPos);
+ bufferPos = 0;
} catch (SAXException ex) {
throw new StreamException(ex);
}
}
+ characterDataMode = CharacterDataMode.PASS_THROUGH;
}
- public void processProcessingInstruction(String target, String data) throws StreamException {
+ @Override
+ public void startProcessingInstruction(String target) throws StreamException {
+ if (accumulator == null) {
+ accumulator = new CharacterDataAccumulator();
+ }
+ piTarget = target;
+ characterDataMode = CharacterDataMode.ACCUMULATE;
+ }
+
+ @Override
+ public void endProcessingInstruction() throws StreamException {
try {
- contentHandler.processingInstruction(target, data);
+ contentHandler.processingInstruction(piTarget, accumulator.toString());
+ accumulator.clear();
+ piTarget = null;
+ characterDataMode = CharacterDataMode.PASS_THROUGH;
} catch (SAXException ex) {
throw new StreamException(ex);
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/SAXReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/SAXReader.java?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/SAXReader.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/SAXReader.java Sun Feb 28 09:50:05 2016
@@ -41,7 +41,7 @@ public final class SAXReader implements
}
@Override
- public void proceed() throws StreamException {
+ public boolean proceed() throws StreamException {
XMLReader reader = source.getXMLReader();
XmlHandlerContentHandler contentHandler = new XmlHandlerContentHandler(handler, expandEntityReferences);
reader.setContentHandler(contentHandler);
@@ -63,5 +63,6 @@ public final class SAXReader implements
} catch (SAXException ex) {
throw new StreamException(ex);
}
+ return true;
}
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/XmlHandlerContentHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/XmlHandlerContentHandler.java?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/XmlHandlerContentHandler.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/XmlHandlerContentHandler.java Sun Feb 28 09:50:05 2016
@@ -78,8 +78,6 @@ public final class XmlHandlerContentHand
*/
private int namespaceCount;
- private boolean inCDATASection;
-
private boolean inEntityReference;
private int entityReferenceDepth;
@@ -308,13 +306,21 @@ public final class XmlHandlerContentHand
public void startCDATA() throws SAXException {
if (!inEntityReference) {
- inCDATASection = true;
+ try {
+ handler.startCDATASection();
+ } catch (StreamException ex) {
+ throw toSAXException(ex);
+ }
}
}
public void endCDATA() throws SAXException {
if (!inEntityReference) {
- inCDATASection = false;
+ try {
+ handler.endCDATASection();
+ } catch (StreamException ex) {
+ throw toSAXException(ex);
+ }
}
}
@@ -322,12 +328,7 @@ public final class XmlHandlerContentHand
throws SAXException {
if (!inEntityReference) {
try {
- if (inCDATASection) {
- // TODO: incorrect because it may split CDATA sections
- handler.processCDATASection(new String(ch, start, length));
- } else {
- handler.processCharacterData(new String(ch, start, length), false);
- }
+ handler.processCharacterData(new String(ch, start, length), false);
} catch (StreamException ex) {
throw toSAXException(ex);
}
@@ -349,7 +350,9 @@ public final class XmlHandlerContentHand
throws SAXException {
if (!inEntityReference) {
try {
- handler.processProcessingInstruction(piTarget, data);
+ handler.startProcessingInstruction(piTarget);
+ handler.processCharacterData(data, false);
+ handler.endProcessingInstruction();
} catch (StreamException ex) {
throw toSAXException(ex);
}
@@ -359,7 +362,9 @@ public final class XmlHandlerContentHand
public void comment(char[] ch, int start, int length) throws SAXException {
if (!inEntityReference) {
try {
- handler.processComment(new String(ch, start, length));
+ handler.startComment();
+ handler.processCharacterData(new String(ch, start, length), false);
+ handler.endComment();
} catch (StreamException ex) {
throw toSAXException(ex);
}
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/SAXResultContentHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/SAXResultContentHandler.java?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/SAXResultContentHandler.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/SAXResultContentHandler.java Sun Feb 28 09:50:05 2016
@@ -18,7 +18,9 @@
*/
package org.apache.axiom.om.impl.common;
+import org.apache.axiom.core.stream.StreamException;
import org.apache.axiom.core.stream.XmlHandler;
+import org.apache.axiom.core.stream.util.CharacterDataAccumulator;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDocument;
@@ -32,12 +34,22 @@ public final class SAXResultContentHand
private final OMContainer root;
private final OMFactory factory;
private OMContainer target;
+ private final CharacterDataAccumulator buffer = new CharacterDataAccumulator();
+ private boolean buffering;
+ private String piTarget;
public SAXResultContentHandler(OMContainer root) {
this.root = root;
factory = root.getOMFactory();
}
+ private String stopBuffering() {
+ String content = buffer.toString();
+ buffer.clear();
+ buffering = false;
+ return content;
+ }
+
public void startDocument(String inputEncoding, String xmlVersion, String xmlEncoding, boolean standalone) {
target = root;
}
@@ -93,20 +105,43 @@ public final class SAXResultContentHand
@Override
public void processCharacterData(Object data, boolean ignorable) {
- factory.createOMText(target, data.toString(), ignorable ? OMNode.SPACE_NODE : OMNode.TEXT_NODE);
+ if (buffering) {
+ buffer.append(data);
+ } else {
+ factory.createOMText(target, data.toString(), ignorable ? OMNode.SPACE_NODE : OMNode.TEXT_NODE);
+ }
}
@Override
- public void processCDATASection(String content) {
- factory.createOMText(target, content, OMNode.CDATA_SECTION_NODE);
+ public void startCDATASection() throws StreamException {
+ buffering = true;
}
- public void processProcessingInstruction(String piTarget, String piData) {
- factory.createOMProcessingInstruction(target, piTarget, piData);
+ @Override
+ public void endCDATASection() throws StreamException {
+ factory.createOMText(target, stopBuffering(), OMNode.CDATA_SECTION_NODE);
+ }
+
+ @Override
+ public void startProcessingInstruction(String target) throws StreamException {
+ buffering = true;
+ piTarget = target;
}
- public void processComment(String content) {
- factory.createOMComment(target, content);
+ @Override
+ public void endProcessingInstruction() throws StreamException {
+ factory.createOMProcessingInstruction(target, piTarget, stopBuffering());
+ piTarget = null;
+ }
+
+ @Override
+ public void startComment() throws StreamException {
+ buffering = true;
+ }
+
+ @Override
+ public void endComment() throws StreamException {
+ factory.createOMComment(target, stopBuffering());
}
public void processEntityReference(String name, String replacementText) {
Modified: webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java?rev=1732707&r1=1732706&r2=1732707&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java Sun Feb 28 09:50:05 2016
@@ -30,6 +30,7 @@ import org.apache.axiom.core.Builder;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.core.NodeFactory;
+import org.apache.axiom.core.stream.StreamException;
import org.apache.axiom.core.stream.XmlHandler;
import org.apache.axiom.om.impl.intf.AxiomDocument;
import org.apache.axiom.om.impl.intf.AxiomSourcedElement;
@@ -124,65 +125,83 @@ public final class BuilderHandler implem
document.coreSetXmlVersion(xmlVersion);
document.coreSetXmlEncoding(xmlEncoding);
document.coreSetStandalone(standalone);
- document.coreSetBuilder(builder);
+ document.coreSetInputContext(context);
nodeAdded(document);
context.target = document;
}
}
public void processDocumentTypeDeclaration(String rootName, String publicId, String systemId,
- String internalSubset) {
+ String internalSubset) throws StreamException {
model.validateEventType(XMLStreamConstants.DTD);
context.processDocumentTypeDeclaration(rootName, publicId, systemId, internalSubset);
}
- public void startElement(String namespaceURI, String localName, String prefix) {
+ public void startElement(String namespaceURI, String localName, String prefix) throws StreamException {
depth++;
context = context.startElement(namespaceURI, localName, prefix);
}
- public void endElement() {
+ public void endElement() throws StreamException {
context = context.endElement();
depth--;
}
- public void processAttribute(String namespaceURI, String localName, String prefix, String value, String type, boolean specified) {
+ public void processAttribute(String namespaceURI, String localName, String prefix, String value, String type, boolean specified) throws StreamException {
context.processAttribute(namespaceURI, localName, prefix, value, type, specified);
}
- public void processNamespaceDeclaration(String prefix, String namespaceURI) {
+ public void processNamespaceDeclaration(String prefix, String namespaceURI) throws StreamException {
context.processNamespaceDeclaration(prefix, namespaceURI);
}
- public void attributesCompleted() {
+ public void attributesCompleted() throws StreamException {
context.attributesCompleted();
}
- public void processCharacterData(Object data, boolean ignorable) {
+ public void processCharacterData(Object data, boolean ignorable) throws StreamException {
context.processCharacterData(data, ignorable);
}
- public void processProcessingInstruction(String piTarget, String piData) {
+ @Override
+ public void startProcessingInstruction(String target) throws StreamException {
model.validateEventType(XMLStreamConstants.PROCESSING_INSTRUCTION);
- context.processProcessingInstruction(piTarget, piData);
+ context = context.startProcessingInstruction(target);
}
- public void processComment(String content) {
+ @Override
+ public void endProcessingInstruction() throws StreamException {
+ context = context.endProcessingInstruction();
+ }
+
+ @Override
+ public void startComment() throws StreamException {
model.validateEventType(XMLStreamConstants.COMMENT);
- context.processComment(content);
+ context = context.startComment();
+ }
+
+ @Override
+ public void endComment() throws StreamException {
+ context = context.endComment();
}
- public void processCDATASection(String content) {
+ @Override
+ public void startCDATASection() throws StreamException {
model.validateEventType(XMLStreamConstants.CDATA);
- context.processCDATASection(content);
+ context = context.startCDATASection();
+ }
+
+ @Override
+ public void endCDATASection() throws StreamException {
+ context = context.endCDATASection();
}
- public void processEntityReference(String name, String replacementText) {
+ public void processEntityReference(String name, String replacementText) throws StreamException {
model.validateEventType(XMLStreamConstants.ENTITY_REFERENCE);
context.processEntityReference(name, replacementText);
}
- public void endDocument() {
+ public void endDocument() throws StreamException {
if (depth != 0) {
throw new IllegalStateException();
}