+++ /dev/null
-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
---- jakarta-tomcat-4.0.6-src.org/catalina/src/bin/catalina.sh Tue Nov 26 22:37:05 2002
-+++ jakarta-tomcat-4.0.6-src/catalina/src/bin/catalina.sh Tue Nov 26 22:52:30 2002
-@@ -104,6 +104,10 @@
- JSSE_HOME=`cygpath --path --windows "$JSSE_HOME"`
- fi
-
-+if [ -x /usr/lib/java/bin/java ]; then
-+ JAVA_HOME=/usr/lib/java
-+fi
-+
- # ----- Execute The Requested Command -----------------------------------------
-
- echo "Using CATALINA_BASE: $CATALINA_BASE"
-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
---- jakarta-tomcat-4.0.6-src.org/catalina/src/bin/setclasspath.sh Tue Nov 26 22:37:05 2002
-+++ jakarta-tomcat-4.0.6-src/catalina/src/bin/setclasspath.sh Tue Nov 26 23:05:50 2002
-@@ -6,9 +6,13 @@
-
- # Make sure prerequisite environment variables are set
- if [ -z "$JAVA_HOME" ]; then
-+ if [ -x /usr/lib/java/bin/java ]; then
-+ JAVA_HOME=/usr/lib/java
-+ else
- echo "The JAVA_HOME environment variable is not defined"
- echo "This environment variable is needed to run this program"
- exit 1
-+ fi
- fi
- if [ ! -r "$JAVA_HOME"/bin/java ]; then
- echo "The JAVA_HOME environment variable is not defined correctly"
-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
---- jakarta-tomcat-4.0.6-src.org/catalina/src/bin/tool-wrapper.sh Tue Nov 26 22:37:05 2002
-+++ jakarta-tomcat-4.0.6-src/catalina/src/bin/tool-wrapper.sh Tue Nov 26 22:53:07 2002
-@@ -50,6 +50,10 @@
- [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
- fi
-
-+if [ -x /usr/lib/java/bin/java ]; then
-+ JAVA_HOME=/usr/lib/java
-+fi
-+
- # Get standard Java environment variables
- if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
- BASEDIR="$CATALINA_HOME"
+++ /dev/null
-diff -Nur jakarta-tomcat-4.1.24-src.orig/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java jakarta-tomcat-4.1.24-src.chng/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java
---- jakarta-tomcat-4.1.24-src.orig/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java Wed Mar 19 10:20:48 2003
-+++ jakarta-tomcat-4.1.24-src.chng/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java Wed Jun 25 15:23:52 2003
-@@ -84,7 +84,7 @@
- import org.apache.catalina.Host;
- import org.apache.catalina.util.ServerInfo;
- import org.apache.commons.fileupload.FileItem;
--import org.apache.commons.fileupload.FileUpload;
-+import org.apache.commons.fileupload.DiskFileUpload;
- import org.apache.commons.fileupload.FileUploadException;
-
- /**
-@@ -195,7 +195,7 @@
- String message = "";
-
- // Create a new file upload handler
-- FileUpload upload = new FileUpload();
-+ DiskFileUpload upload = new DiskFileUpload();
-
- // Get the tempdir
- File tempdir = (File) getServletContext().getAttribute
-@@ -259,7 +259,7 @@
- ("htmlManagerServlet.installUploadWarExists",war);
- break;
- }
-- warUpload.write(file.getCanonicalPath());
-+ warUpload.write(file);
- try {
- URL url = file.toURL();
- war = url.toString();
+++ /dev/null
---- jakarta-tomcat-4.0.1-src/webapps/examples/build.xml.orig Tue Nov 13 03:02:50 2001
-+++ jakarta-tomcat-4.0.1-src/webapps/examples/build.xml Sat Aug 24 15:22:07 2002
-@@ -70,7 +70,7 @@
-
-
- <!-- ================= BUILD: Compile Server Components ================= -->
-- <target name="build-main" depends="build-static">
-+ <target name="build-main" depends="flags,build-static">
-
- <javac srcdir="WEB-INF/classes"
- destdir="${webapps.build}/${webapp.name}/WEB-INF/classes"
---- jakarta-tomcat-4.0.1-src/webapps/examples/jsp/index.html.orig Tue Nov 13 03:02:50 2001
-+++ jakarta-tomcat-4.0.1-src/webapps/examples/jsp/index.html Sat Aug 24 15:22:47 2002
-@@ -112,7 +112,7 @@
- <tr VALIGN=TOP>
- <td>Include </td>
-
--<td VALIGN=TOP WIDTH="30%"><a href="/include/include.jsp"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0 align=TOP></a><a href="include/include.jsp">Execute</a></td>
-+<td VALIGN=TOP WIDTH="30%"><a href="include/include.jsp"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0 align=TOP></a><a href="include/include.jsp">Execute</a></td>
-
- <td WIDTH="30%"><a href="include/inc.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="include/inc.html">Source</a></td>
- </tr>