axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r289289 [122/134] - in /webservices/axis2/trunk/java: ./ etc/ modules/addressing/ modules/addressing/src/META-INF/ modules/addressing/src/org/apache/axis2/handlers/addressing/ modules/addressing/test-resources/ modules/addressing/test/org/a...
Date Thu, 15 Sep 2005 19:07:03 GMT
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildElementIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildElementIterator.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildElementIterator.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildElementIterator.java Thu Sep 15 11:52:11 2005
@@ -1,120 +1,120 @@
-package org.apache.axis2.om.impl.llom.traverse;
-
-import org.apache.axis2.om.OMNode;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMElement;
-
-import java.util.Iterator;
-
-/*
- * Copyright 2004,2005 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.
- */
-
-public class OMChildElementIterator implements Iterator {
-
-    /**
-     * Field currentChild
-     */
-    protected OMNode currentChild;
-
-    /**
-     * Field lastChild
-     */
-    protected OMNode lastChild;
-
-    /**
-     * Field nextCalled
-     */
-    protected boolean nextCalled = false;
-
-    /**
-     * Field removeCalled
-     */
-    protected boolean removeCalled = false;
-
-    /**
-     * Constructor OMChildrenIterator
-     *
-     * @param currentChild
-     */
-    public OMChildElementIterator(OMElement currentChild) {
-        this.currentChild = currentChild;
-    }
-
-    /**
-     * Removes from the underlying collection the last element returned by the
-     * iterator (optional operation).  This method can be called only once per
-     * call to <tt>next</tt>.  The behavior of an iterator is unspecified if
-     * the underlying collection is modified while the iteration is in
-     * progress in any way other than by calling this method.
-     *
-     * @throws UnsupportedOperationException if the <tt>remove</tt>
-     *                                       operation is not supported by this Iterator.
-     * @throws IllegalStateException         if the <tt>next</tt> method has not
-     *                                       yet been called, or the <tt>remove</tt> method has already
-     *                                       been called after the last call to the <tt>next</tt>
-     *                                       method.
-     */
-    public void remove() {
-        if (!nextCalled) {
-            throw new IllegalStateException(
-                    "next method has not yet being called");
-        }
-        if (removeCalled) {
-            throw new IllegalStateException("remove has already being called");
-        }
-        removeCalled = true;
-
-        // since this acts on the last child there is no need to mess with the current child
-        if (lastChild == null) {
-            throw new OMException("cannot remove a child at this stage!");
-        }
-        lastChild.detach();
-    }
-
-    /**
-     * Returns <tt>true</tt> if the iteration has more elements. (In other
-     * words, returns <tt>true</tt> if <tt>next</tt> would return an element
-     * rather than throwing an exception.)
-     *
-     * @return <tt>true</tt> if the iterator has more elements.
-     */
-    public boolean hasNext() {
-        return (currentChild != null);
-    }
-
-    /**
-     * Returns the next element in the iteration.
-     *
-     * @return the next element in the iteration.
-     * @throws java.util.NoSuchElementException
-     *          iteration has no more elements.
-     */
-    public Object next() {
-        nextCalled = true;
-        removeCalled = false;
-
-        if (hasNext()) {
-            lastChild = currentChild;
-            do{
-                currentChild = currentChild.getNextSibling();
-            }while(currentChild!=null && currentChild.getType()!=OMNode.ELEMENT_NODE);
-
-
-            return lastChild;
-        }
-        return null;
-    }
-}
+package org.apache.axis2.om.impl.llom.traverse;
+
+import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.OMException;
+import org.apache.axis2.om.OMElement;
+
+import java.util.Iterator;
+
+/*
+ * Copyright 2004,2005 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.
+ */
+
+public class OMChildElementIterator implements Iterator {
+
+    /**
+     * Field currentChild
+     */
+    protected OMNode currentChild;
+
+    /**
+     * Field lastChild
+     */
+    protected OMNode lastChild;
+
+    /**
+     * Field nextCalled
+     */
+    protected boolean nextCalled = false;
+
+    /**
+     * Field removeCalled
+     */
+    protected boolean removeCalled = false;
+
+    /**
+     * Constructor OMChildrenIterator
+     *
+     * @param currentChild
+     */
+    public OMChildElementIterator(OMElement currentChild) {
+        this.currentChild = currentChild;
+    }
+
+    /**
+     * Removes from the underlying collection the last element returned by the
+     * iterator (optional operation).  This method can be called only once per
+     * call to <tt>next</tt>.  The behavior of an iterator is unspecified if
+     * the underlying collection is modified while the iteration is in
+     * progress in any way other than by calling this method.
+     *
+     * @throws UnsupportedOperationException if the <tt>remove</tt>
+     *                                       operation is not supported by this Iterator.
+     * @throws IllegalStateException         if the <tt>next</tt> method has not
+     *                                       yet been called, or the <tt>remove</tt> method has already
+     *                                       been called after the last call to the <tt>next</tt>
+     *                                       method.
+     */
+    public void remove() {
+        if (!nextCalled) {
+            throw new IllegalStateException(
+                    "next method has not yet being called");
+        }
+        if (removeCalled) {
+            throw new IllegalStateException("remove has already being called");
+        }
+        removeCalled = true;
+
+        // since this acts on the last child there is no need to mess with the current child
+        if (lastChild == null) {
+            throw new OMException("cannot remove a child at this stage!");
+        }
+        lastChild.detach();
+    }
+
+    /**
+     * Returns <tt>true</tt> if the iteration has more elements. (In other
+     * words, returns <tt>true</tt> if <tt>next</tt> would return an element
+     * rather than throwing an exception.)
+     *
+     * @return <tt>true</tt> if the iterator has more elements.
+     */
+    public boolean hasNext() {
+        return (currentChild != null);
+    }
+
+    /**
+     * Returns the next element in the iteration.
+     *
+     * @return the next element in the iteration.
+     * @throws java.util.NoSuchElementException
+     *          iteration has no more elements.
+     */
+    public Object next() {
+        nextCalled = true;
+        removeCalled = false;
+
+        if (hasNext()) {
+            lastChild = currentChild;
+            do{
+                currentChild = currentChild.getNextSibling();
+            }while(currentChild!=null && currentChild.getType()!=OMNode.ELEMENT_NODE);
+
+
+            return lastChild;
+        }
+        return null;
+    }
+}

