You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2009/08/13 00:07:02 UTC

svn commit: r803724 - in /webservices/commons/trunk/modules/axiom/modules: axiom-api/src/main/java/org/apache/axiom/om/ axiom-api/src/main/java/org/apache/axiom/om/impl/ axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ axiom-dom/src/main/java/org/...

Author: veithen
Date: Wed Aug 12 22:06:30 2009
New Revision: 803724

URL: http://svn.apache.org/viewvc?rev=803724&view=rev
Log:
Added a "serialize" method that takes a "cache" parameter. Often, this is more convenient than having two methods "serialize" and "serializeAndConsume". It also allows to simplify some internal code.

Modified:
    webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMSerializable.java
    webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMDocumentImplUtil.java
    webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CommentImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentTypeImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultNodeImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPMessageImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMCommentImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocTypeImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocumentImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSerializableImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultNodeImpl.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultRoleImpl.java

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMSerializable.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMSerializable.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMSerializable.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMSerializable.java Wed Aug 12 22:06:30 2009
@@ -64,7 +64,9 @@
     void close(boolean build);
 
     /**
-     * Serializes the information item with caching.
+     * Serializes the information item with caching. This method has the same effect as
+     * {@link #serialize(XMLStreamWriter, boolean)} with <code>cache</code> set to
+     * <code>true</code>.
      *
      * @param xmlWriter
      * @throws XMLStreamException
@@ -72,10 +74,21 @@
     void serialize(XMLStreamWriter xmlWriter) throws XMLStreamException;
 
     /**
-     * Serializes the information item without caching.
+     * Serializes the information item without caching. This method has the same effect as
+     * {@link #serialize(XMLStreamWriter, boolean)} with <code>cache</code> set to
+     * <code>false</code>.
      *
      * @param xmlWriter
      * @throws XMLStreamException
      */
     void serializeAndConsume(XMLStreamWriter xmlWriter) throws XMLStreamException;
+    
+    /**
+     * Serializes the information item.
+     * 
+     * @param xmlWriter
+     * @param cache indicates if caching should be enabled
+     * @throws XMLStreamException
+     */
+    void serialize(XMLStreamWriter xmlWriter, boolean cache) throws XMLStreamException;
 }

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMDocumentImplUtil.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMDocumentImplUtil.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMDocumentImplUtil.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMDocumentImplUtil.java Wed Aug 12 22:06:30 2009
@@ -57,16 +57,9 @@
 
         Iterator children = document.getChildren();
 
-        if (cache) {
-            while (children.hasNext()) {
-                OMNodeEx omNode = (OMNodeEx) children.next();
-                omNode.internalSerialize(writer);
-            }
-        } else {
-            while (children.hasNext()) {
-                OMNodeEx omNode = (OMNodeEx) children.next();
-                omNode.internalSerializeAndConsume(writer);
-            }
+        while (children.hasNext()) {
+            OMNodeEx omNode = (OMNodeEx) children.next();
+            omNode.internalSerialize(writer, cache);
         }
     }
 }

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java Wed Aug 12 22:06:30 2009
@@ -44,22 +44,15 @@
     public void setType(int nodeType) throws OMException;
 
     /**
-     * Serializes the node with caching.
+     * Serializes the node.
      *
      * @param writer
+     * @param cache indicates if caching should be enabled
      * @throws javax.xml.stream.XMLStreamException
      *
      */
-    public void internalSerialize(XMLStreamWriter writer)
+    public void internalSerialize(XMLStreamWriter writer, boolean cache)
             throws XMLStreamException;
-
-    /**
-     * Serializes the node without caching.
-     *
-     * @param writer
-     * @throws XMLStreamException
-     */
-    public void internalSerializeAndConsume(XMLStreamWriter writer) throws XMLStreamException;
     
     /**
      * Get the next sibling if it is available. The sibling is available if it is complete or

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java Wed Aug 12 22:06:30 2009
@@ -207,19 +207,7 @@
      * This is not supported since attributes serialization is handled by the serialization of the
      * owner nodes.
      */
-    public void internalSerialize(XMLStreamWriter writer) throws XMLStreamException {
-        throw new UnsupportedOperationException("Not supported");
-    }
-
-    /**
-     * This is not supported since attributes serialization is handled by the serialization of the
-     * owner nodes.
-     *
-     * @see org.apache.axiom.om.impl.OMNodeEx#internalSerializeAndConsume
-     *      (org.apache.axiom.om.impl.MTOMXMLStreamWriter)
-     */
-    public void internalSerializeAndConsume(XMLStreamWriter writer)
-            throws XMLStreamException {
+    public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
         throw new UnsupportedOperationException("Not supported");
     }
 

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CommentImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CommentImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CommentImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CommentImpl.java Wed Aug 12 22:06:30 2009
@@ -67,13 +67,7 @@
                 "You should not set the node type of a comment");
     }
 
