Revert r791331 that fixed https://issues.apache.org/bugzilla/show_bug.cgi?id=39194

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

diff --git a/bin/catalina.bat b/bin/catalina.bat
index 5a3e17c..ef14bb6 100755 (executable)
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -106,13 +106,8 @@ set BASEDIR=%CATALINA_HOME%
 call "%CATALINA_HOME%\bin\setclasspath.bat" %1
 if errorlevel 1 goto end
 
-if "%1" == "javac" shift
- 
 rem Add on extra jar files to CLASSPATH
-if "%CLASSPATH%" == "" goto emptyClasspath
-set CLASSPATH=%CLASSPATH%;
-:emptyClasspath
-set CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar
+set CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\bootstrap.jar
 
 if not "%CATALINA_BASE%" == "" goto gotBase
 set CATALINA_BASE=%CATALINA_HOME%
@@ -177,10 +172,7 @@ if ""%1"" == ""start"" goto doStart
 if ""%1"" == ""stop"" goto doStop
 if ""%1"" == ""version"" goto doVersion
 
-echo Usage:  catalina [javac] ( commands ... )
-echo optional arguments:
-echo   javac             Adds tools.jar to the classpath so javac is available
-echo                       as a compiler
+echo Usage:  catalina ( commands ... )
 echo commands:
 echo   debug             Start Catalina in a debugger
 echo   debug -security   Debug Catalina with a security manager

diff --git a/bin/catalina.sh b/bin/catalina.sh
index ce488a7..55ffd61 100755 (executable)
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -150,10 +150,7 @@ else
 fi
 
 # Add on extra jar files to CLASSPATH
-if [ ! -z "$CLASSPATH" ] ; then
-  CLASSPATH="$CLASSPATH":
-fi
-CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar
+CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar
 
 if [ -z "$CATALINA_BASE" ] ; then
   CATALINA_BASE="$CATALINA_HOME"
@@ -348,10 +345,7 @@ elif [ "$1" = "version" ] ; then
 
 else
 
-  echo "Usage: catalina.sh [javac] ( commands ... )"
-  echo "optional arguments:"
-  echo "  javac             Adds tools.jar to the classpath so javac is"
-  echo "                      available as a compiler"
+  echo "Usage: catalina.sh ( commands ... )"
   echo "commands:"
   if $os400; then
     echo "  debug             Start Catalina in a debugger (not available on OS400)"

diff --git a/bin/setclasspath.bat b/bin/setclasspath.bat
index 0afb5dd..71cc5ce 100755 (executable)
--- a/bin/setclasspath.bat
+++ b/bin/setclasspath.bat
@@ -70,14 +70,9 @@ set JAVA_ENDORSED_DIRS=%BASEDIR%\endorsed
 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 noJavac2
-if not ""%1"" == ""debug"" goto noJavac1
+if not exist "%JAVA_HOME%\lib\tools.jar" goto noJavac
 set CLASSPATH=%JAVA_HOME%\lib\tools.jar
-goto noJavac2
-:noJavac1
-if not ""%1"" == ""javac"" goto noJavac2
-set CLASSPATH=%JAVA_HOME%\lib\tools.jar
-:noJavac2
+:noJavac
 
 rem Set standard command for invoking Java.
 rem Note that NT requires a window name argument when using start.

diff --git a/bin/setclasspath.sh b/bin/setclasspath.sh
index ea7ae42..646afd3 100755 (executable)
--- a/bin/setclasspath.sh
+++ b/bin/setclasspath.sh
@@ -112,9 +112,6 @@ fi
 if [ "$1" = "debug" -o "$1" = "javac" ] ; then
   if [ -f "$JAVA_HOME"/lib/tools.jar ]; then
     CLASSPATH="$JAVA_HOME"/lib/tools.jar
-    if [ "$1" = "javac" ] ; then
-      shift
-    fi
   fi
 fi