summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Sennhauser <sera@gentoo.org>2012-07-25 08:12:48 +0000
committerRalph Sennhauser <sera@gentoo.org>2012-07-25 08:12:48 +0000
commit88b371a638da0669a82586aa6602b7721a0f2d48 (patch)
tree595e31b932d74a97ea113450f3aeb0768f8c9ee9
parentwhitespace (diff)
downloadgentoo-2-88b371a638da0669a82586aa6602b7721a0f2d48.tar.gz
gentoo-2-88b371a638da0669a82586aa6602b7721a0f2d48.tar.bz2
gentoo-2-88b371a638da0669a82586aa6602b7721a0f2d48.zip
Pass to vm instead of catalina in init script. Thanks to Märt Bakhoff <spam3910807@gmail.com> #427664
(Portage version: 2.1.11.9/cvs/Linux x86_64)
-rw-r--r--www-servers/tomcat/ChangeLog6
-rw-r--r--www-servers/tomcat/files/tomcat.init5
2 files changed, 8 insertions, 3 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 59eb7e72c318..27b7281ea43c 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.295 2012/07/20 17:36:54 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.296 2012/07/25 08:12:48 sera Exp $
+
+ 25 Jul 2012; Ralph Sennhauser <sera@gentoo.org> files/tomcat.init:
+ Pass to vm instead of catalina in init script. Thanks to Märt Bakhoff
+ <spam3910807@gmail.com> #427664
*tomcat-7.0.29-r1 (20 Jul 2012)
*tomcat-6.0.35-r1 (20 Jul 2012)
diff --git a/www-servers/tomcat/files/tomcat.init b/www-servers/tomcat/files/tomcat.init
index b076f99b6bdf..1f806810ce22 100644
--- a/www-servers/tomcat/files/tomcat.init
+++ b/www-servers/tomcat/files/tomcat.init
@@ -49,7 +49,7 @@ start() {
args="${args} ${JPDA_OPTS}"
fi
if [ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]; then
- JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
+ args="${args} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
-Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties"
fi
@@ -61,13 +61,14 @@ start() {
--exec ${JAVA_HOME}/bin/${cmd} \
-- \
${JAVA_OPTS} \
+ ${args} \
-Dcatalina.base="${CATALINA_BASE}" \
-Dcatalina.home="${CATALINA_HOME}" \
-Djava.io.tmpdir="${CATALINA_TMPDIR}" \
-classpath "${CLASSPATH}" \
org.apache.catalina.startup.Bootstrap \
${CATALINA_OPTS} \
- ${args} ${TOMCAT_START}
+ ${TOMCAT_START}
eend $?
}