axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ruchi...@apache.org
Subject svn commit: r320692 - in /webservices/axis2/trunk/java/modules: integration/ xml/src/org/apache/axis2/om/ xml/src/org/apache/axis2/om/impl/dom/ xml/src/org/apache/axis2/om/impl/llom/ xml/src/org/apache/axis2/om/impl/llom/builder/ xml/src/org/apache/axi...
Date Thu, 13 Oct 2005 08:28:06 GMT
Author: ruchithf
Date: Thu Oct 13 01:27:42 2005
New Revision: 320692

URL: http://svn.apache.org/viewcvs?rev=320692&view=rev
Log:
Changed OMDocument.get/setDocumentOMElement to OMDocument.get/setOMDocumentElement, added
a missing exception class and updated maven.xml of the integration module to remove unnecessary
stuff

Added:
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/dom/OMDOMException.java
Modified:
    webservices/axis2/trunk/java/modules/integration/maven.xml
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMDocument.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/dom/DocumentImpl.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/builder/StAXOMBuilder.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPMessageImpl.java
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java

Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=320692&r1=320691&r2=320692&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Thu Oct 13 01:27:42 2005
@@ -411,11 +411,6 @@
 	    basedir="../security/target/interop/classes" />
 
 
-	<!-- Repository for RPCInOutTest -->
-        <mkdir dir="target/test-resources/rpc_repo"/>
-        <copy file="../addressing/target/addressing.mar"
-            tofile="target/test-resources/rpc_repo/modules/addressing.mar"/>	
-
 
     <!-- Standard repository -->
     <mkdir dir="target/Repository"/>

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMDocument.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMDocument.java?rev=320692&r1=320691&r2=320692&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMDocument.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMDocument.java Thu Oct
13 01:27:42 2005
@@ -37,13 +37,13 @@
 	 * Returns the document element
 	 * @return
 	 */
-	public OMElement getDocumentOMElement();
+	public OMElement getOMDocumentElement();
 	
 	/**
 	 * Sets the document element of the XML document
 	 * @param rootElement
 	 */
-	public void setDocumentOMElement(OMElement rootElement);
+	public void setOMDocumentElement(OMElement rootElement);
 	
 	/**
 	 * Returns the XML version

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/dom/DocumentImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/dom/DocumentImpl.java?rev=320692&r1=320691&r2=320692&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/dom/DocumentImpl.java
(original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/dom/DocumentImpl.java
Thu Oct 13 01:27:42 2005
@@ -241,7 +241,7 @@
 		throw new UnsupportedOperationException("TODO");
 	}
 
-	public void setDocumentOMElement(OMElement rootElement) {
+	public void setOMDocumentElement(OMElement rootElement) {
 		//TODO
 		throw new UnsupportedOperationException("TODO");
 	}
@@ -256,7 +256,7 @@
 		throw new UnsupportedOperationException("TODO");
 	}
 
-	public OMElement getDocumentOMElement() {
+	public OMElement getOMDocumentElement() {
 		// TODO Auto-generated method stub
 		return null;
 	}

Added: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/dom/OMDOMException.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/dom/OMDOMException.java?rev=320692&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/dom/OMDOMException.java
(added)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/dom/OMDOMException.java
Thu Oct 13 01:27:42 2005
@@ -0,0 +1,42 @@
+/*
+ * 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.dom;
+
+import org.apache.axis2.om.OMException;
+/**
+ * OMDOM specific exception
+ * 
+ * @author Ruchith Fernando (ruchith.fernando@gmail.com)
+ */
+public class OMDOMException extends OMException {
+
+	public OMDOMException() {
+		super();
+	}
+
+	public OMDOMException(String arg0) {
+		super(arg0);
+	}
+
+	public OMDOMException(Throwable arg0) {
+		super(arg0);
+	}
+
+	public OMDOMException(String arg0, Throwable arg1) {
+		super(arg0, arg1);
+	}
+
+}

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=320692&r1=320691&r2=320692&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
Thu Oct 13 01:27:42 2005
@@ -102,7 +102,7 @@
      *
      * @return
      */
-    public OMElement getDocumentOMElement() {
+    public OMElement getOMDocumentElement() {
         while (rootElement == null) {
             parserWrapper.next();
         }
@@ -114,7 +114,7 @@
      *
      * @param rootElement
      */
-    public void setDocumentOMElement(OMElement rootElement) {
+    public void setOMDocumentElement(OMElement rootElement) {
         this.rootElement = rootElement;
     }
 

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=320692&r1=320691&r2=320692&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
Thu Oct 13 01:27:42 2005
@@ -99,7 +99,7 @@
         String elementName = parser.getLocalName();
         if (lastNode == null) {
             node = omfactory.createOMElement(elementName, null, null, this);
-            document.setDocumentOMElement(node);
+            document.setOMDocumentElement(node);
             document.addChild(node);
         } else if (lastNode.isComplete()) {
             node = omfactory.createOMElement(elementName, null,
@@ -286,7 +286,7 @@
      * @return root element
      */
     public OMElement getDocumentElement() {
-        return document.getDocumentOMElement();
+        return document.getOMDocumentElement();
     }
 
     /**

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPMessageImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPMessageImpl.java?rev=320692&r1=320691&r2=320692&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPMessageImpl.java
(original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPMessageImpl.java
Thu Oct 13 01:27:42 2005
@@ -42,7 +42,7 @@
 
 
     public SOAPEnvelope getSOAPEnvelope() throws SOAPProcessingException {
-        return (SOAPEnvelope) getDocumentOMElement();
+        return (SOAPEnvelope) getOMDocumentElement();
     }
 
     public void setSOAPEnvelope(SOAPEnvelope envelope) throws SOAPProcessingException {
@@ -50,7 +50,7 @@
         this.rootElement = envelope;
     }
 
-    public void setDocumentOMElement(OMElement rootElement) {
+    public void setOMDocumentElement(OMElement rootElement) {
         throw new UnsupportedOperationException("This is not allowed. Use set SOAPEnvelope
instead");
     }
 

Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java?rev=320692&r1=320691&r2=320692&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java
(original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java
Thu Oct 13 01:27:42 2005
@@ -54,7 +54,7 @@
 		documentElement.addChild(child1);
 		
 		document = factory.createOMDocument();
-		document.setDocumentOMElement(documentElement);
+		document.setOMDocumentElement(documentElement);
 		
 	}
 	



Mime
View raw message