diff -uNr jakarta-tomcat-4.1.31-src/build.properties jakarta-tomcat-4.1.31-src-new/build.properties
--- jakarta-tomcat-4.1.31-src/build.properties Wed Dec 31 19:00:00 1969
+++ jakarta-tomcat-4.1.31-src-new/build.properties Wed Oct 27 11:00:22 2004
@@ -0,0 +1,235 @@
+# -----------------------------------------------------------------------------
+# build.properties.sample
+#
+# This is an example "build.properties" file, used to customize building Tomcat
+# for your local environment. It defines the location of all external
+# modules that Tomcat depends on. Copy this file to "build.properties"
+# in the top-level source directory, and customize it as needed.
+#
+# $Id: build.properties.sample,v 1.54 2002/11/12 16:34:57 jfarcand Exp $
+# -----------------------------------------------------------------------------
+
+
+# ----- Compile Control Flags -----
+compile.debug=on
+compile.deprecation=off
+compile.optimize=on
+
+
+# ----- Build Control Flags
+
+#Build all components
+full.dist=on
+
+#Build lightweight JDK 1.4 distribution
+#light.dist=on
+
+#Hide configuration flags display
+#flags.hide=on
+
+#Version number
+version=4.1
+
+#Proxy to download subproject
+#proxy.host=proxy.domain
+#proxy.port=8080
+#proxy.use=on
+
+#CVS root for the jakarta subprojects that do not have released yet.
+cvsroot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"
+
+
+# ----- Default Base Path for Dependent Packages -----
+base.path=@PREFIX@
+java.base.path=${base.path}/share/java
+
+# ----- Jakarta Tomcat Connectors source path -----
+#jtc.home=../../jakarta-tomcat-connectors
+
+
+# ----- Jakarta Tomcat Jasper source path -----
+jasper.home=${basedir}/jasper
+
+
+# --------------------------------------------------
+# REQUIRED LIBRARIES
+# --------------------------------------------------
+
+
+# ----- Commons Beanutils, version 1.1 or later -----
+commons-beanutils.home=${java.base.path}/commons-beanutils
+commons-beanutils.lib=${commons-beanutils.home}
+commons-beanutils.jar=${commons-beanutils.lib}/commons-beanutils.jar
+commons-beanutils.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-beanutils/v1.4.1/commons-beanutils-1.4.1.tar.gz
+
+
+# ----- Commons Collections, version 1.0 or later -----
+commons-collections.home=${java.base.path}/commons-collections
+commons-collections.lib=${commons-collections.home}
+commons-collections.jar=${commons-collections.lib}/commons-collections-3.1.jar
+commons-collections.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-collections/v2.0/commons-collections-2.0.tar.gz
+
+
+# ----- Commons Digester, version 1.1.1 or later -----
+commons-digester.home=${java.base.path}/commons-digester
+commons-digester.lib=${commons-digester.home}
+commons-digester.jar=${commons-digester.lib}/commons-digester.jar
+commons-digester.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-digester/v1.2/commons-digester-1.2.tar.gz
+
+
+# ----- Commons Logging, version 1.0.1 or later -----
+commons-logging.home=${java.base.path}/commons-logging
+commons-logging.lib=${commons-logging.home}
+commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar
+commons-logging.jar=${commons-logging.lib}/commons-logging.jar
+commons-logging.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-logging/v1.0.2/commons-logging-1.0.2.tar.gz
+
+
+# ----- Java Naming and Directory Interface (JNDI), version 1.2 or later -----
+# Note: Optional with JDK 1.3+
+jndi.home=${java.base.path}/jndi
+jndi.lib=${jndi.home}
+jndi.jar=${jndi.lib}/jndi.jar
+ldap.jar=${java.base.path}/jndi-ldap/ldap.jar
+jaas.jar=${java.base.path}/jndi-ldap/jaas.jar
+
+
+# ----- Jakarta Regular Expressions Library, version 1.2 -----
+regexp.home=${java.base.path}/jakarta-regexp
+regexp.lib=${regexp.home}
+regexp.jar=${regexp.lib}/jakarta-regexp.jar
+regexp.loc=http://jakarta.apache.org/builds/jakarta-regexp/release/v1.2/jakarta-regexp-1.2.tar.gz
+
+
+# ----- Jakarta Servlet API Classes (Servlet 2.3 / JSP 1.2) -----
+servlet.home=${java.base.path}/jakarta-servletapi
+servlet.lib=${servlet.home}
+servlet.jar=${servlet.lib}/servlet.jar
+servlet.loc=jakarta-servletapi-4
+
+
+# ----- Xerces XML Parser, version 1.4.4 to 2.0.0 Beta 4 -----
+# Note: Optional with JDK 1.4+
+#xerces.home=${base.path}/xerces-1_4_4
+#xerces.lib=${xerces.home}
+#xerces.jar=${xerces.lib}/xerces.jar
+
+
+# ----- Xerces XML Parser, version 2.0.0 or later -----
+# Note: Optional with JDK 1.4+, or if Xerces 1.x is present
+xerces.home=${java.base.path}/xerces-j
+xerces.lib=${xerces.home}
+xerces.loc=http://xml.apache.org/dist/xerces-j/old_xerces2/Xerces-J-bin.2.1.0.tar.gz
+xercesImpl.jar=${xerces.lib}/xercesImpl.jar
+xmlParserAPIs.jar=${xerces.lib}/xmlParserAPIs.jar
+
+
+# --------------------------------------------------
+# OPTIONAL LIBRARIES
+# --------------------------------------------------
+
+
+# ----- Java Activation Framework (JAF), version 1.0.1 or later -----
+activation.home=${java.base.path}/jaf
+activation.lib=${activation.home}
+activation.jar=${activation.lib}/activation.jar
+
+
+# ----- Commons Daemon, version 20020219 or later -----
+commons-daemon.home=${java.base.path}/commons-daemon
+commons-daemon.lib=${commons-daemon.home}
+commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
+commons-daemon.loc=jakarta-commons-sandbox/daemon
+
+
+# ----- Commons DBCP, version 1.0 or later -----
+commons-dbcp.home=${java.base.path}/commons-dbcp
+commons-dbcp.lib=${commons-dbcp.home}
+commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp.jar
+commons-dbcp.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-dbcp/v1.0/commons-dbcp-1.0.zip
+
+
+# ----- Commons Modeler, version 1.0 or later -----
+commons-modeler.home=${java.base.path}/commons-modeler
+commons-modeler.lib=${commons-modeler.home}
+commons-modeler.jar=${commons-modeler.lib}/commons-modeler.jar
+commons-modeler.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-modeler/v1.0/commons-modeler-1.0.tar.gz
+
+
+# ----- Commons Pool, version 1.0 or later -----
+commons-pool.home=${java.base.path}/commons-pool
+commons-pool.lib=${commons-pool.home}
+commons-pool.jar=${commons-pool.lib}/commons-pool.jar
+commons-pool.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-pool/v1.0.1/commons-pool-1.0.1.tar.gz
+
+
+# ----- JavaService, version 1.2.0 or later -----
+javaservice.home=${base.path}/javaservice
+javaservice.loc=http://www.alexandriasc.com/software/JavaService/JavaService-bin-1.2.0.zip
+
+
+# ----- Java Database Connectivity (JDBC) Optional Package, version 2.0 -----
+jdbc20ext.home=${java.base.path}/jdbc-optional
+jdbc20ext.lib=${jdbc20ext.home}
+jdbc20ext.jar=${jdbc20ext.lib}/jdbc2_0-stdext.jar
+
+
+# ----- Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.1 or later -----
+jmx.home=${java.base.path}/mx4j
+jmx.lib=${jmx.home}
+jmx.jar=${jmx.lib}/mx4j-jmx.jar
+jmx.loc=http://telia.dl.sourceforge.net/sourceforge/mx4j/mx4j-1.1.tar.gz
+
+
+# ----- Java Secure Sockets Extension (JSSE), version 1.0.2 or later -----
+jsse.home=/Library/Java/Home
+jsse.lib=${jsse.home}/lib
+jcert.jar=${jsse.lib}/jcert.jar
+jnet.jar=${jsse.lib}/jnet.jar
+jsse.jar=${jsse.lib}/jsse.jar
+
+
+# ----- Java Transaction API (JTA), version 1.0.1 or later -----
+jta.home=${java.base.path}/jta-spec
+jta.lib=${jta.home}
+jta.jar=${jta.lib}/jta-spec1_0_1.jar
+
+
+# ----- JUnit Unit Test Suite, version 3.7 or later -----
+junit.home=${java.base.path}/junit
+junit.lib=${junit.home}
+junit.jar=${junit.lib}/junit.jar
+junit.loc=http://download.sourceforge.net/junit/junit3.7.zip
+
+
+# ----- Java Mail, version 1.2 or later -----
+mail.home=${java.base.path}/javamail
+mail.lib=${mail.home}
+mail.jar=${mail.lib}/mail.jar
+
+
+# ----- NSIS, version 1.9x -----
+nsis.home=${base.path}/nsis
+nsis.loc=http://www.nullsoft.com/free/nsis/nsis198.exe
+
+
+# ----- PureTLS Extension, version 0.9 or later -----
+puretls.home=${base.path}/puretls-0.9b2
+puretls.lib=${puretls.home}/build
+puretls.jar=${puretls.lib}/puretls.jar
+
+
+# ----- Struts, version 1.0.1 or later -----
+struts.home=${java.base.path}/struts
+struts.lib=${struts.home}
+struts.jar=${struts.lib}/struts.jar
+struts.loc=http://jakarta.apache.org/builds/jakarta-struts/release/v1.0.2/jakarta-struts-1.0.2.tar.gz
+
+
+# ----- Tyrex Data Source, version 1.0 -----
+tyrex.home=${java.base.path}/tyrex
+tyrex.lib=${tyrex.home}
+tyrex.jar=${tyrex.lib}/tyrex-1.0.jar
+tyrex.loc=ftp://ftp.exolab.org/pub/tyrex/tyrex-1.0/tyrex-1.0.jar
+
+
diff -uNr jakarta-tomcat-4.1.31-src/build.sh jakarta-tomcat-4.1.31-src-new/build.sh
--- jakarta-tomcat-4.1.31-src/build.sh Wed Dec 31 19:00:00 1969
+++ jakarta-tomcat-4.1.31-src-new/build.sh Wed Oct 27 11:00:22 2004
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for i in @PREFIX@/etc/profile.d/*.sh; do
+ source $i
+done
+
+ant dist
diff -uNr jakarta-tomcat-4.1.31-src/build.xml jakarta-tomcat-4.1.31-src-new/build.xml
--- jakarta-tomcat-4.1.31-src/build.xml Sat Sep 25 12:44:17 2004
+++ jakarta-tomcat-4.1.31-src-new/build.xml Wed Oct 27 11:00:22 2004
@@ -19,7 +19,7 @@
-
+
diff -uNr jakarta-tomcat-4.1.31-src/catalina/build.xml jakarta-tomcat-4.1.31-src-new/catalina/build.xml
--- jakarta-tomcat-4.1.31-src/catalina/build.xml Sat Sep 25 12:44:17 2004
+++ jakarta-tomcat-4.1.31-src-new/catalina/build.xml Wed Oct 27 11:00:22 2004
@@ -696,7 +696,7 @@
-
+
diff -uNr jakarta-tomcat-4.1.31-src/tomcat jakarta-tomcat-4.1.31-src-new/tomcat
--- jakarta-tomcat-4.1.31-src/tomcat Wed Dec 31 19:00:00 1969
+++ jakarta-tomcat-4.1.31-src-new/tomcat Wed Oct 27 11:38:32 2004
@@ -0,0 +1,58 @@
+#!/bin/sh
+# wrapper script for tomcat startup
+
+if [ `id -u -n` != 'tomcat' ]; then
+ chown -R tomcat:tomcat @PREFIX@/var/tomcat4/logs >/dev/null 2>&1 || :
+ sudo -u tomcat $0 "$@"
+ exit $?
+fi
+
+for file in @PREFIX@/etc/tomcat4/*.conf; do source "$file"; done
+
+chown -R tomcat:tomcat "$CATALINA_HOME"/work "$CATALINA_HOME"/logs >/dev/null 2>&1
+
+tcproccount() {
+ ps -auxwww | grep TOMCATLAUNCH | grep -v grep | wc -l
+}
+
+case "$1" in
+ start)
+ echo -n "Starting Tomcat: "
+ $CATALINA_HOME/bin/catalina.sh start >>@PREFIX@/var/tomcat4/logs/tomcat.log 2>&1
+ echo "ok"
+ ;;
+
+ stop)
+ $CATALINA_HOME/bin/catalina.sh stop >>@PREFIX@/var/tomcat4/logs/tomcat.log 2>&1
+ ;;
+
+ restart)
+ $0 stop
+
+ # wait 20 seconds and if tomcat hasn't shut down, error out
+ TCDONE=0
+ for i in 1 2 3 4 5 6 7 8 9 10; do
+ if [ "`tcproccount`" -ge 1 ]; then
+ sleep 2
+ else
+ TCDONE=1
+ break
+ fi
+ done
+ if [ "$TCDONE" = "1" ]; then
+ $0 start
+ else
+ echo ""
+ echo "Tomcat is not shutting down properly. Please check"
+ echo "your logs and try again."
+ echo ""
+ exit 1
+ fi
+ ;;
+
+ *)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+ ;;
+
+esac
diff -uNr jakarta-tomcat-4.1.31-src/tomcat.conf jakarta-tomcat-4.1.31-src-new/tomcat.conf
--- jakarta-tomcat-4.1.31-src/tomcat.conf Wed Dec 31 19:00:00 1969
+++ jakarta-tomcat-4.1.31-src-new/tomcat.conf Wed Oct 27 11:00:22 2004
@@ -0,0 +1,11 @@
+# location of your JDK
+JAVA_HOME=/Library/Java/Home export JAVA_HOME
+JSSE_HOME=$JAVA_HOME/lib/ext export JSSE_HOME
+
+# location of Tomcat
+CATALINA_HOME=@PREFIX@/var/tomcat4 export CATALINA_HOME
+
+# any extra options to pass to tomcat startup
+# feel free to add to this, but please don't remove the TOMCATLAUNCH,
+# it is used for finding tomcat processes
+CATALINA_OPTS="-DTOMCATLAUNCH=true" export CATALINA_OPTS
diff -uNr jakarta-tomcat-4.1.31-src/webapps/admin/admin.xml jakarta-tomcat-4.1.31-src-new/webapps/admin/admin.xml
--- jakarta-tomcat-4.1.31-src/webapps/admin/admin.xml Sat Sep 25 12:44:23 2004
+++ jakarta-tomcat-4.1.31-src-new/webapps/admin/admin.xml Wed Oct 27 11:00:22 2004
@@ -7,7 +7,7 @@
-->
-
-