axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r109968 - in webservices/axis/trunk/java/dev/scratch/prototype2/src: java/org/apache/axis/impl/llom java/org/apache/axis/impl/llom/builder java/org/apache/axis/om samples/deployment/service1 samples/deployment/service2 samples/msg/echo test/org/apache/axis/om test/org/apache/axis/om/impl/streamwrapper
Date Mon, 06 Dec 2004 10:33:37 GMT
Author: chinthaka
Date: Mon Dec  6 02:33:35 2004
New Revision: 109968

URL: http://svn.apache.org/viewcvs?view=rev&rev=109968
Log:
Customizing to have a builder to operate on a pure xml without SOAP specific stuff like SOAPEnvelope, etc.,
Added:
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPBodyImpl.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPEnvelopeImpl.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPHeaderBlockImpl.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPHeaderImpl.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXBuilder.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPBody.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPEnvelope.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPHeader.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPHeaderBlock.java
Removed:
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMBodyImpl.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMEnvelopeImpl.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMHeaderBlockImpl.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMHeaderImpl.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/OMStAXBuilder.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMBody.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMEnvelope.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMHeader.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMHeaderBlock.java
Modified:
   webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Echo1.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Echo2.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/Echo.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/IteratorTester.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMNavigatorTest.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTest.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTestUtils.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMBodyImpl.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMBodyImpl.java?view=auto&rev=109967
