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

[Tony Mancill]

Author: tmancill
Date: 2011-11-08 22:06:48 +0000 (Tue, 08 Nov 2011)
New Revision: 15369

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/tomcat6.init
Log:
patch tomcat init.d script for multi-tenant #644365

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2011-11-08 19:12:41 UTC (rev 15368)
+++ trunk/tomcat6/debian/changelog	2011-11-08 22:06:48 UTC (rev 15369)
@@ -1,3 +1,12 @@
+tomcat6 (6.0.32-8) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Add patch for multi-instance startup.  CATALINA_HOME no longer
+    depends on the instance $NAME.  JVM_TMP is now $NAME-specific.
+    - Thank you to Julien Wajsberg. (Closes: #644365)
+
+ -- tony mancill <tmancill at debian.org>  Tue, 08 Nov 2011 13:41:40 -0800
+
 tomcat6 (6.0.32-7) unstable; urgency=medium
 
   [ tony mancill ]

Modified: trunk/tomcat6/debian/tomcat6.init
===================================================================
--- trunk/tomcat6/debian/tomcat6.init	2011-11-08 19:12:41 UTC (rev 15368)
+++ trunk/tomcat6/debian/tomcat6.init	2011-11-08 22:06:48 UTC (rev 15369)
@@ -26,7 +26,7 @@
 NAME=tomcat6
 DESC="Tomcat servlet engine"
 DEFAULT=/etc/default/$NAME
-JVM_TMP=/tmp/tomcat6-tmp
+JVM_TMP=/tmp/tomcat6-$NAME-tmp
 
 if [ `id -u` -ne 0 ]; then
 	echo "You need root privileges to run this script"
@@ -65,7 +65,7 @@
 export JAVA_HOME
 
 # Directory where the Tomcat 6 binary distribution resides
-CATALINA_HOME=/usr/share/$NAME
+CATALINA_HOME=/usr/share/tomcat6
 
 # Directory for per-instance configuration files and webapps
 CATALINA_BASE=/var/lib/$NAME