cvs commit: jakarta-tomcat-5 build.properties.default build.xml
mturk 2004/09/16 06:38:15
Modified:.build.properties.default build.xml
Log:
Remove versioning from build.xml to build.properties. This way
one can set version to any name desired. Just don't forget to set
the numbers accordingly too.
Revision ChangesPath
1.136 +9 -2 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- build.properties.default 3 Sep 2004 11:23:46 - 1.135
+++ build.properties.default 16 Sep 2004 13:38:14 - 1.136
@@ -9,6 +9,13 @@
# $Id$
# -
+# - Vesion Control Flags -
+version.major=5
+version.minor=5
+version.build=0
+version.patch=0
+#Set the pretty version name
+version=5.5.0-dev
# - Compile Control Flags -
compile.debug=on
@@ -36,7 +43,7 @@
# - Default Base Path for Dependent Packages -
base.path=/usr/share/java
-#base.path=../repository
+#base.path=C:/path/to/the/repository
#base.path=/usr/local
# - Jakarta files base location -
1.214 +3 -22 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- build.xml 15 Sep 2004 13:05:41 - 1.213
+++ build.xml 16 Sep 2004 13:38:14 - 1.214
@@ -15,28 +15,9 @@
property name=year value=2004 /
property name=version.major value=5 /
property name=version.minor value=5 /
- !-- When releasing set the 'version.build' to even number
-and 'version.isdev' to zero.
- --
- property name=version.build value=3 /
- property name=version.patch value=0 /
- property name=version.isdev value=1 /
-
- condition property=isDevVersion value=-dev
-not
- equals arg1=${version.isdev} arg2=0/
-/not
- /condition
- condition property=isPatchedVersion value=.${version.patch}
-not
- equals arg1=${version.patch} arg2=0/
-/not
- /condition
- !-- Second definition if not already conditionaly set --
- property name=isDevVersion value= /
- property name=isPatchedVersion value= /
-
- property name=version
value=${version.major}.${version.minor}.${version.build}${isPatchedVersion}${isDevVersion}
/
+ property name=version.build value=0 /
+ property name=version.patch value=0 /
+ property name=version value=5.5.0-dev /
property name=version.number
value=${version.major}.${version.minor}.${version.build}.${version.patch} /
property name=project value=jakarta-tomcat /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-5 build.properties.default build.xml
Hi,
Good solution -- thanks.
Yoav Shapira
Millennium Research Informatics
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
Sent: Thursday, September 16, 2004 9:38 AM
To: [EMAIL PROTECTED]
Subject: cvs commit: jakarta-tomcat-5 build.properties.default
build.xml
mturk 2004/09/16 06:38:15
Modified:.build.properties.default build.xml
Log:
Remove versioning from build.xml to build.properties. This way
one can set version to any name desired. Just don't forget to set
the numbers accordingly too.
Revision ChangesPath
1.136 +9 -2 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- build.properties.default 3 Sep 2004 11:23:46 - 1.135
+++ build.properties.default 16 Sep 2004 13:38:14 - 1.136
@@ -9,6 +9,13 @@
# $Id$
#
--
---
+# - Vesion Control Flags -
+version.major=5
+version.minor=5
+version.build=0
+version.patch=0
+#Set the pretty version name
+version=5.5.0-dev
# - Compile Control Flags -
compile.debug=on
@@ -36,7 +43,7 @@
# - Default Base Path for Dependent Packages -
base.path=/usr/share/java
-#base.path=../repository
+#base.path=C:/path/to/the/repository
#base.path=/usr/local
# - Jakarta files base location -
1.214 +3 -22 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- build.xml15 Sep 2004 13:05:41 - 1.213
+++ build.xml16 Sep 2004 13:38:14 - 1.214
@@ -15,28 +15,9 @@
property name=year value=2004 /
property name=version.major value=5 /
property name=version.minor value=5 /
- !-- When releasing set the 'version.build' to even number
-and 'version.isdev' to zero.
- --
- property name=version.build value=3 /
- property name=version.patch value=0 /
- property name=version.isdev value=1 /
-
- condition property=isDevVersion value=-dev
-not
- equals arg1=${version.isdev} arg2=0/
-/not
- /condition
- condition property=isPatchedVersion value=.${version.patch}
-not
- equals arg1=${version.patch} arg2=0/
-/not
- /condition
- !-- Second definition if not already conditionaly set --
- property name=isDevVersion value= /
- property name=isPatchedVersion value= /
-
- property name=version
value=${version.major}.${version.minor}.${version.build}${isPatchedVer
sion
}${isDevVersion} /
+ property name=version.build value=0 /
+ property name=version.patch value=0 /
+ property name=version value=5.5.0-dev /
property name=version.number
value=${version.major}.${version.minor}.${version.build}.${version.pat
ch}
/
property name=project value=jakarta-tomcat /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
This e-mail, including any attachments, is a confidential business communication, and
may contain information that is confidential, proprietary and/or privileged. This
e-mail is intended only for the individual(s) to whom it is addressed, and may not be
saved, copied, printed, disclosed or used by anyone else. If you are not the(an)
intended recipient, please immediately delete this e-mail from your computer system
and notify the sender. Thank you.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
markt 2004/07/29 12:16:09
Modified:.build.properties.default build.xml
Log:
Update build scripts for JMX 1.2 in preperaton for a fix for bug 28178.
Revision ChangesPath
1.130 +5 -5 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- build.properties.default 16 Jun 2004 18:04:47 - 1.129
+++ build.properties.default 29 Jul 2004 19:16:08 - 1.130
@@ -177,12 +177,12 @@
commons-fileupload.jar=${commons-fileupload.lib}/commons-fileupload-1.0.jar
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
+# - Java Management Extensions (JMX), JMX RI 1.2.1 or later or MX4J 2.0.1 or
later -
+jmx.home=${base.path}/mx4j-2.0.1
jmx.lib=${jmx.home}/lib
-jmx.jar=${jmx.lib}/mx4j-jmx.jar
+jmx.jar=${jmx.lib}/mx4j.jar
jmx-tools.jar=${jmx.lib}/mx4j-tools.jar
-jmx.loc=${base-sf.loc}/mx4j/mx4j-1.1.1.tar.gz
+jmx.loc=${base-sf.loc}/mx4j/mx4j-2.0.1.zip
# - JUnit Unit Test Suite, version 3.7 or later -
1.192 +2 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- build.xml 28 Jun 2004 02:38:41 - 1.191
+++ build.xml 29 Jul 2004 19:16:08 - 1.192
@@ -1597,9 +1597,10 @@
param name=destfile value=${xml-apis.jar}/
/antcall
-antcall target=downloadgz
+antcall target=downloadzip
param name=sourcefile value=${jmx.loc}/
param name=destfile value=${jmx.jar}/
+ param name=destdir value=${jmx.home}/
/antcall
antcall target=downloadzip
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
yoavs 2004/06/16 11:04:47
Modified:.build.properties.default build.xml
Log:
Bugzilla 29368 done: replaced references to xmlParserAPIs.jar with xmls-apis.jar.
Revision ChangesPath
1.129 +2 -2 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- build.properties.default 16 Jun 2004 13:13:53 - 1.128
+++ build.properties.default 16 Jun 2004 18:04:47 - 1.129
@@ -134,7 +134,7 @@
xerces.home=${base.path}/xerces-2_6_2
xerces.lib=${xerces.home}
xercesImpl.jar=${xerces.lib}/xercesImpl.jar
-xmlParserAPIs.jar=${xerces.lib}/xmlParserAPIs.jar
+xml-apis.jar=${xerces.lib}/xml-apis.jar
xerces.loc=${base-xml.loc}/xerces-j/binaries/Xerces-J-bin.2.6.2.tar.gz
1.188 +3 -3 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- build.xml 27 May 2004 14:10:44 - 1.187
+++ build.xml 16 Jun 2004 18:04:47 - 1.188
@@ -777,7 +777,7 @@
/jar
copy todir=${tomcat.deployer}/lib file=${xercesImpl.jar}/
-copy todir=${tomcat.deployer}/lib file=${xmlParserAPIs.jar}/
+copy todir=${tomcat.deployer}/lib file=${xml-apis.jar}/
copy todir=${tomcat.deployer}
fileset dir=${basedir}/resources/deployer /
@@ -800,7 +800,7 @@
target name=compat description=Create compatibility binaries for JREs before
1.4
copy todir=${tomcat.compat}/common/endorsed file=${xercesImpl.jar}/
-copy todir=${tomcat.compat}/common/endorsed file=${xmlParserAPIs.jar}/
+copy todir=${tomcat.compat}/common/endorsed file=${xml-apis.jar}/
/target
@@ -1595,7 +1595,7 @@
antcall target=downloadgz
!-- xerces2 brings 2 files, test for one of them --
param name=sourcefile value=${xerces.loc}/
- param name=destfile value=${xmlParserAPIs.jar}/
+ param name=destfile value=${xml-apis.jar}/
/antcall
antcall target=downloadgz
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
jfclere 2004/01/15 06:37:38
Modified:.build.properties.default build.xml
Log:
Add jaxen/saxpath location.
Revision ChangesPath
1.117 +3 -1 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- build.properties.default 13 Jan 2004 14:32:29 - 1.116
+++ build.properties.default 15 Jan 2004 14:37:37 - 1.117
@@ -220,11 +220,13 @@
# - Jaxen ( required by taglibs/standard required by jasper ) -
jaxen.home=${base.path}/jaxen-1.0-FCS
jaxen.jar=${jaxen.home}/jaxen-full.jar
+jaxen.loc=${base-sf.loc}/jaxen/jaxen-1.0-FCS.tar.gz
# - Saxpath ( required by taglibs/standard required by jasper ) -
saxpath.home=${base.path}/saxpath-1.0-FCS
saxpath.jar=${saxpath.home}/saxpath.jar
+saxpath.loc=${base-sf.loc}/saxpath/saxpath-1.0.tar.gz
# - Java Database Connectivity (JDBC) Optional Package, version 2.0 -
1.174 +10 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- build.xml 15 Jan 2004 09:38:49 - 1.173
+++ build.xml 15 Jan 2004 14:37:37 - 1.174
@@ -1630,6 +1630,16 @@
param name=destfile value=${commons-daemon.jar}/
/antcall
+antcall target=downloadgz
+ param name=sourcefile value=${jaxen.loc}/
+ param name=destfile value=${jaxen.jar}/
+/antcall
+
+antcall target=downloadgz
+ param name=sourcefile value=${saxpath.loc}/
+ param name=destfile value=${saxpath.jar}/
+/antcall
+
!-- Build the dependencies that are not yet released --
antcall target=build-depends/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
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 ChangesPath
1.112 +21 -19jakarta-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 - 1.111
+++ build.properties.default 11 Nov 2003 10:59:26 - 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}
cvs commit: jakarta-tomcat-5 build.properties.default build.xml tomcat.nsi
remm2003/09/29 03:27:40
Modified:.build.properties.default build.xml tomcat.nsi
Log:
- Set -Dsun.io.useCanonCaches=false for Windows. This decreases
startup performance significantly, but is needed for now (since Sun doesn't
seem to be willing to fix the bug in a timely fashion).
- Update after procrun move.
Revision ChangesPath
1.109 +1 -4 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- build.properties.default 23 Sep 2003 18:41:11 - 1.108
+++ build.properties.default 29 Sep 2003 10:27:40 - 1.109
@@ -73,9 +73,6 @@
commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
commons-daemon.loc=jakarta-commons/daemon
commons-daemon.cvs.loc=jakarta-commons/daemon
-commons-daemon.procrun.home=${commons-daemon.lib}/bin
-commons-daemon.procrun.exe=${commons-daemon.procrun.home}/tomcat.exe
-commons-daemon.procrunw.exe=${commons-daemon.procrun.home}/tomcatw.exe
commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz
1.161 +4 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- build.xml 28 Sep 2003 12:23:27 - 1.160
+++ build.xml 29 Sep 2003 10:27:40 - 1.161
@@ -1266,8 +1266,10 @@
fileset dir=resources /
/copy
copy file=${nsis.installoptions.dll} todir=${tomcat.dist} /
-copy file=${commons-daemon.procrun.exe}
tofile=${tomcat.dist}/bin/tomcat.exe /
-copy file=${commons-daemon.procrunw.exe}
tofile=${tomcat.dist}/bin/tomcatw.exe /
+copy file=${jtc.home}/procrun/bin/tomcat.exe
+tofile=${tomcat.dist}/bin/tomcat.exe /
+copy file=${jtc.home}/procrun/bin/tomcatw.exe
+tofile=${tomcat.dist}/bin/tomcatw.exe /
filter token=VERSION value=${version}/
copy file=tomcat.nsi tofile=${tomcat.dist}/tomcat.nsi
filtering=true/
1.35 +3 -3 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- tomcat.nsi16 Jun 2003 21:15:40 - 1.34
+++ tomcat.nsi29 Sep 2003 10:27:40 - 1.35
@@ -130,7 +130,7 @@
Call configure
- ExecWait '$INSTDIR\bin\tomcatw.exe //IS//Tomcat5 --DisplayName Apache Tomcat
--Description Apache Tomcat @VERSION@ Server - http://jakarta.apache.org/tomcat/;
--Install $INSTDIR\bin\tomcat.exe --ImagePath $INSTDIR\bin\bootstrap.jar
--StartupClass org.apache.catalina.startup.Bootstrap;main;start --ShutdownClass
org.apache.catalina.startup.Bootstrap;main;stop --Java java --JavaOptions -Xrs
--Startup manual'
+ ExecWait '$INSTDIR\bin\tomcatw.exe //IS//Tomcat5 --Group Tomcat --DisplayName
Apache Tomcat --Description Apache Tomcat @VERSION@ Server -
http://jakarta.apache.org/tomcat/; --Install $INSTDIR\bin\tomcat.exe --ImagePath
$INSTDIR\bin\bootstrap.jar --StartupClass
org.apache.catalina.startup.Bootstrap;main;start --ShutdownClass
org.apache.catalina.startup.Bootstrap;main;stop --Java java --JavaOptions -Xrs
--Startup manual'
SectionEnd
@@ -222,7 +222,7 @@
Section -post
- ExecWait '$INSTDIR\bin\tomcatw.exe //US//Tomcat5 --JavaOptions
-Dcatalina.home=\$INSTDIR\#-Djava.endorsed.dirs=\$INSTDIR\common\endorsed\#-Xrs
--StdOutputFile $INSTDIR\logs\stdout.log --StdErrorFile $INSTDIR\logs\stderr.log
--WorkingPath $INSTDIR'
+ ExecWait '$INSTDIR\bin\tomcatw.exe //US//Tomcat5 --JavaOptions
-Dcatalina.home=\$INSTDIR\#-Djava.endorsed.dirs=\$INSTDIR\common\endorsed\#-Dsun.io.useCanonCaches=false#-Xrs
--StdOutputFile $INSTDIR\logs\stdout.log --StdErrorFile $INSTDIR\logs\stderr.log
--WorkingPath $INSTDIR'
WriteUninstaller $INSTDIR\Uninstall.exe
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.properties.default build.xml tomcat.nsi
[EMAIL PROTECTED] wrote: remm2003/09/29 03:27:40 Modified:.build.properties.default build.xml tomcat.nsi Log: - Set -Dsun.io.useCanonCaches=false for Windows. This decreases startup performance significantly, but is needed for now (since Sun doesn't seem to be willing to fix the bug in a timely fashion). It doesn't decrease startup performance significantly at all (maybe 2-3%). I actually had forgotten to remove the Watchdog and tester webapps before looking at the results ;-) Remy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2003/09/04 23:46:01
Modified:.build.properties.default build.xml
Log:
- Daemon moved to commons proper.
Revision ChangesPath
1.104 +3 -3 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- build.properties.default 26 Aug 2003 08:42:38 - 1.103
+++ build.properties.default 5 Sep 2003 06:46:01 - 1.104
@@ -71,8 +71,8 @@
commons-daemon.home=${base.path}/commons-daemon
commons-daemon.lib=${commons-daemon.home}
commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
-commons-daemon.loc=jakarta-commons-sandbox/daemon
-commons-daemon.cvs.loc=jakarta-commons-sandbox/daemon
+commons-daemon.loc=jakarta-commons/daemon
+commons-daemon.cvs.loc=jakarta-commons/daemon
commons-daemon.procrun.home=${commons-daemon.lib}/bin
commons-daemon.procrun.exe=${commons-daemon.procrun.home}/tomcat.exe
commons-daemon.procrunw.exe=${commons-daemon.procrun.home}/tomcatw.exe
1.156 +2 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- build.xml 31 Aug 2003 16:52:05 - 1.155
+++ build.xml 5 Sep 2003 06:46:01 - 1.156
@@ -119,7 +119,7 @@
uptodate property=commons-daemon.build.notrequired
targetfile=${commons-daemon.jar}
- srcfiles dir=${cvs.base}/jakarta-commons-sandbox/daemon/src includes=**
/
+ srcfiles dir=${cvs.base}/jakarta-commons/daemon/src includes=** /
/uptodate
/target
@@ -479,7 +479,7 @@
target name=build-commons-daemon unless=commons-daemon.build.notrequired
description=build commons-daemon
echo== Building: commons-daemon /echo
-ant dir=${cvs.base}/jakarta-commons-sandbox/daemon target=dist
+ant dir=${cvs.base}/jakarta-commons/daemon target=dist
property name=compile.optimize value=false /
property name=dist.home value=${commons-daemon.home} /
/ant
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2003/08/26 01:42:39
Modified:.build.properties.default build.xml
Log:
- Use Xerces 2.1, which has less issues with schema validation.
- The deployer doesn't need the Ant binary (as Ant is required to run the
build.xml anyway). This will make the binary much smaller.
Revision ChangesPath
1.103 +4 -3 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- build.properties.default 19 Aug 2003 16:22:22 - 1.102
+++ build.properties.default 26 Aug 2003 08:42:38 - 1.103
@@ -126,11 +126,12 @@
# - Xerces XML Parser, version 2.5.0 -
-xerces.home=${base.path}/xerces-2_5_0
+xerces.home=${base.path}/xerces-2_1_0
xerces.lib=${xerces.home}
xercesImpl.jar=${xerces.lib}/xercesImpl.jar
xmlParserAPIs.jar=${xerces.lib}/xmlParserAPIs.jar
-xerces.loc=http://xml.apache.org/dist/xerces-j/Xerces-J-bin.2.5.0.tar.gz
+xerces.loc=http://xml.apache.org/dist/xerces-j/old_xerces2/Xerces-J-bin.2.1.0.tar.gz
+
# --
# CORE OPTIONAL LIBRARIES
1.152 +0 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- build.xml 25 Aug 2003 18:43:04 - 1.151
+++ build.xml 26 Aug 2003 08:42:38 - 1.152
@@ -705,8 +705,6 @@
target name=deployer description=Create the Tomcat deployer binary
-copy todir=${tomcat.deployer}/lib file=${tomcat.build}/common/lib/ant.jar/
-
!-- JSP and Servlet runtime --
copy todir=${tomcat.deployer}/lib
fileset dir=${tomcat.build}/common/lib
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2003/08/10 01:50:44
Modified:.build.properties.default build.xml
Log:
- Update to commons-modeler 1.1. Thanks to Yoav :)
Revision ChangesPath
1.100 +3 -4 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- build.properties.default 1 Aug 2003 06:54:10 - 1.99
+++ build.properties.default 10 Aug 2003 08:50:44 - 1.100
@@ -102,12 +102,11 @@
# - Commons Modeler, version 1.1 or later -
-commons-modeler.home=${base.path}/commons-modeler-1.1dev
+commons-modeler.home=${base.path}/commons-modeler-1.1
#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://jakarta.apache.org/builds/jakarta-commons/release/commons-modeler/v1.0/commons-modeler-1.0.tar.gz
-commons-modeler.cvs.loc=jakarta-commons/modeler
+commons-modeler.loc=http://www.apache.org/dist/jakarta/commons/modeler/binaries/modeler-1.1.tar.gz
# - Java Naming and Directory Interface (JNDI), version 1.2 or later -
1.148 +12 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- build.xml 2 Aug 2003 17:15:54 - 1.147
+++ build.xml 10 Aug 2003 08:50:44 - 1.148
@@ -117,10 +117,12 @@
srcfiles dir=${catalina.home}/webapps/admin includes=** /
/uptodate
+!--
uptodate property=commons-modeler.build.notrequired
targetfile=${commons-modeler.jar}
srcfiles dir=${cvs.base}/jakarta-commons/modeler/src/java includes=** /
/uptodate
+--
uptodate property=commons-daemon.build.notrequired
targetfile=${commons-daemon.jar}
@@ -463,6 +465,7 @@
!-- == Build dependent code === --
+!--
target name=build-commons-modeler unless=commons-modeler.build.notrequired
description=build commons-modeler
echo== Building: commons-modeler /echo
@@ -474,7 +477,7 @@
property name=build.home value=${tomcat.build} /
/ant
/target
-
+--
target name=build-commons-daemon unless=commons-daemon.build.notrequired
description=build commons-daemon
echo== Building: commons-daemon /echo
@@ -494,7 +497,7 @@
antcall target=build-servletapi/
antcall target=build-jspapi/
-antcall target=build-commons-modeler /
+!-- antcall target=build-commons-modeler / --
antcall target=build-commons-daemon /
/target
@@ -1531,6 +1534,11 @@
/antcall
antcall target=downloadgz
+ param name=sourcefile value=${commons-modeler.loc}/
+ param name=destfile value=${commons-modeler.jar}/
+/antcall
+
+antcall target=downloadgz
param name=sourcefile value=${log4j.loc}/
param name=destfile value=${log4j.jar}/
/antcall
@@ -1700,9 +1708,11 @@
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}
dest=${cvs.base}/
+--
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2003/07/18 07:29:29
Modified:.build.properties.default build.xml
Log:
- Add commons-httpclient to the download list, for use with the tester
component.
Revision ChangesPath
1.98 +15 -8 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- build.properties.default 30 Jun 2003 18:21:34 - 1.97
+++ build.properties.default 18 Jul 2003 14:29:29 - 1.98
@@ -101,6 +101,15 @@
commons-logging.loc=http://www.apache.org/dist/jakarta/commons/logging/binaries/commons-logging-1.0.3.tar.gz
+# - Commons Modeler, version 1.1 or later -
+commons-modeler.home=${base.path}/commons-modeler-1.1dev
+#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://jakarta.apache.org/builds/jakarta-commons/release/commons-modeler/v1.0/commons-modeler-1.0.tar.gz
+commons-modeler.cvs.loc=jakarta-commons/modeler
+
+
# - Java Naming and Directory Interface (JNDI), version 1.2 or later -
# Note: Optional with JDK 1.3+
jndi.home=${base.path}/jndi-1.2.1
@@ -144,13 +153,11 @@
commons-dbcp.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-dbcp/v1.0/commons-dbcp-1.0.zip
-# - Commons Modeler, version 1.0 or later -
-commons-modeler.home=${base.path}/commons-modeler-1.1dev
-#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://jakarta.apache.org/builds/jakarta-commons/release/commons-modeler/v1.0/commons-modeler-1.0.tar.gz
-commons-modeler.cvs.loc=jakarta-commons/modeler
+# - Commons HttpClient, version 2.0 or later -
+commons-httpclient.home=${base.path}/commons-httpclient-2.0-beta2
+commons-httpclient.lib=${commons-httpclient.home}
+commons-httpclient.jar=${commons-httpclient.lib}/commons-httpclient-2.0-beta2.jar
+commons-httpclient.loc=http://www.apache.org/dist/jakarta/commons/httpclient/binary/commons-httpclient-2.0-beta2.tar.gz
# - Commons Pool, version 1.0.1 or later -
1.141 +5 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- build.xml 16 Jul 2003 22:50:41 - 1.140
+++ build.xml 18 Jul 2003 14:29:29 - 1.141
@@ -1589,6 +1589,11 @@
param name=destdir value=${base.path}/
/antcall
+antcall target=downloadgz
+ param name=sourcefile value=${commons-httpclient.loc}/
+ param name=destfile value=${commons-httpclient.jar}/
+/antcall
+
antcall target=downloadfile
param name=sourcefile value=${nsis.loc}/
param name=destfile value=${nsis.exe}/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2003/06/30 11:21:35
Modified:.build.properties.default build.xml
Log:
- Update to Struts 1.1.
Revision ChangesPath
1.97 +3 -3 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- build.properties.default 26 Jun 2003 22:23:15 - 1.96
+++ build.properties.default 30 Jun 2003 18:21:34 - 1.97
@@ -189,10 +189,10 @@
# - Struts, version 1.1 or later -
-struts.home=${base.path}/jakarta-struts-1.1-rc1
+struts.home=${base.path}/jakarta-struts-1.1
struts.lib=${struts.home}/lib
struts.jar=${struts.lib}/struts.jar
-struts.loc=http://www.apache.org/dist/jakarta/struts/binaries/jakarta-struts-1.1-rc1.tar.gz
+struts.loc=http://www.apache.org/dist/jakarta/struts/binaries/jakarta-struts-1.1.tar.gz
# --
1.136 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- build.xml 22 Jun 2003 17:42:46 - 1.135
+++ build.xml 30 Jun 2003 18:21:34 - 1.136
@@ -12,7 +12,7 @@
!-- Project Properties --
property name=name value=Apache Tomcat /
- property name=year value=2002 /
+ property name=year value=2003 /
property name=version value=5.0 /
property name=project value=jakarta-tomcat /
property name=final.namevalue=${project}-${version} /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2003/06/21 06:37:21
Modified:.build.properties.default build.xml
Log:
- Upgrade to commons-el 1.0.
- Thanks to Jan Luehe for the release.
Revision ChangesPath
1.95 +4 -5 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- build.properties.default 16 Jun 2003 21:36:54 - 1.94
+++ build.properties.default 21 Jun 2003 13:37:21 - 1.95
@@ -86,12 +86,11 @@
commons-digester.loc=http://www.apache.org/dist/jakarta/commons/digester/binaries/commons-digester-1.5.tar.gz
-# - Commons Expression Language (EL) -
-commons-el.home=${base.path}/commons-el
+# - 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=jakarta-commons/el
-commons-el.cvs.loc=jakarta-commons/el
+commons-el.loc=http://www.apache.org/dist/jakarta/commons/el/binaries/commons-el-1.0.tar.gz
# - Commons Logging, version 1.0.1 or later -
1.134 +10 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- build.xml 16 Jun 2003 21:36:54 - 1.133
+++ build.xml 21 Jun 2003 13:37:21 - 1.134
@@ -122,10 +122,12 @@
srcfiles dir=${cvs.base}/jakarta-commons/modeler/src/java includes=** /
/uptodate
+!--
uptodate property=commons-el.build.notrequired
targetfile=${commons-el.jar}
srcfiles dir=${cvs.base}/jakarta-commons/el/src/java includes=** /
/uptodate
+--
uptodate property=commons-daemon.build.notrequired
targetfile=${commons-daemon.jar}
@@ -488,7 +490,7 @@
/ant
/target
-
+!--
target name=build-commons-el unless=commons-el.build.notrequired
description=build commons-el
echo== Building: commons-el /echo
@@ -499,6 +501,7 @@
property name=dist.home value=${commons-el.home} /
/ant
/target
+--
target name=build-commons-daemon unless=commons-daemon.build.notrequired
description=build commons-daemon
echo== Building: commons-daemon /echo
@@ -518,7 +521,7 @@
antcall target=build-servletapi/
antcall target=build-jspapi/
-antcall target=build-commons-el /
+!-- antcall target=build-commons-el / --
antcall target=build-commons-modeler /
antcall target=build-commons-daemon /
@@ -1468,6 +1471,11 @@
antcall target=downloadgz
param name=sourcefile value=${commons-collections.loc}/
param name=destfile value=${commons-collections.jar}/
+/antcall
+
+antcall target=downloadgz
+ param name=sourcefile value=${commons-el.loc}/
+ param name=destfile value=${commons-el.jar}/
/antcall
antcall target=downloadgz
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2003/06/16 14:36:54
Modified:.build.properties.default build.xml
Log:
- Remove bundled Tyrex support, as agreed on earlier (Tyrex is no longer
supported, apparently; there are alternatives, readu to use with TC, such
as JOTM).
Revision ChangesPath
1.94 +1 -8 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- build.properties.default 5 Jun 2003 18:28:07 - 1.93
+++ build.properties.default 16 Jun 2003 21:36:54 - 1.94
@@ -197,13 +197,6 @@
struts.loc=http://www.apache.org/dist/jakarta/struts/binaries/jakarta-struts-1.1-rc1.tar.gz
-# - Tyrex Data Source, version 1.0 -
-tyrex.home=${base.path}/tyrex-1.0
-tyrex.lib=${tyrex.home}
-tyrex.jar=${tyrex.lib}/tyrex-1.0.jar
-tyrex.loc=http://telia.dl.sourceforge.net/sourceforge/tyrex/tyrex-1.0.jar
-
-
# --
#OPTIONAL LIBRARIES
# --
1.133 +4 -9 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- build.xml 15 Jun 2003 13:32:35 - 1.132
+++ build.xml 16 Jun 2003 21:36:54 - 1.133
@@ -142,12 +142,12 @@
copy file=${commons-el.jar}
todir=${tomcat.build}/common/lib/
-copy todir=${tomcat.build}/common/lib file=${commons-logging-api.jar} /
+copy todir=${tomcat.build}/common/lib
+ file=${commons-logging-api.jar} /
copy tofile=${tomcat.build}/common/lib/jmx.jar file=${jmx.jar} /
-!--
copy tofile=${tomcat.build}/common/lib/jmx-tools.jar
- file=${jmx-tools.jar} /
---
+file=${jmx-tools.jar} /
+
copy todir=${tomcat.build}/server/lib file=${commons-logging.jar} /
copy todir=${tomcat.build}/server/lib file=${commons-modeler.jar} /
@@ -1536,11 +1536,6 @@
antcall target=downloadgz
param name=sourcefile value=${struts.loc}/
param name=destfile value=${struts.jar}/
-/antcall
-antcall target=downloadfile
- param name=sourcefile value=${tyrex.loc}/
- param name=destfile value=${tyrex.jar}/
- param name=destdir value=${tyrex.home}/
/antcall
!-- Build the dependencies that are not yet released --
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2003/06/05 11:28:07
Modified:.build.properties.default build.xml
Log:
- Package the jsvc source code with Tomcat, for Unix users.
Revision ChangesPath
1.93 +2 -1 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- build.properties.default 4 Jun 2003 18:14:26 - 1.92
+++ build.properties.default 5 Jun 2003 18:28:07 - 1.93
@@ -76,6 +76,7 @@
commons-daemon.procrun.home=${commons-daemon.lib}/bin
commons-daemon.procrun.exe=${commons-daemon.procrun.home}/tomcat.exe
commons-daemon.procrunw.exe=${commons-daemon.procrun.home}/tomcatw.exe
+commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz
# - Commons Digester, version 1.4 or later -
1.130 +6 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- build.xml 3 Jun 2003 21:38:52 - 1.129
+++ build.xml 5 Jun 2003 18:28:07 - 1.130
@@ -151,6 +151,8 @@
copy todir=${tomcat.build}/server/lib file=${commons-logging.jar} /
copy todir=${tomcat.build}/server/lib file=${commons-modeler.jar} /
+copy todir=${tomcat.build}/bin file=${commons-daemon.jsvc.tar.gz} /
+
copy todir=${tomcat.build}/common/lib file=${ant.jar}/
/target
@@ -814,7 +816,6 @@
target name=deploy.old depends=deploy-static
-
echoTarget: Modeler - Dist .../echo
ant dir=${commons-modeler.home} target=dist/
@@ -848,6 +849,10 @@
copy todir=${tomcat.build}/webapps/servlets-examples
fileset dir=${api.home}/jsr154/build/examples/
/copy
+
+!-- Copy Unix JSVC from commons-daemon --
+copy file=${commons-daemon.jsvc.tar.gz}
+tofile=${tomcat.dist}/bin/jsvc.tar.gz /
echoTarget: Webapps precompilation .../echo
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2003/03/14 10:39:50
Modified:.build.properties.default build.xml
Log:
- Remove logkit. What was that used for ?
Revision ChangesPath
1.78 +1 -8 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- build.properties.default 13 Mar 2003 22:56:37 - 1.77
+++ build.properties.default 14 Mar 2003 18:39:50 - 1.78
@@ -137,13 +137,6 @@
log4j.loc=http://jakarta.apache.org/log4j/jakarta-log4j-1.2.7.tar.gz
-# - LogKit -
-logkit.home=${base.path}/LogKit-1.1
-logkit.lib=${logkit.home}
-logkit.jar=${logkit.lib}/logkit-1.1.jar
-logkit.loc=http://jakarta.apache.org/builds/jakarta-avalon/release/logkit/latest/LogKit-1.2-bin.tar.gz
-
-
# - Commons DBCP, version 1.0 or later -
commons-dbcp.home=${base.path}/commons-dbcp-1.0
commons-dbcp.lib=${commons-dbcp.home}
1.108 +0 -5 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- build.xml 14 Mar 2003 15:28:06 - 1.107
+++ build.xml 14 Mar 2003 18:39:50 - 1.108
@@ -1275,11 +1275,6 @@
/antcall
antcall target=downloadgz
- param name=sourcefile value=${logkit.loc}/
- param name=destfile value=${logkit.jar}/
-/antcall
-
-antcall target=downloadgz
param name=sourcefile value=${commons-digester.loc}/
param name=destfile value=${commons-digester.jar}/
/antcall
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
costin 2003/03/12 14:53:47
Modified:.build.properties.default build.xml
Log:
I changed the base.dir to make sure no older files are picked up.
Hopefully we'll have a real repository ( and a download tool in ant16)
Stop downloading commons-modeler and el as part of the download, we build
it in build-depends. When a release is available we should use it, but
for now build-depends seems a better solution.
Revision ChangesPath
1.74 +2 -2 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- build.properties.default 5 Mar 2003 16:48:33 - 1.73
+++ build.properties.default 12 Mar 2003 22:53:47 - 1.74
@@ -36,7 +36,7 @@
# - Default Base Path for Dependent Packages -
#base.path=/usr/share/java
-base.path=/usr/local
+base.path=../repository
# --
1.98 +3 -6 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- build.xml 12 Mar 2003 20:52:28 - 1.97
+++ build.xml 12 Mar 2003 22:53:47 - 1.98
@@ -1251,6 +1251,7 @@
target name=download depends=proxyflags
description=Download binary packages
+mkdir dir=${base.path} /
!-- commons-digester needs ../LICENSE --
!-- That is ugly XXX needs a review --
@@ -1338,12 +1339,7 @@
/antcall
!--
-antcall target=downloadgz
- param name=sourcefile value=${commons-modeler.loc}/
- param name=destfile value=${commons-modeler.jar}/
-/antcall
---
-
+This is our own stuff - don't get binaries, we'll build it ourself
antcall target=cvsbuild
param name=location value=${commons-modeler.cvs.loc}/
param name=subdir value=${commons-modeler.home}/
@@ -1355,6 +1351,7 @@
param name=subdir value=${commons-el.home}/
param name=destfile value=${commons-el.jar}/
/antcall
+--
antcall target=downloadfile
param name=sourcefile value=${nsis.loc}/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
costin 2003/03/12 15:15:17
Modified:.build.properties.default build.xml
Log:
Add back downloading - the other target might use it.
Fix the ../repository ( it needs location ).
Fix the clean-build of modeler.
Revision ChangesPath
1.75 +2 -2 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- build.properties.default 12 Mar 2003 22:53:47 - 1.74
+++ build.properties.default 12 Mar 2003 23:15:17 - 1.75
@@ -36,7 +36,7 @@
# - Default Base Path for Dependent Packages -
#base.path=/usr/share/java
-base.path=../repository
+#base.path=../repository
# --
1.99 +15 -6 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- build.xml 12 Mar 2003 22:53:47 - 1.98
+++ build.xml 12 Mar 2003 23:15:17 - 1.99
@@ -7,6 +7,11 @@
!-- property values you must customize for successful building!!!--
property file=${user.home}/build.properties/
property file=build.properties/
+
+ !-- If not set explicitely in one of the user overrides, set it here
+--
+ property name=base.path location=../repository /
+
property file=build.properties.default/
!-- Project Properties --
@@ -447,6 +452,8 @@
ant dir=${cvs.base}/jakarta-commons/modeler target=jar
property name=commons-logging.jar
location=${tomcat.build}/server/lib/commons-logging.jar /
property name=commons-modeler.jar
location=${tomcat.build}/server/lib/commons-modeler.jar /
+property name=jmx.jar location=${jmx.jar} /
+property name=commons-digester.jar location=${commons-digester.jar} /
property name=build.home value=${tomcat.build} /
/ant
/target
@@ -1340,18 +1347,20 @@
!--
This is our own stuff - don't get binaries, we'll build it ourself
-antcall target=cvsbuild
- param name=location value=${commons-modeler.cvs.loc}/
- param name=subdir value=${commons-modeler.home}/
- param name=destfile value=${commons-modeler.jar}/
-/antcall
+--
+ant target=cvsbuild
+ property name=location value=${commons-modeler.cvs.loc}/
+ property name=subdir value=${commons-modeler.home}/
+ property name=destfile value=${commons-modeler.jar}/
+ property name=jmx.jar location=${jmx.jar} /
+ property name=commons-digester.jar location=${commons-digester.jar} /
+/ant
antcall target=cvsbuild
param name=location value=${commons-el.cvs.loc}/
param name=subdir value=${commons-el.home}/
param name=destfile value=${commons-el.jar}/
/antcall
---
antcall target=downloadfile
param name=sourcefile value=${nsis.loc}/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2003/03/01 09:34:04
Modified:.build.properties.default build.xml
Log:
- In preparation for the 5.0.1 release, upgrade to new versions of the various
dependencies.
Revision ChangesPath
1.71 +17 -24jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- build.properties.default 20 Feb 2003 00:48:12 - 1.70
+++ build.properties.default 1 Mar 2003 17:34:04 - 1.71
@@ -45,17 +45,17 @@
# - Commons Beanutils, version 1.4 or later -
-commons-beanutils.home=${base.path}/commons-beanutils-1.5
+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://jakarta.apache.org/builds/jakarta-commons/release/commons-beanutils/v1.5/commons-beanutils-1.5.tar.gz
+commons-beanutils.loc=http://www.apache.org/dist/jakarta/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://jakarta.apache.org/builds/jakarta-commons/release/commons-collections/v2.1/commons-collections-2.1.tar.gz
+commons-collections.loc=http://www.apache.org/dist/jakarta/commons/collections/binaries/collections-2.1.zip
# - Commons Launcher, version 0.9 or later -
@@ -98,7 +98,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://jakarta.apache.org/builds/jakarta-commons/release/commons-logging/v1.0.2/commons-logging-1.0.2.tar.gz
+commons-logging.loc=http://www.apache.org/dist/jakarta/commons/logging/binaries/logging.1.0.2.tar.gz
# - Java Naming and Directory Interface (JNDI), version 1.2 or later -
@@ -164,21 +164,14 @@
commons-pool.home=${base.path}/commons-pool-1.0.1
commons-pool.lib=${commons-pool.home}
commons-pool.jar=${commons-pool.lib}/commons-pool.jar
-commons-pool.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-pool/v1.0.1/commons-pool-1.0.1.tar.gz
+commons-pool.loc=http://www.apache.org/dist/jakarta/commons/pool/binaries/pool-1.0.1.tar.gz
-# - Commons FileUpload, nightly build -
-commons-fileupload.home=${base.path}/commons-fileupload
-commons-fileupload.lib=${commons-fileupload.home}/dist
-commons-fileupload.jar=${commons-fileupload.lib}/commons-fileupload.jar
-commons-fileupload.loc=jakarta-commons/fileupload
-
-
-# - JavaGroups, version 2.0.3 or later -
-javagroups.home=${base.path}/JavaGroups-2.0.3.bin
-javagroups.lib=${javagroups.home}
-javagroups.jar=${javagroups.lib}/javagroups-all.jar
-javagroups.loc=http://telia.dl.sourceforge.net/sourceforge/javagroups/JavaGroups-2.0.3.bin.zip
+# - Commons FileUpload, version 1.0 or later -
+commons-fileupload.home=${base.path}/commons-fileupload-1.0-beta-1
+commons-fileupload.lib=${commons-fileupload.home}
+commons-fileupload.jar=${commons-fileupload.lib}/commons-fileupload-1.0-beta-1.jar
+commons-fileupload.loc=http://www.apache.org/dist/jakarta/commons/fileupload/binaries/commons-fileupload-1.0-beta-1.tar.gz
# - Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.1 or
later -
@@ -196,18 +189,18 @@
junit.loc=http://telia.dl.sourceforge.net/sourceforge/junit/junit3.7.zip
-# - NSIS, version 2.0a7 or later -
-nsis.home=${base.path}/nsis-2.0-b1
+# - NSIS, version 2.0 or later -
+nsis.home=${base.path}/nsis-2.0-b2
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
-nsis.loc=http://telia.dl.sourceforge.net/sourceforge/nsis/nsis20b1.exe
+nsis.loc=http://telia.dl.sourceforge.net/sourceforge/nsis/nsis20b2.exe
-# - Struts, version 1.1 Beta 2 or later -
-struts.home=${base.path}/jakarta-struts-1.1-b2
+# - Struts, version 1.1 or later -
+struts.home=${base.path}/jakarta-struts-1.1-rc1
struts.lib=${struts.home}/lib
struts.jar=${struts.lib}/struts.jar
-struts.loc=http://jakarta.apache.org/builds/jakarta-struts/release/v1.1-b2/jakarta-struts-1.1-b2.tar.gz
+struts.loc=http://www.apache.org/dist/jakarta/struts/binaries/jakarta-struts-1.1-rc1.tar.gz
# - Tyrex Data Source, version 1.0 -
1.92 +2 -10
cvs commit: jakarta-tomcat-5 build.properties.default build.xml tomcat.nsi
remm2003/02/16 10:28:48
Modified:.build.properties.default build.xml tomcat.nsi
Log:
- Update to use procrun instead of JavaService.
- Unfortunately, procrun doesn't work as advertised yet.
Revision ChangesPath
1.68 +12 -7 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- build.properties.default 12 Feb 2003 17:26:15 - 1.67
+++ build.properties.default 16 Feb 2003 18:28:47 - 1.68
@@ -67,6 +67,17 @@
commons-launcher.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-launcher/v0.9/commons-launcher-0.9.tar.gz
+# - Commons Daemon -
+commons-daemon.home=${base.path}/commons-daemon
+commons-daemon.lib=${commons-daemon.home}/dist
+commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
+commons-daemon.procrun.home=${commons-daemon.home}/src/native/nt/procrun/bin
+commons-daemon.procrun.exe=${commons-daemon.procrun.home}/procrun.exe
+commons-daemon.procrunw.exe=${commons-daemon.procrun.home}/procrunw.exe
+commons-daemon.loc=jakarta-commons-sandbox/daemon
+commons-daemon.cvs.loc=jakarta-commons-sandbox/daemon
+
+
# - Commons Digester, version 1.4 or later -
commons-digester.home=${base.path}/commons-digester-1.4
commons-digester.lib=${commons-digester.home}
@@ -168,12 +179,6 @@
javagroups.lib=${javagroups.home}
javagroups.jar=${javagroups.lib}/javagroups-all.jar
javagroups.loc=http://telia.dl.sourceforge.net/sourceforge/javagroups/JavaGroups-2.0.3.bin.zip
-
-
-# - JavaService, version 1.2.0 or later -
-javaservice.home=${base.path}/javaservice
-javaservice.exe=${javaservice.home}/bin/JavaService.exe
-javaservice.loc=http://www.alexandriasc.com/software/JavaService/JavaService-bin-1.2.0.zip
# - Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.1 or
later -
1.81 +10 -4 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- build.xml 15 Feb 2003 22:33:23 - 1.80
+++ build.xml 16 Feb 2003 18:28:48 - 1.81
@@ -42,8 +42,6 @@
!-- Build Defaults --
property name=catalina.build value=${catalina.home}/build/
property name=jasper.build value=${jasper.home}/build/
- property name=javaservice.home value=../javaservice/
- property name=nsis.homevalue=c:\program files\nsis/
property name=servlet.home value=../jakarta-servletapi-5/jsr154/dist/
property name=jsp.home value=../jakarta-servletapi-5/jsr152/dist/
property name=tomcat.build value=${basedir}/build/
@@ -827,7 +825,8 @@
fileset dir=resources /
/copy
copy file=${nsis.installoptions.dll} todir=${tomcat.dist} /
-copy file=${javaservice.exe} tofile=${tomcat.dist}/bin/tomcat.exe /
+copy file=${commons-daemon.procrun.exe}
tofile=${tomcat.dist}/bin/tomcat.exe /
+copy file=${commons-daemon.procrunw.exe}
tofile=${tomcat.dist}/bin/tomcatw.exe /
filter token=VERSION value=${version}/
copy file=tomcat.nsi tofile=${tomcat.dist}/tomcat.nsi
filtering=true/
@@ -907,7 +906,8 @@
condition property=execute.installer
and
os family=windows /
-available file=${javaservice.exe} /
+available file=${commons-daemon.procrun.exe} /
+available file=${commons-daemon.procrunw.exe} /
available file=${nsis.exe} /
available file=${nsis.installoptions.dll} /
/and
@@ -1063,6 +1063,12 @@
param name=sourcefile value=${junit.loc}/
param name=destfile value=${junit.jar}/
param name=destdir value=${base.path}/
+/antcall
+
+antcall target=cvsbuild
+ param name=location value=${commons-daemon.cvs.loc}/
+ param name=subdir value=${commons-daemon.home}/
+ param name=destfile value=${commons-daemon.jar}/
/antcall
antcall target=downloadgz
1.22 +19 -22jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tomcat.nsi13 Feb 2003 14:45:44 - 1.21
+++ tomcat.nsi16 Feb 2003 18:28:48 - 1.22
@@ -111,7 +111,6 @@
File tomcat.ico
File LICENSE
File /r bin
- Delete $INSTDIR\bin\tomcat.exe
File /r common
File /r conf
File /r shared
@@ -124,7
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2003/02/12 09:26:15
Modified:.build.properties.default build.xml
Log:
- Update to digester 1.4.
- Update to NSIS 2.0b1 (I'll likely need to update the script, obviously ;-) ).
Revision ChangesPath
1.67 +7 -7 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- build.properties.default 5 Feb 2003 08:44:09 - 1.66
+++ build.properties.default 12 Feb 2003 17:26:15 - 1.67
@@ -67,11 +67,11 @@
commons-launcher.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-launcher/v0.9/commons-launcher-0.9.tar.gz
-# - Commons Digester, version 20020820 or later -
-commons-digester.home=${base.path}/commons-digester
-commons-digester.lib=${commons-digester.home}/dist
+# - Commons Digester, version 1.4 or later -
+commons-digester.home=${base.path}/commons-digester-1.4
+commons-digester.lib=${commons-digester.home}
commons-digester.jar=${commons-digester.lib}/commons-digester.jar
-commons-digester.loc=jakarta-commons/digester
+commons-digester.loc=http://www.apache.org/dist/jakarta/commons/digester/binaries/commons-digester-1.4.tar.gz
# - Commons Expression Language (EL) -
@@ -192,10 +192,10 @@
# - NSIS, version 2.0a7 or later -
-nsis.home=${base.path}/nsis-2.0
+nsis.home=${base.path}/nsis-2.0-b1
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
-nsis.loc=http://telia.dl.sourceforge.net/sourceforge/nsis/nsis20b0.exe
+nsis.loc=http://telia.dl.sourceforge.net/sourceforge/nsis/nsis20b1.exe
# - Struts, version 1.1 Beta 2 or later -
1.79 +2 -3 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- build.xml 10 Feb 2003 19:17:51 - 1.78
+++ build.xml 12 Feb 2003 17:26:15 - 1.79
@@ -958,9 +958,8 @@
param name=destfile value=${logkit.jar}/
/antcall
-antcall target=cvsbuild
- param name=location value=${commons-digester.loc}/
- param name=subdir value=${commons-digester.home}/
+antcall target=downloadgz
+ param name=sourcefile value=${commons-digester.loc}/
param name=destfile value=${commons-digester.jar}/
/antcall
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2003/01/16 14:00:52
Modified:.build.properties.default build.xml
Log:
- Add commons-fileupload to the download target.
Revision ChangesPath
1.56 +4 -4 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- build.properties.default 15 Jan 2003 03:38:00 - 1.55
+++ build.properties.default 16 Jan 2003 22:00:52 - 1.56
@@ -152,9 +152,9 @@
# - Commons FileUpload, nightly build -
commons-fileupload.home=${base.path}/commons-fileupload
-commons-fileupload.lib=${commons-fileupload.home}
-commons-fileupload.jar=${commons-fileupload.lib}/commons-fileupload-1.0-dev.jar
-#commons-fileupload.loc=http://jakarta.apache.org/builds/jakarta-commons/nightly/commons-fileupload/commons-fileupload-20030106.zip
+commons-fileupload.lib=${commons-fileupload.home}/dist
+commons-fileupload.jar=${commons-fileupload.lib}/commons-fileupload.jar
+commons-fileupload.loc=jakarta-commons/fileupload
# - JavaGroups, version 2.0.3 or later -
1.62 +7 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- build.xml 27 Dec 2002 09:25:29 - 1.61
+++ build.xml 16 Jan 2003 22:00:52 - 1.62
@@ -818,6 +818,13 @@
param name=destfile value=${commons-digester.jar}/
/antcall
+antcall target=cvsbuild
+ param name=location value=${commons-fileupload.loc}/
+ param name=subdir value=${commons-fileupload.home}/
+ param name=destfile value=${commons-fileupload.jar}/
+ param name=final.name value=commons-fileupload/
+/antcall
+
antcall target=downloadgz
param name=sourcefile value=${regexp.loc}/
param name=destfile value=${regexp.jar}/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2002/12/05 04:01:32
Modified:.build.properties.default build.xml
Log:
- Add JavaGroups support (which will be moved somewhere else relatively quickly).
Revision ChangesPath
1.53 +9 -2 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- build.properties.default 26 Nov 2002 00:46:29 - 1.52
+++ build.properties.default 5 Dec 2002 12:01:32 - 1.53
@@ -150,6 +150,13 @@
commons-pool.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-pool/v1.0.1/commons-pool-1.0.1.tar.gz
+# - JavaGroups, version 2.0.3 or later -
+javagroups.home=${base.path}/JavaGroups-2.0.3.bin
+javagroups.lib=${javagroups.home}
+javagroups.jar=${javagroups.lib}/javagroups-all.jar
+javagroups.loc=http://telia.dl.sourceforge.net/sourceforge/javagroups/JavaGroups-2.0.3.bin.zip
+
+
# - JavaService, version 1.2.0 or later -
javaservice.home=${base.path}/javaservice
javaservice.exe=${javaservice.home}/bin/JavaService.exe
@@ -168,7 +175,7 @@
junit.home=${base.path}/junit3.7
junit.lib=${junit.home}
junit.jar=${junit.lib}/junit.jar
-junit.loc=http://download.sourceforge.net/junit/junit3.7.zip
+junit.loc=http://telia.dl.sourceforge.net/sourceforge/junit/junit3.7.zip
# - NSIS, version 2.0a7 or later -
1.59 +6 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- build.xml 8 Nov 2002 15:26:50 - 1.58
+++ build.xml 5 Dec 2002 12:01:32 - 1.59
@@ -840,6 +840,12 @@
/antcall
antcall target=downloadzip
+ param name=sourcefile value=${javagroups.loc}/
+ param name=destfile value=${javagroups.jar}/
+ param name=destdir value=${base.path}/
+/antcall
+
+antcall target=downloadzip
param name=sourcefile value=${commons-dbcp.loc}/
param name=destfile value=${commons-dbcp.jar}/
param name=destdir value=${base.path}/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2002/10/29 09:58:09
Modified:.build.properties.default build.xml
Log:
- Fix incorrect nsis path.
- Update to MX4J 1.1.1.
Revision ChangesPath
1.48 +3 -3 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- build.properties.default 26 Oct 2002 14:23:12 - 1.47
+++ build.properties.default 29 Oct 2002 17:58:09 - 1.48
-173,11 +173,11
# - Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.1 or
later -
-jmx.home=${base.path}/mx4j-1.1
+jmx.home=${base.path}/mx4j-1.1.1
jmx.lib=${jmx.home}/lib
jmx.jar=${jmx.lib}/mx4j-jmx.jar
jmx-tools.jar=${jmx.lib}/mx4j-tools.jar
-jmx.loc=http://telia.dl.sourceforge.net/sourceforge/mx4j/mx4j-1.1.tar.gz
+jmx.loc=http://telia.dl.sourceforge.net/sourceforge/mx4j/mx4j-1.1.1.tar.gz
# - Java Secure Sockets Extension (JSSE), version 1.0.2 or later -
1.54 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- build.xml 28 Oct 2002 19:32:44 - 1.53
+++ build.xml 29 Oct 2002 17:58:09 - 1.54
-856,7 +856,7
/antcall
antcall target=downloadfile
param name=sourcefile value=${nsis.loc}/
- param name=destfile value=${nsis.home}/nsis.exe/
+ param name=destfile value=${nsis.exe}/
param name=destdir value=${nsis.home}/
/antcall
antcall target=downloadgz
--
To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2002/10/29 10:07:38
Modified:.build.properties.default build.xml
Log:
- Reorganize property.
- Add a Watchdog specific download target.
Revision ChangesPath
1.49 +55 -49jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- build.properties.default 29 Oct 2002 17:58:09 - 1.48
+++ build.properties.default 29 Oct 2002 18:07:37 - 1.49
-108,21 +108,17
# --
-#OPTIONAL LIBRARIES
+# CORE OPTIONAL LIBRARIES
# --
-# - Java Activation Framework (JAF), version 1.0.1 or later -
-activation.home=${base.path}/jaf-1.0.1
-activation.lib=${activation.home}
-activation.jar=${activation.lib}/activation.jar
-
# - Log4j -
log4j.home=${base.path}/jakarta-log4j-1.2.7
log4j.lib=${log4j.home}
log4j.jar=${log4j.lib}/dist/lib/log4j-1.2.7.jar
log4j.loc=http://jakarta.apache.org/log4j/jakarta-log4j-1.2.7.tar.gz
+
# - LogKit -
logkit.home=${base.path}/LogKit-1.1
logkit.lib=${logkit.home}
-130,15 +126,6
logkit.loc=http://jakarta.apache.org/builds/jakarta-avalon/release/logkit/latest/LogKit-1.1-bin.tar.gz
-# - Jaxen ( required by taglibs/standard required by jasper ) -
-jaxen.home=${base.path}/jaxen-1.0-FCS
-jaxen.jar=${jaxen.home}/jaxen-full.jar
-
-# - Saxpath ( required by taglibs/standard required by jasper ) -
-saxpath.home=${base.path}/saxpath-1.0-FCS
-saxpath.jar=${saxpath.home}/saxpath.jar
-
-
# - Commons DBCP, version 1.0 or later -
commons-dbcp.home=${base.path}/commons-dbcp-1.0
commons-dbcp.lib=${commons-dbcp.home}
-166,12 +153,6
javaservice.loc=http://www.alexandriasc.com/software/JavaService/JavaService-bin-1.2.0.zip
-# - Java Database Connectivity (JDBC) Optional Package, version 2.0 -
-jdbc20ext.home=${base.path}/jdbc2_0-stdext
-jdbc20ext.lib=${jdbc20ext.home}
-jdbc20ext.jar=${jdbc20ext.lib}/jdbc2_0-stdext.jar
-
-
# - 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
jmx.lib=${jmx.home}/lib
-180,20 +161,6
jmx.loc=http://telia.dl.sourceforge.net/sourceforge/mx4j/mx4j-1.1.1.tar.gz
-# - Java Secure Sockets Extension (JSSE), version 1.0.2 or later -
-jsse.home=${base.path}/jsse-1.0.2
-jsse.lib=${jsse.home}/lib
-jcert.jar=${jsse.lib}/jcert.jar
-jnet.jar=${jsse.lib}/jnet.jar
-jsse.jar=${jsse.lib}/jsse.jar
-
-
-# - Java Transaction API (JTA), version 1.0.1a or later -
-jta.home=${base.path}/jta-1_0_1a
-jta.lib=${jta.home}
-jta.jar=${jta.lib}/jta.jar
-
-
# - JUnit Unit Test Suite, version 3.7 or later -
junit.home=${base.path}/junit3.7
junit.lib=${junit.home}
-201,12 +168,6
junit.loc=http://download.sourceforge.net/junit/junit3.7.zip
-# - Java Mail, version 1.2 or later -
-mail.home=${base.path}/javamail-1.2
-mail.lib=${mail.home}
-mail.jar=${mail.lib}/mail.jar
-
-
# - NSIS, version 2.0a7 or later -
nsis.home=${base.path}/nsis-2.0
nsis.exe=${nsis.home}/makensis.exe
-214,12 +175,6
nsis.loc=http://telia.dl.sourceforge.net/sourceforge/nsis/nsis20a7.exe
-# - PureTLS Extension, version 0.9 or later -
-puretls.home=${base.path}/puretls-0.9b2
-puretls.lib=${puretls.home}/build
-puretls.jar=${puretls.lib}/puretls.jar
-
-
# - Struts, version 1.1 Beta 2 or later -
struts.home=${base.path}/jakarta-struts-1.1-b2
struts.lib=${struts.home}/lib
-234,6 +189,59
tyrex.loc=http://telia.dl.sourceforge.net/sourceforge/tyrex/tyrex-1.0.jar
+# --
+#OPTIONAL LIBRARIES
+# --
+
+
+# - Java Activation Framework (JAF), version 1.0.1 or later -
+activation.home=${base.path}/jaf-1.0.1
+activation.lib=${activation.home}
+activation.jar=${activation.lib}/activation.jar
+
+
+# - Jaxen ( required by taglibs/standard required by jasper ) -
+jaxen.home=${base.path}/jaxen-1.0-FCS
+jaxen.jar=${jaxen.home}/jaxen-full.jar
+
+
+# - Saxpath ( required by taglibs/standard required by jasper ) -
+saxpath.home=${base.path}/saxpath-1.0-FCS
+saxpath.jar=${saxpath.home}/saxpath.jar
+
+
+# - Java Database Connectivity (JDBC) Optional Package, version 2.0 -
+jdbc20ext.home=${base.path}/jdbc2_0-stdext
+jdbc20ext.lib=${jdbc20ext.home}
+jdbc20ext.jar=${jdbc20ext.lib}/jdbc2_0-stdext.jar
+
+
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2002/10/26 07:23:12
Modified:.build.properties.default build.xml
Log:
- Update to new versions.
- Remove Watchdog from download target. It takes an insane amount of time
to complete, and is mostly not needed. IMO, it should be moved to a different
download-watchdog target or something.
- Optimize release targets using new Ant features. This should help my poor
laptop HD last a bit longer.
Revision ChangesPath
1.47 +4 -4 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- build.properties.default 24 Oct 2002 11:48:51 - 1.46
+++ build.properties.default 26 Oct 2002 14:23:12 - 1.47
-59,13 +59,13
commons-collections.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-collections/v2.1/commons-collections-2.1.tar.gz
-# - Commons Launcher, version 20021012 or later -
-commons-launcher.home=${base.path}/commons-launcher
+# - Commons Launcher, version 0.9 or later -
+commons-launcher.home=${base.path}/commons-launcher-0.9
commons-launcher.lib=${commons-launcher.home}
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=jakarta-commons-sandbox/launcher
+commons-launcher.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-launcher/v0.9/commons-launcher-0.9.tar.gz
# - Commons Digester, version 20020820 or later -
1.49 +59 -110 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- build.xml 18 Oct 2002 20:47:59 - 1.48
+++ build.xml 26 Oct 2002 14:23:12 - 1.49
-573,34 +573,14
arg value=tomcat.nsi /
/exec
move file=${tomcat.dist}/tomcat-installer.exe
- tofile=${tomcat.dist}/${final.name}.exe /
+ tofile=${tomcat.release}/v${version}/bin/${final.name}.exe /
/target
!-- RELEASE: Create Release === --
- target name=release
depends=prepare-release,clean,dist,dist-source,installer,package-zip,package-tgz,package-src-zip,package-src-tgz
+ target name=release
depends=clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-src-zip,package-src-tgz
description=Create a Tomcat 5 packaged distribution
-mkdir dir=${tomcat.release}/
-mkdir dir=${tomcat.release}/v${version}/
-mkdir dir=${tomcat.release}/v${version}/bin/
-mkdir dir=${tomcat.release}/v${version}/src/
-
-copy file=${tomcat.dist}/${final.name}.exe
- todir=${tomcat.release}/v${version}/bin
- failonerror=false/
-delete file=${tomcat.dist}/${final.name}.exe
- failonerror=false/
-move file=${tomcat.dist}/${final.name}.tar.gz
- todir=${tomcat.release}/v${version}/bin/
-move file=${tomcat.dist}/${final.name}.zip
- todir=${tomcat.release}/v${version}/bin/
-
-move file=${tomcat.dist}/${final-src.name}.tar.gz
- todir=${tomcat.release}/v${version}/src/
-move file=${tomcat.dist}/${final-src.name}.zip
- todir=${tomcat.release}/v${version}/src/
-
filter token=VERSION value=${version}/
copy file=KEYS
todir=${tomcat.release}/v${version}/
-616,10 +596,11
copy file=resources/welcome.bin.html
tofile=${tomcat.release}/v${version}/bin/README.html
filtering=true/
+
/target
target name=package-zip
-zip zipfile=${tomcat.dist}/${final.name}.zip
+zip zipfile=${tomcat.release}/v${version}/bin/${final.name}.zip
zipfileset dir=${tomcat.dist} prefix=${final.name}
includes=bin/** /
zipfileset dir=${tomcat.dist} prefix=${final.name}
-654,6 +635,12
/target
target name=prepare-release
+
+mkdir dir=${tomcat.release}/
+mkdir dir=${tomcat.release}/v${version}/
+mkdir dir=${tomcat.release}/v${version}/bin/
+mkdir dir=${tomcat.release}/v${version}/src/
+
condition property=execute.installer
and
os family=windows /
-662,103 +649,72
available file=${nsis.installoptions.dll} /
/and
/condition
+
/target
target name=package-tgz
-mkdir dir=${tomcat.dist}/${final.name} /
-copy todir=${tomcat.dist}/${final.name}
- fileset dir=${tomcat.dist}
-include
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
patrickl2002/10/16 20:00:03
Modified:.build.properties.default build.xml
Log:
Adjust location of commons-launcher.jar. It is back in the dist/bin directory of
its build location like it was when the code was in jakarta-commons-sandbox/daemon.
Revision ChangesPath
1.44 +2 -2 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- build.properties.default 11 Oct 2002 15:16:41 - 1.43
+++ build.properties.default 17 Oct 2002 03:00:03 - 1.44
@@ -63,7 +63,7 @@
commons-launcher.home=${base.path}/commons-launcher
commons-launcher.lib=${commons-launcher.home}
commons-launcher.bin=${commons-launcher.home}/bin
-commons-launcher.jar=${commons-launcher.home}/commons-launcher.jar
+commons-launcher.jar=${commons-launcher.home.bin}/commons-launcher.jar
commons-launcher.bootstrap.class=${commons-launcher.bin}/LauncherBootstrap.class
commons-launcher.loc=jakarta-commons-sandbox/launcher
1.46 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- build.xml 15 Oct 2002 20:44:59 - 1.45
+++ build.xml 17 Oct 2002 03:00:03 - 1.46
@@ -800,7 +800,7 @@
param name=destfile value=${commons-launcher.jar}/
/antcall
copy
- file=${commons-launcher.home}/dist/commons-launcher.jar
+ file=${commons-launcher.home}/dist/bin/commons-launcher.jar
tofile=${commons-launcher.jar}
/
copy
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2002/10/11 03:56:55
Modified:.build.properties.default build.xml
Log:
- Remove dependency on daemon. Add one on launcher.
Revision ChangesPath
1.42 +8 -9 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- build.properties.default 10 Oct 2002 18:00:16 - 1.41
+++ build.properties.default 11 Oct 2002 10:56:55 - 1.42
@@ -59,14 +59,13 @@
commons-collections.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-collections/v2.0/commons-collections-2.0.tar.gz
-# - Commons Daemon, version 20020731 or later -
-commons-daemon.home=${base.path}/commons-daemon
-commons-daemon.lib=${commons-daemon.home}
-commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
-commons-daemon.bin=${commons-daemon.home}/bin
-commons-daemon-launcher.jar=${commons-daemon.bin}/commons-launcher.jar
-commons-daemon-launcher-bootstrap.class=${commons-daemon.bin}/LauncherBootstrap.class
-commons-daemon.loc=jakarta-commons-sandbox/daemon
+# - Commons Launcher, version 20021012 or later -
+commons-launcher.home=${base.path}/commons-launcher
+commons-launcher.lib=${commons-launcher.home}
+commons-launcher.bin=${commons-launcher.home}/bin
+commons-launcher.jar=${commons-launcher.home}/commons-launcher.jar
+commons-launcher.bootstrap.class=${commons-launcher.bin}/LauncherBootstrap.class
+commons-launcher.loc=jakarta-commons-sandbox/launcher
# - Commons Digester, version 20020820 or later -
1.41 +7 -11 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- build.xml 9 Oct 2002 12:20:40 - 1.40
+++ build.xml 11 Oct 2002 10:56:55 - 1.41
@@ -649,21 +649,17 @@
/antcall
antcall target=cvsbuild
- param name=location value=${commons-daemon.loc}/
- param name=subdir value=${commons-daemon.home}/
- param name=destfile value=${commons-daemon.jar}/
+ param name=location value=${commons-launcher.loc}/
+ param name=subdir value=${commons-launcher.home}/
+ param name=destfile value=${commons-launcher.jar}/
/antcall
copy
- file=${commons-daemon.home}/dist/commons-daemon.jar
- tofile=${commons-daemon.jar}
+ file=${commons-launcher.home}/dist/commons-launcher.jar
+ tofile=${commons-launcher.jar}
/
copy
- file=${commons-daemon.home}/dist/bin/commons-launcher.jar
- tofile=${commons-daemon-launcher.jar}
-/
-copy
- file=${commons-daemon.home}/dist/bin/LauncherBootstrap.class
- tofile=${commons-daemon-launcher-bootstrap.class}
+ file=${commons-launcher.home}/dist/bin/LauncherBootstrap.class
+ tofile=${commons-launcher.bootstrap.class}
/
antcall target=downloadgz
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
remm2002/08/13 09:52:19
Modified:.build.properties.default build.xml
Log:
- Use CL 1.0.1 tar.gz (smaller).
- Update to digester 1.3.
Revision ChangesPath
1.27 +5 -5 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- build.properties.default 13 Aug 2002 15:40:00 - 1.26
+++ build.properties.default 13 Aug 2002 16:52:19 - 1.27
@@ -72,11 +72,11 @@
commons-daemon.loc=jakarta-commons-sandbox/daemon
-# - Commons Digester, version 20020810 or later -
-commons-digester.home=${base.path}/commons-digester
+# - Commons Digester, version 1.3 or later -
+commons-digester.home=${base.path}/commons-digester-1.3
commons-digester.lib=${commons-digester.home}
commons-digester.jar=${commons-digester.lib}/commons-digester.jar
-commons-digester.loc=jakarta-commons/digester
+commons-digester.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-digester/v1.3/commons-digester-1.3.tar.gz
# - Commons Logging, version 1.0.1 or later -
@@ -84,7 +84,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://jakarta.apache.org/builds/jakarta-commons/release/commons-logging/v1.0.1/commons-logging-1.0.1.zip
+commons-logging.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-logging/v1.0.1/commons-logging-1.0.1.tar.gz
# - Java Naming and Directory Interface (JNDI), version 1.2 or later -
1.25 +7 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build.xml 13 Aug 2002 16:31:04 - 1.24
+++ build.xml 13 Aug 2002 16:52:19 - 1.25
@@ -499,15 +499,20 @@
param name=sourcefile value=${commons-beanutils.loc}/
param name=destfile value=${commons-beanutils.jar}/
/antcall
+
antcall target=downloadgz
param name=sourcefile value=${commons-collections.loc}/
param name=destfile value=${commons-collections.jar}/
/antcall
-antcall target=downloadzip
+antcall target=downloadgz
+ param name=sourcefile value=${commons-digester.loc}/
+ param name=destfile value=${commons-digester.jar}/
+/antcall
+
+antcall target=downloadgz
param name=sourcefile value=${commons-logging.loc}/
param name=destfile value=${commons-logging.jar}/
- param name=destdir value=${base.path}/
/antcall
antcall target=downloadgz
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
patrickl2002/07/30 13:21:44
Modified:.build.properties.default build.xml
Log:
More updates to get correct downloads
Revision ChangesPath
1.7 +4 -15 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.properties.default 30 Jul 2002 20:01:32 - 1.6
+++ build.properties.default 30 Jul 2002 20:21:44 - 1.7
@@ -10,16 +10,6 @@
# -
-# - Proxy to download subproject -
-#proxy.host=proxy.domain
-#proxy.port=8080
-#proxy.use=on
-
-
-# - CVS root for the jakarta repositories -
-cvsroot=:pserver:[EMAIL PROTECTED]:/home/cvspublic
-
-
# - Compile Control Flags -
compile.debug=on
compile.deprecation=off
@@ -37,16 +27,15 @@
#Hide configuration flags display
#flags.hide=on
-#Version number
-version=5.0
-# - CVS setup
+# - CVS setup -
#Proxy to download subproject
#proxy.host=proxy.domain
#proxy.port=8080
#proxy.use=on
-#CVS root for the jakarta repositories.
+
+# - CVS root for the jakarta repositories --
cvsroot=:pserver:[EMAIL PROTECTED]:/home/cvspublic
1.10 +3 -3 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 30 Jul 2002 20:01:32 - 1.9
+++ build.xml 30 Jul 2002 20:21:44 - 1.10
@@ -512,13 +512,13 @@
param name=sourcefile value=${xerces.loc}/
param name=destfile value=${xmlParserAPIs.jar}/
/antcall
-!-- commons- daemons/dbcp/pool need something different. --
-antcall target=cvsbuild
+antcall target=downloadgz
param name=location value=${commons-daemon.loc}/
param name=subdir value=${commons-daemon.home}/
- param name=destfile value=${commons-daemon.jar}/
/antcall
+
+!-- commons-dbcp/pool need something different. --
!-- Pool 1.0 --
antcall target=downloadgz
param name=sourcefile value=${commons-pool.loc}/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
patrickl2002/07/30 14:00:33
Modified:.build.properties.default build.xml
Log:
More updates to download targets
Revision ChangesPath
1.8 +2 -3 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.properties.default 30 Jul 2002 20:21:44 - 1.7
+++ build.properties.default 30 Jul 2002 21:00:33 - 1.8
@@ -29,7 +29,6 @@
# - CVS setup -
-#Proxy to download subproject
#proxy.host=proxy.domain
#proxy.port=8080
#proxy.use=on
@@ -69,7 +68,7 @@
commons-daemon.bin=${commons-daemon.home}/bin
commons-daemon-launcher.jar=${commons-daemon.bin}/commons-launcher.jar
commons-daemon-launcher-bootstrap.class=${commons-daemon.bin}/LauncherBootstrap.class
-commons-daemon.loc=http://jakarta.apache.org/builds/jakarta-commons/nightly/commons-daemon/commons-daemon-20020730.tar.gz
+commons-daemon.loc=jakarta-commons-sandbox/daemon
# - Commons Digester, version 1.2 or later -
1.11 +6 -11 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 30 Jul 2002 20:21:44 - 1.10
+++ build.xml 30 Jul 2002 21:00:33 - 1.11
@@ -481,6 +481,10 @@
param name=destfile value=${commons-logging.jar}/
/antcall
--
+
+!-- commons-logging/dbcp/pool need ../LICENSE --
+!-- That is ugly XXX needs a review --
+copy file=LICENSE tofile=../LICENSE/
antcall target=cvsbuild
param name=location value=${commons-logging.loc}/
param name=subdir value=${commons-logging.home}/
@@ -499,13 +503,6 @@
param name=sourcefile value=${regexp.loc}/
param name=destfile value=${regexp.jar}/
/antcall
-!-- Servlet api needs something different. --
-
-antcall target=cvsbuild
- param name=location value=${servlet.loc}/
- param name=subdir value=${servlet.home}/
- param name=destfile value=${servlet.jar}/
-/antcall
antcall target=downloadgz
!-- xerces2 brings 2 files, test for one of them --
@@ -513,9 +510,10 @@
param name=destfile value=${xmlParserAPIs.jar}/
/antcall
-antcall target=downloadgz
+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
!-- commons-dbcp/pool need something different. --
@@ -525,9 +523,6 @@
param name=destfile value=${commons-pool.jar}/
/antcall
-!-- commons-dbcp needs pool and ../LICENSE --
-!-- That is ugly XXX needs a review --
-copy file=LICENSE tofile=../LICENSE/
antcall target=cvsbuild
param name=location value=${commons-dbcp.loc}/
param name=subdir value=${commons-dbcp.home}/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default build.xml build.properties.sample
remm2002/07/25 05:01:05
Modified:.build.xml
Added: .build.properties.default
Removed: .build.properties.sample
Log:
- Fix a few basic problems with the scripts.
Revision ChangesPath
1.2 +23 -9 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 19 Jul 2002 00:39:13 - 1.1
+++ build.xml 25 Jul 2002 12:01:05 - 1.2
@@ -8,6 +8,7 @@
property file=download.properties/
property file=build.properties/
property file=${user.home}/build.properties/
+ property file=build.properties.default/
!-- Project Properties --
property name=name value=Apache Tomcat /
@@ -20,6 +21,16 @@
property name=jtc.final.namevalue=${jtc.project}-${version} /
property name=jtc.final-src.namevalue=${jtc.project}-${version}-src /
+ !-- Source dependencies --
+ property name=api.home
+ value=${basedir}/../jakarta-servletapi-5/
+ property name=catalina.home
+ value=${basedir}/../jakarta-tomcat-catalina/
+ property name=jasper.home
+ value=${basedir}/../jakarta-tomcat-jasper/jasper2/
+ property name=jtc.home
+ value=${basedir}/../jakarta-tomcat-connectors/
+
!-- Build Defaults --
property name=catalina.build value=${catalina.home}/build/
property name=jasper.build value=${jasper.home}/build/
@@ -32,19 +43,16 @@
property name=webapps.dist value=${catalina.home}/webapps/dist/
- !-- Source dependencies --
- property name=catalina.home
- value=${basedir}/../jakarta-tomcat-catalina/
- property name=jasper.home
- value=${basedir}/../jakarta-tomcat-jasper/jasper2/
- property name=jtc.home
- value=${basedir}/../jakarta-tomcat-connectors/
-
-
!-- === DETECT: Display configuration == --
target name=detect
description=Display configuration and conditional compilation flags
+echo message=--- ${name} ${version} Build ---/
+echo message=api.home=${api.home}/
+echo message=catalina.home=${catalina.home}/
+echo message=jasper.home=${jasper.home}/
+echo message=jtc.home=${jtc.home}/
+
ant dir=${catalina.home} target=flags.display/
ant dir=${basedir}/webapps/admin target=flags.display/
@@ -64,6 +72,8 @@
!-- == DEPLOY: Deploy Components === --
target name=deploy depends=deploy-static
description=Build and deploy all components
+echoTarget: API - Dist .../echo
+ant dir=${api.home} target=dist/
echoTarget: Catalina - Deploy .../echo
ant dir=${catalina.home} target=deploy/
echoTarget: Jasper - Deploy .../echo
@@ -77,6 +87,8 @@
target name=clean
description=Clean all components
delete dir=${tomcat.build}/
+echoTarget: API - Clean .../echo
+ant dir=${api.home} target=clean/
echoTarget: Catalina - Clean .../echo
ant dir=${catalina.home} target=clean/
echoTarget: Jasper - Clean .../echo
@@ -90,6 +102,8 @@
!-- === COMBO: Build All Components --
target name=all
description=Clean, build, and deploy all components
+echoTarget: API - Dist .../echo
+ant dir=${api.home} target=dist/
echoTarget: Catalina - All .../echo
ant dir=${catalina.home} target=all/
echoTarget: Jasper - All .../echo
1.1 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
# -
# build.properties.sample
#
# This is an example build.properties file, used to customize building Tomcat
# for your local environment. It defines the location of all external
# modules that Tomcat depends on. Copy this file to build.properties
# in the top-level source directory, and customize it as needed.
#
# $Id: build.properties.default,v 1.1 2002/07/25 12:01:05 remm Exp $
# -
# - Compile Control Flags -
compile.debug=on
compile.deprecation=off
compile.optimize=on
# - Build Control Flags
#Build all components
#full.dist=on
#Build lightweight JDK 1.4 distribution
#light.dist=on
#Hide configuration flags display
#flags.hide=on
#Version number
version=5.0
# - CVS setup
#Proxy to download subproject
#proxy.host=proxy.domain
#proxy.port=8080
#proxy.use=on
#CVS root for the jakarta repositories.
