root
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Correct report summarisation, and add support for testing both WAR versions of Contact sample application.

This commit is contained in:
Ben Alex 2004-04-02 11:44:19 +00:00
parent 219dfe2038
commit 7d1916eb7a
1 changed files with 141 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
integration-test/build.xml
View File

@ -23,6 +23,16 @@
</fileset> </fileset>
</path> </path>
<path id="antcontrib-classpath">
<fileset dir="${httpunit.lib.dir}">
<include name="ant-contrib.jar"/>
</fileset>
</path>
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
<classpath refid="antcontrib-classpath"/>
</taskdef>
<path id="jalopy-classpath"> <path id="jalopy-classpath">
<fileset dir="${lib.dir}/jalopy"> <fileset dir="${lib.dir}/jalopy">
<include name="**/*.jar"/> <include name="**/*.jar"/>
@ -47,9 +57,6 @@ tests-catalina-4.1--> runs the integration tests with Catalina 4.1
tests-catalina-5 --> runs the integration tests with Catalina 5.0 tests-catalina-5 --> runs the integration tests with Catalina 5.0
Each tests-xxxx target assumes the container is unzipped Each tests-xxxx target assumes the container is unzipped
BE SURE TO CHECK REPORTS DIRECTORY FOR RESULTS OF TESTS!
*** The script does NOT halt if a test errors or fails ***
</echo> </echo>
</target> </target>
@ -115,38 +122,46 @@ BE SURE TO CHECK REPORTS DIRECTORY FOR RESULTS OF TESTS!
<antcall target="-prepare.availablereports.unix"/> <antcall target="-prepare.availablereports.unix"/>
<antcall target="-prepare.availablereports.windows"/> <antcall target="-prepare.availablereports.windows"/>
<condition property="jetty.errored" value="YES !"> <condition property="jetty.errored" value="YES!">
<isset property="jetty-${jetty.version}.errored"/> <isset property="jetty-${jetty.version}.errored"/>
</condition> </condition>
<condition property="jboss.errored" value="YES !"> <condition property="jboss.errored" value="YES!">
<isset property="jboss-${jboss.version}.errored"/> <isset property="jboss-${jboss.version}.errored"/>
</condition> </condition>
<condition property="jakarta-tomcat-4.1.errored" value="YES !"> <condition property="jakarta-tomcat-4.1.errored" value="YES!">
<isset property="jakarta-tomcat-${tomcat-4.1.version}.errored"/> <isset property="jakarta-tomcat-${tomcat-4.1.version}.errored"/>
</condition> </condition>
<condition property="jakarta-tomcat-5.errored" value="YES !"> <condition property="jakarta-tomcat-5.errored" value="YES!">
<isset property="jakarta-tomcat-${tomcat-5.version}.errored"/> <isset property="jakarta-tomcat-${tomcat-5.version}.errored"/>
</condition> </condition>
<condition property="jetty.failed" value="YES !"> <condition property="jetty.failed" value="YES!">
<isset property="jetty-${jetty.version}.failed"/> <isset property="jetty-${jetty.version}.failed"/>
</condition> </condition>
<condition property="jboss.failed" value="YES !"> <condition property="jboss.failed" value="YES!">
<isset property="jboss-${jboss.version}.failed"/> <isset property="jboss-${jboss.version}.failed"/>
</condition> </condition>
<condition property="jakarta-tomcat-4.1.failed" value="YES !"> <condition property="jakarta-tomcat-4.1.failed" value="YES!">
<isset property="jakarta-tomcat-${tomcat-4.1.version}.failed"/> <isset property="jakarta-tomcat-${tomcat-4.1.version}.failed"/>
</condition> </condition>
<condition property="jakarta-tomcat-5.failed" value="YES !"> <condition property="jakarta-tomcat-5.failed" value="YES!">
<isset property="jakarta-tomcat-${tomcat-5.version}.failed"/> <isset property="jakarta-tomcat-${tomcat-5.version}.failed"/>
</condition> </condition>
<condition property="jakarta-tomcat-4.1.run" value="yes">
<isset property="jakarta-tomcat-${tomcat-4.1.version}.run"/>
</condition>
<condition property="jakarta-tomcat-5.run" value="yes">
<isset property="jakarta-tomcat-${tomcat-5.version}.run"/>
</condition>
<property name="jetty.errored" value="no "/> <property name="jetty.errored" value="no "/>
<property name="jboss.errored" value="no "/> <property name="jboss.errored" value="no "/>
<property name="jakarta-tomcat-4.1.errored" value="no "/> <property name="jakarta-tomcat-4.1.errored" value="no "/>
@ -155,20 +170,20 @@ BE SURE TO CHECK REPORTS DIRECTORY FOR RESULTS OF TESTS!
<property name="jboss.failed" value="no "/> <property name="jboss.failed" value="no "/>
<property name="jakarta-tomcat-4.1.failed" value="no "/> <property name="jakarta-tomcat-4.1.failed" value="no "/>
<property name="jakarta-tomcat-5.failed" value="no "/> <property name="jakarta-tomcat-5.failed" value="no "/>
<property name="jetty.run" value="no"/> <property name="jetty.run" value="no "/>
<property name="jboss.run" value="no"/> <property name="jboss.run" value="no "/>
<property name="jakarta-tomcat-4.1.run" value="no"/> <property name="jakarta-tomcat-4.1.run" value="no "/>
<property name="jakarta-tomcat-5.run" value="no"/> <property name="jakarta-tomcat-5.run" value="no "/>
<echo level="info"> <echo level="info">
Jetty ${jetty.version}:&#9;Run: ${jetty.run}&#9;&#9;Errored: ${jetty.errored}&#9;Failed: ${jetty.failed} Jetty ${jetty.version}:&#9;Run: ${jetty.run}&#9;Errored: ${jetty.errored}&#9;Failed: ${jetty.failed}
JBoss ${jboss.version}:&#9;Run: ${jboss.run}&#9;&#9;Errored: ${jboss.errored}&#9;Failed: ${jboss.failed} JBoss ${jboss.version}:&#9;Run: ${jboss.run}&#9;Errored: ${jboss.errored}&#9;Failed: ${jboss.failed}
Tomcat ${tomcat-4.1.version}:&#9;Run: ${jakarta-tomcat-4.1.run}&#9;&#9;Errored: ${jakarta-tomcat-4.1.errored}&#9;Failed: ${jakarta-tomcat-4.1.failed} Tomcat ${tomcat-4.1.version}:&#9;Run: ${jakarta-tomcat-4.1.run}&#9;Errored: ${jakarta-tomcat-4.1.errored}&#9;Failed: ${jakarta-tomcat-4.1.failed}
Tomcat ${tomcat-5.version}:&#9;Run: ${jakarta-tomcat-5.run}&#9;&#9;Errored: ${jakarta-tomcat-5.errored}&#9;Failed: ${jakarta-tomcat-5.failed} Tomcat ${tomcat-5.version}:&#9;Run: ${jakarta-tomcat-5.run}&#9;Errored: ${jakarta-tomcat-5.errored}&#9;Failed: ${jakarta-tomcat-5.failed}
</echo> </echo>
<fail if="anyerrors">ERRORS OCCURED DURING TESTING</fail> <fail if="anyerrors">*** ERRORS OCCURRED DURING TESTING ***</fail>
<fail if="anyfailures">Failures occured during testing</fail> <fail if="anyfailures">*** Failures occurred during testing ***</fail>
</target> </target>
<target name="-prepare.availablereports.windows" if="is.windows"> <target name="-prepare.availablereports.windows" if="is.windows">
@ -187,27 +202,27 @@ Tomcat ${tomcat-5.version}:&#9;Run: ${jakarta-tomcat-5.run}&#9;&#9;Errored: ${ja
</target> </target>
<target name="tests-jetty" depends="buildtests" description="Runs Jetty integration tests"> <target name="tests-jetty" depends="buildtests" description="Runs Jetty integration tests">
<delete dir="${reports.dir}/jetty-${jetty.version}"/>
<!-- Execute non-container adapter unit tests in normal environment-->
<copy file="${contacts.filter.war}" todir="${tmp.dir}/jetty-${jetty.version}/webapps" overwrite="true"/>
<antcallback target="-perform-test-jetty" return="jetty-${jetty.version}.errored, jetty-${jetty.version}.failed">
<param name="test.includes" value="**/FilterContactsTests.class"/>
<param name="wait.for.url" value="http://localhost:8080/contacts"/>
</antcallback>
<!-- Setup container adapter environment and execute unit tests -->
<copy file="${config.dir}/jetty-${jetty.version}/jetty.xml" todir="${tmp.dir}/jetty-${jetty.version}/etc" overwrite="true"/> <copy file="${config.dir}/jetty-${jetty.version}/jetty.xml" todir="${tmp.dir}/jetty-${jetty.version}/etc" overwrite="true"/>
<copy file="${acegisecurity.xml}" todir="${tmp.dir}/jetty-${jetty.version}/etc" overwrite="true"/> <copy file="${acegisecurity.xml}" todir="${tmp.dir}/jetty-${jetty.version}/etc" overwrite="true"/>
<copy file="${dist.lib.dir}/acegi-security-jetty-ext.jar" todir="${tmp.dir}/jetty-${jetty.version}/ext" overwrite="true"/> <copy file="${dist.lib.dir}/acegi-security-jetty-ext.jar" todir="${tmp.dir}/jetty-${jetty.version}/ext" overwrite="true"/>
<copy file="${lib.dir}/aop-alliance/aopalliance.jar" todir="${tmp.dir}/jetty-${jetty.version}/ext" overwrite="true"/> <copy file="${lib.dir}/aop-alliance/aopalliance.jar" todir="${tmp.dir}/jetty-${jetty.version}/ext" overwrite="true"/>
<copy file="${lib.dir}/jakarta-commons/commons-logging.jar" todir="${tmp.dir}/jetty-${jetty.version}/ext" overwrite="true"/> <copy file="${lib.dir}/jakarta-commons/commons-logging.jar" todir="${tmp.dir}/jetty-${jetty.version}/ext" overwrite="true"/>
<copy file="${lib.dir}/spring/spring.jar" todir="${tmp.dir}/jetty-${jetty.version}/ext" overwrite="true"/> <copy file="${lib.dir}/spring/spring.jar" todir="${tmp.dir}/jetty-${jetty.version}/ext" overwrite="true"/>
<copy file="${contacts.war}" todir="${tmp.dir}/jetty-${jetty.version}/webapps" overwrite="true"/> <copy file="${contacts.ca.war}" todir="${tmp.dir}/jetty-${jetty.version}/webapps" overwrite="true"/>
<antcallback target="-perform-test-jetty" return="jetty-${jetty.version}.errored, jetty-${jetty.version}.failed">
<parallel> <param name="test.includes" value="**/ContainerAdapterContactsTests.class"/>
<java fork="true" dir="${tmp.dir}/jetty-${jetty.version}/" classpath="${tmp.dir}/jetty-${jetty.version}/start.jar" classname="org.mortbay.start.Main"> <param name="wait.for.url" value="http://localhost:8080/contacts-container-adapter"/>
</java> </antcallback>
<sequential>
<waitfor maxwait="240" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond">
<http url="http://localhost:8080/contacts" />
</waitfor>
<antcall target="-runtests">
<param name="product" value="jetty-${jetty.version}"/>
</antcall>
<java fork="true" dir="${tmp.dir}/jetty-${jetty.version}/" classpath="${tmp.dir}/jetty-${jetty.version}/stop.jar" classname="org.mortbay.stop.Main"/>
</sequential>
</parallel>
<antcall target="-report"> <antcall target="-report">
<param name="product" value="jetty-${jetty.version}"/> <param name="product" value="jetty-${jetty.version}"/>
@ -215,38 +230,77 @@ Tomcat ${tomcat-5.version}:&#9;Run: ${jakarta-tomcat-5.run}&#9;&#9;Errored: ${ja
<property name="jetty.run" value="yes"/> <property name="jetty.run" value="yes"/>
</target> </target>
<target name="-perform-test-jetty">
<parallel>
<java fork="true" dir="${tmp.dir}/jetty-${jetty.version}/" classpath="${tmp.dir}/jetty-${jetty.version}/start.jar" classname="org.mortbay.start.Main">
</java>
<sequential>
<waitfor maxwait="60" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond">
<http url="${wait.for.url}" />
</waitfor>
<antcallback target="-runtests" return="jetty-${jetty.version}.errored, jetty-${jetty.version}.failed">
<param name="product" value="jetty-${jetty.version}"/>
</antcallback>
<java fork="true" dir="${tmp.dir}/jetty-${jetty.version}/" classpath="${tmp.dir}/jetty-${jetty.version}/stop.jar" classname="org.mortbay.stop.Main"/>
</sequential>
</parallel>
</target>
<target name="tests-catalina" description="Runs Catalina integration tests"> <target name="tests-catalina" description="Runs Catalina integration tests">
<antcall target="-tests-catalina"> <antcallback target="-tests-catalina" return="jakarta-tomcat-${tomcat-4.1.version}.run, jakarta-tomcat-${tomcat-4.1.version}.errored, jakarta-tomcat-${tomcat-4.1.version}.failed">
<param name="tomcat.version" value="${tomcat-4.1.version}"/> <param name="tomcat.version" value="${tomcat-4.1.version}"/>
</antcall> </antcallback>
<antcall target="-tests-catalina">
<antcallback target="-tests-catalina" return="jakarta-tomcat-${tomcat-5.version}.run, jakarta-tomcat-${tomcat-5.version}.errored, jakarta-tomcat-${tomcat-5.version}.failed">
<param name="tomcat.version" value="${tomcat-5.version}"/> <param name="tomcat.version" value="${tomcat-5.version}"/>
</antcall> </antcallback>
</target> </target>
<target name="tests-catalina-4.1" description="Runs Catalina 4.1 integration tests"> <target name="tests-catalina-4.1" description="Runs Catalina 4.1 integration tests">
<antcall target="-tests-catalina"> <antcallback inheritall="true" target="-tests-catalina" >
<param name="tomcat.version" value="${tomcat-4.1.version}"/> <param name="tomcat.version" value="${tomcat-4.1.version}"/>
</antcall> </antcallback>
</target> </target>
<target name="tests-catalina-5" description="Runs Catalina 5 integration tests"> <target name="tests-catalina-5" description="Runs Catalina 5 integration tests">
<antcall target="-tests-catalina"> <antcallback target="-tests-catalina">
<param name="tomcat.version" value="${tomcat-5.version}"/> <param name="tomcat.version" value="${tomcat-5.version}"/>
</antcall> </antcallback>
</target> </target>
<target name="-tests-catalina" depends="buildtests" description="Runs Catalina integration tests"> <target name="-tests-catalina" depends="buildtests" description="Runs Catalina integration tests">
<property name="tomcat.home" value="${tmp.dir}/jakarta-tomcat-${tomcat.version}"/>
<delete dir="${reports.dir}/jakarta-tomcat-${tomcat.version}"/>
<!-- Execute non-container adapter unit tests in normal environment-->
<delete dir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/webapps/contacts"/> <delete dir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/webapps/contacts"/>
<copy file="${contacts.filter.war}" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/webapps" overwrite="true"/>
<antcallback target="-perform-test-catalina" return="jakarta-tomcat-${tomcat.version}.errored, jakarta-tomcat-${tomcat.version}.failed">
<param name="test.includes" value="**/FilterContactsTests.class"/>
<param name="wait.for.url" value="http://localhost:8080/contacts"/>
</antcallback>
<!-- Setup container adapter environment and execute unit tests -->
<copy file="${config.dir}/catalina-${tomcat.version}/server.xml" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/conf" overwrite="true"/> <copy file="${config.dir}/catalina-${tomcat.version}/server.xml" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/conf" overwrite="true"/>
<copy file="${acegisecurity.xml}" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/conf" overwrite="true"/> <copy file="${acegisecurity.xml}" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/conf" overwrite="true"/>
<copy file="${dist.lib.dir}/acegi-security-catalina-server.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/server/lib" overwrite="true"/> <copy file="${dist.lib.dir}/acegi-security-catalina-server.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/server/lib" overwrite="true"/>
<copy file="${dist.lib.dir}/acegi-security-catalina-common.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/> <copy file="${dist.lib.dir}/acegi-security-catalina-common.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/>
<copy file="${lib.dir}/aop-alliance/aopalliance.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/> <copy file="${lib.dir}/aop-alliance/aopalliance.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/>
<copy file="${lib.dir}/spring/spring.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/> <copy file="${lib.dir}/spring/spring.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/>
<copy file="${contacts.war}" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/webapps" overwrite="true"/> <copy file="${contacts.ca.war}" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/webapps" overwrite="true"/>
<delete dir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/webapps/contacts-container-adapter"/>
<antcallback target="-perform-test-catalina" return="jakarta-tomcat-${tomcat.version}.errored, jakarta-tomcat-${tomcat.version}.failed">
<param name="test.includes" value="**/ContainerAdapterContactsTests.class"/>
<param name="wait.for.url" value="http://localhost:8080/contacts-container-adapter"/>
</antcallback>
<property name="tomcat.home" value="${tmp.dir}/jakarta-tomcat-${tomcat.version}"/> <antcall target="-report">
<param name="product" value="jakarta-tomcat-${tomcat.version}"/>
</antcall>
<property name="jakarta-tomcat-${tomcat.version}.run" value="yes"/>
</target>
<target name="-perform-test-catalina">
<parallel> <parallel>
<java fork="true" classname="org.apache.catalina.startup.Bootstrap" dir="${tomcat.home}"> <java fork="true" classname="org.apache.catalina.startup.Bootstrap" dir="${tomcat.home}">
<jvmarg value="-Dcatalina.home=${tomcat.home}"/> <jvmarg value="-Dcatalina.home=${tomcat.home}"/>
@ -259,12 +313,12 @@ Tomcat ${tomcat-5.version}:&#9;Run: ${jakarta-tomcat-5.run}&#9;&#9;Errored: ${ja
</classpath> </classpath>
</java> </java>
<sequential> <sequential>
<waitfor maxwait="240" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond"> <waitfor maxwait="60" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond">
<http url="http://localhost:8080/contacts" /> <http url="${wait.for.url}" />
</waitfor> </waitfor>
<antcall target="-runtests"> <antcallback target="-runtests" return="jakarta-tomcat-${tomcat.version}.errored, jakarta-tomcat-${tomcat.version}.failed">
<param name="product" value="jakarta-tomcat-${tomcat.version}"/> <param name="product" value="jakarta-tomcat-${tomcat.version}"/>
</antcall> </antcallback>
<java fork="true" classname="org.apache.catalina.startup.Bootstrap" dir="${tomcat.home}"> <java fork="true" classname="org.apache.catalina.startup.Bootstrap" dir="${tomcat.home}">
<jvmarg value="-Dcatalina.home=${tomcat.home}"/> <jvmarg value="-Dcatalina.home=${tomcat.home}"/>
<arg value="stop"/> <arg value="stop"/>
@ -277,21 +331,37 @@ Tomcat ${tomcat-5.version}:&#9;Run: ${jakarta-tomcat-5.run}&#9;&#9;Errored: ${ja
</java> </java>
</sequential> </sequential>
</parallel> </parallel>
<antcall target="-report">
<param name="product" value="jakarta-tomcat-${tomcat.version}"/>
</antcall>
<property name="jakarta-tomcat-${tomcat.version}.run" value="yes"/>
</target> </target>
<target name="tests-jboss" depends="buildtests" description="Runs JBoss integration tests"> <target name="tests-jboss" depends="buildtests" description="Runs JBoss integration tests">
<delete dir="${reports.dir}/jboss-${jboss.version}"/>
<!-- Execute non-container adapter unit tests in normal environment-->
<copy file="${contacts.filter.war}" todir="${tmp.dir}/jboss-${jboss.version}/server/default/deploy" overwrite="true"/>
<antcallback target="-perform-test-jboss" return="jboss-${jboss.version}.errored, jboss-${jboss.version}.failed">
<param name="test.includes" value="**/FilterContactsTests.class"/>
<param name="wait.for.url" value="http://localhost:8080/contacts"/>
</antcallback>
<!-- Setup container adapter environment and execute unit tests -->
<copy file="${config.dir}/jboss-${jboss.version}/login-config.xml" todir="${tmp.dir}/jboss-${jboss.version}/server/default/conf" overwrite="true"/> <copy file="${config.dir}/jboss-${jboss.version}/login-config.xml" todir="${tmp.dir}/jboss-${jboss.version}/server/default/conf" overwrite="true"/>
<copy file="${acegisecurity.xml}" todir="${tmp.dir}/jboss-${jboss.version}/server/default/conf" overwrite="true"/> <copy file="${acegisecurity.xml}" todir="${tmp.dir}/jboss-${jboss.version}/server/default/conf" overwrite="true"/>
<copy file="${dist.lib.dir}/acegi-security-jboss-lib.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/> <copy file="${dist.lib.dir}/acegi-security-jboss-lib.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/>
<copy file="${lib.dir}/aop-alliance/aopalliance.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/> <copy file="${lib.dir}/aop-alliance/aopalliance.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/>
<copy file="${lib.dir}/spring/spring.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/> <copy file="${lib.dir}/spring/spring.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/>
<copy file="${contacts.war}" todir="${tmp.dir}/jboss-${jboss.version}/server/default/deploy" overwrite="true"/> <copy file="${contacts.ca.war}" todir="${tmp.dir}/jboss-${jboss.version}/server/default/deploy" overwrite="true"/>
<antcallback target="-perform-test-jboss" return="jboss-${jboss.version}.errored, jboss-${jboss.version}.failed">
<param name="test.includes" value="**/ContainerAdapterContactsTests.class"/>
<param name="wait.for.url" value="http://localhost:8080/contacts-container-adapter"/>
</antcallback>
<antcall target="-report">
<param name="product" value="jboss-${jboss.version}"/>
</antcall>
<property name="jboss.run" value="yes"/>
</target>
<target name="-perform-test-jboss">
<parallel> <parallel>
<java fork="yes" classname="org.jboss.Main" dir="${tmp.dir}/jboss-${jboss.version}"> <java fork="yes" classname="org.jboss.Main" dir="${tmp.dir}/jboss-${jboss.version}">
<classpath> <classpath>
@ -300,12 +370,12 @@ Tomcat ${tomcat-5.version}:&#9;Run: ${jakarta-tomcat-5.run}&#9;&#9;Errored: ${ja
</classpath> </classpath>
</java> </java>
<sequential> <sequential>
<waitfor maxwait="240" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond"> <waitfor maxwait="60" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond">
<http url="http://localhost:8080/contacts" /> <http url="${wait.for.url}" />
</waitfor> </waitfor>
<antcall target="-runtests"> <antcallback target="-runtests" return="jboss-${jboss.version}.errored, jboss-${jboss.version}.failed">
<param name="product" value="jboss-${jboss.version}"/> <param name="product" value="jboss-${jboss.version}"/>
</antcall> </antcallback>
<java fork="yes" classname="org.jboss.Shutdown" dir="${tmp.dir}/jboss-${jboss.version}"> <java fork="yes" classname="org.jboss.Shutdown" dir="${tmp.dir}/jboss-${jboss.version}">
<arg value="--shutdown"/> <arg value="--shutdown"/>
<classpath> <classpath>
@ -314,11 +384,6 @@ Tomcat ${tomcat-5.version}:&#9;Run: ${jakarta-tomcat-5.run}&#9;&#9;Errored: ${ja
</java> </java>
</sequential> </sequential>
</parallel> </parallel>
<antcall target="-report">
<param name="product" value="jboss-${jboss.version}"/>
</antcall>
<property name="jboss.run" value="yes"/>
</target> </target>
<target name="unzip" depends="unzip-jetty,unzip-catalina,unzip-jboss" description="Unzip all containers"/> <target name="unzip" depends="unzip-jetty,unzip-catalina,unzip-jboss" description="Unzip all containers"/>
@ -371,7 +436,6 @@ Tomcat ${tomcat-5.version}:&#9;Run: ${jakarta-tomcat-5.run}&#9;&#9;Errored: ${ja
</target> </target>
<target name="-runtests" description="Runs the unit tests"> <target name="-runtests" description="Runs the unit tests">
<delete dir="${reports.dir}/${product}"/>
<mkdir dir="${reports.dir}/${product}"/> <mkdir dir="${reports.dir}/${product}"/>
<junit printsummary="yes" haltonfailure="no" haltonerror="no" <junit printsummary="yes" haltonfailure="no" haltonerror="no"
failureproperty="${product}.failed" failureproperty="${product}.failed"