Re: cvs commit: jakarta-tomcat/src/shell tomcat.bat tomcat.sh
Bill Barker wrote: - Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Wednesday, September 18, 2002 9:21 PM Subject: cvs commit: jakarta-tomcat/src/shell tomcat.bat tomcat.sh billbarker2002/09/18 21:21:17 Modified:src/shell tomcat.bat tomcat.sh Log: Temporary stop-gap until I work out all of the ClassLoader issues. Ok, there are a couple of options here: 1) Add a Class-Path to the Manifest (and make a comment in the release notes for people using Java 1.1.x). 2) Revert o.a.t.u.compat.* and o.a.t.u.depend.* to using System.err instead of c-l, since they are loaded in the System ClassLoader when running from the scripts. 3) Re-implement the required methods from o.a.t.u.compat.* in o.a.t.startup.Main so that we can leave o.a.t.u.depend.* and o.a.t.u.compat.* out of the jar. My personal choices are in order, 3-1-2. However 1 is the easiest, and seems to be in the direction that the proposals are heading. Opinions (Larry/Costin)? I used to like a lot (1), however I've been bitten few times. I still think it is a good solution, but with a lot of care. (2) is very easy to implement, and can solve the problem. The big question is: do we want to keep the very small/minimal parent loader - with commons-logging-api in the container loader ? BTW, I'm not sure what was the original problem you are trying to solve. I have a lot of mail to sort through, I would apreciate some more context info :-) -- Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat/src/shell tomcat.bat tomcat.sh
- Original Message - From: Costin Manolache [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Monday, September 23, 2002 3:57 AM Subject: Re: cvs commit: jakarta-tomcat/src/shell tomcat.bat tomcat.sh Bill Barker wrote: - Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Wednesday, September 18, 2002 9:21 PM Subject: cvs commit: jakarta-tomcat/src/shell tomcat.bat tomcat.sh billbarker2002/09/18 21:21:17 Modified:src/shell tomcat.bat tomcat.sh Log: Temporary stop-gap until I work out all of the ClassLoader issues. Ok, there are a couple of options here: 1) Add a Class-Path to the Manifest (and make a comment in the release notes for people using Java 1.1.x). 2) Revert o.a.t.u.compat.* and o.a.t.u.depend.* to using System.err instead of c-l, since they are loaded in the System ClassLoader when running from the scripts. 3) Re-implement the required methods from o.a.t.u.compat.* in o.a.t.startup.Main so that we can leave o.a.t.u.depend.* and o.a.t.u.compat.* out of the jar. My personal choices are in order, 3-1-2. However 1 is the easiest, and seems to be in the direction that the proposals are heading. Opinions (Larry/Costin)? I used to like a lot (1), however I've been bitten few times. I still think it is a good solution, but with a lot of care. (2) is very easy to implement, and can solve the problem. The big question is: do we want to keep the very small/minimal parent loader - with commons-logging-api in the container loader ? BTW, I'm not sure what was the original problem you are trying to solve. I have a lot of mail to sort through, I would apreciate some more context info :-) I went ahead and converted most of j-t o.a.t.util.** to use commons-logging. At the moment, since o.a.t.u.depend and o.a.t.u.compat are in the System ClassLoader, then commons-logging needs to be there as well. -- Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat/src/shell tomcat.bat tomcat.sh
Bill Barker wrote: I went ahead and converted most of j-t o.a.t.util.** to use commons-logging. At the moment, since o.a.t.u.depend and o.a.t.u.compat are in the System ClassLoader, then commons-logging needs to be there as well. +1 We shoud do it for j-t-c o.a.t.util as well, if not already done ( but after 4.1 is out ). IMPORNTANT: it's commons-logging-api.jar that should be in common loader !! ( I assume that's what you meant, just want to be sure everyone is aware of this issue ). The -api.jar was created exactly to allow this kind of setup, with commons-logging in the parent loader and different child loaders using different logging implementations. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat/src/shell tomcat.bat tomcat.sh
Hi Bill, Sorry to take so long to reply. I agree with your 3,1,2 order. However, I confess that I'm not sure I have a good handle on the disadvantages of going with 1 instead of 3. I'll see if I can form a more informed opinion this weekend. Cheers, Larry -Original Message- From: Bill Barker [mailto:[EMAIL PROTECTED]] Sent: Friday, September 20, 2002 12:40 AM To: Tomcat Developers List Subject: Re: cvs commit: jakarta-tomcat/src/shell tomcat.bat tomcat.sh - Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Wednesday, September 18, 2002 9:21 PM Subject: cvs commit: jakarta-tomcat/src/shell tomcat.bat tomcat.sh billbarker2002/09/18 21:21:17 Modified:src/shell tomcat.bat tomcat.sh Log: Temporary stop-gap until I work out all of the ClassLoader issues. Ok, there are a couple of options here: 1) Add a Class-Path to the Manifest (and make a comment in the release notes for people using Java 1.1.x). 2) Revert o.a.t.u.compat.* and o.a.t.u.depend.* to using System.err instead of c-l, since they are loaded in the System ClassLoader when running from the scripts. 3) Re-implement the required methods from o.a.t.u.compat.* in o.a.t.startup.Main so that we can leave o.a.t.u.depend.* and o.a.t.u.compat.* out of the jar. My personal choices are in order, 3-1-2. However 1 is the easiest, and seems to be in the direction that the proposals are heading. Opinions (Larry/Costin)? -- To unsubscribe, e-mail: mailto:tomcat-dev- [EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat/src/shell tomcat.bat tomcat.sh
- Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Wednesday, September 18, 2002 9:21 PM Subject: cvs commit: jakarta-tomcat/src/shell tomcat.bat tomcat.sh billbarker2002/09/18 21:21:17 Modified:src/shell tomcat.bat tomcat.sh Log: Temporary stop-gap until I work out all of the ClassLoader issues. Ok, there are a couple of options here: 1) Add a Class-Path to the Manifest (and make a comment in the release notes for people using Java 1.1.x). 2) Revert o.a.t.u.compat.* and o.a.t.u.depend.* to using System.err instead of c-l, since they are loaded in the System ClassLoader when running from the scripts. 3) Re-implement the required methods from o.a.t.u.compat.* in o.a.t.startup.Main so that we can leave o.a.t.u.depend.* and o.a.t.u.compat.* out of the jar. My personal choices are in order, 3-1-2. However 1 is the easiest, and seems to be in the direction that the proposals are heading. Opinions (Larry/Costin)? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/shell tomcat.bat tomcat.sh
billbarker2002/09/18 21:21:17
Modified:src/shell tomcat.bat tomcat.sh
Log:
Temporary stop-gap until I work out all of the ClassLoader issues.
Revision ChangesPath
1.47 +2 -2 jakarta-tomcat/src/shell/tomcat.bat
Index: tomcat.bat
===
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- tomcat.bat28 Mar 2002 02:29:00 - 1.46
+++ tomcat.bat19 Sep 2002 04:21:17 - 1.47
@@ -97,7 +97,7 @@
:setClasspath
-set CLASSPATH=%TOMCAT_INSTALL%\lib\tomcat.jar
+set
CLASSPATH=%TOMCAT_INSTALL%\lib\tomcat.jar;%TOMCAT_INSTALL%\lib\common\commons-logging.jar
rem - Execute The Requested Command -
1.34 +2 -2 jakarta-tomcat/src/shell/tomcat.sh
Index: tomcat.sh
===
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.sh,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- tomcat.sh 18 Apr 2002 13:58:01 - 1.33
+++ tomcat.sh 19 Sep 2002 04:21:17 - 1.34
@@ -117,7 +117,7 @@
oldCP=$CLASSPATH
unset CLASSPATH
-CLASSPATH=${TOMCAT_INSTALL}/lib/tomcat.jar
+CLASSPATH=${TOMCAT_INSTALL}/lib/tomcat.jar:${TOMCAT_INSTALL}/lib/common/commons-logging.jar
# Ignore previous CLASSPATH
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/shell tomcat.bat
larryi 01/10/21 10:34:12 Modified:src/shell tomcat.bat Log: Update to usage info. Revision ChangesPath 1.45 +13 -9 jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- tomcat.bat2001/09/09 22:00:45 1.44 +++ tomcat.bat2001/10/21 17:34:12 1.45 @@ -29,7 +29,7 @@ rem Tomcat, refer to the Tomcat Users Guide (tomcat_ug.html found rem in the doc directory. rem -rem $Id: tomcat.bat,v 1.44 2001/09/09 22:00:45 larryi Exp $ +rem $Id: tomcat.bat,v 1.45 2001/10/21 17:34:12 larryi Exp $ rem - @@ -115,14 +115,18 @@ echo Usage: tomcat ( enableAdmin | env | estart | jspc | run | start | stop ) echo Commands: echo enableAdmin - Trust the admin web application, -echo i.e. rewrites conf/apps-admin.xml with trusted=true -echo env - Set up environment variables that Tomcat would use -echo estart - Start Tomcat using the/your EmbeddedTomcat class which -echouses a hardcoded set of modules -echo jspc - Run JSPC in Tomcat's environment -echo run - Start Tomcat in the current window -echo start - Start Tomcat in a separate window -echo stop - Stop Tomcat +echo i.e. rewrites conf/apps-admin.xml with trusted=true +echo env - Set up environment variables that Tomcat would use +echo estart - Start Tomcat using the/your EmbeddedTomcat class which +echo uses a hardcoded set of modules +echo jspc- Run JSPC in Tomcat's environment +echo run - Start Tomcat in the current window +echo run -help - more options (usable with start as well): +echo (config, debug, estart, home, install, jkconf, sandbox) +echo start - Start Tomcat in a separate window +echo stop- Stop Tomcat +echo stop -help - more options: +echo (ajpid, host, home, pass, port) goto cleanup :startServer
cvs commit: jakarta-tomcat/src/shell tomcat.bat
larryi 01/09/09 15:00:45 Modified:src/shell tomcat.bat Log: Improve error message if /lib/tomcat.jar can't be found. Revision ChangesPath 1.44 +3 -2 jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- tomcat.bat2001/09/01 21:02:03 1.43 +++ tomcat.bat2001/09/09 22:00:45 1.44 @@ -29,7 +29,7 @@ rem Tomcat, refer to the Tomcat Users Guide (tomcat_ug.html found rem in the doc directory. rem -rem $Id: tomcat.bat,v 1.43 2001/09/01 21:02:03 larryi Exp $ +rem $Id: tomcat.bat,v 1.44 2001/09/09 22:00:45 larryi Exp $ rem - @@ -77,7 +77,8 @@ :gotTcInstall if exist %TOMCAT_INSTALL%\lib\tomcat.jar goto okTcInstall echo %TOMCAT_INSTALL%\lib\tomcat.jar not found. -echo Unable to locate lib\tomcat.jar, check the value of TOMCAT_INSTALL. +echo Unable to locate lib\tomcat.jar, check the value of TOMCAT_HOME and/or +echo TOMCAT_INSTALL. goto cleanup :okTcInstall
cvs commit: jakarta-tomcat/src/shell tomcat.bat
larryi 01/09/01 08:28:11 Modified:src/shell tomcat.bat Log: Add quotes around TOMCAT_HOME Revision ChangesPath 1.42 +9 -9 jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- tomcat.bat2001/08/31 03:54:50 1.41 +++ tomcat.bat2001/09/01 15:28:11 1.42 @@ -29,7 +29,7 @@ rem Tomcat, refer to the Tomcat Users Guide (tomcat_ug.html found rem in the doc directory. rem -rem $Id: tomcat.bat,v 1.41 2001/08/31 03:54:50 larryi Exp $ +rem $Id: tomcat.bat,v 1.42 2001/09/01 15:28:11 larryi Exp $ rem - @@ -125,12 +125,12 @@ if %2 == sandbox goto startSecure if %2 == -sandbox goto startSecure rem Note: Specify tomcat.policy in case -sandbox isn't the second argument -%_STARTJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9 +%_STARTJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :startSecure echo Starting Tomcat with a SecurityManager -%_SECSTARTJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9 +%_SECSTARTJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :runServer @@ -138,31 +138,31 @@ if %2 == enableAdmin goto oldEnbAdmin if %2 == -enableAdmin goto oldEnbAdmin rem Running Tomcat in this window -%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :enableAdmin rem Run enableAdmin -%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% enableAdmin %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% enableAdmin %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :oldEnbAdmin rem Run enableAdmin -%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% enableAdmin %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% enableAdmin %3 %4 %5 %6 %7 %8 %9 goto cleanup :estart -%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% estart %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% estart %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :stopServer rem Stopping the Tomcat Server -%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% stop %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% stop %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :runJspc rem Run JSPC in Tomcat's Environment -%_RUNJAVA% %JSPC_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% jspc %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %JSPC_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% jspc %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup rem - Set CLASSPATH to Tomcat's Runtime Environment ---
cvs commit: jakarta-tomcat/src/shell tomcat.bat
larryi 01/09/01 14:02:03 Modified:src/shell tomcat.bat Log: Need to try .. too when guessing TOMCAT_HOME and TOMCAT_INSTALL. Reported by: Ignacio J. Ortega Revision ChangesPath 1.43 +5 -1 jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- tomcat.bat2001/09/01 15:28:11 1.42 +++ tomcat.bat2001/09/01 21:02:03 1.43 @@ -29,7 +29,7 @@ rem Tomcat, refer to the Tomcat Users Guide (tomcat_ug.html found rem in the doc directory. rem -rem $Id: tomcat.bat,v 1.42 2001/09/01 15:28:11 larryi Exp $ +rem $Id: tomcat.bat,v 1.43 2001/09/01 21:02:03 larryi Exp $ rem - @@ -59,6 +59,8 @@ if not %TOMCAT_HOME% == goto gotTcHome set TOMCAT_HOME=. +if exist %TOMCAT_HOME%\conf\%_NULL% goto okTcHome +set TOMCAT_HOME=.. :gotTcHome if exist %TOMCAT_HOME%\conf\%_NULL% goto okTcHome echo %TOMCAT_HOME%\conf not found. @@ -68,6 +70,8 @@ if not %TOMCAT_INSTALL% == goto gotTcInstall set TOMCAT_INSTALL=. +if exist %TOMCAT_INSTALL%\lib\tomcat.jar goto okTcInstall +set TOMCAT_INSTALL=.. if exist %TOMCAT_INSTALL%\lib\tomcat.jar goto okTcInstall set TOMCAT_INSTALL=%TOMCAT_HOME% :gotTcInstall
cvs commit: jakarta-tomcat/src/shell tomcat.bat
larryi 01/08/30 04:42:55 Modified:src/shell tomcat.bat Log: Fix jspc option to include setting environment. Always clean up internal environment variables. Revision ChangesPath 1.39 +15 -14jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- tomcat.bat2001/08/24 03:16:53 1.38 +++ tomcat.bat2001/08/30 11:42:55 1.39 @@ -29,7 +29,7 @@ rem Tomcat, refer to the Tomcat Users Guide (tomcat_ug.html found rem in the doc directory. rem -rem $Id: tomcat.bat,v 1.38 2001/08/24 03:16:53 larryi Exp $ +rem $Id: tomcat.bat,v 1.39 2001/08/30 11:42:55 larryi Exp $ rem - @@ -102,7 +102,7 @@ if %1 == stop goto stopServer if %1 == run goto runServer if %1 == env goto doEnv -if %1 == jspc goto runJspc +if %1 == jspc goto doEnv if %1 == enableAdmin goto enableAdmin if %1 == estart goto estart @@ -164,11 +164,6 @@ %_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% stop %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup -:runJspc -rem Run JSPC in Tomcat's Environment -%_RUNJAVA% %JSPC_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% jspc %2 %3 %4 %5 %6 %7 %8 %9 -goto cleanup - rem - Set CLASSPATH to Tomcat's Runtime Environment --- :doEnv @@ -195,6 +190,7 @@ echo Setting your CLASSPATH to Tomcat's runtime set of jars. rem Note: _LIBJARS already contains a leading semicolon set CLASSPATH=%CLASSPATH%%_LIBJARS% +if %1 == jspc goto runJspc goto finish :staticClasspath @@ -217,19 +213,17 @@ if exist %TOMCAT_HOME%\lib\common\servlet.jar set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%\lib\common\servlet.jar if exist %TOMCAT_HOME%\lib\common\tomcat_core.jar set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%\lib\common\tomcat_core.jar +if %1 == jspc goto runJspc goto finish +:runJspc +rem Run JSPC in Tomcat's Environment +%_RUNJAVA% %JSPC_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% jspc %2 %3 %4 %5 %6 %7 %8 %9 + rem - Restore Environment Variables --- :cleanup -set _LIBJARS= -set _SECSTARTJAVA= -set _STARTJAVA= -set _RUNJAVA= -SET _MAIN= -SET _CONTAINER= -Set _NULL= set CLASSPATH=%_CLASSPATH% set _CLASSPATH= set TOMCAT_HOME=%_TOMCAT_HOME% @@ -237,3 +231,10 @@ set TOMCAT_INSTALL=%_TOMCAT_INSTALL% set _TOMCAT_INSTALL= :finish +set _LIBJARS= +set _SECSTARTJAVA= +set _STARTJAVA= +set _RUNJAVA= +set _MAIN= +set _CONTAINER= +Set _NULL=
cvs commit: jakarta-tomcat/src/shell tomcat.bat
larryi 01/08/30 08:15:15 Modified:src/shell tomcat.bat Log: Back out change for jspc. Problem was in Jspc.java, not in needing the environment set. Revision ChangesPath 1.40 +7 -8 jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- tomcat.bat2001/08/30 11:42:55 1.39 +++ tomcat.bat2001/08/30 15:15:15 1.40 @@ -29,7 +29,7 @@ rem Tomcat, refer to the Tomcat Users Guide (tomcat_ug.html found rem in the doc directory. rem -rem $Id: tomcat.bat,v 1.39 2001/08/30 11:42:55 larryi Exp $ +rem $Id: tomcat.bat,v 1.40 2001/08/30 15:15:15 larryi Exp $ rem - @@ -102,7 +102,7 @@ if %1 == stop goto stopServer if %1 == run goto runServer if %1 == env goto doEnv -if %1 == jspc goto doEnv +if %1 == jspc goto runJspc if %1 == enableAdmin goto enableAdmin if %1 == estart goto estart @@ -164,6 +164,11 @@ %_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% stop %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup +:runJspc +rem Run JSPC in Tomcat's Environment +%_RUNJAVA% %JSPC_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% jspc %2 %3 %4 %5 %6 %7 %8 %9 +goto cleanup + rem - Set CLASSPATH to Tomcat's Runtime Environment --- :doEnv @@ -190,7 +195,6 @@ echo Setting your CLASSPATH to Tomcat's runtime set of jars. rem Note: _LIBJARS already contains a leading semicolon set CLASSPATH=%CLASSPATH%%_LIBJARS% -if %1 == jspc goto runJspc goto finish :staticClasspath @@ -213,12 +217,7 @@ if exist %TOMCAT_HOME%\lib\common\servlet.jar set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%\lib\common\servlet.jar if exist %TOMCAT_HOME%\lib\common\tomcat_core.jar set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%\lib\common\tomcat_core.jar -if %1 == jspc goto runJspc goto finish - -:runJspc -rem Run JSPC in Tomcat's Environment -%_RUNJAVA% %JSPC_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% jspc %2 %3 %4 %5 %6 %7 %8 %9 rem - Restore Environment Variables ---
cvs commit: jakarta-tomcat/src/shell tomcat.bat
larryi 01/08/30 20:54:50 Modified:src/shell tomcat.bat Log: Fix Usagedisplay for Win9x. Remove -security option in favor of using sandbox. For start and run, always set java.security.policy so sandbox can be any argument. This make it consistent with tomcat.sh. If the second argument after start is sandbox or -sandbox', still display a message and set a title if NT or W2k. Revision ChangesPath 1.41 +8 -12 jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- tomcat.bat2001/08/30 15:15:15 1.40 +++ tomcat.bat2001/08/31 03:54:50 1.41 @@ -29,7 +29,7 @@ rem Tomcat, refer to the Tomcat Users Guide (tomcat_ug.html found rem in the doc directory. rem -rem $Id: tomcat.bat,v 1.40 2001/08/30 15:15:15 larryi Exp $ +rem $Id: tomcat.bat,v 1.41 2001/08/31 03:54:50 larryi Exp $ rem - @@ -107,7 +107,7 @@ if %1 == estart goto estart :doUsage -echo Usage: tomcat ( env ^| jspc ^| run ^| start ^| stop ) +echo Usage: tomcat ( enableAdmin | env | estart | jspc | run | start | stop ) echo Commands: echo enableAdmin - Trust the admin web application, echo i.e. rewrites conf/apps-admin.xml with trusted=true @@ -122,13 +122,15 @@ :startServer echo Starting Tomcat in new window -if %2 == -security goto startSecure -%_STARTJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9 +if %2 == sandbox goto startSecure +if %2 == -sandbox goto startSecure +rem Note: Specify tomcat.policy in case -sandbox isn't the second argument +%_STARTJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :startSecure echo Starting Tomcat with a SecurityManager -%_SECSTARTJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start -sandbox %3 %4 %5 %6 %7 %8 %9 +%_SECSTARTJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :runServer @@ -136,13 +138,7 @@ if %2 == enableAdmin goto oldEnbAdmin if %2 == -enableAdmin goto oldEnbAdmin rem Running Tomcat in this window -if %2 == -security goto runSecure -%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9 -goto cleanup - -:runSecure -rem Running Tomcat with a SecurityManager -%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start -sandbox %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :enableAdmin
cvs commit: jakarta-tomcat/src/shell tomcat.bat
larryi 01/08/23 20:16:54 Modified:src/shell tomcat.bat Log: Add enableAdmin and estart commands with legacy enableAdmin. Added _MAIN environment variable to specify startup class like what is done in tomcat.sh. Some miscellaneous cleanup. Revision ChangesPath 1.38 +35 -8 jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- tomcat.bat2001/08/21 05:52:12 1.37 +++ tomcat.bat2001/08/24 03:16:53 1.38 @@ -29,7 +29,7 @@ rem Tomcat, refer to the Tomcat Users Guide (tomcat_ug.html found rem in the doc directory. rem -rem $Id: tomcat.bat,v 1.37 2001/08/21 05:52:12 costin Exp $ +rem $Id: tomcat.bat,v 1.38 2001/08/24 03:16:53 larryi Exp $ rem - @@ -47,6 +47,8 @@ set _NULL= set _CONTAINER=container :cont +rem main startup class +set _MAIN=org.apache.tomcat.startup.Main rem - Verify and Set Required Environment Variables - @@ -101,11 +103,17 @@ if %1 == run goto runServer if %1 == env goto doEnv if %1 == jspc goto runJspc +if %1 == enableAdmin goto enableAdmin +if %1 == estart goto estart :doUsage echo Usage: tomcat ( env ^| jspc ^| run ^| start ^| stop ) echo Commands: +echo enableAdmin - Trust the admin web application, +echo i.e. rewrites conf/apps-admin.xml with trusted=true echo env - Set up environment variables that Tomcat would use +echo estart - Start Tomcat using the/your EmbeddedTomcat class which +echouses a hardcoded set of modules echo jspc - Run JSPC in Tomcat's environment echo run - Start Tomcat in the current window echo start - Start Tomcat in a separate window @@ -115,33 +123,50 @@ :startServer echo Starting Tomcat in new window if %2 == -security goto startSecure -%_STARTJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main start %2 %3 %4 %5 %6 %7 %8 %9 +%_STARTJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :startSecure echo Starting Tomcat with a SecurityManager -%_SECSTARTJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main start -sandbox %3 %4 %5 %6 %7 %8 %9 +%_SECSTARTJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start -sandbox %3 %4 %5 %6 %7 %8 %9 goto cleanup :runServer +rem Backwards compatibility for enableAdmin +if %2 == enableAdmin goto oldEnbAdmin +if %2 == -enableAdmin goto oldEnbAdmin rem Running Tomcat in this window if %2 == -security goto runSecure -%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main start %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :runSecure rem Running Tomcat with a SecurityManager -%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main start -sandbox %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% %_MAIN% start -sandbox %3 %4 %5 %6 %7 %8 %9 goto cleanup +:enableAdmin +rem Run enableAdmin +%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% enableAdmin %2 %3 %4 %5 %6 %7 %8 %9 +goto cleanup + +:oldEnbAdmin +rem Run enableAdmin +%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% enableAdmin %3 %4 %5 %6 %7 %8 %9 +goto cleanup + +:estart +%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% estart %2 %3 %4 %5 %6 %7 %8 %9 +goto cleanup + :stopServer rem Stopping the Tomcat Server -%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main stop %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% stop %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :runJspc rem Run JSPC in Tomcat's Environment -%_RUNJAVA% %JSPC_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main jspc %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %JSPC_OPTS% -Dtomcat.home=%TOMCAT_HOME% %_MAIN% jspc %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup rem - Set CLASSPATH to Tomcat's Runtime Environment --- @@ -198,11 +223,13 @@ rem - Restore Environment Variables --- :cleanup -set TEST_JAR= set _LIBJARS= set _SECSTARTJAVA= set _STARTJAVA= set _RUNJAVA=
cvs commit: jakarta-tomcat/src/shell tomcat.bat
costin 01/08/20 22:52:12 Modified:src/shell tomcat.bat Log: Update for the new Main.java. Also removed tomcat ant option, ant is no longer bundled ( it was there in 3.0 because we didn't had a separate release, if I remember corectly ). For sandbox use, don't specify -Djava.security.manager - PolicyLoader will set one based on user options. Revision ChangesPath 1.37 +8 -16 jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- tomcat.bat2001/08/19 22:52:51 1.36 +++ tomcat.bat2001/08/21 05:52:12 1.37 @@ -29,7 +29,7 @@ rem Tomcat, refer to the Tomcat Users Guide (tomcat_ug.html found rem in the doc directory. rem -rem $Id: tomcat.bat,v 1.36 2001/08/19 22:52:51 larryi Exp $ +rem $Id: tomcat.bat,v 1.37 2001/08/21 05:52:12 costin Exp $ rem - @@ -99,14 +99,12 @@ if %1 == start goto startServer if %1 == stop goto stopServer if %1 == run goto runServer -if %1 == ant goto runAnt if %1 == env goto doEnv if %1 == jspc goto runJspc :doUsage -echo Usage: tomcat ( ant ^| env ^| jspc ^| run ^| start ^| stop ) +echo Usage: tomcat ( env ^| jspc ^| run ^| start ^| stop ) echo Commands: -echo ant - Run Ant in Tomcat's environment echo env - Set up environment variables that Tomcat would use echo jspc - Run JSPC in Tomcat's environment echo run - Start Tomcat in the current window @@ -117,39 +115,33 @@ :startServer echo Starting Tomcat in new window if %2 == -security goto startSecure -%_STARTJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main %2 %3 %4 %5 %6 %7 %8 %9 +%_STARTJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main start %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :startSecure echo Starting Tomcat with a SecurityManager -%_SECSTARTJAVA% %TOMCAT_OPTS% -Djava.security.manager -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main %3 %4 %5 %6 %7 %8 %9 +%_SECSTARTJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main start -sandbox %3 %4 %5 %6 %7 %8 %9 goto cleanup :runServer rem Running Tomcat in this window if %2 == -security goto runSecure -%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main start %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :runSecure rem Running Tomcat with a SecurityManager -%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.manager -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main start -sandbox %3 %4 %5 %6 %7 %8 %9 goto cleanup :stopServer rem Stopping the Tomcat Server -%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main -stop %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main stop %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup -:runAnt -rem Run ANT in Tomcat's Environment -set CP=%CP%;%TOMCAT_HOME%\lib\ant.jar -%_RUNJAVA% %ANT_OPTS% -Dant.home=%TOMCAT_HOME% -Dtomcat.home=%TOMCAT_HOME% org.apache.tools.ant.Main %2 %3 %4 %5 %6 %7 %8 %9 -goto cleanup - :runJspc rem Run JSPC in Tomcat's Environment -%_RUNJAVA% %JSPC_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.jasper.JspC %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %JSPC_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main jspc %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup rem - Set CLASSPATH to Tomcat's Runtime Environment ---
cvs commit: jakarta-tomcat/src/shell tomcat.bat
larryi 01/08/19 15:52:51 Modified:src/shell tomcat.bat Log: Added a TOMCAT_INSTALL environment variable to allow Tomcat to be started with conf and lib in separate locations. Updated to make env option function properly. Revision ChangesPath 1.36 +99 -29jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- tomcat.bat2001/07/17 03:46:05 1.35 +++ tomcat.bat2001/08/19 22:52:51 1.36 @@ -4,37 +4,49 @@ rem rem Environment Variable Prerequisites: rem -rem TOMCAT_HOME (Optional) May point at your Tomcat distribution -remdirectory. If not present, the current working -remdirectory is assumed. -remNote: This batch file does not function properly -remif TOMCAT_HOME contains spaces. +rem JAVA_HOME Must point at your Java Development Kit installation. rem -rem TOMCAT_OPTS (Optional) Java runtime options used when the start, -remstop, or run command is executed +rem TOMCAT_HOME(Optional) Should point to the directory containing +rem Tomcat's conf and webapps directory. +rem If not present, the current working directory is +rem assumed. +rem Note: This batch file does not function properly +rem if TOMCAT_HOME contains spaces. rem -rem CLASSPATH(Optional) This batch file will automatically add -remwhat Tomcat needs to the CLASSPATH. This consists -remof TOMCAT_HOME\classes and all the jar files in -remTOMCAT_HOME\lib. This will include the jaxp.jar -remand parser.jar files from the JAXP Reference -remimplementation, and the tools.jar from the JDK. +rem TOMCAT_INSTALL (Optional) Should point to the directory containing +rem Tomcat's lib directory. +rem If not present, the current working directory is +rem assumed. If this doesn't contain a lib directory, +rem or if the lib directory doesn't contain tomcat.jar. +rem TOMCAT_HOME is used. rem -rem JAVA_HOMEMust point at your Java Development Kit installation. +rem TOMCAT_OPTS(Optional) Java runtime options used when the start, +rem stop, or run command is executed rem -rem $Id: tomcat.bat,v 1.35 2001/07/17 03:46:05 costin Exp $ +rem NOTE: Tomcat does not use your system's CLASSPATH setting. Instead +rem Tomcat starts using only tomcat.jar on the classpath and builds +rem its classpath internally. To add your classes to those of +rem Tomcat, refer to the Tomcat Users Guide (tomcat_ug.html found +rem in the doc directory. +rem +rem $Id: tomcat.bat,v 1.36 2001/08/19 22:52:51 larryi Exp $ rem - rem - Save Environment Variables That May Change -set _CP=%CP% set _TOMCAT_HOME=%TOMCAT_HOME% +set _TOMCAT_INSTALL=%TOMCAT_INSTALL% set _CLASSPATH=%CLASSPATH% rem - Internal Environment Vars used somewhere -- -set TEST_JAR=lib\tomcat.jar +set _NULL=nul +set _CONTAINER=contai~1 +if not %OS% == Windows_NT goto cont +set _NULL= +set _CONTAINER=container +:cont rem - Verify and Set Required Environment Variables - @@ -43,14 +55,25 @@ goto cleanup :gotJavaHome -if not %TOMCAT_HOME% == goto gotTomcatHome +if not %TOMCAT_HOME% == goto gotTcHome set TOMCAT_HOME=. -:gotTomcatHome -if exist %TOMCAT_HOME%\%TEST_JAR% goto okTomcatHome -echo Unable to locate %TEST_JAR%, check the value of TOMCAT_HOME. +:gotTcHome +if exist %TOMCAT_HOME%\conf\%_NULL% goto okTcHome +echo %TOMCAT_HOME%\conf not found. +echo Unable to locate Tomcat's conf directory, check the value of TOMCAT_HOME. +goto cleanup +:okTcHome + +if not %TOMCAT_INSTALL% == goto gotTcInstall +set TOMCAT_INSTALL=. +if exist %TOMCAT_INSTALL%\lib\tomcat.jar goto okTcInstall +set TOMCAT_INSTALL=%TOMCAT_HOME% +:gotTcInstall +if exist %TOMCAT_INSTALL%\lib\tomcat.jar goto okTcInstall +echo %TOMCAT_INSTALL%\lib\tomcat.jar not found. +echo Unable to locate lib\tomcat.jar, check the value of TOMCAT_INSTALL. goto cleanup -:okTomcatHome - +:okTcInstall rem - Prepare Appropriate Java Execution Commands --- @@ -67,7 +90,7 @@ :setClasspath -set CLASSPATH=%TOMCAT_HOME%\lib\tomcat.jar +set CLASSPATH=%TOMCAT_INSTALL%\lib\tomcat.jar
cvs commit: jakarta-tomcat/src/shell tomcat.bat
costin 01/07/16 20:46:05 Modified:src/shell tomcat.bat Log: Fix for #2192, thanks [EMAIL PROTECTED] (Stephen Brown) for finding it and providing the patch. Submitted by: [EMAIL PROTECTED] (Stephen Brown) Revision ChangesPath 1.35 +8 -8 jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- tomcat.bat2001/02/06 17:58:21 1.34 +++ tomcat.bat2001/07/17 03:46:05 1.35 @@ -22,7 +22,7 @@ rem rem JAVA_HOMEMust point at your Java Development Kit installation. rem -rem $Id: tomcat.bat,v 1.34 2001/02/06 17:58:21 nacho Exp $ +rem $Id: tomcat.bat,v 1.35 2001/07/17 03:46:05 costin Exp $ rem - @@ -97,39 +97,39 @@ :startServer echo Starting Tomcat in new window if %2 == -security goto startSecure -%_STARTJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main %2 %3 %4 %5 %6 %7 %8 %9 +%_STARTJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :startSecure echo Starting Tomcat with a SecurityManager -%_SECSTARTJAVA% %TOMCAT_OPTS% -Djava.security.manager -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main %3 %4 %5 %6 %7 %8 %9 +%_SECSTARTJAVA% %TOMCAT_OPTS% -Djava.security.manager -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main %3 %4 %5 %6 %7 %8 %9 goto cleanup :runServer rem Running Tomcat in this window if %2 == -security goto runSecure -%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :runSecure rem Running Tomcat with a SecurityManager -%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.manager -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.manager -Djava.security.policy==%TOMCAT_HOME%/conf/tomcat.policy -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main %3 %4 %5 %6 %7 %8 %9 goto cleanup :stopServer rem Stopping the Tomcat Server -%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main -stop %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main -stop %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :runAnt rem Run ANT in Tomcat's Environment set CP=%CP%;%TOMCAT_HOME%\lib\ant.jar -%_RUNJAVA% %ANT_OPTS% -Dant.home=%TOMCAT_HOME% -Dtomcat.home=%TOMCAT_HOME% org.apache.tools.ant.Main %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %ANT_OPTS% -Dant.home=%TOMCAT_HOME% -Dtomcat.home=%TOMCAT_HOME% org.apache.tools.ant.Main %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :runJspc rem Run JSPC in Tomcat's Environment -%_RUNJAVA% %JSPC_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.jasper.JspC %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %JSPC_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.jasper.JspC %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup
cvs commit: jakarta-tomcat/src/shell tomcat.bat
marcsaeg01/06/24 12:27:16 Modified:src/shell Tag: tomcat_32 tomcat.bat Log: Making tomcat.bat consistent with tomcat.sh in how files are added to the classpath. Tomcat.bat only added jar files while tomcat.sh added all files in tomcat/lib. This made it more difficult for users to have .zip file automatically added to Tomcat's classpath. PR: 1935 Submitted by: [EMAIL PROTECTED] (Jonathan Pierce) Revision ChangesPath No revision No revision 1.24.2.7 +2 -2 jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.24.2.6 retrieving revision 1.24.2.7 diff -u -r1.24.2.6 -r1.24.2.7 --- tomcat.bat2001/01/11 19:12:45 1.24.2.6 +++ tomcat.bat2001/06/24 19:27:10 1.24.2.7 @@ -22,7 +22,7 @@ rem rem JAVA_HOMEMust point at your Java Development Kit installation. rem -rem $Id: tomcat.bat,v 1.24.2.6 2001/01/11 19:12:45 larryi Exp $ +rem $Id: tomcat.bat,v 1.24.2.7 2001/06/24 19:27:10 marcsaeg Exp $ rem - @@ -76,7 +76,7 @@ :dynClasspath set _LIBJARS= -for %%i in (%TOMCAT_HOME%\lib\*.jar) do call %TOMCAT_HOME%\bin\cpappend.bat %%i +for %%i in (%TOMCAT_HOME%\lib\*.*) do call %TOMCAT_HOME%\bin\cpappend.bat %%i if not %_LIBJARS% == goto gotLibJars echo Unable to set CLASSPATH dynamically. if %OS% == Windows_NT goto staticClasspath
cvs commit: jakarta-tomcat/src/shell tomcat.bat
nacho 01/02/06 09:58:22 Modified:src/shell tomcat.bat Log: Default startup shell for windows, starts tomcat with new bootstrap Revision ChangesPath 1.34 +11 -61jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- tomcat.bat2001/01/11 19:13:18 1.33 +++ tomcat.bat2001/02/06 17:58:21 1.34 @@ -22,7 +22,7 @@ rem rem JAVA_HOMEMust point at your Java Development Kit installation. rem -rem $Id: tomcat.bat,v 1.33 2001/01/11 19:13:18 larryi Exp $ +rem $Id: tomcat.bat,v 1.34 2001/02/06 17:58:21 nacho Exp $ rem - @@ -34,7 +34,7 @@ rem - Internal Environment Vars used somewhere -- -set TEST_JAR=tomcat.jar +set TEST_JAR=lib\tomcat.jar rem - Verify and Set Required Environment Variables - @@ -46,7 +46,7 @@ if not "%TOMCAT_HOME%" == "" goto gotTomcatHome set TOMCAT_HOME=. :gotTomcatHome -if exist "%TOMCAT_HOME%\lib\%TEST_JAR%" goto okTomcatHome +if exist "%TOMCAT_HOME%\%TEST_JAR%" goto okTomcatHome echo Unable to locate %TEST_JAR%, check the value of TOMCAT_HOME. goto cleanup :okTomcatHome @@ -65,64 +65,14 @@ set _STARTJAVA=start "%JAVA_HOME%\bin\java" set _RUNJAVA="%JAVA_HOME%\bin\java" - -rem - Set Up The Runtime Classpath -- - :setClasspath -set CP=%TOMCAT_HOME%\classes -rem Try to determine if TOMCAT_HOME contains spaces -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 - -:dynClasspath -set _LIBJARS= -for %%i in (%TOMCAT_HOME%\lib\*.jar) do call %TOMCAT_HOME%\bin\cpappend.bat %%i -if not "%_LIBJARS%" == "" goto gotLibJars -echo Unable to set CLASSPATH dynamically. -if "%OS%" == "Windows_NT" goto staticClasspath -echo Note: To set the CLASSPATH dynamically on Win9x systems -echo only DOS 8.3 names may be used in TOMCAT_HOME! -goto staticClasspath - -:gotLibJars -echo Including all jars in %TOMCAT_HOME%\lib in your CLASSPATH. -rem Note: _LIBJARS already contains a leading semicolon -set CP=%CP%%_LIBJARS% -goto chkClasspath - -:staticClasspath -echo Setting your CLASSPATH statically. -set CP=%CP%;%TOMCAT_HOME%\lib\ant.jar -set CP=%CP%;%TOMCAT_HOME%\lib\jasper.jar -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\tomcat.jar -set CP=%CP%;%TOMCAT_HOME%\lib\tomcat_core.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\tomcat-startup.jar -set CP=%CP%;%TOMCAT_HOME%\lib\stop-tomcat.jar -set CP=%CP%;%TOMCAT_HOME%\lib\facade22.jar - -:chkClasspath -if "%CLASSPATH%" == "" goto noClasspath -set CP=%CP%;%CLASSPATH% -:noClasspath -if not exist "%JAVA_HOME%\lib\tools.jar" goto installClasspath -set CP=%CP%;%JAVA_HOME%\lib\tools.jar -:installClasspath -echo. -echo Using CLASSPATH: %CP% -echo. -set CLASSPATH=%CP% +set CLASSPATH=%TOMCAT_HOME%\lib\tomcat.jar - rem - Execute The Requested Command - +:execute + if "%1" == "start" goto startServer if "%1" == "stop" goto stopServer if "%1" == "run" goto runServer @@ -147,28 +97,28 @@ :startServer echo Starting Tomcat in new window if "%2" == "-security" goto startSecure -%_STARTJAVA% %TOMCAT_OPTS% -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %2 %3 %4 %5 %6 %7 %8 %9 +%_STARTJAVA% %TOMCAT_OPTS% -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Main %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :startSecure echo Starting Tomcat with a SecurityManager -%_SECSTARTJAVA% %TOMCAT_OPTS% -Djava.security.manager -Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %3 %4 %5 %6 %7 %8 %9 +%_SECSTARTJAVA% %TOMCAT_OPTS% -Djava.security.manager -Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Main %3 %4 %5 %6 %7 %8 %9 goto cleanup :runServer rem Running Tomcat in this window if "%2" == "-security" goto runSecure -%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %2 %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Main %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :runSecure rem Running
cvs commit: jakarta-tomcat/src/shell tomcat.bat
larryi 01/01/11 11:12:48 Modified:src/shell Tag: tomcat_32 tomcat.bat Log: Undo prior "fix" per Craig's note below: The double equals sign (==) tells the default security policy reader that the specified policy file completely *replaces* the standard one (which is what we want here, same as in Tomcat 3.2). Otherwise, the specified policy file is merely *appended* to the standard one. Revision ChangesPath No revision No revision 1.24.2.6 +2 -2 jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.24.2.5 retrieving revision 1.24.2.6 diff -u -r1.24.2.5 -r1.24.2.6 --- tomcat.bat2001/01/08 12:10:29 1.24.2.5 +++ tomcat.bat2001/01/11 19:12:45 1.24.2.6 @@ -22,7 +22,7 @@ rem rem JAVA_HOMEMust point at your Java Development Kit installation. rem -rem $Id: tomcat.bat,v 1.24.2.5 2001/01/08 12:10:29 larryi Exp $ +rem $Id: tomcat.bat,v 1.24.2.6 2001/01/11 19:12:45 larryi Exp $ rem - @@ -154,7 +154,7 @@ :runSecure rem Running Tomcat with a SecurityManager -%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.manager -Djava.security.policy="%TOMCAT_HOME%/conf/tomcat.policy" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.manager -Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %3 %4 %5 %6 %7 %8 %9 goto cleanup :stopServer - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/shell tomcat.bat
larryi 01/01/11 11:13:21 Modified:src/shell tomcat.bat Log: Undo prior "fix" per Craig's note below: The double equals sign (==) tells the default security policy reader that the specified policy file completely *replaces* the standard one (which is what we want here, same as in Tomcat 3.2). Otherwise, the specified policy file is merely *appended* to the standard one. Revision ChangesPath 1.33 +2 -2 jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- tomcat.bat2001/01/08 12:11:46 1.32 +++ tomcat.bat2001/01/11 19:13:18 1.33 @@ -22,7 +22,7 @@ rem rem JAVA_HOMEMust point at your Java Development Kit installation. rem -rem $Id: tomcat.bat,v 1.32 2001/01/08 12:11:46 larryi Exp $ +rem $Id: tomcat.bat,v 1.33 2001/01/11 19:13:18 larryi Exp $ rem - @@ -152,7 +152,7 @@ :startSecure echo Starting Tomcat with a SecurityManager -%_SECSTARTJAVA% %TOMCAT_OPTS% -Djava.security.manager -Djava.security.policy="%TOMCAT_HOME%/conf/tomcat.policy" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %3 %4 %5 %6 %7 %8 %9 +%_SECSTARTJAVA% %TOMCAT_OPTS% -Djava.security.manager -Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %3 %4 %5 %6 %7 %8 %9 goto cleanup :runServer - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/shell tomcat.bat
larryi 01/01/08 04:10:31 Modified:src/shell Tag: tomcat_32 tomcat.bat Log: Fix setting of java.security.policy System property when using -security option to start Tomcat Revision ChangesPath No revision No revision 1.24.2.5 +2 -2 jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.24.2.4 retrieving revision 1.24.2.5 diff -u -r1.24.2.4 -r1.24.2.5 --- tomcat.bat2000/09/23 21:52:56 1.24.2.4 +++ tomcat.bat2001/01/08 12:10:29 1.24.2.5 @@ -22,7 +22,7 @@ rem rem JAVA_HOMEMust point at your Java Development Kit installation. rem -rem $Id: tomcat.bat,v 1.24.2.4 2000/09/23 21:52:56 larryi Exp $ +rem $Id: tomcat.bat,v 1.24.2.5 2001/01/08 12:10:29 larryi Exp $ rem - @@ -154,7 +154,7 @@ :runSecure rem Running Tomcat with a SecurityManager -%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.manager -Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %3 %4 %5 %6 %7 %8 %9 +%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.manager -Djava.security.policy="%TOMCAT_HOME%/conf/tomcat.policy" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %3 %4 %5 %6 %7 %8 %9 goto cleanup :stopServer - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
