summaryrefslogtreecommitdiffstats
path: root/base/server/share/conf/tomcat.conf
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2013-09-18 11:34:07 -0400
committerAde Lee <alee@redhat.com>2013-09-18 16:18:34 -0400
commitfb32217fe98603dbe20563ce9836eb86813ebc98 (patch)
tree222ca43637ec0f5844a576e30ed54116598465a1 /base/server/share/conf/tomcat.conf
parentf37ae8f1d9743c9c17ccc5714865f5c1e5b9db5c (diff)
downloadpki-fb32217fe98603dbe20563ce9836eb86813ebc98.tar.gz
pki-fb32217fe98603dbe20563ce9836eb86813ebc98.tar.xz
pki-fb32217fe98603dbe20563ce9836eb86813ebc98.zip
Upgrade script to fix JAVA_OPTS
Diffstat (limited to 'base/server/share/conf/tomcat.conf')
-rw-r--r--base/server/share/conf/tomcat.conf20
1 files changed, 10 insertions, 10 deletions
diff --git a/base/server/share/conf/tomcat.conf b/base/server/share/conf/tomcat.conf
index f4070ee81..ce8453c91 100644
--- a/base/server/share/conf/tomcat.conf
+++ b/base/server/share/conf/tomcat.conf
@@ -23,16 +23,16 @@ CATALINA_BASE="[PKI_INSTANCE_PATH]"
#JASPER_HOME="/usr/share/tomcat"
CATALINA_TMPDIR=[PKI_TMPDIR]
-# You can pass some parameters to java here if you wish to
-#JAVA_OPTS="-Xminf0.1 -Xmaxf0.3"
-
-# Use JAVA_OPTS to set java.library.path for libtcnative.so
-#JAVA_OPTS="-Djava.library.path=/usr/lib"
-
-# Enable the following JAVA_OPTS to run a java debugger (e. g. - 'eclipse')
-#JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n -Djava.awt.headless=true -Xmx128M"
-
-# RESTEasy
+# NOTE: JAVA_OPTS is now only read once. All desired settings must be concatenated
+# into a single line.
+#
+# Some parameters you might want to add are:
+# - parameters to the JVM like
+# -Xminf0.1 -Xmaxf0.3
+# - parameters to set java.library.path for libtcnative.so
+# -Djava.library.path=/usr/lib"
+# - parameters to run a java debugger (e. g. - 'eclipse')
+# -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n -Djava.awt.headless=true -Xmx128M"
JAVA_OPTS="-DRESTEASY_LIB=[PKI_RESTEASY_LIB]"
# What user should run tomcat