craigmcc 01/02/01 11:08:17
Modified: . README.txt build.xml
catalina build.bat build.xml
jasper build.bat build.xml
tester build.xml
webapps build.bat build.xml
webapps/ROOT build.xml
webapps/examples build.xml
webapps/manager build.xml
webapps/webdav build.xml
Removed: catalina README
Log:
Modify the Tomcat 4.0 build process as discussed on TOMCAT-DEV today.
Now, the destination directories will be "build" and "dist" inside the
"jakarta-tomcat-4.0" source directory, rather than "../build/tomcat-4.0"
and "../dist/tomcat-4.0".
Update the README.txt file in the top level directory to reflect these
changes, and remove the obsolete README file in the "catalina" directory.
NOTE: A ".cvsignore" file was previously checked in which should cause
CVS to ignore the existence of these directories when doing commits and
updates.
Revision Changes Path
1.10 +26 -23 jakarta-tomcat-4.0/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/README.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- README.txt 2000/12/23 21:41:12 1.9
+++ README.txt 2001/02/01 19:07:33 1.10
@@ -17,6 +17,9 @@
JavaServer Pages (JSP) Specification, version 1.2 (currently in
Initial Public Draft).
+* Tester - Unit test web application, with tests that are primarily focused
+ on Tomcat features rather than spec compliance.
+
* Webapps - Example and test web applications, and associated documentation,
that are packaged with Tomcat.
@@ -34,20 +37,17 @@
and add "$JAVA_HOME/bin" to your PATH. Configure the CLASSPATH environment
variable as well, if required.
-* If you are running a JDK earlier than 1.3, download and install the current
- version of the Java Naming and Directory Interface (JNDI) package from
- <http://java.sun.com/products/jndi>, and put the jndi.jar file in the
- "$JAVA_HOME/bin" directory (or copy this file to $JAVA_HOME/jre/lib/ext in a
- JDK 1.2 environment). None of the JNDI providers are required, unless you
- need to use them in your own applications.
-
* Download and install the Java Naming and Directory Interface (JNDI) package,
version 1.2.1 or later, from <http://java.sun.com/products/jndi>. Set an
environment variable "JNDI_HOME" pointing at the directory to which you
- installed the distribution.
+ installed the distribution. None of the standard JNDI providers are required
+ unless you need them in your own applications.
+* If you are running a JDK earlier than 1.3, you will also need to place the
+ "jndi.jar" file on your CLASSPATH in order to build Tomcat.
+
* Download and install the Java Secure Sockets Extension (JSSE) implementation
- (current version number is 1.0.1) from <http://java.sun.com/products/jsse>.
+ (current version number is 1.0.2) from <http://java.sun.com/products/jsse>.
Set an environment variable "JSSE_HOME" pointing at the directory to which
you installed this distribution.
@@ -88,16 +88,15 @@
Servlet 2.3 and JSP 1.2 API classes. A link is available on the Jakarta
web site at <http://jakarta.apache.org/downloads/binindex.html>. When
unpacked, this distribution will create a directory named
- "jakarta-servletapi-4.0". Set an environment variable named
+ "jakarta-servletapi-4". Set an environment variable named
SERVLETAPI_HOME that points to where you have placed this directory.
If you wish to create this package from the CVS archives, you will need
to follow these steps:
cd $JAKARTA_HOME
- cvs checkout jakarta-servletapi
- cd jakarta-servletapi
- cvs update -r SERVLET_23_JSP_12
+ cvs checkout jakarta-servletapi-4
+ cd jakarta-servletapi-4
./build.sh dist <-- Unix
build dist <-- Windows
@@ -122,7 +121,7 @@
build <-- Windows
This will create a complete build of Catalina, Jasper, and the example
- web applications in "$JAKARTA_HOME/build/tomcat-4.0".
+ web applications in "$JAKARTA_HOME/jakarta-tomcat-4.0/build".
* To create a "distribution" build of Tomcat 4.0, with file contents that
are equivalent to the nightly distributions, do this:
@@ -131,10 +130,14 @@
./build.sh dist <-- Unix
build dist <-- Windows
+ This will create a complete distribution build of Catalina, Jasper, and
+ the example web applications in
+ "$JAKARTA_HOME/jakarta-tomcat-4.0/dist".
+
* If you are interested in building only the individual components, there
are separate build scripts for each in the corresponding subdirectories.
Use the "deploy" task if you want to compile this component into the
- consolidated "build/tomcat-4.0" directory (this is what the top level
+ consolidated Tomcat 4.0 "build" directory (this is what the top level
build scripts do for you), or build the individual pieces like this:
cd $JAKARTA_HOME/catalina
@@ -152,9 +155,9 @@
These steps create compiled versions of the components in the following
subdirectories:
- $JAKARTA_HOME/build/catalina
- $JAKARTA_HOME/build/jasper
- $JAKARTA_HOME/build/webapps
+ $JAKARTA_HOME/jakarta-tomcat-4.0/catalina/build
+ $JAKARTA_HOME/jakarta-tomcat-4.0/jasper/build
+ $JAKARTA_HOME/jakarta-tomcat-4.0/webapps/build
* If you modify source files in any of the component, be sure that you
run the "deploy" target for that component (once you are satisfied that
@@ -163,8 +166,8 @@
in order to have a runnable build.
* Each of the component build scripts also has a "dist" target, which
- packages that component under directories "dist/catalina",
- "dist/jasper", and "dist/webapps", respectively. These targets are
+ packages that component under directories "catalina/dist",
+ "jasper/dist", and "webapps/dist", respectively. These targets are
useful if you wish to package the components of Tomcat in combinations
with other application bundles.
@@ -174,7 +177,7 @@
* You can start the unpacked version of Tomcat 4.0 as follows:
- cd $JAKARTA_HOME/build/tomcat-4.0
+ cd $JAKARTA_HOME/jakarta-tomcat-4.0/build
./bin/catalina.sh start <-- Unix
bin\catalina start <-- Windows
@@ -185,14 +188,14 @@
* To shut down the unpacked version of Tomcat 4.0:
- cd $JAKARTA_HOME/build/tomcat-4.0
+ cd $JAKARTA_HOME/jakarta-tomcat-4.0/build
./bin/catalina.sh stop <-- Unix
bin\catalina stop <-- Windows
* You can also set an environment variable CATALINA_HOME so that you
can start and stop Tomcat 4.0 from any directory. For example:
- export CATALINA_HOME=$JAKARTA_HOME/build/tomcat-4.0
+ export CATALINA_HOME=$JAKARTA_HOME/jakarta-tomcat-4.0/build
$CATALINA_HOME/bin/catalina.sh start
1.15 +5 -4 jakarta-tomcat-4.0/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 2000/12/03 01:17:52 1.14
+++ build.xml 2001/02/01 19:07:34 1.15
@@ -2,10 +2,10 @@
<!-- ===================== Initialize Property Values =================== -->
- <property name="catalina.build" value="${basedir}/../build/catalina"/>
- <property name="jasper.build" value="${basedir}/../build/jasper"/>
- <property name="tomcat.build" value="${basedir}/../build/tomcat-4.0"/>
- <property name="tomcat.dist" value="${basedir}/../dist/tomcat-4.0"/>
+ <property name="catalina.build" value="${basedir}/catalina/build"/>
+ <property name="jasper.build" value="${basedir}/jasper/build"/>
+ <property name="tomcat.build" value="${basedir}/build"/>
+ <property name="tomcat.dist" value="${basedir}/dist"/>
<!-- ===================== DEPLOY: Create Directories =================== -->
@@ -31,6 +31,7 @@
<delete dir="${tomcat.build}"/>
<ant dir="./catalina" target="clean"/>
<ant dir="./jasper" target="clean"/>
+ <ant dir="./tester" target="clean"/>
<ant dir="./webapps" target="clean"/>
</target>
1.12 +153 -153 jakarta-tomcat-4.0/catalina/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.bat,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.bat 2000/12/23 21:41:14 1.11
+++ build.bat 2001/02/01 19:07:43 1.12
@@ -1,153 +1,153 @@
-@echo off
-rem ---------------------------------------------------------------------------
-rem build.bat - Build Script for Catalina
-rem
-rem Environment Variable Prerequisites:
-rem
-rem JAVA_HOME Must point at your Java Development Kit [REQUIRED]
-rem
-rem JAXP_HOME Points at a JAXP compliant XML parser
-rem installation directory [NONE]
-rem JAXP_PARSER_JAR The jar filename of the JAXP compliant
-rem 'XML parser' [crimson.jar]
-rem
-rem ANT_HOME Must point at your Ant installation [../jakarta-ant]
-rem
-rem ANT_OPTS Command line options to the Java runtime
-rem that executes Ant [NONE]
-rem ANT_XML_CLASSPATH
-rem Jar files added to the classpath for the XML parsing
-rem requirements of ant
-rem [%JAXP_HOME%\%JAXP_PARSER_JAR%;%JAXP_HOME%\jaxp.jar]
-rem
-rem JMX_HOME Must point at your JMX installation [REQUIRED]
-rem
-rem JNDI_HOME Must point at your JNDI installation [REQUIRED]
-rem
-rem JSSE_HOME Must point at your JSSE installation [REQUIRED]
-rem
-rem REGEXP_HOME Must point at your Regexp installation [REQUIRED]
-rem
-rem SERVLETAPI_HOME Must point at your "jakarta-servletapi" installation.
-rem [REQUIRED]
-rem
-rem CATALINA_JAXP_HOME
-rem JAXP 1.0 compliant XML parser installation directory
-rem used for catalina [JAXP_HOME]
-rem CATALINA_JAXP_PARSER_JAR
-rem The jar filename of the JAXP compliant XML parser
-rem used for catalina [JAXP_PARSER_JAR]
-rem $Id: build.bat,v 1.11 2000/12/23 21:41:14 craigmcc Exp $
-rem ---------------------------------------------------------------------------
-
-
-rem ----- Save Environment Variables ------------------------------------------
-
-set _CLASSPATH=%CLASSPATH%
-set _JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
-set _ANT_HOME=%ANT_HOME%
-set _ANT_XML_CLASSPATH=%ANT_XML_CLASSPATH%
-set _CATALINA_JAXP_HOME=%CATALINA_JAXP_HOME%
-set _CATALINA_JAXP_PARSER_JAR=%CATALINA_JAXP_PARSER_JAR%
-
-
-rem ----- Verify and Set Required Environment Variables -----------------------
-
-
-
-if not "%JAVA_HOME%" == "" goto gotJavaHome
-echo You must set JAVA_HOME to point at your Java Development Kit installation
-goto cleanup
-:gotJavaHome
-
-if not "%JAXP_PARSER_JAR%" == "" goto gotJaxpParserJar
-set JAXP_PARSER_JAR=crimson.jar
-:gotJaxpParserJar
-
-if not "%ANT_XML_CLASSPATH%" == "" goto gotAntXmlClasspath
-if "%JAXP_HOME%" == "" goto jaxpHome
-set ANT_XML_CLASSPATH=%JAXP_HOME%\%JAXP_PARSER_JAR%;%JAXP_HOME%\jaxp.jar
-:gotAntXmlClasspath
-
-if not "%CATALINA_JAXP_HOME%" == "" goto gotCatalinaJaxpHome
-if "%JAXP_HOME%" == "" goto jaxpHome
-set CATALINA_JAXP_HOME=%JAXP_HOME%
-:gotCatalinaJaxpHome
-
-if not "%CATALINA_JAXP_PARSER_JAR%" == "" goto gotCatalinaJaxpParserJar
-set CATALINA_JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
-:gotCatalinaJaxpParserJar
-
-goto gotJaxpHome
-
-:jaxpHome
-echo You must set JAXP_HOME to point at your XML Parser install directory.
-echo By default, ant and catalina will use jaxp.jar and crimson.jar from
-echo that directory.
-echo - A different parser jar file can be specified globally for all
-echo components via environment variable JAXP_PARSER_JAR (e.g. xerces.jar).
-echo - XML requirements for each component can also be set individually via
-echo the following environment variables:
-echo ANT_XML_CLASSPATH
-echo CATALINA_JAXP_HOME CATALINA_JAXP_PARSER_JAR
-goto cleanup
-:gotJaxpHome
-
-if not "%ANT_HOME%" == "" goto gotAntHome
-set ANT_HOME=../jakarta-ant
-:gotAntHome
-
-if not "%JMX_HOME%" == "" goto gotJmxHome
-echo You must set JMX_HOME to point at your Java Management Extensions install
-goto cleanup
-:gotJmxHome
-
-if not "%JNDI_HOME%" == "" goto gotJndiHome
-echo You must set JNDI_HOME to point at your Java Naming and Directory Interface
install
-goto cleanup
-:gotJndiHome
-
-if not "%JSSE_HOME%" == "" goto gotJsseHome
-echo You must set JSSE_HOME to point at your Java Security Extensions install
-goto cleanup
-:gotJsseHome
-
-if not "%REGEXP_HOME%" == "" goto gotRegexpHome
-echo You must set REGEXP_HOME to point at your Regular Expressions distribution
install
-goto cleanup
-:gotRegexpHome
-
-if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
-echo You must set SERVLETAPI_HOME to your Servlet API distribution that includes
the Servlet 2.3 and JSP 1.2 API classes.
-goto cleanup
-:gotServletapiHome
-
-rem ----- Set Up The Runtime Classpath ----------------------------------------
-
-if not "%CLASSPATH%" == "" set CLASSPATH=%CLASSPATH%;
-set
CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar;%ANT_XML_CLASSPATH%
-rem @@@ %JMX_HOME%\lib\jmxri.jar
-
-
-rem ----- Execute The Requested Build -----------------------------------------
-
-%JAVA_HOME%\bin\java %ANT_OPTS% org.apache.tools.ant.Main
-Dcatalina.jaxp.home="%CATALINA_JAXP_HOME%"
-Dcatalina.jaxp.parser.jar="%CATALINA_JAXP_PARSER_JAR%" -Djsse.home=%JSSE_HOME%
-Djmx.home=%JMX_HOME% -Djndi.home=%JNDI_HOME% -Dregexp.home=%REGEXP_HOME%
-Dservletapi.home=%SERVLETAPI_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-
-rem ----- Restore Environment Variables ---------------------------------------
-
-:cleanup
-set CLASSPATH=%_CLASSPATH%
-set _CLASSPATH=
-set JAXP_PARSER_JAR=%_JAXP_PARSER_JAR%
-set _JAXP_PARSER_JAR=
-set ANT_HOME=%_ANT_HOME%
-set _ANT_HOME=
-set ANT_XML_CLASSPATH=%_ANT_XML_CLASSPATH%
-set _ANT_XML_CLASSPATH=
-set CATALINA_JAXP_HOME=%_CATALINA_JAXP_HOME%
-set _CATALINA_JAXP_HOME=
-set CATALINA_JAXP_PARSER_JAR=%_CATALINA_JAXP_PARSER_JAR%
-set _CATALINA_JAXP_PARSER_JAR=
-:finish
-
+@echo off
+rem ---------------------------------------------------------------------------
+rem build.bat - Build Script for Catalina
+rem
+rem Environment Variable Prerequisites:
+rem
+rem JAVA_HOME Must point at your Java Development Kit [REQUIRED]
+rem
+rem JAXP_HOME Points at a JAXP compliant XML parser
+rem installation directory [NONE]
+rem JAXP_PARSER_JAR The jar filename of the JAXP compliant
+rem 'XML parser' [crimson.jar]
+rem
+rem ANT_HOME Must point at your Ant installation [../jakarta-ant]
+rem
+rem ANT_OPTS Command line options to the Java runtime
+rem that executes Ant [NONE]
+rem ANT_XML_CLASSPATH
+rem Jar files added to the classpath for the XML parsing
+rem requirements of ant
+rem [%JAXP_HOME%\%JAXP_PARSER_JAR%;%JAXP_HOME%\jaxp.jar]
+rem
+rem JMX_HOME Must point at your JMX installation [REQUIRED]
+rem
+rem JNDI_HOME Must point at your JNDI installation [REQUIRED]
+rem
+rem JSSE_HOME Must point at your JSSE installation [REQUIRED]
+rem
+rem REGEXP_HOME Must point at your Regexp installation [REQUIRED]
+rem
+rem SERVLETAPI_HOME Must point at your "jakarta-servletapi" installation.
+rem [REQUIRED]
+rem
+rem CATALINA_JAXP_HOME
+rem JAXP 1.0 compliant XML parser installation directory
+rem used for catalina [JAXP_HOME]
+rem CATALINA_JAXP_PARSER_JAR
+rem The jar filename of the JAXP compliant XML parser
+rem used for catalina [JAXP_PARSER_JAR]
+rem $Id: build.bat,v 1.12 2001/02/01 19:07:43 craigmcc Exp $
+rem ---------------------------------------------------------------------------
+
+
+rem ----- Save Environment Variables ------------------------------------------
+
+set _CLASSPATH=%CLASSPATH%
+set _JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
+set _ANT_HOME=%ANT_HOME%
+set _ANT_XML_CLASSPATH=%ANT_XML_CLASSPATH%
+set _CATALINA_JAXP_HOME=%CATALINA_JAXP_HOME%
+set _CATALINA_JAXP_PARSER_JAR=%CATALINA_JAXP_PARSER_JAR%
+
+
+rem ----- Verify and Set Required Environment Variables -----------------------
+
+
+
+if not "%JAVA_HOME%" == "" goto gotJavaHome
+echo You must set JAVA_HOME to point at your Java Development Kit installation
+goto cleanup
+:gotJavaHome
+
+if not "%JAXP_PARSER_JAR%" == "" goto gotJaxpParserJar
+set JAXP_PARSER_JAR=crimson.jar
+:gotJaxpParserJar
+
+if not "%ANT_XML_CLASSPATH%" == "" goto gotAntXmlClasspath
+if "%JAXP_HOME%" == "" goto jaxpHome
+set ANT_XML_CLASSPATH=%JAXP_HOME%\%JAXP_PARSER_JAR%;%JAXP_HOME%\jaxp.jar
+:gotAntXmlClasspath
+
+if not "%CATALINA_JAXP_HOME%" == "" goto gotCatalinaJaxpHome
+if "%JAXP_HOME%" == "" goto jaxpHome
+set CATALINA_JAXP_HOME=%JAXP_HOME%
+:gotCatalinaJaxpHome
+
+if not "%CATALINA_JAXP_PARSER_JAR%" == "" goto gotCatalinaJaxpParserJar
+set CATALINA_JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
+:gotCatalinaJaxpParserJar
+
+goto gotJaxpHome
+
+:jaxpHome
+echo You must set JAXP_HOME to point at your XML Parser install directory.
+echo By default, ant and catalina will use jaxp.jar and crimson.jar from
+echo that directory.
+echo - A different parser jar file can be specified globally for all
+echo components via environment variable JAXP_PARSER_JAR (e.g. xerces.jar).
+echo - XML requirements for each component can also be set individually via
+echo the following environment variables:
+echo ANT_XML_CLASSPATH
+echo CATALINA_JAXP_HOME CATALINA_JAXP_PARSER_JAR
+goto cleanup
+:gotJaxpHome
+
+if not "%ANT_HOME%" == "" goto gotAntHome
+set ANT_HOME=../../jakarta-ant
+:gotAntHome
+
+if not "%JMX_HOME%" == "" goto gotJmxHome
+echo You must set JMX_HOME to point at your Java Management Extensions install
+goto cleanup
+:gotJmxHome
+
+if not "%JNDI_HOME%" == "" goto gotJndiHome
+echo You must set JNDI_HOME to point at your Java Naming and Directory Interface
install
+goto cleanup
+:gotJndiHome
+
+if not "%JSSE_HOME%" == "" goto gotJsseHome
+echo You must set JSSE_HOME to point at your Java Security Extensions install
+goto cleanup
+:gotJsseHome
+
+if not "%REGEXP_HOME%" == "" goto gotRegexpHome
+echo You must set REGEXP_HOME to point at your Regular Expressions distribution
install
+goto cleanup
+:gotRegexpHome
+
+if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
+echo You must set SERVLETAPI_HOME to your Servlet API distribution that includes
the Servlet 2.3 and JSP 1.2 API classes.
+goto cleanup
+:gotServletapiHome
+
+rem ----- Set Up The Runtime Classpath ----------------------------------------
+
+if not "%CLASSPATH%" == "" set CLASSPATH=%CLASSPATH%;
+set
CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar;%ANT_XML_CLASSPATH%
+rem @@@ %JMX_HOME%\lib\jmxri.jar
+
+
+rem ----- Execute The Requested Build -----------------------------------------
+
+%JAVA_HOME%\bin\java %ANT_OPTS% org.apache.tools.ant.Main
-Dcatalina.jaxp.home="%CATALINA_JAXP_HOME%"
-Dcatalina.jaxp.parser.jar="%CATALINA_JAXP_PARSER_JAR%" -Djsse.home=%JSSE_HOME%
-Djmx.home=%JMX_HOME% -Djndi.home=%JNDI_HOME% -Dregexp.home=%REGEXP_HOME%
-Dservletapi.home=%SERVLETAPI_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+
+rem ----- Restore Environment Variables ---------------------------------------
+
+:cleanup
+set CLASSPATH=%_CLASSPATH%
+set _CLASSPATH=
+set JAXP_PARSER_JAR=%_JAXP_PARSER_JAR%
+set _JAXP_PARSER_JAR=
+set ANT_HOME=%_ANT_HOME%
+set _ANT_HOME=
+set ANT_XML_CLASSPATH=%_ANT_XML_CLASSPATH%
+set _ANT_XML_CLASSPATH=
+set CATALINA_JAXP_HOME=%_CATALINA_JAXP_HOME%
+set _CATALINA_JAXP_HOME=
+set CATALINA_JAXP_PARSER_JAR=%_CATALINA_JAXP_PARSER_JAR%
+set _CATALINA_JAXP_PARSER_JAR=
+:finish
+
1.30 +3 -3 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build.xml 2000/12/23 21:41:15 1.29
+++ build.xml 2001/02/01 19:07:44 1.30
@@ -3,9 +3,9 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="build.compiler" value="classic"/>
- <property name="catalina.build" value="../../build/catalina"/>
- <property name="catalina.deploy" value="../../build/tomcat-4.0"/>
- <property name="catalina.dist" value="../../dist/catalina"/>
+ <property name="catalina.build" value="build"/>
+ <property name="catalina.deploy" value="../build"/>
+ <property name="catalina.dist" value="dist"/>
<property name="servletapi.build" value="../../build/servletapi"/>
<property name="avalon.dist" value="../../dist/avalon"/>
1.7 +75 -75 jakarta-tomcat-4.0/jasper/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/build.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.bat 2000/10/12 23:34:11 1.6
+++ build.bat 2001/02/01 19:07:50 1.7
@@ -1,27 +1,27 @@
-@echo off
-rem ---------------------------------------------------------------------------
-rem build.bat - Build Script for Jasper
-rem
-rem Environment Variable Prerequisites:
-rem
-rem JAVA_HOME Must point at your Java Development Kit [REQUIRED]
-rem
+@echo off
+rem ---------------------------------------------------------------------------
+rem build.bat - Build Script for Jasper
+rem
+rem Environment Variable Prerequisites:
+rem
+rem JAVA_HOME Must point at your Java Development Kit [REQUIRED]
+rem
rem JAXP_HOME Points at a JAXP compliant XML parser
rem installation directory [NONE]
rem JAXP_PARSER_JAR The jar filename of the JAXP compliant
rem 'XML parser' [crimson.jar]
rem
-rem ANT_HOME Must point at your Ant installation [../jakarta-ant]
-rem
-rem ANT_OPTS Command line options to the Java runtime
-rem that executes Ant [NONE]
+rem ANT_HOME Must point at your Ant installation [../jakarta-ant]
+rem
+rem ANT_OPTS Command line options to the Java runtime
+rem that executes Ant [NONE]
rem ANT_XML_CLASSPATH
rem Jar files added to the classpath for the XML parsing
rem requirements of ant
rem [%JAXP_HOME%\%JAXP_PARSER_JAR%;%JAXP_HOME%\jaxp.jar]
rem
-rem SERVLETAPI_HOME Must point at your "jakarta-servletapi" installation.
-rem [REQUIRED]
+rem SERVLETAPI_HOME Must point at your "jakarta-servletapi" installation.
+rem [REQUIRED]
rem
rem JASPER_JAXP_HOME
rem JAXP 1.1 compliant XML parser installation directory
@@ -29,40 +29,40 @@
rem JASPER_JAXP_PARSER_JAR
rem The jar filename of the JAXP compliant XML parser
rem used for jasper [JAXP_PARSER_JAR]
-rem
-rem $Id: build.bat,v 1.6 2000/10/12 23:34:11 pierred Exp $
-rem ---------------------------------------------------------------------------
-
-
-rem ----- Save Environment Variables ------------------------------------------
-
+rem
+rem $Id: build.bat,v 1.7 2001/02/01 19:07:50 craigmcc Exp $
+rem ---------------------------------------------------------------------------
+
+
+rem ----- Save Environment Variables ------------------------------------------
+
set _CLASSPATH=%CLASSPATH%
-set _JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
-set _ANT_HOME=%ANT_HOME%
+set _JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
+set _ANT_HOME=%ANT_HOME%
set _ANT_XML_CLASSPATH=%ANT_XML_CLASSPATH%
-set _JASPER_JAXP_HOME=%JASPER_JAXP_HOME%
-set _JASPER_JAXP_PARSER_JAR=%JASPER_JAXP_PARSER_JAR%
-
-
-rem ----- Verify and Set Required Environment Variables -----------------------
-
-
-if not "%JAVA_HOME%" == "" goto gotJavaHome
-echo You must set JAVA_HOME to point at your Java Development Kit installation
-goto cleanup
-:gotJavaHome
-
+set _JASPER_JAXP_HOME=%JASPER_JAXP_HOME%
+set _JASPER_JAXP_PARSER_JAR=%JASPER_JAXP_PARSER_JAR%
+
+
+rem ----- Verify and Set Required Environment Variables -----------------------
+
+
+if not "%JAVA_HOME%" == "" goto gotJavaHome
+echo You must set JAVA_HOME to point at your Java Development Kit installation
+goto cleanup
+:gotJavaHome
+
if not "%JAXP_PARSER_JAR%" == "" goto gotJaxpParserJar
set JAXP_PARSER_JAR=crimson.jar
:gotJaxpParserJar
-if not "%ANT_XML_CLASSPATH%" == "" goto gotAntXmlClasspath
-if "%JAXP_HOME%" == "" goto jaxpHome
+if not "%ANT_XML_CLASSPATH%" == "" goto gotAntXmlClasspath
+if "%JAXP_HOME%" == "" goto jaxpHome
set ANT_XML_CLASSPATH=%JAXP_HOME%\%JAXP_PARSER_JAR%;%JAXP_HOME%\jaxp.jar
:gotAntXmlClasspath
-if not "%JASPER_JAXP_HOME%" == "" goto gotJasperJaxpHome
-if "%JAXP_HOME%" == "" goto jaxpHome
+if not "%JASPER_JAXP_HOME%" == "" goto gotJasperJaxpHome
+if "%JAXP_HOME%" == "" goto jaxpHome
set JASPER_JAXP_HOME=%JAXP_HOME%
:gotJasperJaxpHome
@@ -82,44 +82,44 @@
echo the following environment variables:
echo ANT_XML_CLASSPATH
echo JASPER_JAXP_HOME JASPER_JAXP_PARSER_JAR
-goto cleanup
+goto cleanup
:gotJaxpHome
+
+if not "%ANT_HOME%" == "" goto gotAntHome
+set ANT_HOME=../../jakarta-ant
+:gotAntHome
+
+if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
+echo You must set SERVLETAPI_HOME to your Servlet API distribution that includes
the Servlet 2.3 and JSP 1.2 API classes.
+goto cleanup
+:gotServletapiHome
-if not "%ANT_HOME%" == "" goto gotAntHome
-set ANT_HOME=../jakarta-ant
-:gotAntHome
-
-if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
-echo You must set SERVLETAPI_HOME to your Servlet API distribution that includes
the Servlet 2.3 and JSP 1.2 API classes.
-goto cleanup
-:gotServletapiHome
-
-
-rem ----- Set Up The Runtime Classpath ----------------------------------------
-
-if not "%CLASSPATH%" == "" set CLASSPATH=%CLASSPATH%;
+
+rem ----- Set Up The Runtime Classpath ----------------------------------------
+
+if not "%CLASSPATH%" == "" set CLASSPATH=%CLASSPATH%;
set
CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar;;%ANT_XML_CLASSPATH%
-
-
-rem ----- Execute The Requested Build -----------------------------------------
-
-%JAVA_HOME%\bin\java %ANT_OPTS% org.apache.tools.ant.Main
-Djasper.jaxp.home="%JASPER_JAXP_HOME%"
-Djasper.jaxp.parser.jar="%JASPER_JAXP_PARSER_JAR%"
-Dservletapi.home="%SERVLETAPI_HOME%" -Djava.home="%JAVA_HOME%" %1 %2 %3 %4 %5 %6 %7
%8 %9
-
-
-rem ----- Restore Environment Variables ---------------------------------------
-
-:cleanup
-set CLASSPATH=%_CLASSPATH%
-set _CLASSPATH=
-set JAXP_PARSER_JAR=%_JAXP_PARSER_JAR%
-set _JAXP_PARSER_JAR=
-set ANT_HOME=%_ANT_HOME%
-set _ANT_HOME=
-set ANT_XML_CLASSPATH=%_ANT_XML_CLASSPATH%
-set _ANT_XML_CLASSPATH=
+
+
+rem ----- Execute The Requested Build -----------------------------------------
+
+%JAVA_HOME%\bin\java %ANT_OPTS% org.apache.tools.ant.Main
-Djasper.jaxp.home="%JASPER_JAXP_HOME%"
-Djasper.jaxp.parser.jar="%JASPER_JAXP_PARSER_JAR%"
-Dservletapi.home="%SERVLETAPI_HOME%" -Djava.home="%JAVA_HOME%" %1 %2 %3 %4 %5 %6 %7
%8 %9
+
+
+rem ----- Restore Environment Variables ---------------------------------------
+
+:cleanup
+set CLASSPATH=%_CLASSPATH%
+set _CLASSPATH=
+set JAXP_PARSER_JAR=%_JAXP_PARSER_JAR%
+set _JAXP_PARSER_JAR=
+set ANT_HOME=%_ANT_HOME%
+set _ANT_HOME=
+set ANT_XML_CLASSPATH=%_ANT_XML_CLASSPATH%
+set _ANT_XML_CLASSPATH=
set JASPER_JAXP_HOME=%_JASPER_JAXP_HOME%
-set _JASPER_JAXP_HOME=
+set _JASPER_JAXP_HOME=
set JASPER_JAXP_PARSER_JAR=%_JASPER_JAXP_PARSER_JAR%
-set _JASPER_JAXP_PARSER_JAR=
-:finish
-
+set _JASPER_JAXP_PARSER_JAR=
+:finish
+
1.13 +3 -3 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 2000/11/12 01:10:50 1.12
+++ build.xml 2001/02/01 19:07:52 1.13
@@ -3,9 +3,9 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="build.compiler" value="classic"/>
- <property name="jasper.build" value="../../build/jasper"/>
- <property name="jasper.deploy" value="../../build/tomcat-4.0"/>
- <property name="jasper.dist" value="../../dist/jasper"/>
+ <property name="jasper.build" value="build"/>
+ <property name="jasper.deploy" value="../build"/>
+ <property name="jasper.dist" value="dist"/>
<!-- ================== Derived Property Values ========================= -->
<property name="jaxp.jar" value="${jasper.jaxp.home}/jaxp.jar"/>
1.3 +3 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 2001/01/23 20:11:48 1.2
+++ build.xml 2001/02/01 19:07:56 1.3
@@ -4,9 +4,9 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="build.compiler" value="classic"/>
<property name="servletapi.home" value="../../jakarta-servletapi"/>
- <property name="tester.build" value="../../build/tester"/>
- <property name="tester.deploy" value="../../build/tomcat-4.0"/>
- <property name="tester.dist" value="../../dist/tester"/>
+ <property name="tester.build" value="build"/>
+ <property name="tester.deploy" value="../build"/>
+ <property name="tester.dist" value="dist"/>
<!-- ================== Derived Property Values ========================= -->
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
1.5 +69 -69 jakarta-tomcat-4.0/webapps/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/build.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.bat 2000/10/12 23:34:13 1.4
+++ build.bat 2001/02/01 19:08:00 1.5
@@ -1,54 +1,54 @@
-@echo off
-rem ---------------------------------------------------------------------------
-rem build.bat - Build Script for webapps
-rem
-rem Environment Variable Prerequisites:
-rem
-rem JAVA_HOME Must point at your Java Development Kit [REQUIRED]
-rem
+@echo off
+rem ---------------------------------------------------------------------------
+rem build.bat - Build Script for webapps
+rem
+rem Environment Variable Prerequisites:
+rem
+rem JAVA_HOME Must point at your Java Development Kit [REQUIRED]
+rem
rem JAXP_HOME Points at a JAXP compliant XML parser
rem installation directory [NONE]
rem JAXP_PARSER_JAR The jar filename of the JAXP compliant
rem 'XML parser' [crimson.jar]
rem
-rem ANT_HOME Must point at your Ant installation [../jakarta-ant]
-rem
-rem ANT_OPTS Command line options to the Java runtime
-rem that executes Ant [NONE]
+rem ANT_HOME Must point at your Ant installation [../jakarta-ant]
+rem
+rem ANT_OPTS Command line options to the Java runtime
+rem that executes Ant [NONE]
rem ANT_XML_CLASSPATH
rem Jar files added to the classpath for the XML parsing
rem requirements of ant
rem [%JAXP_HOME%\%JAXP_PARSER_JAR%;%JAXP_HOME%\jaxp.jar]
rem
-rem SERVLETAPI_HOME Must point at your "jakarta-servletapi" installation.
-rem [REQUIRED]
+rem SERVLETAPI_HOME Must point at your "jakarta-servletapi" installation.
+rem [REQUIRED]
rem
-rem
-rem $Id: build.bat,v 1.4 2000/10/12 23:34:13 pierred Exp $
-rem ---------------------------------------------------------------------------
-
-
-rem ----- Save Environment Variables ------------------------------------------
-
+rem
+rem $Id: build.bat,v 1.5 2001/02/01 19:08:00 craigmcc Exp $
+rem ---------------------------------------------------------------------------
+
+
+rem ----- Save Environment Variables ------------------------------------------
+
set _CLASSPATH=%CLASSPATH%
-set _JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
-set _ANT_HOME=%ANT_HOME%
-set _ANT_XML_CLASSPATH=%ANT_XML_CLASSPATH%
-
-
-rem ----- Verify and Set Required Environment Variables -----------------------
-
-if not "%JAVA_HOME%" == "" goto gotJavaHome
-echo You must set JAVA_HOME to point at your Java Development Kit installation
-goto cleanup
-:gotJavaHome
-
+set _JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
+set _ANT_HOME=%ANT_HOME%
+set _ANT_XML_CLASSPATH=%ANT_XML_CLASSPATH%
+
+
+rem ----- Verify and Set Required Environment Variables -----------------------
+
+if not "%JAVA_HOME%" == "" goto gotJavaHome
+echo You must set JAVA_HOME to point at your Java Development Kit installation
+goto cleanup
+:gotJavaHome
+
if not "%JAXP_PARSER_JAR%" == "" goto gotJaxpParserJar
set JAXP_PARSER_JAR=crimson.jar
:gotJaxpParserJar
-if not "%ANT_XML_CLASSPATH%" == "" goto gotAntXmlClasspath
-if "%JAXP_HOME%" == "" goto jaxpHome
+if not "%ANT_XML_CLASSPATH%" == "" goto gotAntXmlClasspath
+if "%JAXP_HOME%" == "" goto jaxpHome
set ANT_XML_CLASSPATH=%JAXP_HOME%\%JAXP_PARSER_JAR%;%JAXP_HOME%\jaxp.jar
:gotAntXmlClasspath
@@ -63,40 +63,40 @@
echo - XML requirements for each component can also be set individually via
echo the following environment variables:
echo ANT_XML_CLASSPATH
-goto cleanup
+goto cleanup
:gotJaxpHome
-if not "%ANT_HOME%" == "" goto gotAntHome
-set ANT_HOME=../jakarta-ant
-:gotAntHome
-
-if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
-echo You must set SERVLETAPI_HOME to your Servlet API distribution that includes
the Servlet 2.3 and JSP 1.2 API classes.
-goto cleanup
-:gotServletapiHome
-
-
-rem ----- Set Up The Runtime Classpath ----------------------------------------
-
-if not "%CLASSPATH%" == "" set CLASSPATH=%CLASSPATH%;
+if not "%ANT_HOME%" == "" goto gotAntHome
+set ANT_HOME=../../jakarta-ant
+:gotAntHome
+
+if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
+echo You must set SERVLETAPI_HOME to your Servlet API distribution that includes
the Servlet 2.3 and JSP 1.2 API classes.
+goto cleanup
+:gotServletapiHome
+
+
+rem ----- Set Up The Runtime Classpath ----------------------------------------
+
+if not "%CLASSPATH%" == "" set CLASSPATH=%CLASSPATH%;
set
CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar;%ANT_XML_CLASSPATH%
-
-
-rem ----- Execute The Requested Build -----------------------------------------
-
-%JAVA_HOME%\bin\java %ANT_OPTS% org.apache.tools.ant.Main
-Dservletapi.home=%SERVLETAPI_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-
-rem ----- Restore Environment Variables ---------------------------------------
-
-:cleanup
-set CLASSPATH=%_CLASSPATH%
-set _CLASSPATH=
-set JAXP_PARSER_JAR=%_JAXP_PARSER_JAR%
-set _JAXP_PARSER_JAR=
-set ANT_HOME=%_ANT_HOME%
-set _ANT_HOME=
-set ANT_XML_CLASSPATH=%_ANT_XML_CLASSPATH%
-set _ANT_XML_CLASSPATH=
-:finish
-
+
+
+rem ----- Execute The Requested Build -----------------------------------------
+
+%JAVA_HOME%\bin\java %ANT_OPTS% org.apache.tools.ant.Main
-Dservletapi.home=%SERVLETAPI_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+
+rem ----- Restore Environment Variables ---------------------------------------
+
+:cleanup
+set CLASSPATH=%_CLASSPATH%
+set _CLASSPATH=
+set JAXP_PARSER_JAR=%_JAXP_PARSER_JAR%
+set _JAXP_PARSER_JAR=
+set ANT_HOME=%_ANT_HOME%
+set _ANT_HOME=
+set ANT_XML_CLASSPATH=%_ANT_XML_CLASSPATH%
+set _ANT_XML_CLASSPATH=
+:finish
+
1.11 +3 -3 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 2000/11/12 01:10:55 1.10
+++ build.xml 2001/02/01 19:08:02 1.11
@@ -3,9 +3,9 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="build.compiler" value="classic"/>
- <property name="webapps.build" value="$../../build/webapps"/>
- <property name="webapps.deploy" value="$../../build/tomcat-4.0"/>
- <property name="webapps.dist" value="$../../dist/webapps"/>
+ <property name="webapps.build" value="build"/>
+ <property name="webapps.deploy" value="../build"/>
+ <property name="webapps.dist" value="dist"/>
<!-- ================== Derived Property Values ========================= -->
1.5 +3 -3 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2000/11/12 01:11:10 1.4
+++ build.xml 2001/02/01 19:08:06 1.5
@@ -3,9 +3,9 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="build.compiler" value="classic"/>
- <property name="build.dir" value="../../../build/webapps"/>
- <property name="dist.dir" value="../../../dist/webapps"/>
- <property name="servletapi.home" value="../../../jakarta-servletapi"/>
+ <property name="build.dir" value="../build"/>
+ <property name="dist.dir" value="../dist"/>
+ <property name="servletapi.home" value="../../../jakarta-servletapi-4"/>
<property name="webapp.name" value="ROOT"/>
1.5 +3 -3 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2000/11/12 01:11:00 1.4
+++ build.xml 2001/02/01 19:08:09 1.5
@@ -3,9 +3,9 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="build.compiler" value="classic"/>
- <property name="build.dir" value="../../../build/webapps"/>
- <property name="dist.dir" value="../../../dist/webapps"/>
- <property name="servletapi.home" value="../../../jakarta-servletapi"/>
+ <property name="build.dir" value="../build"/>
+ <property name="dist.dir" value="../dist"/>
+ <property name="servletapi.home" value="../../../jakarta-servletapi-4"/>
<property name="webapp.name" value="examples"/>
1.4 +3 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2000/11/12 01:11:05 1.3
+++ build.xml 2001/02/01 19:08:13 1.4
@@ -3,9 +3,9 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="build.compiler" value="classic"/>
- <property name="build.dir" value="../../../build/webapps"/>
- <property name="dist.dir" value="../../../dist/webapps"/>
- <property name="servletapi.home" value="../../../jakarta-servletapi"/>
+ <property name="build.dir" value="../build"/>
+ <property name="dist.dir" value="../dist"/>
+ <property name="servletapi.home" value="../../../jakarta-servletapi-4"/>
<property name="webapp.name" value="manager"/>
1.4 +3 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2000/11/12 01:11:14 1.3
+++ build.xml 2001/02/01 19:08:16 1.4
@@ -3,9 +3,9 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="build.compiler" value="classic"/>
- <property name="build.dir" value="../../../build/webapps"/>
- <property name="dist.dir" value="../../../dist/webapps"/>
- <property name="servletapi.home" value="../../../jakarta-servletapi"/>
+ <property name="build.dir" value="../build"/>
+ <property name="dist.dir" value="../dist"/>
+ <property name="servletapi.home" value="../../../jakarta-servletapi-4"/>
<property name="webapp.name" value="webdav"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
