Skip to content

Commit

Permalink
Fix bug 42401. Provide better JRE/JDK information.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@537518 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
markt-asf committed May 12, 2007
1 parent eeef444 commit a175efa
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
8 changes: 6 additions & 2 deletions RUNNING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@ Running With JRE 5.0 Or Later

(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.


Expand Down
2 changes: 1 addition & 1 deletion bin/catalina.bat
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ 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 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",
Expand Down
4 changes: 4 additions & 0 deletions webapps/docs/changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit a175efa

Please sign in to comment.