You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ch...@apache.org on 2005/07/12 15:58:35 UTC

svn commit: r215951 - in /webservices/axis/trunk/java: modules/xml/src/org/apache/axis2/om/impl/llom/ modules/xml/src/org/apache/axis2/om/impl/llom/traverse/ modules/xml/src/org/apache/axis2/soap/impl/llom/ xdocs/

Author: chinthaka
Date: Tue Jul 12 06:58:29 2005
New Revision: 215951

URL: http://svn.apache.org/viewcvs?rev=215951&view=rev
Log:
Changed the order of SOAPFault serialisation
Changed some XDocs

Modified:
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocument.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultCodeImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultDetailImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultNodeImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultReasonImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultRoleImpl.java
    webservices/axis/trunk/java/xdocs/docs.html
    webservices/axis/trunk/java/xdocs/releases.html

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocument.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocument.java?rev=215951&r1=215950&r2=215951&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocument.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocument.java Tue Jul 12 06:58:29 2005
@@ -171,7 +171,7 @@
      * @throws OMException
      */
     public Iterator getChildrenWithName(QName elementQName) throws OMException {
-        return new OMChildrenQNameIterator((OMNodeImpl) getFirstChild(),
+        return new OMChildrenQNameIterator(getFirstChild(),
                 elementQName);
     }
 
@@ -196,7 +196,7 @@
      */
     public OMElement getFirstChildWithName(QName elementQName) throws OMException {
         OMChildrenQNameIterator omChildrenQNameIterator =
-                new OMChildrenQNameIterator((OMNodeImpl) getFirstChild(),
+                new OMChildrenQNameIterator(getFirstChild(),
                         elementQName);
         OMNode omNode = null;
         if (omChildrenQNameIterator.hasNext()) {

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java?rev=215951&r1=215950&r2=215951&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java Tue Jul 12 06:58:29 2005
@@ -37,7 +37,7 @@
      * @throws javax.xml.stream.XMLStreamException
      *
      */
-    static void serializeEndpart(OMOutput omOutput)
+    public static void serializeEndpart(OMOutput omOutput)
             throws XMLStreamException {
         omOutput.getXmlStreamWriter().writeEndElement();
     }
@@ -49,7 +49,7 @@
      * @param writer
      * @throws XMLStreamException
      */
-    static void serializeAttribute(OMAttribute attr, OMOutput omOutput)
+    public static void serializeAttribute(OMAttribute attr, OMOutput omOutput)
             throws XMLStreamException {
 
         // first check whether the attribute is associated with a namespace
@@ -81,7 +81,7 @@
      * @param writer
      * @throws XMLStreamException
      */
-    static void serializeNamespace(OMNamespace namespace, OMOutput omOutput)
+    public static void serializeNamespace(OMNamespace namespace, OMOutput omOutput)
             throws XMLStreamException {
 
         if (namespace != null) {
@@ -103,7 +103,7 @@
      * @param writer
      * @throws XMLStreamException
      */
-    static void serializeStartpart(OMElementImpl element, OMOutput omOutput)
+    public static void serializeStartpart(OMElementImpl element, OMOutput omOutput)
             throws XMLStreamException {
         String nameSpaceName = null;
         String writer_prefix = null;
@@ -177,9 +177,7 @@
      * @param cache
      * @throws XMLStreamException
      */
-    static void serializeNormal(OMElementImpl element,
-                                OMOutput omOutput,
-                                boolean cache)
+    public static void serializeNormal(OMElementImpl element, OMOutput omOutput, boolean cache)
             throws XMLStreamException {
 
         if (cache) {
@@ -198,11 +196,9 @@
         serializeEndpart(omOutput);
     }
 
-    static void serializeByPullStream(OMElementImpl element,
-                                      OMOutput omOutput) throws XMLStreamException {
+    public static void serializeByPullStream(OMElementImpl element, OMOutput omOutput) throws XMLStreamException {
         StreamingOMSerializer streamingOMSerializer = new StreamingOMSerializer();
-        streamingOMSerializer.serialize(
-                element.getXMLStreamReaderWithoutCaching(),
+        streamingOMSerializer.serialize(element.getXMLStreamReaderWithoutCaching(),
                 omOutput);
         return;
     }

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java?rev=215951&r1=215950&r2=215951&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java Tue Jul 12 06:58:29 2005
@@ -112,12 +112,12 @@
      */
     private boolean isQNamesMatch(QName elementQName, QName qNameToBeMatched) {
 
-        // if no QName was given, that means one needs all
+        // if no QName was given, that means user is asking for all
         if (qNameToBeMatched == null) {
             return true;
         }
 
-        // if the given localname is null, whatever value this.qname has, its a match
+        // if the given localname is null, whatever value this.qname has, its a match. But can one give a QName without a localName ??
         boolean localNameMatch =
                 (qNameToBeMatched.getLocalPart() == null)
                 || (qNameToBeMatched.getLocalPart() == "")

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultCodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultCodeImpl.java?rev=215951&r1=215950&r2=215951&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultCodeImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultCodeImpl.java Tue Jul 12 06:58:29 2005
@@ -1,6 +1,10 @@
 package org.apache.axis2.soap.impl.llom;
 
 import org.apache.axis2.om.OMXMLParserWrapper;
+import org.apache.axis2.om.OMOutput;
+import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axis2.om.impl.llom.OMSerializerUtil;
 import org.apache.axis2.soap.SOAPFault;
 import org.apache.axis2.soap.SOAPFaultCode;
 import org.apache.axis2.soap.SOAPFaultSubCode;
@@ -8,6 +12,8 @@
 import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
 import org.apache.axis2.soap.impl.llom.util.UtilProvider;
 
+import javax.xml.stream.XMLStreamException;
+
 /**
  * Copyright 2001-2004 The Apache Software Foundation.
  * <p/>
@@ -70,4 +76,48 @@
         return (SOAPFaultSubCode) UtilProvider.getChildWithName(this,
                 SOAP12Constants.SOAP_FAULT_SUB_CODE_LOCAL_NAME);
     }
+
+    protected void serialize(OMOutput omOutput, boolean cache) throws XMLStreamException {
+        // select the builder
+        short builderType = PULL_TYPE_BUILDER;    // default is pull type
+        if (builder != null) {
+            builderType = this.builder.getBuilderType();
+        }
+        if ((builderType == PUSH_TYPE_BUILDER)
+                && (builder.getRegisteredContentHandler() == null)) {
+            builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(omOutput));
+        }
+
+
+        if (!cache) {
+            //No caching
+            if (this.firstChild != null) {
+                OMSerializerUtil.serializeStartpart(this, omOutput);
+                firstChild.serialize(omOutput);
+                OMSerializerUtil.serializeEndpart(omOutput);
+            } else if (!this.done) {
+                if (builderType == PULL_TYPE_BUILDER) {
+                    OMSerializerUtil.serializeByPullStream(this, omOutput);
+                } else {
+                    OMSerializerUtil.serializeStartpart(this, omOutput);
+                    builder.setCache(cache);
+                    builder.next();
+                    OMSerializerUtil.serializeEndpart(omOutput);
+                }
+            } else {
+                OMSerializerUtil.serializeNormal(this, omOutput, cache);
+            }
+            // do not serialise the siblings
+
+
+        } else {
+            //Cached
+            OMSerializerUtil.serializeNormal(this, omOutput, cache);
+
+            // do not serialise the siblings
+        }
+
+
+    }
+
 }

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultDetailImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultDetailImpl.java?rev=215951&r1=215950&r2=215951&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultDetailImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultDetailImpl.java Tue Jul 12 06:58:29 2005
@@ -2,10 +2,14 @@
 
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMXMLParserWrapper;
+import org.apache.axis2.om.OMOutput;
+import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axis2.om.impl.llom.OMSerializerUtil;
 import org.apache.axis2.soap.SOAPFault;
 import org.apache.axis2.soap.SOAPFaultDetail;
 import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
 
+import javax.xml.stream.XMLStreamException;
 import java.util.Iterator;
 
 /*
@@ -47,4 +51,48 @@
     public Iterator getAllDetailEntries() {
         return this.getChildren();
     }
+
+    protected void serialize(OMOutput omOutput, boolean cache) throws XMLStreamException {
+        // select the builder
+        short builderType = PULL_TYPE_BUILDER;    // default is pull type
+        if (builder != null) {
+            builderType = this.builder.getBuilderType();
+        }
+        if ((builderType == PUSH_TYPE_BUILDER)
+                && (builder.getRegisteredContentHandler() == null)) {
+            builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(omOutput));
+        }
+
+
+        if (!cache) {
+            //No caching
+            if (this.firstChild != null) {
+                OMSerializerUtil.serializeStartpart(this, omOutput);
+                firstChild.serialize(omOutput);
+                OMSerializerUtil.serializeEndpart(omOutput);
+            } else if (!this.done) {
+                if (builderType == PULL_TYPE_BUILDER) {
+                    OMSerializerUtil.serializeByPullStream(this, omOutput);
+                } else {
+                    OMSerializerUtil.serializeStartpart(this, omOutput);
+                    builder.setCache(cache);
+                    builder.next();
+                    OMSerializerUtil.serializeEndpart(omOutput);
+                }
+            } else {
+                OMSerializerUtil.serializeNormal(this, omOutput, cache);
+            }
+            // do not serialise the siblings
+
+
+        } else {
+            //Cached
+            OMSerializerUtil.serializeNormal(this, omOutput, cache);
+
+            // do not serialise the siblings
+        }
+
+
+    }
+
 }

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java?rev=215951&r1=215950&r2=215951&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java Tue Jul 12 06:58:29 2005
@@ -15,22 +15,15 @@
  */
 package org.apache.axis2.soap.impl.llom;
 
-import org.apache.axis2.om.OMConstants;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNode;
-import org.apache.axis2.om.OMXMLParserWrapper;
+import org.apache.axis2.om.*;
 import org.apache.axis2.om.impl.llom.OMElementImpl;
-import org.apache.axis2.soap.SOAPBody;
-import org.apache.axis2.soap.SOAPFault;
-import org.apache.axis2.soap.SOAPFaultCode;
-import org.apache.axis2.soap.SOAPFaultDetail;
-import org.apache.axis2.soap.SOAPFaultNode;
-import org.apache.axis2.soap.SOAPFaultReason;
-import org.apache.axis2.soap.SOAPFaultRole;
+import org.apache.axis2.om.impl.llom.OMSerializerUtil;
+import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axis2.soap.*;
 import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
 
 import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Iterator;
@@ -43,6 +36,7 @@
 
     protected Exception e;
 
+
     /**
      * Constructor SOAPFaultImpl
      *
@@ -179,6 +173,52 @@
             }
         }
         return null;
+    }
+
+    protected void serialize(OMOutput omOutput, boolean cache) throws XMLStreamException {
+        // select the builder
+        short builderType = PULL_TYPE_BUILDER;    // default is pull type
+        if (builder != null) {
+            builderType = this.builder.getBuilderType();
+        }
+        if ((builderType == PUSH_TYPE_BUILDER)
+                && (builder.getRegisteredContentHandler() == null)) {
+            builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(omOutput));
+        }
+
+
+        // this is a special case. This fault element may contain its children in any order. But spec mandates a specific order
+        // the overriding of the method will facilitate that. Not sure this is the best method to do this :(
+        build();
+
+        OMSerializerUtil.serializeStartpart(this, omOutput);
+        SOAPFaultCode faultCode = getCode();
+        if (faultCode != null) {
+            faultCode.serializeWithCache(omOutput);
+        }
+        SOAPFaultReason faultReason = getReason();
+        if (faultReason != null) {
+            faultReason.serializeWithCache(omOutput);
+        }
+
+        SOAPFaultNode faultNode = getNode();
+        if (faultNode != null) {
+            faultNode.serializeWithCache(omOutput);
+        }
+
+        SOAPFaultRole faultRole = getRole();
+        if (faultRole != null) {
+            faultRole.serializeWithCache(omOutput);
+        }
+
+
+
+        SOAPFaultDetail faultDetail = getDetail();
+        if (faultDetail != null) {
+            faultDetail.serializeWithCache(omOutput);
+        }
+
+
     }
 
 }

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultNodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultNodeImpl.java?rev=215951&r1=215950&r2=215951&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultNodeImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultNodeImpl.java Tue Jul 12 06:58:29 2005
@@ -1,10 +1,15 @@
 package org.apache.axis2.soap.impl.llom;
 
 import org.apache.axis2.om.OMXMLParserWrapper;
+import org.apache.axis2.om.OMOutput;
+import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axis2.om.impl.llom.OMSerializerUtil;
 import org.apache.axis2.soap.SOAPFault;
 import org.apache.axis2.soap.SOAPFaultNode;
 import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
 
+import javax.xml.stream.XMLStreamException;
+
 /*
  * Copyright 2004,2005 The Apache Software Foundation.
  *
@@ -40,4 +45,48 @@
     public String getNodeValue() {
         return this.getText();
     }
+
+    protected void serialize(OMOutput omOutput, boolean cache) throws XMLStreamException {
+            // select the builder
+            short builderType = PULL_TYPE_BUILDER;    // default is pull type
+            if (builder != null) {
+                builderType = this.builder.getBuilderType();
+            }
+            if ((builderType == PUSH_TYPE_BUILDER)
+                    && (builder.getRegisteredContentHandler() == null)) {
+                builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(omOutput));
+            }
+
+
+            if (!cache) {
+                //No caching
+                if (this.firstChild != null) {
+                    OMSerializerUtil.serializeStartpart(this, omOutput);
+                    firstChild.serialize(omOutput);
+                    OMSerializerUtil.serializeEndpart(omOutput);
+                } else if (!this.done) {
+                    if (builderType == PULL_TYPE_BUILDER) {
+                        OMSerializerUtil.serializeByPullStream(this, omOutput);
+                    } else {
+                        OMSerializerUtil.serializeStartpart(this, omOutput);
+                        builder.setCache(cache);
+                        builder.next();
+                        OMSerializerUtil.serializeEndpart(omOutput);
+                    }
+                } else {
+                    OMSerializerUtil.serializeNormal(this, omOutput, cache);
+                }
+                // do not serialise the siblings
+
+
+            } else {
+                //Cached
+                OMSerializerUtil.serializeNormal(this, omOutput, cache);
+
+                // do not serialise the siblings
+            }
+
+
+        }
+    
 }

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultReasonImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultReasonImpl.java?rev=215951&r1=215950&r2=215951&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultReasonImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultReasonImpl.java Tue Jul 12 06:58:29 2005
@@ -2,12 +2,17 @@
 
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMXMLParserWrapper;
+import org.apache.axis2.om.OMOutput;
+import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axis2.om.impl.llom.OMSerializerUtil;
 import org.apache.axis2.soap.SOAPFault;
 import org.apache.axis2.soap.SOAPFaultReason;
 import org.apache.axis2.soap.SOAPFaultText;
 import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
 import org.apache.axis2.soap.impl.llom.util.UtilProvider;
 
+import javax.xml.stream.XMLStreamException;
+
 /**
  * Copyright 2001-2004 The Apache Software Foundation.
  * <p/>
@@ -58,4 +63,48 @@
         return (SOAPFaultText) UtilProvider.getChildWithName(this,
                 SOAP12Constants.SOAP_FAULT_TEXT_LOCAL_NAME);
     }
+
+    protected void serialize(OMOutput omOutput, boolean cache) throws XMLStreamException {
+        // select the builder
+        short builderType = PULL_TYPE_BUILDER;    // default is pull type
+        if (builder != null) {
+            builderType = this.builder.getBuilderType();
+        }
+        if ((builderType == PUSH_TYPE_BUILDER)
+                && (builder.getRegisteredContentHandler() == null)) {
+            builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(omOutput));
+        }
+
+
+        if (!cache) {
+            //No caching
+            if (this.firstChild != null) {
+                OMSerializerUtil.serializeStartpart(this, omOutput);
+                firstChild.serialize(omOutput);
+                OMSerializerUtil.serializeEndpart(omOutput);
+            } else if (!this.done) {
+                if (builderType == PULL_TYPE_BUILDER) {
+                    OMSerializerUtil.serializeByPullStream(this, omOutput);
+                } else {
+                    OMSerializerUtil.serializeStartpart(this, omOutput);
+                    builder.setCache(cache);
+                    builder.next();
+                    OMSerializerUtil.serializeEndpart(omOutput);
+                }
+            } else {
+                OMSerializerUtil.serializeNormal(this, omOutput, cache);
+            }
+            // do not serialise the siblings
+
+
+        } else {
+            //Cached
+            OMSerializerUtil.serializeNormal(this, omOutput, cache);
+
+            // do not serialise the siblings
+        }
+
+
+    }
+
 }

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultRoleImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultRoleImpl.java?rev=215951&r1=215950&r2=215951&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultRoleImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultRoleImpl.java Tue Jul 12 06:58:29 2005
@@ -1,9 +1,14 @@
 package org.apache.axis2.soap.impl.llom;
 
 import org.apache.axis2.om.OMXMLParserWrapper;
+import org.apache.axis2.om.OMOutput;
+import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axis2.om.impl.llom.OMSerializerUtil;
 import org.apache.axis2.soap.SOAPFault;
 import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
 
+import javax.xml.stream.XMLStreamException;
+
 /*
  * Copyright 2004,2005 The Apache Software Foundation.
  *
@@ -42,4 +47,48 @@
     public String getRoleValue() {
         return this.getText();
     }
+
+    protected void serialize(OMOutput omOutput, boolean cache) throws XMLStreamException {
+        // select the builder
+        short builderType = PULL_TYPE_BUILDER;    // default is pull type
+        if (builder != null) {
+            builderType = this.builder.getBuilderType();
+        }
+        if ((builderType == PUSH_TYPE_BUILDER)
+                && (builder.getRegisteredContentHandler() == null)) {
+            builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(omOutput));
+        }
+
+
+        if (!cache) {
+            //No caching
+            if (this.firstChild != null) {
+                OMSerializerUtil.serializeStartpart(this, omOutput);
+                firstChild.serialize(omOutput);
+                OMSerializerUtil.serializeEndpart(omOutput);
+            } else if (!this.done) {
+                if (builderType == PULL_TYPE_BUILDER) {
+                    OMSerializerUtil.serializeByPullStream(this, omOutput);
+                } else {
+                    OMSerializerUtil.serializeStartpart(this, omOutput);
+                    builder.setCache(cache);
+                    builder.next();
+                    OMSerializerUtil.serializeEndpart(omOutput);
+                }
+            } else {
+                OMSerializerUtil.serializeNormal(this, omOutput, cache);
+            }
+            // do not serialise the siblings
+
+
+        } else {
+            //Cached
+            OMSerializerUtil.serializeNormal(this, omOutput, cache);
+
+            // do not serialise the siblings
+        }
+
+
+    }
+
 }

Modified: webservices/axis/trunk/java/xdocs/docs.html
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/xdocs/docs.html?rev=215951&r1=215950&r2=215951&view=diff
==============================================================================
--- webservices/axis/trunk/java/xdocs/docs.html (original)
+++ webservices/axis/trunk/java/xdocs/docs.html Tue Jul 12 06:58:29 2005
@@ -15,6 +15,11 @@
 	<ul>
 		<li><a href="./userguide.html">User's 
 		Guide</a></li>
+		<li><a href="installationguide.html">Installation Guide </a></li>
+		<li><a href="webadminguide.html">Web Admin Guide</a></li>
+		<li><a href="OMTutorial.html">AXIOM Tutorial  </a></li>
+		<li><a href="CodegenToolReference.html">Code Generation Tool Tutorial </a></li>
+		<li><a href="rest-ws.html">Rest Support </a></li>
 		<li><a href="refLib.html">Reference 
 		Material</a> </li>
     </ul>
@@ -23,9 +28,13 @@
   </div>
 	<ul><li><a href="Axis2ArchitectureGuide.html">
 		Architecture Guide</a> - Axis design concepts and rationale.</li>
+		<li><a href="mtom-guide.html">MTOM Support Tutorial </a></li>
+		<li><a href="OMTutorial.html">AXIOM Tutorial </a></li>
+		<li><a href="CodegenToolReference.html">Code Generation Tool Tutorial </a></li>
+		<li><a href="rest-ws.html">Rest Support </a></li>
 		<li><a href="svn.html">Setting up the project</a>- Instruction to set up 
 		the project</li>
-	    <li><a href="maven-help.html">Maven Help</a> - A quick help to mostly used maven commands </li>
+		<li><a href="maven-help.html">Maven Help</a> - A quick help to mostly used maven commands </li>
     </ul>
 	<p>&nbsp;</p>
 	<div id="pdf" align="right">

Modified: webservices/axis/trunk/java/xdocs/releases.html
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/xdocs/releases.html?rev=215951&r1=215950&r2=215951&view=diff
==============================================================================
--- webservices/axis/trunk/java/xdocs/releases.html (original)
+++ webservices/axis/trunk/java/xdocs/releases.html Tue Jul 12 06:58:29 2005
@@ -20,7 +20,7 @@
 		  <td>Source Distribution <a href="http://cvs.apache.org/dist/axis/v2.0-M2/axis2-M2-src.zip">zip</a><br>
 Binary Distribution <a href="http://cvs.apache.org/dist/axis/v2.0-M2/axis2-M2-bin.zip">zip</a> <br>
 <a href="dist/axis2.war">War Distribution</a> </td>
-		  <td>07 - 06 - 2005 </td>
+		  <td>08 - 06 - 2005 </td>
 		  <td>Milestone Release #2</td>
 	  </tr>
 		<tr>
@@ -28,7 +28,7 @@
 		  <td>Source Distribution <a href="http://www.apache.org/dist/ws/axis2/0_9/axis2-0.9-src.zip">zip</a><br>
 Binary Distribution <a href="http://www.apache.org/dist/ws/axis2/0_9/axis2-0.9-bin.zip">zip</a> <br>
 <a href="dist/axis2.war">War Distribution</a> </td>
-		  <td>07 - 06 - 2005</td>
+		  <td>05 - 07 - 2005</td>
 		  <td> 0.9 Release</td>
 	  </tr>
 	</table>