markt       2004/02/12 13:38:56

  Modified:    catalina/src/bin setclasspath.bat setclasspath.sh
  Log:
  Fix bug 14246. Make clear in error message that JDK is required. Reported by Eric 
Bloch. Ported from TC4.
  
  Revision  Changes    Path
  1.6       +2 -1      jakarta-tomcat-catalina/catalina/src/bin/setclasspath.bat
  
  Index: setclasspath.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.bat,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- setclasspath.bat  24 Oct 2003 07:55:41 -0000      1.5
  +++ setclasspath.bat  12 Feb 2004 21:38:56 -0000      1.6
  @@ -18,6 +18,7 @@
   :noJavaHome
   echo The JAVA_HOME environment variable is not defined correctly
   echo This environment variable is needed to run this program
  +echo NB: JAVA_HOME should point to a JDK not a JRE
   goto exit
   :okJavaHome
   
  
  
  
  1.7       +2 -1      jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh
  
  Index: setclasspath.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- setclasspath.sh   18 Sep 2003 21:04:51 -0000      1.6
  +++ setclasspath.sh   12 Feb 2004 21:38:56 -0000      1.7
  @@ -20,6 +20,7 @@
     if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/jdb -o ! -r 
"$JAVA_HOME"/bin/javac ]; then
       echo "The JAVA_HOME environment variable is not defined correctly"
       echo "This environment variable is needed to run this program"
  +    echo "NB: JAVA_HOME should point to a JDK not a JRE"
       exit 1
     fi
   fi
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to