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/07 15:19:16 UTC
svn commit: r1728964 - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/
aspects/om-aspects/src/main/java...
Author: veithen
Date: Sun Feb 7 14:19:15 2016
New Revision: 1728964
URL: http://svn.apache.org/viewvc?rev=1728964&view=rev
Log:
Make Serializer implement XmlHandler and extract an interface to avoid a package cycle.
Added:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/SerializerImpl.java
- copied, changed from r1728960, webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/Serializer.java (with props)
Removed:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXSerializer.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/stax/StAXSerializer.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCharacterDataNodeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj
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/AxiomDocTypeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomEntityReferenceSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPMessageSupport.aj
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
Copied: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/SerializerImpl.java (from r1728960, webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/SerializerImpl.java?p2=webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/SerializerImpl.java&p1=webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java&r1=1728960&r2=1728964&rev=1728964&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/SerializerImpl.java Sun Feb 7 14:19:15 2016
@@ -40,10 +40,12 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMSerializable;
import org.apache.axiom.om.impl.common.util.OMDataSourceUtil;
+import org.apache.axiom.om.impl.intf.Serializer;
+import org.apache.axiom.om.impl.intf.TextContent;
import org.apache.axiom.om.impl.stream.StreamException;
import org.apache.axiom.util.stax.XMLStreamReaderUtils;
-public abstract class Serializer {
+public abstract class SerializerImpl implements Serializer {
private static final String XSI_URI = "http://www.w3.org/2001/XMLSchema-instance";
private static final String XSI_LOCAL_NAME = "type";
@@ -65,7 +67,7 @@ public abstract class Serializer {
* indicates if the namespace context determined by the ancestors of the root node
* should be strictly preserved in the output
*/
- public Serializer(OMSerializable root, boolean namespaceRepairing, boolean preserveNamespaceContext) {
+ public SerializerImpl(OMSerializable root, boolean namespaceRepairing, boolean preserveNamespaceContext) {
this.root = root;
if (root instanceof OMNode) {
OMContainer parent = ((OMNode)root).getParent();
@@ -297,11 +299,27 @@ public abstract class Serializer {
}
}
- protected abstract boolean isAssociated(String prefix, String namespace) throws StreamException;
+ public final void processCharacterData(Object data, boolean ignorable) throws StreamException {
+ if (data instanceof TextContent) {
+ TextContent textContent = (TextContent)data;
+ if (textContent.isBinary()) {
+ Object dataHandlerObject = textContent.getDataHandlerObject();
+ if (dataHandlerObject instanceof DataHandlerProvider) {
+ writeDataHandler((DataHandlerProvider)dataHandlerObject, textContent.getContentID(), textContent.isOptimize());
+ } else {
+ writeDataHandler(textContent.getDataHandler(), textContent.getContentID(), textContent.isOptimize());
+ }
+ return;
+ }
+ }
+ writeText(ignorable ? OMNode.SPACE_NODE : OMNode.TEXT_NODE, data.toString());
+ }
- public abstract void writeStartDocument(String version) throws StreamException;
+ public final void processCDATASection(String content) throws StreamException {
+ writeText(OMNode.CDATA_SECTION_NODE, content.toString());
+ }
- public abstract void writeStartDocument(String encoding, String version) throws StreamException;
+ protected abstract boolean isAssociated(String prefix, String namespace) throws StreamException;
public abstract void processDocumentTypeDeclaration(String rootName, String publicId, String systemId, String internalSubset) throws StreamException;
@@ -362,7 +380,7 @@ public abstract class Serializer {
public abstract void endElement() throws StreamException;
- public abstract void writeText(int type, String data) throws StreamException;
+ protected abstract void writeText(int type, String data) throws StreamException;
public abstract void processComment(String data) throws StreamException;
@@ -370,9 +388,9 @@ public abstract class Serializer {
public abstract void processEntityReference(String name, String replacementText) throws StreamException;
- public abstract void writeDataHandler(DataHandler dataHandler, String contentID, boolean optimize) throws StreamException;
+ protected abstract void writeDataHandler(DataHandler dataHandler, String contentID, boolean optimize) throws StreamException;
- public abstract void writeDataHandler(DataHandlerProvider dataHandlerProvider, String contentID, boolean optimize) throws StreamException;
+ protected abstract void writeDataHandler(DataHandlerProvider dataHandlerProvider, String contentID, boolean optimize) throws StreamException;
/**
* Serialize the given data source using {@link OMDataSource#serialize(XMLStreamWriter)}. The
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXSerializer.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXSerializer.java?rev=1728964&r1=1728963&r2=1728964&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXSerializer.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXSerializer.java Sun Feb 7 14:19:15 2016
@@ -28,7 +28,7 @@ import org.apache.axiom.ext.stax.datahan
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMSerializable;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
+import org.apache.axiom.om.impl.common.serializer.push.SerializerImpl;
import org.apache.axiom.om.impl.stream.StreamException;
import org.apache.axiom.util.base64.Base64EncodingWriterOutputStream;
import org.apache.axiom.util.namespace.ScopedNamespaceContext;
@@ -36,7 +36,7 @@ import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
-public class SAXSerializer extends Serializer {
+public class SAXSerializer extends SerializerImpl {
private final ContentHandler contentHandler;
private final LexicalHandler lexicalHandler;
private final ScopedNamespaceContext nsContext = new ScopedNamespaceContext();
@@ -64,11 +64,9 @@ public class SAXSerializer extends Seria
}
}
- public void writeStartDocument(String version) throws StreamException {
- writeStartDocument();
- }
-
- public void writeStartDocument(String encoding, String version) throws StreamException {
+ @Override
+ public void startDocument(String inputEncoding, String xmlVersion, String xmlEncoding,
+ boolean standalone) throws StreamException {
writeStartDocument();
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/stax/StAXSerializer.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/stax/StAXSerializer.java?rev=1728964&r1=1728963&r2=1728964&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/stax/StAXSerializer.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/stax/StAXSerializer.java Sun Feb 7 14:19:15 2016
@@ -26,7 +26,7 @@ import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMSerializable;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
+import org.apache.axiom.om.impl.common.serializer.push.SerializerImpl;
import org.apache.axiom.om.impl.stream.StreamException;
import org.apache.axiom.util.stax.XMLStreamWriterUtils;
import org.apache.commons.logging.Log;
@@ -37,7 +37,7 @@ import javax.xml.namespace.NamespaceCont
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-public class StAXSerializer extends Serializer {
+public class StAXSerializer extends SerializerImpl {
private static final Log log = LogFactory.getLog(StAXSerializer.class);
private final XMLStreamWriter writer;
@@ -59,17 +59,15 @@ public class StAXSerializer extends Seri
}
}
- public void writeStartDocument(String version) throws StreamException {
+ @Override
+ public void startDocument(String inputEncoding, String xmlVersion, String xmlEncoding,
+ boolean standalone) throws StreamException {
try {
- writer.writeStartDocument(version);
- } catch (XMLStreamException ex) {
- throw new StreamException(ex);
- }
- }
-
- public void writeStartDocument(String encoding, String version) throws StreamException {
- try {
- writer.writeStartDocument(encoding, version);
+ if (xmlEncoding == null) {
+ writer.writeStartDocument(xmlVersion);
+ } else {
+ writer.writeStartDocument(xmlEncoding, xmlVersion);
+ }
} catch (XMLStreamException ex) {
throw new StreamException(ex);
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java?rev=1728964&r1=1728963&r2=1728964&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java Sun Feb 7 14:19:15 2016
@@ -21,7 +21,6 @@ package org.apache.axiom.om.impl.intf;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMSerializable;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.om.impl.stream.StreamException;
public interface AxiomSerializable extends OMSerializable, AxiomInformationItem {
Added: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/Serializer.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/Serializer.java?rev=1728964&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/Serializer.java (added)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/Serializer.java Sun Feb 7 14:19:15 2016
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.om.impl.intf;
+
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axiom.ext.stax.datahandler.DataHandlerReader;
+import org.apache.axiom.om.OMDataSource;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.stream.StreamException;
+import org.apache.axiom.om.impl.stream.XmlHandler;
+
+public interface Serializer extends XmlHandler {
+ void serializeStartpart(OMElement element) throws StreamException;
+ void copyEvent(XMLStreamReader reader, DataHandlerReader dataHandlerReader) throws StreamException;
+ void serialize(OMDataSource dataSource) throws StreamException;
+}
Propchange: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/Serializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj?rev=1728964&r1=1728963&r2=1728964&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj Sun Feb 7 14:19:15 2016
@@ -19,10 +19,17 @@
package org.apache.axiom.om.impl.mixin;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.intf.AxiomCDATASection;
+import org.apache.axiom.om.impl.intf.Serializer;
+import org.apache.axiom.om.impl.stream.StreamException;
public aspect AxiomCDATASectionSupport {
public final int AxiomCDATASection.getType() {
return OMNode.CDATA_SECTION_NODE;
}
+
+ public final void AxiomCDATASection.internalSerialize(Serializer serializer, OMOutputFormat format, boolean cache) throws StreamException {
+ serializer.processCDATASection(coreGetCharacterData().toString());
+ }
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCharacterDataNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCharacterDataNodeSupport.aj?rev=1728964&r1=1728963&r2=1728964&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCharacterDataNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCharacterDataNodeSupport.aj Sun Feb 7 14:19:15 2016
@@ -19,10 +19,17 @@
package org.apache.axiom.om.impl.mixin;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.intf.AxiomCharacterDataNode;
+import org.apache.axiom.om.impl.intf.Serializer;
+import org.apache.axiom.om.impl.stream.StreamException;
public aspect AxiomCharacterDataNodeSupport {
public final int AxiomCharacterDataNode.getType() {
return coreIsIgnorable() ? OMNode.SPACE_NODE : OMNode.TEXT_NODE;
}
+
+ public final void AxiomCharacterDataNode.internalSerialize(Serializer serializer, OMOutputFormat format, boolean cache) throws StreamException {
+ serializer.processCharacterData(coreGetCharacterData(), coreIsIgnorable());
+ }
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj?rev=1728964&r1=1728963&r2=1728964&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj Sun Feb 7 14:19:15 2016
@@ -21,8 +21,8 @@ package org.apache.axiom.om.impl.mixin;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.common.AxiomSemantics;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.om.impl.intf.AxiomComment;
+import org.apache.axiom.om.impl.intf.Serializer;
import org.apache.axiom.om.impl.stream.StreamException;
public aspect AxiomCommentSupport {
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=1728964&r1=1728963&r2=1728964&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 Sun Feb 7 14:19:15 2016
@@ -56,12 +56,12 @@ import org.apache.axiom.om.impl.common.O
import org.apache.axiom.om.impl.common.SAXResultContentHandler;
import org.apache.axiom.om.impl.common.serializer.pull.OMXMLStreamReaderExAdapter;
import org.apache.axiom.om.impl.common.serializer.pull.PullSerializer;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.om.impl.common.serializer.push.sax.XMLReaderImpl;
import org.apache.axiom.om.impl.common.serializer.push.stax.StAXSerializer;
import org.apache.axiom.om.impl.intf.AxiomChildNode;
import org.apache.axiom.om.impl.intf.AxiomContainer;
import org.apache.axiom.om.impl.intf.OMFactoryEx;
+import org.apache.axiom.om.impl.intf.Serializer;
import org.apache.axiom.om.impl.stream.StreamException;
import org.apache.axiom.om.util.OMXMLStreamReaderValidator;
import org.apache.axiom.om.util.StAXUtils;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeSupport.aj?rev=1728964&r1=1728963&r2=1728964&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeSupport.aj Sun Feb 7 14:19:15 2016
@@ -19,8 +19,8 @@
package org.apache.axiom.om.impl.mixin;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.om.impl.intf.AxiomDocType;
+import org.apache.axiom.om.impl.intf.Serializer;
import org.apache.axiom.om.impl.stream.StreamException;
public aspect AxiomDocTypeSupport {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.aj?rev=1728964&r1=1728963&r2=1728964&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.aj Sun Feb 7 14:19:15 2016
@@ -23,9 +23,9 @@ import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.common.AxiomSemantics;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.om.impl.intf.AxiomDocument;
import org.apache.axiom.om.impl.intf.AxiomElement;
+import org.apache.axiom.om.impl.intf.Serializer;
import org.apache.axiom.om.impl.stream.StreamException;
public aspect AxiomDocumentSupport {
@@ -63,11 +63,7 @@ public aspect AxiomDocumentSupport {
if (version == null) {
version = "1.0";
}
- if (encoding == null) {
- serializer.writeStartDocument(version);
- } else {
- serializer.writeStartDocument(encoding, version);
- }
+ serializer.startDocument(null, version, encoding, true);
}
serializeChildren(serializer, format, cache);
serializer.endDocument();
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj?rev=1728964&r1=1728963&r2=1728964&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj Sun Feb 7 14:19:15 2016
@@ -59,11 +59,11 @@ import org.apache.axiom.om.impl.common.N
import org.apache.axiom.om.impl.common.NamespaceDeclarationMapper;
import org.apache.axiom.om.impl.common.NamespaceIterator;
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.om.impl.intf.AxiomAttribute;
import org.apache.axiom.om.impl.intf.AxiomContainer;
import org.apache.axiom.om.impl.intf.AxiomElement;
import org.apache.axiom.om.impl.intf.AxiomNamespaceDeclaration;
+import org.apache.axiom.om.impl.intf.Serializer;
import org.apache.axiom.om.impl.stream.StreamException;
import org.apache.axiom.util.namespace.MapBasedNamespaceContext;
import org.apache.axiom.util.stax.XMLStreamIOException;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomEntityReferenceSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomEntityReferenceSupport.aj?rev=1728964&r1=1728963&r2=1728964&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomEntityReferenceSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomEntityReferenceSupport.aj Sun Feb 7 14:19:15 2016
@@ -20,8 +20,8 @@ package org.apache.axiom.om.impl.mixin;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.om.impl.intf.AxiomEntityReference;
+import org.apache.axiom.om.impl.intf.Serializer;
import org.apache.axiom.om.impl.stream.StreamException;
public aspect AxiomEntityReferenceSupport {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj?rev=1728964&r1=1728963&r2=1728964&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj Sun Feb 7 14:19:15 2016
@@ -20,8 +20,8 @@ package org.apache.axiom.om.impl.mixin;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.common.AxiomSemantics;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.om.impl.intf.AxiomProcessingInstruction;
+import org.apache.axiom.om.impl.intf.Serializer;
import org.apache.axiom.om.impl.stream.StreamException;
public aspect AxiomProcessingInstructionSupport {
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=1728964&r1=1728963&r2=1728964&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 Sun Feb 7 14:19:15 2016
@@ -35,9 +35,9 @@ import org.apache.axiom.om.impl.common.D
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.common.builder.PushOMBuilder;
import org.apache.axiom.om.impl.common.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.om.impl.common.util.OMDataSourceUtil;
import org.apache.axiom.om.impl.intf.AxiomSourcedElement;
+import org.apache.axiom.om.impl.intf.Serializer;
import org.apache.axiom.om.impl.stream.StreamException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextSupport.aj?rev=1728964&r1=1728963&r2=1728964&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextSupport.aj Sun Feb 7 14:19:15 2016
@@ -21,17 +21,13 @@ package org.apache.axiom.om.impl.mixin;
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
-import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.common.AxiomSemantics;
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.om.impl.intf.AxiomText;
import org.apache.axiom.om.impl.intf.TextContent;
-import org.apache.axiom.om.impl.stream.StreamException;
public aspect AxiomTextSupport {
private TextContent AxiomText.getTextContent(boolean force) {
@@ -116,25 +112,6 @@ public aspect AxiomTextSupport {
return getTextContent(true).getContentID();
}
- public final void AxiomText.internalSerialize(Serializer serializer, OMOutputFormat format, boolean cache) throws StreamException {
- Object content = coreGetCharacterData();
- if (content instanceof TextContent) {
- TextContent textContent = (TextContent)content;
- if (textContent.isBinary()) {
- Object dataHandlerObject = textContent.getDataHandlerObject();
- if (dataHandlerObject instanceof DataHandlerProvider) {
- serializer.writeDataHandler((DataHandlerProvider)dataHandlerObject, textContent.getContentID(), textContent.isOptimize());
- } else {
- serializer.writeDataHandler(textContent.getDataHandler(), textContent.getContentID(), textContent.isOptimize());
- }
- } else {
- serializer.writeText(getType(), textContent.toString());
- }
- } else {
- serializer.writeText(getType(), (String)content);
- }
- }
-
public final void AxiomText.buildWithAttachments() {
if (isOptimized()) {
// The call to getDataSource ensures that the MIME part is completely read
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPMessageSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPMessageSupport.aj?rev=1728964&r1=1728963&r2=1728964&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPMessageSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPMessageSupport.aj Sun Feb 7 14:19:15 2016
@@ -22,8 +22,8 @@ import org.apache.axiom.core.ClonePolicy
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.om.impl.intf.AxiomElement;
+import org.apache.axiom.om.impl.intf.Serializer;
import org.apache.axiom.om.impl.stream.StreamException;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java?rev=1728964&r1=1728963&r2=1728964&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java Sun Feb 7 14:19:15 2016
@@ -24,7 +24,7 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
+import org.apache.axiom.om.impl.common.serializer.push.SerializerImpl;
import org.apache.axiom.om.impl.stream.StreamException;
import org.apache.axiom.soap.SOAP11Version;
import org.apache.axiom.soap.SOAPBody;
@@ -128,17 +128,19 @@ public abstract class SOAPEnvelopeImpl e
// here do nothing as SOAPEnvelope doesn't have a parent !!!
}
- public void internalSerialize(Serializer serializer, OMOutputFormat format, boolean cache)
+ public void internalSerialize(SerializerImpl serializer, OMOutputFormat format, boolean cache)
throws StreamException {
if (!format.isIgnoreXMLDeclaration()) {
String charSetEncoding = format.getCharSetEncoding();
String xmlVersion = format.getXmlVersion();
- serializer.writeStartDocument(
+ serializer.startDocument(
+ null,
+ xmlVersion == null ? OMConstants.DEFAULT_XML_VERSION
+ : xmlVersion,
charSetEncoding == null ? OMConstants.DEFAULT_CHAR_SET_ENCODING
: charSetEncoding,
- xmlVersion == null ? OMConstants.DEFAULT_XML_VERSION
- : xmlVersion);
+ true);
}
super.internalSerialize(serializer, format, cache);
serializer.endDocument();
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=1728964&r1=1728963&r2=1728964&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 Sun Feb 7 14:19:15 2016
@@ -26,7 +26,7 @@ import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.builder.Builder;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
+import org.apache.axiom.om.impl.common.serializer.push.SerializerImpl;
import org.apache.axiom.om.impl.stream.StreamException;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPConstants;
@@ -119,15 +119,17 @@ public abstract class SOAPEnvelopeImpl e
// here do nothing as SOAPEnvelope doesn't have a parent !!!
}
- public void internalSerialize(Serializer serializer, OMOutputFormat format, boolean cache)
+ public void internalSerialize(SerializerImpl serializer, OMOutputFormat format, boolean cache)
throws StreamException {
if (!format.isIgnoreXMLDeclaration()) {
String charSetEncoding = format.getCharSetEncoding();
String xmlVersion = format.getXmlVersion();
- serializer.writeStartDocument(
+ serializer.startDocument(
+ null,
+ xmlVersion == null ? OMConstants.DEFAULT_XML_VERSION : xmlVersion,
charSetEncoding == null ? OMConstants.DEFAULT_CHAR_SET_ENCODING
: charSetEncoding,
- xmlVersion == null ? OMConstants.DEFAULT_XML_VERSION : xmlVersion);
+ true);
}
super.internalSerialize(serializer, format, cache);
serializer.endDocument();