craigmcc 01/05/21 14:47:35
Modified: . .cvsignore build.xml
catalina build.xml
jasper build.xml
tester build.xml
webapps build.xml
webapps/ROOT build.xml
webapps/examples build.xml
webapps/manager build.xml
webapps/webdav build.xml
Added: . build.properties.sample
Log:
Enable the proposed new build mechanism, without disabling the old one
yet. The "build.bat" and "build.sh" scripts are proposed to be removed,
per mail on the TOMCAT-DEV list.
Revision Changes Path
1.2 +1 -0 jakarta-tomcat-4.0/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 2001/02/01 18:31:44 1.1
+++ .cvsignore 2001/05/21 21:47:11 1.2
@@ -1,2 +1,3 @@
build
+build.properties.sample
dist
1.22 +5 -0 jakarta-tomcat-4.0/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.xml 2001/03/23 01:12:10 1.21
+++ build.xml 2001/05/21 21:47:12 1.22
@@ -2,6 +2,9 @@
<!-- ===================== Initialize Property Values =================== -->
+ <property file="build.properties"/>
+ <property file="${user.home}/build.properties"/>
+
<property name="catalina.build" value="${basedir}/catalina/build"/>
<property name="jasper.build" value="${basedir}/jasper/build"/>
<property name="servletapi.home" value="../jakarta-servletapi-4/dist"/>
@@ -40,6 +43,7 @@
<ant dir="./jasper" target="clean"/>
<ant dir="./tester" target="clean"/>
<ant dir="./webapps" target="clean"/>
+ <delete dir="${tomcat.dist}"/>
</target>
@@ -119,6 +123,7 @@
<fileset dir="${servletapi.home}/docs/api" />
</copy>
</target>
+
<!-- ====================== DIST: Copy Source Code ====================== -->
<target name="dist-source">
1.1 jakarta-tomcat-4.0/build.properties.sample
Index: build.properties.sample
===================================================================
# -----------------------------------------------------------------------------
# build.properties.sample
#
# This is an example "build.properties" file, used to customize building Tomcat
# for your local environment. Make any changes you need, and rename this file
# to "build.properties" in the same directory that contains the top level
# "build.xml" file.
#
# $Id: build.properties.sample,v 1.1 2001/05/21 21:47:12 craigmcc Exp $
# -----------------------------------------------------------------------------
# The directory containing your binary distribution of JAXP and its
# associated declarations. You can customize the versions of JAXP used
# for Catalina and Jasper below. If you are using JAXP/1.0, replace
# "crimson.jar" with "parser.jar"
jaxp.home=/usr/local/jaxp-1.1
jaxp.parser.jar=crimson.jar
# The version of JAXP that is used for Catalina
catalina.jaxp.home=${jaxp.home}
catalina.jaxp.parser.jar=${jaxp.parser.jar}
# The version of JAXP that is used for Jasper
jasper.jaxp.home=${jaxp.home}
jasper.jaxp.parser.jar=${jaxp.parser.jar}
# The directory containing your binary distribution of the Java Management
# Extensions (JMX) Reference Implementation, version 1.0 or later
jmx.home=/usr/local/jmx_ri_1.0
# The directory containing your binary distribution of the Java Naming and
# Directory Interface (JNDI), version 1.2.1 or later. (You must also add
# "ldap.jar" into the ${jndi.home}/lib directory if you want to build and
# use JNDIRealm.)
jndi.home=/usr/local/jndi_1.2.1
# The directory containing your binary distribution of Java Secure Sockets
# Extension (JSSE), version 1.0.2 or later
jsse.home=/usr/local/jsse1.0.2
# The directory containing your binary distribution of the Jakarta
# regular expressions package (jakarta-regexp), version 1.2.
regexp.home=/usr/local/jakarta-regexp-1.2
# The directory containing your binary distribution of the Servlet 2.3
# and JSP 1.2 API classes
servletapi.home=/usr/local/jakarta-servletapi-4/dist
# The directory containing your binary distribution of Tomcat 4.0 ("Catalina"
# is the servlet container part of this distribution), from CVS module
# "jakarta-tomcat-4.0" at jakarta.apache.org). This is only required
# if you are going to execute the "deploy.catalina" target.
catalina.home=../jakarta-tomcat-4.0/build
# The JAR file containing the JDBC 2.0 Optional Package extensions API
# (javax.sql). This file will automatically be added to your class path
# when you compile Struts
jdbc20ext.jar=../jdbc20/jdbc2_0-stdext.jar
# The JAR file containing the Servlet API classes to compile against (either
# version 2.2 or 2.3)
servlet.jar=../jakarta-servletapi/lib/servlet.jar
# The directory containing your binary distribution of Tomcat 3.2, from CVS
# module "jakarta-tomcat" (and branch "TOMCAT_32") at jakarta.apache.org.
# This is only required if you are going to execute the "deploy.tomcat" target.
tomcat.home=../build/tomcat
# The JAR file containing the Xerces parser. This is only required if you are
# going to execute the "deploy.catalina" target.
xerces.jar=../xml-xerces/xerces.jar
# Properties related to Struts unit testing
# -----------------------------------------
# Cactus jar for the Servlet API corresponding to the servlet.jar file
# selected above (either 2.2 or 2.3)
cactus.jar = ../jakarta-commons/cactus/out/servlet22/dist/lib/commons-cactus.jar
# Cactus Ant custom tasks jar
cactus.ant.jar =
../jakarta-commons/cactus/out/servlet22/dist/lib/commons-cactus-ant.jar
# JUnit jar file
junit.jar = f:/applis/jakarta-ant-1.4alpha/lib/junit.jar
# Servlet engine locations for the tests
# Note: If you don't want to run the test on a given servlet engine, just
# comment it's home property. For example, if you don't want to run the
# tests on Tomcat 4.0, comment the "tomcat.home.40" property.
tomcat.home.32 = f:/applis/jakarta-tomcat-3.2.1
tomcat.home.40 = f:/applis/jakarta-tomcat-4.0-b1
1.40 +7 -0 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- build.xml 2001/05/19 01:07:49 1.39
+++ build.xml 2001/05/21 21:47:17 1.40
@@ -2,10 +2,17 @@
<!-- ===================== Initialize Property Values =================== -->
+
+ <property file="build.properties"/>
+ <property file="../build.properties"/>
+ <property file="${user.home}/build.properties"/>
+
<property name="build.compiler" value="classic"/>
<property name="catalina.build" value="build"/>
<property name="catalina.deploy" value="../build"/>
<property name="catalina.dist" value="dist"/>
+ <property name="catalina.jaxp.home" value="${jaxp.home}"/>
+ <property name="catalina.jaxp.parser.jar" value="crimson.jar"/>
<property name="servletapi.home" value="../../jakarta-servletapi-4/dist"/>
<property name="avalon.dist" value="../../dist/avalon"/>
1.17 +7 -0 jakarta-tomcat-4.0/jasper/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 2001/03/23 01:12:11 1.16
+++ build.xml 2001/05/21 21:47:19 1.17
@@ -2,10 +2,17 @@
<!-- ===================== Initialize Property Values =================== -->
+
+ <property file="build.properties"/>
+ <property file="../build.properties"/>
+ <property file="${user.home}/build.properties"/>
+
<property name="build.compiler" value="classic"/>
<property name="jasper.build" value="build"/>
<property name="jasper.deploy" value="../build"/>
<property name="jasper.dist" value="dist"/>
+ <property name="jasper.jaxp.home" value="${jaxp.home}"/>
+ <property name="jasper.jaxp.parser.jar" value="crimson.jar"/>
<property name="servletapi.home" value="../../jakarta-servletapi-4/dist"/>
<!-- ================== Derived Property Values ========================= -->
1.9 +5 -0 jakarta-tomcat-4.0/tester/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 2001/03/23 01:12:11 1.8
+++ build.xml 2001/05/21 21:47:22 1.9
@@ -2,6 +2,11 @@
<!-- ===================== Initialize Property Values =================== -->
+
+ <property file="build.properties"/>
+ <property file="../build.properties"/>
+ <property file="${user.home}/build.properties"/>
+
<property name="build.compiler" value="classic"/>
<property name="servletapi.home" value="../../jakarta-servletapi-4/dist"/>
<property name="tester.build" value="build"/>
1.13 +5 -0 jakarta-tomcat-4.0/webapps/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 2001/03/23 01:12:11 1.12
+++ build.xml 2001/05/21 21:47:25 1.13
@@ -2,6 +2,11 @@
<!-- ===================== Initialize Property Values =================== -->
+
+ <property file="build.properties"/>
+ <property file="../build.properties"/>
+ <property file="${user.home}/build.properties"/>
+
<property name="build.compiler" value="classic"/>
<property name="webapps.build" value="build"/>
<property name="webapps.deploy" value="../build"/>
1.8 +6 -0 jakarta-tomcat-4.0/webapps/ROOT/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/ROOT/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 2001/03/23 01:12:12 1.7
+++ build.xml 2001/05/21 21:47:27 1.8
@@ -2,6 +2,12 @@
<!-- ===================== Initialize Property Values =================== -->
+
+ <property file="build.properties"/>
+ <property file="../build.properties"/>
+ <property file="../../build.properties"/>
+ <property file="${user.home}/build.properties"/>
+
<property name="build.compiler" value="classic"/>
<property name="webapps.build" value="../build"/>
<property name="webapps.dist" value="../dist"/>
1.8 +6 -0 jakarta-tomcat-4.0/webapps/examples/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 2001/03/23 01:12:12 1.7
+++ build.xml 2001/05/21 21:47:30 1.8
@@ -2,6 +2,12 @@
<!-- ===================== Initialize Property Values =================== -->
+
+ <property file="build.properties"/>
+ <property file="../build.properties"/>
+ <property file="../../build.properties"/>
+ <property file="${user.home}/build.properties"/>
+
<property name="build.compiler" value="classic"/>
<property name="webapps.build" value="../build"/>
<property name="webapps.dist" value="../dist"/>
1.7 +6 -0 jakarta-tomcat-4.0/webapps/manager/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/manager/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 2001/03/23 01:12:12 1.6
+++ build.xml 2001/05/21 21:47:32 1.7
@@ -2,6 +2,12 @@
<!-- ===================== Initialize Property Values =================== -->
+
+ <property file="build.properties"/>
+ <property file="../build.properties"/>
+ <property file="../../build.properties"/>
+ <property file="${user.home}/build.properties"/>
+
<property name="build.compiler" value="classic"/>
<property name="webapps.build" value="../build"/>
<property name="webapps.dist" value="../dist"/>
1.7 +6 -0 jakarta-tomcat-4.0/webapps/webdav/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/webdav/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 2001/03/23 01:12:12 1.6
+++ build.xml 2001/05/21 21:47:34 1.7
@@ -2,6 +2,12 @@
<!-- ===================== Initialize Property Values =================== -->
+
+ <property file="build.properties"/>
+ <property file="../build.properties"/>
+ <property file="../../build.properties"/>
+ <property file="${user.home}/build.properties"/>
+
<property name="build.compiler" value="classic"/>
<property name="webapps.build" value="../build"/>
<property name="webapps.dist" value="../dist"/>
