From 9bff3c840d424bbbd22b6c060ac2c3dfafd9d599 Mon Sep 17 00:00:00 2001
From: Coty Sutherland <csutherl@redhat.com>
Date: Wed, 13 Jun 2018 14:02:14 -0400
Subject: [PATCH] Remove JSVC support from tomcat-functions for this tomcat
 package

---
 tomcat-functions | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/tomcat-functions b/tomcat-functions
index ab08fa2..ac7f00d 100644
--- a/tomcat-functions
+++ b/tomcat-functions
@@ -13,28 +13,12 @@ _save_function() {
     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
 
 run() {
    if [ "${USE_JSVC}" = "true" ] ; then
-	run_jsvc $@
+    echo "JSVC support is not available with this Tomcat package."
+    exit 1
    else
 	run_java $@
    fi