Author: keith
Date: Thu Dec 8 13:44:16 2005
New Revision: 355227
URL: http://svn.apache.org/viewcvs?rev=355227&view=rev
Log:
[32081] Remove the JDK requirement from the Win32 scripts.
Use JRE_HOME to point to a JRE.
Modified:
tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat
tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat?rev=355227&r1=355226&r2=355227&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat Thu Dec 8 13:44:16
2005
@@ -19,6 +19,10 @@
rem %CATALINA_BASE%\temp.
rem
rem JAVA_HOME Must point at your Java Development Kit installation.
+rem Required to run the with the "debug" argument.
+rem
+rem JRE_HOME Must point at your Java Development Kit installation.
+rem Defaults to JAVA_HOME if empty.
rem
rem JAVA_OPTS (Optional) Java runtime options used when the "start",
rem "stop", or "run" command is executed.
@@ -61,7 +65,8 @@
goto end
:okSetclasspath
set BASEDIR=%CATALINA_HOME%
-call "%CATALINA_HOME%\bin\setclasspath.bat"
+call "%CATALINA_HOME%\bin\setclasspath.bat" %1
+if errorlevel 1 goto end
rem Add on extra jar files to CLASSPATH
if "%JSSE_HOME%" == "" goto noJsse
@@ -86,7 +91,12 @@
echo Using CATALINA_BASE: %CATALINA_BASE%
echo Using CATALINA_HOME: %CATALINA_HOME%
echo Using CATALINA_TMPDIR: %CATALINA_TMPDIR%
+if ""%1"" == ""debug"" goto use_jdk
+echo Using JRE_HOME: %JRE_HOME%
+goto java_dir_displayed
+:use_jdk
echo Using JAVA_HOME: %JAVA_HOME%
+:java_dir_displayed
set _EXECJAVA=%_RUNJAVA%
set MAINCLASS=org.apache.catalina.startup.Bootstrap
Modified: tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat?rev=355227&r1=355226&r2=355227&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat Thu Dec 8
13:44:16 2005
@@ -5,16 +5,28 @@
rem ---------------------------------------------------------------------------
rem Make sure prerequisite environment variables are set
-if not "%JAVA_HOME%" == "" goto gotJavaHome
-echo The JAVA_HOME environment variable is not defined
-echo This environment variable is needed to run this program
+if not "%JAVA_HOME%" == "" goto gotJdkHome
+if not "%JRE_HOME%" == "" goto gotJreHome
+echo Neither the JAVA_HOME nor the JRE_HOME environment variable is defined
+echo At least one of these environment variable is needed to run this program
+goto exit
+
+:gotJreHome
+if not exist "%JRE_HOME%\bin\java.exe" goto noJavaHome
+if not exist "%JRE_HOME%\bin\javaw.exe" goto noJavaHome
+if not ""%1"" == ""debug"" goto okJavaHome
+echo JAVA_HOME should point to a JDK in order to run in debug mode.
goto exit
-:gotJavaHome
+
+:gotJdkHome
if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
if not exist "%JAVA_HOME%\bin\javaw.exe" goto noJavaHome
if not exist "%JAVA_HOME%\bin\jdb.exe" goto noJavaHome
if not exist "%JAVA_HOME%\bin\javac.exe" goto noJavaHome
+if not "%JRE_HOME%" == "" goto okJavaHome
+set JRE_HOME=%JAVA_HOME%
goto okJavaHome
+
:noJavaHome
echo The JAVA_HOME environment variable is not defined correctly
echo This environment variable is needed to run this program
@@ -44,8 +56,8 @@
rem Set standard command for invoking Java.
rem Note that NT requires a window name argument when using start.
rem Also note the quoting as JAVA_HOME may contain spaces.
-set _RUNJAVA="%JAVA_HOME%\bin\java"
-set _RUNJAVAW="%JAVA_HOME%\bin\javaw"
+set _RUNJAVA="%JRE_HOME%\bin\java"
+set _RUNJAVAW="%JRE_HOME%\bin\javaw"
set _RUNJDB="%JAVA_HOME%\bin\jdb"
set _RUNJAVAC="%JAVA_HOME%\bin\javac"
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=355227&r1=355226&r2=355227&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Dec 8 13:44:16 2005
@@ -14,6 +14,16 @@
<body>
+<section name="Tomcat 5.5.15">
+ <subsection name="General">
+ <changelog>
+ <fix>
+ <bug>32081</bug>: Remove the JDK requirement from the Win32 scripts.
(keith)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="Tomcat 5.5.14 (yoavs)">
<subsection name="General">
<changelog>
@@ -29,7 +39,7 @@
<subsection name="Catalina">
<changelog>
<fix>
- <bug>13040</bug>Fix getContext() when used to obtain a context that is
a sub-context
+ <bug>13040</bug>: Fix getContext() when used to obtain a context that
is a sub-context
of the current context. Ported from TC4. (markt)
</fix>
</changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
