craigmcc 01/02/18 18:09:05 Modified: . build.bat build.sh build.xml Log: Update support for the "deploy.catalina" target so that Xerces (1.2.0) is copied to the WEB_INF/lib directory of each deployed application. This reflects the fact that Tomcat 4.0 no longer exposes an XML parser to web applications by default. Revision Changes Path 1.12 +109 -98 jakarta-struts/build.bat Index: build.bat =================================================================== RCS file: /home/cvs/jakarta-struts/build.bat,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- build.bat 2001/02/14 17:27:18 1.11 +++ build.bat 2001/02/19 02:09:04 1.12 @@ -1,98 +1,109 @@ -@echo off -rem --------------------------------------------------------------------------- -rem build.bat -- Build Script for the "Struts" Toolkit -rem -rem Supported Environment Variables (default values in square brackets): -rem -rem ANT_HOME Distribution directory for "jakarta-ant". -rem [../jakarta-ant] -rem -rem ANT_OPTS Command line options to pass to the JVM when -rem executing Ant. [none] -rem -rem CATALINA_HOME Build directory for "jakarta-tomcat-4.0". -rem [../jakarta-tomcat-4.0/build] This is required -rem only if you wish to deploy Struts directly to the -rem Tomcat 4.0 build directory - otherwise it is -rem optional -rem -rem JAVA_HOME Java Development Kit directory. [REQUIRED] -rem -rem SERVLETAPI_HOME Distribution directory for "jakarta-servletapi". -rem [../jakarta-servletapi] -rem -rem TOMCAT_HOME Build directory for "jakarta-tomcat". -rem [../build/tomcat] This is required only -rem if you wish to deploy Struts directly to the -rem Tomcat 3.2 build directory - otherwise it is -rem optional -rem -rem $Id: build.bat,v 1.11 2001/02/14 17:27:18 craigmcc Exp $ -rem --------------------------------------------------------------------------- - - -rem ----- Save Environment Variables That May Change -------------------------- - -set _ANT_HOME=%ANT_HOME% -set _ANT_OPTS=%ANT_OPTS% -set _CATALINA_HOME=%CATALINA_HOME% -set _SERVLETAPI_HOME=%SERVLETAPI_HOME% -set _TOMCAT_HOME=%TOMCAT_HOME% - - -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 distribution -goto cleanup -:gotJavaHome - -if not "%ANT_HOME%" == "" goto gotAntHome -set ANT_HOME=..\jakarta-ant -:gotAntHome - -if not "%CATALINA_HOME%" == "" goto gotCatalinaHome -set CATALINA_HOME=..\jakarta-tomcat-4.0\build -:gotCatalinaHome - -if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome -set SERVLETAPI_HOME=..\jakarta-servletapi -:gotServletapiHome - -if not "%TOMCAT_HOME%" == "" goto gotTomcatHome -set TOMCAT_HOME=..\build\tomcat -:gotTomcatHome - - - -rem ----- Set Up The Runtime Classpath ---------------------------------------- - -if "%CLASSPATH%" == "" goto noClasspath -set CP=%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\optional.jar;%JAVA_HOME%\lib\tools.jar;%CLASSPATH% -goto gotClasspath -:noClasspath -set CP=%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\optional.jar;%JAVA_HOME%\lib\tools.jar -:gotClasspath - - -rem ----- Execute The Requested Build ----------------------------------------- - -%JAVA_HOME%\bin\java %ANT_OPTS% -classpath "%CP%" org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Dcatalina.home=%CATALINA_HOME% -Dservlet.jar=%SERVLETAPI_HOME%\lib\servlet.jar -Dtomcat.home=%TOMCAT_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9 - - -rem ----- Clean Up Environment Variables -------------------------------------- - -:cleanup - -set ANT_HOME=%_ANT_HOME% -set ANT_OPTS=%_ANT_OPTS% -set CATALINA_HOME=%_CATALINA_HOME% -set SERVLETAPI_HOME=%_SERVLETAPI_HOME% -set TOMCAT_HOME=%_TOMCAT_HOME% - -set _ANT_HOME= -set _ANT_OPTS= -set _CATALINA_HOME= -set _SERVLETAPI_HOME= -set _TOMCAT_HOME= - +@echo off +rem --------------------------------------------------------------------------- +rem build.bat -- Build Script for the "Struts" Toolkit +rem +rem Supported Environment Variables (default values in square brackets): +rem +rem ANT_HOME Distribution directory for "jakarta-ant". +rem [../jakarta-ant] +rem +rem ANT_OPTS Command line options to pass to the JVM when +rem executing Ant. [none] +rem +rem CATALINA_HOME Build directory for "jakarta-tomcat-4.0". +rem [../jakarta-tomcat-4.0/build] This is required +rem only if you wish to deploy Struts directly to the +rem Tomcat 4.0 build directory - otherwise it is +rem optional +rem +rem JAVA_HOME Java Development Kit directory. [REQUIRED] +rem +rem SERVLETAPI_HOME Distribution directory for "jakarta-servletapi". +rem [../jakarta-servletapi] +rem +rem TOMCAT_HOME Build directory for "jakarta-tomcat". +rem [../build/tomcat] This is required only +rem if you wish to deploy Struts directly to the +rem Tomcat 3.2 build directory - otherwise it is +rem optional +rem +rem XERCES_HOME Distribution directory for the Xerces XML parser +rem [../xml-xerces] This is required only if you wish +rem to deploy Struts directly to the Tomcat 4.0 build +rem directory - otherwise it is optional +rem +rem $Id: build.bat,v 1.12 2001/02/19 02:09:04 craigmcc Exp $ +rem --------------------------------------------------------------------------- + + +rem ----- Save Environment Variables That May Change -------------------------- + +set _ANT_HOME=%ANT_HOME% +set _ANT_OPTS=%ANT_OPTS% +set _CATALINA_HOME=%CATALINA_HOME% +set _SERVLETAPI_HOME=%SERVLETAPI_HOME% +set _TOMCAT_HOME=%TOMCAT_HOME% +set _XERCES_HOME=%XERCES_HOME% + + +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 distribution +goto cleanup +:gotJavaHome + +if not "%ANT_HOME%" == "" goto gotAntHome +set ANT_HOME=..\jakarta-ant +:gotAntHome + +if not "%CATALINA_HOME%" == "" goto gotCatalinaHome +set CATALINA_HOME=..\jakarta-tomcat-4.0\build +:gotCatalinaHome + +if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome +set SERVLETAPI_HOME=..\jakarta-servletapi +:gotServletapiHome + +if not "%TOMCAT_HOME%" == "" goto gotTomcatHome +set TOMCAT_HOME=..\build\tomcat +:gotTomcatHome + +if not "%XERCES_HOME%" == "" goto gotXercesHome +set XERCES_HOME=..\xml-xerces +:gotXercesHome + + +rem ----- Set Up The Runtime Classpath ---------------------------------------- + +if "%CLASSPATH%" == "" goto noClasspath +set CP=%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\optional.jar;%JAVA_HOME%\lib\tools.jar;%CLASSPATH% +goto gotClasspath +:noClasspath +set CP=%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\optional.jar;%JAVA_HOME%\lib\tools.jar +:gotClasspath + + +rem ----- Execute The Requested Build ----------------------------------------- + +%JAVA_HOME%\bin\java %ANT_OPTS% -classpath "%CP%" org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Dcatalina.home=%CATALINA_HOME% -Dservlet.jar=%SERVLETAPI_HOME%\lib\servlet.jar -Dtomcat.home=%TOMCAT_HOME% -Dxerces.home=%XERCES_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9 + + +rem ----- Clean Up Environment Variables -------------------------------------- + +:cleanup + +set ANT_HOME=%_ANT_HOME% +set ANT_OPTS=%_ANT_OPTS% +set CATALINA_HOME=%_CATALINA_HOME% +set SERVLETAPI_HOME=%_SERVLETAPI_HOME% +set TOMCAT_HOME=%_TOMCAT_HOME% +set XERCES_HOME=%_XERCES_HOME% + +set _ANT_HOME= +set _ANT_OPTS= +set _CATALINA_HOME= +set _SERVLETAPI_HOME= +set _TOMCAT_HOME= +set _XERCES_HOME= + 1.7 +17 -2 jakarta-struts/build.sh Index: build.sh =================================================================== RCS file: /home/cvs/jakarta-struts/build.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- build.sh 2001/02/14 17:27:19 1.6 +++ build.sh 2001/02/19 02:09:04 1.7 @@ -27,7 +27,12 @@ # Tomcat 3.x build directory - otherwise it is # optional # -# $Id: build.sh,v 1.6 2001/02/14 17:27:19 craigmcc Exp $ +# XERCES_HOME Distribution directory for the Xerces XML parser +# [../xml-xerces] This is required only if you wish +# to deploy Struts directly to the Tomcat 4.0 build +# directory - otherwise it is optional +# +# $Id: build.sh,v 1.7 2001/02/19 02:09:04 craigmcc Exp $ # ----------------------------------------------------------------------------- @@ -58,6 +63,10 @@ TOMCAT_HOME=../build/tomcat fi +if [ "$XERCES_HOME" = "" ] ; then + XERCES_HOME=../xml-xerces +fi + # ----- Set Up The Runtime Classpath ------------------------------------------ @@ -70,4 +79,10 @@ # ----- Execute The Requested Build ------------------------------------------- -java $ANT_OPTS -classpath "$CP" org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Dcatalina.home=$CATALINA_HOME -Dservlet.jar=$SERVLETAPI_HOME/lib/servlet.jar -Dtomcat.home=$TOMCAT_HOME "$@" +java $ANT_OPTS -classpath "$CP" org.apache.tools.ant.Main \ + -Dant.home=$ANT_HOME \ + -Dcatalina.home=$CATALINA_HOME \ + -Dservlet.jar=$SERVLETAPI_HOME/lib/servlet.jar \ + -Dtomcat.home=$TOMCAT_HOME \ + -Dxerces.home=$XERCES_HOME \ + "$@" 1.37 +18 -0 jakarta-struts/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-struts/build.xml,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- build.xml 2001/02/12 23:59:37 1.36 +++ build.xml 2001/02/19 02:09:04 1.37 @@ -382,25 +382,43 @@ <copy todir="${catalina.home}/webapps/struts-blank"> <fileset dir="${build.home}/blank"/> </copy> + <copy todir="${catalina.home}/webapps/struts-blank/WEB-INF/lib"> + <fileset dir="${xerces.home}" includes="xerces.jar"/> + </copy> <mkdir dir="${catalina.home}/webapps/struts-documentation"/> <copy todir="${catalina.home}/webapps/struts-documentation"> <fileset dir="${build.home}/documentation"/> </copy> + <copy todir="${catalina.home}/webapps/struts-documentation/WEB-INF/lib"> + <fileset dir="${xerces.home}" includes="xerces.jar"/> + </copy> <mkdir dir="${catalina.home}/webapps/struts-example"/> <copy todir="${catalina.home}/webapps/struts-example"> <fileset dir="${build.home}/example"/> </copy> + <copy todir="${catalina.home}/webapps/struts-example/WEB-INF/lib"> + <fileset dir="${xerces.home}" includes="xerces.jar"/> + </copy> <mkdir dir="${catalina.home}/webapps/struts-template"/> <copy todir="${catalina.home}/webapps/struts-template"> <fileset dir="${build.home}/template"/> </copy> + <copy todir="${catalina.home}/webapps/struts-template/WEB-INF/lib"> + <fileset dir="${xerces.home}" includes="xerces.jar"/> + </copy> <mkdir dir="${catalina.home}/webapps/struts-test"/> <copy todir="${catalina.home}/webapps/struts-test"> <fileset dir="${build.home}/test"/> </copy> + <copy todir="${catalina.home}/webapps/struts-test/WEB-INF/lib"> + <fileset dir="${xerces.home}" includes="xerces.jar"/> + </copy> <mkdir dir="${catalina.home}/webapps/struts-upload"/> <copy todir="${catalina.home}/webapps/struts-upload"> <fileset dir="${build.home}/upload"/> + </copy> + <copy todir="${catalina.home}/webapps/struts-upload/WEB-INF"> + <fileset dir="${xerces.home}" includes="xerces.jar"/> </copy> </target>