patrickl 01/11/27 17:39:10 Modified: catalina/src/bin catalina.bat tool-wrapper.bat Log: Add user customization of environment variables for Windows Revision Changes Path 1.22 +12 -6 jakarta-tomcat-4.0/catalina/src/bin/catalina.bat Index: catalina.bat =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- catalina.bat 2001/10/19 07:29:01 1.21 +++ catalina.bat 2001/11/28 01:39:10 1.22 @@ -20,7 +20,7 @@ rem (JSSE) installation, whose JAR files will be added to the rem system class path used to start Tomcat. rem -rem $Id: catalina.bat,v 1.21 2001/10/19 07:29:01 remm Exp $ +rem $Id: catalina.bat,v 1.22 2001/11/28 01:39:10 patrickl Exp $ rem --------------------------------------------------------------------------- @@ -34,11 +34,6 @@ rem ----- Verify and Set Required Environment Variables ----------------------- -if not "%JAVA_HOME%" == "" goto gotJava -echo You must set JAVA_HOME to point at your Java Development Kit installation -goto cleanup -:gotJava - if not "%CATALINA_HOME%" == "" goto gotHome set CATALINA_HOME=. if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome @@ -50,9 +45,20 @@ goto cleanup :okHome +rem ----- Get user customizable environment variables ------------------------- + +if not exist "%CATALINA_HOME%\bin\setenv.bat" goto noSetenv +call "%CATALINA_HOME%\bin\setenv.bat" +:noSetenv + if not "%CATALINA_BASE%" == "" goto gotBase set CATALINA_BASE=%CATALINA_HOME% :gotBase + +if not "%JAVA_HOME%" == "" goto gotJava +echo You must set JAVA_HOME to point at your Java Development Kit installation +goto cleanup +:gotJava rem ----- Prepare Appropriate Java Execution Commands ------------------------- 1.2 +12 -6 jakarta-tomcat-4.0/catalina/src/bin/tool-wrapper.bat Index: tool-wrapper.bat =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/tool-wrapper.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tool-wrapper.bat 2001/11/13 16:57:21 1.1 +++ tool-wrapper.bat 2001/11/28 01:39:10 1.2 @@ -12,7 +12,7 @@ rem rem TOOL_OPTS (Optional) Java execution options for the tool. rem -rem $Id: tool-wrapper.bat,v 1.1 2001/11/13 16:57:21 craigmcc Exp $ +rem $Id: tool-wrapper.bat,v 1.2 2001/11/28 01:39:10 patrickl Exp $ rem --------------------------------------------------------------------------- @@ -24,11 +24,6 @@ rem ----- Verify and Set Required Environment Variables ----------------------- -if not "%JAVA_HOME%" == "" goto gotJava -echo You must set JAVA_HOME to point at your Java Development Kit installation -goto cleanup -:gotJava - if not "%CATALINA_HOME%" == "" goto gotHome set CATALINA_HOME=. if exist "%CATALINA_HOME%\bin\tool-wrapper.bat" goto okHome @@ -39,6 +34,17 @@ echo Please check your CATALINA_HOME setting goto cleanup :okHome + +rem ----- Get user customizable environment variables ------------------------- + +if not exist "%CATALINA_HOME%\bin\setenv.bat" goto noSetenv +call "%CATALINA_HOME%\bin\setenv.bat" +:noSetenv + +if not "%JAVA_HOME%" == "" goto gotJava +echo You must set JAVA_HOME to point at your Java Development Kit installation +goto cleanup +:gotJava rem ----- Prepare Appropriate Java Execution Commands -------------------------
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
