SONAR-4662 Disable JRuby JMX monitoring by default

diff --git a/sonar-application/src/main/assembly/conf/wrapper.conf b/sonar-application/src/main/assembly/conf/wrapper.conf
index 0ef0bf41059a89ad5344a7647ae89b79e9656ade..881ac3cef2ca6ca6ab928dd5352aac429d7a1f0e 100644 (file)
--- a/sonar-application/src/main/assembly/conf/wrapper.conf
+++ b/sonar-application/src/main/assembly/conf/wrapper.conf
@@ -3,10 +3,11 @@ wrapper.java.additional.1=-Djava.awt.headless=true
 wrapper.java.additional.2=-XX:MaxPermSize=128m
 wrapper.java.additional.3=-XX:+HeapDumpOnOutOfMemoryError
 wrapper.java.additional.4=-Dfile.encoding=UTF-8
+wrapper.java.additional.5=-Djruby.management.enabled=false
 
 # RECOMMENDED : uncomment if Java Virtual Machine is a JDK but not a JRE. To know which JVM you use, execute
 # 'java -version'. JDK displays 'Server VM'.
-#wrapper.java.additional.5=-server
+#wrapper.java.additional.6=-server
 
 # Initial Java Heap Size (in MB)
 wrapper.java.initmemory=256
@@ -45,16 +46,16 @@ wrapper.app.parameter.1=org.sonar.application.StartServer
 
 #********************************************************************
 # Profiling and debbuging - for development only
-# If wrapper.java.additional.5=-server is not commented, parameter ids should start from 6 instead of 5.
+# If wrapper.java.additional.6=-server is not commented, parameter ids should start from 7 instead of 6.
 #********************************************************************
 # Java remote debugging
-#wrapper.java.additional.5=-agentlib:jdwp=transport=dt_socket,server=y,address=8000
+#wrapper.java.additional.6=-agentlib:jdwp=transport=dt_socket,server=y,address=8000
 
 # JMX remote monitoring on Sun JVM (warning, security is disabled)
-#wrapper.java.additional.5=-Dcom.sun.management.jmxremote
-#wrapper.java.additional.6=-Dcom.sun.management.jmxremote.port=9005
-#wrapper.java.additional.7=-Dcom.sun.management.jmxremote.authenticate=false
-#wrapper.java.additional.8=-Dcom.sun.management.jmxremote.ssl=false
+#wrapper.java.additional.6=-Dcom.sun.management.jmxremote
+#wrapper.java.additional.7=-Dcom.sun.management.jmxremote.port=9005
+#wrapper.java.additional.8=-Dcom.sun.management.jmxremote.authenticate=false
+#wrapper.java.additional.9SO=-Dcom.sun.management.jmxremote.ssl=false
 
 #********************************************************************
 # Wrapper Logging Properties