Alternative fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=39194

Only add tools.jar to classpath when using debug option
Remove references to undocumented, half-implemented javac option
Remove unused environment variables

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@793372 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/bin/catalina.bat b/bin/catalina.bat
index ef14bb6..8eb8dfa 100755 (executable)
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -106,8 +106,11 @@ set BASEDIR=%CATALINA_HOME%
 call "%CATALINA_HOME%\bin\setclasspath.bat" %1
 if errorlevel 1 goto end
 
-rem Add on extra jar files to CLASSPATH
-set CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\bootstrap.jar
+rem Add on extra jar file to CLASSPATH
+if "%CLASSPATH%" == "" goto emptyClasspath
+set CLASSPATH=%CLASSPATH%;
+:emptyClasspath
+set CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar
 
 if not "%CATALINA_BASE%" == "" goto gotBase
 set CATALINA_BASE=%CATALINA_HOME%

diff --git a/bin/catalina.sh b/bin/catalina.sh
index 55ffd61..ad72ca2 100755 (executable)
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -34,7 +34,7 @@
 #                   $CATALINA_BASE/temp.
 #
 #   JAVA_HOME       Must point at your Java Development Kit installation.
-#                   Required to run the with the "debug" or "javac" argument.
+#                   Required to run the with the "debug" argument.
 #
 #   JRE_HOME        Must point at your Java Development Kit installation.
 #                   Defaults to JAVA_HOME if empty.
@@ -150,7 +150,10 @@ else
 fi
 
 # Add on extra jar files to CLASSPATH
-CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar
+if [ ! -z "$CLASSPATH" ] ; then
+  CLASSPATH="$CLASSPATH":
+fi
+CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar
 
 if [ -z "$CATALINA_BASE" ] ; then
   CATALINA_BASE="$CATALINA_HOME"
@@ -201,7 +204,7 @@ if [ $have_tty -eq 1 ]; then
   echo "Using CATALINA_BASE:   $CATALINA_BASE"
   echo "Using CATALINA_HOME:   $CATALINA_HOME"
   echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR"
-  if [ "$1" = "debug" -o "$1" = "javac" ] ; then
+  if [ "$1" = "debug" ] ; then
     echo "Using JAVA_HOME:       $JAVA_HOME"
   else
     echo "Using JRE_HOME:        $JRE_HOME"

diff --git a/bin/setclasspath.bat b/bin/setclasspath.bat
index 71cc5ce..1e1a1e4 100755 (executable)
--- a/bin/setclasspath.bat
+++ b/bin/setclasspath.bat
@@ -71,6 +71,7 @@ rem Set standard CLASSPATH
 rem Note that there are no quotes as we do not want to introduce random
 rem quotes into the CLASSPATH
 if not exist "%JAVA_HOME%\lib\tools.jar" goto noJavac
+if not ""%1"" == ""debug"" goto noJavac
 set CLASSPATH=%JAVA_HOME%\lib\tools.jar
 :noJavac
 
@@ -78,9 +79,7 @@ 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="%JRE_HOME%\bin\java"
-set _RUNJAVAW="%JRE_HOME%\bin\javaw"
 set _RUNJDB="%JAVA_HOME%\bin\jdb"
-set _RUNJAVAC="%JAVA_HOME%\bin\javac"
 
 goto end
 

diff --git a/bin/setclasspath.sh b/bin/setclasspath.sh
index 646afd3..e9a59de 100755 (executable)
--- a/bin/setclasspath.sh
+++ b/bin/setclasspath.sh
@@ -59,7 +59,7 @@ if [ -z "$JRE_HOME" ]; then
 fi
 
 # If we're running under jdb, we need a full jdk.
-if [ "$1" = "debug" -o "$1" = "javac" ] ; then
+if [ "$1" = "debug" ] ; then
   if [ "$os400" = "true" ]; then
     if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/javac ]; then
       echo "The JAVA_HOME environment variable is not defined correctly"
@@ -102,14 +102,7 @@ if [ -z "$JAVA_ENDORSED_DIRS" ]; then
 fi
 
 # Set standard CLASSPATH
-if [ "$1" = "javac" ] ; then
-  if [ ! -f "$JAVA_HOME"/lib/tools.jar ]; then
-    echo "Can't find tools.jar in JAVA_HOME"
-    echo "Need a JDK to run javac"
-    exit 1
-  fi
-fi
-if [ "$1" = "debug" -o "$1" = "javac" ] ; then
+if [ "$1" = "debug" ] ; then
   if [ -f "$JAVA_HOME"/lib/tools.jar ]; then
     CLASSPATH="$JAVA_HOME"/lib/tools.jar
   fi
@@ -131,4 +124,3 @@ _RUNJAVA="$JRE_HOME"/bin/java
 if [ "$os400" != "true" ]; then
   _RUNJDB="$JAVA_HOME"/bin/jdb
 fi
-_RUNJAVAC="$JAVA_HOME"/bin/javac