[pkg-java] r11300 - trunk/tomcat6/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2009-12-19 18:12:25 +0000 (Sat, 19 Dec 2009)
New Revision: 11300

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/tomcat6.default
   trunk/tomcat6/debian/tomcat6.init
Log:
Always set JSVC_CLASSPATH and fixed spelling.

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2009-12-18 05:51:36 UTC (rev 11299)
+++ trunk/tomcat6/debian/changelog	2009-12-19 18:12:25 UTC (rev 11300)
@@ -1,3 +1,10 @@
+tomcat6 (6.0.20-9) unstable; urgency=low
+
+  * Fix spelling issues.
+  * Always set JSVC_CLASSPATH to a default value in init.
+
+ -- Niels Thykier <niels at thykier.net>  Sat, 19 Dec 2009 19:11:33 +0100
+
 tomcat6 (6.0.20-8) unstable; urgency=low
 
   * Corrected some spelling mistakes in debian/control.

Modified: trunk/tomcat6/debian/tomcat6.default
===================================================================
--- trunk/tomcat6/debian/tomcat6.default	2009-12-18 05:51:36 UTC (rev 11299)
+++ trunk/tomcat6/debian/tomcat6.default	2009-12-19 18:12:25 UTC (rev 11300)
@@ -12,11 +12,12 @@
 # Default: /var/lib/tomcat6
 #CATALINA_BASE=/var/lib/tomcat6
 
-# Arguments to pass to jscv (*not* to the JVM as the name may suggest).
-# -D and -X arguments are however passed on to the JVM by jscv
+# Arguments to pass to JSVC (*not* to the JVM as the name may suggest).
+# -D and -X arguments are however passed on to the JVM by JSVC.
 #JAVA_OPTS="-Djava.awt.headless=true -Xmx128M"
 
-# To enable remore debugging uncomment the following line. You will then be able to use a java debugger on port 8000
+# To enable remote debugging uncomment the following line.
+# You will then be able to use a java debugger on port 8000.
 #JAVA_OPTS="${JAVA_OPTS} -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
 
 # Java compiler to use for translating JavaServer Pages (JSPs). You can use all
@@ -35,5 +36,5 @@
 # WARNING: This directory will be destroyed and recreated at every startup !
 #JVM_TMP=/tmp/tomcat6-temp
 
-# JSVC Classpath.
-JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar"
+# JSVC ClassPath
+#JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar"

Modified: trunk/tomcat6/debian/tomcat6.init
===================================================================
--- trunk/tomcat6/debian/tomcat6.init	2009-12-18 05:51:36 UTC (rev 11299)
+++ trunk/tomcat6/debian/tomcat6.init	2009-12-19 18:12:25 UTC (rev 11300)
@@ -28,6 +28,7 @@
 CATALINA_HOME=/usr/share/$NAME
 DEFAULT=/etc/default/$NAME
 JVM_TMP=/tmp/tomcat6-tmp
+JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar"
 
 if [ `id -u` -ne 0 ]; then
 	echo "You need root privileges to run this script"
@@ -84,9 +85,6 @@
 # overwrite settings from default file
 if [ -f "$DEFAULT" ]; then
 	. "$DEFAULT"
-else
-    # In case the default is not present - set some sane default.
-    JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar"    
 fi
 
 if [ ! -f "$CATALINA_HOME/bin/bootstrap.jar" ]; then