Propchange: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildElementIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenIterator.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenIterator.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenIterator.java Thu Sep 15 11:52:11 2005
@@ -1,115 +1,115 @@
-/*
- * Copyright 2004,2005 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.axis2.om.impl.llom.traverse;
-
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNode;
-
-import java.util.Iterator;
-
-/**
- * Class OMChildrenIterator
- */
-public class OMChildrenIterator implements Iterator {
-    /**
-     * Field currentChild
-     */
-    protected OMNode currentChild;
-
-    /**
-     * Field lastChild
-     */
-    protected OMNode lastChild;
-
-    /**
-     * Field nextCalled
-     */
-    protected boolean nextCalled = false;
-
-    /**
-     * Field removeCalled
-     */
-    protected boolean removeCalled = false;
-
-    /**
-     * Constructor OMChildrenIterator
-     *
-     * @param currentChild
-     */
-    public OMChildrenIterator(OMNode currentChild) {
-        this.currentChild = currentChild;
-    }
-
-    /**
-     * Removes from the underlying collection the last element returned by the
-     * iterator (optional operation).  This method can be called only once per
-     * call to <tt>next</tt>.  The behavior of an iterator is unspecified if
-     * the underlying collection is modified while the iteration is in
-     * progress in any way other than by calling this method.
-     *
-     * @throws UnsupportedOperationException if the <tt>remove</tt>
-     *                                       operation is not supported by this Iterator.
-     * @throws IllegalStateException         if the <tt>next</tt> method has not
-     *                                       yet been called, or the <tt>remove</tt> method has already
-     *                                       been called after the last call to the <tt>next</tt>
-     *                                       method.
-     */
-    public void remove() {
-        if (!nextCalled) {
-            throw new IllegalStateException(
-                    "next method has not yet being called");
-        }
-        if (removeCalled) {
-            throw new IllegalStateException("remove has already being called");
-        }
-        removeCalled = true;
-
-        // since this acts on the last child there is no need to mess with the current child
-        if (lastChild == null) {
-            throw new OMException("cannot remove a child at this stage!");
-        }
-        lastChild.detach();
-    }
-
-    /**
-     * Returns <tt>true</tt> if the iteration has more elements. (In other
-     * words, returns <tt>true</tt> if <tt>next</tt> would return an element
-     * rather than throwing an exception.)
-     *
-     * @return <tt>true</tt> if the iterator has more elements.
-     */
-    public boolean hasNext() {
-        return (currentChild != null);
-    }
-
-    /**
-     * Returns the next element in the iteration.
-     *
-     * @return the next element in the iteration.
-     * @throws java.util.NoSuchElementException
-     *          iteration has no more elements.
-     */
-    public Object next() {
-        nextCalled = true;
-        removeCalled = false;
-        if (hasNext()) {
-            lastChild = currentChild;
-            currentChild = currentChild.getNextSibling();
-            return lastChild;
-        }
-        return null;
-    }
-}
+/*
+ * Copyright 2004,2005 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.axis2.om.impl.llom.traverse;
+
+import org.apache.axis2.om.OMException;
+import org.apache.axis2.om.OMNode;
+
+import java.util.Iterator;
+
+/**
+ * Class OMChildrenIterator
+ */
+public class OMChildrenIterator implements Iterator {
+    /**
+     * Field currentChild
+     */
+    protected OMNode currentChild;
+
+    /**
+     * Field lastChild
+     */
+    protected OMNode lastChild;
+
+    /**
+     * Field nextCalled
+     */
+    protected boolean nextCalled = false;
+
+    /**
+     * Field removeCalled
+     */
+    protected boolean removeCalled = false;
+
+    /**
+     * Constructor OMChildrenIterator
+     *
+     * @param currentChild
+     */
+    public OMChildrenIterator(OMNode currentChild) {
+        this.currentChild = currentChild;
+    }
+
+    /**
+     * Removes from the underlying collection the last element returned by the
+     * iterator (optional operation).  This method can be called only once per
+     * call to <tt>next</tt>.  The behavior of an iterator is unspecified if
+     * the underlying collection is modified while the iteration is in
+     * progress in any way other than by calling this method.
+     *
+     * @throws UnsupportedOperationException if the <tt>remove</tt>
+     *                                       operation is not supported by this Iterator.
+     * @throws IllegalStateException         if the <tt>next</tt> method has not
+     *                                       yet been called, or the <tt>remove</tt> method has already
+     *                                       been called after the last call to the <tt>next</tt>
+     *                                       method.
+     */
+    public void remove() {
+        if (!nextCalled) {
+            throw new IllegalStateException(
+                    "next method has not yet being called");
+        }
+        if (removeCalled) {
+            throw new IllegalStateException("remove has already being called");
+        }
+        removeCalled = true;
+
+        // since this acts on the last child there is no need to mess with the current child
+        if (lastChild == null) {
+            throw new OMException("cannot remove a child at this stage!");
+        }
+        lastChild.detach();
+    }
+
+    /**
+     * Returns <tt>true</tt> if the iteration has more elements. (In other
+     * words, returns <tt>true</tt> if <tt>next</tt> would return an element
+     * rather than throwing an exception.)
+     *
+     * @return <tt>true</tt> if the iterator has more elements.
+     */
+    public boolean hasNext() {
+        return (currentChild != null);
+    }
+
+    /**
+     * Returns the next element in the iteration.
+     *
+     * @return the next element in the iteration.
+     * @throws java.util.NoSuchElementException
+     *          iteration has no more elements.
+     */
+    public Object next() {
+        nextCalled = true;
+        removeCalled = false;
+        if (hasNext()) {
+            lastChild = currentChild;
+            currentChild = currentChild.getNextSibling();
+            return lastChild;
+        }
+        return null;
+    }
+}

