[patch] tomcat 6 init script patch for Baselayout 2 [revised]

tomcat-6-init-baselayout2.patch (text/plain), 2.90 KB, created by Diego Elio Pettenò (RETIRED) on 2007-05-05 13:25:50 UTC

--- /imports/repos/gentoo-x86-sync/www-servers/tomcat/files/6/tomcat.init	2007-04-19 18:36:07 +0200
+++ /etc/init.d/tomcat-6	2007-05-05 16:25:09 +0200
@@ -16,14 +16,14 @@
 	JPDA_OPTS=${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"}
 
 	# Activate Logging
-	if [[ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]]; then
+	if [ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]; then
 		JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
 			-Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties"
 	fi
 
 	# Populate the classpath
 	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/lib:${JAVA_HOME}/lib/tools.jar"
-	if [[ -n "${JSSE_HOME}" ]]; then
+	if [ -n "${JSSE_HOME}" ]; then
 		CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar"
 	fi
 	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar"
@@ -45,7 +45,7 @@
 	local executor=${1}
 	shift
 	local arguments="--start --quiet --background --chuid ${CATALINA_USER}:${CATALINA_GROUP} \
-		--make-pidfile --pidfile /var/run/tomcat.pid"
+		--make-pidfile --pidfile /var/run/tomcat-6.pid"
 	start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> "$CATALINA_BASE"/logs/catalina.out 2>&1
 	return $?
 }
@@ -58,19 +58,19 @@
 	ebegin "Starting Tomcat"
 	init_env_vars
 	# Figure out what arguments to pass start_helper based on TOMCAT_START
-	if [[ "${TOMCAT_START}" == "debug" ]] ; then
+	if [ "${TOMCAT_START}" = "debug" ] ; then
 		start_helper ${JAVA_HOME}/bin/jdb \
 			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share
-	elif [[ "${TOMCAT_START}" == "debug -security" ]] ; then
+	elif [ "${TOMCAT_START}" = "debug -security" ] ; then
 		start_helper ${JAVA_HOME}/bin/jdb \
 			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \
 			-Djava.security.manager \
 			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
-	elif [[ "${TOMCAT_START}" == "jpda start" ]] ; then
+	elif [ "${TOMCAT_START}" = "jpda start" ] ; then
 		start_helper ${JAVA_HOME}/bin/java ${JPDA_OPTS}
-	elif [[ "${TOMCAT_START}" == "start" ]] ; then
+	elif [ "${TOMCAT_START}" = "start" ] ; then
 		start_helper ${JAVA_HOME}/bin/java
-	elif [[ "${TOMCAT_START}" == "start -security" ]] ; then
+	elif [ "${TOMCAT_START}" = "start -security" ] ; then
 		start_helper ${JAVA_HOME}/bin/java \
 			-Djava.security.manager \
 			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
@@ -85,8 +85,8 @@
 stop()	{
 	ebegin "Stopping Tomcat"
 	init_env_vars
-	start-stop-daemon --stop --quiet \
-	       	--make-pidfile --pidfile /var/run/tomcat.pid \
+	start-stop-daemon --stop --name java \
+	       	--make-pidfile --pidfile /var/run/tomcat-6.pid \
 			--exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} stop ${STD_OUT}
 	eend $?
 }