jakarta-tomcat-JAVA_HOME.patch

   1 diff -urN jakarta-tomcat-4.0.6-src.org/catalina/src/bin/catalina.sh jakarta-tomcat-4.0.6-src/catalina/src/bin/catalina.sh
   2 --- jakarta-tomcat-4.0.6-src.org/catalina/src/bin/catalina.sh   Tue Nov 26 22:37:05 2002
   3 +++ jakarta-tomcat-4.0.6-src/catalina/src/bin/catalina.sh       Tue Nov 26 22:52:30 2002
   4 @@ -104,6 +104,10 @@
   5    JSSE_HOME=`cygpath --path --windows "$JSSE_HOME"`
   6  fi
   7
   8 +if [ -x /usr/lib/java/bin/java ]; then
   9 +  JAVA_HOME=/usr/lib/java
  10 +fi
  11 +
  12  # ----- Execute The Requested Command -----------------------------------------
  13
  14  echo "Using CATALINA_BASE:   $CATALINA_BASE"
  15 diff -urN jakarta-tomcat-4.0.6-src.org/catalina/src/bin/setclasspath.sh jakarta-tomcat-4.0.6-src/catalina/src/bin/setclasspath.sh
  16 --- jakarta-tomcat-4.0.6-src.org/catalina/src/bin/setclasspath.sh       Tue Nov 26 22:37:05 2002
  17 +++ jakarta-tomcat-4.0.6-src/catalina/src/bin/setclasspath.sh   Tue Nov 26 23:05:50 2002
  18 @@ -6,9 +6,13 @@
  19
  20  # Make sure prerequisite environment variables are set
  21  if [ -z "$JAVA_HOME" ]; then
  22 +  if [ -x /usr/lib/java/bin/java ]; then
  23 +    JAVA_HOME=/usr/lib/java
  24 +  else
  25    echo "The JAVA_HOME environment variable is not defined"
  26    echo "This environment variable is needed to run this program"
  27    exit 1
  28 +  fi
  29  fi
  30  if [ ! -r "$JAVA_HOME"/bin/java ]; then
  31    echo "The JAVA_HOME environment variable is not defined correctly"
  32 diff -urN jakarta-tomcat-4.0.6-src.org/catalina/src/bin/tool-wrapper.sh jakarta-tomcat-4.0.6-src/catalina/src/bin/tool-wrapper.sh
  33 --- jakarta-tomcat-4.0.6-src.org/catalina/src/bin/tool-wrapper.sh       Tue Nov 26 22:37:05 2002
  34 +++ jakarta-tomcat-4.0.6-src/catalina/src/bin/tool-wrapper.sh   Tue Nov 26 22:53:07 2002
  35 @@ -50,6 +50,10 @@
  36    [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
  37  fi
  38
  39 +if [ -x /usr/lib/java/bin/java ]; then
  40 +      JAVA_HOME=/usr/lib/java
  41 +fi
  42 +
  43  # Get standard Java environment variables
  44  if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
  45    BASEDIR="$CATALINA_HOME"