-    public void internalSerialize(XMLStreamWriter writer) throws XMLStreamException {
+    public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
         writer.writeComment(this.textValue.toString());
     }
-
-    public void internalSerializeAndConsume(XMLStreamWriter writer)
-            throws XMLStreamException {
-        internalSerialize(writer);
-    }
-
 }

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java Wed Aug 12 22:06:30 2009
@@ -72,7 +72,7 @@
         // DO Nothing :-?
     }
 
-    public void internalSerialize(XMLStreamWriter writer) throws XMLStreamException {
+    public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
         // TODO
         throw new UnsupportedOperationException("TODO");
     }
@@ -82,12 +82,6 @@
         throw new UnsupportedOperationException("TODO");
     }
 
-    public void internalSerializeAndConsume(XMLStreamWriter writer)
-            throws XMLStreamException {
-        // TODO
-        throw new UnsupportedOperationException("TODO");
-    }
-
     public void serializeAndConsume(XMLStreamWriter xmlWriter)
             throws XMLStreamException {
         // TODO

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java Wed Aug 12 22:06:30 2009
@@ -102,8 +102,8 @@
                 "In OM Document object doesn't have a type");
     }
 
-    public void internalSerialize(XMLStreamWriter writer) throws XMLStreamException {
-        internalSerialize(writer, true, !((MTOMXMLStreamWriter) writer).isIgnoreXMLDeclaration());
+    public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
+        internalSerialize(writer, cache, !((MTOMXMLStreamWriter) writer).isIgnoreXMLDeclaration());
     }
 
     // /
@@ -381,11 +381,6 @@
 
     }
 
-    public void internalSerializeAndConsume(XMLStreamWriter writer)
-            throws XMLStreamException {
-        internalSerialize(writer, false, !((MTOMXMLStreamWriter) writer).isIgnoreXMLDeclaration());
-    }
-
     // /
     // /OMDocument Methods
     // /
@@ -416,13 +411,13 @@
     public void serializeAndConsume(OutputStream output, OMOutputFormat format)
             throws XMLStreamException {
         MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(output, format);
-        internalSerializeAndConsume(writer);
+        internalSerialize(writer, false);
         writer.flush();
     }
 
     public void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException {
         MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(output, format);
-        internalSerialize(writer);
+        internalSerialize(writer, true);
         writer.flush();
     }
 

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentTypeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentTypeImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentTypeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentTypeImpl.java Wed Aug 12 22:06:30 2009
@@ -42,11 +42,7 @@
         return DOCUMENT_TYPE_NODE;
     }
 
-    public void internalSerialize(XMLStreamWriter writer) throws XMLStreamException {
-        throw new UnsupportedOperationException();
-    }
-
-    public void internalSerializeAndConsume(XMLStreamWriter writer) throws XMLStreamException {
+    public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
         throw new UnsupportedOperationException();
     }
 

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java Wed Aug 12 22:06:30 2009
@@ -1093,16 +1093,7 @@
         throw new UnsupportedOperationException();
     }
 
-    public void internalSerialize(XMLStreamWriter writer) throws XMLStreamException {
-        internalSerialize(writer, true);
-    }
-
-    public void internalSerializeAndConsume(XMLStreamWriter writer)
-            throws XMLStreamException {
-        this.internalSerialize(writer, false);
-    }
-
-    protected void internalSerialize(XMLStreamWriter writer,
+    public void internalSerialize(XMLStreamWriter writer,
                                      boolean cache) throws XMLStreamException {
 
         if (!cache) {
@@ -1112,7 +1103,7 @@
             // serilize children
             Iterator children = this.getChildren();
             while (children.hasNext()) {
-                ((OMNodeEx) children.next()).internalSerialize(writer);
+                ((OMNodeEx) children.next()).internalSerialize(writer, true);
             }
             OMSerializerUtil.serializeEndpart(writer);
 
@@ -1126,7 +1117,7 @@
                 while (child != null
                         && ((!(child instanceof OMElement)) || child
                         .isComplete())) {
-                    child.internalSerializeAndConsume(writer);
+                    child.internalSerialize(writer, false);
                     child = child.nextSibling;
                 }
                 if (child != null) {

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java Wed Aug 12 22:06:30 2009
@@ -383,12 +383,6 @@
 
     }
 
-    /** There no concept of caching in this OM-DOM implementation. */
-    public void internalSerializeWithCache(XMLStreamWriter writer)
-            throws XMLStreamException {
-        this.internalSerialize(writer);
-    }
-
     /*
      * (non-Javadoc)
      * 
@@ -492,19 +486,18 @@
     }
 
     public void serialize(XMLStreamWriter xmlWriter) throws XMLStreamException {
-        MTOMXMLStreamWriter writer = xmlWriter instanceof MTOMXMLStreamWriter ?
-                (MTOMXMLStreamWriter) xmlWriter : 
-                    new MTOMXMLStreamWriter(xmlWriter);
-        internalSerialize(writer);
-        writer.flush();
+        serialize(xmlWriter, true);
     }
 
-    public void serializeAndConsume(XMLStreamWriter xmlWriter)
-            throws XMLStreamException {
+    public void serializeAndConsume(XMLStreamWriter xmlWriter) throws XMLStreamException {
+        serialize(xmlWriter, false);
+    }
+
+    public void serialize(XMLStreamWriter xmlWriter, boolean cache) throws XMLStreamException {
         MTOMXMLStreamWriter writer = xmlWriter instanceof MTOMXMLStreamWriter ?
                 (MTOMXMLStreamWriter) xmlWriter : 
                     new MTOMXMLStreamWriter(xmlWriter);
-        internalSerializeAndConsume(writer);
+        internalSerialize(writer, cache);
         writer.flush();
     }
 
@@ -802,7 +795,7 @@
             throws XMLStreamException {
         MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(output, format);
         try {
-            internalSerialize(writer);
+            internalSerialize(writer, true);
             writer.flush();
         } finally {
             if (format.isAutoCloseWriter()) {
@@ -817,7 +810,7 @@
                 .createXMLStreamWriter(writer2));
         writer.setOutputFormat(format);
         try {
-            internalSerialize(writer);
+            internalSerialize(writer, true);
             writer.flush();
         } finally {
             if (format.isAutoCloseWriter()) {
@@ -830,7 +823,7 @@
             throws XMLStreamException {
         MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(output, format);
         try {
-            internalSerializeAndConsume(writer);
+            internalSerialize(writer, false);
             writer.flush();
         } finally {
             if (format.isAutoCloseWriter()) {
@@ -845,7 +838,7 @@
                 .createXMLStreamWriter(writer2));
         try {
             writer.setOutputFormat(format);
-            internalSerializeAndConsume(writer);
+            internalSerialize(writer, false);
             writer.flush();
         } finally {
             if (format.isAutoCloseWriter()) {

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java Wed Aug 12 22:06:30 2009
@@ -96,11 +96,7 @@
         return value;
     }
 
-    public void internalSerialize(XMLStreamWriter writer) throws XMLStreamException {
+    public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
         writer.writeProcessingInstruction(target + " ", value);
     }
-
-    public void internalSerializeAndConsume(XMLStreamWriter writer) throws XMLStreamException {
-        internalSerialize(writer);
-    }
 }

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java Wed Aug 12 22:06:30 2009
@@ -299,15 +299,6 @@
     // /OMNode methods
     // /
 
-    public void internalSerialize(XMLStreamWriter writer) throws XMLStreamException {
-        internalSerializeLocal(writer);
-    }
-
-    public void internalSerializeAndConsume(XMLStreamWriter writer)
-            throws XMLStreamException {
-        internalSerializeLocal(writer);
-    }
-
     public boolean isOptimized() {
         return this.optimize;
     }
@@ -466,7 +457,7 @@
         }
     }
 
-    private void internalSerializeLocal(XMLStreamWriter writer)
+    public void internalSerialize(XMLStreamWriter writer, boolean cache)
             throws XMLStreamException {
         if (!this.isBinary) {
             writeOutput(writer);

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java Wed Aug 12 22:06:30 2009
@@ -189,7 +189,7 @@
         // here do nothing as SOAPEnvelope doesn't have a parent !!!
     }
 
-    protected void internalSerialize(XMLStreamWriter writer2, boolean cache)
+    public void internalSerialize(XMLStreamWriter writer2, boolean cache)
             throws XMLStreamException {
 
         MTOMXMLStreamWriter writer = (MTOMXMLStreamWriter) writer2;
@@ -209,12 +209,12 @@
             //serialize children
             SOAPHeader header = getHeader();
             if ((header != null) && (header.getFirstOMChild() != null)) {
-                ((SOAPHeaderImpl) header).internalSerialize(writer);
+                ((SOAPHeaderImpl) header).internalSerialize(writer, true);
             }
             SOAPBody body = getBody();
             //REVIEW: getBody has statements to return null..Can it be null in any case?
             if (body != null) {
-                ((org.apache.axiom.soap.impl.dom.SOAPBodyImpl) body).internalSerialize(writer);
+                ((org.apache.axiom.soap.impl.dom.SOAPBodyImpl) body).internalSerialize(writer, true);
             }
             OMSerializerUtil.serializeEndpart(writer);
 
@@ -241,7 +241,7 @@
     private void serializeInternally(NodeImpl child, MTOMXMLStreamWriter writer)
             throws XMLStreamException {
         if ((!(child instanceof OMElement)) || child.isComplete() || child.builder == null) {
-            child.internalSerializeAndConsume(writer);
+            child.internalSerialize(writer, false);
         } else {
             OMElement element = (OMElement) child;
             element.getBuilder().setCache(false);

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java Wed Aug 12 22:06:30 2009
@@ -62,7 +62,7 @@
         return this.getChildren();
     }
 
-    protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+    public void internalSerialize(XMLStreamWriter writer, boolean cache)
             throws XMLStreamException {
         // select the builder
         short builderType = PULL_TYPE_BUILDER;    // default is pull type
@@ -79,7 +79,7 @@
             //No caching
             if (this.firstChild != null) {
                 OMSerializerUtil.serializeStartpart(this, writer);
-                firstChild.internalSerializeAndConsume(writer);
+                firstChild.internalSerialize(writer, false);
                 OMSerializerUtil.serializeEndpart(writer);
             } else if (!this.done) {
                 if (builderType == PULL_TYPE_BUILDER) {

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultImpl.java Wed Aug 12 22:06:30 2009
@@ -150,7 +150,7 @@
         this.addChild(newElement);
     }
 
-    protected void internalSerialize(XMLStreamWriter writer,
+    public void internalSerialize(XMLStreamWriter writer,
                                      boolean cache) throws XMLStreamException {
         // select the builder
         short builderType = PULL_TYPE_BUILDER; // default is pull type

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultNodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultNodeImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultNodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultNodeImpl.java Wed Aug 12 22:06:30 2009
@@ -52,7 +52,7 @@
         return this.getText();
     }
 
-    protected void internalSerialize(
+    public void internalSerialize(
             XMLStreamWriter writer, boolean cache)
             throws XMLStreamException {
         // select the builder
@@ -70,7 +70,7 @@
             //No caching
             if (this.firstChild != null) {
                 OMSerializerUtil.serializeStartpart(this, writer);
-                firstChild.internalSerializeAndConsume(writer);
+                firstChild.internalSerialize(writer, false);
                 OMSerializerUtil.serializeEndpart(writer);
             } else if (!this.done) {
                 if (builderType == PULL_TYPE_BUILDER) {

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java Wed Aug 12 22:06:30 2009
@@ -60,7 +60,7 @@
         return this.getText();
     }
 
-    protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+    public void internalSerialize(XMLStreamWriter writer, boolean cache)
             throws XMLStreamException {
         // select the builder
         short builderType = PULL_TYPE_BUILDER;    // default is pull type
@@ -77,7 +77,7 @@
             //No caching
             if (this.firstChild != null) {
                 OMSerializerUtil.serializeStartpart(this, writer);
-                firstChild.internalSerializeAndConsume(writer);
+                firstChild.internalSerialize(writer, false);
                 OMSerializerUtil.serializeEndpart(writer);
             } else if (!this.done) {
                 if (builderType == PULL_TYPE_BUILDER) {

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPMessageImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPMessageImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPMessageImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPMessageImpl.java Wed Aug 12 22:06:30 2009
@@ -59,10 +59,6 @@
 
     protected void internalSerialize(XMLStreamWriter writer, boolean cache,
                                      boolean includeXMLDeclaration) throws XMLStreamException {
-        if (cache) {
-            ((OMNodeEx) this.ownerNode.getDocumentElement()).internalSerialize(writer);
-        } else {
-            ((OMNodeEx) this.ownerNode.getDocumentElement()).internalSerializeAndConsume(writer);
-        }
+        ((OMNodeEx) this.ownerNode.getDocumentElement()).internalSerialize(writer, cache);
     }
 }

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java Wed Aug 12 22:06:30 2009
@@ -79,7 +79,7 @@
         }
     }
 
-    protected void internalSerialize(
+    public void internalSerialize(
             XMLStreamWriter writer, boolean cache)
             throws XMLStreamException {
 

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java Wed Aug 12 22:06:30 2009
@@ -78,7 +78,7 @@
 
 
         if (firstChild != null) {
-            firstChild.internalSerializeAndConsume(writer);
+            firstChild.internalSerialize(writer, false);
         }
         writer.writeEndElement();
     }

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java Wed Aug 12 22:06:30 2009
@@ -59,7 +59,7 @@
         }
     }
 
-    protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+    public void internalSerialize(XMLStreamWriter writer, boolean cache)
             throws XMLStreamException {
 
         // select the builder

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java Wed Aug 12 22:06:30 2009
@@ -53,7 +53,7 @@
         }
     }
 
-    protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+    public void internalSerialize(XMLStreamWriter writer, boolean cache)
             throws XMLStreamException {
 
         // select the builder

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMCommentImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMCommentImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMCommentImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMCommentImpl.java Wed Aug 12 22:06:30 2009
@@ -53,27 +53,11 @@
         this(parentNode, null, factory);
     }
 
-    /**
-     * Serializes the node with caching.
-     *
-     * @param writer
-     * @throws XMLStreamException
-     */
-    public void internalSerialize(XMLStreamWriter writer) throws XMLStreamException {
+    public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
         writer.writeComment(this.value);
     }
 
     /**
-     * Serializes the node without caching.
-     *
-     * @param writer
-     * @throws XMLStreamException
-     */
-    public void internalSerializeAndConsume(XMLStreamWriter writer) throws XMLStreamException {
-        internalSerialize(writer);
-    }
-
-    /**
      * Gets the value of this comment.
      *
      * @return Returns String.

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocTypeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocTypeImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocTypeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocTypeImpl.java Wed Aug 12 22:06:30 2009
@@ -53,27 +53,11 @@
         this(parentNode, null, factory);
     }
 
-    /**
-     * Serializes the node with caching.
-     *
-     * @param writer
-     * @throws XMLStreamException
-     */
-    public void internalSerialize(XMLStreamWriter writer) throws XMLStreamException {
+    public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
         writer.writeDTD(this.value);
     }
 
     /**
-     * Serializes the node without caching.
-     *
-     * @param writer
-     * @throws XMLStreamException
-     */
-    public void internalSerializeAndConsume(XMLStreamWriter writer) throws XMLStreamException {
-        internalSerialize(writer);
-    }
-
-    /**
      * Gets the value of this DocType.
      *
      * @return Returns String.

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocumentImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocumentImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocumentImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocumentImpl.java Wed Aug 12 22:06:30 2009
@@ -311,25 +311,6 @@
         this.xmlVersion = xmlVersion;
     }
 
-    /** Serialize the docuement with/without the XML declaration */
-    public void internalSerializeAndConsume(XMLStreamWriter writer, boolean includeXMLDeclaration)
-            throws XMLStreamException {
-        internalSerialize(writer, false, includeXMLDeclaration);
-    }
-
-    /** Serializes the document with the XML declaration. */
-    public void internalSerializeAndConsume(XMLStreamWriter writer)
-            throws XMLStreamException {
-        internalSerialize(writer, false, !((MTOMXMLStreamWriter) writer).isIgnoreXMLDeclaration());
-    }
-
-
-    /** Serializes the document with cache. */
-    public void internalSerialize(XMLStreamWriter writer) throws XMLStreamException {
-        internalSerialize(writer, true, !((MTOMXMLStreamWriter) writer).isIgnoreXMLDeclaration());
-
-    }
-
     /**
      * Serializes the document directly to the output stream with caching disabled.
      *
@@ -338,7 +319,7 @@
      */
     public void serializeAndConsume(OutputStream output) throws XMLStreamException {
         MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(output, new OMOutputFormat());
-        internalSerializeAndConsume(writer);
+        internalSerialize(writer, false);
         writer.flush();
     }
 
@@ -350,7 +331,7 @@
      */
     public void serialize(OutputStream output) throws XMLStreamException {
         MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(output, new OMOutputFormat());
-        internalSerialize(writer);
+        internalSerialize(writer, true);
         writer.flush();
     }
 
@@ -364,7 +345,7 @@
     public void serializeAndConsume(OutputStream output, OMOutputFormat format)
             throws XMLStreamException {
         MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(output, format);
-        internalSerializeAndConsume(writer);
+        internalSerialize(writer, false);
         writer.flush();
     }
 
@@ -377,15 +358,12 @@
      */
     public void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException {
         MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(output, format);
-        internalSerialize(writer);
+        internalSerialize(writer, true);
         writer.flush();
     }
 
-    /** Serializes the document with cache. */
-    public void internalSerialize(XMLStreamWriter writer, boolean includeXMLDeclaration)
-            throws XMLStreamException {
-        internalSerialize(writer, true, includeXMLDeclaration);
-
+    public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
+        internalSerialize(writer, cache, !((MTOMXMLStreamWriter) writer).isIgnoreXMLDeclaration());
     }
 
     protected void internalSerialize(XMLStreamWriter writer, boolean cache,

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java Wed Aug 12 22:06:30 2009
@@ -936,19 +936,10 @@
         }
     }
 
-    /**
-     * Method internalSerialize.
-     *
-     * @throws XMLStreamException
-     */
-    public void internalSerialize(XMLStreamWriter writer) throws XMLStreamException {
-        internalSerialize(writer, true);
-    }
-
 ///////////////////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////////////////
 
-    protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+    public void internalSerialize(XMLStreamWriter writer, boolean cache)
             throws XMLStreamException {
 
         if (cache) {
@@ -958,7 +949,7 @@
             //serialize children
             Iterator children = this.getChildren();
             while (children.hasNext()) {
-                ((OMNodeEx) children.next()).internalSerialize(writer);
+                ((OMNodeEx) children.next()).internalSerialize(writer, true);
             }
             OMSerializerUtil.serializeEndpart(writer);
 
@@ -971,7 +962,7 @@
                 while (child != null) {
                     if ((!(child instanceof OMElement)) || child.isComplete() ||
                             child.builder == null) {
-                        child.internalSerializeAndConsume(writer);
+                        child.internalSerialize(writer, false);
                     } else {
                         OMElement element = (OMElement) child;
                         element.getBuilder().setCache(false);
@@ -992,18 +983,6 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
     /**
-     * This method serializes and consumes without building the object structure in memory. Misuse
-     * of this method will cause loss of data. So it is advised to use populateYourSelf() method,
-     * before calling this method, if one wants to preserve data in the stream. This was requested
-     * during the second Axis2 summit.
-     *
-     * @throws XMLStreamException
-     */
-    public void internalSerializeAndConsume(XMLStreamWriter writer) throws XMLStreamException {
-        this.internalSerialize(writer, false);
-    }
-
-    /**
      * Gets first element.
      *
      * @return Returns element.

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java Wed Aug 12 22:06:30 2009
@@ -347,7 +347,7 @@
 
     public void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException {
         MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(output, format);
-        internalSerialize(writer);
+        internalSerialize(writer, true);
         writer.flush();
         if (format.isAutoCloseWriter()) {
             writer.close();
@@ -358,7 +358,7 @@
         MTOMXMLStreamWriter writer =
                 new MTOMXMLStreamWriter(StAXUtils.createXMLStreamWriter(writer2));
         writer.setOutputFormat(format);
-        internalSerialize(writer);
+        internalSerialize(writer, true);
         writer.flush();
         if (format.isAutoCloseWriter()) {
             writer.close();
@@ -368,7 +368,7 @@
     public void serializeAndConsume(OutputStream output, OMOutputFormat format)
             throws XMLStreamException {
         MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(output, format);
-        internalSerializeAndConsume(writer);
+        internalSerialize(writer, false);
         writer.flush();
         if (format.isAutoCloseWriter()) {
             writer.close();
@@ -380,7 +380,7 @@
         MTOMXMLStreamWriter writer =
                 new MTOMXMLStreamWriter(StAXUtils.createXMLStreamWriter(writer2));
         writer.setOutputFormat(format);
-        internalSerializeAndConsume(writer);
+        internalSerialize(writer, false);
         writer.flush();
         if (format.isAutoCloseWriter()) {
             writer.close();

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java Wed Aug 12 22:06:30 2009
@@ -57,27 +57,11 @@
         this(parentNode, null, null, factory);
     }
 
-    /**
-     * Serializes the node with caching.
-     *
-     * @param writer
-     * @throws XMLStreamException
-     */
-    public void internalSerialize(XMLStreamWriter writer) throws XMLStreamException {
+    public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
         writer.writeProcessingInstruction(this.target + " ", this.value);
     }
 
     /**
-     * Serializes the node without caching.
-     *
-     * @param writer
-     * @throws XMLStreamException
-     */
-    public void internalSerializeAndConsume(XMLStreamWriter writer) throws XMLStreamException {
-        internalSerialize(writer);
-    }
-
-    /**
      * Gets the value of this Processing Instruction.
      *
      * @return string

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSerializableImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSerializableImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSerializableImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSerializableImpl.java Wed Aug 12 22:06:30 2009
@@ -93,38 +93,27 @@
     public abstract void setComplete(boolean state);
 
     /**
-     * Serializes the node with caching.
+     * Serializes the node.
      *
      * @param writer
      * @throws XMLStreamException
      */
-    public abstract void internalSerialize(XMLStreamWriter writer) throws XMLStreamException;
-
-    /**
-     * Serializes the node without caching.
-     *
-     * @param writer
-     * @throws XMLStreamException
-     */
-    public abstract void internalSerializeAndConsume(XMLStreamWriter writer)
-            throws XMLStreamException;
+    public abstract void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException;
 
     public void serialize(XMLStreamWriter xmlWriter) throws XMLStreamException {
-        
-        // If the input xmlWriter is not an MTOMXMLStreamWriter, then wrapper it
-        MTOMXMLStreamWriter writer = xmlWriter instanceof MTOMXMLStreamWriter ?
-                (MTOMXMLStreamWriter) xmlWriter : 
-                    new MTOMXMLStreamWriter(xmlWriter);
-        internalSerialize(writer);
-        writer.flush();
+        serialize(xmlWriter, true);
     }
 
     public void serializeAndConsume(XMLStreamWriter xmlWriter) throws XMLStreamException {
+        serialize(xmlWriter, false);
+    }
+
+    public void serialize(XMLStreamWriter xmlWriter, boolean cache) throws XMLStreamException {
         // If the input xmlWriter is not an MTOMXMLStreamWriter, then wrapper it
         MTOMXMLStreamWriter writer = xmlWriter instanceof MTOMXMLStreamWriter ?
                 (MTOMXMLStreamWriter) xmlWriter : 
                     new MTOMXMLStreamWriter(xmlWriter);
-        internalSerializeAndConsume(writer);
+        internalSerialize(writer, cache);
         writer.flush();
     }
 }

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java Wed Aug 12 22:06:30 2009
@@ -686,29 +686,7 @@
         return super.getType();
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.axiom.om.OMNode#internalSerialize(javax.xml.stream.XMLStreamWriter)
-     */
-    public void internalSerialize(javax.xml.stream.XMLStreamWriter writer)
-            throws XMLStreamException {
-        // The contract of internalSerialize is to "cache" the om
-        if (isExpanded()) {
-            super.internalSerialize(writer);
-        } else {
-            if (isDestructiveWrite()) {
-                forceExpand();
-                super.internalSerialize(writer);
-            } else {
-                dataSource.serialize(writer);
-            }
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.axiom.om.impl.llom.OMElementImpl#
-     * internalSerialize(javax.xml.stream.XMLStreamWriter, boolean)
-     */
-    protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+    public void internalSerialize(XMLStreamWriter writer, boolean cache)
             throws XMLStreamException {
         if (isExpanded()) {
             super.internalSerialize(writer, cache);
@@ -720,20 +698,6 @@
                 dataSource.serialize(writer);
             }
         } else {
-            internalSerializeAndConsume(writer);
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.axiom.om.OMNode#internalSerializeAndConsume(javax.xml.stream.XMLStreamWriter)
-     */
-    public void internalSerializeAndConsume(XMLStreamWriter writer) throws XMLStreamException {
-        if (isDebugEnabled) {
-            log.debug("serialize " + getPrintableName() + " to XMLStreamWriter");
-        }
-        if (isExpanded()) {
-            super.internalSerializeAndConsume(writer);
-        } else {
             dataSource.serialize(writer); 
         }
     }
@@ -743,7 +707,7 @@
      */
     public void serialize(XMLStreamWriter xmlWriter) throws XMLStreamException {
         // The contract is to serialize with caching
-        internalSerialize(xmlWriter);
+        internalSerialize(xmlWriter, true);
     }
 
     /* (non-Javadoc)
@@ -797,7 +761,7 @@
      */
     public void serializeAndConsume(javax.xml.stream.XMLStreamWriter xmlWriter)
             throws XMLStreamException {
-        internalSerializeAndConsume(xmlWriter);
+        internalSerialize(xmlWriter, false);
     }
 
     /* (non-Javadoc)

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java Wed Aug 12 22:06:30 2009
@@ -239,14 +239,6 @@
     }
 
     /**
-     * @param writer
-     * @throws XMLStreamException
-     */
-    public void internalSerialize(XMLStreamWriter writer) throws XMLStreamException {
-        internalSerializeLocal(writer);
-    }
-
-    /**
      * Writes the relevant output.
      *
      * @param writer
@@ -408,12 +400,7 @@
         return this.contentID;
     }
 
-    public void internalSerializeAndConsume(XMLStreamWriter writer)
-            throws XMLStreamException {
-        internalSerializeLocal(writer);
-    }
-
-    private void internalSerializeLocal(XMLStreamWriter writer) throws XMLStreamException {
+    public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
 
         if (!this.isBinary) {
             writeOutput(writer);

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java Wed Aug 12 22:06:30 2009
@@ -206,7 +206,7 @@
         // here do nothing as SOAPEnvelope doesn't have a parent !!!
     }
 
-    protected void internalSerialize(XMLStreamWriter writer2, boolean cache)
+    public void internalSerialize(XMLStreamWriter writer2, boolean cache)
             throws XMLStreamException {
         MTOMXMLStreamWriter writer = (MTOMXMLStreamWriter) writer2;
         if (!writer.isIgnoreXMLDeclaration()) {
@@ -224,12 +224,12 @@
             //serialize children
             OMElement header = getHeader();
             if ((header != null) && (header.getFirstOMChild() != null)) {
-                ((SOAPHeaderImpl) header).internalSerialize(writer);
+                ((SOAPHeaderImpl) header).internalSerialize(writer, true);
             }
             SOAPBody body = getBody();
             //REVIEW: getBody has statements to return null..Can it be null in any case?
             if (body != null) {
-                ((SOAPBodyImpl) body).internalSerialize(writer);
+                ((SOAPBodyImpl) body).internalSerialize(writer, true);
             }
             OMSerializerUtil.serializeEndpart(writer);
 
@@ -282,7 +282,7 @@
     private void serializeInternally(OMNodeImpl child, MTOMXMLStreamWriter writer)
             throws XMLStreamException {
         if ((!(child instanceof OMElement)) || child.isComplete() || child.builder == null) {
-            child.internalSerializeAndConsume(writer);
+            child.internalSerialize(writer, false);
         } else {
             OMElement element = (OMElement) child;
             element.getBuilder().setCache(false);

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java Wed Aug 12 22:06:30 2009
@@ -60,7 +60,7 @@
         return this.getChildren();
     }
 
-    protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+    public void internalSerialize(XMLStreamWriter writer, boolean cache)
             throws XMLStreamException {
         this.registerContentHandler(writer);
 

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java Wed Aug 12 22:06:30 2009
@@ -152,7 +152,7 @@
         this.addChild(newElement);
     }
 
-    protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+    public void internalSerialize(XMLStreamWriter writer, boolean cache)
             throws XMLStreamException {
         this.registerContentHandler(writer);
         
@@ -163,23 +163,23 @@
         OMSerializerUtil.serializeStartpart(this, writer);
         SOAPFaultCode faultCode = getCode();
         if (faultCode != null) {
-            ((OMNodeEx) faultCode).internalSerialize(writer);
+            ((OMNodeEx) faultCode).internalSerialize(writer, true);
         }
         SOAPFaultReason faultReason = getReason();
         if (faultReason != null) {
-            ((OMNodeEx) faultReason).internalSerialize(writer);
+            ((OMNodeEx) faultReason).internalSerialize(writer, true);
         }
 
         serializeFaultNode(writer);
 
         SOAPFaultRole faultRole = getRole();
         if (faultRole != null && faultRole.getText() != null && !"".equals(faultRole.getText())) {
-            ((OMNodeEx) faultRole).internalSerialize(writer);
+            ((OMNodeEx) faultRole).internalSerialize(writer, true);
         }
 
         SOAPFaultDetail faultDetail = getDetail();
         if (faultDetail != null) {
-            ((OMNodeEx) faultDetail).internalSerialize(writer);
+            ((OMNodeEx) faultDetail).internalSerialize(writer, true);
         }
 
         OMSerializerUtil.serializeEndpart(writer);

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java Wed Aug 12 22:06:30 2009
@@ -67,10 +67,6 @@
 
     protected void internalSerialize(XMLStreamWriter writer, boolean cache,
                                      boolean includeXMLDeclaration) throws XMLStreamException {
-        if (cache) {
-            ((OMNodeEx) this.documentElement).internalSerialize(writer);
-        } else {
-            ((OMNodeEx) this.documentElement).internalSerializeAndConsume(writer);
-        }
+        ((OMNodeEx) this.documentElement).internalSerialize(writer, cache);
     }
 }

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java Wed Aug 12 22:06:30 2009
@@ -72,7 +72,7 @@
         }
     }
 
-    protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+    public void internalSerialize(XMLStreamWriter writer, boolean cache)
             throws XMLStreamException {
         this.registerContentHandler(writer);
 

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java Wed Aug 12 22:06:30 2009
@@ -68,7 +68,7 @@
         }
     }
 
-    protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+    public void internalSerialize(XMLStreamWriter writer, boolean cache)
             throws XMLStreamException {
         this.registerContentHandler(writer);
 

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java Wed Aug 12 22:06:30 2009
@@ -54,7 +54,7 @@
         }
     }
 
-    protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+    public void internalSerialize(XMLStreamWriter writer, boolean cache)
             throws XMLStreamException {
 
         this.registerContentHandler(writer);

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java Wed Aug 12 22:06:30 2009
@@ -127,7 +127,7 @@
         SOAPFaultNode faultNode = getNode();
         if (faultNode != null && faultNode.getText() != null
                 && !"".equals(faultNode.getText())) {
-            ((SOAP12FaultNodeImpl) faultNode).internalSerialize(writer);
+            ((SOAP12FaultNodeImpl) faultNode).internalSerialize(writer, true);
         }
     }
 

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultNodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultNodeImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultNodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultNodeImpl.java Wed Aug 12 22:06:30 2009
@@ -52,7 +52,7 @@
         }
     }
     
-    protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+    public void internalSerialize(XMLStreamWriter writer, boolean cache)
     throws XMLStreamException {
         this.registerContentHandler(writer);
         super.internalSerialize(writer, cache);

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultRoleImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultRoleImpl.java?rev=803724&r1=803723&r2=803724&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultRoleImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultRoleImpl.java Wed Aug 12 22:06:30 2009
@@ -52,7 +52,7 @@
         }
     }
     
-    protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+    public void internalSerialize(XMLStreamWriter writer, boolean cache)
     throws XMLStreamException {
 
         this.registerContentHandler(writer);