Attachment #118236 for bug #174498

View | Details | Raw Unified | Return to bug 174498
Collapse All | Expand All




	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
		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
		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"

	local executor=${1}
	shift
	local arguments="--start --quiet --background --chuid ${CATALINA_USER}:${CATALINA_GROUP} \
		--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 $?
}

	ebegin "Starting Tomcat"
	init_env_vars
	# Figure out what arguments to pass start_helper based on TOMCAT_START
	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
		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
		start_helper ${JAVA_HOME}/bin/java ${JPDA_OPTS}
	elif [ "${TOMCAT_START}" = "start" ] ; then
		start_helper ${JAVA_HOME}/bin/java
	elif [ "${TOMCAT_START}" = "start -security" ] ; then
		start_helper ${JAVA_HOME}/bin/java \
			-Djava.security.manager \
			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy

stop()	{
	ebegin "Stopping Tomcat"
	init_env_vars
	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 $?
}

Return to bug 174498

Lines 16-29 Link Here

(-)/imports/repos/gentoo-x86-sync/www-servers/tomcat/files/6/tomcat.init (-10 / +10 lines)
16	JPDA_OPTS=${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"}	16	JPDA_OPTS=${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"}
17		17
18	# Activate Logging	18	# Activate Logging
19	if [[ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]]; then	19	if [ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]; then
20	JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \	20	JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
21	-Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties"	21	-Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties"
22	fi	22	fi
23		23
24	# Populate the classpath	24	# Populate the classpath
25	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/lib:${JAVA_HOME}/lib/tools.jar"	25	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/lib:${JAVA_HOME}/lib/tools.jar"
26	if [[ -n "${JSSE_HOME}" ]]; then	26	if [ -n "${JSSE_HOME}" ]; then
27	CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar"	27	CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar"
28	fi	28	fi
29	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar"	29	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar"
Lines 45-51 Link Here
45	local executor=${1}	45	local executor=${1}
46	shift	46	shift
47	local arguments="--start --quiet --background --chuid ${CATALINA_USER}:${CATALINA_GROUP} \	47	local arguments="--start --quiet --background --chuid ${CATALINA_USER}:${CATALINA_GROUP} \
48	--make-pidfile --pidfile /var/run/tomcat.pid"	48	--make-pidfile --pidfile /var/run/tomcat-6.pid"
49	start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> "$CATALINA_BASE"/logs/catalina.out 2>&1	49	start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> "$CATALINA_BASE"/logs/catalina.out 2>&1
50	return $?	50	return $?
51	}	51	}
Lines 58-76 Link Here
58	ebegin "Starting Tomcat"	58	ebegin "Starting Tomcat"
59	init_env_vars	59	init_env_vars
60	# Figure out what arguments to pass start_helper based on TOMCAT_START	60	# Figure out what arguments to pass start_helper based on TOMCAT_START
61	if [[ "${TOMCAT_START}" == "debug" ]] ; then	61	if [ "${TOMCAT_START}" = "debug" ] ; then
62	start_helper ${JAVA_HOME}/bin/jdb \	62	start_helper ${JAVA_HOME}/bin/jdb \
63	-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share	63	-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share
64	elif [[ "${TOMCAT_START}" == "debug -security" ]] ; then	64	elif [ "${TOMCAT_START}" = "debug -security" ] ; then
65	start_helper ${JAVA_HOME}/bin/jdb \	65	start_helper ${JAVA_HOME}/bin/jdb \
66	-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \	66	-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \
67	-Djava.security.manager \	67	-Djava.security.manager \
68	-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy	68	-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
69	elif [[ "${TOMCAT_START}" == "jpda start" ]] ; then	69	elif [ "${TOMCAT_START}" = "jpda start" ] ; then
70	start_helper ${JAVA_HOME}/bin/java ${JPDA_OPTS}	70	start_helper ${JAVA_HOME}/bin/java ${JPDA_OPTS}
71	elif [[ "${TOMCAT_START}" == "start" ]] ; then	71	elif [ "${TOMCAT_START}" = "start" ] ; then
72	start_helper ${JAVA_HOME}/bin/java	72	start_helper ${JAVA_HOME}/bin/java
73	elif [[ "${TOMCAT_START}" == "start -security" ]] ; then	73	elif [ "${TOMCAT_START}" = "start -security" ] ; then
74	start_helper ${JAVA_HOME}/bin/java \	74	start_helper ${JAVA_HOME}/bin/java \
75	-Djava.security.manager \	75	-Djava.security.manager \
76	-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy	76	-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
Lines 85-92 Link Here
85	stop() {	85	stop() {
86	ebegin "Stopping Tomcat"	86	ebegin "Stopping Tomcat"
87	init_env_vars	87	init_env_vars
88	start-stop-daemon --stop --quiet \	88	start-stop-daemon --stop --name java \
89	--make-pidfile --pidfile /var/run/tomcat.pid \	89	--make-pidfile --pidfile /var/run/tomcat-6.pid \
90	--exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} stop ${STD_OUT}	90	--exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} stop ${STD_OUT}
91	eend $?	91	eend $?
92	}	92	}