dims 2002/09/30 07:44:54
Modified: java buildTest.xml
java/xmls targets.xml
Log:
- Current test harness was running ALL tests with signature signing on (when
xml-security is present). This is an overkill
- Switch to old behavior of running just a few tests with signature signing on.
Revision Changes Path
1.42 +2 -2 xml-axis/java/buildTest.xml
Index: buildTest.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/buildTest.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- buildTest.xml 26 Sep 2002 19:57:40 -0000 1.41
+++ buildTest.xml 30 Sep 2002 14:44:54 -0000 1.42
@@ -159,7 +159,7 @@
<!-- =================================================================== -->
<!-- Runs the JUnit functional test -->
<!-- =================================================================== -->
- <target name="junit-functional" if="junit.present"
depends="junit-functional-prepare,start-signature-signing-and-verification">
+ <target name="junit-functional" if="junit.present"
depends="junit-functional-prepare">
<java classname="org.apache.axis.client.AdminClient" fork="yes">
<classpath refid="classpath" />
<arg line="${deploy.xml.property}"/>
@@ -230,7 +230,7 @@
<runaxisfunctionaltests
url="http://localhost:8088";
startTarget1="start-functional-test-tcp-server"
- startTarget2="start-functional-test-http-server"
+ startTarget2="start-functional-test-http-server-secure"
testTarget="junit-functional-secure"
stopTarget="stop-functional-test-http-server-secure" />
1.38 +18 -1 xml-axis/java/xmls/targets.xml
Index: targets.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/xmls/targets.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- targets.xml 24 Sep 2002 00:06:10 -0000 1.37
+++ targets.xml 30 Sep 2002 14:44:54 -0000 1.38
@@ -290,9 +290,26 @@
</target>
<!-- =================================================================== -->
+ <!-- Launches the functional test HTTP server when testing digital signature -->
+ <!-- =================================================================== -->
+ <target name="start-functional-test-http-server-secure" if="junit.present"
depends="start-signature-signing-and-verification">
+ <echo message="Starting test http server."/>
+ <java classname="org.apache.axis.transport.http.SimpleAxisServer" fork="yes"
dir="${axis.home}/build">
+ <!-- Uncomment this to use Jikes instead of Javac for compiling JWS Files
+ <jvmarg value="-Daxis.Compiler=org.apache.axis.components.compiler.Jikes"/>
+ -->
+ <jvmarg
value="-Daxis.wsdlgen.intfnamespace=http://localhost:${test.functional.ServicePort}"/>
+ <jvmarg
value="-Daxis.wsdlgen.serv.loc.url=http://localhost:${test.functional.ServicePort}"/>
+ <arg line="-p ${test.functional.SimpleAxisPort}" /> <!-- arbitrary port -->
+ <classpath refid="classpath" />
+ </java>
+
+ </target>
+
+ <!-- =================================================================== -->
<!-- Stops the functional test HTTP server -->
<!-- =================================================================== -->
- <target name="stop-functional-test-http-server" if="junit.present"
depends="stop-signature-signing-and-verification">
+ <target name="stop-functional-test-http-server" if="junit.present">
<echo message="Stopping test http server."/>
<java classname="org.apache.axis.client.AdminClient" fork="yes">
<classpath refid="classpath" />
