Holy crap a new tomcat... :)

8 files changed, 265 insertions, 8 deletions

diff --git a/net-www/tomcat/ChangeLog b/net-www/tomcat/ChangeLog
index 5ed0159ef640..5ae1c060ce93 100644
--- a/net-www/tomcat/ChangeLog
+++ b/net-www/tomcat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-www/tomcat
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/ChangeLog,v 1.30 2004/04/27 20:55:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/ChangeLog,v 1.31 2004/05/19 17:42:56 zx Exp $
+
+*tomcat-5.0.25 (19 May 2004)
+
+  19 May 2004; Chris Aniszczyk <zx@gentoo.org> +files/5.0.25/21tomcat,
+  +files/5.0.25/gentoo.diff, +files/5.0.25/tomcat.conf,
+  +files/5.0.25/tomcat.init, +tomcat-5.0.25.ebuild:
+  New tomcat and new layout scheme.
+  Thanks to Tim Chen for the initial ebuild.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> tomcat-4.1.29.ebuild:
   Add inherit eutils
diff --git a/net-www/tomcat/Manifest b/net-www/tomcat/Manifest
index 3ce9d1ad7f80..7c1b4c771776 100644
--- a/net-www/tomcat/Manifest
+++ b/net-www/tomcat/Manifest
@@ -1,15 +1,21 @@
-MD5 a5fc0f77d896a1258bba73c553d19d75 ChangeLog 6487
+MD5 0c217a663f0f6bb95b7d98464fc03157 ChangeLog 6486
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 89a4cf22a7086ff61c3eff0d869e8fdd tomcat-4.1.29.ebuild 4234
-MD5 1bd68315bee98f6972ea3e31e0224f03 tomcat-5.0.18.ebuild 4413
+MD5 463fefea7d6fa30426350efcdd267501 tomcat-4.1.29.ebuild 4233
+MD5 c39b4097e57304056a14a6aa9f925b77 tomcat-5.0.18.ebuild 4412
+MD5 37ba14efdff3a5406f50a8b9f25183b4 tomcat-5.0.25.ebuild 3078
 MD5 aadebd5a246bdfeb6ccf764f4f9b289b files/digest-tomcat-4.1.29 74
 MD5 16a563fee9101781e780f3d7909f999d files/digest-tomcat-5.0.18 75
+MD5 59c2cca5fed04f099567957c04297f51 files/digest-tomcat-5.0.25 75
 MD5 d686b57da55c6d8da476981c6557a3a1 files/4.1.29/21tomcat 152
 MD5 8e78596e41abd9a751733cc48570d1a4 files/4.1.29/gentoo.diff 5815
-MD5 2deac7fda9f45b969dfb83aad24536cb files/4.1.29/tomcat.conf 2708
-MD5 09d8dc78bb3606f48d8f720960c6707d files/4.1.29/tomcat.init 799
+MD5 219cd03e7fd965c15b668a1e41a6e867 files/4.1.29/tomcat.conf 2707
+MD5 8c6b16a4fa1cf234457cbb2e9dacaf42 files/4.1.29/tomcat.init 798
 MD5 d686b57da55c6d8da476981c6557a3a1 files/5.0.18/21tomcat 152
 MD5 d0b4b02720bc1672f97f846c44be219e files/5.0.18/gentoo.diff 6359
-MD5 7a12faca3e29fee290fee8e710698e96 files/5.0.18/tomcat.conf 2646
-MD5 6cbb650cb68d7578b259a822ecbb1afd files/5.0.18/tomcat.init 799
 MD5 05406ff27a96734864728d6ae8a95482 files/5.0.18/jikes.diff 904
