tomcat4-4.0.3.patch

opennms得相关源码 请大家看看

diff -uNbr jakarta-tomcat-4.0.3-src.orig/catalina/src/bin/catalina.sh jakarta-tomcat-4.0.3-src/catalina/src/bin/catalina.sh
--- jakarta-tomcat-4.0.3-src.orig/catalina/src/bin/catalina.sh	Fri Mar  1 17:49:56 2002
+++ jakarta-tomcat-4.0.3-src/catalina/src/bin/catalina.sh	Wed Mar 20 15:01:00 2002
@@ -32,6 +32,49 @@
 # tomcat4-4.0.3.patch,v 1.3 2002/03/26 04:57:01 ben Exp
 # -----------------------------------------------------------------------------
 
+TOMCAT_CFG="/etc/tomcat4/conf/tomcat4.conf"
+
+[ -r "$TOMCAT_CFG" ] && . "${TOMCAT_CFG}"
+
+### Set up defaults if they were omitted in TOMCAT_CFG
+
+###  JVM lookup
+
+if [ -z "$JAVA_HOME" ]; then
+    # Search for java in PATH
+    JAVA=`which java`
+    if [ "$?" = "0" ] && [ -z "$JAVA" ]; then
+        JAVA_BINDIR=`dirname ${JAVA}`
+        if [ "$?" = "0" ]; then
+            JAVA_HOME="${JAVA_BINDIR}/.."
+        fi
+    fi
+    # Default to JDK 1.4
+    [ -z "$JAVA_HOME" -a -d "/usr/java/j2sdk1.4.0" ] && JAVA_HOME="/usr/java/j2sdk1.4.0"
+    # Default clean JAVA_HOME
+    [ -z "$JAVA_HOME"  -a -d "/usr/lib/java" ] &&  JAVA_HOME="/usr/lib/java"
+    # Default IBM JAVA_HOME
+    [ -z "$JAVA_HOME"  -a -d "/opt/IBMJava2-13" ] &&  JAVA_HOME="/opt/IBMJava2-13"
+    # Another solution
+    [ -z "$JAVA_HOME"  -a -d "/usr/java/jdk" ] &&  JAVA_HOME="/usr/java/jdk"
+    # madeinlinux JAVA_HOME
+    [ -z "$JAVA_HOME" -a -d "/usr/local/jdk1.2.2" ] && JAVA_HOME="/usr/local/jdk1.2.2"
+    # Kondara JAVA_HOME
+    [ -z "$JAVA_HOME"  -a -d "/usr/lib/java/jdk1.2.2" ] && JAVA_HOME="/usr/lib/java/jdk1.2.2"
+    # Other commonly found JAVA_HOMEs
+    [ -z "$JAVA_HOME"  -a -d "/usr/jdk1.2" ] && JAVA_HOME="/usr/jdk1.2"
+    # Default Caldera JAVA_HOME
+    [ -z "$JAVA_HOME"  -a -d "/opt/java-1.3" ] && JAVA_HOME="/opt/java-1.3"
+    # Add other locations here
+    if [ -z "$JAVA_HOME" ]; then
+    echo "No JAVA_HOME specified in ${TOMCAT_CFG} and no java found, exiting..."
+    exit 1
+    else
+    echo "Found JAVA_HOME: ${JAVA_HOME}"
+    echo "Please complete your ${TOMCAT_CFG} so we won't have to look for it next time"
+    fi
+fi
+
 # OS specific support.  $var _must_ be set to either true or false.
 cygwin=false
 case "`uname`" in
@@ -53,10 +96,15 @@
 
 # Get standard environment variables
 PRGDIR=`dirname "$PRG"`
-CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
+if [ -z "$CATALINA_HOME" ]; then
+  CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
+fi
 if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
   . "$CATALINA_HOME"/bin/setenv.sh
 fi
+if [ -r "$PRGDIR"/setenv.sh ]; then
+  . "$PRGDIR"/setenv.sh
+fi
 
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin; then
@@ -70,8 +118,11 @@
 if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
   BASEDIR="$CATALINA_HOME"
   . "$CATALINA_HOME"/bin/setclasspath.sh
+elif [ -r "$PRGDIR"/setclasspath.sh ]; then
+  BASEDIR=`cd "$PRGDIR/.."; pwd`
+  . "$PRGDIR"/setclasspath.sh
 else
-  echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh"
+  echo "Cannot find setclasspath.sh"
   echo "This file is needed to run this program"
   exit 1
 fi
@@ -179,7 +230,7 @@
 elif [ "$1" = "start" ] ; then
 
   shift
