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 2013/01/28 22:13:18 UTC
svn commit: r1439636 [2/2] - in /webservices/axiom/trunk/modules:
axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/
axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/
axiom-dom/src/main/java/org/apache/axiom/om/i...
Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?rev=1439636&r1=1439635&r2=1439636&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java Mon Jan 28 21:13:17 2013
@@ -38,7 +38,8 @@ import org.apache.axiom.om.QNameAwareOMD
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.impl.common.OMDataSourceUtil;
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
-import org.apache.axiom.om.impl.common.StAXSerializer;
+import org.apache.axiom.om.impl.common.serializer.OutputException;
+import org.apache.axiom.om.impl.common.serializer.StAXSerializer;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -711,7 +712,7 @@ public class OMSourcedElementImpl extend
}
public void internalSerialize(StAXSerializer serializer, boolean cache)
- throws XMLStreamException {
+ throws XMLStreamException, OutputException {
if (isExpanded()) {
super.internalSerialize(serializer, cache);
} else if (cache) {
@@ -728,7 +729,11 @@ public class OMSourcedElementImpl extend
public void serialize(XMLStreamWriter xmlWriter) throws XMLStreamException {
// The contract is to serialize with caching
- internalSerialize(new StAXSerializer(xmlWriter), true);
+ try {
+ internalSerialize(new StAXSerializer(this, xmlWriter), true);
+ } catch (OutputException ex) {
+ throw (XMLStreamException)ex.getCause();
+ }
}
public void serialize(OutputStream output) throws XMLStreamException {
@@ -765,7 +770,11 @@ public class OMSourcedElementImpl extend
public void serializeAndConsume(javax.xml.stream.XMLStreamWriter xmlWriter)
throws XMLStreamException {
- internalSerialize(new StAXSerializer(xmlWriter), false);
+ try {
+ internalSerialize(new StAXSerializer(this, xmlWriter), false);
+ } catch (OutputException ex) {
+ throw (XMLStreamException)ex.getCause();
+ }
}
public void serializeAndConsume(OutputStream output) throws XMLStreamException {
Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java?rev=1439636&r1=1439635&r2=1439636&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java Mon Jan 28 21:13:17 2013
@@ -30,7 +30,8 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
-import org.apache.axiom.om.impl.common.StAXSerializer;
+import org.apache.axiom.om.impl.common.serializer.OutputException;
+import org.apache.axiom.om.impl.common.serializer.StAXSerializer;
import org.apache.axiom.util.UIDGenerator;
import org.apache.axiom.util.base64.Base64Utils;
import org.apache.axiom.util.stax.XMLStreamWriterUtils;
@@ -38,7 +39,6 @@ import org.apache.axiom.util.stax.XMLStr
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
import java.io.IOException;
public class OMTextImpl extends OMLeafNode implements OMText, OMConstants {
@@ -224,20 +224,6 @@ public class OMTextImpl extends OMLeafNo
return nodeType;
}
- /**
- * Writes the relevant output.
- *
- * @param writer
- * @throws XMLStreamException
- */
- private void writeOutput(XMLStreamWriter writer) throws XMLStreamException {
- if (getType() == OMNode.CDATA_SECTION_NODE) {
- writer.writeCData(this.getText());
- } else {
- writer.writeCharacters(this.getText());
- }
- }
-
/** Returns the value. */
public String getText() throws OMException {
if (charArray != null || this.value != null) {
@@ -368,10 +354,10 @@ public class OMTextImpl extends OMLeafNo
return this.contentID;
}
- public void internalSerialize(StAXSerializer serializer, boolean cache) throws XMLStreamException {
+ public void internalSerialize(StAXSerializer serializer, boolean cache) throws XMLStreamException, OutputException {
if (!this.isBinary) {
- writeOutput(serializer.getWriter());
+ serializer.writeText(getType(), getText());
} else {
try {
if (dataHandlerObject instanceof DataHandlerProvider) {
Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java?rev=1439636&r1=1439635&r2=1439636&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java Mon Jan 28 21:13:17 2013
@@ -34,7 +34,8 @@ import org.apache.axiom.om.OMXMLParserWr
import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
import org.apache.axiom.om.impl.llom.OMNodeImpl;
import org.apache.axiom.om.impl.builder.StAXBuilder;
-import org.apache.axiom.om.impl.common.StAXSerializer;
+import org.apache.axiom.om.impl.common.serializer.OutputException;
+import org.apache.axiom.om.impl.common.serializer.StAXSerializer;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAP12Version;
@@ -50,7 +51,6 @@ import org.apache.axiom.soap.impl.builde
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
/** Class SOAPEnvelopeImpl */
public class SOAPEnvelopeImpl extends SOAPElement
@@ -193,7 +193,7 @@ public class SOAPEnvelopeImpl extends SO
}
public void internalSerialize(StAXSerializer serializer, boolean cache)
- throws XMLStreamException {
+ throws XMLStreamException, OutputException {
MTOMXMLStreamWriter writer = (MTOMXMLStreamWriter)serializer.getWriter();
if (!writer.isIgnoreXMLDeclaration()) {
String charSetEncoding = writer.getCharSetEncoding();
Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java?rev=1439636&r1=1439635&r2=1439636&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java Mon Jan 28 21:13:17 2013
@@ -26,7 +26,8 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.common.StAXSerializer;
+import org.apache.axiom.om.impl.common.serializer.OutputException;
+import org.apache.axiom.om.impl.common.serializer.StAXSerializer;
import org.apache.axiom.om.impl.llom.OMElementImpl;
import org.apache.axiom.om.impl.llom.OMNodeImpl;
import org.apache.axiom.soap.SOAPBody;
@@ -123,7 +124,7 @@ public abstract class SOAPFaultImpl exte
}
public void internalSerialize(StAXSerializer serializer, boolean cache)
- throws XMLStreamException {
+ throws XMLStreamException, OutputException {
serializer.serializeStartpart(this);
for (Iterator it = getChildren(); it.hasNext(); ) {
OMNodeImpl child = (OMNodeImpl)it.next();
Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java?rev=1439636&r1=1439635&r2=1439636&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java Mon Jan 28 21:13:17 2013
@@ -24,7 +24,8 @@ import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.common.StAXSerializer;
+import org.apache.axiom.om.impl.common.serializer.OutputException;
+import org.apache.axiom.om.impl.common.serializer.StAXSerializer;
import org.apache.axiom.om.impl.llom.OMDocumentImpl;
import org.apache.axiom.om.impl.llom.OMNodeImpl;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -61,7 +62,7 @@ public class SOAPMessageImpl extends OMD
}
protected void internalSerialize(StAXSerializer serializer, boolean cache,
- boolean includeXMLDeclaration) throws XMLStreamException {
+ boolean includeXMLDeclaration) throws XMLStreamException, OutputException {
((OMNodeImpl)getOMDocumentElement()).internalSerialize(serializer, cache);
}