Propchange: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java Thu Sep 15 11:52:11 2005
@@ -1,139 +1,139 @@
-/*
- * Copyright 2004,2005 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.axis2.om.impl.llom.traverse;
-
-import org.apache.axis2.om.OMNode;
-import org.apache.axis2.om.impl.llom.OMElementImpl;
-
-import javax.xml.namespace.QName;
-
-/**
- * Class OMChildrenQNameIterator
- */
-public class OMChildrenQNameIterator extends OMChildrenIterator {
-    /**
-     * Field givenQName
-     */
-    private QName givenQName;
-
-    /**
-     * Field needToMoveForward
-     */
-    private boolean needToMoveForward = true;
-
-    /**
-     * Field isMatchingNodeFound
-     */
-    private boolean isMatchingNodeFound = false;
-
-    /**
-     * Constructor OMChildrenQNameIterator
-     *
-     * @param currentChild
-     * @param givenQName
-     */
-    public OMChildrenQNameIterator(OMNode currentChild, QName givenQName) {
-        super(currentChild);
-        this.givenQName = givenQName;
-    }
-
-    /**
-     * Returns <tt>true</tt> if the iteration has more elements. (In other
-     * words, returns <tt>true</tt> if <tt>next</tt> would return an element
-     * rather than throwing an exception.)
-     *
-     * @return <tt>true</tt> if the iterator has more elements.
-     */
-    public boolean hasNext() {
-        while (needToMoveForward) {
-            if (currentChild != null) {
-
-                // check the current node for the criteria
-                if ((currentChild instanceof OMElementImpl)
-                        && (isQNamesMatch(
-                                ((OMElementImpl) currentChild).getQName(),
-                                this.givenQName))) {
-                    isMatchingNodeFound = true;
-                    needToMoveForward = false;
-                } else {
-
-                    // get the next named node
-                    currentChild = currentChild.getNextSibling();
-                    isMatchingNodeFound = needToMoveForward = !(currentChild
-                            == null);
-                }
-            } else {
-                needToMoveForward = false;
-            }
-        }
-        return isMatchingNodeFound;
-    }
-
-    /**
-     * Returns the next element in the iteration.
-     *
-     * @return the next element in the iteration.
-     * @throws java.util.NoSuchElementException
-     *          iteration has no more elements.
-     */
-    public Object next() {
-
-        // reset the flags
-        needToMoveForward = true;
-        isMatchingNodeFound = false;
-        nextCalled = true;
-        removeCalled = false;
-        lastChild = currentChild;
-        currentChild = currentChild.getNextSibling();
-        return lastChild;
-    }
-
-    /**
-     * Here I can not use the overriden equals method of QName, as one might want to get
-     * some element just by giving the localname, even though a matching element has a namespace uri as well.
-     * This will not be supported in the equals method of the QName
-     *
-     * @param elementQName
-     * @param qNameToBeMatched
-     * @return
-     */
-    private boolean isQNamesMatch(QName elementQName, QName qNameToBeMatched) {
-
-        // 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. But can one give a QName without a localName ??
-        boolean localNameMatch =
-                (qNameToBeMatched.getLocalPart() == null)
-                || (qNameToBeMatched.getLocalPart() == "")
-                ||
-                ((elementQName != null)
-                &&
-                elementQName.getLocalPart().equalsIgnoreCase(
-                        qNameToBeMatched.getLocalPart()));
-        boolean namespaceURIMatch =
-                (qNameToBeMatched.getNamespaceURI() == null)
-                || (qNameToBeMatched.getNamespaceURI() == "")
-                ||
-                ((elementQName != null)
-                &&
-                elementQName.getNamespaceURI().equalsIgnoreCase(
-                        qNameToBeMatched.getNamespaceURI()));
-        return localNameMatch && namespaceURIMatch;
-    }
-}
+/*
+ * Copyright 2004,2005 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.axis2.om.impl.llom.traverse;
+
+import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.impl.llom.OMElementImpl;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Class OMChildrenQNameIterator
+ */
+public class OMChildrenQNameIterator extends OMChildrenIterator {
+    /**
+     * Field givenQName
+     */
+    private QName givenQName;
+
+    /**
+     * Field needToMoveForward
+     */
+    private boolean needToMoveForward = true;
+
+    /**
+     * Field isMatchingNodeFound
+     */
+    private boolean isMatchingNodeFound = false;
+
+    /**
+     * Constructor OMChildrenQNameIterator
+     *
+     * @param currentChild
+     * @param givenQName
+     */
+    public OMChildrenQNameIterator(OMNode currentChild, QName givenQName) {
+        super(currentChild);
+        this.givenQName = givenQName;
+    }
+
+    /**
+     * Returns <tt>true</tt> if the iteration has more elements. (In other
+     * words, returns <tt>true</tt> if <tt>next</tt> would return an element
+     * rather than throwing an exception.)
+     *
+     * @return <tt>true</tt> if the iterator has more elements.
+     */
+    public boolean hasNext() {
+        while (needToMoveForward) {
+            if (currentChild != null) {
+
+                // check the current node for the criteria
+                if ((currentChild instanceof OMElementImpl)
+                        && (isQNamesMatch(
+                                ((OMElementImpl) currentChild).getQName(),
+                                this.givenQName))) {
+                    isMatchingNodeFound = true;
+                    needToMoveForward = false;
+                } else {
+
+                    // get the next named node
+                    currentChild = currentChild.getNextSibling();
+                    isMatchingNodeFound = needToMoveForward = !(currentChild
+                            == null);
+                }
+            } else {
+                needToMoveForward = false;
+            }
+        }
+        return isMatchingNodeFound;
+    }
+
+    /**
+     * Returns the next element in the iteration.
+     *
+     * @return the next element in the iteration.
+     * @throws java.util.NoSuchElementException
+     *          iteration has no more elements.
+     */
+    public Object next() {
+
+        // reset the flags
+        needToMoveForward = true;
+        isMatchingNodeFound = false;
+        nextCalled = true;
+        removeCalled = false;
+        lastChild = currentChild;
+        currentChild = currentChild.getNextSibling();
+        return lastChild;
+    }
+
+    /**
+     * Here I can not use the overriden equals method of QName, as one might want to get
+     * some element just by giving the localname, even though a matching element has a namespace uri as well.
+     * This will not be supported in the equals method of the QName
+     *
+     * @param elementQName
+     * @param qNameToBeMatched
+     * @return
+     */
+    private boolean isQNamesMatch(QName elementQName, QName qNameToBeMatched) {
+
+        // 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. But can one give a QName without a localName ??
+        boolean localNameMatch =
+                (qNameToBeMatched.getLocalPart() == null)
+                || (qNameToBeMatched.getLocalPart() == "")
+                ||
+                ((elementQName != null)
+                &&
+                elementQName.getLocalPart().equalsIgnoreCase(
+                        qNameToBeMatched.getLocalPart()));
+        boolean namespaceURIMatch =
+                (qNameToBeMatched.getNamespaceURI() == null)
+                || (qNameToBeMatched.getNamespaceURI() == "")
+                ||
+                ((elementQName != null)
+                &&
+                elementQName.getNamespaceURI().equalsIgnoreCase(
+                        qNameToBeMatched.getNamespaceURI()));
+        return localNameMatch && namespaceURIMatch;
+    }
+}

