Author: jfrederic.clere(a)jboss.com Date: 2008-09-14 18:00:45 -0400 (Sun, 14 Sep 2008) New Revision: 1823 Modified: trunk/mod_cluster/test/java/Clients/JBWEB-117/build.xml trunk/mod_cluster/test/java/build.properties.default trunk/mod_cluster/test/java/build.xml Log: Arrange dependancies. Modified: trunk/mod_cluster/test/java/Clients/JBWEB-117/build.xml =================================================================== --- trunk/mod_cluster/test/java/Clients/JBWEB-117/build.xml 2008-09-14 20:45:23 UTC (rev 1822) +++ trunk/mod_cluster/test/java/Clients/JBWEB-117/build.xml 2008-09-14 22:00:45 UTC (rev 1823) @@ -4,10 +4,7 @@ <property file="../../build.properties.default"/> <path id="tomcat.test.classpath"> - <fileset dir="${jbosswebjar}/"> - <include name="jbossweb.jar"/> - <include name="servlet-api.jar"/> - </fileset> + <pathelement location="${servlet-api.jar}"/> </path> <target name="build" depends="compile"> Modified: trunk/mod_cluster/test/java/build.properties.default =================================================================== --- trunk/mod_cluster/test/java/build.properties.default 2008-09-14 20:45:23 UTC (rev 1822) +++ trunk/mod_cluster/test/java/build.properties.default 2008-09-14 22:00:45 UTC (rev 1823) @@ -1,8 +1,33 @@ -commons-httpclient.jar=${user.home}/java/commons-httpclient-3.1/commons-httpclient-3.1.jar -commons-logging.jar=${user.home}/java/commons-logging-1.0.4/commons-logging.jar -commons-codec.jar=${user.home}/java/commons-codec-1.3/commons-codec-1.3.jar +base-apache.loc=http://archive.apache.org/dist/ +base.path=${user.home}/java +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 + +commons-logging.loc=${base-apache.loc}/commons/logging/binaries/commons-logging-1.0.4.tar.gz +commons-logging.jar=${base.path}/commons-logging-1.0.4/commons-logging.jar + +commons-codec.loc=${base-apache.loc}/commons/codec/binaries/commons-codec-1.3.tar.gz +commons-codec.jar=${base.path}/commons-codec-1.3.jar + +# junit stuff +junit.version=4.5 +junit.jar.loc=http://kent.dl.sourceforge.net/sourceforge/junit/junit-${junit.version}.jar +junit.jar=${base.path}/junit-${junit.version}/junit-${junit.version}.jar +base-junit.home=${base.path}/junit-${junit.version} + # Location of jbossweb jar files. -jbosswebjar=${user.home}/jbossweb_trunk/output/jars -bootstrap.jar=${user.home}/jbossweb_trunk/output/build/bin/bootstrap.jar -annotations-api.jar=${user.home}/jbossweb_trunk//output/build/lib/annotations-api.jar +base-jbossweb.loc=http://repository.jboss.com/maven2/jboss/web/ +jbossweb.version=2.1.1.CR7 +base-jbossweb.home=${base.path}/${jbossweb.version}/lib + +jbossweb.jar.loc=${base-jbossweb.loc}/jbossweb/${jbossweb.version}/jbossweb-${jbossweb.version}.jar +jbossweb.jar=${base.path}/${jbossweb.version}/jbossweb-${jbossweb.version}.jar + +servlet-api.jar.loc=${base-jbossweb.loc}/servlet-api/${jbossweb.version}/servlet-api-${jbossweb.version}.jar +servlet-api.jar=${base.path}/${jbossweb.version}/servlet-api-${jbossweb.version}.jar + +base-jboss.loc=http://repository.jboss.com/maven2/jboss +jboss-logging.version=2.0.3.GA +jboss-logging.jar.loc=${base-jboss.loc}/jboss-logging-spi/${jboss-logging.version}/jboss-logging-spi-${jboss-logging.version}.jar +jboss-logging.jar=${base.path}/${jboss-logging.version}/jboss-logging-spi-${jboss-logging.version}.jar Modified: trunk/mod_cluster/test/java/build.xml =================================================================== --- trunk/mod_cluster/test/java/build.xml 2008-09-14 20:45:23 UTC (rev 1822) +++ trunk/mod_cluster/test/java/build.xml 2008-09-14 22:00:45 UTC (rev 1823) @@ -36,7 +36,6 @@ <property name="compile.source" value="1.5"/> - <property name="junit.jar" value="${junit.home}/junit.jar"/> <property name="test.runner" value="junit.textui.TestRunner"/> <path id="tomcat.test.classpath"> @@ -45,14 +44,12 @@ <pathelement location="${commons-httpclient.jar}"/> <pathelement location="${commons-logging.jar}"/> <pathelement location="${commons-codec.jar}"/> - <pathelement location="${bootstrap.jar}"/> - <pathelement location="${annotations-api.jar}"/> - <fileset dir="${jbosswebjar}/"> - <include name="jbossweb.jar"/> - <include name="servlet-api.jar"/> - </fileset> + <pathelement location="${jbossweb.jar}"/> + <pathelement location="${servlet-api.jar}"/> + <pathelement location="${jboss-logging.jar}"/> + <!-- <fileset dir="${jbossweb.build}/bin/"> <include name="tomcat-juli.jar"/> @@ -98,4 +95,81 @@ </java> </target> + + <!-- Download and dependency building --> + <target name="proxyflags"> + <!-- check proxy parameters. --> + <condition property="useproxy"> + <equals arg1="${proxy.use}" arg2="on" /> + </condition> + </target> + + <target name="setproxy" depends="proxyflags" if="useproxy"> + <taskdef name="setproxy" + classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" /> + <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" + proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> + <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> + </target> + + <target name="testexist"> + <echo message="Testing for ${destfile}"/> + <available file="${destfile}" property="exist"/> + </target> + + <target name="downloadgz" unless="exist" depends="setproxy,testexist"> + <!-- Download and extract the package --> + <get src="${sourcefile}" dest="${base.path}/file.tar.gz" /> + <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/> + <untar src="${base.path}/file.tar" dest="${base.path}"/> + <delete file="${base.path}/file.tar"/> + <delete file="${base.path}/file.tar.gz"/> + </target> + + <target name="downloadfile" unless="exist" depends="setproxy,testexist"> + <!-- Download extract the file --> + <mkdir dir="${destdir}" /> + <get src="${sourcefile}" dest="${destfile}" /> + </target> + + <target name="download" description="Builds and download dependent components"> + <antcall target="downloadgz"> + <param name="sourcefile" value="${commons-httpclient.loc}"/> + <param name="destfile" value="${commons-httpclient.jar}"/> + </antcall> + + <antcall target="downloadgz"> + <param name="sourcefile" value="${commons-logging.loc}"/> + <param name="destfile" value="${commons-logging.jar}"/> + </antcall> + + <antcall target="downloadgz"> + <param name="sourcefile" value="${commons-codec.loc}"/> + <param name="destfile" value="${commons-codec.jar}"/> + </antcall> + + <antcall target="downloadfile"> + <param name="sourcefile" value="${jbossweb.jar.loc}"/> + <param name="destfile" value="${jbossweb.jar}"/> + <param name="destdir" value="${base-jbossweb.home}"/> + </antcall> + + <antcall target="downloadfile"> + <param name="sourcefile" value="${servlet-api.jar.loc}"/> + <param name="destfile" value="${servlet-api.jar}"/> + <param name="destdir" value="${base-jbossweb.home}"/> + </antcall> + + <antcall target="downloadfile"> + <param name="sourcefile" value="${jboss-logging.jar.loc}"/> + <param name="destfile" value="${jboss-logging.jar}"/> + <param name="destdir" value="${base-jboss.home}"/> + </antcall> + + <antcall target="downloadfile"> + <param name="sourcefile" value="${junit.jar.loc}"/> + <param name="destfile" value="${junit.jar}"/> + <param name="destdir" value="${base-junit.home}"/> + </antcall> + </target> </project>