==============================================================================

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMEnvelopeImpl.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMEnvelopeImpl.java?view=auto&rev=109967
==============================================================================

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMHeaderBlockImpl.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMHeaderBlockImpl.java?view=auto&rev=109967
==============================================================================

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMHeaderImpl.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMHeaderImpl.java?view=auto&rev=109967
==============================================================================

Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPBodyImpl.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPBodyImpl.java?view=auto&rev=109968
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPBodyImpl.java	Mon Dec  6 02:33:35 2004
@@ -0,0 +1,85 @@
+package org.apache.axis.impl.llom;
+
+import org.apache.axis.om.*;
+
+/**
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * <p/>
+ * User: Eran Chinthaka - Lanka Software Foundation
+ * Date: Nov 2, 2004
+ * Time: 4:29:00 PM
+ */
+public class SOAPBodyImpl extends OMElementImpl implements SOAPBody {
+
+
+
+    /**
+     * @param envelope
+     */
+    public SOAPBodyImpl(SOAPEnvelope envelope) {
+        super(envelope);
+        this.ns = envelope.getNamespace();
+        this.localName = OMConstants.BODY_LOCAL_NAME;
+    }
+
+    public SOAPBodyImpl(String localName, OMNamespace ns, OMElement parent, OMXMLParserWrapper builder) {
+        super(localName, ns, parent, builder);
+    }
+
+    /**
+     * Creates a new <code>OMFault</code> object and adds it to
+     * this <code>SOAPBody</code> object.
+     *
+     * @return the new <code>OMFault</code> object
+     * @throws org.apache.axis.om.OMException if there is a SOAP error
+     */
+    public OMFault addFault() throws OMException {
+        throw new UnsupportedOperationException(); //TODO implement this
+    }
+
+    /**
+     * Indicates whether a <code>OMFault</code> object exists in
+     * this <code>SOAPBody</code> object.
+     *
+     * @return <code>true</code> if a <code>OMFault</code> object exists in
+     *         this <code>SOAPBody</code> object; <code>false</code>
+     *         otherwise
+     */
+    public boolean hasFault() {
+        throw new UnsupportedOperationException(); //TODO implement this
+    }
+
+    /**
+     * Returns the <code>OMFault</code> object in this <code>SOAPBody</code>
+     * object.
+     *
+     * @return the <code>OMFault</code> object in this <code>SOAPBody</code>
+     *         object
+     */
+    public OMFault getFault() {
+        throw new UnsupportedOperationException(); //TODO implement this
+    }
+
+
+    /**
+     * @param omFault
+     * @throws org.apache.axis.om.OMException
+     */
+    public void addFault(OMFault omFault) throws OMException {
+        throw new UnsupportedOperationException(); //TODO implement this
+    }
+
+
+}

Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPEnvelopeImpl.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPEnvelopeImpl.java?view=auto&rev=109968
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPEnvelopeImpl.java	Mon Dec  6 02:33:35 2004
@@ -0,0 +1,121 @@
+package org.apache.axis.impl.llom;
+
+import org.apache.axis.om.*;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.impl.llom.OMElementImpl;
+
+
+import javax.xml.namespace.QName;
+import java.util.Iterator;
+
+/**
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * <p/>
+ * User: Eran Chinthaka - Lanka Software Foundation
+ * Date: Oct 29, 2004
+ * Time: 3:41:59 PM
+ */
+public class SOAPEnvelopeImpl extends OMElementImpl implements SOAPEnvelope {
+
+    /**
+     *
+     * @param builder
+     */
+    public SOAPEnvelopeImpl(OMXMLParserWrapper builder){
+         super("",null,null,builder);
+    }
+
+    public SOAPEnvelopeImpl(String localName, OMNamespace ns, OMElement parent, OMXMLParserWrapper builder) {
+        super(localName, ns, parent, builder);
+    }
+
+    /**
+     * @param localName
+     * @param ns
+     */
+    public SOAPEnvelopeImpl(String localName, OMNamespace ns) {
+        super(localName, ns);
+    }
+
+    /**
+     * Creates a new <CODE>Name</CODE> object initialized with the
+     * given local name, namespace prefix, and namespace URI.
+     * <p/>
+     * <P>This factory method creates <CODE>Name</CODE> objects
+     * for use in the SOAP/XML document.
+     *
+     * @param localName a <CODE>String</CODE> giving
+     *                  the local name
+     * @param prefix    a <CODE>String</CODE> giving
+     *                  the prefix of the namespace
+     * @param uri       a <CODE>String</CODE> giving the
+     *                  URI of the namespace
+     * @return a <CODE>OMNamespace</CODE> object initialized with the given
+     *         local name, namespace prefix, and namespace URI
+     * @throws org.apache.axis.om.OMException if there is a SOAP error
+     */
+    public OMNamespace createNamespace(String localName, String prefix, String uri) throws OMException {
+        return this.createNamespace(localName, prefix, uri);
+    }
+
+    /**
+     * Returns the <CODE>SOAPHeader</CODE> object for this <CODE>
+     * SOAPEnvelope</CODE> object.
+     * <p/>
+     * <P> This SOAPHeader will just be a container for all the headers in the
+     * <CODE>OMMessage</CODE>
+     * </P>
+     *
+     * @return the <CODE>SOAPHeader</CODE> object or <CODE>
+     *         null</CODE> if there is none
+     * @throws org.apache.axis.om.OMException if there is a problem
+     *                                        obtaining the <CODE>SOAPHeader</CODE> object
+     */
+    public SOAPHeader getHeader() throws OMException {
+        Iterator headerIterator = this.getChildrenWithName(new QName(OMConstants.HEADER_NAMESPACEURI, OMConstants.HEADER_LOCAL_NAME));
+        SOAPHeader soapHeader = null;
+        if (headerIterator.hasNext()) {
+            soapHeader = (SOAPHeader) headerIterator.next();
+        }
+
+        return soapHeader;
+    }
+
+    /**
+     * Returns the <CODE>SOAPBody</CODE> object associated with
+     * this <CODE>SOAPEnvelope</CODE> object.
+     * <p/>
+     * <P> This SOAPBody will just be a container for all the BodyElements in the
+     * <CODE>OMMessage</CODE>
+     * </P>
+     *
+     * @return the <CODE>SOAPBody</CODE> object for this <CODE>
+     *         SOAPEnvelope</CODE> object or <CODE>null</CODE> if there
+     *         is none
+     * @throws org.apache.axis.om.OMException if there is a problem
+     *                                        obtaining the <CODE>SOAPBody</CODE> object
+     */
+    public SOAPBody getBody() throws OMException {
+        Iterator bodyIterator = this.getChildrenWithName(new QName(OMConstants.BODY_NAMESPACE_URI, OMConstants.BODY_LOCAL_NAME));
+        SOAPBody soapBody = null;
+        if (bodyIterator.hasNext()) {
+            soapBody = (SOAPBody) bodyIterator.next();
+        }
+
+        return soapBody;
+    }
+
+
+}

Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPHeaderBlockImpl.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPHeaderBlockImpl.java?view=auto&rev=109968
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPHeaderBlockImpl.java	Mon Dec  6 02:33:35 2004
@@ -0,0 +1,132 @@
+package org.apache.axis.impl.llom;
+
+import org.apache.axis.om.*;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.impl.llom.OMAttributeImpl;
+import org.apache.axis.impl.llom.OMElementImpl;
+
+
+import javax.xml.namespace.QName;
+import java.util.Iterator;
+
+/**
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * <p/>
+ * User: Eran Chinthaka - Lanka Software Foundation
+ * Date: Nov 2, 2004
+ * Time: 3:19:20 PM
+ */
+public class SOAPHeaderBlockImpl extends OMElementImpl implements SOAPHeaderBlock {
+
+    /**
+     * @param localName
+     * @param ns
+     */
+    public SOAPHeaderBlockImpl(String localName, OMNamespace ns) {
+        super(localName, ns);
+    }
+
+    public SOAPHeaderBlockImpl(String localName, OMNamespace ns, OMElement parent, OMXMLParserWrapper builder) {
+        super(localName, ns, parent, builder);
+    }
+
+    /**
+     * Sets the actor associated with this <CODE>
+     * SOAPHeaderBlock</CODE> object to the specified actor. The
+     * default value of an actor is: <CODE>
+     * OMConstants.URI_SOAP_ACTOR_NEXT</CODE>
+     *
+     * @param actorURI a <CODE>String</CODE> giving
+     *                 the URI of the actor to set
+     * @throws IllegalArgumentException if
+     *                                  there is a problem in setting the actor.
+     * @see #getActor() getActor()
+     */
+    public void setActor(String actorURI) {
+        setAttribute(OMConstants.ATTR_ACTOR, actorURI);
+    }
+
+    /**
+     *
+     * @param attributeName
+     * @param attrValue
+     */
+    private void setAttribute(String attributeName, String attrValue) {
+        Iterator attrIter = this.getAttributeWithQName(new QName(OMConstants.SOAP_ENVELOPE_NAMESPACE_URI, attributeName));
+        if (attrIter.hasNext()) {
+            ((OMAttribute) attrIter.next()).setValue(attrValue);
+        } else {
+            OMAttribute attribute = new OMAttributeImpl(attributeName, new OMNamespaceImpl(OMConstants.SOAP_ENVELOPE_NAMESPACE_URI, OMConstants.SOAPENVELOPE_NAMESPACE_PREFIX), attrValue, this);
+            this.insertAttribute(attribute);
+        }
+    }
+
+    /**
+     * Returns the uri of the actor associated with this <CODE>
+     * SOAPHeaderBlock</CODE> object.
+     *
+     * @return a <CODE>String</CODE> giving the URI of the
+     *         actor
+     * @see #setActor(String) setActor(java.lang.String)
+     */
+    public String getActor() {
+        return getAttribute(OMConstants.ATTR_ACTOR);
+    }
+
+    private String getAttribute(String attrName) {
+        Iterator attrIter = this.getAttributeWithQName(new QName(OMConstants.SOAP_ENVELOPE_NAMESPACE_URI, attrName));
+        if (attrIter.hasNext()) {
+            return ((OMAttribute) attrIter.next()).getValue();
+        }
+        return null;
+    }
+
+    /**
+     * Sets the mustUnderstand attribute for this <CODE>
+     * SOAPHeaderBlock</CODE> object to be on or off.
+     * <p/>
+     * <P>If the mustUnderstand attribute is on, the actor who
+     * receives the <CODE>SOAPHeaderBlock</CODE> must process it
+     * correctly. This ensures, for example, that if the <CODE>
+     * SOAPHeaderBlock</CODE> object modifies the message, that
+     * the message is being modified correctly.</P>
+     *
+     * @param mustUnderstand <CODE>true</CODE> to
+     *                       set the mustUnderstand attribute on; <CODE>false</CODE>
+     *                       to turn if off
+     * @throws IllegalArgumentException if
+     *                                  there is a problem in setting the actor.
+     * @see #getMustUnderstand() getMustUnderstand()
+     */
+    public void setMustUnderstand(boolean mustUnderstand) {
+        setAttribute(OMConstants.ATTR_MUSTUNDERSTAND, mustUnderstand ? "true" : "false");
+    }
+
+    /**
+     * Returns whether the mustUnderstand attribute for this
+     * <CODE>SOAPHeaderBlock</CODE> object is turned on.
+     *
+     * @return <CODE>true</CODE> if the mustUnderstand attribute of
+     *         this <CODE>SOAPHeaderBlock</CODE> object is turned on;
+     *         <CODE>false</CODE> otherwise
+     */
+    public boolean getMustUnderstand() {
+        String mustUnderstand = "";
+        if( (mustUnderstand = getAttribute(OMConstants.ATTR_MUSTUNDERSTAND)) != null){
+            return mustUnderstand.equalsIgnoreCase("true");
+        }
+        return false;
+    }
+}

Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPHeaderImpl.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPHeaderImpl.java?view=auto&rev=109968
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPHeaderImpl.java	Mon Dec  6 02:33:35 2004
@@ -0,0 +1,150 @@
+package org.apache.axis.impl.llom;
+
+import org.apache.axis.om.*;
+import org.apache.axis.impl.llom.OMElementImpl;
+import org.apache.axis.impl.llom.SOAPHeaderBlockImpl;
+
+import java.util.Iterator;
+
+/**
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * <p/>
+ * User: Eran Chinthaka - Lanka Software Foundation
+ * Date: Nov 2, 2004
+ * Time: 2:45:24 PM
+ */
+public class SOAPHeaderImpl extends OMElementImpl implements SOAPHeader {
+
+
+    /**
+     * @param envelope
+     */
+    public SOAPHeaderImpl(SOAPEnvelope envelope) {
+        super(envelope);
+        //set the namespaces
+        this.ns = envelope.getNamespace();
+        this.localName = OMConstants.HEADER_LOCAL_NAME;
+
+    }
+
+    public SOAPHeaderImpl(String localName, OMNamespace ns, OMElement parent, OMXMLParserWrapper builder) {
+        super(localName, ns, parent, builder);
+    }
+
+    /**
+     * Creates a new <CODE>SOAPHeaderBlock</CODE> object
+     * initialized with the specified name and adds it to this
+     * <CODE>SOAPHeader</CODE> object.
+     *
+     * @return the new <CODE>SOAPHeaderBlock</CODE> object that
+     *         was inserted into this <CODE>SOAPHeader</CODE>
+     *         object
+     * @throws org.apache.axis.om.OMException if a SOAP error occurs
+     */
+    public SOAPHeaderBlock addHeaderBlock(String localName, OMNamespace ns) throws OMException {
+        SOAPHeaderBlock soapHeaderBlock = new SOAPHeaderBlockImpl(localName, ns);
+        this.addChild(soapHeaderBlock);
+        soapHeaderBlock.setComplete(true);
+        return soapHeaderBlock;
+    }
+
+    /**
+     * Returns a list of all the <CODE>SOAPHeaderBlock</CODE>
+     * objects in this <CODE>SOAPHeader</CODE> object that have the
+     * the specified actor. An actor is a global attribute that
+     * indicates the intermediate parties to whom the message should
+     * be sent. An actor receives the message and then sends it to
+     * the next actor. The default actor is the ultimate intended
+     * recipient for the message, so if no actor attribute is
+     * included in a <CODE>SOAPHeader</CODE> object, the message is
+     * sent to its ultimate destination.
+     *
+     * @param actor a <CODE>String</CODE> giving the
+     *              URI of the actor for which to search
+     * @return an <CODE>Iterator</CODE> object over all the <CODE>
+     *         SOAPHeaderBlock</CODE> objects that contain the
+     *         specified actor
+     * @see #extractHeaderBlocks(String) extractHeaderBlocks(java.lang.String)
+     */
+    public Iterator examineHeaderBlocks(String actor) {
+        throw new UnsupportedOperationException(); //TODO implement this
+    }
+
+    /**
+     * Returns a list of all the <CODE>SOAPHeaderBlock</CODE>
+     * objects in this <CODE>SOAPHeader</CODE> object that have
+     * the the specified actor and detaches them from this <CODE>
+     * SOAPHeader</CODE> object.
+     * <p/>
+     * <P>This method allows an actor to process only the parts of
+     * the <CODE>SOAPHeader</CODE> object that apply to it and to
+     * remove them before passing the message on to the next
+     * actor.
+     *
+     * @param actor a <CODE>String</CODE> giving the
+     *              URI of the actor for which to search
+     * @return an <CODE>Iterator</CODE> object over all the <CODE>
+     *         SOAPHeaderBlock</CODE> objects that contain the
+     *         specified actor
+     * @see #examineHeaderBlocks(String) examineHeaderBlocks(java.lang.String)
+     */
+    public Iterator extractHeaderBlocks(String actor) {
+        throw new UnsupportedOperationException(); //TODO implement this
+    }
+
+    /**
+     * Returns an <code>Iterator</code> over all the
+     * <code>SOAPHeaderBlock</code> objects in this <code>SOAPHeader</code>
+     * object that have the specified actor and that have a MustUnderstand
+     * attribute whose value is equivalent to <code>true</code>.
+     *
+     * @param actor a <code>String</code> giving the URI of the actor for which
+     *              to search
+     * @return an <code>Iterator</code> object over all the
+     *         <code>SOAPHeaderBlock</code> objects that contain the
+     *         specified actor and are marked as MustUnderstand
+     */
+    public Iterator examineMustUnderstandHeaderBlocks(String actor) {
+        throw new UnsupportedOperationException(); //TODO implement this
+    }
+
+    /**
+     * Returns an <code>Iterator</code> over all the
+     * <code>SOAPHeaderBlock</code> objects in this <code>SOAPHeader</code>
+     * object.
+     *
+     * Not that this will return elements containing the QName (http://schemas.xmlsoap.org/soap/envelope/, Header)
+     *
+     * @return an <code>Iterator</code> object over all the
+     *         <code>SOAPHeaderBlock</code> objects contained by this
+     *         <code>SOAPHeader</code>
+     */
+    public Iterator examineAllHeaderBlocks() {
+        return this.getChildrenWithName(null);
+    }
+
+    /**
+     * Returns an <code>Iterator</code> over all the
+     * <code>SOAPHeaderBlock</code> objects in this <code>SOAPHeader </code>
+     * object and detaches them from this <code>SOAPHeader</code> object.
+     *
+     * @return an <code>Iterator</code> object over all the
+     *         <code>SOAPHeaderBlock</code> objects contained by this
+     *         <code>SOAPHeader</code>
+     */
+    public Iterator extractAllHeaderBlocks() {
+        throw new UnsupportedOperationException(); //TODO implement this
+    }
+}

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/OMStAXBuilder.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/OMStAXBuilder.java?view=auto&rev=109967
==============================================================================

Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXBuilder.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXBuilder.java?view=auto&rev=109968
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXBuilder.java	Mon Dec  6 02:33:35 2004
@@ -0,0 +1,236 @@
+package org.apache.axis.impl.llom.builder;
+
+import org.apache.axis.om.*;
+import org.apache.axis.impl.llom.OMNodeImpl;
+import org.apache.axis.impl.llom.OMTextImpl;
+import org.apache.axis.impl.llom.OMElementImpl;
+
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamConstants;
+
+/**
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * <p/>
+ * User: Eran Chinthaka - Lanka Software Foundation
+ * Date: Dec 6, 2004
+ * Time: 3:58:31 PM
+ * <p/>
+ * OM should be able to built from any data source. And the model it builds may be a SOAP specific one
+ * or just an XML model. This class will give some common functionality of OM Building from StAX.
+ */
+public abstract class StAXBuilder implements OMXMLParserWrapper {
+    protected OMFactory ombuilderFactory;
+    protected XMLStreamReader parser;
+
+    protected OMNode lastNode;
+//returns the state of completion
+    protected boolean done = false;
+
+    //keeps the state of the cache
+    protected boolean cache = true;
+
+    //keeps the state of the parser access. if the parser is
+    //accessed atleast once,this flag will be set
+    protected boolean parserAccessed = false;
+
+    protected StAXBuilder(OMFactory ombuilderFactory, XMLStreamReader parser) {
+        this.ombuilderFactory = ombuilderFactory;
+        this.parser = parser;
+    }
+
+    protected StAXBuilder(XMLStreamReader parser) {
+        this.parser = parser;
+        this.ombuilderFactory = OMFactory.newInstance();
+
+    }
+
+    public void setOmbuilderFactory(OMFactory ombuilderFactory) {
+        this.ombuilderFactory = ombuilderFactory;
+    }
+
+    protected void processNamespaceData(OMElement node) {
+        int namespaceCount = parser.getNamespaceCount();
+        for (int i = 0; i < namespaceCount; i++) {
+            node.createNamespace(parser.getNamespaceURI(i), parser.getNamespacePrefix(i));
+        }
+
+        //set the own namespace
+        node.setNamespace(node.resolveNamespace(parser.getNamespaceURI(), parser.getPrefix()));
+    }
+
+    protected void processAttributes(OMElement node) {
+        int attribCount = parser.getAttributeCount();
+        for (int i = 0; i < attribCount; i++) {
+            OMNamespace ns = null;
+            String uri = parser.getAttributeNamespace(i);
+            if (uri.hashCode() != 0)
+                ns = node.resolveNamespace(uri, parser.getAttributePrefix(i));
+
+            node.insertAttribute(ombuilderFactory.createOMAttribute(parser.getAttributeLocalName(i),
+                    ns,
+                    parser.getAttributeValue(i)));
+        }
+    }
+
+    protected OMNode createOMText() throws OMException {
+        if (lastNode == null)
+            throw new OMException();
+        OMNodeImpl node;
+        if (lastNode.isComplete()) {
+            node = new OMTextImpl(lastNode.getParent(), parser.getText());
+            lastNode.setNextSibling(node);
+            node.setPreviousSibling(lastNode);
+        } else {
+            OMElementImpl e = (OMElementImpl) lastNode;
+            node = new OMTextImpl(e, parser.getText());
+            e.setFirstChild(node);
+        }
+        return node;
+    }
+
+    public void reset(OMNode node) throws OMException {
+        lastNode = null;
+    }
+
+    public void discard(OMElement el) throws OMException {
+
+        OMElementImpl elementImpl = null;
+        if (el instanceof OMElementImpl) {
+            elementImpl = (OMElementImpl) el;
+        } else {
+            throw new OMException();
+        }
+
+        if (elementImpl.isComplete() || !cache)
+            throw new OMException();
+        try {
+            cache = false;
+            do {
+                while (parser.next() != XMLStreamConstants.END_ELEMENT) ;
+                //	TODO:
+            } while (!parser.getName().equals(elementImpl.getLocalName()));
+            lastNode = (OMNodeImpl) elementImpl.getPreviousSibling();
+            if (lastNode != null)
+                lastNode.setNextSibling(null);
+            else {
+                OMElement parent = elementImpl.getParent();
+                if (parent == null)
+                    throw new OMException();
+                parent.setFirstChild(null);
+                lastNode = parent;
+            }
+            cache = true;
+        } catch (OMException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new OMException(e);
+        }
+    }
+
+    public String getText() throws OMException {
+        return parser.getText();
+    }
+
+    public String getNamespace() throws OMException {
+        return parser.getNamespaceURI();
+    }
+
+    public int getNamespaceCount() throws OMException {
+        try {
+            return parser.getNamespaceCount();
+        } catch (Exception e) {
+            throw new OMException(e);
+        }
+    }
+
+    public String getNamespacePrefix(int index) throws OMException {
+        try {
+            return parser.getNamespacePrefix(index);
+        } catch (Exception e) {
+            throw new OMException(e);
+        }
+    }
+
+    public String getNamespaceUri(int index) throws OMException {
+        try {
+            return parser.getNamespaceURI(index);
+        } catch (Exception e) {
+            throw new OMException(e);
+        }
+    }
+
+    public void setCache(boolean b) {
+        if (parserAccessed && b)
+            throw new UnsupportedOperationException("parser accessed. cannot set cache");
+        cache = b;
+    }
+
+    public String getName() throws OMException {
+        return parser.getLocalName();
+    }
+
+    public String getPrefix() throws OMException {
+        return parser.getPrefix();
+    }
+
+    public int getAttributeCount() throws OMException {
+        return parser.getAttributeCount();
+    }
+
+    public String getAttributeNamespace(int arg) throws OMException {
+        return parser.getAttributeNamespace(arg);
+    }
+
+    public String getAttributeName(int arg) throws OMException {
+        return parser.getAttributeNamespace(arg);
+    }
+
+    public String getAttributePrefix(int arg) throws OMException {
+        return parser.getAttributeNamespace(arg);
+    }
+
+    public Object getParser() {
+        if (!cache) {
+            parserAccessed = true;
+            return parser;
+        } else {
+            throw new UnsupportedOperationException("cache must be switched off to access the parser");
+        }
+    }
+
+    public boolean isCompleted() {
+        return done;
+    }
+
+    /**
+     * This method will be called with the XMLStreamConstants.START_ELEMENT event
+     * @return
+     * @throws OMException
+     */
+    protected abstract OMNode createOMElement() throws OMException;
+
+    /**
+     * This should proceed the parser one step further, if parser is not completed yet.
+     * If this has been called whist parser is done, then throw an OMException.
+     *
+     * If the cache is set to false, then should be return the event, *without* building the OM tree.
+     *
+     * If the cache is set to true, then this should handle all the events within this, and should build
+     * the object structure appropriately and return the event.
+     * @return
+     * @throws OMException
+     */
+    public abstract int next() throws OMException;
+}

Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java?view=auto&rev=109968
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java	Mon Dec  6 02:33:35 2004
@@ -0,0 +1,174 @@
+package org.apache.axis.impl.llom.builder;
+
+import org.apache.axis.impl.llom.OMElementImpl;
+import org.apache.axis.impl.llom.OMNodeImpl;
+import org.apache.axis.impl.llom.OMTextImpl;
+import org.apache.axis.om.*;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamReader;
+
+/**
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author Axis team
+ *         Date: Nov 18, 2004
+ *         Time: 2:30:17 PM
+ *         <p/>
+ *         Note - OM navigator has been removed to simplify the build process
+ */
+public class StAXSOAPModelBuilder extends StAXBuilder {
+
+    private SOAPEnvelope envelope;
+
+    /**
+     * element level 1 = envelope level
+     * element level 2 = Header or Body level
+     * element level 3 = HeaderElement or BodyElement level
+     */
+    private int elementLevel = 0;
+
+    public StAXSOAPModelBuilder(OMFactory ombuilderFactory, XMLStreamReader parser) {
+        super(ombuilderFactory, parser);
+    }
+
+    public StAXSOAPModelBuilder(XMLStreamReader parser) {
+        super(parser);
+    }
+
+    public SOAPEnvelope getOMEnvelope() throws OMException {
+        while (envelope == null && !done) {
+            next();
+        }
+        return envelope;
+    }
+
+    protected OMNode createOMElement() throws OMException {
+        OMElement node;
+        String elementName = parser.getLocalName();
+
+        if (lastNode == null) {
+            envelope = ombuilderFactory.createOMEnvelope(elementName, null, null, this);
+            node = (OMElementImpl) envelope;
+        } else if (lastNode.isComplete()) {
+            node = constructNode(lastNode.getParent(), elementName);
+            lastNode.setNextSibling(node);
+//            node.setPreviousSibling(lastNode);
+        } else {
+            OMElement e = (OMElement) lastNode;
+            node = constructNode((OMElement) lastNode, elementName);
+            e.setFirstChild(node);
+        }
+
+        //create the namespaces
+        processNamespaceData(node);
+
+        //fill in the attributes
+        processAttributes(node);
+
+        return node;
+    }
+
+    private OMElement constructNode(OMElement parent, String elementName) {
+        OMElement element = null;
+        if (elementLevel == 2) {
+            // this is either a header or a body
+            if (elementName.equalsIgnoreCase("Header")) {
+                //since its level 2 parent MUST be the envelope
+                element = ombuilderFactory.createHeader(elementName, null, parent, this);
+            } else if (elementName.equalsIgnoreCase("Body")) {
+                //since its level 2 parent MUST be the envelope
+                element = ombuilderFactory.createOMBody(elementName, null, parent, this);
+            } else {
+                // can there be Elements other than Header and Body in Envelope. If yes, what are they and is it YAGNI ??
+                throw new OMException(elementName + " is not supported here. Envelope can not have elements other than Header and Body.");
+            }
+
+        } else if (elementLevel == 3 && parent.getLocalName().equalsIgnoreCase("Header")) {
+            // this is a headerblock
+            element = ombuilderFactory.createOMHeaderBlock(elementName, null, parent, this);//todo NS is required here
+
+        } else {
+            // this is neither of above. Just create an element
+            element = ombuilderFactory.createOMElement(elementName, null, parent, this);//todo put the name
+        }
+
+        return element;
+    }
+
+
+    public int next() throws OMException {
+        try {
+
+            if (done)
+                throw new OMException();
+
+            int token = parser.next();
+
+            if (!cache) {
+                return token;
+            }
+
+            switch (token) {
+                case XMLStreamConstants.START_ELEMENT:
+                    elementLevel++;
+                    lastNode = createOMElement();
+                    break;
+
+                case XMLStreamConstants.CHARACTERS:
+                    lastNode = createOMText();
+                    break;
+
+                case XMLStreamConstants.END_ELEMENT:
+                    if (lastNode.isComplete()) {
+                        OMElement parent = lastNode.getParent();
+                        parent.setComplete(true);
+                        lastNode = parent;
+                    } else {
+                        OMElement e = (OMElement) lastNode;
+                        e.setComplete(true);
+                    }
+                    elementLevel--;
+                    break;
+
+                case XMLStreamConstants.END_DOCUMENT:
+                    done = true;
+
+                    break;
+                case XMLStreamConstants.SPACE:
+                    next();
+                    break;
+
+                default :
+                    throw new OMException();
+            }
+            return token;
+        } catch (OMException e) {
+            throw e;
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new OMException(e);
+        }
+    }
+
+//    public String getNamespace(String arg) throws OMException {
+//        try {
+//            return parser.getNamespaceU(arg);
+//        } catch (Exception e) {
+//            throw new OMException(e);
+//        }
+//    }
+
+}

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMBody.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMBody.java?view=auto&rev=109967
==============================================================================

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMEnvelope.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMEnvelope.java?view=auto&rev=109967
==============================================================================

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMHeader.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMHeader.java?view=auto&rev=109967
==============================================================================

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMHeaderBlock.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMHeaderBlock.java?view=auto&rev=109967
==============================================================================

Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPBody.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPBody.java?view=auto&rev=109968
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPBody.java	Mon Dec  6 02:33:35 2004
@@ -0,0 +1,66 @@
+/*   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.axis.om;
+
+
+/**
+ * An object that represents the contents of the SOAP body
+ * element in a SOAP message. B SOAP body element consists of XML data
+ * that affects the way the application-specific content is processed.
+ * <P>
+ * B <code>SOAPBody</code> object contains <code>OMBodyBlock</code>
+ * objects, which have the content for the SOAP body.
+ * B <code>OMFault</code> object, which carries status and/or
+ * error information, is an example of a <code>OMBodyBlock</code> object.
+ */
+public interface SOAPBody extends OMElement {
+
+    /**
+     * Creates a new <code>OMFault</code> object and adds it to
+     * this <code>SOAPBody</code> object.
+     *
+     * @return the new <code>OMFault</code> object
+     * @throws org.apache.axis.om.OMException if there is a SOAP error
+     */
+    public abstract OMFault addFault() throws OMException;
+
+    /**
+     * Indicates whether a <code>OMFault</code> object exists in
+     * this <code>SOAPBody</code> object.
+     *
+     * @return <code>true</code> if a <code>OMFault</code> object exists in
+     *         this <code>SOAPBody</code> object; <code>false</code>
+     *         otherwise
+     */
+    public abstract boolean hasFault();
+
+    /**
+     * Returns the <code>OMFault</code> object in this <code>SOAPBody</code>
+     * object.
+     *
+     * @return the <code>OMFault</code> object in this <code>SOAPBody</code>
+     *         object
+     */
+    public abstract OMFault getFault();
+
+    /**
+     * @param soapFault
+     * @throws OMException
+     */
+    public abstract void addFault(OMFault soapFault) throws OMException;
+
+    
+}

Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPEnvelope.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPEnvelope.java?view=auto&rev=109968
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPEnvelope.java	Mon Dec  6 02:33:35 2004
@@ -0,0 +1,84 @@
+/*   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *  limitations under the License.
+ * <p/>
+ * User: Eran Chinthaka - Lanka Software Foundation
+ * Date: Oct 28, 2004
+ * Time: 11:52:18 AM
+ * <p/>
+ *
+ */
+
+
+package org.apache.axis.om;
+
+
+
+
+public interface SOAPEnvelope extends OMElement {
+
+    /**
+     * Creates a new <CODE>Name</CODE> object initialized with the
+     * given local name, namespace prefix, and namespace URI.
+     * <p/>
+     * <P>This factory method creates <CODE>Name</CODE> objects
+     * for use in the SOAP/XML envelope.
+     *
+     * @param localName a <CODE>String</CODE> giving
+     *                  the local name
+     * @param prefix    a <CODE>String</CODE> giving
+     *                  the prefix of the namespace
+     * @param uri       a <CODE>String</CODE> giving the
+     *                  URI of the namespace
+     * @return a <CODE>OMNamespace</CODE> object initialized with the given
+     *         local name, namespace prefix, and namespace URI
+     * @throws OMException if there is a SOAP error
+     */
+    public abstract OMNamespace createNamespace(String localName, String prefix, String uri)
+            throws OMException;
+
+
+    /**
+     * Returns the <CODE>SOAPHeader</CODE> object for this <CODE>
+     * SOAPEnvelope</CODE> object.
+     * <p/>
+     * <P> This SOAPHeader will just be a container for all the headers in the
+     * <CODE>OMMessage</CODE>
+     * </P>
+     *
+     *
+     * @return the <CODE>SOAPHeader</CODE> object or <CODE>
+     *         null</CODE> if there is none
+     * @throws OMException if there is a problem
+     *                       obtaining the <CODE>SOAPHeader</CODE> object
+     */
+    public abstract SOAPHeader getHeader() throws OMException;
+
+    /**
+     * Returns the <CODE>SOAPBody</CODE> object associated with
+     * this <CODE>SOAPEnvelope</CODE> object.
+     * <p/>
+     * <P> This SOAPBody will just be a container for all the BodyElements in the
+     * <CODE>OMMessage</CODE>
+     * </P>
+     *
+     * @return the <CODE>SOAPBody</CODE> object for this <CODE>
+     *         SOAPEnvelope</CODE> object or <CODE>null</CODE> if there
+     *         is none
+     * @throws OMException if there is a problem
+     *                       obtaining the <CODE>SOAPBody</CODE> object
+     */
+    public abstract SOAPBody getBody() throws OMException;
+
+
+}

Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPHeader.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPHeader.java?view=auto&rev=109968
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPHeader.java	Mon Dec  6 02:33:35 2004
@@ -0,0 +1,110 @@
+/*   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.axis.om;
+
+import java.util.Iterator;
+
+
+public interface SOAPHeader extends OMElement {
+
+
+
+    /**
+     * Creates a new <CODE>SOAPHeaderBlock</CODE> object
+     * initialized with the specified name and adds it to this
+     * <CODE>SOAPHeader</CODE> object.
+     * @return the new <CODE>SOAPHeaderBlock</CODE> object that
+     *     was inserted into this <CODE>SOAPHeader</CODE>
+     *     object
+     * @throws  OMException if a SOAP error occurs
+     */
+    public abstract SOAPHeaderBlock addHeaderBlock(String localName, OMNamespace ns)
+        throws OMException ;
+
+    /**
+     * Returns a list of all the <CODE>SOAPHeaderBlock</CODE>
+     * objects in this <CODE>SOAPHeader</CODE> object that have the
+     * the specified actor. An actor is a global attribute that
+     * indicates the intermediate parties to whom the message should
+     * be sent. An actor receives the message and then sends it to
+     * the next actor. The default actor is the ultimate intended
+     * recipient for the message, so if no actor attribute is
+     * included in a <CODE>SOAPHeader</CODE> object, the message is
+     * sent to its ultimate destination.
+     * @param   actor  a <CODE>String</CODE> giving the
+     *     URI of the actor for which to search
+     * @return an <CODE>Iterator</CODE> object over all the <CODE>
+     *     SOAPHeaderBlock</CODE> objects that contain the
+     *     specified actor
+     * @see #extractHeaderBlocks(java.lang.String) extractHeaderBlocks(java.lang.String)
+     */
+    public abstract Iterator examineHeaderBlocks(String actor);
+
+    /**
+     * Returns a list of all the <CODE>SOAPHeaderBlock</CODE>
+     *   objects in this <CODE>SOAPHeader</CODE> object that have
+     *   the the specified actor and detaches them from this <CODE>
+     *   SOAPHeader</CODE> object.
+     *
+     *   <P>This method allows an actor to process only the parts of
+     *   the <CODE>SOAPHeader</CODE> object that apply to it and to
+     *   remove them before passing the message on to the next
+     *   actor.
+     * @param   actor  a <CODE>String</CODE> giving the
+     *     URI of the actor for which to search
+     * @return an <CODE>Iterator</CODE> object over all the <CODE>
+     *     SOAPHeaderBlock</CODE> objects that contain the
+     *     specified actor
+     * @see #examineHeaderBlocks(java.lang.String) examineHeaderBlocks(java.lang.String)
+     */
+    public abstract Iterator extractHeaderBlocks(String actor);
+
+    /**
+     * Returns an <code>Iterator</code> over all the
+     * <code>SOAPHeaderBlock</code> objects in this <code>SOAPHeader</code>
+     * object that have the specified actor and that have a MustUnderstand
+     * attribute whose value is equivalent to <code>true</code>.
+     *
+     * @param actor a <code>String</code> giving the URI of the actor for which
+     *              to search
+     * @return an <code>Iterator</code> object over all the
+     *              <code>SOAPHeaderBlock</code> objects that contain the
+     *              specified actor and are marked as MustUnderstand
+     */
+    public abstract Iterator examineMustUnderstandHeaderBlocks(String actor);
+
+    /**
+     * Returns an <code>Iterator</code> over all the
+     * <code>SOAPHeaderBlock</code> objects in this <code>SOAPHeader</code>
+     * object.
+     *
+     * @return an <code>Iterator</code> object over all the
+     *              <code>SOAPHeaderBlock</code> objects contained by this
+     *              <code>SOAPHeader</code>
+     */
+    public abstract Iterator examineAllHeaderBlocks();
+
+    /**
+     * Returns an <code>Iterator</code> over all the
+     * <code>SOAPHeaderBlock</code> objects in this <code>SOAPHeader </code>
+     * object and detaches them from this <code>SOAPHeader</code> object.
+     *
+     * @return an <code>Iterator</code> object over all the
+     *              <code>SOAPHeaderBlock</code> objects contained by this
+     *              <code>SOAPHeader</code>
+     */
+    public abstract Iterator extractAllHeaderBlocks();
+}

Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPHeaderBlock.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPHeaderBlock.java?view=auto&rev=109968
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/SOAPHeaderBlock.java	Mon Dec  6 02:33:35 2004
@@ -0,0 +1,80 @@
+/*   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.axis.om;
+
+
+
+
+/**
+ *     <P>An object representing the contents in the SOAP header part
+ *   of the SOAP envelope. The immediate children of a <CODE>
+ *   SOAPHeader</CODE> object can be represented only as <CODE>
+ *   SOAPHeaderBlock</CODE> objects.</P>
+ *
+ *   <P>B <CODE>SOAPHeaderBlock</CODE> object can have other
+ *   <CODE>OMElement</CODE> objects as its children.</P>
+ */
+public interface SOAPHeaderBlock extends OMElement {
+
+    /**
+     * Sets the actor associated with this <CODE>
+     * SOAPHeaderBlock</CODE> object to the specified actor. The
+     * default value of an actor is: <CODE>
+     * OMConstants.URI_SOAP_ACTOR_NEXT</CODE>
+     * @param  actorURI  a <CODE>String</CODE> giving
+     *     the URI of the actor to set
+     * @see #getActor() getActor()
+     * @throws java.lang.IllegalArgumentException if
+     *     there is a problem in setting the actor.
+     */
+    public abstract void setActor(String actorURI);
+
+    /**
+     * Returns the uri of the actor associated with this <CODE>
+     * SOAPHeaderBlock</CODE> object.
+     * @return  a <CODE>String</CODE> giving the URI of the
+     *     actor
+     * @see #setActor(java.lang.String) setActor(java.lang.String)
+     */
+    public abstract String getActor();
+
+    /**
+     * Sets the mustUnderstand attribute for this <CODE>
+     *   SOAPHeaderBlock</CODE> object to be on or off.
+     *
+     *   <P>If the mustUnderstand attribute is on, the actor who
+     *   receives the <CODE>SOAPHeaderBlock</CODE> must process it
+     *   correctly. This ensures, for example, that if the <CODE>
+     *   SOAPHeaderBlock</CODE> object modifies the message, that
+     *   the message is being modified correctly.</P>
+     * @param  mustUnderstand  <CODE>true</CODE> to
+     *     set the mustUnderstand attribute on; <CODE>false</CODE>
+     *     to turn if off
+     * @throws java.lang.IllegalArgumentException if
+     *     there is a problem in setting the actor.
+     * @see #getMustUnderstand() getMustUnderstand()
+     */
+    public abstract void setMustUnderstand(boolean mustUnderstand);
+
+    /**
+     * Returns whether the mustUnderstand attribute for this
+     * <CODE>SOAPHeaderBlock</CODE> object is turned on.
+     * @return  <CODE>true</CODE> if the mustUnderstand attribute of
+     *     this <CODE>SOAPHeaderBlock</CODE> object is turned on;
+     *     <CODE>false</CODE> otherwise
+     */
+    public abstract boolean getMustUnderstand();
+}

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Echo1.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Echo1.java?view=diff&rev=109968&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Echo1.java&r1=109967&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Echo1.java&r2=109968
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Echo1.java	(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Echo1.java	Mon Dec  6 02:33:35 2004
@@ -1,4 +1,4 @@
-import org.apache.axis.om.OMEnvelope;
+import org.apache.axis.om.SOAPEnvelope;
 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -20,7 +20,7 @@
  * @author Srinath Perera(hemapani@opensource.lk)
  */
 public class Echo1 {
-    public OMEnvelope echo(OMEnvelope in){
+    public SOAPEnvelope echo(SOAPEnvelope in){
         return in;
-    }    
+    }
 }

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Echo2.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Echo2.java?view=diff&rev=109968&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Echo2.java&r1=109967&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Echo2.java&r2=109968
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Echo2.java	(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Echo2.java	Mon Dec  6 02:33:35 2004
@@ -1,4 +1,4 @@
-import org.apache.axis.om.OMEnvelope;
+import org.apache.axis.om.SOAPEnvelope;
 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -20,7 +20,7 @@
  * @author Srinath Perera(hemapani@opensource.lk)
  */
 public class Echo2 {
-    public OMEnvelope echo(OMEnvelope in){
+    public SOAPEnvelope echo(SOAPEnvelope in){
         return in;
     }    
 }

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/Echo.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/Echo.java?view=diff&rev=109968&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/Echo.java&r1=109967&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/Echo.java&r2=109968
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/Echo.java	(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/Echo.java	Mon Dec  6 02:33:35 2004
@@ -1,4 +1,4 @@
-import org.apache.axis.om.OMEnvelope;
+import org.apache.axis.om.SOAPEnvelope;
 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -20,7 +20,7 @@
  * @author Srinath Perera(hemapani@opensource.lk)
  */
 public class Echo {
-    public OMEnvelope echo(OMEnvelope in){
+    public SOAPEnvelope echo(SOAPEnvelope in){
         return in;
     }    
 }

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/IteratorTester.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/IteratorTester.java?view=diff&rev=109968&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/IteratorTester.java&r1=109967&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/IteratorTester.java&r2=109968
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/IteratorTester.java	(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/IteratorTester.java	Mon Dec  6 02:33:35 2004
@@ -7,7 +7,7 @@
 
 import junit.framework.TestCase;
 
-import org.apache.axis.impl.llom.builder.OMStAXBuilder;
+import org.apache.axis.impl.llom.builder.StAXSOAPModelBuilder;
 import org.apache.axis.AbstractTestCase;
 
 /**
@@ -39,7 +39,7 @@
     }
 
     protected void setUp() throws Exception {
-		envelope = new OMStAXBuilder(XMLInputFactory.newInstance().
+		envelope = new StAXSOAPModelBuilder(XMLInputFactory.newInstance().
                 createXMLStreamReader(
                         new FileReader(getTestResourceFile("soap/sample1.xml")))).getOMEnvelope();
     }

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMNavigatorTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMNavigatorTest.java?view=diff&rev=109968&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMNavigatorTest.java&r1=109967&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMNavigatorTest.java&r2=109968
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMNavigatorTest.java	(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMNavigatorTest.java	Mon Dec  6 02:33:35 2004
@@ -11,7 +11,7 @@
 import junit.framework.TestCase;
 
 import org.apache.axis.impl.llom.OMNavigator;
-import org.apache.axis.impl.llom.builder.OMStAXBuilder;
+import org.apache.axis.impl.llom.builder.StAXSOAPModelBuilder;
 import org.apache.axis.impl.llom.factory.OMLinkedListImplFactory;
 import org.apache.axis.impl.llom.serialize.SimpleOMSerializer;
 import org.apache.axis.AbstractTestCase;
@@ -40,7 +40,7 @@
 
     private SOAPEnvelope envelope = null;
     private SimpleOMSerializer serilizer;
-    private OMStAXBuilder builder;
+    private StAXSOAPModelBuilder builder;
     private File tempFile;
 
     public OMNavigatorTest(String testName) {
@@ -51,7 +51,7 @@
         XMLStreamReader xmlStreamReader = XMLInputFactory.newInstance().
                 createXMLStreamReader(new FileReader(getTestResourceFile("soap/soapmessage1.xml")));
         OMFactory factory = OMFactory.newInstance();
-        builder = new OMStAXBuilder(factory, xmlStreamReader);
+        builder = new StAXSOAPModelBuilder(factory, xmlStreamReader);
         envelope = builder.getOMEnvelope();
         serilizer = new SimpleOMSerializer();
 

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTest.java?view=diff&rev=109968&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTest.java&r1=109967&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTest.java&r2=109968
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTest.java	(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTest.java	Mon Dec  6 02:33:35 2004
@@ -23,7 +23,7 @@
 
 import org.apache.axis.AbstractTestCase;
 import org.apache.axis.impl.llom.wrapper.OMXPPWrapper;
-import org.apache.axis.impl.llom.builder.OMStAXBuilder;
+import org.apache.axis.impl.llom.builder.StAXSOAPModelBuilder;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserFactory;
 
@@ -49,7 +49,7 @@
         File file = getTestResourceFile("soap/sample1.xml");
         XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(new FileReader(file));
         fac = OMFactory.newInstance();
-        OMXMLParserWrapper builder = new OMStAXBuilder(fac,parser);
+        OMXMLParserWrapper builder = new StAXSOAPModelBuilder(fac,parser);
         envelope = builder.getOMEnvelope();
     }
 

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTestUtils.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTestUtils.java?view=diff&rev=109968&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTestUtils.java&r1=109967&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTestUtils.java&r2=109968
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTestUtils.java	(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTestUtils.java	Mon Dec  6 02:33:35 2004
@@ -23,7 +23,7 @@
 import junit.framework.TestCase;
 
 import org.apache.axis.impl.llom.wrapper.OMXPPWrapper;
-import org.apache.axis.impl.llom.builder.OMStAXBuilder;
+import org.apache.axis.impl.llom.builder.StAXSOAPModelBuilder;
 import org.apache.axis.impl.llom.factory.OMLinkedListImplFactory;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -42,7 +42,7 @@
     public static OMXMLParserWrapper getOMBuilder(File file) throws Exception {
 
         XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(new FileReader(file));
-        OMStAXBuilder builder =   new OMStAXBuilder(OMFactory.newInstance(),parser);
+        StAXSOAPModelBuilder builder =   new StAXSOAPModelBuilder(OMFactory.newInstance(),parser);
 
         return builder;
     }

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java?view=diff&rev=109968&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java&r1=109967&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java&r2=109968
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java	(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java	Mon Dec  6 02:33:35 2004
@@ -4,7 +4,7 @@
 import org.apache.axis.om.OMFactory;
 import org.apache.axis.impl.llom.factory.OMLinkedListImplFactory;
 import org.apache.axis.impl.llom.serialize.SimpleOMSerializer;
-import org.apache.axis.impl.llom.builder.OMStAXBuilder;
+import org.apache.axis.impl.llom.builder.StAXSOAPModelBuilder;
 import org.apache.axis.impl.llom.wrapper.OMStAXWrapper;
 import org.apache.axis.om.SOAPEnvelope;
 import org.apache.axis.AbstractTestCase;
@@ -41,7 +41,7 @@
 
     private SOAPEnvelope envelope = null;
     private SimpleOMSerializer serilizer;
-    private OMStAXBuilder omStAXBuilder;
+    private StAXSOAPModelBuilder staxSOAPModelBuilder;
     private File tempFile;
 
     public OMStaxStreamingWrapperTest(String testName) {
@@ -52,8 +52,8 @@
         XMLStreamReader xmlStreamReader = XMLInputFactory.newInstance().
                 createXMLStreamReader(new FileReader(getTestResourceFile("soap/soapmessage1.xml")));
         OMFactory factory = OMFactory.newInstance();
-        omStAXBuilder = new OMStAXBuilder(factory, xmlStreamReader);
-        envelope = omStAXBuilder.getOMEnvelope();
+        staxSOAPModelBuilder = new StAXSOAPModelBuilder(factory, xmlStreamReader);
+        envelope = staxSOAPModelBuilder.getOMEnvelope();
         serilizer = new SimpleOMSerializer();
 
         tempFile = File.createTempFile("temp","xml");
@@ -66,7 +66,7 @@
         serilizer.serialize(envelope, new FileOutputStream(tempFile));
 
         //now the OM is fully created. Create the wrapper and see
-        OMStAXWrapper wrapper = new OMStAXWrapper(omStAXBuilder, envelope);
+        OMStAXWrapper wrapper = new OMStAXWrapper(staxSOAPModelBuilder, envelope);
 
         while (wrapper.hasNext()) {
             int event = wrapper.next();
@@ -79,7 +79,7 @@
         assertNotNull(envelope);
 
         //now the OM is not fully created. Create the wrapper and see
-        OMStAXWrapper wrapper = new OMStAXWrapper(omStAXBuilder, envelope);
+        OMStAXWrapper wrapper = new OMStAXWrapper(staxSOAPModelBuilder, envelope);
         while (wrapper.hasNext()) {
             int event = wrapper.next();
             assertTrue(event>0);
@@ -89,7 +89,7 @@
     public void testWrapperHalfOMWithCacheOff() {
         assertNotNull(envelope);
         //now the OM is not fully created. Create the wrapper and see
-        OMStAXWrapper wrapper = new OMStAXWrapper(omStAXBuilder, envelope);
+        OMStAXWrapper wrapper = new OMStAXWrapper(staxSOAPModelBuilder, envelope);
         //set the switching allowed flag
         wrapper.setAllowSwitching(true);
         while (wrapper.hasNext()) {

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java?view=diff&rev=109968&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java&r1=109967&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java&r2=109968
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java	(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java	Mon Dec  6 02:33:35 2004
@@ -4,7 +4,7 @@
 import org.apache.axis.om.OMFactory;
 import org.apache.axis.impl.llom.factory.OMLinkedListImplFactory;
 import org.apache.axis.impl.llom.serialize.SimpleOMSerializer;
-import org.apache.axis.impl.llom.builder.OMStAXBuilder;
+import org.apache.axis.impl.llom.builder.StAXSOAPModelBuilder;
 import org.apache.axis.om.SOAPEnvelope;
 import org.apache.axis.AbstractTestCase;
 
@@ -37,7 +37,7 @@
 public class OmStAXBuilderTest extends AbstractTestCase{
 
     private OMFactory factory =null;
-    private OMStAXBuilder builder;
+    private StAXSOAPModelBuilder builder;
     private SimpleOMSerializer serilizer;
     private File tempFile;
 
@@ -49,7 +49,7 @@
         factory = OMFactory.newInstance();
         XMLStreamReader reader = XMLInputFactory.newInstance().
                 createXMLStreamReader(new FileReader(getTestResourceFile("soap/soapmessage1.xml")));
-        builder = new OMStAXBuilder(factory,reader);
+        builder = new StAXSOAPModelBuilder(factory,reader);
         serilizer = new SimpleOMSerializer();
 
         tempFile = File.createTempFile("temp", "xml");

Mime
View raw message