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 14:34:13 UTC
svn commit: r1728960 [2/2] - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/
aspects/om-aspects/src/main/java/org/apache/axiom/om/i...
Copied: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/XmlHandler.java (from r1728946, webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/Handler.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/XmlHandler.java?p2=webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/XmlHandler.java&p1=webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/Handler.java&r1=1728946&r2=1728960&rev=1728960&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/Handler.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/XmlHandler.java Sun Feb 7 13:34:12 2016
@@ -16,33 +16,33 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.om.impl.common;
+package org.apache.axiom.om.impl.stream;
-public interface Handler {
- void startDocument(String inputEncoding, String xmlVersion, String xmlEncoding, boolean standalone);
+public interface XmlHandler {
+ void startDocument(String inputEncoding, String xmlVersion, String xmlEncoding, boolean standalone) throws StreamException;
- void endDocument();
+ void endDocument() throws StreamException;
- void createDocumentTypeDeclaration(String rootName, String publicId,
- String systemId, String internalSubset);
+ void processDocumentTypeDeclaration(String rootName, String publicId,
+ String systemId, String internalSubset) throws StreamException;
- void startElement(String namespaceURI, String localName, String prefix);
+ void startElement(String namespaceURI, String localName, String prefix) throws StreamException;
- void endElement();
+ void endElement() throws StreamException;
- void createAttribute(String namespaceURI, String localName, String prefix, String value, String type, boolean specified);
+ void processAttribute(String namespaceURI, String localName, String prefix, String value, String type, boolean specified) throws StreamException;
- void createNamespaceDeclaration(String prefix, String namespaceURI);
+ void processNamespaceDeclaration(String prefix, String namespaceURI) throws StreamException;
- void attributesCompleted();
+ void attributesCompleted() throws StreamException;
- void processCharacterData(Object data, boolean ignorable);
+ void processCharacterData(Object data, boolean ignorable) throws StreamException;
- void createProcessingInstruction(String piTarget, String piData);
+ void processProcessingInstruction(String piTarget, String piData) throws StreamException;
- void createComment(String content);
+ void processComment(String content) throws StreamException;
- void createCDATASection(String content);
+ void processCDATASection(String content) throws StreamException;
- void createEntityReference(String name, String replacementText);
+ void processEntityReference(String name, String replacementText) throws StreamException;
}
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=1728960&r1=1728959&r2=1728960&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 13:34:12 2016
@@ -22,9 +22,9 @@ 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.OutputException;
import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.om.impl.intf.AxiomElement;
+import org.apache.axiom.om.impl.stream.StreamException;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.impl.intf.AxiomSOAPMessage;
@@ -54,7 +54,7 @@ public aspect AxiomSOAPMessageSupport {
// TODO: this violates OO design principles and should disappear in a future Axiom version
public final void AxiomSOAPMessage.internalSerialize(Serializer serializer, OMOutputFormat format,
- boolean cache, boolean includeXMLDeclaration) throws OutputException {
+ boolean cache, boolean includeXMLDeclaration) throws StreamException {
((AxiomElement)getOMDocumentElement()).internalSerialize(serializer, format, cache);
}
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=1728960&r1=1728959&r2=1728960&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 13:34:12 2016
@@ -24,8 +24,8 @@ 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.OutputException;
import org.apache.axiom.om.impl.common.serializer.push.Serializer;
+import org.apache.axiom.om.impl.stream.StreamException;
import org.apache.axiom.soap.SOAP11Version;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPConstants;
@@ -129,7 +129,7 @@ public abstract class SOAPEnvelopeImpl e
}
public void internalSerialize(Serializer serializer, OMOutputFormat format, boolean cache)
- throws OutputException {
+ throws StreamException {
if (!format.isIgnoreXMLDeclaration()) {
String charSetEncoding = format.getCharSetEncoding();
@@ -141,6 +141,6 @@ public abstract class SOAPEnvelopeImpl e
: xmlVersion);
}
super.internalSerialize(serializer, format, cache);
- serializer.writeEndDocument();
+ 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=1728960&r1=1728959&r2=1728960&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 13:34:12 2016
@@ -26,8 +26,8 @@ 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.OutputException;
import org.apache.axiom.om.impl.common.serializer.push.Serializer;
+import org.apache.axiom.om.impl.stream.StreamException;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPHeader;
@@ -120,7 +120,7 @@ public abstract class SOAPEnvelopeImpl e
}
public void internalSerialize(Serializer serializer, OMOutputFormat format, boolean cache)
- throws OutputException {
+ throws StreamException {
if (!format.isIgnoreXMLDeclaration()) {
String charSetEncoding = format.getCharSetEncoding();
String xmlVersion = format.getXmlVersion();
@@ -130,7 +130,7 @@ public abstract class SOAPEnvelopeImpl e
xmlVersion == null ? OMConstants.DEFAULT_XML_VERSION : xmlVersion);
}
super.internalSerialize(serializer, format, cache);
- serializer.writeEndDocument();
+ serializer.endDocument();
if (!cache) {
// let's try to close the builder/parser here since we are now done with the
// non-caching code block serializing the top-level SOAPEnvelope element