Add the CLAASSPATH to the output (will be useful while working on 39194 as well as...

Fix a minor alignment niggle with JRE_HOME in cataina.sh

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

diff --git a/bin/catalina.bat b/bin/catalina.bat
index b46ae83..ef14bb6 100755 (executable)
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -140,6 +140,7 @@ goto java_dir_displayed
 :use_jdk
 echo Using JAVA_HOME:       %JAVA_HOME%
 :java_dir_displayed
+echo Using CLASSPATH:       %CLASSPATH%
 
 set _EXECJAVA=%_RUNJAVA%
 set MAINCLASS=org.apache.catalina.startup.Bootstrap

diff --git a/bin/catalina.sh b/bin/catalina.sh
index ed1e419..55ffd61 100755 (executable)
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -204,8 +204,9 @@ if [ $have_tty -eq 1 ]; then
   if [ "$1" = "debug" -o "$1" = "javac" ] ; then
     echo "Using JAVA_HOME:       $JAVA_HOME"
   else
-    echo "Using JRE_HOME:       $JRE_HOME"
+    echo "Using JRE_HOME:        $JRE_HOME"
   fi
+  echo "Using CLASSPATH:       $CLASSPATH"
 fi
 
 if [ "$1" = "jpda" ] ; then