cleaning up

4 files changed, 0 insertions, 221 deletions

diff --git a/net-www/tomcat/files/4.1.24/21tomcat b/net-www/tomcat/files/4.1.24/21tomcat
deleted file mode 100644
index a3879343e642..000000000000
--- a/net-www/tomcat/files/4.1.24/21tomcat
+++ /dev/null
@@ -1,2 +0,0 @@
-CATALINA_HOME=/opt/tomcat
-CONFIG_PROTECT=/opt/tomcat/conf
diff --git a/net-www/tomcat/files/4.1.24/gentoo.diff b/net-www/tomcat/files/4.1.24/gentoo.diff
deleted file mode 100644
index ccaeea1c260e..000000000000
--- a/net-www/tomcat/files/4.1.24/gentoo.diff
+++ /dev/null
@@ -1,111 +0,0 @@
---- bin/setclasspath.sh.orig	2003-03-25 10:41:13.000000000 -0500
-+++ bin/setclasspath.sh	2003-03-25 10:42:57.000000000 -0500
-@@ -6,13 +6,15 @@
- 
- # Make sure prerequisite environment variables are set
- if [ -z "$JAVA_HOME" ]; then
--  echo "The JAVA_HOME environment variable is not defined"
--  echo "This environment variable is needed to run this program"
-+  echo "The JAVA_HOME environment variable is not defined!"
-+  echo "This environment variable is needed to run this program."
-+  echo "See the /etc/conf.d/tomcat file for details."
-   exit 1
- fi
- if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/jdb -o ! -r "$JAVA_HOME"/bin/javac ]; then
--  echo "The JAVA_HOME environment variable is not defined correctly"
--  echo "This environment variable is needed to run this program"
-+  echo "The JAVA_HOME environment variable is not defined correctly!"
-+  echo "This environment variable is needed to run this program."
-+  echo "See the /etc/conf.d/tomcat file for details."
-   exit 1
- fi
- if [ -z "$BASEDIR" ]; then
-@@ -27,7 +29,7 @@
- fi
- 
- # Set the default -Djava.endorsed.dirs argument
--JAVA_ENDORSED_DIRS="$BASEDIR"/common/endorsed
-+JAVA_ENDORSED_DIRS="$TOMCAT_LIBDIR"
- 
- # Set standard CLASSPATH
- CLASSPATH="$JAVA_HOME"/lib/tools.jar
---- bin/catalina.sh.orig	2003-03-25 10:50:50.000000000 -0500
-+++ bin/catalina.sh	2003-03-25 10:55:13.000000000 -0500
-@@ -40,9 +40,6 @@
- 
- # OS specific support.  $var _must_ be set to either true or false.
- cygwin=false
--case "`uname`" in
--CYGWIN*) cygwin=true;;
--esac
- 
- # resolve links - $0 may be a softlink
- PRG="$0"
-@@ -63,15 +60,8 @@
- if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
-   . "$CATALINA_HOME"/bin/setenv.sh
- fi
-+source /etc/conf.d/tomcat
- 
--# For Cygwin, ensure paths are in UNIX format before anything is touched
--if $cygwin; then
--  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
--  [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"`
--  [ -n "$CATALINA_BASE" ] && CATALINA_BASE=`cygpath --unix "$CATALINA_BASE"`
--  [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
--  [ -n "$JSSE_HOME" ] && JSSE_HOME=`cygpath --path --unix "$JSSE_HOME"`
--fi
- 
- # Get standard Java environment variables
- if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
-@@ -98,23 +88,7 @@
-   CATALINA_TMPDIR="$CATALINA_BASE"/temp
- fi
- 
--# For Cygwin, switch paths to Windows format before running java
--if $cygwin; then
--  JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
--  CATALINA_HOME=`cygpath --path --windows "$CATALINA_HOME"`
--  CATALINA_BASE=`cygpath --path --windows "$CATALINA_BASE"`
--  CATALINA_TMPDIR=`cygpath --path --windows "$CATALINA_TMPDIR"`
--  CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
--  JSSE_HOME=`cygpath --path --windows "$JSSE_HOME"`
--fi
--
- # ----- Execute The Requested Command -----------------------------------------
--
--echo "Using CATALINA_BASE:   $CATALINA_BASE"
--echo "Using CATALINA_HOME:   $CATALINA_HOME"
--echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR"
--echo "Using JAVA_HOME:       $JAVA_HOME"
--
- if [ "$1" = "jpda" ] ; then
-   if [ -z "$JPDA_TRANSPORT" ]; then
-     JPDA_TRANSPORT="dt_socket"
-@@ -191,7 +165,7 @@
- elif [ "$1" = "start" ] ; then
- 
-   shift
--  touch "$CATALINA_BASE"/logs/catalina.out
-+  touch "$CATALINA_OUT"
-   if [ "$1" = "-security" ] ; then
-     echo "Using Security Manager"
-     shift
-@@ -203,7 +177,7 @@
-       -Dcatalina.home="$CATALINA_HOME" \
-       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-       org.apache.catalina.startup.Bootstrap "$@" start \
--      >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
-+      >> "$CATALINA_OUT" 2>&1 &
- 
-       if [ ! -z "$CATALINA_PID" ]; then
-         echo $! > $CATALINA_PID
-@@ -215,7 +189,7 @@
-       -Dcatalina.home="$CATALINA_HOME" \
-       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-       org.apache.catalina.startup.Bootstrap "$@" start \
--      >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
-+      >> "$CATALINA_OUT" 2>&1 &
- 
-       if [ ! -z "$CATALINA_PID" ]; then
-         echo $! > $CATALINA_PID
diff --git a/net-www/tomcat/files/4.1.24/tomcat.conf b/net-www/tomcat/files/4.1.24/tomcat.conf
deleted file mode 100644
index 8a6d49c81f9b..000000000000
--- a/net-www/tomcat/files/4.1.24/tomcat.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/files/4.1.24/tomcat.conf,v 1.2 2003/03/28 07:39:03 absinthe Exp $
-
-# JVM Runtime
-# Using the default setting, it will determine your JVM from the system-vm
-# set using java-config.
-# See java-config(1) manual page for assistance in determining this value.
-#
-# You can override this value with whatever path you wish.  
-# Example: JAVA_HOME=/opt/sun-jdk-1.4.1.01
-
-JAVA_HOME=`/bin/grep -e "JAVA_HOME" /etc/profile.env | /bin/sed -e "s/^.*'\(.*\)'$/\1/"`
-
-# (Optional) Java runtime options used when the "start", "stop", or "run"
-# commands are executed.
-# JAVA_OPTS=""
-
-# Where your web applications are located
-CATALINA_HOME=/opt/tomcat
-CATALINA_BASE=${CATALINA_HOME}
-
-# Tomcat's User
-CATALINA_USER=tomcat
-
-# Tomcat Log Location
-CATALINA_OUT=/var/log/tomcat/catalina.log
-
-# Location of the Tomcat JARs and classes
-CATALINA_LIBDIR=/usr/share/tomcat/lib
-
-# The CLASSPATH for Tomcat to use, plus any others you need.
-CLASSPATH=${CLASSPATH}:${CATALINA_LIBDIR}/lib
-
-# (Optional) Directory path location of temporary directory the JVM should 
-# use (java.io.tmpdir).  Defaults to $CATALINA_BASE/temp.
-# CATALINA_TMPDIR="/your/path/here"
-
-# TOMCAT STARTUP/SHUTDOWN
-# 	debug             Start Catalina in a debugger
-# 	debug -security   Debug Catalina with a security manager
-# 	embedded          Start Catalina in embedded mode
-# 	jpda start        Start Catalina under JPDA debugger
-# 	start             Start Catalina in a separate window
-# 	start -security   Start in a separate window with security manager
-# 	stop              Stop Catalina"
-#
-# NOTE: -security requires JSSE (see below)
-# NOTE: jpda requires JPDA (see below)
-TOMCAT_START="start"
-TOMCAT_STOP="stop"
-
-# (Optional) Java runtime options used when the "start", "stop", or "run" 
-# commands are executed.
-# CATALINA_OPTS=""
-
-# Java Platform Debugger Architecture (JPDA)
-# http://java.sun.com/products/jpda/
-# Included with Java SDK 1.3 and later.  No need to specify location.
-#
-#   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
-#                   command is executed. The default is "dt_socket".
-#
-#   JPDA_ADDRESS    (Optional) Java runtime options used when the "jpda start"
-#                   command is executed. The default is 8000.
-#
-# JPDA_TRANSPORT="dt_socket"
-# JPDA_ADDRESS="8000"
-
-# Java Secure Socket Extension (JSSE)
-# http://java.sun.com/products/jsse/
-# Included with Java SDK 1.4 and later.
-#
-#   JSSE_HOME       (Optional) May point at your Java Secure Sockets Extension
-#                   (JSSE) installation, whose JAR files will be added to the
-#                   system class path used to start Tomcat.
-#
-# JSSE_HOME="/opt/sun-jdk-1.4.1.02/jre/lib/"
diff --git a/net-www/tomcat/files/4.1.24/tomcat.init b/net-www/tomcat/files/4.1.24/tomcat.init
deleted file mode 100644
index 83f9d81e3289..000000000000
--- a/net-www/tomcat/files/4.1.24/tomcat.init
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/files/4.1.24/tomcat.init,v 1.2 2004/03/06 03:59:34 vapier Exp $
-
-depend() {
-	need net
-	use dns logger mysql postgresql
-}
-
-start()	{
-	ebegin "Starting Tomcat"
-	cd ${CATALINA_HOME}
-	su - ${CATALINA_USER} -c "/opt/tomcat/bin/catalina.sh ${TOMCAT_START}" 
-	eend $?
-}
-
-stop()	{
-	ebegin "Stopping Tomcat"
-	su - ${CATALINA_USER} -c "/opt/tomcat/bin/catalina.sh ${TOMCAT_STOP}"
-	sleep 2
-	eend $?
-}
-
-restart() {
-	ebegin "Restarting Tomcat"
-	su - ${CATALINA_USER} -c "/opt/tomcat/bin/catalina.sh ${TOMCAT_STOP}"
-	sleep 5
-	cd ${CATALINA_HOME}
-	su - ${CATALINA_USER} -c "/opt/tomcat/bin/catalina.sh ${TOMCAT_START}"
-	eend $?
-}