Propchange: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java Thu Sep 15 11:52:11 2005
@@ -1,117 +1,117 @@
-/*
- * Copyright 2004,2005 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.axis2.om.impl.llom.traverse;
-
-import org.apache.axis2.om.OMAttribute;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNode;
-
-import javax.xml.namespace.QName;
-
-/**
- * Class OMChildrenWithSpecificAttributeIterator
- */
-public class OMChildrenWithSpecificAttributeIterator
-        extends OMChildrenIterator {
-    /**
-     * Field attributeName
-     */
-    private QName attributeName;
-
-    /**
-     * Field attributeValue
-     */
-    private String attributeValue;
-
-    /**
-     * Field detach
-     */
-    private boolean detach;
-
-    /**
-     * Constructor OMChildrenWithSpecificAttributeIterator
-     *
-     * @param currentChild
-     * @param attributeName
-     * @param attributeValue
-     * @param detach
-     */
-    public OMChildrenWithSpecificAttributeIterator(OMNode currentChild,
-                                                   QName attributeName,
-                                                   String attributeValue,
-                                                   boolean detach) {
-        super(currentChild);
-        this.attributeName = attributeName;
-        this.attributeValue = attributeValue;
-        this.detach = detach;
-    }
-
-    /**
-     * Method hasNext
-     *
-     * @return
-     */
-    public boolean hasNext() {
-
-        // First check whether we have a child, using the super class
-        if (currentChild == null) {
-            return false;
-        }
-        boolean isMatchingNodeFound = false;
-        boolean needToMoveForward = true;
-
-        // now we have a child to check. If its an OMElement and matches the criteria, then we are done
-        while (needToMoveForward) {
-
-            // check the current node for the criteria
-            if (currentChild instanceof OMElement) {
-                OMAttribute attr =
-                        ((OMElement) currentChild).getFirstAttribute(
-                                attributeName);
-                if ((attr != null)
-                        && attr.getValue().equalsIgnoreCase(attributeValue)) {
-                    isMatchingNodeFound = true;
-                    needToMoveForward = false;
-                } else {
-                    currentChild = currentChild.getNextSibling();
-                    needToMoveForward = !(currentChild == null);
-                }
-            } else {
-
-                // get the next named node
-                currentChild = currentChild.getNextSibling();
-                needToMoveForward = !(currentChild == null);
-            }
-        }
-        return isMatchingNodeFound;
-    }
-
-    /**
-     * Method next
-     *
-     * @return
-     */
-    public Object next() {
-        nextCalled = true;
-        removeCalled = false;
-        lastChild = currentChild;
-        currentChild = currentChild.getNextSibling();
-        if ((lastChild != null) && detach && lastChild.getParent() != null) {
-            lastChild.detach();
-        }
-        return lastChild;
-    }
-}
+/*
+ * Copyright 2004,2005 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.axis2.om.impl.llom.traverse;
+
+import org.apache.axis2.om.OMAttribute;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMNode;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Class OMChildrenWithSpecificAttributeIterator
+ */
+public class OMChildrenWithSpecificAttributeIterator
+        extends OMChildrenIterator {
+    /**
+     * Field attributeName
+     */
+    private QName attributeName;
+
+    /**
+     * Field attributeValue
+     */
+    private String attributeValue;
+
+    /**
+     * Field detach
+     */
+    private boolean detach;
+
+    /**
+     * Constructor OMChildrenWithSpecificAttributeIterator
+     *
+     * @param currentChild
+     * @param attributeName
+     * @param attributeValue
+     * @param detach
+     */
+    public OMChildrenWithSpecificAttributeIterator(OMNode currentChild,
+                                                   QName attributeName,
+                                                   String attributeValue,
+                                                   boolean detach) {
+        super(currentChild);
+        this.attributeName = attributeName;
+        this.attributeValue = attributeValue;
+        this.detach = detach;
+    }
+
+    /**
+     * Method hasNext
+     *
+     * @return
+     */
+    public boolean hasNext() {
+
+        // First check whether we have a child, using the super class
+        if (currentChild == null) {
+            return false;
+        }
+        boolean isMatchingNodeFound = false;
+        boolean needToMoveForward = true;
+
+        // now we have a child to check. If its an OMElement and matches the criteria, then we are done
+        while (needToMoveForward) {
+
+            // check the current node for the criteria
+            if (currentChild instanceof OMElement) {
+                OMAttribute attr =
+                        ((OMElement) currentChild).getFirstAttribute(
+                                attributeName);
+                if ((attr != null)
+                        && attr.getValue().equalsIgnoreCase(attributeValue)) {
+                    isMatchingNodeFound = true;
+                    needToMoveForward = false;
+                } else {
+                    currentChild = currentChild.getNextSibling();
+                    needToMoveForward = !(currentChild == null);
+                }
+            } else {
+
+                // get the next named node
+                currentChild = currentChild.getNextSibling();
+                needToMoveForward = !(currentChild == null);
+            }
+        }
+        return isMatchingNodeFound;
+    }
+
+    /**
+     * Method next
+     *
+     * @return
+     */
+    public Object next() {
+        nextCalled = true;
+        removeCalled = false;
+        lastChild = currentChild;
+        currentChild = currentChild.getNextSibling();
+        if ((lastChild != null) && detach && lastChild.getParent() != null) {
+            lastChild.detach();
+        }
+        return lastChild;
+    }
+}

Propchange: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/EmptyIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/EmptyIterator.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/EmptyIterator.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/EmptyIterator.java Thu Sep 15 11:52:11 2005
@@ -1,37 +1,37 @@
-package org.apache.axis2.om.impl.llom.util;
-
-import java.util.Iterator;
-
-/*
-* Copyright 2004,2005 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.
-*
-* An empty Iterator implementation
-*/
-
-public class EmptyIterator implements Iterator {
-    public void remove() {
-        throw new UnsupportedOperationException();
-
-    }
-
-    public boolean hasNext() {
-        return false;
-    }
-
-    public Object next() {
-        throw new UnsupportedOperationException();
-    }
-}
-
+package org.apache.axis2.om.impl.llom.util;
+
+import java.util.Iterator;
+
+/*
+* Copyright 2004,2005 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.
+*
+* An empty Iterator implementation
+*/
+
+public class EmptyIterator implements Iterator {
+    public void remove() {
+        throw new UnsupportedOperationException();
+
+    }
+
+    public boolean hasNext() {
+        return false;
+    }
+
+    public Object next() {
+        throw new UnsupportedOperationException();
+    }
+}
+

