Author: kkolinko
Date: Sun Apr 13 11:20:23 2014
New Revision: 1586961
URL: http://svn.apache.org/r1586961
Log:
Align DisplayName of Tomcat service installed by service.bat with one installed
by the *.exe installer:
Use "X.0" version number in both instead of "X".
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=1586961&r1=1586960&r2=1586961&view=diff
==============================================================================
--- tomcat/trunk/bin/service.bat (original)
+++ tomcat/trunk/bin/service.bat Sun Apr 13 11:20:23 2014
@@ -75,7 +75,7 @@ set "EXECUTABLE=%CATALINA_HOME%\bin\tomc
rem Set default Service name
set SERVICE_NAME=Tomcat@VERSION_MAJOR@
-set DISPLAYNAME=Apache Tomcat @VERSION_MAJOR@ %SERVICE_NAME%
+set DISPLAYNAME=Apache Tomcat @VERSION_MAJOR_MINOR@ %SERVICE_NAME%
if "x%1x" == "xx" goto displayUsage
set SERVICE_CMD=%1
@@ -85,7 +85,7 @@ if "x%1x" == "xx" goto checkServiceCmd
if "x%1x" == "x/userx" goto runAsUser
if "x%1x" == "x--userx" goto runAsUser
set SERVICE_NAME=%1
-set DISPLAYNAME=Apache Tomcat @VERSION_MAJOR@ %1
+set DISPLAYNAME=Apache Tomcat @VERSION_MAJOR_MINOR@ %1
shift
if "x%1x" == "xx" goto checkServiceCmd
goto checkUser
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1586961&r1=1586960&r2=1586961&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Apr 13 11:20:23 2014
@@ -197,10 +197,16 @@
</changelog>
</subsection>
<subsection name="Other">
- <scode>
- Review source code and take advantage of Java 7's
- try-with-resources syntax where possible. (markt)
- </scode>
+ <changelog>
+ <scode>
+ Review source code and take advantage of Java 7's
+ try-with-resources syntax where possible. (markt)
+ </scode>
+ <fix>
+ Align DisplayName of Tomcat installed by <code>service.bat</code> with
+ one installed by the *.exe installer. (kkolinko)
+ </fix>
+ </changelog>
</subsection>
</section>
<section name="Tomcat 8.0.5 (markt)" rtext="beta, 2014-03-27">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
