You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/12/23 22:41:17 UTC

cvs commit: jakarta-tomcat-4.0/catalina build.bat build.sh build.xml

craigmcc    00/12/23 13:41:16

  Modified:    .        README.txt build.bat build.sh
               catalina build.bat build.sh build.xml
  Log:
  Modify the build scripts (per the pattern already in place) to copy
  jndi.jar to the binary distribution.  The JNDI license says it allows
  redistribution.
  
  As a result, you will now need to have JNDI 1.2.1 downloaded, and point at
  it with a JNDI_HOME environment variable, in order to build Tomcat 4.0.
  
  Revision  Changes    Path
  1.9       +5 -6      jakarta-tomcat-4.0/README.txt
  
  Index: README.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/README.txt,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- README.txt	2000/12/02 20:52:56	1.8
  +++ README.txt	2000/12/23 21:41:12	1.9
  @@ -41,11 +41,10 @@
     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 API for XML Processing 1.1
  -  from <http://java.sun.com/xml/download.html>. Set an
  -  environment variable "JAXP_HOME" pointing at the directory to which you
  -  installed this distribution.  
  -  [Other XML parsers may also be used. See below for details]
  +* 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.
   
   * Download and install the Java Secure Sockets Extension (JSSE) implementation
     (current version number is 1.0.1) from <http://java.sun.com/products/jsse>.
  @@ -251,4 +250,4 @@
       CATALINA_JAXP_PARSER_JAR [default: JAXP_PARSER_JAR]
     
       JASPER_JAXP_HOME [default: JAXP_HOME]
  -    JASPER_JAXP_PARSER_JAR [default: JAXP_PARSER_JAR]
  \ No newline at end of file
  +    JASPER_JAXP_PARSER_JAR [default: JAXP_PARSER_JAR]
  
  
  
  1.13      +175 -168  jakarta-tomcat-4.0/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.bat,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.bat	2000/12/03 02:48:58	1.12
  +++ build.bat	2000/12/23 21:41:12	1.13
  @@ -1,168 +1,175 @@
  -@echo off
  -rem --------------------------------------------------------------------------
  -rem build.bat - Build Script for Tomcat
  -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   JSSE_HOME        Must point at your JSSE installation [REQUIRED]
  -rem
  -rem   JMX_HOME         Must point at your JMX 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
  -rem   JASPER_JAXP_HOME
  -rem                    JAXP 1.1 compliant XML parser installation directory
  -rem                    used for jasper [JAXP_HOME]
  -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.12 2000/12/03 02:48:58 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%
  -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
  -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
  -
  -if not "%JASPER_JAXP_HOME%" == "" goto gotJasperJaxpHome
  -if "%JAXP_HOME%" == "" goto jaxpHome
  -set JASPER_JAXP_HOME=%JAXP_HOME%
  -:gotJasperJaxpHome
  -
  -if not "%JASPER_JAXP_PARSER_JAR%" == "" goto gotJasperJaxpParserJar
  -set JASPER_JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
  -:gotJasperJaxpParserJar
  -
  -goto gotJaxpHome
  -
  -:jaxpHome
  -echo You must set JAXP_HOME to point at your XML Parser install directory.
  -echo By default, ant, catalina, and jasper 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
  -echo      JASPER_JAXP_HOME JASPER_JAXP_PARSER_JAR
  -goto cleanup
  -:gotJaxpHome
  -
  -if not "%ANT_HOME%" == "" goto gotAntHome
  -set ANT_HOME=../jakarta-ant
  -:gotAntHome
  -
  -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 "%JMX_HOME%" == "" goto gotJmxHome
  -echo You must set JMX_HOME to point at your Java Management Extensions install
  -goto cleanup
  -:gotJmxHome
  -
  -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 -Dant.home=%ANT_HOME% -Dcatalina.jaxp.home="%CATALINA_JAXP_HOME%" -Dcatalina.jaxp.parser.jar="%CATALINA_JAXP_PARSER_JAR%" -Djasper.jaxp.home="%JASPER_JAXP_HOME%" -Djasper.jaxp.parser.jar="%JASPER_JAXP_PARSER_JAR%" -Djsse.home="%JSSE_HOME%" -Djmx.home="%JMX_HOME%" -Dregexp.home="%REGEXP_HOME%" -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 CATALINA_JAXP_HOME=%_CATALINA_JAXP_HOME%
  -set _CATALINA_JAXP_HOME=
  -set CATALINA_JAXP_PARSER_JAR=%_CATALINA_JAXP_PARSER_JAR%
  -set _CATALINA_JAXP_PARSER_JAR=
  -set JASPER_JAXP_HOME=%_JASPER_JAXP_HOME%
  -set _JASPER_JAXP_HOME=
  -set JASPER_JAXP_PARSER_JAR=%_JASPER_JAXP_PARSER_JAR%
  -set _JASPER_JAXP_PARSER_JAR=
  -:finish
  -
  +@echo off
  +rem --------------------------------------------------------------------------
  +rem build.bat - Build Script for Tomcat
  +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
  +rem   JASPER_JAXP_HOME
  +rem                    JAXP 1.1 compliant XML parser installation directory
  +rem                    used for jasper [JAXP_HOME]
  +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.13 2000/12/23 21:41:12 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%
  +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
  +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
  +
  +if not "%JASPER_JAXP_HOME%" == "" goto gotJasperJaxpHome
  +if "%JAXP_HOME%" == "" goto jaxpHome
  +set JASPER_JAXP_HOME=%JAXP_HOME%
  +:gotJasperJaxpHome
  +
  +if not "%JASPER_JAXP_PARSER_JAR%" == "" goto gotJasperJaxpParserJar
  +set JASPER_JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
  +:gotJasperJaxpParserJar
  +
  +goto gotJaxpHome
  +
  +:jaxpHome
  +echo You must set JAXP_HOME to point at your XML Parser install directory.
  +echo By default, ant, catalina, and jasper 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
  +echo      JASPER_JAXP_HOME JASPER_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 -Dant.home=%ANT_HOME% -Dcatalina.jaxp.home="%CATALINA_JAXP_HOME%" -Dcatalina.jaxp.parser.jar="%CATALINA_JAXP_PARSER_JAR%" -Djasper.jaxp.home="%JASPER_JAXP_HOME%" -Djasper.jaxp.parser.jar="%JASPER_JAXP_PARSER_JAR%" -Djsse.home="%JSSE_HOME%" -Djmx.home="%JMX_HOME%" -Djndi.home="%JNDI_HOME%" -Dregexp.home="%REGEXP_HOME%" -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 CATALINA_JAXP_HOME=%_CATALINA_JAXP_HOME%
  +set _CATALINA_JAXP_HOME=
  +set CATALINA_JAXP_PARSER_JAR=%_CATALINA_JAXP_PARSER_JAR%
  +set _CATALINA_JAXP_PARSER_JAR=
  +set JASPER_JAXP_HOME=%_JASPER_JAXP_HOME%
  +set _JASPER_JAXP_HOME=
  +set JASPER_JAXP_PARSER_JAR=%_JASPER_JAXP_PARSER_JAR%
  +set _JASPER_JAXP_PARSER_JAR=
  +:finish
  +
  
  
  
  1.11      +15 -8     jakarta-tomcat-4.0/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.sh,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.sh	2000/12/18 01:32:16	1.10
  +++ build.sh	2000/12/23 21:41:13	1.11
  @@ -22,10 +22,12 @@
   #                    requirements of ant
   #                    [$JAXP_HOME/$JAXP_PARSER_JAR:$JAXP_HOME/jaxp.jar]
   # 
  -#   JSSE_HOME        Must point at your JSSE installation [REQUIRED]
  -#
   #   JMX_HOME         Must point at your JMX installation [REQUIRED]
   #
  +#   JNDI_HOME        Must point at your JNDI installation [REQUIRED]
  +#
  +#   JSSE_HOME        Must point at your JSSE installation [REQUIRED]
  +#
   #   REGEXP_HOME      Must point at your Regexp installation [REQUIRED]
   #
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  @@ -47,7 +49,7 @@
   #                    The jar filename of the JAXP compliant XML parser 
   #                    used for jasper [$JAXP_PARSER_JAR]
   #
  -# $Id: build.sh,v 1.10 2000/12/18 01:32:16 remm Exp $
  +# $Id: build.sh,v 1.11 2000/12/23 21:41:13 craigmcc Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -58,13 +60,18 @@
     exit 1
   fi
   
  -if [ "$JSSE_HOME" = "" ] ; then
  -  echo You must set JSSE_HOME to point at your Java Security Extensions install
  +if [ "$JMX_HOME" = "" ] ; then
  +  echo You must set JMX_HOME to point at your Java Management Extensions install
     exit 1
   fi
   
  -if [ "$JMX_HOME" = "" ] ; then
  -  echo You must set JMX_HOME to point at your Java Management Extensions install
  +if [ "$JNDI_HOME" = "" ] ; then
  +  echo You must set JNDI_HOME to point at your Java Naming and Directory Interface install
  +  exit 1
  +fi
  +
  +if [ "$JSSE_HOME" = "" ] ; then
  +  echo You must set JSSE_HOME to point at your Java Security Extensions install
     exit 1
   fi
   
  @@ -139,5 +146,5 @@
   
   # ----- Execute The Requested Build -------------------------------------------
   
  -$JAVA_HOME/bin/java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Dcatalina.jaxp.home=$CATALINA_JAXP_HOME -Dcatalina.jaxp.parser.jar=$CATALINA_JAXP_PARSER_JAR -Djasper.jaxp.home=$JASPER_JAXP_HOME -Djasper.jaxp.parser.jar=$JASPER_JAXP_PARSER_JAR -Djsse.home=$JSSE_HOME -Djmx.home=$JMX_HOME -Dregexp.home=$REGEXP_HOME -Dservletapi.home=$SERVLETAPI_HOME -Djava.home=$JAVA_HOME "$@"
  +$JAVA_HOME/bin/java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Dcatalina.jaxp.home=$CATALINA_JAXP_HOME -Dcatalina.jaxp.parser.jar=$CATALINA_JAXP_PARSER_JAR -Djasper.jaxp.home=$JASPER_JAXP_HOME -Djasper.jaxp.parser.jar=$JASPER_JAXP_PARSER_JAR -Djsse.home=$JSSE_HOME -Djmx.home=$JMX_HOME -Djndi.home=$JNDI_HOME -Dregexp.home=$REGEXP_HOME -Dservletapi.home=$SERVLETAPI_HOME -Djava.home=$JAVA_HOME "$@"
   
  
  
  
  1.11      +66 -59    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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.bat	2000/10/12 23:34:09	1.10
  +++ build.bat	2000/12/23 21:41:14	1.11
  @@ -6,36 +6,38 @@
   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   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   JSSE_HOME        Must point at your JSSE installation [REQUIRED]
  -rem
  +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.10 2000/10/12 23:34:09 pierred Exp $
  +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 ---------------------------------------------------------------------------
   
   
  @@ -44,7 +46,7 @@
   set _CLASSPATH=%CLASSPATH%
   set _JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
   set _ANT_HOME=%ANT_HOME%
  -set _ANT_XML_CLASSPATH=%ANT_XML_CLASSPATH%
  +set _ANT_XML_CLASSPATH=%ANT_XML_CLASSPATH%
   set _CATALINA_JAXP_HOME=%CATALINA_JAXP_HOME%
   set _CATALINA_JAXP_PARSER_JAR=%CATALINA_JAXP_PARSER_JAR%
   
  @@ -58,53 +60,58 @@
   goto cleanup
   :gotJavaHome
   
  -if not "%JAXP_PARSER_JAR%" == "" goto gotJaxpParserJar
  -set JAXP_PARSER_JAR=crimson.jar
  -:gotJaxpParserJar
  -
  +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
  -
  +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
  +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
  -
  +:gotJaxpHome
  +
   if not "%ANT_HOME%" == "" goto gotAntHome
   set ANT_HOME=../jakarta-ant
   :gotAntHome
   
  -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 "%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
  @@ -114,17 +121,17 @@
   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%
  +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% -Dregexp.home=%REGEXP_HOME% -Dservletapi.home=%SERVLETAPI_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
  +%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 ---------------------------------------
  @@ -138,9 +145,9 @@
   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=%_CATALINA_JAXP_HOME%
   set _CATALINA_JAXP_HOME=
  -set CATALINA_JAXP_PARSER_JAR=%_CATALINA_JAXP_PARSER_JAR%
  +set CATALINA_JAXP_PARSER_JAR=%_CATALINA_JAXP_PARSER_JAR%
   set _CATALINA_JAXP_PARSER_JAR=
   :finish
   
  
  
  
  1.8       +15 -8     jakarta-tomcat-4.0/catalina/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.sh,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.sh	2000/10/12 23:34:09	1.7
  +++ build.sh	2000/12/23 21:41:14	1.8
  @@ -22,10 +22,12 @@
   #                    requirements of ant
   #                    [$JAXP_HOME/$JAXP_PARSER_JAR:$JAXP_HOME/jaxp.jar]
   # 
  -#   JSSE_HOME        Must point at your JSSE installation [REQUIRED]
  -#
   #   JMX_HOME         Must point at your JMX installation [REQUIRED]
   #
  +#   JNDI_HOME        Must point at your JNDI installation [REQUIRED]
  +#
  +#   JSSE_HOME        Must point at your JSSE installation [REQUIRED]
  +#
   #   REGEXP_HOME      Must point at your Regexp installation [REQUIRED]
   #
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  @@ -39,7 +41,7 @@
   #                    The jar filename of the JAXP compliant XML parser 
   #                    used for catalina [$JAXP_PARSER_JAR]
   #
  -# $Id: build.sh,v 1.7 2000/10/12 23:34:09 pierred Exp $
  +# $Id: build.sh,v 1.8 2000/12/23 21:41:14 craigmcc Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -50,13 +52,18 @@
     exit 1
   fi
   
  -if [ "$JSSE_HOME" = "" ] ; then
  -  echo You must set JSSE_HOME to point at your Java Security Extensions install
  +if [ "$JMX_HOME" = "" ] ; then
  +  echo You must set JMX_HOME to point at your Java Management Extensions install
     exit 1
   fi
   
  -if [ "$JMX_HOME" = "" ] ; then
  -  echo You must set JMX_HOME to point at your Java Management Extensions install
  +if [ "$JNDI_HOME" = "" ] ; then
  +  echo You must set JNDI_HOME to point at your Java Naming and Directory Interface install
  +  exit 1
  +fi
  +
  +if [ "$JSSE_HOME" = "" ] ; then
  +  echo You must set JSSE_HOME to point at your Java Security Extensions install
     exit 1
   fi
   
  @@ -118,4 +125,4 @@
   
   # ----- Execute The Requested Build -------------------------------------------
   
  -$JAVA_HOME/bin/java $ANT_OPTS -classpath $CP 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 -Dregexp.home=$REGEXP_HOME -Dservletapi.home=$SERVLETAPI_HOME -Djava.home=$JAVA_HOME "$@"
  +$JAVA_HOME/bin/java $ANT_OPTS -classpath $CP 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 -Djava.home=$JAVA_HOME "$@"
  
  
  
  1.29      +3 -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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- build.xml	2000/12/23 20:05:19	1.28
  +++ build.xml	2000/12/23 21:41:15	1.29
  @@ -14,6 +14,7 @@
     <property name="jaxp.jar"        value="${catalina.jaxp.home}/jaxp.jar"/>
     <property name="parser.jar"      value="${catalina.jaxp.home}/${catalina.jaxp.parser.jar}"/>
     <property name="jcert.jar"       value="${jsse.home}/lib/jcert.jar"/>
  +  <property name="jndi.jar"        value="${jndi.home}/lib/jndi.jar"/>
     <property name="jnet.jar"        value="${jsse.home}/lib/jnet.jar"/>
     <property name="jsse.jar"        value="${jsse.home}/lib/jsse.jar"/>
     <property name="jmxri.jar"       value="${jmx.home}/lib/jmxri.jar"/>
  @@ -57,6 +58,8 @@
       <!-- Shared Extensions -->
       <!--   All applications need the servlet API classes -->
       <copy file="${servlet.jar}" tofile="${catalina.build}/bin/servlet.jar" />
  +    <!--   Copy the JNDI JAR file for use under JDK 1.2.2 -->
  +    <copy file="${jndi.jar}"    tofile="${catalina.build}/bin/jndi.jar" />
   
       <!-- Server Components -->
       <!--   Catalina needs JAXP compliant XML parser -->