ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hemap...@apache.org
Subject svn commit: r209005 - in /webservices/axis/trunk/java: ./ etc/ modules/samples/ modules/tool/ modules/tool/src/org/apache/axis2/tool/ant/ modules/tool/src/org/apache/axis2/tool/util/
Date Mon, 04 Jul 2005 02:49:27 GMT
Author: hemapani
Date: Sun Jul  3 19:49:25 2005
New Revision: 209005

URL: http://svn.apache.org/viewcvs?rev=209005&view=rev
Log:
enable the ant wsdl2java in the build

Modified:
    webservices/axis/trunk/java/etc/project.properties
    webservices/axis/trunk/java/modules/samples/build.xml
    webservices/axis/trunk/java/modules/samples/maven.xml
    webservices/axis/trunk/java/modules/samples/project.xml
    webservices/axis/trunk/java/modules/tool/project.xml
    webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java
    webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/util/Constants.java
    webservices/axis/trunk/java/project.properties

Modified: webservices/axis/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/etc/project.properties?rev=209005&r1=209004&r2=209005&view=diff
==============================================================================
--- webservices/axis/trunk/java/etc/project.properties (original)
+++ webservices/axis/trunk/java/etc/project.properties Sun Jul  3 19:49:25 2005
@@ -16,7 +16,7 @@
 
 maven.repo.remote=http://www.apache.org/dist/java-repository/
 maven.multiproject.includes=modules/*/project.xml
-maven.multiproject.excludes=modules/tool/project.xml
+#maven.multiproject.excludes=modules/tool/project.xml
 
 maven.xdoc.date=left
 ## maven.xdoc.version=${pom.currentVersion}

Modified: webservices/axis/trunk/java/modules/samples/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/build.xml?rev=209005&r1=209004&r2=209005&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/build.xml (original)
+++ webservices/axis/trunk/java/modules/samples/build.xml Sun Jul  3 19:49:25 2005
@@ -20,8 +20,6 @@
 	<property name="AXIS_HOME" value="${env.AXIS_HOME}" />
 	<property name="axis.serverJarDrop.dir" value="${AXIS_HOME}/WEB-INF/services" />
 
-
-
 	<property name="conf.dir" value="conf"/>
 	
 	<path id="classpath.library">

Modified: webservices/axis/trunk/java/modules/samples/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/maven.xml?rev=209005&r1=209004&r2=209005&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/maven.xml (original)
+++ webservices/axis/trunk/java/modules/samples/maven.xml Sun Jul  3 19:49:25 2005
@@ -43,6 +43,7 @@
 
     <postGoal name="test:test">
         <attainGoal name="create-samples"/>
+       <!-- <attainGoal name="doInterop-test"/> -->
     </postGoal>
 
     <goal name="create-samples">
@@ -210,10 +211,18 @@
     
     <goal name="test-mtom">
     		<echo message="running MTOM tests"/>
+    		<echo message="${maven.repo.local}"/>
 			<junit printsummary="yes" haltonfailure="yes">
 					<classpath>
 					      <fileset dir="${maven.repo.local}">
         						<include name="j2ee/jars/***.jar"/>
+        						<include name="axis/jars/axis2-core-0.9.jar"/>
+        						<include name="axis/jars/axis2-xml-0.9.jar"/>
+        						<include name="axis/jars/axis2-wsdl-0.9.jar"/>
+        						<include name="axis/jars/axis-wsdl4j-1.2.jar"/>
+        						<include name="commons-logging/jars/commons-logging-1.0.3.jar"/>
+        						<include name="stax/jars/stax-1.1.1-dev.jar"/>
+        						<include name="stax/jars/stax-api-1.0.jar"/>
 					      </fileset>
 					      <pathelement location="target/test-classes" />
 				          <path refid="maven.dependency.classpath"/>
@@ -221,12 +230,65 @@
 				   <formatter type="plain"/>
 				   <test name="org.apache.axis2.engine.EchoRawMTOMToBase64Test" />
   				   <test name="org.apache.axis2.engine.EchoRawMTOMTest" />
-				   <!--
-				  <batchtest fork="yes" todir="${reports.tests}">
-					    <fileset dir="test">
-						      <include name="**MTOM*.java"/>
-     				    </fileset>
-				  </batchtest> -->
 			</junit>
+    </goal>
+
+    <goal name="test-mail">
+    		<echo message="running Mail tests"/>
+    		<echo message="${maven.repo.local}"/>
+			<junit printsummary="yes" haltonfailure="yes">
+					<classpath>
+					      <fileset dir="${maven.repo.local}">
+        						<include name="j2ee/jars/***.jar"/>
+        						<include name="axis/jars/axis2-core-0.9.jar"/>
+        						<include name="axis/jars/axis2-xml-0.9.jar"/>
+        						<include name="axis/jars/axis2-wsdl-0.9.jar"/>
+        						<include name="axis/jars/axis-wsdl4j-1.2.jar"/>
+        						<include name="commons-logging/jars/commons-logging-1.0.3.jar"/>
+        						<include name="stax/jars/stax-1.1.1-dev.jar"/>
+        						<include name="stax/jars/stax-api-1.0.jar"/>
+					      </fileset>
+					      <pathelement location="target/test-classes" />
+				          <path refid="maven.dependency.classpath"/>
+					 </classpath>
+				   <formatter type="plain"/>
+				   <test name="org.apache.axis2.mail.MailetRequestResponceRawXMLTest" />
+  				   <test name="org.apache.axis2.mail.MailOneWayRawXMLTest" />
+  				   <test name="org.apache.axis2.mail.MailRequestResponseRawXMLTest" />  				
  
+			</junit>
+    </goal>
+
+    
+    <goal name="doInterop-test">
+             <taskdef name="wsdl2java"
+                classname="org.apache.axis2.tool.ant.AntCodegenTask"
+                    classpathref="maven.dependency.classpath"/>
+               <j:set var="interop3.dir" value="target/interop3"/>
+               <j:set var="work.dir" value="${interop3.dir}/work"/>
+               <j:set var="calss.dir" value="${interop3.dir}/classes"/>
+                <j:set var="wsdl.dir" value="test-resources/wsdl"/>
+                       
+		       <wsdl2java WSDLFileName="test-resources/wsdl/compound2.wsdl" output="${work.dir}"/>
+		       <copy file="${wsdl.dir}/Client.java" todir="${work.dir}" overwrite="true" />
+               <copy file="${wsdl.dir}/echoEmployeeDatabindingSupporter.java" todir="${work.dir}/org/soapinterop/databinding"
overwrite="true" />
+               
+                <move todir="${classes.dir}/schema">
+            		<fileset dir="${work.dir}/schema"/>
+               </move>   
+    	
+              <javac srcdir="${work.dir}" destdir="${classes.dir}" debug="on">
+                  <classpath refid="maven.dependency.classpath" />
+              </javac>
+    	
+    	     <!-- Run the interop test -->
+    	     <java classname="Client">
+                <classpath refid="maven.dependency.classpath" />
+   		     </java>
+    	
+		    <junit dir="${classes.dir}" printsummary="yes" haltonfailure="yes">
+			    <classpath refid="maven.dependency.classpath" />
+			    <formatter type="plain"/>
+			    <test name="InteropClient2" />
+		    </junit>
     </goal>
  </project>

Modified: webservices/axis/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/project.xml?rev=209005&r1=209004&r2=209005&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/project.xml (original)
+++ webservices/axis/trunk/java/modules/samples/project.xml Sun Jul  3 19:49:25 2005
@@ -47,6 +47,11 @@
             <artifactId>addressing</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis2-tools</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
 
         <!-- external JARs -->
         <dependency>

Modified: webservices/axis/trunk/java/modules/tool/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/project.xml?rev=209005&r1=209004&r2=209005&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/project.xml (original)
+++ webservices/axis/trunk/java/modules/tool/project.xml Sun Jul  3 19:49:25 2005
@@ -32,10 +32,60 @@
 			<properties>
 				<module>true</module>
 			</properties>
-			<!--url>http://dist.codehaus.org/stax/jars/</url-->
 		</dependency>
+		 <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis2-wsdl</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+		 <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis-wsdl4j</artifactId>
+            <version>1.2</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
 	</dependencies>
 	
+	  <build>
+    <nagEmailAddress>axis-dev@ws.apache.org</nagEmailAddress>
+    <sourceDirectory>src</sourceDirectory>
+    <unitTestSourceDirectory>test</unitTestSourceDirectory>
+
+    <sourceModifications>
+		<sourceModification>
+			<className>fakeClass</className>
+			<excludes>
+				<exclude>**/codegen/**/*.java</exclude>
+				<exclude>**/core/**/*.java</exclude>
+				<exclude>**/service/**/*.java</exclude>
+			</excludes>
+		</sourceModification>
+	</sourceModifications>
+	
+    <unitTest>
+     <includes>
+        <include>**/*Test.java</include>
+      </includes>
+    </unitTest>
+
+    <resources>
+      <resource>
+        <directory>conf</directory>
+        <includes>
+          <include>**/*.properties</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src</directory>
+        <includes>
+          <include>**/*.properties</include>
+          <include>**/*.xml</include>
+        </includes>
+      </resource>
+        </resources>
+  </build>
 	<reports/>
 	
 </project>

Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java?rev=209005&r1=209004&r2=209005&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java
(original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java
Sun Jul  3 19:49:25 2005
@@ -1,22 +1,24 @@
-package org.apache.axis.tool.ant;
+package org.apache.axis2.tool.ant;
 
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildException;
-import org.apache.wsdl.WSDLDescription;
-import org.apache.axis.wsdl.codegen.CodeGenConfiguration;
-import org.apache.axis.wsdl.codegen.CodeGenerationEngine;
-import org.apache.axis.wsdl.codegen.CommandLineOptionConstants;
-import org.apache.axis.wsdl.codegen.CommandLineOption;
-import org.apache.axis.wsdl.builder.WOMBuilderFactory;
-import org.apache.axis.wsdl.util.URLProcessor;
-
-import javax.wsdl.WSDLException;
-import java.util.Map;
-import java.util.HashMap;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.wsdl.WSDLException;
+
+import org.apache.axis2.wsdl.WSDLVersionWrapper;
+import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
+import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
+import org.apache.axis2.wsdl.codegen.CodeGenerationEngine;
+import org.apache.axis2.wsdl.codegen.CommandLineOption;
+import org.apache.axis2.wsdl.codegen.CommandLineOptionConstants;
+import org.apache.axis2.wsdl.util.URLProcessor;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.apache.wsdl.WSDLDescription;
 
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
@@ -116,7 +118,8 @@
     private WSDLDescription getWOM(String wsdlLocation) throws WSDLException ,
             IOException {
         InputStream in = new FileInputStream(new File(wsdlLocation));
-        return WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in);
+        WSDLVersionWrapper wsdlvWrap =  WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in);
+        return wsdlvWrap.getDescription();
     }
 
     private String[] getStringArray(String value) {

Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/util/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/util/Constants.java?rev=209005&r1=209004&r2=209005&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/util/Constants.java
(original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/util/Constants.java
Sun Jul  3 19:49:25 2005
@@ -1,4 +1,4 @@
-package org.apache.axis.tool.util;
+package org.apache.axis2.tool.util;
 
 /*
  * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/project.properties?rev=209005&r1=209004&r2=209005&view=diff
==============================================================================
--- webservices/axis/trunk/java/project.properties (original)
+++ webservices/axis/trunk/java/project.properties Sun Jul  3 19:49:25 2005
@@ -22,9 +22,9 @@
 modules/saaj/project.xml,\
 modules/samples/project.xml,\
 modules/wsdl/project.xml,\
-modules/xml/project.xml
-
-maven.multiproject.excludes=\
+modules/xml/project.xml,\
 modules/tool/project.xml
+
+
 
 maven.allreports.disable=true



Mime
View raw message