tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/bin service.bat
Date Mon, 23 Aug 2004 22:54:33 GMT
mturk       2004/08/23 15:54:33

  Modified:    catalina/src/bin Tag: TOMCAT_5_0 service.bat
  Log:
  Backport from HEAD
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.5.2.1   +20 -6     jakarta-tomcat-catalina/catalina/src/bin/service.bat
  
  Index: service.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/service.bat,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- service.bat	8 Apr 2004 16:49:37 -0000	1.5
  +++ service.bat	23 Aug 2004 22:54:32 -0000	1.5.2.1
  @@ -28,6 +28,11 @@
   echo The CATALINA_HOME environment variable is not defined correctly.
   echo This environment variable is needed to run this program
   goto end
  +rem Make sure prerequisite environment variables are set
  +if not "%JAVA_HOME%" == "" goto okHome
  +echo The JAVA_HOME environment variable is not defined
  +echo This environment variable is needed to run this program
  +goto end 
   :okHome
   if not "%CATALINA_BASE%" == "" goto gotBase
   set CATALINA_BASE=%CATALINA_HOME%
  @@ -37,10 +42,12 @@
   
   rem Set default Service name
   set SERVICE_NAME=Tomcat5
  +set PR_DISPLAYNAME=Apache Tomcat
   
   if "%1" == "" goto displayUsage
   if "%2" == "" goto setServiceName
   set SERVICE_NAME=%2
  +set PR_DISPLAYNAME=Apache Tomcat %2
   :setServiceName
   if %1 == install goto doInstall
   if %1 == remove goto doRemove
  @@ -58,28 +65,35 @@
   
   :doInstall
   rem Install the service
  +echo Installing the service '%SERVICE_NAME%' ...
  +echo Using CATALINA_HOME:    %CATALINA_HOME%
  +echo Using JAVA_HOME:        %JAVA_HOME%
  +
   rem Use the environment variables as an exaple
   rem Each command line option is prefixed with PR_
   
  -set PR_DISPLAYNAME=Apache Tomcat
   set PR_DESCRIPTION=Apache Tomcat Server - http://jakarta.apache.org/tomcat
   set PR_INSTALL=%EXECUTABLE%
   set PR_LOGPATH=%CATALINA_HOME%\logs
  -set PR_CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar
  -"%EXECUTABLE%" //IS//%SERVICE_NAME% --Jvm auto --StartClass org.apache.catalina.startup.Bootstrap
--StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
  +set PR_CLASSPATH=%JAVA_HOME%\lib\tools.jar;%CATALINA_HOME%\bin\bootstrap.jar
  +rem Set the server jvm frrom JAVA_HOME
  +set PR_JVM=%JAVA_HOME%\jre\bin\server\jvm.dll
  +rem You can use the 'set PR_JVM=auto' for default JVM
  +"%EXECUTABLE%" //IS//%SERVICE_NAME% --StartClass org.apache.catalina.startup.Bootstrap
--StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
   rem Clear the environment variables. They are not needed any more.
   set PR_DISPLAYNAME=
   set PR_DESCRIPTION=
   set PR_INSTALL=
   set PR_LOGPATH=
   set PR_CLASSPATH=
  +set PR_JVM=
   rem Set extra parameters
   "%EXECUTABLE%" //US//%SERVICE_NAME% --JvmOptions "-Dcatalina.base=%CATALINA_BASE%;-Dcatalina.home=%CATALINA_HOME%;-Djava.endorsed.dirs=%CATALINA_HOME%\common\endorsed"
--StartMode jvm --StopMode jvm
   rem More extra parameters
   set PR_STDOUTPUT=%CATALINA_HOME%\logs\stdout.log
   set PR_STDERROR=%CATALINA_HOME%\logs\stderr.log
  -"%EXECUTABLE%" //US//%SERVICE_NAME% ++JvmOptions "-Djava.io.tmpdir=%CATALINA_BASE%\temp"
  -echo The service '%SERVICE_NAME%' has been installed
  +"%EXECUTABLE%" //US//%SERVICE_NAME% ++JvmOptions "-Djava.io.tmpdir=%CATALINA_BASE%\temp"
--JvmMs 128 --JvmMx 256
  +echo The service '%SERVICE_NAME%' has been installed.
   
   :end
   cd %CURRENT_DIR%
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message