From: Ryan C. <rca...@jb...> - 2005-07-18 15:42:25
|
User: rcampbell Date: 05/07/18 11:41:24 Modified: jbosstest build.xml Log: JBAS-1864 use node0 instead of localhost Revision Changes Path 1.474 +14 -13 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.473 retrieving revision 1.474 diff -u -b -r1.473 -r1.474 --- build.xml 4 Jul 2005 00:44:05 -0000 1.473 +++ build.xml 18 Jul 2005 15:41:23 -0000 1.474 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.473 2005/07/04 00:44:05 telrod Exp $ --> +<!-- $Id: build.xml,v 1.474 2005/07/18 15:41:23 rcampbell Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -405,7 +405,7 @@ <macrodef name="wait-on-host"> <attribute name="seconds" default="60"/> - <attribute name="host" default="localhost"/> + <attribute name="host" default="${node0}"/> <sequential> <echo message="Waiting for @{host} to start..."/> <waitfor maxwait="@{seconds}" maxwaitunit="second" @@ -634,14 +634,14 @@ <target name="jboss-minimal-tests" description="Validate the minimal config"> - <start-jboss conf="minimal" host="localhost" /> + <start-jboss conf="minimal" host="${node0}" /> <copy file="${build.lib}/shutdown.sar" todir="${jboss.dist}/server/minimal/deploy" /> <!-- Wait for the 1099 jndi port --> <waitfor maxwait="30" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="minimal.timeout"> <and> - <socket server="localhost" port="1099" /> + <socket server="${node0}" port="1099" /> </and> </waitfor> <fail message="Timeout waiting for minimal to start" if="minimal.timeout"/> @@ -1450,7 +1450,7 @@ <mkdir dir="${build.testlog}"/> <waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout"> - <http url="http://localhost:8080/"/> + <http url="http://${node0}:8080/"/> </waitfor> <fail message="Timeout waiting for server to start" if="startup.timeout"/> @@ -1530,7 +1530,7 @@ <mkdir dir="${build.testlog}"/> <waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout"> - <http url="http://localhost:8080/"/> + <http url="http://${node0}:8080/"/> </waitfor> <fail message="Timeout waiting for server to start" if="startup.timeout"/> @@ -1573,7 +1573,7 @@ <mkdir dir="${build.testlog}"/> <waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout"> - <http url="http://localhost:8080/"/> + <http url="http://${node0}:8080/"/> </waitfor> <fail message="Timeout waiting for server to start" if="startup.timeout"/> @@ -1593,6 +1593,7 @@ <jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/client.policy"/> <jvmarg value="-Djava.security.debug=access,failure"/> --> + <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="jboss.home" file="${project.root}"/> <sysproperty key="jboss.thirdparty.dir" file="${project.root}/thirdparty"/> <sysproperty key="jboss.tools.dir" file="${project.root}/tools"/> @@ -2021,7 +2022,7 @@ <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory"/> <jvmarg value="-Djacorb.security.ssl.client.supported_options=0"/> <jvmarg value="-Djacorb.security.ssl.client.required_options=0"/> - <jvmarg value="-DORBInitRef.NameService=corbaloc::localhost:3528/JBoss/Naming/root"/> + <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root"/> <jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/> <jvmarg value="-Djava.security.manager"/> <sysproperty key="java.security.policy" @@ -2239,9 +2240,9 @@ <sysproperty key="javax.xml.registry.ConnectionFactoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/> <sysproperty key="jaxr.query.url" - value="http://localhost:8080/juddi/inquiry"/> + value="http://${node0}:8080/juddi/inquiry"/> <sysproperty key="jaxr.publish.url" - value="http://localhost:8080/juddi/publish"/> + value="http://${node0}:8080/juddi/publish"/> <!-- Pass along any jbosstest.* system properties --> <syspropertyset> <propertyref prefix="jbosstest."/> @@ -2304,9 +2305,9 @@ <sysproperty key="javax.xml.registry.ConnectionFactoryClass" value="com.sun.xml.registry.ebxml.ConnectionFactoryImpl"/> <sysproperty key="jaxr.queryurl" - value="http://localhost:8080/ebxmlrr/registry/soap"/> + value="http://${node0}:8080/ebxmlrr/registry/soap"/> <sysproperty key="jaxr.publishurl" - value="http://localhost:8080/ebxmlrr/registry/soap"/> + value="http://${node0}:8080/ebxmlrr/registry/soap"/> <!-- Pass along any jbosstest.* system properties --> <syspropertyset> <propertyref prefix="jbosstest."/> @@ -2489,7 +2490,7 @@ <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory"/> <jvmarg value="-Djacorb.security.ssl.client.supported_options=0"/> <jvmarg value="-Djacorb.security.ssl.client.required_options=0"/> - <jvmarg value="-DORBInitRef.NameService=corbaloc::localhost:3528/JBoss/Naming/root"/> + <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root"/> <jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/> <jvmarg value="-Djava.security.manager"/> <jvmarg value="-Djava.security.policy==${build.resources}/${test}/client.policy"/> |