ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r391463 - in /webservices/axis2/trunk/java/modules: jibx/src/org/apache/axis2/jibx/OMJiBXElementImpl.java saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java saaj/src/org/apache/axis2/saaj/TextImplEx.java
Date Wed, 05 Apr 2006 01:11:38 GMT
Author: dims
Date: Tue Apr  4 18:11:36 2006
New Revision: 391463

URL: http://svn.apache.org/viewcvs?rev=391463&view=rev
Log:
sync with axiom

Modified:
    webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/OMJiBXElementImpl.java
    webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
    webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java

Modified: webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/OMJiBXElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/OMJiBXElementImpl.java?rev=391463&r1=391462&r2=391463&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/OMJiBXElementImpl.java
(original)
+++ webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/OMJiBXElementImpl.java
Tue Apr  4 18:11:36 2006
@@ -25,7 +25,6 @@
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.om.impl.OMContainerEx;
-import org.apache.axiom.om.impl.OMOutputImpl;
 import org.apache.axiom.om.impl.llom.OMElementImpl;
 import org.apache.axiom.om.impl.llom.OMNamespaceImpl;
 import org.apache.axiom.om.impl.llom.OMNodeImpl;
@@ -340,18 +339,11 @@
     }
 
     /* (non-Javadoc)
-     * @see org.apache.axiom.om.OMNode#serialize(org.apache.axiom.om.impl.OMOutputImpl)
      */
-    public void internalSerialize(OMOutputImpl omOutput) throws XMLStreamException {
-        forceTree().internalSerialize(omOutput);
+    public void internalSerialize(javax.xml.stream.XMLStreamWriter writer) throws XMLStreamException
{
+        forceTree().internalSerialize(writer);
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.axiom.om.OMNode#serialize(org.apache.axiom.om.impl.OMOutputImpl)
-     */
-    public void serializeAndConsume(OMOutputImpl omOutput) throws XMLStreamException {
-        serialize(omOutput.getXmlStreamWriter());
-    }
 
     /* (non-Javadoc)
      * @see org.apache.axiom.om.OMNode#serialize(javax.xml.stream.XMLStreamWriter)
@@ -423,7 +415,7 @@
     /* (non-Javadoc)
      * @see org.apache.axiom.om.OMNode#serializeAndConsume(javax.xml.stream.XMLStreamWriter)
      */
-    public void serializeAndConsume(XMLStreamWriter xmlWriter) throws XMLStreamException
{
+    public void serializeAndConsume(javax.xml.stream.XMLStreamWriter xmlWriter) throws XMLStreamException
{
         try {
             IXMLWriter writer = new StAXWriter(bindingFactory.getNamespaces(),
                 xmlWriter);

Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=391463&r1=391462&r2=391463&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
(original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
Tue Apr  4 18:11:36 2006
@@ -20,7 +20,6 @@
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.impl.OMOutputImpl;
 import org.apache.axiom.om.impl.dom.DocumentImpl;
 import org.apache.axiom.om.impl.dom.ElementImpl;
 import org.apache.axiom.om.impl.dom.NodeImpl;
@@ -64,17 +63,16 @@
     }
 
     /* (non-Javadoc)
-      * @see org.apache.axiom.om.OMNode#serialize(org.apache.axiom.om.impl.OMOutputImpl)
       */
-    public void internalSerialize(OMOutputImpl omOutput) throws XMLStreamException {
-        element.internalSerialize(omOutput);
+    public void internalSerialize(javax.xml.stream.XMLStreamWriter writer) throws XMLStreamException
{
+        element.internalSerialize(writer);
     }
 
     /* (non-Javadoc)
       * @see org.apache.axiom.om.OMNode#serializeAndConsume(org.apache.axiom.om.impl.OMOutputImpl)
       */
-    public void internalSerializeAndConsume(OMOutputImpl omOutput) throws XMLStreamException
{
-        element.internalSerializeAndConsume(omOutput);
+    public void internalSerializeAndConsume(javax.xml.stream.XMLStreamWriter writer) throws
XMLStreamException {
+        element.internalSerializeAndConsume(writer);
     }
 
     /**

Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java?rev=391463&r1=391462&r2=391463&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java Tue
Apr  4 18:11:36 2006
@@ -17,7 +17,6 @@
 
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.impl.OMOutputImpl;
 import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
 import org.apache.axiom.om.impl.dom.TextImpl;
 import org.w3c.dom.DOMException;
@@ -264,18 +263,12 @@
         textNode.discard();
     }
 
-    /* (non-Javadoc)
-      * @see org.apache.axiom.om.OMNode#serialize(org.apache.axiom.om.impl.OMOutputImpl)
-      */
-    public void internalSerialize(OMOutputImpl omOutput) throws XMLStreamException {
-        textNode.internalSerialize(omOutput);
+    public void internalSerialize(javax.xml.stream.XMLStreamWriter writer) throws XMLStreamException
{
+        textNode.internalSerialize(writer);
     }
 
-    /* (non-Javadoc)
-      * @see org.apache.axiom.om.OMNode#serializeAndConsume(org.apache.axiom.om.impl.OMOutputImpl)
-      */
-    public void internalSerializeAndConsume(OMOutputImpl omOutput) throws XMLStreamException
{
-        textNode.internalSerializeAndConsume(omOutput);
+    public void internalSerializeAndConsume(javax.xml.stream.XMLStreamWriter writer) throws
XMLStreamException {
+        textNode.internalSerializeAndConsume(writer);
     }
 
     /**



Mime
View raw message