tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pier...@locus.apache.org
Subject cvs commit: jakarta-tomcat-4.0/webapps/webdav build.bat build.sh build.xml
Date Thu, 12 Oct 2000 23:34:17 GMT
pierred     00/10/12 16:34:17

  Modified:    .        build.bat build.sh build.xml
               catalina build.bat build.sh build.xml
               catalina/src/conf web.xml
               jasper   build.bat build.sh build.xml
               jasper/src/share/org/apache/jasper
                        EmbededServletOptions.java JspC.java Options.java
               jasper/src/share/org/apache/jasper/compiler
                        ParserController.java ParserXJspSax.java
               webapps  build.bat build.sh build.xml
               webapps/ROOT build.bat build.sh build.xml
               webapps/examples build.bat build.sh build.xml
               webapps/manager build.bat build.sh build.xml
               webapps/webdav build.bat build.sh build.xml
  Log:
  Back to using a JAXP compliant XML parser.
  Simply set JAXP_HOME to the install directory of
  a JAXP1.1 compliant parser.
  (one is available at http://java.sun.com/xml/download.html)
  
  * NEW *
  It is now possible to easily specify an XML parser
  individually for each component of tomcat-4.0 that
  requires an XML parser. see below for details.
  
  -----
  In the tomcat-4.0 build procedure, an XML parser is required for three
  different components:
  
     1. ant
        See ant specific requirements for an XML parser
     2. catalina
        At least JAXP1.0 compliant XML parser
     3. jasper
        At least JAXP1.1 compliant XML parser
  
  All of these requirements can be handled globally by setting
  environment variable JAXP_HOME.
  
  The default jar files used for XML parsing are then:
     JAXP_HOME/jaxp.jar and JAXP_HOME/crimson.jar
  
  * To change the 'XML parser' jar file used:
  
    JAXP_PARSER_JAR [default: crimson.jar]
    (e.g. xerces.jar)
  
  * To set the XML parser of each component individually:
  
    ANT_XML_CLASSPATH [default: JAXP_HOME/JAXP_PARSER_JAR;JAXP_HOME/jaxp.jar]
  
    CATALINA_JAXP_HOME [default: JAXP_HOME]
    CATALINA_JAXP_PARSER_JAR [default: JAXP_PARSER_JAR]
  
    JASPER_JAXP_HOME [default: JAXP_HOME]
    JASPER_JAXP_PARSER_JAR [default: JAXP_PARSER_JAR]
  
  Revision  Changes    Path
  1.9       +94 -16    jakarta-tomcat-4.0/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.bat,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.bat	2000/10/10 00:37:30	1.8
  +++ build.bat	2000/10/12 23:34:07	1.9
  @@ -4,15 +4,22 @@
   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
  -rem   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
  -rem
  -rem   XERCES_HOME      Must point at your XERCES 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   JSSE_HOME        Must point at your JSSE installation [REQUIRED]
   rem
   rem   JMX_HOME         Must point at your JMX installation [REQUIRED]
  @@ -21,15 +28,35 @@
   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.8 2000/10/10 00:37:30 craigmcc Exp $
  +rem $Id: build.bat,v 1.9 2000/10/12 23:34:07 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
   rem ----- Save Environment Variables ------------------------------------------
   
  +set _CLASSPATH=%CLASSPATH%
  +set _JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
   set _ANT_HOME=%ANT_HOME%
  -set _CLASSPATH=%CLASSPATH%
  +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 -----------------------
  @@ -39,10 +66,52 @@
   goto cleanup
   :gotJavaHome
   
  -if not "%XERCES_HOME%" == "" goto gotXercesHome
  -echo You must set XERCES_HOME to point at your Xerces install
  +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
  -:gotXercesHome
  +: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
  @@ -54,10 +123,6 @@
   goto cleanup
   :gotJmxHome
   
  -if not "%ANT_HOME%" == "" goto gotAntHome
  -set ANT_HOME=../jakarta-ant
  -:gotAntHome
  -
   if not "%REGEXP_HOME%" == "" goto gotRegexpHome
   echo You must set REGEXP_HOME to point at your Regular Expressions distribution install
   goto cleanup
  @@ -72,19 +137,32 @@
   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;%XERCES_HOME%\xerces.jar;%JMX_HOME%\lib\jmxri.jar
  +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 %ANT_OPTS% org.apache.tools.ant.Main -Dant.home="%ANT_HOME%" -Dxerces.home="%XERCES_HOME%" -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
  +%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%" -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
   
  
  
  
  1.8       +82 -24    jakarta-tomcat-4.0/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.sh,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.sh	2000/09/30 22:35:22	1.7
  +++ build.sh	2000/10/12 23:34:08	1.8
  @@ -4,49 +4,60 @@
   #
   # Environment Variable Prerequisites:
   #
  +#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
  +#
  +#   JAXP_HOME        Points at a JAXP compliant XML parser 
  +#                    installation directory [NONE]
  +#
  +#   JAXP_PARSER_JAR  The jar filename of the JAXP compliant 
  +#                    'XML parser' [crimson.jar]
  +#
   #   ANT_HOME         Must point at your Ant installation [../jakarta-ant]
   #
   #   ANT_OPTS         Command line options to the Java runtime
   #                    that executes Ant [NONE]
  -#
  -#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   #
  -#   XERCES_HOME      Must point at your XERCES installation [REQUIRED]
  -#
  +#   ANT_XML_CLASSPATH  
  +#                    Jar files added to the classpath for the XML parsing
  +#                    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]
   #
  -#   REGEXP_HOME      Must point at your "jakarta-regexp" installation
  -#                    [../jakarta-regexp]
  +#   REGEXP_HOME      Must point at your Regexp installation [REQUIRED]
   #
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -#                    [../jakarta-servletapi]
  +#                    [REQUIRED]
  +# 
  +#   CATALINA_JAXP_HOME        
  +#                    JAXP 1.0 compliant XML parser installation directory 
  +#                    used for catalina [$JAXP_HOME]
  +#
  +#   CATALINA_JAXP_PARSER_JAR  
  +#                    The jar filename of the JAXP compliant XML parser 
  +#                    used for catalina [$JAXP_PARSER_JAR]
  +#
  +#   JASPER_JAXP_HOME        
  +#                    JAXP 1.1 compliant XML parser installation directory 
  +#                    used for jasper [$JAXP_HOME]
  +#
  +#   JASPER_JAXP_PARSER_JAR  
  +#                    The jar filename of the JAXP compliant XML parser 
  +#                    used for jasper [$JAXP_PARSER_JAR]
   #
  -# $Id: build.sh,v 1.7 2000/09/30 22:35:22 remm Exp $
  +# $Id: build.sh,v 1.8 2000/10/12 23:34:08 pierred Exp $
   # -----------------------------------------------------------------------------
   
   
   # ----- Verify and Set Required Environment Variables -------------------------
   
  -if [ "$ANT_HOME" = "" ] ; then
  -  ANT_HOME=../jakarta-ant
  -fi
  -
  -if [ "$ANT_OPTS" = "" ] ; then
  -  ANT_OPTS=""
  -fi
  -
   if [ "$JAVA_HOME" = "" ] ; then
     echo You must set JAVA_HOME to point at your Java Development Kit install
     exit 1
   fi
   
  -if [ "$XERCES_HOME" = "" ] ; then
  -  echo You must set XERCES_HOME to point at your Xerces install
  -  exit 1
  -fi
  -
   if [ "$JSSE_HOME" = "" ] ; then
     echo You must set JSSE_HOME to point at your Java Security Extensions install
     exit 1
  @@ -67,16 +78,63 @@
     exit 1
   fi
   
  +if [ "$JAXP_PARSER_JAR" = "" ] ; then
  +  JAXP_PARSER_JAR=crimson.jar
  +fi
  +
  +if [ "$ANT_XML_CLASSPATH" = "" ] ; then
  +  ANT_XML_CLASSPATH=$JAXP_HOME/$JAXP_PARSER_JAR:$JAXP_HOME/jaxp.jar
  +  ANT_USING_DEFAULT=true
  +fi
  +
  +if [ "$CATALINA_JAXP_HOME" = "" ] ; then
  +  CATALINA_JAXP_HOME=$JAXP_HOME
  +fi
  +
  +if [ "$JASPER_JAXP_HOME" = "" ] ; then
  +  JASPER_JAXP_HOME=$JAXP_HOME
  +fi
  +
  +if [ "$CATALINA_JAXP_HOME" = "" -o "$JASPER_JAXP_HOME" = "" -o "$ANT_USING_DEFAULT" = "true" -a "$JAXP_HOME" = "" ] ; then
  +  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
  +  exit 1
  +fi
  +
  +if [ "$CATALINA_JAXP_PARSER_JAR" = "" ] ; then
  +  CATALINA_JAXP_PARSER_JAR=$JAXP_PARSER_JAR
  +fi
  +
  +if [ "$JASPER_JAXP_PARSER_JAR" = "" ] ; then
  +  JASPER_JAXP_PARSER_JAR=$JAXP_PARSER_JAR
  +fi
   
  +if [ "$ANT_HOME" = "" ] ; then
  +  ANT_HOME=../jakarta-ant
  +fi
  +
  +if [ "$ANT_OPTS" = "" ] ; then
  +  ANT_OPTS=""
  +fi
  +
   # ----- Set Up The Runtime Classpath ------------------------------------------
   
  -CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$XERCES_HOME/xerces.jar:$JMX_HOME/lib/jmxri.jar
  +CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$ANT_XML_CLASSPATH
  +echo classpath is $CP
   
   if [ "$CLASSPATH" != "" ] ; then
     CP=$CLASSPATH:$CP
   fi
   
  -
   # ----- 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 -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 $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Dxerces.home=$XERCES_HOME -Djsse.home=$JSSE_HOME -Djmx.home=$JMX_HOME -Dregexp.home=$REGEXP_HOME -Dservletapi.home=$SERVLETAPI_HOME -Djava.home=$JAVA_HOME "$@"
  
  
  
  1.11      +0 -3      jakarta-tomcat-4.0/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	2000/10/05 03:44:55	1.10
  +++ build.xml	2000/10/12 23:34:08	1.11
  @@ -1,12 +1,9 @@
   <project name="Tomcat 4.0" default="deploy-main" basedir=".">
   
  -
     <!-- ===================== Initialize Property Values =================== -->
   
  -  <property name="ant.home"        value="${basedir}/../jakarta-ant"/>
     <property name="catalina.build"  value="${basedir}/../build/catalina"/>
     <property name="jasper.build"    value="${basedir}/../build/jasper"/>
  -  <property name="servletapi.home" value="${basedir}/../dist/servletapi"/>
     <property name="tomcat.build"    value="${basedir}/../build/tomcat-4.0"/>
     <property name="tomcat.dist"     value="${basedir}/../dist/tomcat-4.0"/>
   
  
  
  
  1.10      +75 -20    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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.bat	2000/10/10 00:39:04	1.9
  +++ build.bat	2000/10/12 23:34:09	1.10
  @@ -4,15 +4,22 @@
   rem
   rem Environment Variable Prerequisites:
   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
   rem   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   rem
  -rem   XERCES_HOME      Must point at your XERCES installation [REQUIRED]
  +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]
  @@ -21,28 +28,72 @@
   rem
   rem   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
   rem                    [REQUIRED]
  -rem
  -rem $Id: build.bat,v 1.9 2000/10/10 00:39:04 craigmcc 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.10 2000/10/12 23:34:09 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
   rem ----- Save Environment Variables ------------------------------------------
   
  -set _ANT_HOME=%ANT_HOME%
   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 "%XERCES_HOME%" == "" goto gotXercesHome
  -echo You must set XERCES_HOME to point at your Xerces install
  +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
  -:gotXercesHome
  +: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
  @@ -54,10 +105,6 @@
   goto cleanup
   :gotJmxHome
   
  -if not "%ANT_HOME%" == "" goto gotAntHome
  -set ANT_HOME=../../jakarta-ant
  -:gotAntHome
  -
   if not "%REGEXP_HOME%" == "" goto gotRegexpHome
   echo You must set REGEXP_HOME to point at your Regular Expressions distribution install
   goto cleanup
  @@ -67,17 +114,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;%XERCES_HOME%\xerces.jar;%JMX_HOME%\lib\jmxri.jar
  +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% -Dxerces.home="%XERCES_HOME%" -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% -Dregexp.home=%REGEXP_HOME% -Dservletapi.home=%SERVLETAPI_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
   
   
   rem ----- Restore Environment Variables ---------------------------------------
  @@ -85,7 +132,15 @@
   :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.7       +65 -26    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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.sh	2000/09/30 22:35:23	1.6
  +++ build.sh	2000/10/12 23:34:09	1.7
  @@ -4,49 +4,52 @@
   #
   # Environment Variable Prerequisites:
   #
  -#   ANT_HOME         Must point at your Ant installation [../../jakarta-ant]
  +#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   #
  -#   ANT_OPTS         Command line options to the Java runtime
  -#                    that executes Ant [NONE]
  +#   JAXP_HOME        Points at a JAXP compliant XML parser 
  +#                    installation directory [NONE]
   #
  -#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
  +#   JAXP_PARSER_JAR  The jar filename of the JAXP compliant 
  +#                    'XML parser' [crimson.jar]
  +#
  +#   ANT_HOME         Must point at your Ant installation [../jakarta-ant]
   #
  -#   XERCES_HOME      Must point at your XERCES installation [REQUIRED]
  +#   ANT_OPTS         Command line options to the Java runtime
  +#                    that executes Ant [NONE]
   #
  +#   ANT_XML_CLASSPATH  
  +#                    Jar files added to the classpath for the XML parsing
  +#                    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]
   #
  -#   REGEXP_HOME      Must point at your Regexp installation
  -#                    [../../jakarta-regexp]
  +#   REGEXP_HOME      Must point at your Regexp installation [REQUIRED]
   #
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -#                    [../../jakarta-servletapi]
  +#                    [REQUIRED]
  +# 
  +#   CATALINA_JAXP_HOME        
  +#                    JAXP 1.0 compliant XML parser installation directory 
  +#                    used for catalina [$JAXP_HOME]
  +#
  +#   CATALINA_JAXP_PARSER_JAR  
  +#                    The jar filename of the JAXP compliant XML parser 
  +#                    used for catalina [$JAXP_PARSER_JAR]
   #
  -# $Id: build.sh,v 1.6 2000/09/30 22:35:23 remm Exp $
  +# $Id: build.sh,v 1.7 2000/10/12 23:34:09 pierred Exp $
   # -----------------------------------------------------------------------------
   
   
   # ----- Verify and Set Required Environment Variables -------------------------
   
  -if [ "$ANT_HOME" = "" ] ; then
  -  ANT_HOME=../../jakarta-ant
  -fi
  -
  -if [ "$ANT_OPTS" = "" ] ; then
  -  ANT_OPTS=""
  -fi
  -
   if [ "$JAVA_HOME" = "" ] ; then
     echo You must set JAVA_HOME to point at your Java Development Kit install
     exit 1
   fi
   
  -if [ "$XERCES_HOME" = "" ] ; then
  -  echo You must set XERCES_HOME to point at your Xerces install
  -  exit 1
  -fi
  -
   if [ "$JSSE_HOME" = "" ] ; then
     echo You must set JSSE_HOME to point at your Java Security Extensions install
     exit 1
  @@ -67,16 +70,52 @@
     exit 1
   fi
   
  +if [ "$JAXP_PARSER_JAR" = "" ] ; then
  +  JAXP_PARSER_JAR=crimson.jar
  +fi
   
  +if [ "$ANT_XML_CLASSPATH" = "" ] ; then
  +  ANT_XML_CLASSPATH=$JAXP_HOME/$JAXP_PARSER_JAR:$JAXP_HOME/jaxp.jar
  +  ANT_USING_DEFAULT=true
  +fi
  +
  +if [ "$CATALINA_JAXP_HOME" = "" ] ; then
  +  CATALINA_JAXP_HOME=$JAXP_HOME
  +fi
  +
  +if [ "$CATALINA_JAXP_HOME" = "" -o "$ANT_USING_DEFAULT" = "true" -a "$JAXP_HOME" = "" ] ; then
  +  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
  +  exit 1
  +fi
  +
  +if [ "$CATALINA_JAXP_PARSER_JAR" = "" ] ; then
  +  CATALINA_JAXP_PARSER_JAR=$JAXP_PARSER_JAR
  +fi
  +
  +if [ "$ANT_HOME" = "" ] ; then
  +  ANT_HOME=../jakarta-ant
  +fi
  +
  +if [ "$ANT_OPTS" = "" ] ; then
  +  ANT_OPTS=""
  +fi
  +
   # ----- Set Up The Runtime Classpath ------------------------------------------
  +
  +CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$ANT_XML_CLASSPATH
   
  -CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$XERCES_HOME\xerces.jar:$JMX_HOME/lib/jmxri.jar
   if [ "$CLASSPATH" != "" ] ; then
     CP=$CLASSPATH:$CP
   fi
   
  -
   # ----- Execute The Requested Build -------------------------------------------
  -
  -java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Dxerces.home=$XERCES_HOME -Djsse.home=$JSSE_HOME -Djmx.home=$JMX_HOME -Dregexp.home=$REGEXP_HOME -Dservletapi.home=$SERVLETAPI_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 -Dregexp.home=$REGEXP_HOME -Dservletapi.home=$SERVLETAPI_HOME -Djava.home=$JAVA_HOME "$@"
  
  
  
  1.18      +12 -13    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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.xml	2000/09/30 22:35:23	1.17
  +++ build.xml	2000/10/12 23:34:09	1.18
  @@ -2,20 +2,14 @@
   
   
     <!-- ===================== Initialize Property Values =================== -->
  -  <property name="ant.home"        value="../../jakarta-ant"/>
     <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="xerces.home"     value="${basedir}/../xerces"/>
  -  <property name="jsse.home"       value="../../jsse"/>
  -  <property name="jmx.home"        value="../../jmx"/>
  -  <property name="regexp.home"     value="../../jakarta-regexp"/>
  -  <property name="servletapi.home" value="../../jakarta-servletapi"/>
   
  -
     <!-- ================== Derived Property Values ========================= -->
  -  <property name="xerces.jar"      value="${xerces.home}/xerces.jar"/>
  +  <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="jnet.jar"        value="${jsse.home}/lib/jnet.jar"/>
     <property name="jsse.jar"        value="${jsse.home}/lib/jsse.jar"/>
  @@ -25,6 +19,7 @@
   
     <!-- =================== BUILD: Create Directories ====================== -->
     <target name="build-prepare">
  +    <available file="${jaxp.jar}" property="jaxp.jar.present" />
       <mkdir dir="${catalina.build}"/>
       <mkdir dir="${catalina.build}/bin"/>
       <mkdir dir="${catalina.build}/classes"/>
  @@ -35,7 +30,7 @@
   
   
     <!-- =================== BUILD: Copy Static Files ======================= -->
  -  <target name="build-static" depends="build-prepare">
  +  <target name="build-static" depends="build-prepare,copy-jaxp-jar">
   
       <!-- Executable Commands -->
       <copydir src="src/bin"  dest="${catalina.build}/bin"/>
  @@ -53,8 +48,8 @@
       <copyfile src="${servlet.jar}" dest="${catalina.build}/bin/servlet.jar"/>
   
       <!-- Server Components -->
  -    <!--   Catalina needs Xerces XML parser -->
  -    <copyfile src="${xerces.jar}"  dest="${catalina.build}/server/xerces.jar"/>
  +    <!--   Catalina needs JAXP compliant XML parser -->
  +    <copyfile src="${parser.jar}"  dest="${catalina.build}/server/${catalina.jaxp.parser.jar}"/>
       <!--   Catalina needs the regular expression library -->
       <copyfile src="${regexp.jar}"  dest="${catalina.build}/server/regexp.jar"/>
       <!--   Catalina needs the JSSE packages -->
  @@ -65,13 +60,17 @@
   -->
     </target>
   
  +  <target name="copy-jaxp-jar" if="jaxp.jar.present" >
  +    <copyfile src="${jaxp.jar}"  dest="${catalina.build}/server/jaxp.jar"/>
  +  </target>    
  +
   
     <!-- ================= BUILD: Compile Server Components ================= -->
     <target name="build-main" depends="build-static">
   
       <!-- Compile internal server components -->
       <javac   srcdir="src/share" destdir="${catalina.build}/classes"
  -             classpath="${xerces.jar}:${regexp.jar}:${servlet.jar}:${jcert.jar}:${jnet.jar}:${jsse.jar}:${jmxri.jar}"
  +             classpath="${parser.jar}:${jaxp.jar}:${regexp.jar}:${servlet.jar}:${jcert.jar}:${jnet.jar}:${jsse.jar}:${jmxri.jar}"
                deprecation="off" debug="on" optimize="off" target="1.2"
                excludes="**/CVS/**"/>
   
  @@ -92,7 +91,7 @@
       <deltree dir="${catalina.build}/javadoc"/>
       <mkdir dir="${catalina.build}/javadoc"/>
       <javadoc packagenames="org.apache.catalina.*"
  -             classpath="${xerces.jar}:${jcert.jar}:${jsse.jar}:${jnet.jar}:${regexp.jar}:${jmxri.jar}:${servlet.jar}:${catalina.build}/classes"
  +             classpath="${parser.jar}:${jaxp.jar}:${jcert.jar}:${jsse.jar}:${jnet.jar}:${regexp.jar}:${jmxri.jar}:${servlet.jar}:${catalina.build}/classes"
                  sourcepath="src/share"
                     destdir="${catalina.build}/javadoc"
                      author="true"
  
  
  
  1.9       +0 -4      jakarta-tomcat-4.0/catalina/src/conf/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/web.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- web.xml	2000/09/26 21:54:57	1.8
  +++ web.xml	2000/10/12 23:34:10	1.9
  @@ -50,10 +50,6 @@
         <param-name>logVerbosityLevel</param-name>
         <param-value>WARNING</param-value>
       </init-param>
  -    <init-param>
  -      <param-name>sax2DriverClassName</param-name>
  -      <param-value>org.apache.xerces.parsers.SAXParser</param-value>
  -    </init-param>
   <!--
       <load-on-startup>4</load-on-startup>
   -->
  
  
  
  1.6       +70 -15    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.bat	2000/10/10 00:40:16	1.5
  +++ build.bat	2000/10/12 23:34:11	1.6
  @@ -4,42 +4,89 @@
   rem
   rem Environment Variable Prerequisites:
   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
   rem   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   rem
  -rem   XERCES_HOME      Must point at your XERCES installation [REQUIRED]
  +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   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 
  +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.5 2000/10/10 00:40:16 craigmcc Exp $
  +rem $Id: build.bat,v 1.6 2000/10/12 23:34:11 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
   rem ----- Save Environment Variables ------------------------------------------
   
  +set _CLASSPATH=%CLASSPATH%
  +set _JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
   set _ANT_HOME=%ANT_HOME%
  -set _CLASSPATH=%CLASSPATH%
  +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
   
  -if not "%XERCES_HOME%" == "" goto gotXercesHome
  -echo You must set XERCES_HOME to point at your Xerces install
  +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 "%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 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      JASPER_JAXP_HOME JASPER_JAXP_PARSER_JAR
   goto cleanup
  -:gotXercesHome
  -
  +:gotJaxpHome
  +
   if not "%ANT_HOME%" == "" goto gotAntHome
  -set ANT_HOME=../../jakarta-ant
  +set ANT_HOME=../jakarta-ant
   :gotAntHome
   
   if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
  @@ -51,12 +98,12 @@
   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;%XERCES_HOME%\xerces.jar
  +set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar;;%ANT_XML_CLASSPATH%
   
   
   rem ----- Execute The Requested Build -----------------------------------------
   
  -java %ANT_OPTS% org.apache.tools.ant.Main -Dant.home="%ANT_HOME%" -Dxerces.home="%XERCES_HOME%" -Dservletapi.home="%SERVLETAPI_HOME%" -Djava.home="%JAVA_HOME%" %1 %2 %3 %4 %5 %6 %7 %8 %9
  +%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 ---------------------------------------
  @@ -64,7 +111,15 @@
   :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_PARSER_JAR=%_JASPER_JAXP_PARSER_JAR%
  +set _JASPER_JAXP_PARSER_JAR=
   :finish
   
  
  
  
  1.5       +80 -17    jakarta-tomcat-4.0/jasper/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/build.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.sh	2000/09/22 13:57:40	1.4
  +++ build.sh	2000/10/12 23:34:11	1.5
  @@ -1,40 +1,67 @@
   #!/bin/sh
   # -----------------------------------------------------------------------------
  -# build.sh - Build Script for Jasper
  +# build.sh - Build Script for jasper
   #
   # Environment Variable Prerequisites:
   #
  -#   ANT_HOME         Must point at your Ant installation [../../jakarta-ant]
  +#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   #
  +#   JAXP_HOME        Points at a JAXP compliant XML parser 
  +#                    installation directory [NONE]
  +#
  +#   JAXP_PARSER_JAR  The jar filename of the JAXP compliant 
  +#                    'XML parser' [crimson.jar]
  +#
  +#   ANT_HOME         Must point at your Ant installation [../jakarta-ant]
  +#
   #   ANT_OPTS         Command line options to the Java runtime
   #                    that executes Ant [NONE]
  +#
  +#   ANT_XML_CLASSPATH  
  +#                    Jar files added to the classpath for the XML parsing
  +#                    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]
   #
  -#   XERCES_HOME      Must point at your XERCES installation [REQUIRED]
  +#   REGEXP_HOME      Must point at your Regexp installation [REQUIRED]
   #
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -#                    [../../jakarta-servletapi]
  +#                    [REQUIRED]
  +# 
  +#   JASPER_JAXP_HOME        
  +#                    JAXP 1.1 compliant XML parser installation directory 
  +#                    used for jasper [$JAXP_HOME]
  +#
  +#   JASPER_JAXP_PARSER_JAR  
  +#                    The jar filename of the JAXP compliant XML parser 
  +#                    used for jasper [$JAXP_PARSER_JAR]
   #
  -# $Id: build.sh,v 1.4 2000/09/22 13:57:40 pierred Exp $
  +# $Id: build.sh,v 1.5 2000/10/12 23:34:11 pierred Exp $
   # -----------------------------------------------------------------------------
   
   
   # ----- Verify and Set Required Environment Variables -------------------------
   
  -if [ "$ANT_HOME" = "" ] ; then
  -  ANT_HOME=../../jakarta-ant
  +if [ "$JAVA_HOME" = "" ] ; then
  +  echo You must set JAVA_HOME to point at your Java Development Kit install
  +  exit 1
   fi
   
  -if [ "$ANT_OPTS" = "" ] ; then
  -  ANT_OPTS=""
  +if [ "$JSSE_HOME" = "" ] ; then
  +  echo You must set JSSE_HOME to point at your Java Security Extensions install
  +  exit 1
   fi
   
  -if [ "$JAVA_HOME" = "" ] ; then
  -  echo You must set JAVA_HOME to point at your Java Development Kit install
  +if [ "$JMX_HOME" = "" ] ; then
  +  echo You must set JMX_HOME to point at your Java Management Extensions install
     exit 1
   fi
   
  -if [ "$XERCES_HOME" = "" ] ; then
  -  echo You must set XERCES_HOME to point at your Xerces install
  +if [ "$REGEXP_HOME" = "" ] ; then
  +  echo You must set REGEXP_HOME to point at your Regular Expressions distribution install
     exit 1
   fi
   
  @@ -43,16 +70,52 @@
     exit 1
   fi
   
  +if [ "$JAXP_PARSER_JAR" = "" ] ; then
  +  JAXP_PARSER_JAR=crimson.jar
  +fi
  +
  +if [ "$ANT_XML_CLASSPATH" = "" ] ; then
  +  ANT_XML_CLASSPATH=$JAXP_HOME/$JAXP_PARSER_JAR:$JAXP_HOME/jaxp.jar
  +  ANT_USING_DEFAULT=true
  +fi
  +
  +if [ "$JASPER_JAXP_HOME" = "" ] ; then
  +  JASPER_JAXP_HOME=$JAXP_HOME
  +fi
  +
  +if [ "$JASPER_JAXP_HOME" = "" -o "$ANT_USING_DEFAULT" = "true" -a "$JAXP_HOME" = "" ] ; then
  +  echo You must set JAXP_HOME to point at your XML Parser install directory.
  +  echo By default, ant 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      JASPER_JAXP_HOME JASPER_JAXP_PARSER_JAR
  +  exit 1
  +fi
  +
  +if [ "$JASPER_JAXP_PARSER_JAR" = "" ] ; then
  +  JASPER_JAXP_PARSER_JAR=$JAXP_PARSER_JAR
  +fi
   
  +if [ "$ANT_HOME" = "" ] ; then
  +  ANT_HOME=../jakarta-ant
  +fi
  +
  +if [ "$ANT_OPTS" = "" ] ; then
  +  ANT_OPTS=""
  +fi
  +
   # ----- Set Up The Runtime Classpath ------------------------------------------
  +
  +CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$ANT_XML_CLASSPATH
   
  -CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$XERCES_HOME\xerces.jar
   if [ "$CLASSPATH" != "" ] ; then
     CP=$CLASSPATH:$CP
   fi
   
  -
   # ----- Execute The Requested Build -------------------------------------------
  -
  -java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Dxerces.home=$XERCES_HOME -Dservletapi.home=$SERVLETAPI_HOME -Djava.home=$JAVA_HOME "$@"
   
  +$JAVA_HOME/bin/java $ANT_OPTS -classpath $CP 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.11      +11 -11    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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	2000/09/30 19:15:47	1.10
  +++ build.xml	2000/10/12 23:34:11	1.11
  @@ -2,24 +2,21 @@
   
   
     <!-- ===================== Initialize Property Values =================== -->
  -  <property name="ant.home"        value="../../jakarta-ant"/>
     <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="xerces.home"     value="${basedir}/../xerces"/>
  -  <property name="servletapi.home" value="../../jakarta-servletapi"/>
  -  <property name="java.home"       value="java.home_is_undefined"/>
   
  -
     <!-- ================== Derived Property Values ========================= -->
  -  <property name="xerces.jar"      value="${xerces.home}/xerces.jar"/>
  +  <property name="jaxp.jar"        value="${jasper.jaxp.home}/jaxp.jar"/>
  +  <property name="parser.jar"      value="${jasper.jaxp.home}/${jasper.jaxp.parser.jar}"/>
     <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
     <property name="tools.jar"       value="${java.home}/lib/tools.jar"/>
   
   
     <!-- =================== BUILD: Create Directories ====================== -->
     <target name="build-prepare">
  +    <available file="${jaxp.jar}" property="jaxp.jar.present" />
       <mkdir dir="${jasper.build}"/>
       <mkdir dir="${jasper.build}/bin"/>
       <mkdir dir="${jasper.build}/classes"/>
  @@ -28,7 +25,7 @@
   
   
     <!-- =================== BUILD: Copy Static Files ======================= -->
  -  <target name="build-static" depends="build-prepare">
  +  <target name="build-static" depends="build-prepare,copy-jaxp-jar">
   
       <!-- Executable Commands -->
       <copydir src="src/bin"  dest="${jasper.build}/bin"/>
  @@ -40,18 +37,21 @@
       <!-- Shared Extensions -->
       <!--   Jasper needs the servlet API classes -->
       <copyfile src="${servlet.jar}" dest="${jasper.build}/bin/servlet.jar"/>
  -    <!--   Jasper needs Xerces (JAXP1.0/SAX2.0 compliant parser -->
  -    <copyfile src="${xerces.jar}"    dest="${jasper.build}/lib/xerces.jar"/>
  +    <!--   Jasper needs JAXP1.0/SAX2.0 compliant parser -->
  +    <copyfile src="${parser.jar}"  dest="${jasper.build}/lib/${jasper.jaxp.parser.jar}"/>
   
     </target>
   
  +  <target name="copy-jaxp-jar" if="jaxp.jar.present" >
  +    <copyfile src="${jaxp.jar}"  dest="${jasper.build}/lib/jaxp.jar"/>
  +  </target> 
   
     <!-- ================= BUILD: Compile Server Components ================= -->
     <target name="build-main" depends="build-static">
   
       <!-- Compile internal server components -->
       <javac   srcdir="src/share" destdir="${jasper.build}/classes"
  -          classpath="${servlet.jar}"
  +          classpath="${parser.jar}:${jaxp.jar}:${servlet.jar}"
           deprecation="off" debug="on" optimize="off"
              excludes="**/CVS/**"/>
   
  @@ -69,7 +69,7 @@
       <deltree dir="${jasper.build}/javadoc"/>
       <mkdir dir="${jasper.build}/javadoc"/>
       <javadoc packagenames="org.apache.jasper.*"
  -             classpath="${tools.jar}:${xerces.jar}:${servlet.jar}:${jasper.build}/classes"
  +             classpath="${tools.jar}:${parser.jar}:${jaxp.jar}:${servlet.jar}:${jasper.build}/classes"
                  sourcepath="src/share"
                     destdir="${jasper.build}/javadoc"
                      author="true"
  
  
  
  1.3       +3 -18     jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java
  
  Index: EmbededServletOptions.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EmbededServletOptions.java	2000/09/19 19:33:11	1.2
  +++ EmbededServletOptions.java	2000/10/12 23:34:11	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java,v 1.2 2000/09/19 19:33:11 pierred Exp $
  - * $Revision: 1.2 $
  - * $Date: 2000/09/19 19:33:11 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java,v 1.3 2000/10/12 23:34:11 pierred Exp $
  + * $Revision: 1.3 $
  + * $Date: 2000/10/12 23:34:11 $
    *
    * ====================================================================
    * 
  @@ -136,11 +136,6 @@
       public String jspCompilerPath = null;
   
       /**
  -     * SAX 2 driver class name
  -     */
  -    public String sax2DriverClassName;
  -
  -    /**
        * Are we keeping generated code around?
        */
       public boolean getKeepGenerated() {
  @@ -211,10 +206,6 @@
           return jspCompilerPath;
       }
   
  -    public String getSax2DriverClassName() {
  -	return sax2DriverClassName;
  -    }
  -
       /**
        * Create an EmbededServletOptions object using data available from
        * ServletConfig and ServletContext. 
  @@ -317,12 +308,6 @@
                                     Logger.FATAL);
               }
           }
  -
  -        sax2DriverClassName = 
  -	    config.getInitParameter("sax2DriverClassName");
  -	if (sax2DriverClassName == null) {
  -	    sax2DriverClassName = "org.apache.xerces.parsers.SAXParser";
  -	}
       }
   }
   
  
  
  
  1.5       +3 -12     jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java
  
  Index: JspC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JspC.java	2000/09/19 19:33:11	1.4
  +++ JspC.java	2000/10/12 23:34:12	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v 1.4 2000/09/19 19:33:11 pierred Exp $
  - * $Revision: 1.4 $
  - * $Date: 2000/09/19 19:33:11 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v 1.5 2000/10/12 23:34:12 pierred Exp $
  + * $Revision: 1.5 $
  + * $Date: 2000/10/12 23:34:12 $
    *
    * ====================================================================
    * 
  @@ -102,7 +102,6 @@
       public static final String SWITCH_WEBAPP_XML = "-webxml";
       public static final String SWITCH_MAPPED = "-mapped";
       public static final String SWITCH_DIE = "-die";
  -    public static final String SWITCH_SAX2 = "-sax2";
   
       public static final int NO_WEBXML = 0;
       public static final int INC_WEBXML = 10;
  @@ -149,8 +148,6 @@
   
       Vector extensions;
   
  -    String sax2DriverClassName = "org.apache.xerces.parsers.SAXParser";
  -
       public boolean getKeepGenerated() {
           // isn't this why we are running jspc?
           return true;
  @@ -207,10 +204,6 @@
           return System.getProperty("java.class.path");
       }
   
  -    public String getSax2DriverClassName() {
  -	return sax2DriverClassName;
  -    }
  -    
       int argPos;
       // value set by beutifully obsfucscated java
       boolean fullstop = false;
  @@ -315,8 +308,6 @@
                       dieLevel = DEFAULT_DIE_LEVEL;
                   }
                   die = dieLevel;
  -            } else if (tok.startsWith(SWITCH_SAX2)) {
  -                sax2DriverClassName = nextArg();
               } else {
                   pushBackArg();
                   // Not a recognized Option?  Start treting them as JSP Pages
  
  
  
  1.3       +3 -9      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java
  
  Index: Options.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Options.java	2000/09/19 19:33:11	1.2
  +++ Options.java	2000/10/12 23:34:12	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java,v 1.2 2000/09/19 19:33:11 pierred Exp $
  - * $Revision: 1.2 $
  - * $Date: 2000/09/19 19:33:11 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java,v 1.3 2000/10/12 23:34:12 pierred Exp $
  + * $Revision: 1.3 $
  + * $Date: 2000/10/12 23:34:12 $
    *
    * ====================================================================
    * 
  @@ -125,10 +125,4 @@
        * ProtectionDomain for this JSP Context when using a SecurityManager
        */
       public Object getProtectionDomain();
  -
  -    /**
  -     * The SAX 2.0 driver class name.
  -     * @@@ Temporary until JAXP supports SAX2.0
  -     */
  -    public String getSax2DriverClassName();
   }
  
  
  
  1.5       +1 -7      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserController.java
  
  Index: ParserController.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserController.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ParserController.java	2000/10/06 00:34:00	1.4
  +++ ParserController.java	2000/10/12 23:34:12	1.5
  @@ -130,18 +130,12 @@
       static String jspDtd_part2 = null;
       */
   
  -    /*
  -     * Cached value of the class name of the SAX2 driver. 
  -     */
  -    String sax2DriverClassName;
  -
       //*********************************************************************
       // Constructor
   
       public ParserController(JspCompilationContext ctxt) {
           this.ctxt = ctxt; // @@@ can we assert that ctxt is not null?
           jspHandler = new JspParseEventListener(ctxt, this);
  -	sax2DriverClassName = ctxt.getOptions().getSax2DriverClassName();
   	
   	/* @@@ NOT COMPILED
   	// Cache the content of the jsp DTD
  @@ -210,7 +204,7 @@
   	    } catch (IOException ex) {}
               reader = getReader(file, encoding);
               if (isXml) {
  -                (new ParserXJspSax(currentFilePath, reader, jspHandler, sax2DriverClassName)).parse();
  +                (new ParserXJspSax(currentFilePath, reader, jspHandler)).parse();
               } else {
                   (new Parser(ctxt, file, encoding, reader, jspHandler)).parse();
               }
  
  
  
  1.2       +8 -10     jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserXJspSax.java
  
  Index: ParserXJspSax.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserXJspSax.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ParserXJspSax.java	2000/09/19 19:19:21	1.1
  +++ ParserXJspSax.java	2000/10/12 23:34:13	1.2
  @@ -65,6 +65,8 @@
   import java.util.LinkedList;
   import java.util.Stack;
   
  +import javax.xml.parsers.*;
  +
   import org.xml.sax.Attributes;
   import org.xml.sax.DTDHandler;
   import org.xml.sax.EntityResolver;
  @@ -93,11 +95,6 @@
    */
   public class ParserXJspSax {
   
  -    /*
  -     * The SAX 'driver' class to be used for parsing.
  -     */
  -    private String sax2DriverClassName;
  -
       /* 
        * InputSource for XML document
        */
  @@ -132,13 +129,11 @@
   
       public ParserXJspSax(String filePath,
   			 InputStreamReader reader, 
  -			 ParseEventListener jspHandler,
  -			 String sax2DriverClassName) 
  +			 ParseEventListener jspHandler)
       {
   	this.filePath = filePath;
   	this.is = new InputSource(reader);
   	this.jspHandler = jspHandler;
  -	this.sax2DriverClassName = sax2DriverClassName;
       }
       
       //*********************************************************************
  @@ -146,8 +141,9 @@
       
       public void parse() throws JasperException {
           try {
  -            XMLReader parser =
  -                XMLReaderFactory.createXMLReader(sax2DriverClassName);
  +	    SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
  +	    SAXParser saxParser = saxParserFactory.newSAXParser();
  +            XMLReader parser = saxParser.getXMLReader();
               ParserXJspSaxHandler handler =
                   new ParserXJspSaxHandler(filePath, jspHandler);
   	    
  @@ -184,6 +180,8 @@
   
           } catch (IOException ex) {
   	    throw new JasperException(ex);
  +	} catch (ParserConfigurationException ex) {
  +	    throw new ParseException(ex.getMessage());
           } catch (SAXParseException ex) {
   	    Mark mark = 
   		new Mark(filePath, ex.getLineNumber(), ex.getColumnNumber());
  
  
  
  1.4       +48 -11    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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.bat	2000/10/10 00:41:25	1.3
  +++ build.bat	2000/10/12 23:34:13	1.4
  @@ -4,26 +4,36 @@
   rem
   rem Environment Variable Prerequisites:
   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
   rem   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   rem
  -rem   XERCES_HOME      Must point at your XERCES installation [REQUIRED]
  +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   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
   rem                    [REQUIRED]
  +rem 
   rem
  -rem $Id: build.bat,v 1.3 2000/10/10 00:41:25 craigmcc Exp $
  +rem $Id: build.bat,v 1.4 2000/10/12 23:34:13 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
   rem ----- Save Environment Variables ------------------------------------------
   
  +set _CLASSPATH=%CLASSPATH%
  +set _JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
   set _ANT_HOME=%ANT_HOME%
  -set _CLASSPATH=%CLASSPATH%
  +set _ANT_XML_CLASSPATH=%ANT_XML_CLASSPATH%
   
   
   rem ----- Verify and Set Required Environment Variables -----------------------
  @@ -33,8 +43,31 @@
   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
  +
  +goto gotJaxpHome
  +
  +:jaxpHome
  +echo You must set JAXP_HOME to point at your XML Parser install directory.
  +echo By default, ant 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
  +goto cleanup
  +:gotJaxpHome
  +
   if not "%ANT_HOME%" == "" goto gotAntHome
  -set ANT_HOME=../../jakarta-ant
  +set ANT_HOME=../jakarta-ant
   :gotAntHome
   
   if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
  @@ -46,12 +79,12 @@
   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;%XERCES_HOME%\xerces.jar
  +set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar;%ANT_XML_CLASSPATH%
   
   
   rem ----- Execute The Requested Build -----------------------------------------
   
  -java %ANT_OPTS% org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Dxerces.home="%XERCES_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 -Dservletapi.home=%SERVLETAPI_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
   
   
   rem ----- Restore Environment Variables ---------------------------------------
  @@ -59,7 +92,11 @@
   :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.3       +46 -18    jakarta-tomcat-4.0/webapps/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/build.sh,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.sh	2000/09/20 19:55:09	1.2
  +++ build.sh	2000/10/12 23:34:13	1.3
  @@ -4,32 +4,33 @@
   #
   # Environment Variable Prerequisites:
   #
  -#   ANT_HOME         Must point at your Ant installation [../../jakarta-ant]
  +#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   #
  -#   ANT_OPTS         Command line options to the Java runtime
  -#                    that executes Ant [NONE]
  +#   JAXP_HOME        Points at a JAXP compliant XML parser 
  +#                    installation directory [NONE]
   #
  -#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
  +#   JAXP_PARSER_JAR  The jar filename of the JAXP compliant 
  +#                    'XML parser' [crimson.jar]
   #
  -#   XERCES_HOME      Must point at your XERCES installation [REQUIRED]
  +#   ANT_HOME         Must point at your Ant installation [../jakarta-ant]
   #
  +#   ANT_OPTS         Command line options to the Java runtime
  +#                    that executes Ant [NONE]
  +#
  +#   ANT_XML_CLASSPATH  
  +#                    Jar files added to the classpath for the XML parsing
  +#                    requirements of ant
  +#                    [$JAXP_HOME/$JAXP_PARSER_JAR:$JAXP_HOME/jaxp.jar]
  +# 
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
   #                    [REQUIRED]
   #
  -# $Id: build.sh,v 1.2 2000/09/20 19:55:09 pierred Exp $
  +# $Id: build.sh,v 1.3 2000/10/12 23:34:13 pierred Exp $
   # -----------------------------------------------------------------------------
   
   
   # ----- Verify and Set Required Environment Variables -------------------------
   
  -if [ "$ANT_HOME" = "" ] ; then
  -  ANT_HOME=../../jakarta-ant
  -fi
  -
  -if [ "$ANT_OPTS" = "" ] ; then
  -  ANT_OPTS=""
  -fi
  -
   if [ "$JAVA_HOME" = "" ] ; then
     echo You must set JAVA_HOME to point at your Java Development Kit install
     exit 1
  @@ -40,16 +41,43 @@
     exit 1
   fi
   
  +if [ "$JAXP_PARSER_JAR" = "" ] ; then
  +  JAXP_PARSER_JAR=crimson.jar
  +fi
  +
  +if [ "$ANT_XML_CLASSPATH" = "" ] ; then
  +  ANT_XML_CLASSPATH=$JAXP_HOME/$JAXP_PARSER_JAR:$JAXP_HOME/jaxp.jar
  +  ANT_USING_DEFAULT=true
  +fi
  +
  +if [ "$ANT_USING_DEFAULT" = "true" -a "$JAXP_HOME" = "" ] ; then
  +  echo You must set JAXP_HOME to point at your XML Parser install directory.
  +  echo By default, ant 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
  +  exit 1
  +fi
  +
  +if [ "$ANT_HOME" = "" ] ; then
  +  ANT_HOME=../jakarta-ant
  +fi
   
  +if [ "$ANT_OPTS" = "" ] ; then
  +  ANT_OPTS=""
  +fi
  +
   # ----- Set Up The Runtime Classpath ------------------------------------------
   
  -CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$XERCES_HOME\xerces.jar
  +CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$ANT_XML_CLASSPATH
  +
   if [ "$CLASSPATH" != "" ] ; then
     CP=$CLASSPATH:$CP
   fi
   
  -
   # ----- Execute The Requested Build -------------------------------------------
  -
  -java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Dxerces.home=$XERCES_HOME -Dservletapi.home=$SERVLETAPI_HOME "$@"
   
  +$JAVA_HOME/bin/java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dservletapi.home=$SERVLETAPI_HOME -Djava.home=$JAVA_HOME "$@"
  
  
  
  1.8       +0 -2      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml	2000/10/05 02:30:23	1.7
  +++ build.xml	2000/10/12 23:34:13	1.8
  @@ -2,9 +2,7 @@
   
   
     <!-- ===================== Initialize Property Values =================== -->
  -  <property name="ant.home"        value="${basedir}/../../jakarta-ant"/>
     <property name="build.compiler"  value="classic"/>
  -  <property name="servletapi.home" value="${basedir}/../../jakarta-servletapi"/>
     <property name="webapps.build"   value="${basedir}/../../build/webapps"/>
     <property name="webapps.deploy"  value="${basedir}/../../build/tomcat-4.0"/>
     <property name="webapps.dist"    value="${basedir}/../../dist/webapps"/>
  
  
  
  1.3       +51 -16    jakarta-tomcat-4.0/webapps/ROOT/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/ROOT/build.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.bat	2000/10/10 00:42:51	1.2
  +++ build.bat	2000/10/12 23:34:14	1.3
  @@ -4,27 +4,36 @@
   rem
   rem Environment Variable Prerequisites:
   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
   rem   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   rem
  -rem   JAXP_HOME        Must point at your JAXP installation 
  +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   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -rem                    [../../jakarta-servletapi]
  +rem                    [REQUIRED]
  +rem 
   rem
  -rem $Id: build.bat,v 1.2 2000/10/10 00:42:51 craigmcc Exp $
  +rem $Id: build.bat,v 1.3 2000/10/12 23:34:14 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
   rem ----- Save Environment Variables ------------------------------------------
   
  +set _CLASSPATH=%CLASSPATH%
  +set _JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
   set _ANT_HOME=%ANT_HOME%
  -set _CLASSPATH=%CLASSPATH%
  -set _SERVLETAPI_HOME=%SERVLETAPI_HOME%
  +set _ANT_XML_CLASSPATH=%ANT_XML_CLASSPATH%
   
   
   rem ----- Verify and Set Required Environment Variables -----------------------
  @@ -34,33 +43,59 @@
   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
  +
  +goto gotJaxpHome
  +
  +:jaxpHome
  +echo You must set JAXP_HOME to point at your XML Parser install directory.
  +echo By default, ant 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
  +goto cleanup
  +:gotJaxpHome
  +
   if not "%ANT_HOME%" == "" goto gotAntHome
  -set ANT_HOME=../../../jakarta-ant
  +set ANT_HOME=../jakarta-ant
   :gotAntHome
   
   if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
  -set SERVLETAPI_HOME=../../../jakarta-servletapi
  +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
  +set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar;%ANT_XML_CLASSPATH%
   
   
   rem ----- Execute The Requested Build -----------------------------------------
   
  -java %ANT_OPTS% org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Djaxp.home="%JAXP_HOME%" -Dservletapi.home=%SERVLETAPI_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
  +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 SERVLETAPI_HOME=%_SERVLETAPIHOME%
  -set _SERVLETAPIHOME=
   set CLASSPATH=%_CLASSPATH%
   set _CLASSPATH=
   set ANT_HOME=%_ANT_HOME%
   set _ANT_HOME=
  +set XML_PARSER_JAR=%_XML_PARSER_JAR%
  +set _XML_PARSER_JAR=
  +set XML_PARSER_JAR_ANT=%_XML_PARSER_JAR_ANT%
  +set _XML_PARSER_JAR_ANT=
   :finish
  
  
  
  1.2       +49 -20    jakarta-tomcat-4.0/webapps/ROOT/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/ROOT/build.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.sh	2000/08/23 18:29:48	1.1
  +++ build.sh	2000/10/12 23:34:14	1.2
  @@ -1,54 +1,83 @@
   #!/bin/sh
   # -----------------------------------------------------------------------------
  -# build.sh - Build Script for webapps
  +# build.sh - Build Script for webapp subdir
   #
   # Environment Variable Prerequisites:
   #
  -#   ANT_HOME         Must point at your Ant installation [../../../jakarta-ant]
  +#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   #
  -#   ANT_OPTS         Command line options to the Java runtime
  -#                    that executes Ant [NONE]
  +#   JAXP_HOME        Points at a JAXP compliant XML parser 
  +#                    installation directory [NONE]
   #
  -#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
  +#   JAXP_PARSER_JAR  The jar filename of the JAXP compliant 
  +#                    'XML parser' [crimson.jar]
   #
  -#   JAXP_HOME        Must point at your JAXP installation
  +#   ANT_HOME         Must point at your Ant installation [../jakarta-ant]
   #
  +#   ANT_OPTS         Command line options to the Java runtime
  +#                    that executes Ant [NONE]
  +#
  +#   ANT_XML_CLASSPATH  
  +#                    Jar files added to the classpath for the XML parsing
  +#                    requirements of ant
  +#                    [$JAXP_HOME/$JAXP_PARSER_JAR:$JAXP_HOME/jaxp.jar]
  +# 
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -#                    [../../../jakarta-servletapi]
  +#                    [REQUIRED]
   #
  -# $Id: build.sh,v 1.1 2000/08/23 18:29:48 craigmcc Exp $
  +# $Id: build.sh,v 1.2 2000/10/12 23:34:14 pierred Exp $
   # -----------------------------------------------------------------------------
   
   
   # ----- Verify and Set Required Environment Variables -------------------------
   
  -if [ "$ANT_HOME" = "" ] ; then
  -  ANT_HOME=../../../jakarta-ant
  +if [ "$JAVA_HOME" = "" ] ; then
  +  echo You must set JAVA_HOME to point at your Java Development Kit install
  +  exit 1
   fi
   
  -if [ "$ANT_OPTS" = "" ] ; then
  -  ANT_OPTS=""
  +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
   fi
   
  -if [ "$JAVA_HOME" = "" ] ; then
  -  echo You must set JAVA_HOME to point at your Java Development Kit install
  +if [ "$JAXP_PARSER_JAR" = "" ] ; then
  +  JAXP_PARSER_JAR=crimson.jar
  +fi
  +
  +if [ "$ANT_XML_CLASSPATH" = "" ] ; then
  +  ANT_XML_CLASSPATH=$JAXP_HOME/$JAXP_PARSER_JAR:$JAXP_HOME/jaxp.jar
  +  ANT_USING_DEFAULT=true
  +fi
  +
  +if [ "$ANT_USING_DEFAULT" = "true" -a "$JAXP_HOME" = "" ] ; then
  +  echo You must set JAXP_HOME to point at your XML Parser install directory.
  +  echo By default, ant 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
     exit 1
   fi
   
  -if [ "$SERVLETAPI_HOME" = "" ] ; then
  -  SERVLETAPI_HOME=../../../jakarta-servletapi
  +if [ "$ANT_HOME" = "" ] ; then
  +  ANT_HOME=../jakarta-ant
   fi
   
  +if [ "$ANT_OPTS" = "" ] ; then
  +  ANT_OPTS=""
  +fi
   
   # ----- Set Up The Runtime Classpath ------------------------------------------
   
  -CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar
  +CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$ANT_XML_CLASSPATH
  +
   if [ "$CLASSPATH" != "" ] ; then
     CP=$CLASSPATH:$CP
   fi
   
  -
   # ----- Execute The Requested Build -------------------------------------------
  -
  -java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Djaxp.home=$JAXP_HOME -Dservletapi.home=$SERVLETAPI_HOME "$@"
   
  +$JAVA_HOME/bin/java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dservletapi.home=$SERVLETAPI_HOME -Djava.home=$JAVA_HOME "$@"
  
  
  
  1.3       +0 -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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	2000/08/25 02:58:55	1.2
  +++ build.xml	2000/10/12 23:34:14	1.3
  @@ -2,7 +2,6 @@
   
   
     <!-- ===================== Initialize Property Values =================== -->
  -  <property name="ant.home"        value="../../../jakarta-ant"/>
     <property name="build.compiler"  value="classic"/>
     <property name="build.dir"       value="../../../build/webapps"/>
     <property name="dist.dir"        value="../../../dist/webapps"/>
  
  
  
  1.3       +51 -16    jakarta-tomcat-4.0/webapps/examples/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/build.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.bat	2000/10/10 00:42:52	1.2
  +++ build.bat	2000/10/12 23:34:14	1.3
  @@ -4,27 +4,36 @@
   rem
   rem Environment Variable Prerequisites:
   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
   rem   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   rem
  -rem   JAXP_HOME        Must point at your JAXP installation 
  +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   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -rem                    [../../jakarta-servletapi]
  +rem                    [REQUIRED]
  +rem 
   rem
  -rem $Id: build.bat,v 1.2 2000/10/10 00:42:52 craigmcc Exp $
  +rem $Id: build.bat,v 1.3 2000/10/12 23:34:14 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
   rem ----- Save Environment Variables ------------------------------------------
   
  +set _CLASSPATH=%CLASSPATH%
  +set _JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
   set _ANT_HOME=%ANT_HOME%
  -set _CLASSPATH=%CLASSPATH%
  -set _SERVLETAPI_HOME=%SERVLETAPI_HOME%
  +set _ANT_XML_CLASSPATH=%ANT_XML_CLASSPATH%
   
   
   rem ----- Verify and Set Required Environment Variables -----------------------
  @@ -34,33 +43,59 @@
   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
  +
  +goto gotJaxpHome
  +
  +:jaxpHome
  +echo You must set JAXP_HOME to point at your XML Parser install directory.
  +echo By default, ant 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
  +goto cleanup
  +:gotJaxpHome
  +
   if not "%ANT_HOME%" == "" goto gotAntHome
  -set ANT_HOME=../../jakarta-ant
  +set ANT_HOME=../jakarta-ant
   :gotAntHome
   
   if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
  -set SERVLETAPI_HOME=../../jakarta-servletapi
  +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
  +set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar;%ANT_XML_CLASSPATH%
   
   
   rem ----- Execute The Requested Build -----------------------------------------
   
  -java %ANT_OPTS% org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Djaxp.home="%JAXP_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 -Dservletapi.home=%SERVLETAPI_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
   
   
   rem ----- Restore Environment Variables ---------------------------------------
   
   :cleanup
  -set SERVLETAPI_HOME=%_SERVLETAPIHOME%
  -set _SERVLETAPIHOME=
   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.2       +49 -20    jakarta-tomcat-4.0/webapps/examples/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/build.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.sh	2000/08/21 18:30:26	1.1
  +++ build.sh	2000/10/12 23:34:15	1.2
  @@ -1,54 +1,83 @@
   #!/bin/sh
   # -----------------------------------------------------------------------------
  -# build.sh - Build Script for webapps
  +# build.sh - Build Script for webapp subdir
   #
   # Environment Variable Prerequisites:
   #
  -#   ANT_HOME         Must point at your Ant installation [../../jakarta-ant]
  +#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   #
  -#   ANT_OPTS         Command line options to the Java runtime
  -#                    that executes Ant [NONE]
  +#   JAXP_HOME        Points at a JAXP compliant XML parser 
  +#                    installation directory [NONE]
   #
  -#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
  +#   JAXP_PARSER_JAR  The jar filename of the JAXP compliant 
  +#                    'XML parser' [crimson.jar]
   #
  -#   JAXP_HOME        Must point at your JAXP installation
  +#   ANT_HOME         Must point at your Ant installation [../jakarta-ant]
   #
  +#   ANT_OPTS         Command line options to the Java runtime
  +#                    that executes Ant [NONE]
  +#
  +#   ANT_XML_CLASSPATH  
  +#                    Jar files added to the classpath for the XML parsing
  +#                    requirements of ant
  +#                    [$JAXP_HOME/$JAXP_PARSER_JAR:$JAXP_HOME/jaxp.jar]
  +# 
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -#                    [../../jakarta-servletapi]
  +#                    [REQUIRED]
   #
  -# $Id: build.sh,v 1.1 2000/08/21 18:30:26 horwat Exp $
  +# $Id: build.sh,v 1.2 2000/10/12 23:34:15 pierred Exp $
   # -----------------------------------------------------------------------------
   
   
   # ----- Verify and Set Required Environment Variables -------------------------
   
  -if [ "$ANT_HOME" = "" ] ; then
  -  ANT_HOME=../../jakarta-ant
  +if [ "$JAVA_HOME" = "" ] ; then
  +  echo You must set JAVA_HOME to point at your Java Development Kit install
  +  exit 1
   fi
   
  -if [ "$ANT_OPTS" = "" ] ; then
  -  ANT_OPTS=""
  +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
   fi
   
  -if [ "$JAVA_HOME" = "" ] ; then
  -  echo You must set JAVA_HOME to point at your Java Development Kit install
  +if [ "$JAXP_PARSER_JAR" = "" ] ; then
  +  JAXP_PARSER_JAR=crimson.jar
  +fi
  +
  +if [ "$ANT_XML_CLASSPATH" = "" ] ; then
  +  ANT_XML_CLASSPATH=$JAXP_HOME/$JAXP_PARSER_JAR:$JAXP_HOME/jaxp.jar
  +  ANT_USING_DEFAULT=true
  +fi
  +
  +if [ "$ANT_USING_DEFAULT" = "true" -a "$JAXP_HOME" = "" ] ; then
  +  echo You must set JAXP_HOME to point at your XML Parser install directory.
  +  echo By default, ant 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
     exit 1
   fi
   
  -if [ "$SERVLETAPI_HOME" = "" ] ; then
  -  SERVLETAPI_HOME=../../jakarta-servletapi
  +if [ "$ANT_HOME" = "" ] ; then
  +  ANT_HOME=../jakarta-ant
   fi
   
  +if [ "$ANT_OPTS" = "" ] ; then
  +  ANT_OPTS=""
  +fi
   
   # ----- Set Up The Runtime Classpath ------------------------------------------
   
  -CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar
  +CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$ANT_XML_CLASSPATH
  +
   if [ "$CLASSPATH" != "" ] ; then
     CP=$CLASSPATH:$CP
   fi
   
  -
   # ----- Execute The Requested Build -------------------------------------------
  -
  -java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Djaxp.home=$JAXP_HOME -Dservletapi.home=$SERVLETAPI_HOME "$@"
   
  +$JAVA_HOME/bin/java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dservletapi.home=$SERVLETAPI_HOME -Djava.home=$JAVA_HOME "$@"
  
  
  
  1.3       +0 -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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	2000/08/25 02:58:56	1.2
  +++ build.xml	2000/10/12 23:34:15	1.3
  @@ -2,7 +2,6 @@
   
   
     <!-- ===================== Initialize Property Values =================== -->
  -  <property name="ant.home"        value="../../../jakarta-ant"/>
     <property name="build.compiler"  value="classic"/>
     <property name="build.dir"       value="../../../build/webapps"/>
     <property name="dist.dir"        value="../../../dist/webapps"/>
  
  
  
  1.3       +52 -16    jakarta-tomcat-4.0/webapps/manager/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/manager/build.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.bat	2000/10/10 00:42:52	1.2
  +++ build.bat	2000/10/12 23:34:15	1.3
  @@ -4,27 +4,36 @@
   rem
   rem Environment Variable Prerequisites:
   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
   rem   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   rem
  -rem   JAXP_HOME        Must point at your JAXP installation 
  +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   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -rem                    [../../jakarta-servletapi]
  +rem                    [REQUIRED]
  +rem 
   rem
  -rem $Id: build.bat,v 1.2 2000/10/10 00:42:52 craigmcc Exp $
  +rem $Id: build.bat,v 1.3 2000/10/12 23:34:15 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
   rem ----- Save Environment Variables ------------------------------------------
   
  +set _CLASSPATH=%CLASSPATH%
  +set _JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
   set _ANT_HOME=%ANT_HOME%
  -set _CLASSPATH=%CLASSPATH%
  -set _SERVLETAPI_HOME=%SERVLETAPI_HOME%
  +set _ANT_XML_CLASSPATH=%ANT_XML_CLASSPATH%
   
   
   rem ----- Verify and Set Required Environment Variables -----------------------
  @@ -34,33 +43,60 @@
   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
  +
  +goto gotJaxpHome
  +
  +:jaxpHome
  +echo You must set JAXP_HOME to point at your XML Parser install directory.
  +echo By default, ant 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
  +goto cleanup
  +:gotJaxpHome
  +
   if not "%ANT_HOME%" == "" goto gotAntHome
  -set ANT_HOME=../../jakarta-ant
  +set ANT_HOME=../jakarta-ant
   :gotAntHome
   
   if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
  -set SERVLETAPI_HOME=../../jakarta-servletapi
  +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
  +set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar;%ANT_XML_CLASSPATH%
   
   
   rem ----- Execute The Requested Build -----------------------------------------
   
  -java %ANT_OPTS% org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Djaxp.home="%JAXP_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 -Dservletapi.home=%SERVLETAPI_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
   
   
   rem ----- Restore Environment Variables ---------------------------------------
   
   :cleanup
  -set SERVLETAPI_HOME=%_SERVLETAPIHOME%
  -set _SERVLETAPIHOME=
   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.2       +49 -20    jakarta-tomcat-4.0/webapps/manager/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/manager/build.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.sh	2000/10/05 02:30:23	1.1
  +++ build.sh	2000/10/12 23:34:15	1.2
  @@ -1,54 +1,83 @@
   #!/bin/sh
   # -----------------------------------------------------------------------------
  -# build.sh - Build Script for webapps
  +# build.sh - Build Script for webapp subdir
   #
   # Environment Variable Prerequisites:
   #
  -#   ANT_HOME         Must point at your Ant installation [../../jakarta-ant]
  +#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   #
  -#   ANT_OPTS         Command line options to the Java runtime
  -#                    that executes Ant [NONE]
  +#   JAXP_HOME        Points at a JAXP compliant XML parser 
  +#                    installation directory [NONE]
   #
  -#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
  +#   JAXP_PARSER_JAR  The jar filename of the JAXP compliant 
  +#                    'XML parser' [crimson.jar]
   #
  -#   JAXP_HOME        Must point at your JAXP installation
  +#   ANT_HOME         Must point at your Ant installation [../jakarta-ant]
   #
  +#   ANT_OPTS         Command line options to the Java runtime
  +#                    that executes Ant [NONE]
  +#
  +#   ANT_XML_CLASSPATH  
  +#                    Jar files added to the classpath for the XML parsing
  +#                    requirements of ant
  +#                    [$JAXP_HOME/$JAXP_PARSER_JAR:$JAXP_HOME/jaxp.jar]
  +# 
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -#                    [../../jakarta-servletapi]
  +#                    [REQUIRED]
   #
  -# $Id: build.sh,v 1.1 2000/10/05 02:30:23 craigmcc Exp $
  +# $Id: build.sh,v 1.2 2000/10/12 23:34:15 pierred Exp $
   # -----------------------------------------------------------------------------
   
   
   # ----- Verify and Set Required Environment Variables -------------------------
   
  -if [ "$ANT_HOME" = "" ] ; then
  -  ANT_HOME=../../jakarta-ant
  +if [ "$JAVA_HOME" = "" ] ; then
  +  echo You must set JAVA_HOME to point at your Java Development Kit install
  +  exit 1
   fi
   
  -if [ "$ANT_OPTS" = "" ] ; then
  -  ANT_OPTS=""
  +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
   fi
   
  -if [ "$JAVA_HOME" = "" ] ; then
  -  echo You must set JAVA_HOME to point at your Java Development Kit install
  +if [ "$JAXP_PARSER_JAR" = "" ] ; then
  +  JAXP_PARSER_JAR=crimson.jar
  +fi
  +
  +if [ "$ANT_XML_CLASSPATH" = "" ] ; then
  +  ANT_XML_CLASSPATH=$JAXP_HOME/$JAXP_PARSER_JAR:$JAXP_HOME/jaxp.jar
  +  ANT_USING_DEFAULT=true
  +fi
  +
  +if [ "$ANT_USING_DEFAULT" = "true" -a "$JAXP_HOME" = "" ] ; then
  +  echo You must set JAXP_HOME to point at your XML Parser install directory.
  +  echo By default, ant 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
     exit 1
   fi
   
  -if [ "$SERVLETAPI_HOME" = "" ] ; then
  -  SERVLETAPI_HOME=../../jakarta-servletapi
  +if [ "$ANT_HOME" = "" ] ; then
  +  ANT_HOME=../jakarta-ant
   fi
   
  +if [ "$ANT_OPTS" = "" ] ; then
  +  ANT_OPTS=""
  +fi
   
   # ----- Set Up The Runtime Classpath ------------------------------------------
   
  -CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar
  +CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$ANT_XML_CLASSPATH
  +
   if [ "$CLASSPATH" != "" ] ; then
     CP=$CLASSPATH:$CP
   fi
   
  -
   # ----- Execute The Requested Build -------------------------------------------
  -
  -java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Djaxp.home=$JAXP_HOME -Dservletapi.home=$SERVLETAPI_HOME "$@"
   
  +$JAVA_HOME/bin/java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dservletapi.home=$SERVLETAPI_HOME -Djava.home=$JAVA_HOME "$@"
  
  
  
  1.2       +0 -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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	2000/10/05 02:30:23	1.1
  +++ build.xml	2000/10/12 23:34:15	1.2
  @@ -2,7 +2,6 @@
   
   
     <!-- ===================== Initialize Property Values =================== -->
  -  <property name="ant.home"        value="../../../jakarta-ant"/>
     <property name="build.compiler"  value="classic"/>
     <property name="build.dir"       value="../../../build/webapps"/>
     <property name="dist.dir"        value="../../../dist/webapps"/>
  
  
  
  1.3       +52 -16    jakarta-tomcat-4.0/webapps/webdav/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/webdav/build.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.bat	2000/10/10 00:42:53	1.2
  +++ build.bat	2000/10/12 23:34:16	1.3
  @@ -4,27 +4,36 @@
   rem
   rem Environment Variable Prerequisites:
   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
   rem   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   rem
  -rem   JAXP_HOME        Must point at your JAXP installation 
  +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   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -rem                    [../../jakarta-servletapi]
  +rem                    [REQUIRED]
  +rem 
   rem
  -rem $Id: build.bat,v 1.2 2000/10/10 00:42:53 craigmcc Exp $
  +rem $Id: build.bat,v 1.3 2000/10/12 23:34:16 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
   rem ----- Save Environment Variables ------------------------------------------
   
  +set _CLASSPATH=%CLASSPATH%
  +set _JAXP_PARSER_JAR=%JAXP_PARSER_JAR%
   set _ANT_HOME=%ANT_HOME%
  -set _CLASSPATH=%CLASSPATH%
  -set _SERVLETAPI_HOME=%SERVLETAPI_HOME%
  +set _ANT_XML_CLASSPATH=%ANT_XML_CLASSPATH%
   
   
   rem ----- Verify and Set Required Environment Variables -----------------------
  @@ -34,33 +43,60 @@
   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
  +
  +goto gotJaxpHome
  +
  +:jaxpHome
  +echo You must set JAXP_HOME to point at your XML Parser install directory.
  +echo By default, ant 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
  +goto cleanup
  +:gotJaxpHome
  +
   if not "%ANT_HOME%" == "" goto gotAntHome
  -set ANT_HOME=../../../jakarta-ant
  +set ANT_HOME=../jakarta-ant
   :gotAntHome
   
   if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
  -set SERVLETAPI_HOME=../../../jakarta-servletapi
  +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
  +set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar;%ANT_XML_CLASSPATH%
   
   
   rem ----- Execute The Requested Build -----------------------------------------
   
  -java %ANT_OPTS% org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Djaxp.home="%JAXP_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 -Dservletapi.home=%SERVLETAPI_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
   
   
   rem ----- Restore Environment Variables ---------------------------------------
   
   :cleanup
  -set SERVLETAPI_HOME=%_SERVLETAPIHOME%
  -set _SERVLETAPIHOME=
   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.2       +49 -20    jakarta-tomcat-4.0/webapps/webdav/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/webdav/build.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.sh	2000/08/31 19:09:08	1.1
  +++ build.sh	2000/10/12 23:34:16	1.2
  @@ -1,54 +1,83 @@
   #!/bin/sh
   # -----------------------------------------------------------------------------
  -# build.sh - Build Script for webapps
  +# build.sh - Build Script for webapp subdir
   #
   # Environment Variable Prerequisites:
   #
  -#   ANT_HOME         Must point at your Ant installation [../../../jakarta-ant]
  +#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   #
  -#   ANT_OPTS         Command line options to the Java runtime
  -#                    that executes Ant [NONE]
  +#   JAXP_HOME        Points at a JAXP compliant XML parser 
  +#                    installation directory [NONE]
   #
  -#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
  +#   JAXP_PARSER_JAR  The jar filename of the JAXP compliant 
  +#                    'XML parser' [crimson.jar]
   #
  -#   JAXP_HOME        Must point at your JAXP installation
  +#   ANT_HOME         Must point at your Ant installation [../jakarta-ant]
   #
  +#   ANT_OPTS         Command line options to the Java runtime
  +#                    that executes Ant [NONE]
  +#
  +#   ANT_XML_CLASSPATH  
  +#                    Jar files added to the classpath for the XML parsing
  +#                    requirements of ant
  +#                    [$JAXP_HOME/$JAXP_PARSER_JAR:$JAXP_HOME/jaxp.jar]
  +# 
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -#                    [../../../jakarta-servletapi]
  +#                    [REQUIRED]
   #
  -# $Id: build.sh,v 1.1 2000/08/31 19:09:08 remm Exp $
  +# $Id: build.sh,v 1.2 2000/10/12 23:34:16 pierred Exp $
   # -----------------------------------------------------------------------------
   
   
   # ----- Verify and Set Required Environment Variables -------------------------
   
  -if [ "$ANT_HOME" = "" ] ; then
  -  ANT_HOME=../../../jakarta-ant
  +if [ "$JAVA_HOME" = "" ] ; then
  +  echo You must set JAVA_HOME to point at your Java Development Kit install
  +  exit 1
   fi
   
  -if [ "$ANT_OPTS" = "" ] ; then
  -  ANT_OPTS=""
  +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
   fi
   
  -if [ "$JAVA_HOME" = "" ] ; then
  -  echo You must set JAVA_HOME to point at your Java Development Kit install
  +if [ "$JAXP_PARSER_JAR" = "" ] ; then
  +  JAXP_PARSER_JAR=crimson.jar
  +fi
  +
  +if [ "$ANT_XML_CLASSPATH" = "" ] ; then
  +  ANT_XML_CLASSPATH=$JAXP_HOME/$JAXP_PARSER_JAR:$JAXP_HOME/jaxp.jar
  +  ANT_USING_DEFAULT=true
  +fi
  +
  +if [ "$ANT_USING_DEFAULT" = "true" -a "$JAXP_HOME" = "" ] ; then
  +  echo You must set JAXP_HOME to point at your XML Parser install directory.
  +  echo By default, ant 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
     exit 1
   fi
   
  -if [ "$SERVLETAPI_HOME" = "" ] ; then
  -  SERVLETAPI_HOME=../../../jakarta-servletapi
  +if [ "$ANT_HOME" = "" ] ; then
  +  ANT_HOME=../jakarta-ant
   fi
   
  +if [ "$ANT_OPTS" = "" ] ; then
  +  ANT_OPTS=""
  +fi
   
   # ----- Set Up The Runtime Classpath ------------------------------------------
   
  -CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar
  +CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$ANT_XML_CLASSPATH
  +
   if [ "$CLASSPATH" != "" ] ; then
     CP=$CLASSPATH:$CP
   fi
   
  -
   # ----- Execute The Requested Build -------------------------------------------
  -
  -java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Djaxp.home=$JAXP_HOME -Dservletapi.home=$SERVLETAPI_HOME "$@"
   
  +$JAVA_HOME/bin/java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dservletapi.home=$SERVLETAPI_HOME -Djava.home=$JAVA_HOME "$@"
  
  
  
  1.2       +0 -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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	2000/08/31 19:09:08	1.1
  +++ build.xml	2000/10/12 23:34:16	1.2
  @@ -2,7 +2,6 @@
   
   
     <!-- ===================== Initialize Property Values =================== -->
  -  <property name="ant.home"        value="../../../jakarta-ant"/>
     <property name="build.compiler"  value="classic"/>
     <property name="build.dir"       value="../../../build/webapps"/>
     <property name="dist.dir"        value="../../../dist/webapps"/>
  
  
  

Mime
View raw message