nacho 00/11/03 04:15:38 Modified: src/shell startup.bat tomcat.bat Log: Sync shell script with new jar structure. Revision Changes Path 1.9 +2 -2 jakarta-tomcat/src/shell/startup.bat Index: startup.bat =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/shell/startup.bat,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- startup.bat 2000/09/04 21:24:49 1.8 +++ startup.bat 2000/11/03 12:15:37 1.9 @@ -1,6 +1,6 @@ @echo off -rem $Id: startup.bat,v 1.8 2000/09/04 21:24:49 larryi Exp $ -rem Startup batch file for tomcat servner. +rem $Id: startup.bat,v 1.9 2000/11/03 12:15:37 nacho Exp $ +rem Startup batch file for tomcat server. rem This batch file written and tested under Windows NT rem Improvements to this file are welcome 1.31 +14 -5 jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- tomcat.bat 2000/09/08 01:02:27 1.30 +++ tomcat.bat 2000/11/03 12:15:37 1.31 @@ -22,7 +22,7 @@ rem rem JAVA_HOME Must point at your Java Development Kit installation. rem -rem $Id: tomcat.bat,v 1.30 2000/09/08 01:02:27 larryi Exp $ +rem $Id: tomcat.bat,v 1.31 2000/11/03 12:15:37 nacho Exp $ rem ------------------------------------------------------------------------- @@ -32,7 +32,10 @@ set _TOMCAT_HOME=%TOMCAT_HOME% set _CLASSPATH=%CLASSPATH% +rem ----- Internal Environment Vars used somewhere -------------------------- +set TEST_JAR=tomcat.jar + rem ----- Verify and Set Required Environment Variables --------------------- if not "%JAVA_HOME%" == "" goto gotJavaHome @@ -43,8 +46,8 @@ if not "%TOMCAT_HOME%" == "" goto gotTomcatHome set TOMCAT_HOME=. :gotTomcatHome -if exist "%TOMCAT_HOME%\lib\webserver.jar" goto okTomcatHome -echo Unable to locate webserver.jar, check the value of TOMCAT_HOME. +if exist "%TOMCAT_HOME%\lib\%TEST_JAR%" goto okTomcatHome +echo Unable to locate %TEST_JAR%, check the value of TOMCAT_HOME. goto cleanup :okTomcatHome @@ -69,7 +72,7 @@ set CP=%TOMCAT_HOME%\classes rem Try to determine if TOMCAT_HOME contains spaces -if exist %TOMCAT_HOME%\lib\webserver.jar goto dynClasspath +if exist %TOMCAT_HOME%\lib\%TEST_JAR% goto dynClasspath echo Your TOMCAT_HOME appears to contain spaces. echo Unable to set CLASSPATH dynamically. goto staticClasspath @@ -97,7 +100,12 @@ set CP=%CP%;%TOMCAT_HOME%\lib\jaxp.jar set CP=%CP%;%TOMCAT_HOME%\lib\parser.jar set CP=%CP%;%TOMCAT_HOME%\lib\servlet.jar -set CP=%CP%;%TOMCAT_HOME%\lib\webserver.jar +set CP=%CP%;%TOMCAT_HOME%\lib\tomcat.jar +set CP=%CP%;%TOMCAT_HOME%\lib\tomcat_core.jar +set CP=%CP%;%TOMCAT_HOME%\lib\tomcat_config.jar +set CP=%CP%;%TOMCAT_HOME%\lib\tomcat_modules.jar +set CP=%CP%;%TOMCAT_HOME%\lib\tomcat_util.jar +set CP=%CP%;%TOMCAT_HOME%\lib\facade22.jar :chkClasspath if "%CLASSPATH%" == "" goto noClasspath @@ -177,6 +185,7 @@ rem ----- Restore Environment Variables --------------------------------------- :cleanup +set TEST_JAR= set _LIBJARS= set _SECSTARTJAVA= set _STARTJAVA= --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
