[pkg-java] r2825 - branches/tomcat5.5/feature/debian/debian

[Marcus Better]

Author: marcusb-guest
Date: 2006-11-30 12:02:24 +0100 (Thu, 30 Nov 2006)
New Revision: 2825

Modified:
   branches/tomcat5.5/feature/debian/debian/tomcat5.5.default
   branches/tomcat5.5/feature/debian/debian/tomcat5.5.init
Log:
Remove obsolete shutdown delay.


Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.default
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.default	2006-11-30 10:40:55 UTC (rev 2824)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.default	2006-11-30 11:02:24 UTC (rev 2825)
@@ -28,7 +28,3 @@
 # NOTE: java-gcj-compat-dev currently doesn't support a security
 # manager. 
 #TOMCAT5_SECURITY=yes
-
-# Timeout in seconds for the shutdown procedure (default: 30). The Java
-# processes will be killed if tomcat5.5 has not stopped until then.
-#TOMCAT5_SHUTDOWN=30

Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.init
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.init	2006-11-30 10:40:55 UTC (rev 2824)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.init	2006-11-30 11:02:24 UTC (rev 2825)
@@ -162,7 +162,7 @@
 		log_progress_msg "(not running)"
 	else
 		$DAEMON -cp "$JSVC_CLASSPATH" -pidfile "$CATALINA_PID" \
-		     -stop -wait "$TOMCAT5_SHUTDOWN" "$BOOTSTRAP_CLASS"
+		     -stop "$BOOTSTRAP_CLASS"
 	fi
 	log_end_msg 0
 	;;