Author: jfrederic.clere(a)jboss.com Date: 2009-02-02 03:42:01 -0500 (Mon, 02 Feb 2009) New Revision: 2261 Modified: trunk/mod_cluster/test/java/build.properties.default trunk/mod_cluster/test/java/build.xml Log: Use base.apache for httpd because the lab machines share the home directory which brings very weird behaviour.... Modified: trunk/mod_cluster/test/java/build.properties.default =================================================================== --- trunk/mod_cluster/test/java/build.properties.default 2009-02-01 19:12:43 UTC (rev 2260) +++ trunk/mod_cluster/test/java/build.properties.default 2009-02-02 08:42:01 UTC (rev 2261) @@ -2,6 +2,7 @@ base-apache.loc=http://archive.apache.org/dist/ base.path=${user.home}/java +base.apache=${user.home}/java/${os.name}-${os.arch} commons-httpclient.loc=${base-apache.loc}/httpcomponents/commons-httpclient/binary/commons-httpclient-3.1.tar.gz commons-httpclient.jar=${base.path}/commons-httpclient-3.1/commons-httpclient-3.1.jar Modified: trunk/mod_cluster/test/java/build.xml =================================================================== --- trunk/mod_cluster/test/java/build.xml 2009-02-01 19:12:43 UTC (rev 2260) +++ trunk/mod_cluster/test/java/build.xml 2009-02-02 08:42:01 UTC (rev 2261) @@ -62,7 +62,7 @@ </path> <target name="base"> - <echo message="${base.path}"/> + <echo message="${base.apache}"/> </target> <target name="compile" depends="download"> @@ -91,20 +91,21 @@ <!-- Download and install httpd --> <target name="testhttpd"> - <available file="${base.path}/opt/jboss/httpd/sbin/apachectl" property="exist"/> + <available file="${base.apache}/opt/jboss/httpd/sbin/apachectl" property="exist"/> </target> <!-- <target name="installhttpd" unless="exist" depends="testhttpd"> --> <target name="installhttpd"> + <mkdir dir="${base.apache}" /> <exec executable="bash"> <arg value="installhttpd.sh"/> </exec> </target> <target name="httpd" depends="installhttpd"> <copy file="apachectl.bat" tofile="apache.bat" /> - <replace file="apache.bat" token="@BASELOC@" value="${base.path}"/> - <exec executable="${base.path}/opt/jboss/httpd/sbin/apachectl" os="Linux,SunOS,HP-UX"> + <replace file="apache.bat" token="@BASELOC@" value="${base.apache}"/> + <exec executable="${base.apache}/opt/jboss/httpd/sbin/apachectl" os="Linux,SunOS,HP-UX"> <arg value="start"/> </exec> <exec executable="apache.bat" os="Windows 2003"> @@ -112,13 +113,13 @@ </exec> </target> <target name="stophttpd"> - <exec executable="${base.path}/opt/jboss/httpd/sbin/apachectl" os="Linux,SunOS,HP-UX"> + <exec executable="${base.apache}/opt/jboss/httpd/sbin/apachectl" os="Linux,SunOS,HP-UX"> <arg value="stop"/> </exec> - <exec executable="${base.path}/httpd-2.2/bin/httpd.exe" os="Windows 2003"> + <exec executable="${base.apache}/httpd-2.2/bin/httpd.exe" os="Windows 2003"> <arg value="-k stop"/> </exec> - <exec executable="${base.path}/httpd-2.2/bin/httpd.exe" os="Windows 2003"> + <exec executable="${base.apache}/httpd-2.2/bin/httpd.exe" os="Windows 2003"> <arg value="-k uninstall"/> </exec> </target>