modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf
| 1 +
modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf
| 2 ++
modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
| 4 ++--
modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc
| 6 +++---
4 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit defe61fc07d00d7751b480aaaef4f4bfa467a1b1
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Aug 29 14:24:01 2013 -0400
tweak server wrapper files slightly to get additional java opt numbering right
diff --git
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf
index dc41ed9..a294bd1 100644
---
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf
+++
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf
@@ -92,6 +92,7 @@
wrapper.java.additional.21="-Dorg.apache.coyote.http11.Http11Protocol.COMPRESSIO
wrapper.java.additional.22="-Dorg.apache.coyote.http11.Http11Protocol.COMPRESSION_MIME_TYPES=text/javascript,text/css,text/html"
# use these if your JVM supports it
+# - note that if you enable these you will need to update numbering in
rhq-server-wrapper.inc, if it exists
#wrapper.java.additional.23=-XX:+TieredCompilation
#wrapper.java.additional.24=-XX:+UseCompressedOops
# Don't need these now, but this is commented out in case we need to add an endorsed
dir in the future
diff --git
a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
index 58f82bf..8cd24ee 100644
---
a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
+++
b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
@@ -8,8 +8,8 @@
wrapper.java.additional.23=-agentlib:jdwp=transport=dt_socket,address=8787,serve
# enable jprofiler
#set.PATH=%PATH%;<jprofiler-install-dir>\bin\windows
-#wrapper.java.additional.23=-agentlib:jprofilerti=port=8849
-#wrapper.java.additional.24=-Xbootclasspath/a:<jprofiler-install-dir>\bin\agent.jar
+#wrapper.java.additional.24=-agentlib:jprofilerti=port=8849
+#wrapper.java.additional.25=-Xbootclasspath/a:<jprofiler-install-dir>\bin\agent.jar
# disable JVM startup timeout
wrapper.startup.timeout=0
commit d3f1bf8b97e82b4745ec910f66faf18f3c5979de
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Aug 29 14:23:13 2013 -0400
[999558] Ensure the JMX interface on cassandra nodes is only bound to the loopback
interface, and applies authentication and authorization
-- windows portion of this fix
diff --git
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf
index de83364..b68846a 100644
---
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf
+++
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf
@@ -83,6 +83,8 @@
wrapper.java.additional.16="-Dcom.sun.management.jmxremote.ssl=false"
wrapper.java.additional.17="-Dcom.sun.management.jmxremote.authenticate=false"
wrapper.java.additional.18="-Dlog4j.configuration=log4j-server.properties"
wrapper.java.additional.19="-Dlog4j.defaultInitOverride=true"
+# The next one is for
https://bugzilla.redhat.com/show_bug.cgi?id=999558
+wrapper.java.additional.20="-Djava.rmi.server.hostname=localhost"
# We want to make sure the Storage Node starts in the cassandra bin directory
wrapper.working.dir=%RHQ_STORAGE_HOME%/bin
diff --git
a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc
b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc
index 6941358..8f0b0eb 100644
---
a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc
+++
b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc
@@ -4,11 +4,11 @@
#
# override and lower the initial memory profile
-wrapper.java.additional.20=-Xms128M
-wrapper.java.additional.21=-Xmx256M
+wrapper.java.additional.21=-Xms128M
+wrapper.java.additional.22=-Xmx256M
# enable remote debugging
-#wrapper.java.additional.22=-agentlib:jdwp=transport=dt_socket,address=8788,server=y,suspend=n
+#wrapper.java.additional.23=-agentlib:jdwp=transport=dt_socket,address=8788,server=y,suspend=n
# disable JVM startup timeout
wrapper.startup.timeout=0