You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2007/05/09 18:48:04 UTC
svn commit: r536582 - in /webservices/axis2/trunk/java/modules/integration:
itest-build.xml maven.xml pom.xml
Author: davidillsley
Date: Wed May 9 09:48:03 2007
New Revision: 536582
URL: http://svn.apache.org/viewvc?view=rev&rev=536582
Log:
Further factoring of common ant scripting to an ant file
Modified:
webservices/axis2/trunk/java/modules/integration/itest-build.xml
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/pom.xml
Modified: webservices/axis2/trunk/java/modules/integration/itest-build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/itest-build.xml?view=diff&rev=536582&r1=536581&r2=536582
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest-build.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/itest-build.xml Wed May 9 09:48:03 2007
@@ -1,5 +1,115 @@
<?xml version="1.0"?>
-<project name="itest" default="build-repos" basedir=".">
+<project name="itest" default="build-repos" basedir=".">
+ <target name="rpc-wsdl-codegen">
+ <echo>Running codegen RPC WSDLs - take 1</echo>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg line="-o target/rpc-test1 -uri test-resources/rpc/test-rpc-2.wsdl -uw"/>
+ </java>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/rpc-test1"
+ target="jar.client"/>
+
+ <echo>Running codegen RPC WSDLs - take 2</echo>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg line="-o target/rpc-test2 -uri test-resources/rpc/test-rpc-3.wsdl -uw"/>
+ </java>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/rpc-test2"
+ target="jar.client"/>
+
+
+ <echo>Running codegen RPC WSDLs - take 3</echo>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg line="-o target/rpc-test3 -uri test-resources/rpc/test-rpc-2.wsdl -uw"/>
+ </java>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/rpc-test3"
+ target="jar.client"/>
+
+ <echo>Running codegen RPC WSDLs - take 4</echo>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg line="-o target/rpc-test4 -uri test-resources/rpc/test-rpc-2.wsdl -uw -ss -sd"/>
+ </java>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/rpc-test4"
+ target="jar.server"/>
+
+ <echo>Running codegen RPC WSDLs with helper mode - take 1</echo>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg line="-o target/helper-test1 -uri test-resources/rpc/test-rpc-2.wsdl -u -Eh"/>
+ </java>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/helper-test1"
+ target="jar.client"/>
+
+ <echo>Running codegen RPC WSDLs with helper mode - take 2</echo>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg line="-o target/helper-test2 -uri test-resources/rpc/test-rpc-2.wsdl -u -Eh"/>
+ </java>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/helper-test2"
+ target="jar.client"/>
+ </target>
+
+ <target name="enterprise-wsdl-codegen">
+ <!-- codegen for the enterprise wsdl -->
+ <echo>Running codegen for Enterprise WSDL - take 1</echo>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg line="-d xmlbeans -o target/enterprise-test1 -s -uri test-resources/enterprise.wsdl"/>
+ </java>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/enterprise-test1"
+ target="jar.client"/>
+
+ <echo>Running codegen for Enterprise WSDL - take 2</echo>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg line="-o target/enterprise-test2 -s -uri test-resources/enterprise.wsdl"/>
+ </java>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/enterprise-test2"
+ target="jar.client"/>
+
+ <echo>Running codegen for Enterprise WSDL - take 3</echo>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg line="-d xmlbeans -ss -sd -g -o target/enterprise-test3 -s -uri test-resources/enterprise.wsdl"/>
+ </java>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/enterprise-test3"
+ target="jar.server"/>
+
+ <echo>Running codegen for Enterprise WSDL - take 4</echo>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg line="-ns2p urn:sobject.enterprise.soap.sforce.com=com.salesforce -d xmlbeans -ss -sd -g -o target/enterprise-test4 -s -uri test-resources/enterprise.wsdl"/>
+ </java>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/enterprise-test4"
+ target="jar.server"/>
+
+ <echo>Running codegen for eBaySvc WSDL</echo>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg line="-ss -sd -g -u -ssi -t -o target/eBaySvc -uri test-resources/eBaySvc.wsdl"/>
+ </java>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/eBaySvc"
+ target="jar.server"/>
+
+ <echo>Running codegen for eBaySvc WSDL Back word compatibiliy</echo>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg line="-ss -sd -g -t -u -ssi -b -s -o target/eBaySvcB -uri test-resources/eBaySvc.wsdl"/>
+ </java>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/eBaySvcB"
+ target="jar.server"/>
+
+ <echo>Running codegen for eBaySvc WSDL with un wrapping </echo>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg line="-ss -sd -ssi -u -g -t -uw -o target/eBaySvcUW -uri test-resources/eBaySvc.wsdl"/>
+ </java>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/eBaySvcUW"
+ target="jar.server"/>
+ </target>
+
<target name="build-repos">
<mkdir dir="target/test-resources/samples/modules"/>
<mkdir dir="target/test-resources/samples/conf"/>
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/maven.xml?view=diff&rev=536582&r1=536581&r2=536582
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Wed May 9 09:48:03 2007
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
-
<project default="jar"
xmlns:j="jelly:core"
xmlns:u="jelly:util"
@@ -43,6 +40,7 @@
</java>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/wsdl/documentunwrapping"/>
+
<ant:echo>Compiling RPCUnwrappingTest.wsdl </ant:echo>
<mkdir dir="${wsdl.output.base.dir}/rpcunwrapping"/>
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
@@ -102,110 +100,12 @@
</java>
<j:if test="${context.getVariable('skip.enterprise.tests') != 'true'}">
- <ant:echo>Running codegen RPC WSDLs - take 1</ant:echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-o target/rpc-test1 -uri test-resources/rpc/test-rpc-2.wsdl -uw"/>
- </java>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/rpc-test1"
- target="jar.client"/>
-
- <ant:echo>Running codegen RPC WSDLs - take 2</ant:echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-o target/rpc-test2 -uri test-resources/rpc/test-rpc-3.wsdl -uw"/>
- </java>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/rpc-test2"
- target="jar.client"/>
-
-
- <ant:echo>Running codegen RPC WSDLs - take 3</ant:echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-o target/rpc-test3 -uri test-resources/rpc/test-rpc-2.wsdl -uw"/>
- </java>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/rpc-test3"
- target="jar.client"/>
-
- <ant:echo>Running codegen RPC WSDLs - take 4</ant:echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-o target/rpc-test4 -uri test-resources/rpc/test-rpc-2.wsdl -uw -ss -sd"/>
- </java>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/rpc-test4"
- target="jar.server"/>
-
- <ant:echo>Running codegen RPC WSDLs with helper mode - take 1</ant:echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-o target/helper-test1 -uri test-resources/rpc/test-rpc-2.wsdl -u -Eh"/>
- </java>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/helper-test1"
- target="jar.client"/>
-
- <ant:echo>Running codegen RPC WSDLs with helper mode - take 2</ant:echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-o target/helper-test2 -uri test-resources/rpc/test-rpc-2.wsdl -u -Eh"/>
- </java>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/helper-test2"
- target="jar.client"/>
-
+ <ant:ant antfile="itest-build.xml" inheritall="true" inheritrefs="true"
+ dir="." target="rpc-wsdl-codegen"/>
<j:if test="${context.getVariable('maven.test.skip') != 'true'}">
-
- <!-- codegen for the enterprise wsdl -->
- <ant:echo>Running codegen for Enterprise WSDL - take 1</ant:echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-d xmlbeans -o target/enterprise-test1 -s -uri test-resources/enterprise.wsdl"/>
- </java>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/enterprise-test1"
- target="jar.client"/>
- <ant:echo>Running codegen for Enterprise WSDL - take 2</ant:echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-o target/enterprise-test2 -s -uri test-resources/enterprise.wsdl"/>
- </java>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/enterprise-test2"
- target="jar.client"/>
-
+ <ant:ant antfile="itest-build.xml" inheritall="true" inheritrefs="true"
+ dir="." target="enterprise-wsdl-codegen"/>
- <ant:echo>Running codegen for Enterprise WSDL - take 3</ant:echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-d xmlbeans -ss -sd -g -o target/enterprise-test3 -s -uri test-resources/enterprise.wsdl"/>
- </java>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/enterprise-test3"
- target="jar.server"/>
-
- <ant:echo>Running codegen for Enterprise WSDL - take 4</ant:echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-ns2p urn:sobject.enterprise.soap.sforce.com=com.salesforce -d xmlbeans -ss -sd -g -o target/enterprise-test4 -s -uri test-resources/enterprise.wsdl"/>
- </java>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/enterprise-test4"
- target="jar.server"/>
- <ant:echo>Running codegen for eBaySvc WSDL</ant:echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-ss -sd -g -u -ssi -t -o target/eBaySvc -uri test-resources/eBaySvc.wsdl"/>
- </java>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/eBaySvc"
- target="jar.server"/>
- <ant:echo>Running codegen for eBaySvc WSDL Back word compatibiliy</ant:echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-ss -sd -g -t -u -ssi -b -s -o target/eBaySvcB -uri test-resources/eBaySvc.wsdl"/>
- </java>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/eBaySvcB"
- target="jar.server"/>
- <ant:echo>Running codegen for eBaySvc WSDL with un wrapping </ant:echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-ss -sd -ssi -u -g -t -uw -o target/eBaySvcUW -uri test-resources/eBaySvc.wsdl"/>
- </java>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/eBaySvcUW"
- target="jar.server"/>
</j:if>
<j:jelly xmlns="jelly:ant">
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
Modified: webservices/axis2/trunk/java/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/pom.xml?view=diff&rev=536582&r1=536581&r2=536582
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/pom.xml Wed May 9 09:48:03 2007
@@ -260,7 +260,10 @@
tofile="target/test-classes/modules/addressing-${version}.mar"/>
<property name="axis2.home" value="${basedir}/target"/>
-
+ <property name="maven.junit.jvmargs" value=""/>
+ <path id="maven.dependency.classpath">
+ <path refid="maven.compile.classpath"/>
+ </path>
<!-- compiling some custom wsdl files -->
<property name="wsdl.source.dir" value="test-resources/wsdl"/>
<property name="wsdl.output.base.dir" value="target/wsdl"/>
@@ -336,112 +339,10 @@
<arg line="-src target/xmlbeans-src -d target/classes test-resources/xsd/type-test.xsd"/>
</java>
- <echo>Running codegen RPC WSDLs - take 1</echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg line="-o target/rpc-test1 -uri test-resources/rpc/test-rpc-2.wsdl -uw"/>
- </java>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/rpc-test1"
- target="jar.client"/>
-
- <echo>Running codegen RPC WSDLs - take 2</echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg line="-o target/rpc-test2 -uri test-resources/rpc/test-rpc-3.wsdl -uw"/>
- </java>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/rpc-test2"
- target="jar.client"/>
-
-
- <echo>Running codegen RPC WSDLs - take 3</echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg line="-o target/rpc-test3 -uri test-resources/rpc/test-rpc-2.wsdl -uw"/>
- </java>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/rpc-test3"
- target="jar.client"/>
-
- <echo>Running codegen RPC WSDLs - take 4</echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg line="-o target/rpc-test4 -uri test-resources/rpc/test-rpc-2.wsdl -uw -ss -sd"/>
- </java>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/rpc-test4"
- target="jar.server"/>
-
- <echo>Running codegen RPC WSDLs with helper mode - take 1</echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg line="-o target/helper-test1 -uri test-resources/rpc/test-rpc-2.wsdl -u -Eh"/>
- </java>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/helper-test1"
- target="jar.client"/>
-
- <echo>Running codegen RPC WSDLs with helper mode - take 2</echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg line="-o target/helper-test2 -uri test-resources/rpc/test-rpc-2.wsdl -u -Eh"/>
- </java>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/helper-test2"
- target="jar.client"/>
-
- <!-- codegen for the enterprise wsdl -->
- <echo>Running codegen for Enterprise WSDL - take 1</echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg line="-d xmlbeans -o target/enterprise-test1 -s -uri test-resources/enterprise.wsdl"/>
- </java>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true"
- dir="target/enterprise-test1"
- target="jar.client"/>
- <echo>Running codegen for Enterprise WSDL - take 2</echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg line="-o target/enterprise-test2 -s -uri test-resources/enterprise.wsdl"/>
- </java>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true"
- dir="target/enterprise-test2"
- target="jar.client"/>
-
-
- <echo>Running codegen for Enterprise WSDL - take 3</echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg line="-d xmlbeans -ss -sd -g -o target/enterprise-test3 -s -uri test-resources/enterprise.wsdl"/>
- </java>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true"
- dir="target/enterprise-test3"
- target="jar.server"/>
-
- <echo>Running codegen for Enterprise WSDL - take 4</echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg line="-ns2p urn:sobject.enterprise.soap.sforce.com=com.salesforce -d xmlbeans -ss -sd -g -o target/enterprise-test4 -s -uri test-resources/enterprise.wsdl"/>
- </java>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true"
- dir="target/enterprise-test4"
- target="jar.server"/>
- <echo>Running codegen for eBaySvc WSDL</echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg line="-ss -sd -g -u -ssi -o target/eBaySvc -uri test-resources/eBaySvc.wsdl"/>
- </java>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/eBaySvc"
- target="jar.server"/>
- <echo>Running codegen for eBaySvc WSDL Back word compatibiliy</echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg line="-ss -sd -g -u -ssi -b -s -o target/eBaySvcB -uri test-resources/eBaySvc.wsdl"/>
- </java>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/eBaySvcB"
- target="jar.server"/>
- <echo>Running codegen for eBaySvc WSDL with un wrapping</echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg line="-ss -sd -ssi -u -g -uw -o target/eBaySvcUW -uri test-resources/eBaySvc.wsdl"/>
- </java>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/eBaySvcUW"
- target="jar.server"/>
+ <ant antfile="itest-build.xml" inheritall="true" inheritrefs="true"
+ dir="." target="rpc-wsdl-codegen"/>
+ <ant antfile="itest-build.xml" inheritall="true" inheritrefs="true"
+ dir="." target="enterprise-wsdl-codegen"/>
<ant antfile="build.xml" inheritall="true" inheritrefs="true"
dir="test-resources/SOAP12Testing/SOAP12TestModuleB"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org