From: Ryan C. <rca...@jb...> - 2005-08-18 19:39:41
|
User: rcampbell Date: 05/08/18 15:37:55 Modified: jbosstest build.xml Log: Fix the testsuite; Use the server:* tags to control the security manager tests Revision Changes Path 1.496 +5 -9 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.495 retrieving revision 1.496 diff -u -b -r1.495 -r1.496 --- build.xml 15 Aug 2005 21:22:38 -0000 1.495 +++ build.xml 18 Aug 2005 19:37:55 -0000 1.496 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.495 2005/08/15 21:22:38 bwang Exp $ --> +<!-- $Id: build.xml,v 1.496 2005/08/18 19:37:55 rcampbell Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -1547,15 +1547,12 @@ <include name="lib/**"/> </patternset> </create-config> - <start-securitymgr conf="jacc"/> + <server:start name="jacc-securitymgr"/> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> - <waitfor maxwait="60" maxwaitunit="second" - checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout"> - <http url="http://${node0}:8080/"/> - </waitfor> - <fail message="Timeout waiting for server to start" if="startup.timeout"/> + + <property name="jbosstest.secure" value="true"/> <property name="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/> @@ -1571,8 +1568,7 @@ junit.configuration="JACC+SecurityMgr" junit.syspropertyset="jacc-tests-props" /> - <stop-jboss/> - <wait-on-shutdown conf="jacc"/> + <server:stop name="jacc-securitymgr"/> </target> <target name="tests-standalone-aop-unit"> |