Remove JSVC support from tomcat-functions for this tomcat package
This commit is contained in:
parent
a6663e4ef4
commit
1fc89451d7
|
@ -13,28 +13,12 @@ _save_function() {
|
||||||
eval "$NEWNAME_FUNC"
|
eval "$NEWNAME_FUNC"
|
||||||
}
|
}
|
||||||
|
|
||||||
run_jsvc(){
|
|
||||||
if [ -x /usr/bin/jsvc ]; then
|
|
||||||
TOMCAT_USER="${TOMCAT_USER:-tomcat}"
|
|
||||||
JSVC="/usr/bin/jsvc"
|
|
||||||
|
|
||||||
JSVC_OPTS="-nodetach -pidfile /var/run/jsvc-tomcat${NAME}.pid -user ${TOMCAT_USER} -outfile ${CATALINA_BASE}/logs/catalina.out -errfile ${CATALINA_BASE}/logs/catalina.out"
|
|
||||||
if [ "$1" = "stop" ]; then
|
|
||||||
JSVC_OPTS="${JSVC_OPTS} -stop"
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec "${JSVC}" ${JSVC_OPTS} ${FLAGS} -classpath "${CLASSPATH}" ${OPTIONS} "${MAIN_CLASS}" "${@}"
|
|
||||||
else
|
|
||||||
echo "Can't find /usr/bin/jsvc executable"
|
|
||||||
fi
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
_save_function run run_java
|
_save_function run run_java
|
||||||
|
|
||||||
run() {
|
run() {
|
||||||
if [ "${USE_JSVC}" = "true" ] ; then
|
if [ "${USE_JSVC}" = "true" ] ; then
|
||||||
run_jsvc $@
|
echo "JSVC support is not available with this Tomcat package."
|
||||||
|
exit 1
|
||||||
else
|
else
|
||||||
run_java $@
|
run_java $@
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue