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

[veithen]

Author: veithen
Date: Fri Sep 18 19:54:11 2009
New Revision: 816761

URL: http://svn.apache.org/viewvc?rev=816761&view=rev
Log:
WSCOMMONS-502: Restored the internalSerialize(XMLStreamWriter) and 
internalSerializeAndConsume(XMLStreamWriter) methods on OMNodeEx for backward 
compatibility with projects which use them despite the fact that these are 
internal methods.

Modified:
    
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/NodeImpl.java
    
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java

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=816761&r1=816760&r2=816761&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
 Fri Sep 18 19:54:11 2009
@@ -22,6 +22,7 @@
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMSerializable;
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
@@ -44,7 +45,8 @@
     public void setType(int nodeType) throws OMException;
 
     /**
-     * Serializes the node.
+     * Serializes the node. Note that this is an internal method that MUST NOT 
be used outside of
+     * Axiom. Please use {...@link OMSerializable#serialize(XMLStreamWriter, 
boolean)} instead.
      *
      * @param writer
      * @param cache indicates if caching should be enabled
@@ -53,6 +55,20 @@
      */
     public void internalSerialize(XMLStreamWriter writer, boolean cache)
             throws XMLStreamException;
+
+    /**
+     * @deprecated This method will be removed in a future version of Axiom. 
It is only here to
+     *             maintain backward compatibility with projects using this 
method despite the fact
+     *             that it is marked as internal.
+     */
+    public void internalSerialize(XMLStreamWriter writer) throws 
XMLStreamException;
+
+    /**
+     * @deprecated This method will be removed in a future version of Axiom. 
It is only here to
+     *             maintain backward compatibility with projects using this 
method despite the fact
+     *             that it is marked as internal.
+     */
+    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/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=816761&r1=816760&r2=816761&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
 Fri Sep 18 19:54:11 2009
@@ -847,4 +847,12 @@
     public OMFactory getOMFactory() {
         return this.factory;
     }
+
+    public void internalSerialize(XMLStreamWriter writer) throws 
XMLStreamException {
+        internalSerialize(writer, true);
+    }
+
+    public void internalSerializeAndConsume(XMLStreamWriter writer) throws 
XMLStreamException {
+        internalSerialize(writer, false);
+    }
 }

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=816761&r1=816760&r2=816761&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
 Fri Sep 18 19:54:11 2009
@@ -19,6 +19,9 @@
 
 package org.apache.axiom.om.impl.llom;
 
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
 import org.apache.axiom.om.OMComment;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMDocType;
@@ -354,4 +357,12 @@
             }
         }
     }
+
+    public void internalSerialize(XMLStreamWriter writer) throws 
XMLStreamException {
+        internalSerialize(writer, true);
+    }
+
+    public void internalSerializeAndConsume(XMLStreamWriter writer) throws 
XMLStreamException {
+        internalSerialize(writer, false);
+    }
 }