Author: kkolinko
Date: Mon Apr 14 18:24:20 2014
New Revision: 1587273
URL: http://svn.apache.org/r1587273
Log:
Merged r1587272 from tomcat/trunk:
Print a warning in case if neither server nor client jvm is found by
service.bat.
Fix comments (addresses sebb's note in "Re: r1000718").
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:r1587272
Modified: tomcat/tc7.0.x/trunk/bin/service.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/service.bat?rev=1587273&r1=1587272&r2=1587273&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/service.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/service.bat Mon Apr 14 18:24:20 2014
@@ -128,12 +128,13 @@ echo Using CATALINA_BASE: "%CATALINA_
echo Using JAVA_HOME: "%JAVA_HOME%"
echo Using JRE_HOME: "%JRE_HOME%"
-rem Set the server jvm from JAVA_HOME
+rem Try to use the server jvm
set "JVM=%JRE_HOME%\bin\server\jvm.dll"
if exist "%JVM%" goto foundJvm
-rem Set the client jvm from JAVA_HOME
+rem Try to use the client jvm
set "JVM=%JRE_HOME%\bin\client\jvm.dll"
if exist "%JVM%" goto foundJvm
+echo Warning: Neither 'server' nor 'client' jvm.dll was found at JRE_HOME.
set JVM=auto
:foundJvm
echo Using JVM: "%JVM%"
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=1587273&r1=1587272&r2=1587273&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Apr 14 18:24:20 2014
@@ -162,7 +162,8 @@
<changelog>
<fix>
Align DisplayName of Tomcat installed by <code>service.bat</code> with
- one installed by the *.exe installer. (kkolinko)
+ one installed by the *.exe installer. Print a warning in case if
neither
+ server nor client jvm is found by <code>service.bat</code>. (kkolinko)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
