summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Thomson <wltjr@gentoo.org>2006-09-09 21:20:21 +0000
committerWilliam Thomson <wltjr@gentoo.org>2006-09-09 21:20:21 +0000
commit21ff79bfdc2cc5392d4ea38b1d1108d899c9f866 (patch)
treee9179263947a04ee0114391b15b21766b23f029c /www-servers/tomcat/files/5.0.28/tomcat.conf
parentx86 (diff)
downloadhistorical-21ff79bfdc2cc5392d4ea38b1d1108d899c9f866.tar.gz
historical-21ff79bfdc2cc5392d4ea38b1d1108d899c9f866.tar.bz2
historical-21ff79bfdc2cc5392d4ea38b1d1108d899c9f866.zip
Removed eant || die from ebuilds. Sync 5.0.28 ebuild with one in overlay that is more current. Removed older versions of 5.5.17 ebuild.
Package-Manager: portage-2.1.1_rc1-r5
Diffstat (limited to 'www-servers/tomcat/files/5.0.28/tomcat.conf')
-rw-r--r--www-servers/tomcat/files/5.0.28/tomcat.conf20
1 files changed, 8 insertions, 12 deletions
diff --git a/www-servers/tomcat/files/5.0.28/tomcat.conf b/www-servers/tomcat/files/5.0.28/tomcat.conf
index c2e686472f45..8aef879d0cd8 100644
--- a/www-servers/tomcat/files/5.0.28/tomcat.conf
+++ b/www-servers/tomcat/files/5.0.28/tomcat.conf
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.28/tomcat.conf,v 1.4 2005/09/18 14:10:44 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.28/tomcat.conf,v 1.5 2006/09/09 21:20:21 wltjr Exp $
# JVM Runtime
# Using the default setting, it will determine your JVM from the system-vm
@@ -8,36 +8,32 @@
# You can override this value with whatever path you wish.
# Example: JAVA_HOME=/opt/sun-jdk-1.4.2.05
-#JAVA_HOME=`java-config -O`
+JAVA_HOME=`java-config --jre-home`
# (Optional) Java runtime options used when the "start", "stop", or "run"
# commands are executed.
# JAVA_OPTS=""
-# profile
-PROFILE=default
-
# Where your web applications are located
-CATALINA_HOME=/usr/share/tomcat-5
-CATALINA_BASE=/var/lib/tomcat-5/${PROFILE}
+CATALINA_HOME=/usr/share/tomcat-5/
+CATALINA_BASE=/var/lib/tomcat-5/
# Tomcat's User
CATALINA_USER=tomcat
# Location of the Tomcat JARs and classes
-CATALINA_LIBDIR=/usr/share/tomcat-5/server/lib
+CATALINA_LIBDIR=/usr/share/tomcat-5/server/lib/
# The CLASSPATH for Tomcat to use, plus any others you need.
-#CLASSPATH=${CLASSPATH}:${CATALINA_LIBDIR}
+CLASSPATH=${CATALINA_LIBDIR}
# (Optional) Directory path location of temporary directory the JVM should
# use (java.io.tmpdir). Defaults to $CATALINA_BASE/temp.
-CATALINA_TMPDIR="/var/tmp/tomcat-5/${PROFILE}"
+CATALINA_TMPDIR="/var/tmp/tomcat-5/"
# 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
@@ -50,7 +46,7 @@ TOMCAT_STOP="stop"
# (Optional) Java runtime options used when the "start", "stop", or "run"
# commands are executed.
-#CATALINA_OPTS="-Dlog4j.configuration=file:/etc/tomcat-5/log4j.properties"
+# CATALINA_OPTS=""
# Java Platform Debugger Architecture (JPDA)
# http://java.sun.com/products/jpda/