axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r292960 [1/2] - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/clientapi/ core/src/org/apache/axis2/deployment/ core/test-resources/deployment/outservice/org/apache/axis/services/ databinding/src/org/apache/axis2/databi...
Date Sat, 01 Oct 2005 11:47:50 GMT
Author: chinthaka
Date: Sat Oct  1 04:44:28 2005
New Revision: 292960

URL: http://svn.apache.org/viewcvs?rev=292960&view=rev
Log:
Renaming following methods to enable DOM implementation on OM.

	getNextSibling() -> getNextOMSibling()
	getPreviousSibling() -> getPreviousOMSibling()
	setNextSibling() -> setNextOMSibling()		[For consistancy]
	setPreviousSibling() -> setPreviousOMSibling()	[For consistancy]


	getFirstChild() -> getFirstOMChild()

	getAttributes() -> getAllAttributes()

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/AbstractCallbackSupporter.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/org/apache/axis/services/OutService.java
    webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/databinding/DeserializationContext.java
    webservices/axis2/trunk/java/modules/integration/src/org/apache/axis2/XMLComparatorInterop.java
    webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java
    webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoService.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java
    webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java
    webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
    webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java
    webservices/axis2/trunk/java/modules/samples/src/sample/mtom/imagetransfer/service/MTOMService.java
    webservices/axis2/trunk/java/modules/samples/src/sample/mtom/interop/service/interopService.java
    webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java
    webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMContainer.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMElement.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMNodeEx.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildElementIterator.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenIterator.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/XMLComparator.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPHeaderImpl.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11HeaderImpl.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12HeaderImpl.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/attachments/ImageSampleTest.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTest.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestUtils.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/builder/StAXOMBuilderTest.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilderTest.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/serializer/ElementSerializerTest.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/util/XMLComparator.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPFaultTextTest.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/OMElementTest.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilderTest.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/AbstractCallbackSupporter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/AbstractCallbackSupporter.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/AbstractCallbackSupporter.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/AbstractCallbackSupporter.java Sat Oct  1 04:44:28 2005