Propchange: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/EmptyIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/XMLComparator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/XMLComparator.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/XMLComparator.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/XMLComparator.java Thu Sep 15 11:52:11 2005
@@ -1,225 +1,225 @@
-package org.apache.axis2.om.impl.llom.util;
-
-import org.apache.axis2.om.OMAttribute;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.om.OMNode;
-import org.apache.axis2.om.impl.llom.exception.XMLComparisonException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-/**
- * 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/>
- */
-public class XMLComparator {
-    /**
-     * Eran Chinthaka (chinthaka@apache.org)
-     */
-    private Log log = LogFactory.getLog(getClass());
-
-    private Vector ignorableNamespaceList = new Vector();
-
-    public void addIgnorableNamespace(String nsURI){
-        ignorableNamespaceList.add(nsURI);
-    }
-
-    public void clearIgnorableNamespaces(){
-        ignorableNamespaceList.clear();
-    }
-
-
-    public boolean compare(OMElement elementOne, OMElement elementTwo) throws XMLComparisonException {
-
-        //ignore if the elements belong to any of the ignorable namespaces list
-        if (isIgnorable(elementOne) ||
-                isIgnorable(elementTwo)){
-            return true;
-        }
-
-        if (elementOne == null && elementTwo == null) {
-            log.info("Both Elements are null.");
-            return true;
-        }
-        if (elementOne == null && elementTwo != null) {
-            throw new XMLComparisonException(
-                    "Element One is null and Element Two is not null");
-        }
-        if (elementOne != null && elementTwo == null) {
-            throw new XMLComparisonException(
-                    "Element Two is null and Element One is not null");
-        }
-
-        log.info(
-                "Now Checking " + elementOne.getLocalName() + " and " +
-                elementTwo.getLocalName() +
-                "=============================");
-
-        log.info("Comparing Element Names .......");
-        compare("Elements names are not equal. ",
-                elementOne.getLocalName(),
-                elementTwo.getLocalName());
-
-        log.info("Comparing Namespaces .........");
-        compare("Element namespaces are not equal",
-                elementOne.getNamespace(),
-                elementTwo.getNamespace());
-
-        log.info("Comparing attributes .....");
-        compareAllAttributes(elementOne, elementTwo);
-
-        log.info("Comparing texts .....");
-
-        /*
-        * Trimming the value of the XMLElement is not correct
-        * since this compare method cannot be used to compare
-        * element contents with trailing and leading whitespaces
-        * BUT for the practicalltiy of tests and to get the current
-        * tests working we have to trim() the contents
-        */
-        compare("Elements texts are not equal ",
-                elementOne.getText().trim(),
-                elementTwo.getText().trim());
-
-        log.info("Comparing Children ......");
-        compareAllChildren(elementOne, elementTwo);
-
-
-        return true;
-    }
-
-    private void compareAllAttributes(OMElement elementOne,
-                                      OMElement elementTwo) throws XMLComparisonException {
-        compareAttibutes(elementOne, elementTwo);
-        compareAttibutes(elementTwo, elementOne);
-    }
-
-    private void compareAllChildren(OMElement elementOne,
-                                    OMElement elementTwo) throws XMLComparisonException {
-        compareChildren(elementOne, elementTwo);
-        compareChildren(elementTwo, elementOne);
-    }
-
-
-    private boolean isIgnorable(OMElement elt){
-        if (elt!=null){
-            OMNamespace namespace = elt.getNamespace();
-            if (namespace!=null){
-            return ignorableNamespaceList.contains(namespace.getName());
-            }else{
-                return false; 
-            }
-        }else{
-            return false;
-        }
-    }
-
-
-    private void compareChildren(OMElement elementOne, OMElement elementTwo) throws XMLComparisonException {
-        //ignore if the elements belong to any of the ignorable namespaces list
-        if (isIgnorable(elementOne) ||
-                isIgnorable(elementTwo)){
-            return ;
-        }
-        Iterator elementOneChildren = elementOne.getChildren();
-        while (elementOneChildren.hasNext()) {
-            OMNode omNode = (OMNode) elementOneChildren.next();
-            if (omNode instanceof OMElement) {
-                OMElement elementOneChild = (OMElement) omNode;
-                OMElement elementTwoChild = null;
-//                if ("Reference4".equals(elementOneChild.getLocalName())) {
-//                    log.info("Reference4");
-//                }
-                //Do the comparison only if the element is not ignorable
-                if (!isIgnorable(elementOneChild)){
-                    elementTwoChild = elementTwo.getFirstChildWithName(
-                            elementOneChild.getQName());
-                    //Do the comparison only if the element is not ignorable
-                    if (!isIgnorable(elementTwoChild)){
-                        if (elementTwoChild == null) {
-                            throw new XMLComparisonException(
-                                    " There is no " + elementOneChild.getLocalName() +
-                                    " element under " +
-                                    elementTwo.getLocalName());
-                        }
-                    }
-                }
-                compare(elementOneChild, elementTwoChild);
-            }
-        }
-    }
-
-
-    private void compareAttibutes(OMElement elementOne, OMElement elementTwo) throws XMLComparisonException {
-        int elementOneAtribCount = 0;
-        int elementTwoAtribCount = 0;
-        Iterator attributes = elementOne.getAttributes();
-        while (attributes.hasNext()) {
-            OMAttribute omAttribute = (OMAttribute) attributes.next();
-            OMAttribute attr = elementTwo.getFirstAttribute(
-                    omAttribute.getQName());
-            if (attr == null) {
-                throw new XMLComparisonException(
-                        "Attributes are not the same in two elements. Attribute " +
-                        omAttribute.getLocalName() +
-                        " != ");
-            }
-            elementOneAtribCount++;
-        }
-
-        Iterator elementTwoIter = elementTwo.getAttributes();
-        while (elementTwoIter.hasNext()) {
-            elementTwoIter.next();
-            elementTwoAtribCount++;
-
-        }
-
-        if (elementOneAtribCount != elementTwoAtribCount) {
-            throw new XMLComparisonException(
-                    "Attributes are not the same in two elements.");
-        }
-    }
-
-    private void compare(String failureNotice, String one, String two) throws XMLComparisonException {
-        if (!one.equals(two)) {
-            throw new XMLComparisonException(
-                    failureNotice + one + " != " + two);
-        }
-    }
-
-    private void compare(String failureNotice,
-                         OMNamespace one,
-                         OMNamespace two) throws XMLComparisonException {
-        if (one == null && two == null) {
-            return;
-        } else if (one != null && two == null) {
-            throw new XMLComparisonException(
-                    "First Namespace is NOT null. But the second is null");
-        } else if (one == null && two != null) {
-            throw new XMLComparisonException(
-                    "First Namespace is null. But the second is NOT null");
-        }
-
-        if (!one.getName().equals(two.getName())) {
-            throw new XMLComparisonException(
-                    failureNotice + one + " != " + two);
-        }
-
-        // Do we need to compare prefixes as well
-    }
-}
+package org.apache.axis2.om.impl.llom.util;
+
+import org.apache.axis2.om.OMAttribute;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.impl.llom.exception.XMLComparisonException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.util.Iterator;
+import java.util.Vector;
+
+/**
+ * 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/>
+ */
+public class XMLComparator {
+    /**
+     * Eran Chinthaka (chinthaka@apache.org)
+     */
+    private Log log = LogFactory.getLog(getClass());
+
+    private Vector ignorableNamespaceList = new Vector();
+
+    public void addIgnorableNamespace(String nsURI){
+        ignorableNamespaceList.add(nsURI);
+    }
+
+    public void clearIgnorableNamespaces(){
+        ignorableNamespaceList.clear();
+    }
+
+
+    public boolean compare(OMElement elementOne, OMElement elementTwo) throws XMLComparisonException {
+
+        //ignore if the elements belong to any of the ignorable namespaces list
+        if (isIgnorable(elementOne) ||
+                isIgnorable(elementTwo)){
+            return true;
+        }
+
+        if (elementOne == null && elementTwo == null) {
+            log.info("Both Elements are null.");
+            return true;
+        }
+        if (elementOne == null && elementTwo != null) {
+            throw new XMLComparisonException(
+                    "Element One is null and Element Two is not null");
+        }
+        if (elementOne != null && elementTwo == null) {
+            throw new XMLComparisonException(
+                    "Element Two is null and Element One is not null");
+        }
+
+        log.info(
+                "Now Checking " + elementOne.getLocalName() + " and " +
+                elementTwo.getLocalName() +
+                "=============================");
+
+        log.info("Comparing Element Names .......");
+        compare("Elements names are not equal. ",
+                elementOne.getLocalName(),
+                elementTwo.getLocalName());
+
+        log.info("Comparing Namespaces .........");
+        compare("Element namespaces are not equal",
+                elementOne.getNamespace(),
+                elementTwo.getNamespace());
+
+        log.info("Comparing attributes .....");
+        compareAllAttributes(elementOne, elementTwo);
+
+        log.info("Comparing texts .....");
+
+        /*
+        * Trimming the value of the XMLElement is not correct
+        * since this compare method cannot be used to compare
+        * element contents with trailing and leading whitespaces
+        * BUT for the practicalltiy of tests and to get the current
+        * tests working we have to trim() the contents
+        */
+        compare("Elements texts are not equal ",
+                elementOne.getText().trim(),
+                elementTwo.getText().trim());
+
+        log.info("Comparing Children ......");
+        compareAllChildren(elementOne, elementTwo);
+
+
+        return true;
+    }
+
+    private void compareAllAttributes(OMElement elementOne,
+                                      OMElement elementTwo) throws XMLComparisonException {
+        compareAttibutes(elementOne, elementTwo);
+        compareAttibutes(elementTwo, elementOne);
+    }
+
+    private void compareAllChildren(OMElement elementOne,
+                                    OMElement elementTwo) throws XMLComparisonException {
+        compareChildren(elementOne, elementTwo);
+        compareChildren(elementTwo, elementOne);
+    }
+
+
+    private boolean isIgnorable(OMElement elt){
+        if (elt!=null){
+            OMNamespace namespace = elt.getNamespace();
+            if (namespace!=null){
+            return ignorableNamespaceList.contains(namespace.getName());
+            }else{
+                return false; 
+            }
+        }else{
+            return false;
+        }
+    }
+
+
+    private void compareChildren(OMElement elementOne, OMElement elementTwo) throws XMLComparisonException {
+        //ignore if the elements belong to any of the ignorable namespaces list
+        if (isIgnorable(elementOne) ||
+                isIgnorable(elementTwo)){
+            return ;
+        }
+        Iterator elementOneChildren = elementOne.getChildren();
+        while (elementOneChildren.hasNext()) {
+            OMNode omNode = (OMNode) elementOneChildren.next();
+            if (omNode instanceof OMElement) {
+                OMElement elementOneChild = (OMElement) omNode;
+                OMElement elementTwoChild = null;
+//                if ("Reference4".equals(elementOneChild.getLocalName())) {
+//                    log.info("Reference4");
+//                }
+                //Do the comparison only if the element is not ignorable
+                if (!isIgnorable(elementOneChild)){
+                    elementTwoChild = elementTwo.getFirstChildWithName(
+                            elementOneChild.getQName());
+                    //Do the comparison only if the element is not ignorable
+                    if (!isIgnorable(elementTwoChild)){
+                        if (elementTwoChild == null) {
+                            throw new XMLComparisonException(
+                                    " There is no " + elementOneChild.getLocalName() +
+                                    " element under " +
+                                    elementTwo.getLocalName());
+                        }
+                    }
+                }
+                compare(elementOneChild, elementTwoChild);
+            }
+        }
+    }
+
+
+    private void compareAttibutes(OMElement elementOne, OMElement elementTwo) throws XMLComparisonException {
+        int elementOneAtribCount = 0;
+        int elementTwoAtribCount = 0;
+        Iterator attributes = elementOne.getAttributes();
+        while (attributes.hasNext()) {
+            OMAttribute omAttribute = (OMAttribute) attributes.next();
+            OMAttribute attr = elementTwo.getFirstAttribute(
+                    omAttribute.getQName());
+            if (attr == null) {
+                throw new XMLComparisonException(
+                        "Attributes are not the same in two elements. Attribute " +
+                        omAttribute.getLocalName() +
+                        " != ");
+            }
+            elementOneAtribCount++;
+        }
+
+        Iterator elementTwoIter = elementTwo.getAttributes();
+        while (elementTwoIter.hasNext()) {
+            elementTwoIter.next();
+            elementTwoAtribCount++;
+
+        }
+
+        if (elementOneAtribCount != elementTwoAtribCount) {
+            throw new XMLComparisonException(
+                    "Attributes are not the same in two elements.");
+        }
+    }
+
+    private void compare(String failureNotice, String one, String two) throws XMLComparisonException {
+        if (!one.equals(two)) {
+            throw new XMLComparisonException(
+                    failureNotice + one + " != " + two);
+        }
+    }
+
+    private void compare(String failureNotice,
+                         OMNamespace one,
+                         OMNamespace two) throws XMLComparisonException {
+        if (one == null && two == null) {
+            return;
+        } else if (one != null && two == null) {
+            throw new XMLComparisonException(
+                    "First Namespace is NOT null. But the second is null");
+        } else if (one == null && two != null) {
+            throw new XMLComparisonException(
+                    "First Namespace is null. But the second is NOT null");
+        }
+
+        if (!one.getName().equals(two.getName())) {
+            throw new XMLComparisonException(
+                    failureNotice + one + " != " + two);
+        }
+
+        // Do we need to compare prefixes as well
+    }
+}

