Author: davidillsley
Date: Sat Jun 9 06:51:38 2007
New Revision: 545745
URL: http://svn.apache.org/viewvc?view=rev&rev=545745
Log:
Clean up integration module. Move non-integration tests into 'manual' directory
to keep them out of the way.
Apologies if this breaks things temporarily
Added:
webservices/axis2/trunk/java/modules/integration/manual/
webservices/axis2/trunk/java/modules/integration/manual/build.xml
- copied unchanged from r545657,
webservices/axis2/trunk/java/modules/integration/build.xml
webservices/axis2/trunk/java/modules/integration/manual/doclit-interop/
- copied from r545657,
webservices/axis2/trunk/java/modules/integration/doclit-interop/
webservices/axis2/trunk/java/modules/integration/manual/doclit-interop/clients/
- copied from r545662,
webservices/axis2/trunk/java/modules/integration/doclit-interop/clients/
webservices/axis2/trunk/java/modules/integration/manual/itest/
- copied from r545657,
webservices/axis2/trunk/java/modules/integration/itest/
webservices/axis2/trunk/java/modules/integration/manual/itest-resources/
- copied from r545657,
webservices/axis2/trunk/java/modules/integration/itest-resources/
webservices/axis2/trunk/java/modules/integration/manual/itest-resources/WSDLs/
- copied from r545662,
webservices/axis2/trunk/java/modules/integration/itest-resources/WSDLs/
webservices/axis2/trunk/java/modules/integration/manual/itest-resources/integrationRepo/
- copied from r545662,
webservices/axis2/trunk/java/modules/integration/itest-resources/integrationRepo/
webservices/axis2/trunk/java/modules/integration/manual/itest-resources/interop/
- copied from r545662,
webservices/axis2/trunk/java/modules/integration/itest-resources/interop/
webservices/axis2/trunk/java/modules/integration/manual/itest-resources/mtom/
- copied from r545662,
webservices/axis2/trunk/java/modules/integration/itest-resources/mtom/
webservices/axis2/trunk/java/modules/integration/manual/itest/org/
- copied from r545662,
webservices/axis2/trunk/java/modules/integration/itest/org/
webservices/axis2/trunk/java/modules/integration/manual/itest/test/
- copied from r545662,
webservices/axis2/trunk/java/modules/integration/itest/test/
webservices/axis2/trunk/java/modules/integration/manual/src/
- copied from r545657,
webservices/axis2/trunk/java/modules/integration/src/
webservices/axis2/trunk/java/modules/integration/manual/src/test/
- copied from r545662,
webservices/axis2/trunk/java/modules/integration/src/test/
webservices/axis2/trunk/java/modules/integration/manual/test/
webservices/axis2/trunk/java/modules/integration/manual/test/org/
webservices/axis2/trunk/java/modules/integration/manual/test/org/apache/
webservices/axis2/trunk/java/modules/integration/manual/test/org/apache/axis2/
webservices/axis2/trunk/java/modules/integration/manual/test/org/apache/axis2/interop/
- copied from r545657,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/interop/
webservices/axis2/trunk/java/modules/integration/manual/test/org/apache/axis2/interop/whitemesa/
- copied from r545662,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/interop/whitemesa/
webservices/axis2/trunk/java/modules/integration/manual/test/org/apache/axis2/soap12testing/
- copied from r545657,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/soap12testing/
webservices/axis2/trunk/java/modules/integration/manual/test/org/apache/axis2/soap12testing/soap12testsuite/
- copied from r545662,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/soap12testing/soap12testsuite/
webservices/axis2/trunk/java/modules/integration/manual/test/samples/
- copied from r545657,
webservices/axis2/trunk/java/modules/integration/test/samples/
webservices/axis2/trunk/java/modules/integration/manual/test/samples/wsdl/
- copied from r545662,
webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/
Removed:
webservices/axis2/trunk/java/modules/integration/build.xml
webservices/axis2/trunk/java/modules/integration/doclit-interop/
webservices/axis2/trunk/java/modules/integration/itest/
webservices/axis2/trunk/java/modules/integration/itest-resources/
webservices/axis2/trunk/java/modules/integration/src/
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/interop/
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/soap12testing/
webservices/axis2/trunk/java/modules/integration/test/samples/
Modified:
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/pom.xml
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=545745&r1=545744&r2=545745
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Sat Jun 9
06:51:38 2007
@@ -7,12 +7,6 @@
xmlns:ant="jelly:ant">
<j:set var="samples.dir" value="target/samples"/>
- <postGoal name="itest:compile">
- <mkdir dir="target/itest-classes/modules"/>
- <copy file="../addressing/target/addressing-${addressing_version}.mar"
-
tofile="target/itest-classes/modules/addressing-${addressing_version}.mar"/>
- </postGoal>
-
<preGoal name="test:compile">
<!-- Set a property that can be picked up from the ant
build.xml's -->
@@ -50,48 +44,6 @@
<arg line="-o target/wsdl/rpcunwrapping -ss -sd -ssi -u -g -uw
-uri test-resources/wsdl/RPCUnwrappingTest.wsdl"/>
</java>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
dir="target/wsdl/rpcunwrapping"/>
-
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-d xmlbeans -p samples.wsdl.perf -o
target/perf -s -t -ss -sd -g -uri test/samples/wsdl/perf/perf.wsdl"/>
- </java>
- <ant:copy overwrite="yes"
todir="target/perf/src/samples/wsdl/perf">
- <ant:fileset dir="test/samples/wsdl/perf">
- <ant:include name="*Skeleton.java"/>
- </ant:fileset>
- </ant:copy>
- <ant:ant antfile="build.xml" inheritall="true"
inheritrefs="true" dir="target/perf"
- target="make.repo"/>
- <ant:ant antfile="build.xml" inheritall="true"
inheritrefs="true" dir="target/perf"
- target="jar.client"/>
- <ant:move
file="target/perf/build/lib/Services-test-client.jar"
-
tofile="target/perf/build/lib/PerfSoapService-test-client.jar" />
-
- <ant:move file="target/perf/build/lib/Services.aar"
- tofile="target/perf/build/lib/PerfSoapService.aar" />
-
- <ant:path id="samples.wsdl.perf.client.jar"
-
location="target/perf/build/lib/PerfSoapService-test-client.jar"/>
-
- <maven:addPath id="maven.dependency.classpath"
refid="samples.wsdl.perf.client.jar"/>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-d adb -p samples.wsdl.perf2 -o target/perf2
-s -t -ss -sd -g -uri test/samples/wsdl/perf2/perf.wsdl"/>
- </java>
- <ant:copy overwrite="yes"
todir="target/perf2/src/samples/wsdl/perf2">
- <ant:fileset dir="test/samples/wsdl/perf2">
- <ant:include name="*Skeleton.java"/>
- </ant:fileset>
- </ant:copy>
- <ant:ant antfile="build.xml" inheritall="true"
inheritrefs="true" dir="target/perf2"
- target="make.repo"/>
- <ant:ant antfile="build.xml" inheritall="true"
inheritrefs="true" dir="target/perf2"
- target="jar.client"/>
- <ant:move
file="target/perf2/build/lib/Services-test-client.jar"
-
tofile="target/perf2/build/lib/PerfSoapService2-test-client.jar" />
- <ant:path id="samples.wsdl.perf2.client.jar"
-
location="target/perf2/build/lib/PerfSoapService2-test-client.jar"/>
- <maven:addPath id="maven.dependency.classpath"
refid="samples.wsdl.perf2.client.jar"/>
<!-- compile the schema for XMLbeans -->
<java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler"
fork="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=545745&r1=545744&r2=545745
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/pom.xml Sat Jun 9
06:51:38 2007
@@ -341,48 +341,6 @@
<ant antfile="build.xml" inheritall="true"
inheritrefs="true"
dir="target/wsdl/rpcunwrapping"/>
- <java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath
refid="maven.runtime.classpath"/>
- <arg line="-d xmlbeans -p
samples.wsdl.perf -o target/perf -s -ss -sd -g -uri
test/samples/wsdl/perf/perf.wsdl"/>
- </java>
- <copy overwrite="yes"
todir="target/perf/src/samples/wsdl/perf">
- <fileset dir="test/samples/wsdl/perf">
- <include name="*Skeleton.java"/>
- </fileset>
- </copy>
- <ant antfile="build.xml" inheritall="true"
inheritrefs="true" dir="target/perf"
- target="make.repo"/>
- <ant antfile="build.xml" inheritall="true"
inheritrefs="true" dir="target/perf"
- target="jar.client"/>
- <move
file="target/perf/build/lib/Services-test-client.jar"
-
tofile="target/perf/build/lib/PerfSoapService-test-client.jar"/>
-
- <move file="target/perf/build/lib/Services.aar"
-
tofile="target/perf/build/lib/PerfSoapService.aar"/>
-
- <path id="samples.wsdl.perf.client.jar"
-
location="target/perf/build/lib/PerfSoapService-test-client.jar"/>
- <delete
file="target/perf/src/samples/wsdl/perf/PerfPortTypeSkeleton.java"/>
-
- <java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath
refid="maven.runtime.classpath"/>
- <arg line="-d adb -p samples.wsdl.perf2 -o
target/perf2 -s -ss -sd -g -uri test/samples/wsdl/perf2/perf.wsdl"/>
- </java>
- <copy overwrite="yes"
todir="target/perf2/src/samples/wsdl/perf2">
- <fileset dir="test/samples/wsdl/perf2">
- <include name="*Skeleton.java"/>
- </fileset>
- </copy>
- <ant antfile="build.xml" inheritall="true"
inheritrefs="true" dir="target/perf2"
- target="make.repo"/>
- <ant antfile="build.xml" inheritall="true"
inheritrefs="true" dir="target/perf2"
- target="jar.client"/>
- <move
file="target/perf2/build/lib/Services-test-client.jar"
-
tofile="target/perf2/build/lib/PerfSoapService2-test-client.jar"/>
- <path id="samples.wsdl.perf2.client.jar"
-
location="target/perf2/build/lib/PerfSoapService2-test-client.jar"/>
- <delete
file="target/perf2/src/samples/wsdl/perf2/PerfPortTypeSkeleton.java"/>
-
<!-- compile the schema for XMLbeans -->
<java
classname="org.apache.xmlbeans.impl.tool.SchemaCompiler" fork="true">
<classpath
refid="maven.runtime.classpath"/>
@@ -419,25 +377,6 @@
<goals>
<goal>run</goal>
</goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-test-source</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/perf2/src/</source>
- <source>${basedir}/target/perf/src/</source>
- </sources>
- </configuration>
</execution>
</executions>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
