craigmcc 01/03/22 17:12:12
Modified: . README.txt build.bat build.sh 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
Log:
Undo the previous fix on where servlet API javadocs are copied from,
because it causes other compatibility problems. Instead, correct the
instructions in the README on setting SERVLETAPI_HOME if you are building
the Servlet API classes from source.
Also, establish a reasonable default value if SERVLETAPI_HOME is not set,
rather than requiring it in the build.sh and build.bat scripts.
Revision Changes Path
1.13 +4 -1 jakarta-tomcat-4.0/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/README.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- README.txt 2001/02/23 03:15:39 1.12
+++ README.txt 2001/03/23 01:12:10 1.13
@@ -109,7 +109,10 @@
./build.sh dist <-- Unix
build dist <-- Windows
- to create the required servlet.jar file.
+ to create the required servlet.jar file and Javadoc documentation.
+
+ If you do this, you should set your SERVLETAPI_HOME environment variable
+ to point at "$JAKARTA_HOME/jakarta-servletapi-4/dist".
* Download the Tomcat 4.0 source repository (module
"jakarta-tomcat-4.0") via anonymous CVS into a directory named
1.17 +6 -4 jakarta-tomcat-4.0/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/build.bat,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.bat 2001/02/24 22:23:56 1.16
+++ build.bat 2001/03/23 01:12:10 1.17
@@ -29,7 +29,7 @@
rem REGEXP_HOME Must point at your Regexp installation [REQUIRED]
rem
rem SERVLETAPI_HOME Must point at your "jakarta-servletapi" installation.
-rem [REQUIRED]
+rem [..\jakarta-servletapi-4\dist]
rem
rem CATALINA_JAXP_HOME
rem JAXP 1.0 compliant XML parser installation directory
@@ -45,7 +45,7 @@
rem The jar filename of the JAXP compliant XML parser
rem used for jasper [JAXP_PARSER_JAR]
rem
-rem $Id: build.bat,v 1.16 2001/02/24 22:23:56 craigmcc Exp $
+rem $Id: build.bat,v 1.17 2001/03/23 01:12:10 craigmcc Exp $
rem ---------------------------------------------------------------------------
@@ -59,6 +59,7 @@
set _CATALINA_JAXP_PARSER_JAR=%CATALINA_JAXP_PARSER_JAR%
set _JASPER_JAXP_HOME=%JASPER_JAXP_HOME%
set _JASPER_JAXP_PARSER_JAR=%JASPER_JAXP_PARSER_JAR%
+set _SERVLETAPI_HOME=%SERVLETAPI_HOME%
rem ----- Verify and Set Required Environment Variables -----------------------
@@ -136,8 +137,7 @@
: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
+set SERVLETAPI_HOME=..\jakarta-servletapi-4\dist
:gotServletapiHome
@@ -171,5 +171,7 @@
set _JASPER_JAXP_HOME=
set JASPER_JAXP_PARSER_JAR=%_JASPER_JAXP_PARSER_JAR%
set _JASPER_JAXP_PARSER_JAR=
+set SERVLETAPI_HOME=%_SERVLETAPI_HOME%
+set _SERVLETAPI_HOME=
:finish
1.12 +3 -4 jakarta-tomcat-4.0/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/build.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.sh 2000/12/23 21:41:13 1.11
+++ build.sh 2001/03/23 01:12:10 1.12
@@ -31,7 +31,7 @@
# REGEXP_HOME Must point at your Regexp installation [REQUIRED]
#
# SERVLETAPI_HOME Must point at your "jakarta-servletapi" installation.
-# [REQUIRED]
+# [../jakarta-servletapi-4/dist]
#
# CATALINA_JAXP_HOME
# JAXP 1.0 compliant XML parser installation directory
@@ -49,7 +49,7 @@
# The jar filename of the JAXP compliant XML parser
# used for jasper [$JAXP_PARSER_JAR]
#
-# $Id: build.sh,v 1.11 2000/12/23 21:41:13 craigmcc Exp $
+# $Id: build.sh,v 1.12 2001/03/23 01:12:10 craigmcc Exp $
# -----------------------------------------------------------------------------
@@ -81,8 +81,7 @@
fi
if [ "$SERVLETAPI_HOME" = "" ] ; then
- echo You must set SERVLETAPI_HOME to your Servlet API distribution that includes
the Servlet 2.3 and JSP 1.2 API classes.
- exit 1
+ SERVLETAPI_HOME=`pwd`/../jakarta-servletapi-4/dist
fi
if [ "$JAXP_PARSER_JAR" = "" ] ; then
1.21 +2 -1 jakarta-tomcat-4.0/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 2001/03/23 00:07:36 1.20
+++ build.xml 2001/03/23 01:12:10 1.21
@@ -4,6 +4,7 @@
<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"/>
<property name="tomcat.build" value="${basedir}/build"/>
<property name="tomcat.dist" value="${basedir}/dist"/>
<property name="webapps.build" value="${basedir}/webapps/build"/>
@@ -115,7 +116,7 @@
<fileset dir="${jasper.build}/javadoc" />
</copy>
<copy todir="${tomcat.build}/webapps/ROOT/servletapi-javadoc">
- <fileset dir="${servletapi.home}/dist/docs/api" />
+ <fileset dir="${servletapi.home}/docs/api" />
</copy>
</target>
1.33 +1 -1 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- build.xml 2001/03/11 15:05:46 1.32
+++ build.xml 2001/03/23 01:12:11 1.33
@@ -7,7 +7,7 @@
<property name="catalina.deploy" value="../build"/>
<property name="catalina.dist" value="dist"/>
- <property name="servletapi.build" value="../../build/servletapi"/>
+ <property name="servletapi.home" value="../../jakarta-servletapi-4/dist"/>
<property name="avalon.dist" value="../../dist/avalon"/>
<!-- ================== Derived Property Values ========================= -->
1.16 +1 -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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 2001/02/23 02:35:07 1.15
+++ build.xml 2001/03/23 01:12:11 1.16
@@ -6,6 +6,7 @@
<property name="jasper.build" value="build"/>
<property name="jasper.deploy" value="../build"/>
<property name="jasper.dist" value="dist"/>
+ <property name="servletapi.home" value="../../jakarta-servletapi-4/dist"/>
<!-- ================== Derived Property Values ========================= -->
<property name="jaxp.jar" value="${jasper.jaxp.home}/jaxp.jar"/>
1.8 +1 -1 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 2001/03/21 19:38:28 1.7
+++ build.xml 2001/03/23 01:12:11 1.8
@@ -3,7 +3,7 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="build.compiler" value="classic"/>
- <property name="servletapi.home" value="../../jakarta-servletapi-4"/>
+ <property name="servletapi.home" value="../../jakarta-servletapi-4/dist"/>
<property name="tester.build" value="build"/>
<property name="tester.deploy" value="../build"/>
<property name="tester.dist" value="dist"/>
1.12 +1 -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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 2001/02/01 19:08:02 1.11
+++ build.xml 2001/03/23 01:12:11 1.12
@@ -6,6 +6,7 @@
<property name="webapps.build" value="build"/>
<property name="webapps.deploy" value="../build"/>
<property name="webapps.dist" value="dist"/>
+ <property name="servletapi.home" value="../../jakarta-servletapi-4/dist"/>
<!-- ================== Derived Property Values ========================= -->
1.7 +1 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 2001/02/03 22:09:44 1.6
+++ build.xml 2001/03/23 01:12:12 1.7
@@ -5,7 +5,7 @@
<property name="build.compiler" value="classic"/>
<property name="webapps.build" value="../build"/>
<property name="webapps.dist" value="../dist"/>
- <property name="servletapi.home" value="../../../jakarta-servletapi-4"/>
+ <property name="servletapi.home" value="../../../jakarta-servletapi-4/dist"/>
<property name="webapp.name" value="ROOT"/>
1.7 +1 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 2001/02/03 22:09:45 1.6
+++ build.xml 2001/03/23 01:12:12 1.7
@@ -5,7 +5,7 @@
<property name="build.compiler" value="classic"/>
<property name="webapps.build" value="../build"/>
<property name="webapps.dist" value="../dist"/>
- <property name="servletapi.home" value="../../../jakarta-servletapi-4"/>
+ <property name="servletapi.home" value="../../../jakarta-servletapi-4/dist"/>
<property name="webapp.name" value="examples"/>
1.6 +1 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 2001/02/03 22:09:45 1.5
+++ build.xml 2001/03/23 01:12:12 1.6
@@ -5,7 +5,7 @@
<property name="build.compiler" value="classic"/>
<property name="webapps.build" value="../build"/>
<property name="webapps.dist" value="../dist"/>
- <property name="servletapi.home" value="../../../jakarta-servletapi-4"/>
+ <property name="servletapi.home" value="../../../jakarta-servletapi-4/dist"/>
<property name="webapp.name" value="manager"/>
1.6 +1 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 2001/02/03 22:09:46 1.5
+++ build.xml 2001/03/23 01:12:12 1.6
@@ -5,7 +5,7 @@
<property name="build.compiler" value="classic"/>
<property name="webapps.build" value="../build"/>
<property name="webapps.dist" value="../dist"/>
- <property name="servletapi.home" value="../../../jakarta-servletapi-4"/>
+ <property name="servletapi.home" value="../../../jakarta-servletapi-4/dist"/>
<property name="webapp.name" value="webdav"/>