-  touch "$CATALINA_BASE"/logs/catalina.out
+  touch /var/log/tomcat4/catalina.out
   if [ "$1" = "-security" ] ; then
     echo "Using Security Manager"
     shift
@@ -191,7 +242,7 @@
       -Dcatalina.home="$CATALINA_HOME" \
       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
       org.apache.catalina.startup.Bootstrap "$@" start \
-      >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
+      >> /var/log/tomcat4/catalina.out 2>&1 &
   else
     "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
       -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
@@ -199,7 +250,7 @@
       -Dcatalina.home="$CATALINA_HOME" \
       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
       org.apache.catalina.startup.Bootstrap "$@" start \
-      >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
+      >> /var/log/tomcat4/catalina.out 2>&1 &
   fi
 
 elif [ "$1" = "stop" ] ; then
diff -uNbr jakarta-tomcat-4.0.3-src.orig/catalina/src/bin/tool-wrapper.sh jakarta-tomcat-4.0.3-src/catalina/src/bin/tool-wrapper.sh
--- jakarta-tomcat-4.0.3-src.orig/catalina/src/bin/tool-wrapper.sh	Fri Mar  1 17:49:56 2002
+++ jakarta-tomcat-4.0.3-src/catalina/src/bin/tool-wrapper.sh	Wed Mar 20 15:01:30 2002
@@ -36,12 +36,16 @@
   fi
 done
 
-# Get standard environment variables
 PRGDIR=`dirname "$PRG"`
-CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
+if [ -z "$CATALINA_HOME" ]; then
+  CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
+fi
 if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
   . "$CATALINA_HOME"/bin/setenv.sh
 fi
+if [ -r "$PRGDIR"/setenv.sh ]; then
+  . "$PRGDIR"/setenv.sh
+fi
 
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin; then
@@ -54,8 +58,11 @@
 if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
   BASEDIR="$CATALINA_HOME"
   . "$CATALINA_HOME"/bin/setclasspath.sh
+elif [ -r "$PRGDIR"/setclasspath.sh ]; then
+  BASEDIR=`cd "$PRGDIR/.."; pwd`
+  . "$PRGDIR"/setclasspath.sh
 else
-  echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh"
+  echo "Cannot find setclasspath.sh"
   echo "This file is needed to run this program"
   exit 1
 fi
diff -uNbr jakarta-tomcat-4.0.3-src.orig/catalina/src/conf/catalina.conf.xml jakarta-tomcat-4.0.3-src/catalina/src/conf/catalina.conf.xml
--- jakarta-tomcat-4.0.3-src.orig/catalina/src/conf/catalina.conf.xml	Fri Mar  1 17:49:56 2002
+++ jakarta-tomcat-4.0.3-src/catalina/src/conf/catalina.conf.xml	Wed Mar 20 14:22:04 2002
@@ -4,7 +4,7 @@
     <block class="org.apache.catalina.startup.CatalinaBlock" 
            name="catalina" >
 
-        <logger name="Servlet container" destinationURL="../logs/catalina.log" priority="DEBUG"/>
+        <logger name="Servlet container" destinationURL="/var/log/tomcat4/catalina.log" priority="DEBUG"/>
         <configuration>
           <path>../../tomcat-4.0</path>
         </configuration>
diff -uNbr jakarta-tomcat-4.0.3-src.orig/catalina/src/conf/server-noexamples.xml.config jakarta-tomcat-4.0.3-src/catalina/src/conf/server-noexamples.xml.config
--- jakarta-tomcat-4.0.3-src.orig/catalina/src/conf/server-noexamples.xml.config	Fri Mar  1 17:49:56 2002
+++ jakarta-tomcat-4.0.3-src/catalina/src/conf/server-noexamples.xml.config	Wed Mar 20 14:22:24 2002
@@ -178,7 +178,7 @@
              (to $CATALINA_HOME) or absolute path to the desired directory.
         -->
         <Valve className="org.apache.catalina.valves.AccessLogValve"
-                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
+                 directory="/var/log/tomcat4"  prefix="localhost_access_log." suffix=".txt"
                  pattern="common"/>
 
         <!-- Logger shared by all Contexts related to this virtual host.  By
@@ -188,7 +188,7 @@
              relative (to $CATALINA_HOME) or absolute path to the desired
              directory.-->
         <Logger className="org.apache.catalina.logger.FileLogger"
-                 directory="logs"  prefix="localhost_log." suffix=".txt"
+                 directory="/var/log/tomcat4"  prefix="localhost_log." suffix=".txt"
 	        timestamp="true"/>
 
         <!-- Define properties for each web application.  This is only needed
