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/tool-wrapper.sh jakarta-tomcat-4.0.6-src/catalina/src/bin/tool-wrapper.sh
  16 --- jakarta-tomcat-4.0.6-src.org/catalina/src/bin/tool-wrapper.sh       Tue Nov 26 22:37:05 2002
  17 +++ jakarta-tomcat-4.0.6-src/catalina/src/bin/tool-wrapper.sh   Tue Nov 26 22:53:07 2002
  18 @@ -50,6 +50,10 @@
  19    [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
  20  fi
  21
  22 +if [ -x /usr/lib/java/bin/java ]; then
  23 +      JAVA_HOME=/usr/lib/java
  24 +fi
  25 +
  26  # Get standard Java environment variables
  27  if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
  28    BASEDIR="$CATALINA_HOME"