From: Thomas D. <tho...@jb...> - 2005-07-27 13:27:22
|
User: tdiesler Date: 05/07/27 09:24:15 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Integrate tests-webservice-ssl with all-tests Revision Changes Path No revision No revision 1.406.2.91 +5 -4 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.90 retrieving revision 1.406.2.91 diff -u -b -r1.406.2.90 -r1.406.2.91 --- build.xml 26 Jul 2005 16:11:39 -0000 1.406.2.90 +++ build.xml 27 Jul 2005 13:24:15 -0000 1.406.2.91 @@ -12,7 +12,7 @@ <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.90 2005/07/26 16:11:39 rloehr Exp $ --> +<!-- $Id: build.xml,v 1.406.2.91 2005/07/27 13:24:15 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -626,6 +626,7 @@ <antcall target="tests-jacc-security"/> <antcall target="tests-jacc-securitymgr"/> <antcall target="tests-compatibility"/> + <antcall target="tests-webservice-ssl"/> <antcall target="tests-report"/> <record name="${basedir}/build.log" action="stop"/> </target> @@ -2140,7 +2141,7 @@ </junit> </target> - <target name="webservice-ssl-tests" + <target name="tests-webservice-ssl" description="Tomcat tests requiring an SSL connector"> <!-- Create the ssl enabled tomcat config --> <create-config baseconf="default" newconf="webservice-ssl"> @@ -2158,12 +2159,12 @@ value="${build.resources}/test-configs/webservice-ssl/conf/client.keystore"/> <property name="javax.net.ssl.trustStorePassword" value="unit-tests-client"/> <property name="rootDir" value="${build.resources}"/> - <propertyset id="webservice-ssl-tests-props"> + <propertyset id="tests-webservice-ssl-props"> <propertyref prefix="javax.net.ssl"/> <propertyref name="rootDir"/> </propertyset> <run-junit junit.patternset="webservice-ssl.includes" - junit.syspropertyset="webservice-ssl-tests-props" /> + junit.syspropertyset="tests-webservice-ssl-props" /> <stop-jboss/> <wait-on-shutdown conf="webservice-ssl"/> </target> |