Author: markt
Date: Fri Feb 7 19:59:08 2014
New Revision: 1565781
URL: http://svn.apache.org/r1565781
Log:
Fix a secondary issue identified in
https://issues.apache.org/bugzilla/show_bug.cgi?id=56079
Modified:
tomcat/trunk/bin/service.bat
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/bin/service.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/service.bat?rev=1565781&r1=1565780&r2=1565781&view=diff
==============================================================================
--- tomcat/trunk/bin/service.bat (original)
+++ tomcat/trunk/bin/service.bat Fri Feb 7 19:59:08 2014
@@ -137,9 +137,20 @@ rem Set the client jvm from JAVA_HOME
set "PR_JVM=%JRE_HOME%\bin\client\jvm.dll"
if exist "%PR_JVM%" goto foundJvm
set PR_JVM=auto
+set PR_STDOUTPUT=auto
+set PR_STDERROR=auto
:foundJvm
echo Using JVM: "%PR_JVM%"
-"%EXECUTABLE%" //IS//%SERVICE_NAME% --StartClass
org.apache.catalina.startup.Bootstrap --StopClass
org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
+"%EXECUTABLE%" //IS//%SERVICE_NAME% ^
+ --StartClass org.apache.catalina.startup.Bootstrap ^
+ --StopClass org.apache.catalina.startup.Bootstrap ^
+ --StartParams start ^
+ --StopParams stop ^
+ --JvmOptions
"-Dcatalina.base=%CATALINA_BASE%;-Dcatalina.home=%CATALINA_HOME%;-Djava.endorsed.dirs=%CATALINA_HOME%\endorsed;-Djava.io.tmpdir=%CATALINA_BASE%\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties"
^
+ --StartMode jvm ^
+ --StopMode jvm ^
+ --JvmMs 128 ^
+ --JvmMx 256
if not errorlevel 1 goto installed
echo Failed installing '%SERVICE_NAME%' service
goto end
@@ -151,13 +162,6 @@ 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%\endorsed"
--StartMode jvm --StopMode jvm
-rem More extra parameters
-set "PR_LOGPATH=%CATALINA_BASE%\logs"
-set PR_STDOUTPUT=auto
-set PR_STDERROR=auto
-"%EXECUTABLE%" //US//%SERVICE_NAME% ++JvmOptions
"-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
echo The service '%SERVICE_NAME%' has been installed.
:end
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1565781&r1=1565780&r2=1565781&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 7 19:59:08 2014
@@ -44,6 +44,19 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
+<section name="Tomcat 8.0.4 (markt)">
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ Use a single call to <code>tomcat8.exe</code> to install the Windows
+ service from <code>service.bat</code> rather than three calls. This is
+ preparatory work for fixing <bug>56079</bug> as each time
+ <code>tomcat8.exe</code> is called, a UAC dialog is displayed if UAC is
+ enabled. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
<section name="Tomcat 8.0.3 (markt)">
<subsection name="Other">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