Propchange: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/XMLComparator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/util/XPathEvaluator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/util/XPathEvaluator.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/util/XPathEvaluator.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/util/XPathEvaluator.java Thu Sep 15 11:52:11 2005
@@ -1,29 +1,29 @@
-package org.apache.axis2.om.util;
-
-import org.apache.axis2.om.xpath.AXIOMXPath;
-import org.jaxen.NamespaceContext;
-import org.jaxen.SimpleNamespaceContext;
-
-import java.util.List;
-
-/**
- * Created by IntelliJ IDEA.
- * User: Ajith
- * Date: Sep 6, 2005
- * Time: 8:02:51 PM
- * To change this template use File | Settings | File Templates.
- */
-public class XPathEvaluator {
-
-    public List evaluateXpath(String xpathExpression, Object element, String nsURI) throws Exception{
-        AXIOMXPath xpath = new AXIOMXPath(xpathExpression);
-        if (nsURI!=null){
-            SimpleNamespaceContext nsContext = new SimpleNamespaceContext();
-            nsContext.addNamespace(null,nsURI);
-            xpath.setNamespaceContext(nsContext);
-        }
-        return xpath.selectNodes(element);
-    }
-
-
-}
+package org.apache.axis2.om.util;
+
+import org.apache.axis2.om.xpath.AXIOMXPath;
+import org.jaxen.NamespaceContext;
+import org.jaxen.SimpleNamespaceContext;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: Ajith
+ * Date: Sep 6, 2005
+ * Time: 8:02:51 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class XPathEvaluator {
+
+    public List evaluateXpath(String xpathExpression, Object element, String nsURI) throws Exception{
+        AXIOMXPath xpath = new AXIOMXPath(xpathExpression);
+        if (nsURI!=null){
+            SimpleNamespaceContext nsContext = new SimpleNamespaceContext();
+            nsContext.addNamespace(null,nsURI);
+            xpath.setNamespaceContext(nsContext);
+        }
+        return xpath.selectNodes(element);
+    }
+
+
+}

