Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java?rev=391462&r1=391461&r2=391462&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java (original) +++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java Tue Apr 4 18:10:36 2006 @@ -18,7 +18,7 @@ import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMXMLParserWrapper; -import org.apache.axiom.om.impl.OMOutputImpl; +import org.apache.axiom.om.impl.MTOMXMLStreamWriter; import org.apache.axiom.om.impl.llom.OMSerializerUtil; import org.apache.axiom.om.impl.serialize.StreamWriterToContentHandlerConverter; import org.apache.axiom.soap.SOAP11Constants; @@ -51,7 +51,7 @@ } } - protected void internalSerialize(OMOutputImpl omOutput, boolean cache) + protected void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException { // select the builder @@ -62,10 +62,9 @@ if ((builderType == PUSH_TYPE_BUILDER) && (builder.getRegisteredContentHandler() == null)) { builder.registerExternalContentHandler( - new StreamWriterToContentHandlerConverter(omOutput.getXmlStreamWriter())); + new StreamWriterToContentHandlerConverter(writer)); } - XMLStreamWriter writer = omOutput.getXmlStreamWriter(); if (this.getNamespace() != null) { String prefix = this.getNamespace().getPrefix(); String nameSpaceName = this.getNamespace().getName();
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java?rev=391462&r1=391461&r2=391462&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java (original) +++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java Tue Apr 4 18:10:36 2006 @@ -23,7 +23,7 @@ import org.apache.axiom.om.OMNamespace; import org.apache.axiom.om.OMNode; import org.apache.axiom.om.OMXMLParserWrapper; -import org.apache.axiom.om.impl.OMOutputImpl; +import org.apache.axiom.om.impl.MTOMXMLStreamWriter; import org.apache.axiom.soap.SOAP11Constants; import org.apache.axiom.soap.SOAP12Constants; import org.apache.axiom.soap.SOAPBody; @@ -35,6 +35,7 @@ import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; /** * Class SOAPEnvelopeImpl @@ -151,15 +152,15 @@ // here do nothing as SOAPEnvelope doesn't have a parent !!! } - protected void internalSerialize(OMOutputImpl omOutput, boolean cache) throws XMLStreamException { - - if (!omOutput.isIgnoreXMLDeclaration()) { - String charSetEncoding = omOutput.getCharSetEncoding(); - String xmlVersion = omOutput.getXmlVersion(); - omOutput.getXmlStreamWriter().writeStartDocument(charSetEncoding == null ? + protected void internalSerialize(XMLStreamWriter writer2, boolean cache) throws XMLStreamException { + MTOMXMLStreamWriter writer = (MTOMXMLStreamWriter) writer2; + if (!writer.isIgnoreXMLDeclaration()) { + String charSetEncoding = writer.getCharSetEncoding(); + String xmlVersion = writer.getXmlVersion(); + writer.getXmlStreamWriter().writeStartDocument(charSetEncoding == null ? OMConstants.DEFAULT_CHAR_SET_ENCODING : charSetEncoding, xmlVersion == null ? OMConstants.DEFAULT_XML_VERSION : xmlVersion); } - super.internalSerialize(omOutput, cache); + super.internalSerialize(writer, cache); } } Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java?rev=391462&r1=391461&r2=391462&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java (original) +++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java Tue Apr 4 18:10:36 2006 @@ -63,7 +63,7 @@ return this.getChildren(); } - protected void internalSerialize(org.apache.axiom.om.impl.OMOutputImpl omOutput, boolean cache) throws XMLStreamException { + protected void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException { // select the builder short builderType = PULL_TYPE_BUILDER; // default is pull type if (builder != null) { @@ -71,11 +71,9 @@ } if ((builderType == PUSH_TYPE_BUILDER) && (builder.getRegisteredContentHandler() == null)) { - builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(omOutput.getXmlStreamWriter())); + builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(writer)); } - - XMLStreamWriter writer = omOutput.getXmlStreamWriter(); if (this.getNamespace() != null) { String prefix = this.getNamespace().getPrefix(); String nameSpaceName = this.getNamespace().getName(); @@ -94,7 +92,7 @@ OMNode child = (OMNodeImpl) firstChild; while (child != null && ((!(child instanceof OMElement)) || child.isComplete())) { - ((OMNodeImpl) child).internalSerializeAndConsume(omOutput); + ((OMNodeImpl) child).internalSerializeAndConsume(writer); child = child.getNextOMSibling(); } Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java?rev=391462&r1=391461&r2=391462&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java (original) +++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java Tue Apr 4 18:10:36 2006 @@ -193,7 +193,7 @@ return null; } - protected void internalSerialize(org.apache.axiom.om.impl.OMOutputImpl omOutput, boolean cache) throws XMLStreamException { + protected void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException { // select the builder short builderType = PULL_TYPE_BUILDER; // default is pull type if (builder != null) { @@ -201,14 +201,13 @@ } if ((builderType == PUSH_TYPE_BUILDER) && (builder.getRegisteredContentHandler() == null)) { - builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(omOutput.getXmlStreamWriter())); + builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(writer)); } // this is a special case. This fault element may contain its children in any order. But spec mandates a specific order // the overriding of the method will facilitate that. Not sure this is the best method to do this :( build(); - XMLStreamWriter writer = omOutput.getXmlStreamWriter(); OMSerializerUtil.serializeStartpart(this, writer); SOAPFaultCode faultCode = getCode(); if (faultCode != null) { Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultNodeImpl.java URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultNodeImpl.java?rev=391462&r1=391461&r2=391462&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultNodeImpl.java (original) +++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultNodeImpl.java Tue Apr 4 18:10:36 2006 @@ -53,7 +53,7 @@ return this.getText(); } - protected void internalSerialize(org.apache.axiom.om.impl.OMOutputImpl omOutput, boolean cache) throws XMLStreamException { + protected void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException { // select the builder short builderType = PULL_TYPE_BUILDER; // default is pull type if (builder != null) { @@ -61,16 +61,15 @@ } if ((builderType == PUSH_TYPE_BUILDER) && (builder.getRegisteredContentHandler() == null)) { - builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(omOutput.getXmlStreamWriter())); + builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(writer)); } - XMLStreamWriter writer = omOutput.getXmlStreamWriter(); if (!cache) { //No caching if (this.firstChild != null) { OMSerializerUtil.serializeStartpart(this, writer); - ((OMNodeEx)firstChild).internalSerializeAndConsume(omOutput); + ((OMNodeEx)firstChild).internalSerializeAndConsume(writer); OMSerializerUtil.serializeEndpart(writer); } else if (!this.done) { if (builderType == PULL_TYPE_BUILDER) { Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java?rev=391462&r1=391461&r2=391462&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java (original) +++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java Tue Apr 4 18:10:36 2006 @@ -19,7 +19,7 @@ import org.apache.axiom.om.OMNamespace; import org.apache.axiom.om.OMXMLParserWrapper; import org.apache.axiom.om.impl.OMNodeEx; -import org.apache.axiom.om.impl.OMOutputImpl; +import org.apache.axiom.om.impl.MTOMXMLStreamWriter; import org.apache.axiom.om.impl.llom.OMSerializerUtil; import org.apache.axiom.om.impl.serialize.StreamWriterToContentHandlerConverter; import org.apache.axiom.soap.SOAP12Constants; @@ -58,7 +58,7 @@ return this.getText(); } - protected void internalSerialize(OMOutputImpl omOutput, boolean cache) throws XMLStreamException { + protected void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException { // select the builder short builderType = PULL_TYPE_BUILDER; // default is pull type if (builder != null) { @@ -66,16 +66,14 @@ } if ((builderType == PUSH_TYPE_BUILDER) && (builder.getRegisteredContentHandler() == null)) { - builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(omOutput.getXmlStreamWriter())); + builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(writer)); } - - XMLStreamWriter writer = omOutput.getXmlStreamWriter(); if (!cache) { //No caching if (this.firstChild != null) { OMSerializerUtil.serializeStartpart(this, writer); - ((OMNodeEx)firstChild).internalSerializeAndConsume(omOutput); + ((OMNodeEx)firstChild).internalSerializeAndConsume(writer); OMSerializerUtil.serializeEndpart(writer); } else if (!this.done) { if (builderType == PULL_TYPE_BUILDER) { Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java?rev=391462&r1=391461&r2=391462&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java (original) +++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java Tue Apr 4 18:10:36 2006 @@ -20,13 +20,14 @@ import org.apache.axiom.om.OMNode; import org.apache.axiom.om.OMXMLParserWrapper; import org.apache.axiom.om.impl.OMNodeEx; -import org.apache.axiom.om.impl.OMOutputImpl; +import org.apache.axiom.om.impl.MTOMXMLStreamWriter; import org.apache.axiom.om.impl.llom.OMDocumentImpl; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPMessage; import org.apache.axiom.soap.SOAPProcessingException; import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; public class SOAPMessageImpl extends OMDocumentImpl implements SOAPMessage { @@ -60,11 +61,11 @@ throw new UnsupportedOperationException("This is not allowed. Use set SOAPEnvelope instead"); } - protected void internalSerialize(OMOutputImpl omOutput, boolean cache, boolean includeXMLDeclaration) throws XMLStreamException { + protected void internalSerialize(XMLStreamWriter writer, boolean cache, boolean includeXMLDeclaration) throws XMLStreamException { if (cache) { - ((OMNodeEx)this.documentElement).internalSerialize(omOutput); + ((OMNodeEx)this.documentElement).internalSerialize(writer); } else { - ((OMNodeEx)this.documentElement).internalSerializeAndConsume(omOutput); + ((OMNodeEx)this.documentElement).internalSerializeAndConsume(writer); } } } Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java?rev=391462&r1=391461&r2=391462&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java (original) +++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java Tue Apr 4 18:10:36 2006 @@ -78,7 +78,7 @@ } } - protected void internalSerialize(org.apache.axiom.om.impl.OMOutputImpl omOutput, boolean cache) throws XMLStreamException { + protected void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException { // select the builder short builderType = PULL_TYPE_BUILDER; // default is pull type @@ -88,10 +88,9 @@ if ((builderType == PUSH_TYPE_BUILDER) && (builder.getRegisteredContentHandler() == null)) { builder.registerExternalContentHandler( - new StreamWriterToContentHandlerConverter(omOutput.getXmlStreamWriter())); + new StreamWriterToContentHandlerConverter(writer)); } - XMLStreamWriter writer = omOutput.getXmlStreamWriter(); if (this.getNamespace() != null) { String prefix = this.getNamespace().getPrefix(); String nameSpaceName = this.getNamespace().getName(); Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java?rev=391462&r1=391461&r2=391462&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java (original) +++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java Tue Apr 4 18:10:36 2006 @@ -55,7 +55,7 @@ } } - public void internalSerialize(org.apache.axiom.om.impl.OMOutputImpl omOutput, boolean cache) throws XMLStreamException { + public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException { // select the builder short builderType = PULL_TYPE_BUILDER; // default is pull type @@ -65,9 +65,9 @@ if ((builderType == PUSH_TYPE_BUILDER) && (builder.getRegisteredContentHandler() == null)) { builder.registerExternalContentHandler( - new StreamWriterToContentHandlerConverter(omOutput.getXmlStreamWriter())); + new StreamWriterToContentHandlerConverter(writer)); } - XMLStreamWriter writer = omOutput.getXmlStreamWriter(); + if (this.getNamespace() != null) { String prefix = this.getNamespace().getPrefix(); String nameSpaceName = this.getNamespace().getName(); @@ -86,7 +86,7 @@ OMNode child = (OMNodeImpl) firstChild; while (child != null && ((!(child instanceof OMElement)) || child.isComplete())) { - ((OMNodeImpl) child).internalSerializeAndConsume(omOutput); + ((OMNodeImpl) child).internalSerializeAndConsume(writer); child = child.getNextOMSibling(); } Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java?rev=391462&r1=391461&r2=391462&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java (original) +++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java Tue Apr 4 18:10:36 2006 @@ -18,7 +18,7 @@ import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMXMLParserWrapper; -import org.apache.axiom.om.impl.OMOutputImpl; +import org.apache.axiom.om.impl.MTOMXMLStreamWriter; import org.apache.axiom.soap.SOAPBody; import org.apache.axiom.soap.SOAPFactory; import org.apache.axiom.soap.SOAPFault; @@ -70,14 +70,14 @@ return new SOAP11FaultDetailImpl(fault, (SOAPFactory)this.factory); } - public void internalSerialize(OMOutputImpl omOutput) + public void internalSerialize(XMLStreamWriter writer) throws XMLStreamException { - super.internalSerialize(omOutput); + super.internalSerialize(writer); } - public void internalSerializeAndConsume(OMOutputImpl omOutput) + public void internalSerializeAndConsume(XMLStreamWriter writer) throws XMLStreamException { - super.internalSerializeAndConsume(omOutput); + super.internalSerializeAndConsume(writer); } public void setCode(SOAPFaultCode soapFaultCode) Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java?rev=391462&r1=391461&r2=391462&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java (original) +++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java Tue Apr 4 18:10:36 2006 @@ -18,7 +18,7 @@ import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMXMLParserWrapper; -import org.apache.axiom.om.impl.OMOutputImpl; +import org.apache.axiom.om.impl.MTOMXMLStreamWriter; import org.apache.axiom.om.impl.llom.OMSerializerUtil; import org.apache.axiom.om.impl.serialize.StreamWriterToContentHandlerConverter; import org.apache.axiom.soap.SOAP11Constants; @@ -73,7 +73,7 @@ } } - protected void internalSerialize(OMOutputImpl omOutput, boolean cache) + protected void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException { // select the builder @@ -84,10 +84,9 @@ if ((builderType == PUSH_TYPE_BUILDER) && (builder.getRegisteredContentHandler() == null)) { builder.registerExternalContentHandler( - new StreamWriterToContentHandlerConverter(omOutput.getXmlStreamWriter())); + new StreamWriterToContentHandlerConverter(writer)); } - XMLStreamWriter writer = omOutput.getXmlStreamWriter(); if (this.getNamespace() != null) { String prefix = this.getNamespace().getPrefix(); String nameSpaceName = this.getNamespace().getName(); Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java?rev=391462&r1=391461&r2=391462&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java (original) +++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java Tue Apr 4 18:10:36 2006 @@ -54,7 +54,7 @@ } protected void internalSerialize( - org.apache.axiom.om.impl.OMOutputImpl omOutput, boolean cache) + XMLStreamWriter writer, boolean cache) throws XMLStreamException { // select the builder @@ -65,10 +65,9 @@ if ((builderType == PUSH_TYPE_BUILDER) && (builder.getRegisteredContentHandler() == null)) { builder.registerExternalContentHandler( - new StreamWriterToContentHandlerConverter(omOutput.getXmlStreamWriter())); + new StreamWriterToContentHandlerConverter(writer)); } - XMLStreamWriter writer = omOutput.getXmlStreamWriter(); if (this.getNamespace() != null) { String prefix = this.getNamespace().getPrefix(); String nameSpaceName = this.getNamespace().getName();
