From bab7433dc80d35178096c3d373ceabe91dc32f20 Mon Sep 17 00:00:00 2001 From: Igal Date: Fri, 21 Oct 2016 10:08:41 -0700 Subject: [PATCH] Allow to specify custom values for Service install Added possibility to specify `%JvmMs%`, `%JvmMx%`, `%SERVICE_STARTUP_MODE%`, and additional `%JvmArgs%` --- bin/service.bat | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bin/service.bat b/bin/service.bat index 4bbc6c3f89e7..6533f4052e77 100755 --- a/bin/service.bat +++ b/bin/service.bat @@ -142,6 +142,10 @@ echo Using JVM: "%JVM%" set "CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar;%CATALINA_BASE%\bin\tomcat-juli.jar" if not "%CATALINA_HOME%" == "%CATALINA_BASE%" set "CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\tomcat-juli.jar" +if "%SERVICE_STARTUP_MODE%" == "" set SERVICE_STARTUP_MODE=manual +if "%JvmMs%" == "" set JvmMs=128 +if "%JvmMx%" == "" set JvmMx=256 + "%EXECUTABLE%" //IS//%SERVICE_NAME% ^ --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/" ^ --DisplayName "%DISPLAYNAME%" ^ @@ -159,9 +163,11 @@ if not "%CATALINA_HOME%" == "%CATALINA_BASE%" set "CLASSPATH=%CLASSPATH%;%CATALI --StopClass org.apache.catalina.startup.Bootstrap ^ --StartParams start ^ --StopParams stop ^ - --JvmOptions "-Dcatalina.home=%CATALINA_HOME%;-Dcatalina.base=%CATALINA_BASE%;-Djava.io.tmpdir=%CATALINA_BASE%\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties" ^ - --JvmMs 128 ^ - --JvmMx 256 + --JvmOptions "-Dcatalina.home=%CATALINA_HOME%;-Dcatalina.base=%CATALINA_BASE%;-Djava.io.tmpdir=%CATALINA_BASE%\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties;%JvmArgs%" ^ + --Startup "%SERVICE_STARTUP_MODE%" ^ + --JvmMs "%JvmMs%" ^ + --JvmMx "%JvmMx%" + if not errorlevel 1 goto installed echo Failed installing '%SERVICE_NAME%' service goto end