Propchange: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/util/XPathEvaluator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAP11Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAP11Constants.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAP11Constants.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAP11Constants.java Thu Sep 15 11:52:11 2005
@@ -1,55 +1,55 @@
-package org.apache.axis2.soap;
-
-import org.apache.axis2.soap.impl.llom.SOAPConstants;
-
-/**
- * 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/>
- */
-public interface SOAP11Constants extends SOAPConstants {
-    /**
-     * Eran Chinthaka (chinthaka@apache.org)
-     */
-    public static final String SOAP_ENVELOPE_NAMESPACE_URI = "http://schemas.xmlsoap.org/soap/envelope/";
-
-    /**
-     * Field ATTR_ACTOR
-     */
-    public static final String ATTR_ACTOR = "actor";
-
-    /**
-     * Field SOAP_FAULT_CODE_LOCAL_NAME
-     */
-    public static final String SOAP_FAULT_CODE_LOCAL_NAME = "faultcode";
-    /**
-     * Field SOAP_FAULT_STRING_LOCAL_NAME
-     */
-    public static final String SOAP_FAULT_STRING_LOCAL_NAME = "faultstring";
-    /**
-     * Field SOAP_FAULT_ACTOR_LOCAL_NAME
-     */
-    public static final String SOAP_FAULT_ACTOR_LOCAL_NAME = "faultactor";
-
-    public static final String SOAP_FAULT_DETAIL_LOCAL_NAME = "detail";
-
-    //SOAP 1.2 Content Type
-    public static final String SOAP_11_CONTENT_TYPE = "text/xml";
-
-     // -------- SOAP Fault Codes ------------------------------
-    public static final String FAULT_CODE_SENDER = "Client";
-    public static final String FAULT_CODE_RECEIVER = "Server";
-
-    public static final String SOAP_ACTOR_NEXT = "http://schemas.xmlsoap.org/soap/actor/next";
-}
+package org.apache.axis2.soap;
+
+import org.apache.axis2.soap.impl.llom.SOAPConstants;
+
+/**
+ * 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/>
+ */
+public interface SOAP11Constants extends SOAPConstants {
+    /**
+     * Eran Chinthaka (chinthaka@apache.org)
+     */
+    public static final String SOAP_ENVELOPE_NAMESPACE_URI = "http://schemas.xmlsoap.org/soap/envelope/";
+
+    /**
+     * Field ATTR_ACTOR
+     */
+    public static final String ATTR_ACTOR = "actor";
+
+    /**
+     * Field SOAP_FAULT_CODE_LOCAL_NAME
+     */
+    public static final String SOAP_FAULT_CODE_LOCAL_NAME = "faultcode";
+    /**
+     * Field SOAP_FAULT_STRING_LOCAL_NAME
+     */
+    public static final String SOAP_FAULT_STRING_LOCAL_NAME = "faultstring";
+    /**
+     * Field SOAP_FAULT_ACTOR_LOCAL_NAME
+     */
+    public static final String SOAP_FAULT_ACTOR_LOCAL_NAME = "faultactor";
+
+    public static final String SOAP_FAULT_DETAIL_LOCAL_NAME = "detail";
+
+    //SOAP 1.2 Content Type
+    public static final String SOAP_11_CONTENT_TYPE = "text/xml";
+
+     // -------- SOAP Fault Codes ------------------------------
+    public static final String FAULT_CODE_SENDER = "Client";
+    public static final String FAULT_CODE_RECEIVER = "Server";
+
+    public static final String SOAP_ACTOR_NEXT = "http://schemas.xmlsoap.org/soap/actor/next";
+}

Propchange: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAP11Constants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAP12Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAP12Constants.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAP12Constants.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAP12Constants.java Thu Sep 15 11:52:11 2005
@@ -1,71 +1,71 @@
-package org.apache.axis2.soap;
-
-import org.apache.axis2.soap.impl.llom.SOAPConstants;
-
-/**
- * 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/>
- */
-public interface SOAP12Constants extends SOAPConstants {
-    /**
-     * Eran Chinthaka (chinthaka@apache.org)
-     */
-
-    public String SOAP_ENVELOPE_NAMESPACE_URI =
-            "http://www.w3.org/2003/05/soap-envelope";
-
-    public static final String SOAP_ROLE = "role";
-    public static final String SOAP_RELAY = "relay";
-
-    // SOAP Fault Code
-    public static final String SOAP_FAULT_CODE_LOCAL_NAME = "Code";
-    public static final String SOAP_FAULT_SUB_CODE_LOCAL_NAME = "SubCode";
-    public static final String SOAP_FAULT_VALUE_LOCAL_NAME = "Value";
-
-    // SOAP Fault Codes
-    public static final String SOAP_FAULT_VALUE_VERSION_MISMATCH = "VersionMismatch";
-    public static final String SOAP_FAULT_VALUE_MUST_UNDERSTAND = "MustUnderstand";
-    public static final String SOAP_FAULT_VALUE_DATA_ENCODING_UKNOWN = "DataEncodingUnknown";
-    public static final String SOAP_FAULT_VALUE_SENDER = "Sender";
-    public static final String SOAP_FAULT_VALUE_RECEIVER = "Receiver";
-
-    // SOAP Fault Reason
-    public static final String SOAP_FAULT_REASON_LOCAL_NAME = "Reason";
-    public static final String SOAP_FAULT_TEXT_LOCAL_NAME = "Text";
-    public static final String SOAP_FAULT_TEXT_LANG_ATTR_LOCAL_NAME = "lang";
-    public static final String SOAP_FAULT_TEXT_LANG_ATTR_NS_URI = "http://www.w3.org/XML/1998/namespace";
-    public static final String SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX = "xml";
-
-    // SOAP Fault Node
-    public static final String SOAP_FAULT_NODE_LOCAL_NAME = "Node";
-
-    // SOAP Fault Detail
-    public static final String SOAP_FAULT_DETAIL_LOCAL_NAME = "Detail";
-
-    // SOAP Fault Role
-    public static final String SOAP_FAULT_ROLE_LOCAL_NAME = "Role";
-
-    //SOAP 1.2 Content Type
-    public static final String SOAP_12_CONTENT_TYPE = "application/soap+xml";
-
-    // -------- SOAP Fault Codes ------------------------------
-    public static final String FAULT_CODE_SENDER = "Sender";
-    public static final String FAULT_CODE_RECEIVER = "Receiver";
-
-    public static final String SOAP_ROLE_NEXT = "http://www.w3.org/2003/05/soap-envelope/role/next";
-    public static final String SOAP_ROLE_NONE = "http://www.w3.org/2003/05/soap-envelope/role/next";
-    public static final String SOAP_ROLE_ULTIMATE_RECEIVER = "http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver";
-    
-}
+package org.apache.axis2.soap;
+
+import org.apache.axis2.soap.impl.llom.SOAPConstants;
+
+/**
+ * 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/>
+ */
+public interface SOAP12Constants extends SOAPConstants {
+    /**
+     * Eran Chinthaka (chinthaka@apache.org)
+     */
+
+    public String SOAP_ENVELOPE_NAMESPACE_URI =
+            "http://www.w3.org/2003/05/soap-envelope";
+
+    public static final String SOAP_ROLE = "role";
+    public static final String SOAP_RELAY = "relay";
+
+    // SOAP Fault Code
+    public static final String SOAP_FAULT_CODE_LOCAL_NAME = "Code";
+    public static final String SOAP_FAULT_SUB_CODE_LOCAL_NAME = "SubCode";
+    public static final String SOAP_FAULT_VALUE_LOCAL_NAME = "Value";
+
+    // SOAP Fault Codes
+    public static final String SOAP_FAULT_VALUE_VERSION_MISMATCH = "VersionMismatch";
+    public static final String SOAP_FAULT_VALUE_MUST_UNDERSTAND = "MustUnderstand";
+    public static final String SOAP_FAULT_VALUE_DATA_ENCODING_UKNOWN = "DataEncodingUnknown";
+    public static final String SOAP_FAULT_VALUE_SENDER = "Sender";
+    public static final String SOAP_FAULT_VALUE_RECEIVER = "Receiver";
+
+    // SOAP Fault Reason
+    public static final String SOAP_FAULT_REASON_LOCAL_NAME = "Reason";
+    public static final String SOAP_FAULT_TEXT_LOCAL_NAME = "Text";
+    public static final String SOAP_FAULT_TEXT_LANG_ATTR_LOCAL_NAME = "lang";
+    public static final String SOAP_FAULT_TEXT_LANG_ATTR_NS_URI = "http://www.w3.org/XML/1998/namespace";
+    public static final String SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX = "xml";
+
+    // SOAP Fault Node
+    public static final String SOAP_FAULT_NODE_LOCAL_NAME = "Node";
+
+    // SOAP Fault Detail
+    public static final String SOAP_FAULT_DETAIL_LOCAL_NAME = "Detail";
+
+    // SOAP Fault Role
+    public static final String SOAP_FAULT_ROLE_LOCAL_NAME = "Role";
+
+    //SOAP 1.2 Content Type
+    public static final String SOAP_12_CONTENT_TYPE = "application/soap+xml";
+
+    // -------- SOAP Fault Codes ------------------------------
+    public static final String FAULT_CODE_SENDER = "Sender";
+    public static final String FAULT_CODE_RECEIVER = "Receiver";
+
+    public static final String SOAP_ROLE_NEXT = "http://www.w3.org/2003/05/soap-envelope/role/next";
+    public static final String SOAP_ROLE_NONE = "http://www.w3.org/2003/05/soap-envelope/role/next";
+    public static final String SOAP_ROLE_ULTIMATE_RECEIVER = "http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver";
+    
+}

