Author: yoavs
Date: Thu Jun 15 11:56:42 2006
New Revision: 414655
URL: http://svn.apache.org/viewvc?rev=414655&view=rev
Log:
Bugzilla 39674: http://issues.apache.org/bugzilla/show_bug.cgi?id=39674
Modified:
tomcat/container/tc5.5.x/catalina/src/bin/service.bat
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified: tomcat/container/tc5.5.x/catalina/src/bin/service.bat
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/service.bat?rev=414655&r1=414654&r2=414655&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/service.bat (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/service.bat Thu Jun 15 11:56:42
2006
@@ -74,17 +74,22 @@
rem Use the environment variables as an example
rem Each command line option is prefixed with PR_
-set PR_DESCRIPTION=Apache Tomcat Server - http://jakarta.apache.org/tomcat
+set PR_DESCRIPTION=Apache Tomcat Server - http://tomcat.apache.org
set PR_INSTALL=%EXECUTABLE%
set PR_LOGPATH=%CATALINA_BASE%\logs
set PR_CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar
+
rem Set the server jvm from JAVA_HOME
set PR_JVM=%JAVA_HOME%\jre\bin\server\jvm.dll
if exist "%PR_JVM%" goto foundJvm
rem Set the client jvm from JAVA_HOME
set PR_JVM=%JAVA_HOME%\jre\bin\client\jvm.dll
if exist "%PR_JVM%" goto foundJvm
+rem Check for JRockit JVM: Bugzilla 39674
+set PR_JVM=%JAVA_HOME%\jre\bin\jrockit\jvm.dll
+if exist "%PR_JVM%" goto foundJvm
set PR_JVM=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
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=414655&r1=414654&r2=414655&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Jun 15 11:56:42 2006
@@ -40,6 +40,9 @@
<bug>39657</bug>: Warn (and don't load jar) if JSP API is in webapp
classloader repository, as suggested by
David Sanchez Crespillo. (yoavs)
</add>
+ <add>
+ <bug>39674</bug>: Support JRockit JVM in service.bat script, as
suggested by lizongbo. (yoavs)
+ </add>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
