[tomcat8] 01/01: Removed the default 128M heap limit (LP: #568823)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit 706319bd906d61160f78ae9ae36960632dbd2db9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 21 14:29:38 2016 +0200

    Removed the default 128M heap limit (LP: #568823)
---
 debian/changelog         | 7 +++++++
 debian/defaults.template | 4 ++--
 debian/setenv.sh         | 2 +-
 debian/tomcat8.config    | 2 +-
 debian/tomcat8.init      | 4 +---
 debian/tomcat8.postinst  | 4 ++--
 debian/tomcat8.templates | 2 +-
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9f53a9..75ec04e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat8 (8.0.36-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Removed the default 128M heap limit (LP: #568823)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 21 Jul 2016 14:26:01 +0200
+
 tomcat8 (8.0.36-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/defaults.template b/debian/defaults.template
index a2ba08d..33f8ba2 100644
--- a/debian/defaults.template
+++ b/debian/defaults.template
@@ -12,13 +12,13 @@ TOMCAT8_GROUP=tomcat8
 #JAVA_HOME=/usr/lib/jvm/java-7-openjdk
 
 # You may pass JVM startup parameters to Java here. If unset, the default
-# options will be: -Djava.awt.headless=true -Xmx128m -XX:+UseConcMarkSweepGC
+# options will be: -Djava.awt.headless=true -XX:+UseConcMarkSweepGC
 #
 # Use "-XX:+UseConcMarkSweepGC" to enable the CMS garbage collector (improved
 # response time). If you use that option and you run Tomcat on a machine with
 # exactly one CPU chip that contains one or two cores, you should also add
 # the "-XX:+CMSIncrementalMode" option.
-JAVA_OPTS="-Djava.awt.headless=true -Xmx128m -XX:+UseConcMarkSweepGC"
+JAVA_OPTS="-Djava.awt.headless=true -XX:+UseConcMarkSweepGC"
 
 # To enable remote debugging uncomment the following line.
 # You will then be able to use a java debugger on port 8000.
diff --git a/debian/setenv.sh b/debian/setenv.sh
index ff10b33..04169a2 100755
--- a/debian/setenv.sh
+++ b/debian/setenv.sh
@@ -21,6 +21,6 @@ done
 
 # Default Java options
 if [ -z "$JAVA_OPTS" ]; then
-	JAVA_OPTS="-Djava.awt.headless=true -Xmx128M"
+	JAVA_OPTS="-Djava.awt.headless=true"
 fi
 
diff --git a/debian/tomcat8.config b/debian/tomcat8.config
index f7e32d3..b1fae44 100644
--- a/debian/tomcat8.config
+++ b/debian/tomcat8.config
@@ -5,7 +5,7 @@ set -e
 . /usr/share/debconf/confmodule
 
 CONFFILE="/etc/default/tomcat8"
-JAVA_OPTS="-Djava.awt.headless=true -Xmx128m"
+JAVA_OPTS="-Djava.awt.headless=true"
 
 if [ -e "${CONFFILE}" ]
 then
diff --git a/debian/tomcat8.init b/debian/tomcat8.init
index cd76a0b..a14e191 100644
--- a/debian/tomcat8.init
+++ b/debian/tomcat8.init
@@ -101,10 +101,8 @@ TOMCAT8_SECURITY=no
 # Default Java options
 # Set java.awt.headless=true if JAVA_OPTS is not set so the
 # Xalan XSL transformer can work without X11 display on JDK 1.4+
-# It also looks like the default heap size of 64M is not enough for most cases
-# so the maximum heap size is set to 128M
 if [ -z "$JAVA_OPTS" ]; then
-	JAVA_OPTS="-Djava.awt.headless=true -Xmx128M"
+	JAVA_OPTS="-Djava.awt.headless=true"
 fi
 
 # End of variables that can be overwritten in $DEFAULT
diff --git a/debian/tomcat8.postinst b/debian/tomcat8.postinst
index 306a0b1..cf59198 100644
--- a/debian/tomcat8.postinst
+++ b/debian/tomcat8.postinst
@@ -6,7 +6,7 @@ TEMPLATE="/usr/share/tomcat8/defaults.template"
 CONFFILE="/etc/default/tomcat8"
 LR_TEMPLATE="/usr/share/tomcat8/logrotate.template"
 LR_CONFFILE="/etc/logrotate.d/tomcat8"
-JAVA_OPTS="-Djava.awt.headless=true -Xmx128m -XX:+UseConcMarkSweepGC"
+JAVA_OPTS="-Djava.awt.headless=true -XX:+UseConcMarkSweepGC"
 
 case "$1" in
     configure)
@@ -15,7 +15,7 @@ case "$1" in
 	db_version 2.0
 	db_get tomcat8/username && TOMCAT8_USER="$RET" || TOMCAT8_USER="tomcat8"
 	db_get tomcat8/groupname && TOMCAT8_GROUP="$RET" || TOMCAT8_GROUP="tomcat8"
-	db_get tomcat8/javaopts && JAVA_OPTS="$RET" || JAVA_OPTS="-Djava.awt.headless=true -Xmx128m -XX:+UseConcMarkSweepGC"
+	db_get tomcat8/javaopts && JAVA_OPTS="$RET" || JAVA_OPTS="-Djava.awt.headless=true -XX:+UseConcMarkSweepGC"
 
 	tmpfile=`mktemp /tmp/tomcat8.XXXXXXXXXX`
 	chmod 644 $tmpfile
diff --git a/debian/tomcat8.templates b/debian/tomcat8.templates
index 8dc3b07..1b54cfb 100644
--- a/debian/tomcat8.templates
+++ b/debian/tomcat8.templates
@@ -16,7 +16,7 @@ _Description: Dedicated system group for the tomcat8 daemon:
 
 Template: tomcat8/javaopts
 Type: string
-Default: -Djava.awt.headless=true -Xmx128m -XX:+UseConcMarkSweepGC
+Default: -Djava.awt.headless=true -XX:+UseConcMarkSweepGC
 _Description: Please choose the tomcat8 JVM Java options:
  Tomcat's JVM will be launched with a specific set of Java options.
  .

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git