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

[Niels Thykier]

Author: nthykier-guest
Date: 2010-03-25 20:37:17 +0000 (Thu, 25 Mar 2010)
New Revision: 11920

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/tomcat6.default
Log:
Added optimised garbage collection options to tomcat6's default options.
Thanks to Aaron J. Zirbes and Thierry Carrez for research and the patch.
(Closes: LP: #541520)



Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2010-03-24 22:28:28 UTC (rev 11919)
+++ trunk/tomcat6/debian/changelog	2010-03-25 20:37:17 UTC (rev 11920)
@@ -1,3 +1,11 @@
+tomcat6 (6.0.24-5) UNRELEASED; urgency=low
+
+  * Added optimised garbage collection options to tomcat6's default options.
+    Thanks to Aaron J. Zirbes and Thierry Carrez for research and the patch.
+    (Closes: LP: #541520)
+
+ -- Niels Thykier <niels at thykier.net>  Thu, 25 Mar 2010 21:34:56 +0100
+
 tomcat6 (6.0.24-4) unstable; urgency=low
 
   * debian/tomcat6.postrm: fix removal of Tomcat (Closes: #567548)

Modified: trunk/tomcat6/debian/tomcat6.default
===================================================================
--- trunk/tomcat6/debian/tomcat6.default	2010-03-24 22:28:28 UTC (rev 11919)
+++ trunk/tomcat6/debian/tomcat6.default	2010-03-25 20:37:17 UTC (rev 11920)
@@ -21,9 +21,18 @@
 # Default: /var/lib/tomcat6
 #CATALINA_BASE=/var/lib/$NAME
 
-# You may pass JVM startup parameters to Java here.
-#JAVA_OPTS="-Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Xmx128m"
+# You may pass JVM startup parameters to Java here. If unset, the default
+# options (-Djava.awt.headless=true -Xmx128m) will be used.
+#JAVA_OPTS="-Djava.awt.headless=true -Xmx128m"
 
+# Use a CMS garbage collector for improved response time
+JAVA_OPTS="${JAVA_OPTS} -XX:+UseConcMarkSweepGC"
+
+# When using the CMS garbage collector, you should enable the following option
+# if you run Tomcat on a machine with exactly one CPU chip that contains one
+# or two cores.
+#JAVA_OPTS="$JAVA_OPTS -XX:+CMSIncrementalMode"
+
 # 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"