Author: dims
Date: Mon Apr 3 17:29:53 2006
New Revision: 391200
URL: http://svn.apache.org/viewcvs?rev=391200&view=rev
Log:
reduce unnecessary usage of OMOutputImpl
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/ElementImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMElementImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMSerializerUtil.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/serialize/StreamingOMSerializer.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultCodeImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultNodeImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultReasonImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultNodeImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultReasonImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/ElementImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=391200&r1=391199&r2=391200&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/ElementImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/ElementImpl.java
Mon Apr 3 17:29:53 2006
@@ -44,6 +44,7 @@
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.HashMap;
@@ -1057,24 +1058,24 @@
protected void serialize(org.apache.axiom.om.impl.OMOutputImpl omOutput,
boolean cache) throws XMLStreamException {
-
+ XMLStreamWriter writer = omOutput.getXmlStreamWriter();
if (!cache) {
// in this case we don't care whether the elements are built or not
// we just call the serializeAndConsume methods
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
// serilize children
Iterator children = this.getChildren();
while (children.hasNext()) {
((OMNodeEx) children.next()).serialize(omOutput);
}
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
} else {
// Now the caching is supposed to be off. However caching been
// switched off
// has nothing to do if the element is already built!
if (this.done) {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
ChildNode child = this.firstChild;
while (child != null
&& ((!(child instanceof OMElement)) || child
@@ -1085,15 +1086,15 @@
if (child != null) {
OMElement element = (OMElement) child;
element.getBuilder().setCache(false);
- OMSerializerUtil.serializeByPullStream(element, omOutput,
+ OMSerializerUtil.serializeByPullStream(element, writer,
cache);
}
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
} else {
// take the XMLStream reader and feed it to the stream
// serilizer.
// todo is this right ?????
- OMSerializerUtil.serializeByPullStream(this, omOutput, cache);
+ OMSerializerUtil.serializeByPullStream(this, writer, cache);
}
}
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=391200&r1=391199&r2=391200&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMElementImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMElementImpl.java
Mon Apr 3 17:29:53 2006
@@ -41,6 +41,7 @@
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
import java.io.ByteArrayOutputStream;
import java.util.HashMap;
import java.util.Iterator;
@@ -754,23 +755,23 @@
//////////////////////////////////////////////////////////////////////////////////////////////
protected void serialize(OMOutputImpl omOutput, boolean cache) throws
XMLStreamException {
-
+ XMLStreamWriter writer = omOutput.getXmlStreamWriter();
if (cache) {
//in this case we don't care whether the elements are built or not
//we just call the serializeAndConsume methods
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
//serialize children
Iterator children = this.getChildren();
while (children.hasNext()) {
((OMNodeEx) children.next()).serialize(omOutput);
}
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
} else {
//Now the caching is supposed to be off. However caching been
switched off
//has nothing to do if the element is already built!
if (this.done) {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
OMNodeImpl child = (OMNodeImpl) firstChild;
while (child != null && ((!(child instanceof OMElement)) ||
child.isComplete())) {
child.serializeAndConsume(omOutput);
@@ -779,11 +780,11 @@
if (child != null) {
OMElement element = (OMElement) child;
element.getBuilder().setCache(false);
- OMSerializerUtil.serializeByPullStream(element, omOutput,
cache);
+ OMSerializerUtil.serializeByPullStream(element, writer,
cache);
}
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
} else {
- OMSerializerUtil.serializeByPullStream(this, omOutput, cache);
+ OMSerializerUtil.serializeByPullStream(this, writer, cache);
}
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMSerializerUtil.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMSerializerUtil.java?rev=391200&r1=391199&r2=391200&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMSerializerUtil.java
(original)
+++
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMSerializerUtil.java
Mon Apr 3 17:29:53 2006
@@ -21,7 +21,6 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.OMNodeEx;
-import org.apache.axiom.om.impl.OMOutputImpl;
import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
import javax.xml.stream.XMLStreamException;
@@ -36,30 +35,29 @@
/**
* Method serializeEndpart.
*
- * @param omOutput
+ * @param writer
* @throws javax.xml.stream.XMLStreamException
*
*/
- public static void serializeEndpart(OMOutputImpl omOutput)
+ public static void serializeEndpart(XMLStreamWriter writer)
throws XMLStreamException {
- omOutput.getXmlStreamWriter().writeEndElement();
+ writer.writeEndElement();
}
/**
* Method serializeAttribute.
*
* @param attr
- * @param omOutput
+ * @param writer
* @throws XMLStreamException
*/
- public static void serializeAttribute(OMAttribute attr, OMOutputImpl
omOutput)
+ public static void serializeAttribute(OMAttribute attr, XMLStreamWriter
writer)
throws XMLStreamException {
// first check whether the attribute is associated with a namespace
OMNamespace ns = attr.getNamespace();
String prefix = null;
String namespaceName = null;
- XMLStreamWriter writer = omOutput.getXmlStreamWriter();
if (ns != null) {
// add the prefix if it's availble
@@ -83,15 +81,14 @@
* Method serializeNamespace.
*
* @param namespace
- * @param omOutput
+ * @param writer
* @throws XMLStreamException
*/
- public static void serializeNamespace(OMNamespace namespace,
org.apache.axiom.om.impl.OMOutputImpl omOutput)
+ public static void serializeNamespace(OMNamespace namespace,
XMLStreamWriter writer)
throws XMLStreamException {
if (namespace == null) {
return;
}
- XMLStreamWriter writer = omOutput.getXmlStreamWriter();
String uri = namespace.getName();
String prefix = namespace.getPrefix();
@@ -115,18 +112,16 @@
/**
* Method serializeStartpart.
*
- * @param omOutput
+ * @param writer
* @throws XMLStreamException
*/
public static void serializeStartpart
(OMElement
- element, OMOutputImpl
- omOutput)
+ element, XMLStreamWriter writer)
throws XMLStreamException {
String nameSpaceName;
String writer_prefix;
String prefix;
- XMLStreamWriter writer = omOutput.getXmlStreamWriter();
if (element.getNamespace() != null) {
nameSpaceName = element.getNamespace().getName();
writer_prefix = writer.getPrefix(nameSpaceName);
@@ -159,21 +154,20 @@
}
// add the namespaces
- serializeNamespaces(element, omOutput);
+ serializeNamespaces(element, writer);
// add the elements attributes
- serializeAttributes(element, omOutput);
+ serializeAttributes(element, writer);
}
public static void serializeNamespaces
(OMElement
element,
- org.apache.axiom.om.impl.OMOutputImpl
- omOutput) throws XMLStreamException {
+ XMLStreamWriter writer) throws XMLStreamException {
Iterator namespaces = element.getAllDeclaredNamespaces();
if (namespaces != null) {
while (namespaces.hasNext()) {
- serializeNamespace((OMNamespace) namespaces.next(), omOutput);
+ serializeNamespace((OMNamespace) namespaces.next(), writer);
}
}
}
@@ -181,13 +175,12 @@
public static void serializeAttributes
(OMElement
element,
- org.apache.axiom.om.impl.OMOutputImpl
- omOutput) throws XMLStreamException {
+ XMLStreamWriter writer) throws XMLStreamException {
Iterator attributes = element.getAllAttributes();
if (attributes != null && attributes.hasNext()) {
while (attributes.hasNext()) {
serializeAttribute((OMAttribute) attributes.next(),
- omOutput);
+ writer);
}
}
}
@@ -195,51 +188,48 @@
/**
* Method serializeNormal.
*
- * @param omOutput
+ * @param writer
* @param cache
* @throws XMLStreamException
*/
public static void serializeNormal
(OMElement
- element, OMOutputImpl
- omOutput, boolean cache)
+ element, XMLStreamWriter writer, boolean cache)
throws XMLStreamException {
if (cache) {
element.build();
}
- serializeStartpart(element, omOutput);
+ serializeStartpart(element, writer);
OMNode firstChild = element.getFirstOMChild();
if (firstChild != null) {
if (cache) {
- ((OMNodeEx) firstChild).serialize(omOutput);
+ ((OMNodeEx) firstChild).serialize(writer);
} else {
- ((OMNodeEx) firstChild).serializeAndConsume(omOutput);
+ ((OMNodeEx) firstChild).serializeAndConsume(writer);
}
}
- serializeEndpart(omOutput);
+ serializeEndpart(writer);
}
public static void serializeByPullStream
(OMElement
- element, OMOutputImpl
- omOutput) throws XMLStreamException {
- serializeByPullStream(element, omOutput, false);
+ element, XMLStreamWriter writer) throws XMLStreamException
{
+ serializeByPullStream(element, writer, false);
}
public static void serializeByPullStream
(OMElement
- element, OMOutputImpl
- omOutput, boolean cache) throws XMLStreamException {
+ element, XMLStreamWriter writer, boolean cache) throws
XMLStreamException {
StreamingOMSerializer streamingOMSerializer = new
StreamingOMSerializer();
if (cache) {
streamingOMSerializer.serialize(element.getXMLStreamReader(),
- omOutput);
+ writer);
} else {
XMLStreamReader xmlStreamReaderWithoutCaching =
element.getXMLStreamReaderWithoutCaching();
streamingOMSerializer.serialize(xmlStreamReaderWithoutCaching,
- omOutput);
+ writer);
}
}
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/serialize/StreamingOMSerializer.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/serialize/StreamingOMSerializer.java?rev=391200&r1=391199&r2=391200&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/serialize/StreamingOMSerializer.java
(original)
+++
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/serialize/StreamingOMSerializer.java
Mon Apr 3 17:29:53 2006
@@ -17,7 +17,6 @@
package org.apache.axiom.om.impl.serialize;
import org.apache.axiom.om.OMSerializer;
-import org.apache.axiom.om.impl.OMOutputImpl;
import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLStreamConstants;
@@ -54,34 +53,20 @@
*/
public void serialize(XMLStreamReader node, XMLStreamWriter writer)
throws XMLStreamException {
- serializeNode(node, new OMOutputImpl(writer));
- }
-
- /**
- * Method serialize.
- *
- * @param obj
- * @param omOutput
- * @throws XMLStreamException
- */
- public void serialize(XMLStreamReader obj, OMOutputImpl omOutput)
- throws XMLStreamException {
- XMLStreamReader node = obj;
- serializeNode(node, omOutput);
+ serializeNode(node, writer);
}
/**
* Method serializeNode.
*
* @param reader
- * @param omOutput
+ * @param writer
* @throws XMLStreamException
*/
- protected void serializeNode(XMLStreamReader reader, OMOutputImpl omOutput)
+ protected void serializeNode(XMLStreamReader reader, XMLStreamWriter
writer)
throws XMLStreamException {
//TODO We get the StAXWriter at this point and uses it hereafter
assuming that this is the only entry point to this class.
// If there can be other classes calling methodes of this we might
need to change methode signatures to OMOutputer
- XMLStreamWriter writer = omOutput.getXmlStreamWriter();
while (reader.hasNext()) {
int event = reader.next();
if (event == START_ELEMENT) {
@@ -269,7 +254,7 @@
* Generates a unique namespace prefix that is not in the
* scope of the NamespaceContext
* @param nsCtxt
- * @return
+ * @return string
*/
private String generateUniquePrefix(NamespaceContext nsCtxt){
String prefix = NAMESPACE_PREFIX + namespaceSuffix++;
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultCodeImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultCodeImpl.java?rev=391200&r1=391199&r2=391200&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultCodeImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultCodeImpl.java
Mon Apr 3 17:29:53 2006
@@ -30,6 +30,7 @@
import org.apache.axiom.soap.SOAPProcessingException;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
public abstract class SOAPFaultCodeImpl extends SOAPElement implements
SOAPFaultCode{
@@ -40,7 +41,7 @@
* @param builder
*/
public SOAPFaultCodeImpl(SOAPFault parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME, builder,
factory);
}
@@ -49,7 +50,7 @@
* @param parent
*/
public SOAPFaultCodeImpl(SOAPFault parent,
- boolean extractNamespaceFromParent,
+ boolean extractNamespaceFromParent,
SOAPFactory factory) throws
SOAPProcessingException {
super(parent, SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME,
extractNamespaceFromParent, factory);
@@ -87,31 +88,31 @@
builder.registerExternalContentHandler(new
StreamWriterToContentHandlerConverter(omOutput));
}
-
+ XMLStreamWriter writer = omOutput.getXmlStreamWriter();
if (!cache) {
//No caching
if (this.firstChild != null) {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
firstChild.serializeAndConsume(omOutput);
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
} else if (!this.done) {
if (builderType == PULL_TYPE_BUILDER) {
- OMSerializerUtil.serializeByPullStream(this, omOutput);
+ OMSerializerUtil.serializeByPullStream(this, writer);
} else {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
builder.setCache(cache);
builder.next();
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
}
} else {
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
}
// do not serialise the siblings
} else {
//Cached
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
// do not serialise the siblings
}
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java?rev=391200&r1=391199&r2=391200&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java
Mon Apr 3 17:29:53 2006
@@ -27,6 +27,7 @@
import org.apache.axiom.soap.SOAPProcessingException;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
import java.util.Iterator;
public abstract class SOAPFaultDetailImpl extends SOAPElement implements
SOAPFaultDetail {
@@ -70,31 +71,31 @@
builder.registerExternalContentHandler(new
StreamWriterToContentHandlerConverter(omOutput));
}
-
+ XMLStreamWriter writer = omOutput.getXmlStreamWriter();
if (!cache) {
//No caching
if (this.firstChild != null) {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
firstChild.serializeAndConsume(omOutput);
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
} else if (!this.done) {
if (builderType == PULL_TYPE_BUILDER) {
- OMSerializerUtil.serializeByPullStream(this, omOutput);
+ OMSerializerUtil.serializeByPullStream(this, writer);
} else {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
builder.setCache(cache);
builder.next();
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
}
} else {
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
}
// do not serialise the siblings
} else {
//Cached
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
// do not serialise the siblings
}
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultImpl.java?rev=391200&r1=391199&r2=391200&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultImpl.java
Mon Apr 3 17:29:53 2006
@@ -40,6 +40,7 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Iterator;
@@ -210,7 +211,8 @@
// the best method to do this :(
build();
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ XMLStreamWriter writer = omOutput.getXmlStreamWriter();
+ OMSerializerUtil.serializeStartpart(this, writer);
SOAPFaultCode faultCode = getCode();
if (faultCode != null) {
((OMNodeEx)faultCode).serialize(omOutput);
@@ -232,7 +234,7 @@
((OMNodeEx)faultDetail).serialize(omOutput);
}
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
}
protected abstract void serializeFaultNode(
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultNodeImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultNodeImpl.java?rev=391200&r1=391199&r2=391200&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultNodeImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultNodeImpl.java
Mon Apr 3 17:29:53 2006
@@ -26,6 +26,7 @@
import org.apache.axiom.soap.SOAPProcessingException;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
public abstract class SOAPFaultNodeImpl extends SOAPElement implements
SOAPFaultNode {
@@ -35,7 +36,7 @@
}
public SOAPFaultNodeImpl(SOAPFault parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME, builder,
factory);
}
@@ -62,31 +63,31 @@
omOutput));
}
-
+ XMLStreamWriter writer = omOutput.getXmlStreamWriter();
if (!cache) {
//No caching
if (this.firstChild != null) {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
firstChild.serializeAndConsume(omOutput);
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
} else if (!this.done) {
if (builderType == PULL_TYPE_BUILDER) {
- OMSerializerUtil.serializeByPullStream(this, omOutput);
+ OMSerializerUtil.serializeByPullStream(this, writer);
} else {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
builder.setCache(cache);
builder.next();
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
}
} else {
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
}
// do not serialise the siblings
} else {
//Cached
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
// do not serialise the siblings
}
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultReasonImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultReasonImpl.java?rev=391200&r1=391199&r2=391200&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultReasonImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultReasonImpl.java
Mon Apr 3 17:29:53 2006
@@ -29,6 +29,7 @@
import org.apache.axiom.soap.SOAPProcessingException;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
public abstract class SOAPFaultReasonImpl extends SOAPElement implements
SOAPFaultReason {
@@ -41,7 +42,7 @@
* @param builder
*/
public SOAPFaultReasonImpl(SOAPFault parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME, builder,
factory);
}
@@ -50,7 +51,7 @@
* @param parent
*/
public SOAPFaultReasonImpl(OMElement parent,
- boolean extractNamespaceFromParent, SOAPFactory factory)
+ boolean extractNamespaceFromParent, SOAPFactory
factory)
throws SOAPProcessingException {
super(parent,SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME,
extractNamespaceFromParent,factory);
@@ -79,31 +80,32 @@
builder.registerExternalContentHandler(new
StreamWriterToContentHandlerConverter(omOutput));
}
+ XMLStreamWriter writer = omOutput.getXmlStreamWriter();
if (!cache) {
//No caching
if (this.firstChild != null) {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
firstChild.serializeAndConsume(omOutput);
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
} else if (!this.done) {
if (builderType == PULL_TYPE_BUILDER) {
- OMSerializerUtil.serializeByPullStream(this, omOutput);
+ OMSerializerUtil.serializeByPullStream(this, writer);
} else {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
builder.setCache(cache);
builder.next();
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
}
} else {
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
}
// do not serialise the siblings
} else {
//Cached
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
// do not serialise the siblings
}
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java?rev=391200&r1=391199&r2=391200&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java
Mon Apr 3 17:29:53 2006
@@ -27,6 +27,7 @@
import org.apache.axiom.soap.SOAPProcessingException;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
public abstract class SOAPFaultRoleImpl extends SOAPElement implements
@@ -40,7 +41,7 @@
}
public SOAPFaultRoleImpl(SOAPFault parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME, builder,
factory);
}
@@ -69,30 +70,31 @@
new StreamWriterToContentHandlerConverter(omOutput));
}
+ XMLStreamWriter writer = omOutput.getXmlStreamWriter();
if (!cache) {
//No caching
if (this.firstChild != null) {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
firstChild.serializeAndConsume(omOutput);
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
} else if (!this.done) {
if (builderType == PULL_TYPE_BUILDER) {
- OMSerializerUtil.serializeByPullStream(this, omOutput);
+ OMSerializerUtil.serializeByPullStream(this, writer);
} else {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
builder.setCache(cache);
builder.next();
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
}
} else {
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
}
// do not serialise the siblings
} else {
//Cached
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
// do not serialise the siblings
}
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java?rev=391200&r1=391199&r2=391200&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
Mon Apr 3 17:29:53 2006
@@ -104,8 +104,8 @@
SOAP11Constants.SOAP_FAULT_CODE_LOCAL_NAME);
}
- OMSerializerUtil.serializeAttributes(this, omOutput);
- OMSerializerUtil.serializeNamespaces(this, omOutput);
+ OMSerializerUtil.serializeAttributes(this, writer);
+ OMSerializerUtil.serializeNamespaces(this, writer);
String text = this.getValue().getText();
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java?rev=391200&r1=391199&r2=391200&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
Mon Apr 3 17:29:53 2006
@@ -77,8 +77,8 @@
writer.writeStartElement(
SOAP11Constants.SOAP_FAULT_DETAIL_LOCAL_NAME);
}
- OMSerializerUtil.serializeAttributes(this, omOutput);
- OMSerializerUtil.serializeNamespaces(this, omOutput);
+ OMSerializerUtil.serializeAttributes(this, writer);
+ OMSerializerUtil.serializeNamespaces(this, writer);
String text = this.getText();
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java?rev=391200&r1=391199&r2=391200&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
Mon Apr 3 17:29:53 2006
@@ -88,8 +88,8 @@
writer.writeStartElement(
SOAP11Constants.SOAP_FAULT_STRING_LOCAL_NAME);
}
- OMSerializerUtil.serializeAttributes(this, omOutput);
- OMSerializerUtil.serializeNamespaces(this, omOutput);
+ OMSerializerUtil.serializeAttributes(this, writer);
+ OMSerializerUtil.serializeNamespaces(this, writer);
String text = this.getSOAPText().getText();
writer.writeCharacters(text);
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=391200&r1=391199&r2=391200&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
Mon Apr 3 17:29:53 2006
@@ -75,8 +75,8 @@
writer.writeStartElement(
SOAP11Constants.SOAP_FAULT_ACTOR_LOCAL_NAME);
}
- OMSerializerUtil.serializeAttributes(this, omOutput);
- OMSerializerUtil.serializeNamespaces(this, omOutput);
+ OMSerializerUtil.serializeAttributes(this, writer);
+ OMSerializerUtil.serializeNamespaces(this, writer);
String text = this.getText();
writer.writeCharacters(text);
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=391200&r1=391199&r2=391200&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
Mon Apr 3 17:29:53 2006
@@ -85,8 +85,8 @@
writer.writeStartElement(
SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME);
}
- OMSerializerUtil.serializeAttributes(this, omOutput);
- OMSerializerUtil.serializeNamespaces(this, omOutput);
+ OMSerializerUtil.serializeAttributes(this, writer);
+ OMSerializerUtil.serializeNamespaces(this, writer);
String text = this.getText();
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=391200&r1=391199&r2=391200&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
Mon Apr 3 17:29:53 2006
@@ -30,6 +30,7 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Iterator;
@@ -197,7 +198,8 @@
// the overriding of the method will facilitate that. Not sure this is
the best method to do this :(
build();
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ XMLStreamWriter writer = omOutput.getXmlStreamWriter();
+ OMSerializerUtil.serializeStartpart(this, writer);
SOAPFaultCode faultCode = getCode();
if (faultCode != null) {
((OMNodeEx) faultCode).serialize(omOutput);
@@ -219,7 +221,7 @@
((OMNodeEx) faultDetail).serialize(omOutput);
}
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
}
protected abstract void
serializeFaultNode(org.apache.axiom.om.impl.OMOutputImpl omOutput) throws
XMLStreamException;
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=391200&r1=391199&r2=391200&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
Mon Apr 3 17:29:53 2006
@@ -28,6 +28,7 @@
import org.apache.axiom.soap.SOAPProcessingException;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
public abstract class SOAPFaultNodeImpl extends SOAPElement implements
SOAPFaultNode {
@@ -39,8 +40,8 @@
super(parent, SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME, true,
factory);
}
- public SOAPFaultNodeImpl(SOAPFault parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ public SOAPFaultNodeImpl(SOAPFault parent, OMXMLParserWrapper builder,
+ SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME, builder,
factory);
}
@@ -64,35 +65,36 @@
}
+ XMLStreamWriter writer = omOutput.getXmlStreamWriter();
if (!cache) {
//No caching
if (this.firstChild != null) {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
((OMNodeEx)firstChild).serializeAndConsume(omOutput);
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
} else if (!this.done) {
if (builderType == PULL_TYPE_BUILDER) {
- OMSerializerUtil.serializeByPullStream(this, omOutput);
+ OMSerializerUtil.serializeByPullStream(this, writer);
} else {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
builder.setCache(cache);
builder.next();
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
}
} else {
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
}
// do not serialise the siblings
} else {
//Cached
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
// do not serialise the siblings
}
}
-
+
}
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultReasonImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultReasonImpl.java?rev=391200&r1=391199&r2=391200&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultReasonImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultReasonImpl.java
Mon Apr 3 17:29:53 2006
@@ -31,6 +31,7 @@
import org.apache.axiom.soap.SOAPProcessingException;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
public abstract class SOAPFaultReasonImpl extends SOAPElement implements
SOAPFaultReason {
protected SOAPFaultText text;
@@ -46,7 +47,7 @@
* @param builder
*/
public SOAPFaultReasonImpl(SOAPFault parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME, builder,
factory);
}
@@ -55,7 +56,7 @@
* @param parent
*/
public SOAPFaultReasonImpl(OMElement parent,
- boolean extractNamespaceFromParent, SOAPFactory factory)
+ boolean extractNamespaceFromParent, SOAPFactory
factory)
throws SOAPProcessingException {
super(parent,
SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME,
@@ -87,30 +88,31 @@
}
+ XMLStreamWriter writer = omOutput.getXmlStreamWriter();
if (!cache) {
//No caching
if (this.firstChild != null) {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
((OMNodeEx)firstChild).serializeAndConsume(omOutput);
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
} else if (!this.done) {
if (builderType == PULL_TYPE_BUILDER) {
- OMSerializerUtil.serializeByPullStream(this, omOutput);
+ OMSerializerUtil.serializeByPullStream(this, writer);
} else {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
builder.setCache(cache);
builder.next();
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
}
} else {
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
}
// do not serialise the siblings
} else {
//Cached
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
// do not serialise the siblings
}
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=391200&r1=391199&r2=391200&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
Mon Apr 3 17:29:53 2006
@@ -28,6 +28,7 @@
import org.apache.axiom.soap.SOAPProcessingException;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
public abstract class SOAPFaultRoleImpl extends SOAPElement implements
org.apache.axiom.soap.SOAPFaultRole {
@@ -40,12 +41,12 @@
SOAPFactory factory) throws
SOAPProcessingException {
super(parent,
SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME,
- extractNamespaceFromParent,
+ extractNamespaceFromParent,
factory);
}
public SOAPFaultRoleImpl(SOAPFault parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME, builder,
factory);
}
@@ -69,30 +70,31 @@
}
+ XMLStreamWriter writer = omOutput.getXmlStreamWriter();
if (!cache) {
//No caching
if (this.firstChild != null) {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
((OMNodeEx)firstChild).serializeAndConsume(omOutput);
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
} else if (!this.done) {
if (builderType == PULL_TYPE_BUILDER) {
- OMSerializerUtil.serializeByPullStream(this, omOutput);
+ OMSerializerUtil.serializeByPullStream(this, writer);
} else {
- OMSerializerUtil.serializeStartpart(this, omOutput);
+ OMSerializerUtil.serializeStartpart(this, writer);
builder.setCache(cache);
builder.next();
- OMSerializerUtil.serializeEndpart(omOutput);
+ OMSerializerUtil.serializeEndpart(writer);
}
} else {
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
}
// do not serialise the siblings
} else {
//Cached
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ OMSerializerUtil.serializeNormal(this, writer, cache);
// do not serialise the siblings
}
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=391200&r1=391199&r2=391200&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
Mon Apr 3 17:29:53 2006
@@ -102,8 +102,8 @@
SOAP11Constants.SOAP_FAULT_CODE_LOCAL_NAME);
}
- OMSerializerUtil.serializeAttributes(this, omOutput);
- OMSerializerUtil.serializeNamespaces(this, omOutput);
+ OMSerializerUtil.serializeAttributes(this, writer);
+ OMSerializerUtil.serializeNamespaces(this, writer);
String text = this.getValue().getText();
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=391200&r1=391199&r2=391200&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
Mon Apr 3 17:29:53 2006
@@ -77,8 +77,8 @@
writer.writeStartElement(
SOAP11Constants.SOAP_FAULT_DETAIL_LOCAL_NAME);
}
- OMSerializerUtil.serializeAttributes(this, omOutput);
- OMSerializerUtil.serializeNamespaces(this, omOutput);
+ OMSerializerUtil.serializeAttributes(this, writer);
+ OMSerializerUtil.serializeNamespaces(this, writer);
String text = this.getText();
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=391200&r1=391199&r2=391200&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
Mon Apr 3 17:29:53 2006
@@ -98,8 +98,8 @@
writer.writeStartElement(
SOAP11Constants.SOAP_FAULT_STRING_LOCAL_NAME);
}
- OMSerializerUtil.serializeAttributes(this, omOutput);
- OMSerializerUtil.serializeNamespaces(this, omOutput);
+ OMSerializerUtil.serializeAttributes(this, writer);
+ OMSerializerUtil.serializeNamespaces(this, writer);
String text = this.getSOAPText().getText();
writer.writeCharacters(text);
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=391200&r1=391199&r2=391200&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
Mon Apr 3 17:29:53 2006
@@ -79,8 +79,8 @@
writer.writeStartElement(
SOAP11Constants.SOAP_FAULT_ACTOR_LOCAL_NAME);
}
- OMSerializerUtil.serializeAttributes(this, omOutput);
- OMSerializerUtil.serializeNamespaces(this, omOutput);
+ OMSerializerUtil.serializeAttributes(this, writer);
+ OMSerializerUtil.serializeNamespaces(this, writer);
String text = this.getText();
writer.writeCharacters(text);
