[patch] update setclasspath.sh to run with JRE

catalina.sh.patch (text/plain), 2.47 KB, created by Ben Souther on 2005-01-10 02:48:33 UTC

(hide)

Description: update setclasspath.sh to run with JRE

Filename:

MIME Type:

Creator: Ben Souther

Created: 2005-01-10 02:48:33 UTC

Size: 2.47 KB

patch

obsolete

>Index: catalina.sh >=================================================================== >RCS file: /home/cvspublic/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v >retrieving revision 1.17 >diff -u -r1.17 catalina.sh >--- catalina.sh 17 Nov 2004 20:17:46 -0000 1.17 >+++ catalina.sh 10 Jan 2005 01:44:38 -0000 >@@ -18,6 +18,10 @@ > # $CATALINA_BASE/temp. > # > # JAVA_HOME Must point at your Java Development Kit installation. >+# Required to run the with the "debug" or "javac" argument. >+# >+# JRE_HOME Must point at your Java Development Kit installation. >+# Defaults to JAVA_HOME if empty. > # > # JAVA_OPTS (Optional) Java runtime options used when the "start", > # "stop", or "run" command is executed. >@@ -38,6 +42,8 @@ > # $Id: catalina.sh,v 1.17 2004/11/17 20:17:46 yoavs Exp $ > # ----------------------------------------------------------------------------- > >+echo $1 >+ > # OS specific support. $var _must_ be set to either true or false. > cygwin=false > os400=false >@@ -72,6 +78,7 @@ > # For Cygwin, ensure paths are in UNIX format before anything is touched > if $cygwin; then > [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` >+ [ -n "$JRE_HOME" ] && JAVA_HOME=`cygpath --unix "$JRE_HOME"` > [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"` > [ -n "$CATALINA_BASE" ] && CATALINA_BASE=`cygpath --unix "$CATALINA_BASE"` > [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` >@@ -127,6 +134,7 @@ > # For Cygwin, switch paths to Windows format before running java > if $cygwin; then > JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"` >+ JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"` > CATALINA_HOME=`cygpath --absolute --windows "$CATALINA_HOME"` > CATALINA_BASE=`cygpath --absolute --windows "$CATALINA_BASE"` > CATALINA_TMPDIR=`cygpath --absolute --windows "$CATALINA_TMPDIR"` >@@ -140,7 +148,11 @@ > echo "Using CATALINA_BASE: $CATALINA_BASE" > echo "Using CATALINA_HOME: $CATALINA_HOME" > echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR" >-echo "Using JAVA_HOME: $JAVA_HOME" >+if [ "$1" = "debug" -o "$1" = "javac" ] ; then >+ echo "Using JAVA_HOME: $JAVA_HOME" >+else >+ echo "Using JRE_HOME: $JRE_HOME" >+fi > > if [ "$1" = "jpda" ] ; then > if [ -z "$JPDA_TRANSPORT" ]; then >@@ -157,6 +169,8 @@ > fi > > if [ "$1" = "debug" ] ; then >+echo "DEBUG--------" >+echo "$_RUNJDB" > > if $os400; then > echo "Debug command not available on OS400" View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]