Propchange: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAP12Constants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPBody.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPBody.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPBody.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPBody.java Thu Sep 15 11:52:11 2005
@@ -1,71 +1,71 @@
-/*
- * Copyright 2004,2005 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.axis2.soap;
-
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-
-/**
- * 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>SOAPFault</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>SOAPFault</code> object and adds it to
-     * this <code>SOAPBody</code> object.
-     *
-     * @param e
-     * @return the new <code>SOAPFault</code> object
-     * @throws org.apache.axis2.om.OMException
-     *          if there is a SOAP error
-     * @throws org.apache.axis2.om.OMException
-     *
-     */
-    public abstract SOAPFault addFault(Exception e) throws OMException;
-
-    /**
-     * Indicates whether a <code>SOAPFault</code> object exists in
-     * this <code>SOAPBody</code> object.
-     *
-     * @return <code>true</code> if a <code>SOAPFault</code> object exists in
-     *         this <code>SOAPBody</code> object; <code>false</code>
-     *         otherwise
-     */
-    public abstract boolean hasFault();
-
-    /**
-     * Returns the <code>SOAPFault</code> object in this <code>SOAPBody</code>
-     * object.
-     *
-     * @return the <code>SOAPFault</code> object in this <code>SOAPBody</code>
-     *         object
-     */
-    public abstract SOAPFault getFault();
-
-    /**
-     * @param soapFault
-     * @throws OMException
-     */
-    public abstract void addFault(SOAPFault soapFault) throws OMException;
-
-
-}
+/*
+ * Copyright 2004,2005 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.axis2.soap;
+
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMException;
+
+/**
+ * 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>SOAPFault</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>SOAPFault</code> object and adds it to
+     * this <code>SOAPBody</code> object.
+     *
+     * @param e
+     * @return the new <code>SOAPFault</code> object
+     * @throws org.apache.axis2.om.OMException
+     *          if there is a SOAP error
+     * @throws org.apache.axis2.om.OMException
+     *
+     */
+    public abstract SOAPFault addFault(Exception e) throws OMException;
+
+    /**
+     * Indicates whether a <code>SOAPFault</code> object exists in
+     * this <code>SOAPBody</code> object.
+     *
+     * @return <code>true</code> if a <code>SOAPFault</code> object exists in
+     *         this <code>SOAPBody</code> object; <code>false</code>
+     *         otherwise
+     */
+    public abstract boolean hasFault();
+
+    /**
+     * Returns the <code>SOAPFault</code> object in this <code>SOAPBody</code>
+     * object.
+     *
+     * @return the <code>SOAPFault</code> object in this <code>SOAPBody</code>
+     *         object
+     */
+    public abstract SOAPFault getFault();
+
+    /**
+     * @param soapFault
+     * @throws OMException
+     */
+    public abstract void addFault(SOAPFault soapFault) throws OMException;
+
+
+}

Propchange: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPBody.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPEnvelope.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPEnvelope.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPEnvelope.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPEnvelope.java Thu Sep 15 11:52:11 2005
@@ -1,63 +1,63 @@
-/*
- * Copyright 2004,2005 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.axis2.soap;
-
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-
-/**
- * Interface SOAPEnvelope
- */
-public interface SOAPEnvelope extends OMElement {
-    /**
-     * Returns the <CODE>SOAPHeader</CODE> object for this <CODE>
-     * SOAPEnvelope</CODE> object.
-     * <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.axis2.om.OMException
-     *          if there is a problem
-     *          obtaining the <CODE>SOAPHeader</CODE> object
-     */
-    public abstract SOAPHeader getHeader() throws OMException;
-
-    /**
-     * Convenience method to add a SOAP header to this envelope
-     *
-     * @param namespaceURI
-     * @param name
-     */
-    public abstract SOAPHeaderBlock addHeader(String namespaceURI, String name)
-            throws OMException;
-
-    /**
-     * Returns the <CODE>SOAPBody</CODE> object associated with
-     * this <CODE>SOAPEnvelope</CODE> object.
-     * <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;
-}
+/*
+ * Copyright 2004,2005 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.axis2.soap;
+
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMException;
+
+/**
+ * Interface SOAPEnvelope
+ */
+public interface SOAPEnvelope extends OMElement {
+    /**
+     * Returns the <CODE>SOAPHeader</CODE> object for this <CODE>
+     * SOAPEnvelope</CODE> object.
+     * <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.axis2.om.OMException
+     *          if there is a problem
+     *          obtaining the <CODE>SOAPHeader</CODE> object
+     */
+    public abstract SOAPHeader getHeader() throws OMException;
+
+    /**
+     * Convenience method to add a SOAP header to this envelope
+     *
+     * @param namespaceURI
+     * @param name
+     */
+    public abstract SOAPHeaderBlock addHeader(String namespaceURI, String name)
+            throws OMException;
+
+    /**
+     * Returns the <CODE>SOAPBody</CODE> object associated with
+     * this <CODE>SOAPEnvelope</CODE> object.
+     * <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;
+}

Propchange: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPEnvelope.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message