axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hemap...@apache.org
Subject svn commit: r126214 - in webservices/axis/trunk/java/dev/scratch/prototype2: . src/conf src/docs src/html src/samples/deployment/service1 src/samples/deployment/service2 src/test/org/apache/axis/om
Date Sun, 23 Jan 2005 15:38:30 GMT
Author: hemapani
Date: Sun Jan 23 07:38:30 2005
New Revision: 126214

URL: http://svn.apache.org/viewcvs?view=rev&rev=126214
Log:

Added:
   webservices/axis/trunk/java/dev/scratch/prototype2/src/conf/web.xml
   webservices/axis/trunk/java/dev/scratch/prototype2/src/html/
   webservices/axis/trunk/java/dev/scratch/prototype2/src/html/index.html
Modified:
   webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml
   webservices/axis/trunk/java/dev/scratch/prototype2/project.xml
   webservices/axis/trunk/java/dev/scratch/prototype2/src/docs/TODO.txt
   webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Handler1.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Handler2.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTestUtils.java

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml?view=diff&rev=126214&p1=webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml&r1=126213&p2=webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml&r2=126214
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml	(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml	Sun Jan 23 07:38:30 2005
@@ -20,5 +20,28 @@
 	<postGoal name="jar">
         <ant:mkdir dir="${maven.repo.local}/axis/jars"/>
 		<ant:copy file="${basedir}/target/axis2-M1.jar" tofile="${maven.repo.local}/axis/jars/axis2-M1.jar"/>
-              </postGoal>
+     </postGoal>
+    <goal name="war" prereqs="jar">
+		<war destfile="target/axis2.war" webxml="src/conf/web.xml">
+		  <fileset dir="src/html"/>
+		  <lib dir="${maven.repo.local}/stax/jars/">
+		    <include name="stax-api-1.0.jar"/>
+		    <include name="stax-1.1.1-dev.jar"/>		    
+		  </lib>  
+		  <lib dir="${maven.repo.local}/commons-logging/jars/">
+		    <include name="commons-logging-1.0.3.jar"/>
+		  </lib>  
+		  <lib dir="${maven.repo.local}/axis/jars/">
+		    <include name="axis-wsdl4j-1.2-RC1.jar"/>
+		  </lib>  
+		  <lib dir="${maven.repo.local}/log4j/jars/">
+		    <include name="log4j-1.2.8.jar"/>
+		  </lib>  
+		  <lib dir="target/">
+		    <include name="axis2*.jar"/>
+		  </lib>  
+		</war>
+
+
+    </goal>
  </project>

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/project.xml
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/project.xml?view=diff&rev=126214&p1=webservices/axis/trunk/java/dev/scratch/prototype2/project.xml&r1=126213&p2=webservices/axis/trunk/java/dev/scratch/prototype2/project.xml&r2=126214
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/project.xml	(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/project.xml	Sun Jan 23 07:38:30 2005
@@ -202,7 +202,7 @@
                 <module>true</module>
             </properties>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>xpp3</groupId>
             <artifactId>xpp3</artifactId>
             <version>1.1.3.3</version>
@@ -210,6 +210,8 @@
                 <module>true</module>
             </properties>
         </dependency>
+        
+-->        
         <dependency>
             <groupId>axis</groupId>
             <artifactId>axis-wsdl4j</artifactId>

Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/conf/web.xml
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/conf/web.xml?view=auto&rev=126214
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/conf/web.xml	Sun Jan 23 07:38:30
2005
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+  <display-name>Apache-Axis2</display-name>
+  <servlet>
+    <servlet-name>AxisServlet</servlet-name>
+    <display-name>Apache-Axis Servlet</display-name>
+    <servlet-class>
+        org.apache.axis.impl.transport.http.AxisServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>AxisServlet</servlet-name>
+    <url-pattern>/servlet/AxisServlet</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>AxisServlet</servlet-name>
+    <url-pattern>*.jws</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>AxisServlet</servlet-name>
+    <url-pattern>/services/*</url-pattern>
+  </servlet-mapping>
+</web-app>

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/docs/TODO.txt
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/docs/TODO.txt?view=diff&rev=126214&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/docs/TODO.txt&r1=126213&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/docs/TODO.txt&r2=126214
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/docs/TODO.txt	(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/docs/TODO.txt	Sun Jan 23 07:38:30
2005
@@ -1,3 +1,12 @@
 how the DD are parsed
 
-getNSURI() for OMElement
\ No newline at end of file
+getNSURI() for OMElement
+war/dist tragets for the axis2
+docs
+welcome page for axis2
+admin page for axis2
+axis2 "good looking sample"
+axis performance analysis
+handle the error shown by the deployment
+
+

Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/html/index.html
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/html/index.html?view=auto&rev=126214
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/html/index.html	Sun Jan 23 07:38:30
2005
@@ -0,0 +1,6 @@
+<html>
+	<head></head>
+	<body>
+		<h1>Apache Axis2</h1>	
+	</body>
+</html>
\ No newline at end of file

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Handler1.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Handler1.java?view=diff&rev=126214&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Handler1.java&r1=126213&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Handler1.java&r2=126214
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Handler1.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Handler1.java
Sun Jan 23 07:38:30 2005
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-package org.apache.axis.registry;
-
 import javax.xml.namespace.QName;
 
 import org.apache.axis.context.MessageContext;

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Handler2.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Handler2.java?view=diff&rev=126214&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Handler2.java&r1=126213&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Handler2.java&r2=126214
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Handler2.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Handler2.java
Sun Jan 23 07:38:30 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.axis.registry;
+
 
 import javax.xml.namespace.QName;
 

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTestUtils.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTestUtils.java?view=diff&rev=126214&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTestUtils.java&r1=126213&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTestUtils.java&r2=126214
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTestUtils.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMTestUtils.java
Sun Jan 23 07:38:30 2005
@@ -17,6 +17,8 @@
 package org.apache.axis.om;
 
 import junit.framework.TestCase;
+
+import org.apache.axis.engine.AxisFault;
 import org.apache.axis.impl.llom.factory.OMXMLBuilderFactory;
 import org.w3c.dom.*;
 
@@ -64,20 +66,22 @@
             //go through the attributes
             NamedNodeMap map =  ele.getAttributes();
             Iterator attIterator = omele.getAttributes();
-            OMAttribute OMattribute;
-            Attr DOMAttribute;
+            OMAttribute omattribute;
+            Attr domAttribute;
             String DOMAttrName;
-            int length = map.getLength();
-            for (int i=0;i<length;i++){
-                DOMAttribute = (Attr)map.item(i);
-                DOMAttrName = DOMAttribute.getName();
-                if (!DOMAttrName.startsWith("xmlns")){
-                    TestCase.assertTrue(attIterator.hasNext());
-                    OMattribute = (OMAttribute)attIterator.next();
-                    TestCase.assertEquals(DOMAttribute.getLocalName(),OMattribute.getLocalName());
+            
+            while (attIterator.hasNext() && map == null) {
+                omattribute = (OMAttribute)attIterator.next(); 
+                
+                Node node = map.getNamedItemNS(omattribute.getNamespace().getName(),omattribute.getLocalName());
+                if(node.getNodeType() == Node.ATTRIBUTE_NODE){
+                    Attr attr = (Attr)node;
+                    TestCase.assertEquals(attr.getValue(),omattribute.getValue());
+                }else{
+                    throw new AxisFault("return type is not a Attribute");
                 }
+                
             }
-
 
             Iterator it = omele.getChildren();
             NodeList list = ele.getChildNodes();

Mime
View raw message