jfclere 2003/11/11 02:59:26 Modified: . build.properties.default build.xml Log: Arrange build.properties.sample and build.xml to use the released daemon. Arrange the location to use base-jakarta.loc like in 4.x. Revision Changes Path 1.112 +21 -19 jakarta-tomcat-5/build.properties.default Index: build.properties.default =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- build.properties.default 6 Nov 2003 10:57:51 -0000 1.111 +++ build.properties.default 11 Nov 2003 10:59:26 -0000 1.112 @@ -39,6 +39,9 @@ #base.path=../repository #base.path=/usr/local +# ----- Jakarta files base location ----- +base-jakarta.loc=http://archive.apache.org/dist/jakarta/ + # -------------------------------------------------- # REQUIRED LIBRARIES # -------------------------------------------------- @@ -48,14 +51,14 @@ commons-beanutils.home=${base.path}/commons-beanutils-1.6.1 commons-beanutils.lib=${commons-beanutils.home} commons-beanutils.jar=${commons-beanutils.lib}/commons-beanutils.jar -commons-beanutils.loc=http://archive.apache.org/dist/jakarta/commons/beanutils/binaries/commons-beanutils-1.6.1.tar.gz +commons-beanutils.loc=${base-jakarta.loc}/commons/beanutils/binaries/commons-beanutils-1.6.1.tar.gz # ----- Commons Collections, version 2.0 or later ----- commons-collections.home=${base.path}/commons-collections-2.1 commons-collections.lib=${commons-collections.home} commons-collections.jar=${commons-collections.lib}/commons-collections.jar -commons-collections.loc=http://archive.apache.org/dist/jakarta/commons/collections/binaries/collections-2.1.tar.gz +commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/collections-2.1.tar.gz # ----- Commons Launcher, version 0.9 or later ----- @@ -64,15 +67,14 @@ commons-launcher.bin=${commons-launcher.home}/bin commons-launcher.jar=${commons-launcher.bin}/commons-launcher.jar commons-launcher.bootstrap.class=${commons-launcher.bin}/LauncherBootstrap.class -commons-launcher.loc=http://archive.apache.org/dist/jakarta/commons/launcher/binaries/launcher-0.9.tar.gz +commons-launcher.loc=${base-jakarta.loc}/commons/launcher/binaries/launcher-0.9.tar.gz -# ----- Commons Daemon ----- -commons-daemon.home=${base.path}/commons-daemon +# ----- Commons Daemon, version 1.0-Alpha or later ----- +commons-daemon.home=${base.path}/commons-daemon-1.0-Alpha commons-daemon.lib=${commons-daemon.home} commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar -commons-daemon.loc=jakarta-commons/daemon -commons-daemon.cvs.loc=jakarta-commons/daemon +commons-daemon.loc=${base-jakarta.loc}/commons/daemon/binaries/commons-daemon-1.0-Alpha.tar.gz commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz @@ -80,14 +82,14 @@ commons-digester.home=${base.path}/commons-digester-1.5 commons-digester.lib=${commons-digester.home} commons-digester.jar=${commons-digester.lib}/commons-digester.jar -commons-digester.loc=http://archive.apache.org/dist/jakarta/commons/digester/binaries/commons-digester-1.5.tar.gz +commons-digester.loc=${base-jakarta.loc}/commons/digester/binaries/commons-digester-1.5.tar.gz # ----- Commons Expression Language (EL), version 1.0 or later ----- commons-el.home=${base.path}/commons-el-1.0 commons-el.lib=${commons-el.home} commons-el.jar=${commons-el.lib}/commons-el.jar -commons-el.loc=http://archive.apache.org/dist/jakarta/commons/el/binaries/commons-el-1.0.tar.gz +commons-el.loc=${base-jakarta.loc}/commons/el/binaries/commons-el-1.0.tar.gz # ----- Commons Logging, version 1.0.1 or later ----- @@ -95,7 +97,7 @@ commons-logging.lib=${commons-logging.home} commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar commons-logging.jar=${commons-logging.lib}/commons-logging.jar -commons-logging.loc=http://archive.apache.org/dist/jakarta/commons/logging/binaries/commons-logging-1.0.3.tar.gz +commons-logging.loc=${base-jakarta.loc}/commons/logging/binaries/commons-logging-1.0.3.tar.gz # ----- Commons Modeler, version 1.1 or later ----- @@ -103,7 +105,7 @@ #commons-modeler.lib=${commons-modeler.home} commons-modeler.lib=${commons-modeler.home} commons-modeler.jar=${commons-modeler.lib}/commons-modeler.jar -commons-modeler.loc=http://archive.apache.org/dist/jakarta/commons/modeler/binaries/modeler-1.1.tar.gz +commons-modeler.loc=${base-jakarta.loc}/commons/modeler/binaries/modeler-1.1.tar.gz # ----- Java Naming and Directory Interface (JNDI), version 1.2 or later ----- @@ -119,7 +121,7 @@ regexp.home=${base.path}/jakarta-regexp-1.3 regexp.lib=${regexp.home} regexp.jar=${regexp.lib}/jakarta-regexp-1.3.jar -regexp.loc=http://archive.apache.org/dist/jakarta/regexp/binaries/jakarta-regexp-1.3.tar.gz +regexp.loc=${base-jakarta.loc}/regexp/binaries/jakarta-regexp-1.3.tar.gz # ----- Xerces XML Parser, version 2.5.0 ----- @@ -139,35 +141,35 @@ log4j.home=${base.path}/jakarta-log4j-1.2.8 log4j.lib=${log4j.home} log4j.jar=${log4j.lib}/dist/lib/log4j-1.2.8.jar -log4j.loc=http://archive.apache.org/dist/jakarta/log4j/binaries/jakarta-log4j-1.2.8.tar.gz +log4j.loc=${base-jakarta.loc}/log4j/binaries/jakarta-log4j-1.2.8.tar.gz # ----- Commons DBCP, version 1.1 or later ----- commons-dbcp.home=${base.path}/commons-dbcp-1.1 commons-dbcp.lib=${commons-dbcp.home} commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp-1.1.jar -commons-dbcp.loc=http://archive.apache.org/dist/jakarta/commons/dbcp/binaries/commons-dbcp-1.1.tar.gz +commons-dbcp.loc=${base-jakarta.loc}/commons/dbcp/binaries/commons-dbcp-1.1.tar.gz # ----- Commons HttpClient, version 2.0 or later ----- commons-httpclient.home=${base.path}/commons-httpclient-2.0-rc1 commons-httpclient.lib=${commons-httpclient.home} commons-httpclient.jar=${commons-httpclient.lib}/commons-httpclient-2.0-rc1.jar -commons-httpclient.loc=http://archive.apache.org/dist/jakarta/commons/httpclient/binary/commons-httpclient-2.0-rc1.tar.gz +commons-httpclient.loc=${base-jakarta.loc}/commons/httpclient/binary/commons-httpclient-2.0-rc1.tar.gz # ----- Commons Pool, version 1.1 or later ----- commons-pool.home=${base.path}/commons-pool-1.1 commons-pool.lib=${commons-pool.home} commons-pool.jar=${commons-pool.lib}/commons-pool-1.1.jar -commons-pool.loc=http://archive.apache.org/dist/jakarta/commons/pool/binaries/commons-pool-1.1.tar.gz +commons-pool.loc=${base-jakarta.loc}/commons/pool/binaries/commons-pool-1.1.tar.gz # ----- Commons FileUpload, version 1.0-20030531 or later ----- commons-fileupload.home=${base.path}/commons-fileupload-1.0 commons-fileupload.lib=${commons-fileupload.home} commons-fileupload.jar=${commons-fileupload.lib}/commons-fileupload-1.0.jar -commons-fileupload.loc=http://archive.apache.org/dist/jakarta/commons/fileupload/binaries/commons-fileupload-1.0.tar.gz +commons-fileupload.loc=${base-jakarta.loc}/commons/fileupload/binaries/commons-fileupload-1.0.tar.gz # ----- Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.1 or later ----- jmx.home=${base.path}/mx4j-1.1.1 @@ -195,7 +197,7 @@ struts.home=${base.path}/jakarta-struts-1.1 struts.lib=${struts.home}/lib struts.jar=${struts.lib}/struts.jar -struts.loc=http://archive.apache.org/dist/jakarta/struts/binaries/jakarta-struts-1.1.tar.gz +struts.loc=${base-jakarta.loc}/struts/binaries/jakarta-struts-1.1.tar.gz # -------------------------------------------------- 1.166 +13 -9 jakarta-tomcat-5/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- build.xml 24 Oct 2003 13:09:15 -0000 1.165 +++ build.xml 11 Nov 2003 10:59:26 -0000 1.166 @@ -117,10 +117,12 @@ <srcfiles dir="${catalina.home}/webapps/admin" includes="**" /> </uptodate> + <!-- <uptodate property="commons-daemon.build.notrequired" targetfile="${commons-daemon.jar}"> <srcfiles dir="${cvs.base}/jakarta-commons/daemon" includes="**" /> </uptodate> + --> </target> @@ -476,6 +478,7 @@ </target> --> +<!-- <target name="build-commons-daemon" unless="commons-daemon.build.notrequired" description="build commons-daemon" > <echo>========== Building: commons-daemon </echo> @@ -484,6 +487,7 @@ <property name="dist.home" value="${commons-daemon.home}" /> </ant> </target> +--> <target name="build-all" depends="init,deploy-static,build,build-webapps,embed,compat,deployer" description="build tomcat, webapps, embed, compat, deployer" /> @@ -495,7 +499,7 @@ <antcall target="build-jspapi"/> <!-- <antcall target="build-commons-modeler" /> --> - <antcall target="build-commons-daemon" /> + <!-- <antcall target="build-commons-daemon" /> --> </target> @@ -1594,11 +1598,17 @@ <param name="destfile" value="${nsis.exe}"/> <param name="destdir" value="${nsis.home}"/> </antcall> + <antcall target="downloadgz"> <param name="sourcefile" value="${struts.loc}"/> <param name="destfile" value="${struts.jar}"/> </antcall> + <antcall target="downloadgz"> + <param name="sourcefile" value="${commons-daemon.loc}"/> + <param name="destfile" value="${commons-daemon.jar}"/> + </antcall> + <!-- Build the dependencies that are not yet released --> <antcall target="build-depends"/> @@ -1698,9 +1708,11 @@ <cvs cvsroot="${cvsroot}" quiet="true" command="checkout -P ${cvstag} jakarta-servletapi-5" dest="${cvs.base}"/> +<!-- Use released daemon instead <cvs cvsroot="${cvsroot}" quiet="true" command="checkout -P ${cvstag} ${commons-daemon.cvs.loc}" dest="${cvs.base}"/> +--> <!-- <cvs cvsroot="${cvsroot}" quiet="true" command="checkout -P ${cvstag} ${commons-modeler.cvs.loc}" @@ -1708,14 +1720,6 @@ --> </target> - - <target name="jfc"> - <antcall target="cvsbuild"> - <param name="location" value="${commons-daemon.loc}"/> - <param name="subdir" value="${commons-daemon.home}"/> - <param name="destfile" value="${commons-daemon.jar}"/> - </antcall> - </target> <!-- ==================== Modeler tricks ==================== -->
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