diff -uNbr jakarta-tomcat-4.0.3-src.orig/catalina/src/conf/server.xml jakarta-tomcat-4.0.3-src/catalina/src/conf/server.xml
--- jakarta-tomcat-4.0.3-src.orig/catalina/src/conf/server.xml	Fri Mar  1 17:49:56 2002
+++ jakarta-tomcat-4.0.3-src/catalina/src/conf/server.xml	Wed Mar 20 14:21:40 2002
@@ -176,7 +176,7 @@
              (to $CATALINA_HOME) or absolute path to the desired directory.
         -->
         <Valve className="org.apache.catalina.valves.AccessLogValve"
-                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
+                 directory="/var/log/tomcat4"  prefix="localhost_access_log." suffix=".txt"
                  pattern="common"/>
 
         <!-- Logger shared by all Contexts related to this virtual host.  By
@@ -186,7 +186,7 @@
              relative (to $CATALINA_HOME) or absolute path to the desired
              directory.-->
         <Logger className="org.apache.catalina.logger.FileLogger"
-                 directory="logs"  prefix="localhost_log." suffix=".txt"
+                 directory="/var/log/tomcat4"  prefix="localhost_log." suffix=".txt"
 	        timestamp="true"/>
 
         <!-- Define properties for each web application.  This is only needed
diff -uNbr jakarta-tomcat-4.0.3-src.orig/jasper/src/bin/jasper.sh jakarta-tomcat-4.0.3-src/jasper/src/bin/jasper.sh
--- jakarta-tomcat-4.0.3-src.orig/jasper/src/bin/jasper.sh	Fri Mar  1 17:49:58 2002
+++ jakarta-tomcat-4.0.3-src/jasper/src/bin/jasper.sh	Wed Mar 20 08:52:26 2002
@@ -17,6 +17,47 @@
 # tomcat4-4.0.3.patch,v 1.3 2002/03/26 04:57:01 ben Exp
 # -----------------------------------------------------------------------------
 
+TOMCAT_CFG="/etc/tomcat4/conf/tomcat4.conf"
+
+[ -r "$TOMCAT_CFG" ] && . "${TOMCAT_CFG}"
+
+### Set up defaults if they were omitted in TOMCAT_CFG
+
+###  JVM lookup
+
+if [ -z "$JAVA_HOME" ]; then
+    # Search for java in PATH
+    JAVA=`which java`
+    if [ -z "$JAVA" ] ; then
+    JAVA_BINDIR=`dirname ${JAVA}`
+    JAVA_HOME="${JAVA_BINDIR}/.."
+    fi
+    # Defaults to JDK 1.4
+    [ -z "$JAVA_HOME"  -a -d "/usr/java/j2sdk1.4.0" ] &&  JAVA_HOME="/usr/java/j2sdk1.4.0"
+    # Default clean JAVA_HOME
+    [ -z "$JAVA_HOME"  -a -d "/usr/lib/java" ] &&  JAVA_HOME="/usr/lib/java"
+    # Default IBM JAVA_HOME
+    [ -z "$JAVA_HOME"  -a -d "/opt/IBMJava2-13" ] &&  JAVA_HOME="/opt/IBMJava2-13"
+    # Another solution
+    [ -z "$JAVA_HOME"  -a -d "/usr/java/jdk" ] &&  JAVA_HOME="/usr/java/jdk"
+    # madeinlinux JAVA_HOME
+    [ -z "$JAVA_HOME" -a -d "/usr/local/jdk1.2.2" ] && JAVA_HOME="/usr/local/jdk1.2.2"
+    # Kondara JAVA_HOME
+    [ -z "$JAVA_HOME"  -a -d "/usr/lib/java/jdk1.2.2" ] && JAVA_HOME="/usr/lib/java/jdk1.2.2"
+    # Other commonly found JAVA_HOMEs
+    [ -z "$JAVA_HOME"  -a -d "/usr/jdk1.2" ] && JAVA_HOME="/usr/jdk1.2"
+    # Default Caldera JAVA_HOME
+    [ -z "$JAVA_HOME"  -a -d "/opt/java-1.3" ] && JAVA_HOME="/opt/java-1.3"
+    # Add other locations here
+    if [ -z "$JAVA_HOME" ]; then
+    echo "No JAVA_HOME specified in ${TOMCAT_CFG} and no java found, exiting..."
+    exit 1
+    else
+    echo "Found JAVA_HOME: ${JAVA_HOME}"
+    echo "Please complete your ${TOMCAT_CFG} so we won't have to look for it next time"
+    fi
+fi
+
 # OS specific support.  $var _must_ be set to either true or false.
 cygwin=false
 case "`uname`" in