Author: kkolinko
Date: Sun Apr 13 11:25:14 2014
New Revision: 1586962
URL: http://svn.apache.org/r1586962
Log:
Merged r1586961 from tomcat/trunk:
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/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/bin/service.bat
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1586961
Modified: tomcat/tc7.0.x/trunk/bin/service.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/service.bat?rev=1586962&r1=1586961&r2=1586962&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/service.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/service.bat Sun Apr 13 11:25:14 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/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1586962&r1=1586961&r2=1586962&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Apr 13 11:25:14 2014
@@ -158,6 +158,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <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 7.0.53 (violetagg)" rtext="released 2014-03-30">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