@@ -50,7 +50,7 @@
     private static void markElementsAsOptimized(QName qName,OMElement rootElt){
         if (rootElt.getQName().equals(qName)){
             //get the text node and mark it
-            OMNode node = rootElt.getFirstChild();
+            OMNode node = rootElt.getFirstOMChild();
             if (node.getType()==OMNode.TEXT_NODE){
                 ((OMText)node).setOptimize(true);
             }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java Sat Oct  1 04:44:28 2005
@@ -129,7 +129,7 @@
         if(order_element == null){
             throw new DeploymentException("Invaid Handler , phase rule does not specify");
         } else {
-            Iterator order_itr = order_element.getAttributes();
+            Iterator order_itr = order_element.getAllAttributes();
             while (order_itr.hasNext()) {
                 OMAttribute orderAttribut = (OMAttribute) order_itr.next();
                 String name  = orderAttribut.getQName().getLocalPart();

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/org/apache/axis/services/OutService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/org/apache/axis/services/OutService.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/org/apache/axis/services/OutService.java (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/org/apache/axis/services/OutService.java Sat Oct  1 04:44:28 2005
@@ -23,7 +23,7 @@
         SOAPEnvelope env = omFactory.getDefaultEnvelope();
         OMNode testNode = omFactory.createText("This is auto generated messge by the server at " + new Date());
         env.getBody().addChild(testNode);
-        log.info("Generated Message" + env.getBody().getFirstChild());
+        log.info("Generated Message" + env.getBody().getFirstOMChild());
 
         /*EndpointReference targetEPR = null;
         String action = null;

Modified: webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/databinding/DeserializationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/databinding/DeserializationContext.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/databinding/DeserializationContext.java (original)
+++ webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/databinding/DeserializationContext.java Sat Oct  1 04:44:28 2005
@@ -105,7 +105,7 @@
 
     public void processRest(OMElement rpcElement) throws Exception {
         // The siblings of this should be SOAP 1.1 independent elements
-        OMNode nextElement = rpcElement.getNextSibling();
+        OMNode nextElement = rpcElement.getNextOMSibling();
         while (nextElement != null) {
             if (nextElement instanceof OMElement) {
                 OMAttribute idAttr =
@@ -114,7 +114,7 @@
                     idFound(idAttr.getValue(), (OMElement)nextElement);
                 }
             }
-            nextElement = nextElement.getNextSibling();
+            nextElement = nextElement.getNextOMSibling();
         }
     }
 }

Modified: webservices/axis2/trunk/java/modules/integration/src/org/apache/axis2/XMLComparatorInterop.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/org/apache/axis2/XMLComparatorInterop.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/org/apache/axis2/XMLComparatorInterop.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/org/apache/axis2/XMLComparatorInterop.java Sat Oct  1 04:44:28 2005
@@ -190,7 +190,7 @@
     private boolean compareAttibutes(OMElement elementOne, OMElement elementTwo) {
         int elementOneAtribCount = 0;
         int elementTwoAtribCount = 0;
-        Iterator attributes = elementOne.getAttributes();
+        Iterator attributes = elementOne.getAllAttributes();
         while (attributes.hasNext()) {
             OMAttribute omAttribute = (OMAttribute) attributes.next();
             OMAttribute attr = elementTwo.getFirstAttribute(omAttribute.getQName());
@@ -200,7 +200,7 @@
             elementOneAtribCount++;
         }
 
-        Iterator elementTwoIter = elementTwo.getAttributes();
+        Iterator elementTwoIter = elementTwo.getAllAttributes();
         while (elementTwoIter.hasNext()) {
             elementTwoIter.next();
             elementTwoAtribCount++;

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java Sat Oct  1 04:44:28 2005
@@ -53,7 +53,7 @@
                 } catch (ClassCastException e) {
                     continue;
                 }
-                Iterator attributes = headerBlock.getAttributes();
+                Iterator attributes = headerBlock.getAllAttributes();
 
                 if (attributes.hasNext()) {
                     OMAttribute firstAttribute = (OMAttribute) attributes.next();
@@ -71,7 +71,7 @@
                             roleValue.equals(SOAP12_ROLE + "/" + NEXT_ROLE)) {
                         headerBlock.setLocalName(RESPONSE_HEADERBLOCK_NAME);
                         if (attributePresent)
-                            headerBlock.removeAttribute((OMAttribute) headerBlock.getAttributes().next());
+                            headerBlock.removeAttribute((OMAttribute) headerBlock.getAllAttributes().next());
                         headerBlockPresent = new Integer(1);
                         msgContext.getOperationContext().setProperty("HEADER_BLOCK_PRESENT", headerBlockPresent, true);
                         headerAdd.addChild(headerBlock);

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java Sat Oct  1 04:44:28 2005
@@ -53,7 +53,7 @@
                 } catch (ClassCastException e) {
                     continue;
                 }
-                Iterator attributes = headerBlock.getAttributes();
+                Iterator attributes = headerBlock.getAllAttributes();
 
                 if (attributes.hasNext()) {
                     OMAttribute firstAttribute = (OMAttribute) attributes.next();
@@ -71,7 +71,7 @@
                             roleValue.equals(SOAP12_ROLE + "/" + NEXT_ROLE)) {
                         headerBlock.setLocalName(RESPONSE_HEADERBLOCK_NAME);
                         if (attributePresent) {
-                            headerBlock.removeAttribute((OMAttribute) headerBlock.getAttributes().next());
+                            headerBlock.removeAttribute((OMAttribute) headerBlock.getAllAttributes().next());
                             attributePresent = false;
                         }
                         headerBlockPresent = new Integer(1);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java Sat Oct  1 04:44:28 2005
@@ -100,7 +100,7 @@
 
 
             assertNotNull("Result is null", resultElem);
-            String result = ((OMElement) resultElem.getFirstChild()).getText();
+            String result = ((OMElement) resultElem.getFirstOMChild()).getText();
 
             assertNotNull("Result value is null", result);
 

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java Sat Oct  1 04:44:28 2005
@@ -50,7 +50,7 @@
     }
 
     public OMElement echoMTOMtoBase64(OMElement omEle) {
-        OMText omText = (OMText) omEle.getFirstChild();
+        OMText omText = (OMText) omEle.getFirstOMChild();
         omText.setOptimize(false);
         return omEle;
     }

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java Sat Oct  1 04:44:28 2005
@@ -93,7 +93,7 @@
         OMElement result = call.invokeBlocking(operationName.getLocalPart(),
                 payload);
         assertNotNull(result);
-        OMElement person = (OMElement)result.getFirstChild();
+        OMElement person = (OMElement)result.getFirstOMChild();
         assertEquals(person.getLocalName(),"person");
 
         StringWriter writer = new StringWriter();

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java Sat Oct  1 04:44:28 2005
@@ -153,8 +153,8 @@
            // call.close();
             call = null;
             assertNotNull("Result is null", resultElem);
-            String result = ((OMElement) resultElem.getFirstChild()
-                    .getNextSibling()).getFirstElement().getFirstElement()
+            String result = ((OMElement) resultElem.getFirstOMChild()
+                    .getNextOMSibling()).getFirstElement().getFirstElement()
                     .getText();
 
             assertNotNull("Result value is null", result);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java Sat Oct  1 04:44:28 2005
@@ -117,7 +117,7 @@
         OMElement result = call.invokeBlocking(operationName
                 .getLocalPart(), payload);
 
-        OMElement ele = (OMElement) result.getFirstChild();
+        OMElement ele = (OMElement) result.getFirstOMChild();
         this.campareWithCreatedOMElement(data);
 
     }

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java Sat Oct  1 04:44:28 2005
@@ -120,9 +120,9 @@
             OMElement result = call.invokeBlocking(operationName
                     .getLocalPart(),
                     payload);
-            OMElement ele = (OMElement) result.getFirstChild();
-            OMElement ele1 = (OMElement) ele.getFirstChild();
-            OMText binaryNode = (OMText) ele1.getFirstChild();
+            OMElement ele = (OMElement) result.getFirstOMChild();
+            OMElement ele1 = (OMElement) ele.getFirstOMChild();
+            OMText binaryNode = (OMText) ele1.getFirstOMChild();
             compareWithActualOMText(binaryNode);
             log.info("" + i);
             UtilServer.unDeployClientService();

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java Sat Oct  1 04:44:28 2005
@@ -121,8 +121,8 @@
             public void onComplete(AsyncResult result) {
                 SOAPEnvelope envelope = result.getResponseEnvelope();
                 
-                OMElement ele = (OMElement) envelope.getBody().getFirstElement().getFirstChild();
-                OMText binaryNode = (OMText) ele.getFirstChild();
+                OMElement ele = (OMElement) envelope.getBody().getFirstElement().getFirstOMChild();
+                OMText binaryNode = (OMText) ele.getFirstOMChild();
                 
                 // to the assert equal
                 compareWithCreatedOMText(binaryNode);
@@ -168,8 +168,8 @@
                 payload);
         // result.serializeWithCache(new
         // OMOutput(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out)));
-        OMElement ele = (OMElement) result.getFirstChild();
-        OMText binaryNode = (OMText) ele.getFirstChild();
+        OMElement ele = (OMElement) result.getFirstOMChild();
+        OMText binaryNode = (OMText) ele.getFirstOMChild();
         
         // to the assert equal
         compareWithCreatedOMText(binaryNode);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java Sat Oct  1 04:44:28 2005
@@ -111,7 +111,7 @@
             public void onComplete(AsyncResult result) {
                 SOAPEnvelope envelope = result.getResponseEnvelope();
 
-                OMElement data = (OMElement) envelope.getBody().getFirstElement().getFirstChild();
+                OMElement data = (OMElement) envelope.getBody().getFirstElement().getFirstOMChild();
                 compareWithCreatedOMText(data.getText());
                 finish = true;
             }
@@ -155,7 +155,7 @@
             OMElement result = call.invokeBlocking(operationName
                     .getLocalPart(), payload);
 
-            OMElement data = (OMElement) result.getFirstChild();
+            OMElement data = (OMElement) result.getFirstOMChild();
             compareWithCreatedOMText(data.getText());
             call.close();
             log.info("" + i);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoService.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoService.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoService.java Sat Oct  1 04:44:28 2005
@@ -27,14 +27,14 @@
         if (element.getLocalName().equalsIgnoreCase("Data")
                 && element.getNamespace().getName().equalsIgnoreCase(
                         "http://example.org/mtom/data")) {
-                OMText binaryNode = (OMText)element.getFirstChild();
+                OMText binaryNode = (OMText)element.getFirstOMChild();
                 binaryNode.setOptimize(!binaryNode.isOptimized());
             }
          else if (element.getLocalName().equalsIgnoreCase("EchoTest") && element.getNamespace().getName().equalsIgnoreCase("http://example.org/mtom/data")) {
             Iterator childrenIterator = element.getChildren();
             while (childrenIterator.hasNext()) {
                 OMElement dataElement = (OMElement) childrenIterator.next();
-                OMText binaryNode = (OMText)dataElement.getFirstChild();
+                OMText binaryNode = (OMText)dataElement.getFirstOMChild();
                 binaryNode.setOptimize(!binaryNode.isOptimized());
             }
         }

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java Sat Oct  1 04:44:28 2005
@@ -42,7 +42,7 @@
     }
 
     public OMElement echoAttachment(OMElement omEle) {
-        OMElement child  = (OMElement)omEle.getFirstChild();
+        OMElement child  = (OMElement)omEle.getFirstOMChild();
         OMAttribute attr = child.getFirstAttribute(new QName("href"));
         String contentID = attr.getValue();
         MIMEHelper attachment = (MIMEHelper)msgcts.getProperty(MTOMConstants.ATTACHMENTS);

Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java Sat Oct  1 04:44:28 2005
@@ -112,7 +112,7 @@
         if (omNode.getType() == OMNode.TEXT_NODE)
             return ((OMText) omNode).getText();
         else if (omNode.getType() == OMNode.ELEMENT_NODE)
-            return new NodeImpl(((OMElement) omNode).getFirstChild()).getValue();
+            return new NodeImpl(((OMElement) omNode).getFirstOMChild()).getValue();
         return null;
     }
 
@@ -175,7 +175,7 @@
                     org.apache.axis2.om.OMAbstractFactory.getOMFactory()
                     .createText(parent, value);
         } else if (omNode.getType() == OMNode.ELEMENT_NODE) {
-            OMNode firstChild = ((OMElement) omNode).getFirstChild();
+            OMNode firstChild = ((OMElement) omNode).getFirstOMChild();
             if (firstChild == null) {
                 firstChild =
                         org.apache.axis2.om.OMAbstractFactory.getOMFactory()
@@ -219,7 +219,7 @@
      */
     public boolean hasAttributes() {
         if (omNode instanceof OMElement) {
-            Iterator iter = ((OMElement) omNode).getAttributes();
+            Iterator iter = ((OMElement) omNode).getAllAttributes();
             return (iter.hasNext());
         }
         return false;
@@ -361,7 +361,7 @@
     }
 
     /**
-     * Method getAttributes
+     * Method getAllAttributes
      *
      * @see org.w3c.dom.Node#getAttributes()
      */
@@ -369,19 +369,19 @@
         // Will have to provide an implementation of NamedNodeMap
         // Dropping for now
         // TODO
-        Iterator iter = ((OMElement) omNode).getAttributes();
+        Iterator iter = ((OMElement) omNode).getAllAttributes();
 
         return null;
     }
 
     /**
-     * Method getFirstChild
+     * Method getFirstOMChild
      *
      * @see org.w3c.dom.Node#getFirstChild()
      */
     public org.w3c.dom.Node getFirstChild() {
         //
-        OMNode child = ((OMElement) omNode).getFirstChild();
+        OMNode child = ((OMElement) omNode).getFirstOMChild();
         return new NodeImpl(child);
     }
 
@@ -408,7 +408,7 @@
      */
     public org.w3c.dom.Node getNextSibling() {
 
-        OMNode sibling = omNode.getNextSibling();
+        OMNode sibling = omNode.getNextOMSibling();
         return new NodeImpl(sibling);
     }
 
@@ -424,7 +424,7 @@
      */
     public org.w3c.dom.Node getPreviousSibling() {
 
-        OMNode prevSibling = omNode.getPreviousSibling();
+        OMNode prevSibling = omNode.getPreviousOMSibling();
         return new NodeImpl(prevSibling);
     }
 

Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java Sat Oct  1 04:44:28 2005
@@ -244,7 +244,7 @@
      * @see javax.xml.soap.SOAPElement#getAllAttributes()
      */
     public Iterator getAllAttributes() {
-        Iterator attrIter = omElement.getAttributes();
+        Iterator attrIter = omElement.getAllAttributes();
         ArrayList arrayList = new ArrayList();
         while (attrIter.hasNext()) {
             Object o = attrIter.next();
@@ -523,7 +523,7 @@
      * @see org.w3c.dom.Element#hasAttribute(java.lang.String)
      */
     public boolean hasAttribute(String localName) {
-        Iterator attrIter = omElement.getAttributes();
+        Iterator attrIter = omElement.getAllAttributes();
         while (attrIter.hasNext()) {
             org.apache.axis2.om.OMAttribute omAttr = (org.apache.axis2.om.OMAttribute) (attrIter.next());
             if (omAttr.getLocalName().equals(localName)) {
@@ -544,7 +544,7 @@
      * @see org.w3c.dom.Element#getAttribute(java.lang.String)
      */
     public String getAttribute(String name) {
-        Iterator attrIter = omElement.getAttributes();
+        Iterator attrIter = omElement.getAllAttributes();
         while (attrIter.hasNext()) {
             org.apache.axis2.om.OMAttribute omAttr = (org.apache.axis2.om.OMAttribute) (attrIter.next());
             if (omAttr.getLocalName().equals(name)) {
@@ -593,7 +593,7 @@
      * @see org.w3c.dom.Element#hasAttributeNS(java.lang.String, java.lang.String)
      */
     public boolean hasAttributeNS(String namespaceURI, String localName) {
-        Iterator attrIter = omElement.getAttributes();
+        Iterator attrIter = omElement.getAllAttributes();
         while (attrIter.hasNext()) {
             org.apache.axis2.om.OMAttribute omAttr = (org.apache.axis2.om.OMAttribute) (attrIter.next());
             if (omAttr.getLocalName().equals(localName) &&
@@ -613,7 +613,7 @@
      * @see org.w3c.dom.Element#getAttributeNode(java.lang.String)
      */
     public Attr getAttributeNode(String localName) {
-        Iterator attrIter = omElement.getAttributes();
+        Iterator attrIter = omElement.getAllAttributes();
         while (attrIter.hasNext()) {
             org.apache.axis2.om.OMAttribute omAttr = (org.apache.axis2.om.OMAttribute) (attrIter.next());
             if (omAttr.getLocalName().equals(localName)) {
@@ -738,7 +738,7 @@
      * @see org.w3c.dom.Element#getAttributeNS(java.lang.String, java.lang.String)
      */
     public String getAttributeNS(String namespaceURI, String localName) {
-        Iterator attrIter = omElement.getAttributes();
+        Iterator attrIter = omElement.getAllAttributes();
         while (attrIter.hasNext()) {
             org.apache.axis2.om.OMAttribute omAttr = (org.apache.axis2.om.OMAttribute) (attrIter.next());
             if (omAttr.getLocalName().equals(localName) &&
@@ -781,7 +781,7 @@
      * @see org.w3c.dom.Element#getAttributeNodeNS(java.lang.String, java.lang.String)
      */
     public Attr getAttributeNodeNS(String namespaceURI, String localName) {
-        Iterator attrIter = omElement.getAttributes();
+        Iterator attrIter = omElement.getAllAttributes();
         while (attrIter.hasNext()) {
             org.apache.axis2.om.OMAttribute omAttr = (org.apache.axis2.om.OMAttribute) (attrIter.next());
             if (omAttr.getLocalName().equals(localName) &&

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java Sat Oct  1 04:44:28 2005
@@ -80,7 +80,7 @@
             }
             String methodName = op.getName().getLocalPart();
             OMElement firstChild =
-                (OMElement) inMessage.getEnvelope().getBody().getFirstChild();
+                (OMElement) inMessage.getEnvelope().getBody().getFirstOMChild();
             inMessage.getEnvelope().build();
             StringWriter writer = new StringWriter();
             firstChild.build();

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/mtom/imagetransfer/service/MTOMService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/mtom/imagetransfer/service/MTOMService.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/mtom/imagetransfer/service/MTOMService.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/mtom/imagetransfer/service/MTOMService.java Sat Oct  1 04:44:28 2005
@@ -31,8 +31,8 @@
     public OMElement mtomSample(OMElement element) throws Exception {
     	
         OMElement imageEle = element.getFirstElement();
-        OMElement imageName = (OMElement) imageEle.getNextSibling();
-        OMText binaryNode = (OMText) imageEle.getFirstChild();
+        OMElement imageName = (OMElement) imageEle.getNextOMSibling();
+        OMText binaryNode = (OMText) imageEle.getFirstOMChild();
         String fileName = imageName.getText();
         //Extracting the data and saving
         DataHandler actualDH;

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/mtom/interop/service/interopService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/mtom/interop/service/interopService.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/mtom/interop/service/interopService.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/mtom/interop/service/interopService.java Sat Oct  1 04:44:28 2005
@@ -26,14 +26,14 @@
         if (element.getLocalName().equalsIgnoreCase("Data")
                 && element.getNamespace().getName().equalsIgnoreCase(
                         "http://example.org/mtom/data")) {
-                OMText binaryNode = (OMText)element.getFirstChild();
+                OMText binaryNode = (OMText)element.getFirstOMChild();
                 binaryNode.setOptimize(!binaryNode.isOptimized());
             }
          else if (element.getLocalName().equalsIgnoreCase("EchoTest") && element.getNamespace().getName().equalsIgnoreCase("http://example.org/mtom/data")) {
             Iterator childrenIterator = element.getChildren();
             while (childrenIterator.hasNext()) {
                 OMElement dataElement = (OMElement) childrenIterator.next();
-                OMText binaryNode = (OMText)dataElement.getFirstChild();
+                OMText binaryNode = (OMText)dataElement.getFirstOMChild();
                 binaryNode.setOptimize(!binaryNode.isOptimized());
             }
         }

Modified: webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java (original)
+++ webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java Sat Oct  1 04:44:28 2005
@@ -2,30 +2,30 @@
     package org.apache.axis2.oasis.ping;
 
 
-     import org.apache.axis2.oasis.ping.databinding.org.xmlsoap.PingResponseDocument;
-     import org.apache.axis2.oasis.ping.databinding.org.xmlsoap.PingResponse; 	
-     import org.apache.axis2.oasis.ping.databinding.org.xmlsoap.PingDocument; 
+    import org.apache.axis2.oasis.ping.databinding.org.xmlsoap.PingDocument;
+    import org.apache.axis2.oasis.ping.databinding.org.xmlsoap.PingResponse;
+    import org.apache.axis2.oasis.ping.databinding.org.xmlsoap.PingResponseDocument;
 
     /**
      *  Auto generated java skeleton for the service by the Axis code generator
      */
     public class PingPortSkeleton {
-     
-	
-		 
+
+
+
         /**
          * Auto generated method signature
-         
+
           * @param param0
-         
+
          */
         public  PingResponseDocument Ping
                   (PingDocument param0 ){
                 PingResponseDocument response = PingResponseDocument.Factory.newInstance();
-        	PingResponse pingRes = response.addNewPingResponse();
-        	pingRes.setText("Response: " + param0.getPing().getText());
+            PingResponse pingRes = response.addNewPingResponse();
+            pingRes.setText("Response: " + param0.getPing().getText());
             return response;
         }
-     
+
     }
     

Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java Sat Oct  1 04:44:28 2005
@@ -50,7 +50,7 @@
 		
 		while (cipherValueElements.hasNext()) {
 			OMElement element = (OMElement) cipherValueElements.next();
-			OMText text = (OMText)element.getFirstChild();
+			OMText text = (OMText)element.getFirstOMChild();
 			text.setOptimize(true);
 		}
 	}

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMContainer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMContainer.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMContainer.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMContainer.java Sat Oct  1 04:44:28 2005
@@ -93,7 +93,7 @@
      *
      * @return Returns the first child.  May return null if the container has no children.
      */
-    public OMNode getFirstChild();
+    public OMNode getFirstOMChild();
 
     public boolean isComplete();
 

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMElement.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMElement.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMElement.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMElement.java Sat Oct  1 04:44:28 2005
@@ -127,7 +127,7 @@
      * @see #addAttribute(OMAttribute)
      * @see #addAttribute(String, String, OMNamespace)
      */
-    public Iterator getAttributes();
+    public Iterator getAllAttributes();
 
     /**
      * Return a named attribute if present.

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java Sat Oct  1 04:44:28 2005
@@ -106,7 +106,7 @@
      *
      * @return The next sibling in document order.
      */
-    public OMNode getNextSibling() throws OMException;
+    public OMNode getNextOMSibling() throws OMException;
 
     /**
      * this will indicate whether parser has parsed this information item completely or not.
@@ -171,7 +171,7 @@
      *
      * @return node
      */
-    public OMNode getPreviousSibling();
+    public OMNode getPreviousOMSibling();
 
     /**
      * Serialize the node with caching

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMNodeEx.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMNodeEx.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMNodeEx.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMNodeEx.java Sat Oct  1 04:44:28 2005
@@ -27,9 +27,9 @@
  * Please use at your own risk. May corrupt the data integrity
  */
 public interface OMNodeEx extends OMNode {
-    public void setNextSibling(OMNode node);
+    public void setNextOMSibling(OMNode node);
 
-    public void setPreviousSibling(OMNode previousSibling);
+    public void setPreviousOMSibling(OMNode previousSibling);
 
     public void setParent(OMContainer element);
 

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java Sat Oct  1 04:44:28 2005
@@ -164,12 +164,12 @@
     private void addChild(OMNodeImpl child) {
         if (firstChild == null) {
             firstChild = child;
-            child.setPreviousSibling(null);
+            child.setPreviousOMSibling(null);
         } else {
-            child.setPreviousSibling(lastChild);
-            ((OMNodeEx)lastChild).setNextSibling(child);
+            child.setPreviousOMSibling(lastChild);
+            ((OMNodeEx)lastChild).setNextOMSibling(child);
         }
-        child.setNextSibling(null);
+        child.setNextOMSibling(null);
         child.setParent(this);
         lastChild = child;
 
@@ -182,7 +182,7 @@
      * @return
      */
     public Iterator getChildren() {
-        return new OMChildrenIterator(getFirstChild());
+        return new OMChildrenIterator(getFirstOMChild());
     }
 
     /**
@@ -195,16 +195,16 @@
      * @throws org.apache.axis2.om.OMException
      */
     public Iterator getChildrenWithName(QName elementQName) {
-        return new OMChildrenQNameIterator(getFirstChild(),
+        return new OMChildrenQNameIterator(getFirstOMChild(),
                 elementQName);
     }
 
     /**
-     * Method getFirstChild
+     * Method getFirstOMChild
      *
      * @return
      */
-    public OMNode getFirstChild() {
+    public OMNode getFirstOMChild() {
         while ((firstChild == null) && !done) {
             buildNext();
         }
@@ -220,7 +220,7 @@
      */
     public OMElement getFirstChildWithName(QName elementQName) throws OMException {
         OMChildrenQNameIterator omChildrenQNameIterator =
-                new OMChildrenQNameIterator(getFirstChild(),
+                new OMChildrenQNameIterator(getFirstOMChild(),
                         elementQName);
         OMNode omNode = null;
         if (omChildrenQNameIterator.hasNext()) {

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java Sat Oct  1 04:44:28 2005
@@ -189,7 +189,7 @@
      * @throws OMException
      */
     public Iterator getChildrenWithName(QName elementQName) {
-        return new OMChildrenQNameIterator(getFirstChild(),
+        return new OMChildrenQNameIterator(getFirstOMChild(),
                 elementQName);
     }
 
@@ -200,7 +200,7 @@
      */
     public OMElement getFirstChildWithName(QName elementQName) throws OMException {
         OMChildrenQNameIterator omChildrenQNameIterator =
-                new OMChildrenQNameIterator(getFirstChild(),
+                new OMChildrenQNameIterator(getFirstOMChild(),
                         elementQName);
         OMNode omNode = null;
         if (omChildrenQNameIterator.hasNext()) {
@@ -225,13 +225,13 @@
 
         if (firstChild == null) {
             firstChild = child;
-            child.setPreviousSibling(null);
+            child.setPreviousOMSibling(null);
         } else {
-            child.setPreviousSibling(lastChild);
-            ((OMNodeEx)lastChild).setNextSibling(child);
+            child.setPreviousOMSibling(lastChild);
+            ((OMNodeEx)lastChild).setNextOMSibling(child);
         }
 
-        child.setNextSibling(null);
+        child.setNextOMSibling(null);
         lastChild = child;
 
     }
@@ -241,11 +241,11 @@
      * @throws org.apache.axis2.om.OMException
      * @throws OMException
      */
-    public OMNode getNextSibling() throws OMException {
+    public OMNode getNextOMSibling() throws OMException {
         while (!done) {
             builder.next();
         }
-        return super.getNextSibling();
+        return super.getNextOMSibling();
     }
 
     /**
@@ -255,7 +255,7 @@
      * @return children
      */
     public Iterator getChildren() {
-        return new OMChildrenIterator(getFirstChild());
+        return new OMChildrenIterator(getFirstOMChild());
     }
 
     /**
@@ -372,7 +372,7 @@
      *
      * @return iterator
      */
-    public Iterator getAttributes() {
+    public Iterator getAllAttributes() {
         if (attributes == null) {
             return new EmptyIterator();
         }
@@ -458,11 +458,11 @@
     }
 
     /**
-     * Method getFirstChild
+     * Method getFirstOMChild
      *
      * @return child
      */
-    public OMNode getFirstChild() {
+    public OMNode getFirstOMChild() {
         while ((firstChild == null) && !done) {
             buildNext();
         }
@@ -553,12 +553,12 @@
      */
     public void setText(String text) {
 
-        OMNode child = this.getFirstChild();
+        OMNode child = this.getFirstOMChild();
         while (child != null) {
             if (child.getType() == OMNode.TEXT_NODE) {
                 child.detach();
             }
-            child = child.getNextSibling();
+            child = child.getNextOMSibling();
         }
 
         this.addChild(OMAbstractFactory.getOMFactory().createText(this, text));
@@ -571,7 +571,7 @@
      */
     public String getText() {
         String childText = "";
-        OMNode child = this.getFirstChild();
+        OMNode child = this.getFirstOMChild();
         OMText textNode;
 
         while (child != null) {
@@ -582,7 +582,7 @@
                     childText += textNode.getText();
                 }
             }
-            child = child.getNextSibling();
+            child = child.getNextOMSibling();
         }
 
         return childText;
@@ -595,7 +595,7 @@
      */
     public String getTrimmedText() {
         String childText = "";
-        OMNode child = this.getFirstChild();
+        OMNode child = this.getFirstOMChild();
         OMText textNode;
 
         while (child != null) {
@@ -606,7 +606,7 @@
                     childText += textNode.getText().trim();
                 }
             }
-            child = child.getNextSibling();
+            child = child.getNextOMSibling();
         }
 
         return childText;
@@ -690,12 +690,12 @@
      * @return element
      */
     public OMElement getFirstElement() {
-        OMNode node = getFirstChild();
+        OMNode node = getFirstOMChild();
         while (node != null) {
             if (node.getType() == OMNode.ELEMENT_NODE) {
                 return (OMElement) node;
             } else {
-                node = node.getNextSibling();
+                node = node.getNextOMSibling();
             }
         }
         return null;

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java Sat Oct  1 04:44:28 2005
@@ -118,7 +118,7 @@
      *
      * @throws OMException
      */
-    public OMNode getNextSibling() throws OMException {
+    public OMNode getNextOMSibling() throws OMException {
         if ((nextSibling == null) && (parent != null) && !parent.isComplete()) {
             parent.buildNext();
         }
@@ -126,11 +126,11 @@
     }
 
     /**
-     * Method setNextSibling
+     * Method setNextOMSibling
      *
      * @param node
      */
-    public void setNextSibling(OMNode node) {
+    public void setNextOMSibling(OMNode node) {
         this.nextSibling = (OMNodeImpl) node;
     }
 
@@ -167,14 +167,14 @@
             throw new OMException(
                     "Elements that doesn't have a parent can not be detached");
         }
-        OMNodeImpl nextSibling = (OMNodeImpl) getNextSibling();
+        OMNodeImpl nextSibling = (OMNodeImpl) getNextOMSibling();
         if (previousSibling == null) {
             parent.setFirstChild(nextSibling);
         } else {
-            ((OMNodeEx)getPreviousSibling()).setNextSibling(nextSibling);
+            ((OMNodeEx)getPreviousOMSibling()).setNextOMSibling(nextSibling);
         }
         if (nextSibling != null) {
-            nextSibling.setPreviousSibling(getPreviousSibling());
+            nextSibling.setPreviousOMSibling(getPreviousOMSibling());
         }
         this.parent = null;
         return this;
@@ -196,13 +196,13 @@
         if (sibling instanceof OMNodeImpl) {
             OMNodeImpl siblingImpl = (OMNodeImpl) sibling;
             if (nextSibling == null) {
-                getNextSibling();
+                getNextOMSibling();
             }
-            siblingImpl.setPreviousSibling(this);
+            siblingImpl.setPreviousOMSibling(this);
             if (nextSibling != null) {
-                nextSibling.setPreviousSibling(sibling);
+                nextSibling.setPreviousOMSibling(sibling);
             }
-            ((OMNodeEx)sibling).setNextSibling(nextSibling);
+            ((OMNodeEx)sibling).setNextOMSibling(nextSibling);
             nextSibling = siblingImpl;
         }
     }
@@ -222,12 +222,12 @@
         ((OMNodeEx)sibling).setParent(parent);
         if (sibling instanceof OMNodeImpl) {
             OMNodeImpl siblingImpl = (OMNodeImpl) sibling;
-            siblingImpl.setPreviousSibling(previousSibling);
-            siblingImpl.setNextSibling(this);
+            siblingImpl.setPreviousOMSibling(previousSibling);
+            siblingImpl.setNextOMSibling(this);
             if (previousSibling == null) {
                 parent.setFirstChild(siblingImpl);
             } else {
-                previousSibling.setNextSibling(siblingImpl);
+                previousSibling.setNextOMSibling(siblingImpl);
             }
             previousSibling = siblingImpl;
         }
@@ -255,20 +255,20 @@
     }
 
     /**
-     * Method getPreviousSibling
+     * Method getPreviousOMSibling
      *
      * @return boolean
      */
-    public OMNode getPreviousSibling() {
+    public OMNode getPreviousOMSibling() {
         return previousSibling;
     }
 
     /**
-     * Method setPreviousSibling
+     * Method setPreviousOMSibling
      *
      * @param previousSibling
      */
-    public void setPreviousSibling(OMNode previousSibling) {
+    public void setPreviousOMSibling(OMNode previousSibling) {
         this.previousSibling = (OMNodeImpl) previousSibling;
     }
 

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java Sat Oct  1 04:44:28 2005
@@ -23,8 +23,8 @@
 import org.apache.axis2.om.impl.llom.serialize.StreamingOMSerializer;
 
 import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
 import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
 import java.util.Iterator;
 
 public class OMSerializerUtil {
@@ -150,8 +150,8 @@
 
     public static void serializeAttributes(OMElementImpl element,
                                            org.apache.axis2.om.impl.OMOutputImpl omOutput) throws XMLStreamException {
-        if (element.getAttributes() != null) {
-            Iterator attributesList = element.getAttributes();
+        if (element.getAllAttributes() != null) {
+            Iterator attributesList = element.getAllAttributes();
             while (attributesList.hasNext()) {
                 serializeAttribute((OMAttribute) attributesList.next(),
                         omOutput);

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java Sat Oct  1 04:44:28 2005
@@ -619,7 +619,7 @@
         } else {
             if (isStartElement() || (currentEvent == ATTRIBUTE)) {
                 OMElement elt = (OMElement) lastNode;
-                returnCount = getCount(elt.getAttributes());
+                returnCount = getCount(elt.getAllAttributes());
             } else {
                 throw new IllegalStateException(
                         "attribute count accessed in illegal event (" +
@@ -1174,7 +1174,7 @@
         OMAttribute returnAttrib = null;
         if (elt != null) {
             returnAttrib =
-                    (OMAttribute) getItemFromIterator(elt.getAttributes(),
+                    (OMAttribute) getItemFromIterator(elt.getAllAttributes(),
                             index);
         }
         return returnAttrib;

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java Sat Oct  1 04:44:28 2005
@@ -59,8 +59,8 @@
         } else if (lastNode.isComplete()) {
             e = factory.createOMElement(localName, null, lastNode.getParent(),
                     null);
-            ((OMNodeEx)lastNode).setNextSibling(e);
-            ((OMNodeEx)e).setPreviousSibling(lastNode);
+            ((OMNodeEx)lastNode).setNextOMSibling(e);
+            ((OMNodeEx)e).setPreviousOMSibling(lastNode);
         } else {
             OMElement parent = (OMElement) lastNode;
             e = factory.createOMElement(localName, null, (OMElement) lastNode,
@@ -144,8 +144,8 @@
                     factory.createText((OMElement) lastNode.getParent(),
                             new String(ch,
                                     start, length));
-            ((OMNodeEx)lastNode).setNextSibling(node);
-            ((OMNodeEx)node).setPreviousSibling(lastNode);
+            ((OMNodeEx)lastNode).setNextOMSibling(node);
+            ((OMNodeEx)node).setPreviousOMSibling(lastNode);
         } else {
             OMElement e = (OMElement) lastNode;
             node = factory.createText(e, new String(ch, start, length));

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java Sat Oct  1 04:44:28 2005
@@ -179,9 +179,9 @@
 
                 // TODO:
             } while (!parser.getName().equals(element.getQName()));
-            lastNode = element.getPreviousSibling();
+            lastNode = element.getPreviousOMSibling();
             if (lastNode != null) {
-                ((OMNodeEx)lastNode).setNextSibling(null);
+                ((OMNodeEx)lastNode).setNextOMSibling(null);
             } else {
                 OMElement parent = (OMElement) element.getParent();
                 if (parent == null) {

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java Sat Oct  1 04:44:28 2005
@@ -104,8 +104,8 @@
         } else if (lastNode.isComplete()) {
             node = omfactory.createOMElement(elementName, null,
                     lastNode.getParent(), this);
-            ((OMNodeEx)lastNode).setNextSibling(node);
-            ((OMNodeEx)node).setPreviousSibling(lastNode);
+            ((OMNodeEx)lastNode).setNextOMSibling(node);
+            ((OMNodeEx)node).setPreviousOMSibling(lastNode);
         } else {
             OMElement e = (OMElement) lastNode;
             node = omfactory.createOMElement(elementName, null,

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java Sat Oct  1 04:44:28 2005
@@ -129,8 +129,8 @@
                         constructNode((OMElement) lastNode.getParent(),
                                 elementName,
                                 false);
-                ((OMNodeEx)lastNode).setNextSibling(node);
-                ((OMNodeEx)node).setPreviousSibling(lastNode);
+                ((OMNodeEx)lastNode).setNextOMSibling(node);
+                ((OMNodeEx)node).setPreviousOMSibling(lastNode);
             } else {
                 OMElement e = (OMElement) lastNode;
                 node = constructNode((OMElement) lastNode, elementName, false);

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=292960&r1=292959&r2=292960&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 Sat Oct  1 04:44:28 2005
@@ -109,7 +109,7 @@
         if (hasNext()) {
             lastChild = currentChild;
             do{
-                currentChild = currentChild.getNextSibling();
+                currentChild = currentChild.getNextOMSibling();
             }while(currentChild!=null && currentChild.getType()!=OMNode.ELEMENT_NODE);
 
 

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=292960&r1=292959&r2=292960&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 Sat Oct  1 04:44:28 2005
@@ -108,7 +108,7 @@
         removeCalled = false;
         if (hasNext()) {
             lastChild = currentChild;
-            currentChild = currentChild.getNextSibling();
+            currentChild = currentChild.getNextOMSibling();
             return lastChild;
         }
         return null;

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=292960&r1=292959&r2=292960&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 Sat Oct  1 04:44:28 2005
@@ -72,7 +72,7 @@
                 } else {
 
                     // get the next named node
-                    currentChild = currentChild.getNextSibling();
+                    currentChild = currentChild.getNextOMSibling();
                     isMatchingNodeFound = needToMoveForward = !(currentChild
                             == null);
                 }
@@ -98,7 +98,7 @@
         nextCalled = true;
         removeCalled = false;
         lastChild = currentChild;
-        currentChild = currentChild.getNextSibling();
+        currentChild = currentChild.getNextOMSibling();
         return lastChild;
     }
 

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=292960&r1=292959&r2=292960&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 Sat Oct  1 04:44:28 2005
@@ -87,13 +87,13 @@
                     isMatchingNodeFound = true;
                     needToMoveForward = false;
                 } else {
-                    currentChild = currentChild.getNextSibling();
+                    currentChild = currentChild.getNextOMSibling();
                     needToMoveForward = !(currentChild == null);
                 }
             } else {
 
                 // get the next named node
-                currentChild = currentChild.getNextSibling();
+                currentChild = currentChild.getNextOMSibling();
                 needToMoveForward = !(currentChild == null);
             }
         }
@@ -109,7 +109,7 @@
         nextCalled = true;
         removeCalled = false;
         lastChild = currentChild;
-        currentChild = currentChild.getNextSibling();
+        currentChild = currentChild.getNextOMSibling();
         if ((lastChild != null) && detach && lastChild.getParent() != null) {
             lastChild.detach();
         }

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=292960&r1=292959&r2=292960&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 Sat Oct  1 04:44:28 2005
@@ -165,7 +165,7 @@
     private void compareAttibutes(OMElement elementOne, OMElement elementTwo) throws XMLComparisonException {
         int elementOneAtribCount = 0;
         int elementTwoAtribCount = 0;
-        Iterator attributes = elementOne.getAttributes();
+        Iterator attributes = elementOne.getAllAttributes();
         while (attributes.hasNext()) {
             OMAttribute omAttribute = (OMAttribute) attributes.next();
             OMAttribute attr = elementTwo.getFirstAttribute(
@@ -179,7 +179,7 @@
             elementOneAtribCount++;
         }
 
-        Iterator elementTwoIter = elementTwo.getAttributes();
+        Iterator elementTwoIter = elementTwo.getAllAttributes();
         while (elementTwoIter.hasNext()) {
             elementTwoIter.next();
             elementTwoAtribCount++;

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java Sat Oct  1 04:44:28 2005
@@ -319,7 +319,7 @@
     public Iterator getAttributeAxisIterator(Object contextNode) throws UnsupportedAxisException {
         if (isElement(contextNode)) {
             ArrayList attributes = new ArrayList();
-            Iterator i = ((OMElement) contextNode).getAttributes();
+            Iterator i = ((OMElement) contextNode).getAllAttributes();
             while (i != null && i.hasNext()) {
                 attributes.add(
                         new OMAttributeEx((OMAttribute) i.next(),
@@ -356,7 +356,7 @@
                 declaredNS.add(i.next());
             }
             declaredNS.add(element.getNamespace());
-            for (Iterator iter = element.getAttributes();
+            for (Iterator iter = element.getAllAttributes();
                  iter != null && iter.hasNext();) {
                 OMAttribute attr = (OMAttribute) iter.next();
                 declaredNS.add(attr.getNamespace());
@@ -471,7 +471,7 @@
         ArrayList list = new ArrayList();
         if (contextNode != null && contextNode instanceof OMNode) {
             while (contextNode != null && contextNode instanceof OMNode) {
-                contextNode = ((OMNode) contextNode).getNextSibling();
+                contextNode = ((OMNode) contextNode).getNextOMSibling();
                 if (contextNode != null)
                     list.add(contextNode);
             }
@@ -492,7 +492,7 @@
         ArrayList list = new ArrayList();
         if (contextNode != null && contextNode instanceof OMNode) {
             while (contextNode != null && contextNode instanceof OMNode) {
-                contextNode = ((OMNode) contextNode).getPreviousSibling();
+                contextNode = ((OMNode) contextNode).getPreviousOMSibling();
                 if (contextNode != null)
                     list.add(contextNode);
             }

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java Sat Oct  1 04:44:28 2005
@@ -124,9 +124,9 @@
             if (SOAPConstants.BODY_LOCAL_NAME.equals(element.getLocalName())) {
                 return (SOAPBody) element;
             } else {      // if not second element SHOULD be the body
-                OMNode node = element.getNextSibling();
+                OMNode node = element.getNextOMSibling();
                 while (node != null && node.getType() != OMNode.ELEMENT_NODE) {
-                    node = node.getNextSibling();
+                    node = node.getNextOMSibling();
                 }
                 element = (OMElement) node;
 

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPHeaderImpl.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPHeaderImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPHeaderImpl.java Sat Oct  1 04:44:28 2005
@@ -207,7 +207,7 @@
                     headers.add(header);
                 }
             }
-            node = node.getNextSibling();
+            node = node.getNextOMSibling();
 
         }
         return headers;

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java Sat Oct  1 04:44:28 2005
@@ -201,8 +201,8 @@
                     constructNode((OMElement) lastNode.getParent(),
                             elementName,
                             false);
-            ((OMNodeEx)lastNode).setNextSibling(node);
-            ((OMNodeEx)node).setPreviousSibling(lastNode);
+            ((OMNodeEx)lastNode).setNextOMSibling(node);
+            ((OMNodeEx)node).setPreviousOMSibling(lastNode);
         } else {
             OMElement e = (OMElement) lastNode;
             node = constructNode((OMElement) lastNode, elementName, false);

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11HeaderImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11HeaderImpl.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11HeaderImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11HeaderImpl.java Sat Oct  1 04:44:28 2005
@@ -70,7 +70,7 @@
     }
 
     public Iterator extractHeaderBlocks(String role) {
-        return new OMChildrenWithSpecificAttributeIterator(getFirstChild(),
+        return new OMChildrenWithSpecificAttributeIterator(getFirstOMChild(),
                 new QName(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
                         SOAP11Constants.ATTR_ACTOR),
                 role,

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12HeaderImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12HeaderImpl.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12HeaderImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12HeaderImpl.java Sat Oct  1 04:44:28 2005
@@ -75,7 +75,7 @@
 
 
     public Iterator extractHeaderBlocks(String role) {
-        return new OMChildrenWithSpecificAttributeIterator(getFirstChild(),
+        return new OMChildrenWithSpecificAttributeIterator(getFirstOMChild(),
                 new QName(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI,
                         SOAP12Constants.SOAP_ROLE),
                 role,

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/attachments/ImageSampleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/attachments/ImageSampleTest.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/attachments/ImageSampleTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/attachments/ImageSampleTest.java Sat Oct  1 04:44:28 2005
@@ -121,9 +121,9 @@
                 .getSOAPPartInputStream())));
         builder = new MTOMStAXSOAPModelBuilder(reader, mimeHelper, null);
         OMElement root = builder.getDocumentElement();
-        OMElement body = (OMElement) root.getFirstChild();
-        OMElement data = (OMElement) body.getFirstChild();
-        OMText blob = (OMText) data.getFirstChild();
+        OMElement body = (OMElement) root.getFirstOMChild();
+        OMElement data = (OMElement) body.getFirstOMChild();
+        OMText blob = (OMText) data.getFirstOMChild();
         /*
          * Following is the procedure the user has to follow to read objects in
          * OBBlob User has to know the object type & whether it is serializable.

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTest.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTest.java Sat Oct  1 04:44:28 2005
@@ -99,10 +99,10 @@
     public void testFirstChildDetach() throws Exception {
         OMElement root = envelope;
         assertFalse("Root should not be complete", root.isComplete());
-        OMNode oldFirstChild = root.getFirstChild();
+        OMNode oldFirstChild = root.getFirstOMChild();
         assertNotNull(oldFirstChild);
         oldFirstChild.detach();
-        OMNode newFirstChild = root.getFirstChild();
+        OMNode newFirstChild = root.getFirstOMChild();
         assertNotNull(newFirstChild);
         assertNotSame(oldFirstChild, newFirstChild);
     }

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestUtils.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestUtils.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestUtils.java Sat Oct  1 04:44:28 2005
@@ -40,7 +40,7 @@
     }
 
     public static void walkThrough(OMElement omEle) {
-        Iterator attibIt = omEle.getAttributes();
+        Iterator attibIt = omEle.getAllAttributes();
         if (attibIt != null) {
             while (attibIt.hasNext()) {
                 TestCase.assertNotNull("once the has next is not null, the " +
@@ -77,7 +77,7 @@
 
             //go through the attributes
             NamedNodeMap map = ele.getAttributes();
-            Iterator attIterator = omele.getAttributes();
+            Iterator attIterator = omele.getAllAttributes();
             OMAttribute omattribute;
             Attr domAttribute;
             String DOMAttrName;

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/builder/StAXOMBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/builder/StAXOMBuilderTest.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/builder/StAXOMBuilderTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/builder/StAXOMBuilderTest.java Sat Oct  1 04:44:28 2005
@@ -55,9 +55,9 @@
         assertTrue(" Name of the root element is wrong",
                 rootElement.getLocalName().equalsIgnoreCase("Root"));
         // get the first OMElement child
-        OMNode omnode = rootElement.getFirstChild();
+        OMNode omnode = rootElement.getFirstOMChild();
         while (omnode instanceof OMText) {
-            omnode = omnode.getNextSibling();
+            omnode = omnode.getNextOMSibling();
         }
         Iterator children = ((OMElement) omnode).getChildren();
         int childrenCount = 0;

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilderTest.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilderTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilderTest.java Sat Oct  1 04:44:28 2005
@@ -63,17 +63,17 @@
         OMElement root = builder.getDocumentElement();
 //        System.out.println(root.getLocalName() + " : "
 //                + root.getNamespace().getName());
-        OMElement body = (OMElement) root.getFirstChild();
+        OMElement body = (OMElement) root.getFirstOMChild();
 //        System.out.println(body.getLocalName() + " : "
 //                + body.getNamespace().getName());
 
-        OMElement data = (OMElement) body.getFirstChild();
+        OMElement data = (OMElement) body.getFirstOMChild();
 //        System.out.println(data.getLocalName() + " : "
 //                + data.getNamespace().getName());
         Iterator childIt = data.getChildren();
         //while (childIt.hasNext()) {
         OMElement child = (OMElement) childIt.next();
-        OMText blob = (OMText) child.getFirstChild();
+        OMText blob = (OMText) child.getFirstOMChild();
         /*
          * Following is the procedure the user has to follow to read objects in
          * OBBlob User has to know the object type & whether it is serializable.

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/serializer/ElementSerializerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/serializer/ElementSerializerTest.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/serializer/ElementSerializerTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/serializer/ElementSerializerTest.java Sat Oct  1 04:44:28 2005
@@ -74,7 +74,7 @@
 
     public void testElementSerilizationChild() throws Exception {
         OMElement elt = builder.getDocumentElement();
-        OMNode node = elt.getFirstChild().getNextSibling();
+        OMNode node = elt.getFirstOMChild().getNextOMSibling();
         node.serializeWithCache(writer);
 
     }

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java Sat Oct  1 04:44:28 2005
@@ -39,7 +39,7 @@
         OMElement documentElement = getSampleDocumentElement(testNamespace);
 
         Iterator childrenIter = new OMChildrenWithSpecificAttributeIterator(
-                documentElement.getFirstChild(), new QName(testNamespace.getName(), "myAttr",
+                documentElement.getFirstOMChild(), new QName(testNamespace.getName(), "myAttr",
                 testNamespace.getPrefix()), "Axis2", true);
 
         int childCount = getChidrenCount(childrenIter);
@@ -58,7 +58,7 @@
         OMElement documentElement = getSampleDocumentElement(testNamespace);
 
         Iterator childrenIter = new OMChildrenWithSpecificAttributeIterator(
-                documentElement.getFirstChild(), new QName(testNamespace.getName(), "myAttr",
+                documentElement.getFirstOMChild(), new QName(testNamespace.getName(), "myAttr",
                 testNamespace.getPrefix()), "Axis2", false);
 
         int childCount = getChidrenCount(childrenIter);

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/util/XMLComparator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/util/XMLComparator.java?rev=292960&r1=292959&r2=292960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/util/XMLComparator.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/util/XMLComparator.java Sat Oct  1 04:44:28 2005
@@ -109,7 +109,7 @@
 
 
     private void compareAttibutes(OMElement elementOne, OMElement elementTwo) throws XMLComparisonException {
-        Iterator attributes = elementOne.getAttributes();
+        Iterator attributes = elementOne.getAllAttributes();
         while (attributes.hasNext()) {
             OMAttribute omAttribute = (OMAttribute) attributes.next();
             OMAttribute attr = elementTwo.getFirstAttribute(



Mime
View raw message