+MD5 1b106c8de8b8546675d60600f778fa28 files/5.0.18/tomcat.conf 2645
+MD5 646b56c2d0ff6cfb14ccb77d598f5646 files/5.0.18/tomcat.init 798
+MD5 fa8a75161f8536952738fe8adddc95d5 files/5.0.25/gentoo.diff 467
+MD5 10f3070771c952b5b92e21ad96042780 files/5.0.25/tomcat.conf 2652
+MD5 3ba870a09fa1571004267f1a5cf49c5e files/5.0.25/tomcat.init 819
+MD5 6a2e3734b0dedcf684fb8f6e68b04293 files/5.0.25/21tomcat 155
diff --git a/net-www/tomcat/files/5.0.25/21tomcat b/net-www/tomcat/files/5.0.25/21tomcat
new file mode 100644
index 000000000000..b594d1c35c93
--- /dev/null
+++ b/net-www/tomcat/files/5.0.25/21tomcat
@@ -0,0 +1,5 @@
+CATALINA_HOME=/opt/tomcat5
+CONFIG_PROTECT=/etc/tomcat5
+#CATALINA_LIBDIR=/usr/share/tomcat5/lib 
+#CLASSPATH=${CATALINA_LIBDIR} 
+#ENV_VARS="CATALINA_LIBDIR"
diff --git a/net-www/tomcat/files/5.0.25/gentoo.diff b/net-www/tomcat/files/5.0.25/gentoo.diff
new file mode 100644
index 000000000000..1ed154b18d02
--- /dev/null
+++ b/net-www/tomcat/files/5.0.25/gentoo.diff
@@ -0,0 +1,13 @@
+--- bin/catalina.sh.orig	2004-05-19 02:25:07.000000000 -0400
++++ bin/catalina.sh	2004-05-19 02:23:20.128089696 -0400
+@@ -38,6 +38,10 @@
+ # $Id: gentoo.diff,v 1.1 2004/05/19 17:42:56 zx Exp $
+ # -----------------------------------------------------------------------------
+ 
++# source the appropriate files right away
++source /etc/profile
++source /etc/conf.d/tomcat5
++
+ # OS specific support.  $var _must_ be set to either true or false.
+ cygwin=false
+ os400=false
diff --git a/net-www/tomcat/files/5.0.25/tomcat.conf b/net-www/tomcat/files/5.0.25/tomcat.conf
new file mode 100644
index 000000000000..ac90fb77c625
--- /dev/null
+++ b/net-www/tomcat/files/5.0.25/tomcat.conf
@@ -0,0 +1,76 @@
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/files/5.0.25/tomcat.conf,v 1.1 2004/05/19 17:42:56 zx 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=`java-config -O`
+
+# (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/tomcat5
+#CATALINA_BASE=${CATALINA_HOME}
+
+# Tomcat's User
+CATALINA_USER=tomcat
+
+# Tomcat Console Log Location
+CATALINA_OUT=/var/log/tomcat5/catalina.log
+
+# Location of the Tomcat JARs and classes
+#CATALINA_LIBDIR=/usr/share/tomcat5/lib
+
+# The CLASSPATH for Tomcat to use, plus any others you need.
+#CLASSPATH=${CLASSPATH}:${CATALINA_LIBDIR}
+
+# (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/5.0.25/tomcat.init b/net-www/tomcat/files/5.0.25/tomcat.init
new file mode 100644
index 000000000000..7a4f1227ee32
--- /dev/null
+++ b/net-www/tomcat/files/5.0.25/tomcat.init
@@ -0,0 +1,32 @@
+#!/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/5.0.25/tomcat.init,v 1.1 2004/05/19 17:42:56 zx Exp $
+
+depend() {
+	need net
+	use dns logger mysql postgresql
+}
+
+start()	{
+	ebegin "Starting Tomcat"
+	cd ${CATALINA_HOME}
+	su - ${CATALINA_USER} -c "${CATALINA_HOME}/bin/catalina.sh ${TOMCAT_START}" 
+	eend $?
+}
+
+stop()	{
+	ebegin "Stopping Tomcat"
+	su - ${CATALINA_USER} -c "${CATALINA_HOME}/bin/catalina.sh ${TOMCAT_STOP}"
+	sleep 2
+	eend $?
+}
+
+restart() {
+	ebegin "Restarting Tomcat"
+	su - ${CATALINA_USER} -c "${CATALINA_HOME}/bin/catalina.sh ${TOMCAT_STOP}"
+	sleep 5
+	cd ${CATALINA_HOME}
+	su - ${CATALINA_USER} -c "${CATALINA_HOME}/bin/catalina.sh ${TOMCAT_START}"
+	eend $?
+}
diff --git a/net-www/tomcat/files/digest-tomcat-5.0.25 b/net-www/tomcat/files/digest-tomcat-5.0.25
new file mode 100644
index 000000000000..c21d8db0edd1
--- /dev/null
+++ b/net-www/tomcat/files/digest-tomcat-5.0.25
@@ -0,0 +1 @@
+MD5 456001c1844b25605e0cf76537fa8504 jakarta-tomcat-5.0.25.tar.gz 10227073
diff --git a/net-www/tomcat/tomcat-5.0.25.ebuild b/net-www/tomcat/tomcat-5.0.25.ebuild
new file mode 100644
index 000000000000..9e26ad2f13eb
--- /dev/null
+++ b/net-www/tomcat/tomcat-5.0.25.ebuild
@@ -0,0 +1,116 @@
+# 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/tomcat-5.0.25.ebuild,v 1.1 2004/05/19 17:42:56 zx Exp $
+
+inherit eutils
+
+DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
+
+JT_P="jakarta-${P}.tar.gz"
+S=${WORKDIR}/jakarta-${P}
+SRC_URI="http://mirrors.combose.com/apache/jakarta/tomcat-5/v5.0.25-alpha/bin/${JT_P}"
+HOMEPAGE="http://jakarta.apache.org/tomcat"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+LICENSE="Apache-2.0"
+SLOT="0"
+DEPEND="sys-apps/sed"
+RDEPEND=">=virtual/jdk-1.2"
+RESTRICT="nomirror"
+IUSE=""
+
+src_unpack() {
+	tar xzf ${DISTDIR}/${JT_P} || die
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/gentoo.diff
+}
+
+pkg_setup() {
+	USERADDED=false
+	if ! groupmod tomcat >/dev/null 2>&1 ; then
+		groupadd -g 265 tomcat || die "problem adding group tomcat, gid 265"
+		USERADDED=true
+	fi
+
+	if ! id tomcat >/dev/null 2>&1 ; then
+		useradd -u 265 -g tomcat -s /bin/bash -d /opt/${PN}5 -c "Apache Tomcat" tomcat || die "problem adding user tomcat, uid 265"
+		USERADDED=true
+	fi
+}
+
+src_install() {
+	TOMCAT_HOME="/opt/tomcat5"
+	TOMCAT_NAME="tomcat5"
+	INSTALLING="yes"
+	DIROPTIONS="--mode=0750 --owner=tomcat --group=tomcat"
+
+	# Create directories
+	dodir ${TOMCAT_HOME}
+	dodir /var/log/${TOMCAT_NAME}
+	dosym /var/log/${TOMCAT_NAME} ${TOMCAT_HOME}/logs
+	keepdir /var/log/${TOMCAT_NAME}
+
+	cd ${S}
+
+	# FIX ALL PERMISSIONS
+	chown -R tomcat:tomcat ${S}
+
+	cp -a * ${D}${TOMCAT_HOME}
+
+	# INIT SCRIPTS AND ENV
+	cp -a ${FILESDIR}/${PV}/tomcat.init ${S}/${TOMCAT_NAME}
+	insinto /etc/init.d
+	insopts -m0750
+	doins ${S}/${TOMCAT_NAME}
+
+	cp -a ${FILESDIR}/${PV}/tomcat.conf ${S}/${TOMCAT_NAME}
+	insinto /etc/conf.d
+	insopts -m0644
+	doins ${S}/${TOMCAT_NAME}
+
+	cp -a ${FILESDIR}/${PV}/21tomcat ${S}/21${TOMCAT_NAME}
+	insinto /etc/env.d
+	insopts -m0644
+	doins ${S}/21${TOMCAT_NAME}
+
+	dodir /etc/${TOMCAT_NAME}
+	dosym /etc/${TOMCAT_NAME} ${TOMCAT_HOME}/conf
+}
+
+pkg_postinst() {
+	einfo " "
+	einfo " NOTICE!"
+	if ${USERADDED} ; then
+		einfo " User and group 'tomcat' have been added."
+		einfo " "
+	fi
+	einfo " FILE LOCATIONS:"
+	einfo " 1.  Tomcat home directory: /opt/tomcat5"
+	einfo "     Contains application data, configuration files."
+	einfo " 2.  Runtime settings: /etc/conf.d/tomcat5"
+	einfo "     Contains CLASSPATH and JAVA_HOME settings."
+	einfo " 3.  Configuration:  /etc/tomcat5/"
+	einfo " 4.  Logs:  /var/log/tomcat5/"
+	einfo " 5.  Executables, libraries:  /usr/share/tomcat/"
+	einfo " "
+	einfo " "
+	einfo " STARTING AND STOPPING TOMCAT:"
+	einfo "   /etc/init.d/tomcat5 start"
+	einfo "   /etc/init.d/tomcat5 stop"
+	einfo "   /etc/init.d/tomcat5 restart"
+	einfo " "
+	einfo " "
+	einfo " NETWORK CONFIGURATION:"
+	einfo " By default, Tomcat runs on port 8080.  You can change this"
+	einfo " value by editing /etc/tomcat5/server.xml."
+	einfo " "
+	einfo " To test Tomcat while it's running, point your web browser to:"
+	einfo " http://localhost:8080/"
+	einfo " "
+	einfo " "
+	einfo " BUGS:"
+	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
+	einfo " may not get seen.  Thank you."
+	einfo " "
+	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
+	sleep 10
+}