Author: kkolinko
Date: Sun Feb 16 15:34:06 2014
New Revision: 1568780
URL: http://svn.apache.org/r1568780
Log:
Avoid using the same path for "tomcat-juli.jar" twice when CATALINA_HOME and
CATALINA_BASE are the same.
Modified:
tomcat/trunk/bin/service.bat
Modified: tomcat/trunk/bin/service.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/service.bat?rev=1568780&r1=1568779&r2=1568780&view=diff
==============================================================================
--- tomcat/trunk/bin/service.bat (original)
+++ tomcat/trunk/bin/service.bat Sun Feb 16 15:34:06 2014
@@ -138,6 +138,9 @@ set JVM=auto
:foundJvm
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"
+
"%EXECUTABLE%" //IS//%SERVICE_NAME% ^
--Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/";
^
--DisplayName "%DISPLAYNAME%" ^
@@ -145,7 +148,7 @@ echo Using JVM: "%JVM%"
--LogPath "%CATALINA_BASE%\logs" ^
--StdOutput auto ^
--StdError auto ^
- --Classpath
"%CATALINA_HOME%\bin\bootstrap.jar;%CATALINA_BASE%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\tomcat-juli.jar"
^
+ --Classpath "%CLASSPATH%" ^
--Jvm "%JVM%" ^
--StartMode jvm ^
--StopMode jvm ^
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
