Author: markt
Date: Sat May 12 14:11:40 2007
New Revision: 537518
URL: http://svn.apache.org/viewvc?view=rev&rev=537518
Log:
Fix bug 42401. Provide better JRE/JDK information.
Modified:
tomcat/tc6.0.x/trunk/RUNNING.txt
tomcat/tc6.0.x/trunk/bin/catalina.bat
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/RUNNING.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/RUNNING.txt?view=diff&rev=537518&r1=537517&r2=537518
==============================================================================
--- tomcat/tc6.0.x/trunk/RUNNING.txt (original)
+++ tomcat/tc6.0.x/trunk/RUNNING.txt Sat May 12 14:11:40 2007
@@ -18,9 +18,13 @@
(1.2) Install the JRE according to the instructions included with the
release.
+(1.3) Set an environment variable named JRE_HOME to the pathname of
+ the directory into which you installed the JRE, e.g. c:\jre5.0
+ or /usr/local/java/jre5.0.
-(1.3) Set an environment variable named JAVA_HOME to the pathname of
- the directory into which you installed the JRE, e.g. c:\j2sdk5.0
+NOTE: You may also use the full JDK rather than just the JRE. In this
+ case set your JAVA_HOME environment variable to the pathname of
+ the directory into which you installed the JDK, e.g. c:\j2sdk5.0
or /usr/local/java/j2sdk5.0.
Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?view=diff&rev=537518&r1=537517&r2=537518
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.bat Sat May 12 14:11:40 2007
@@ -21,7 +21,7 @@
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 JRE_HOME Must point at your Java Runtime installation.
rem Defaults to JAVA_HOME if empty.
rem
rem JAVA_OPTS (Optional) Java runtime options used when the "start",
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=537518&r1=537517&r2=537518
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat May 12 14:11:40 2007
@@ -21,6 +21,10 @@
<bug>42361</bug>: Handle multi-part forms when saving requests during
FORM authentication process. Patch provided by Peter Runge. (markt)
</fix>
+ <fix>
+ <bug>42401</bug>: Update RUNNING.txt with better JRE/JDK information.
+ (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
