summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-servers/tomcat/files')
-rwxr-xr-xwww-servers/tomcat/files/5.5.20/tomcat.init6
-rwxr-xr-xwww-servers/tomcat/files/6/tomcat.init6
-rw-r--r--www-servers/tomcat/files/digest-tomcat-5.5.20-r10 (renamed from www-servers/tomcat/files/digest-tomcat-5.5.20-r9)0
-rw-r--r--www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r5 (renamed from www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r4)0
-rw-r--r--www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r2 (renamed from www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r1)0
5 files changed, 4 insertions, 8 deletions
diff --git a/www-servers/tomcat/files/5.5.20/tomcat.init b/www-servers/tomcat/files/5.5.20/tomcat.init
index 3b083cd2d844..677bdbde0b94 100755
--- a/www-servers/tomcat/files/5.5.20/tomcat.init
+++ b/www-servers/tomcat/files/5.5.20/tomcat.init
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5.20/tomcat.init,v 1.3 2007/01/10 21:06:33 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5.20/tomcat.init,v 1.4 2007/01/28 07:26:59 wltjr Exp $
init_env_vars() {
# Set some sane defaults
@@ -38,8 +38,6 @@ init_env_vars() {
touch "${CATALINA_BASE}logs/catalina.out"
chown tomcat:tomcat "${CATALINA_BASE}logs/catalina.out"
fi
-
- STD_OUT=" 2<&1 >> ${CATALINA_BASE}logs/catalina.out"
}
start-helper() {
@@ -47,7 +45,7 @@ start-helper() {
shift
local arguments="--start --quiet --background --chuid ${CATALINA_USER}:${CATALINA_GROUP} \
--make-pidfile --pidfile /var/run/tomcat.pid"
- start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${STD_OUT} ${TOMCAT_START}
+ start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> "$CATALINA_BASE"/logs/catalina.out 2>&1
return $?
}
diff --git a/www-servers/tomcat/files/6/tomcat.init b/www-servers/tomcat/files/6/tomcat.init
index 6b32e6b32e31..c4e863f61d0f 100755
--- a/www-servers/tomcat/files/6/tomcat.init
+++ b/www-servers/tomcat/files/6/tomcat.init
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.3 2007/01/10 21:06:33 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.4 2007/01/28 07:26:59 wltjr Exp $
init_env_vars() {
# Set some sane defaults
@@ -36,8 +36,6 @@ init_env_vars() {
touch "${CATALINA_BASE}logs/catalina.out"
chown tomcat:tomcat "${CATALINA_BASE}logs/catalina.out"
fi
-
- STD_OUT=" 2<&1 >> ${CATALINA_BASE}logs/catalina.out"
}
start-helper() {
@@ -45,7 +43,7 @@ start-helper() {
shift
local arguments="--start --quiet --background --chuid ${CATALINA_USER}:${CATALINA_GROUP} \
--make-pidfile --pidfile /var/run/tomcat.pid"
- start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${STD_OUT} ${TOMCAT_START}
+ start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> "$CATALINA_BASE"/logs/catalina.out 2>&1
return $?
}
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.20-r9 b/www-servers/tomcat/files/digest-tomcat-5.5.20-r10
index 25cb711a112c..25cb711a112c 100644
--- a/www-servers/tomcat/files/digest-tomcat-5.5.20-r9
+++ b/www-servers/tomcat/files/digest-tomcat-5.5.20-r10
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r4 b/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r5
index 1309a094c51c..1309a094c51c 100644
--- a/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r4
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r5
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r1 b/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r2
index d9ae7e3b1bba..d9ae7e3b1bba 100644
--- a/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r1
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r2