SONAR-5237 - ES java_opts defaults

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 9e2dd261d300bf54d786aa1919adb9b04958cff5..ce2bb92b4cd7e971753af9a740d92b2c29f67599 100644 (file)
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -8,7 +8,7 @@
 
 #--------------------------------------------------------------------------------------------------
 # TO BE DOCUMENTED - WORK IN PROGRESS
-sonar.search.javaOpts=-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xmx256m -Xms256m -Xss256k -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly
+#sonar.search.javaOpts=-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xmx256m -Xms256m -Xss256k -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly
 #sonar.search.port=9001
 #sonar.search.jmxPort=9002
 

diff --git a/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java b/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java
index 99ebcd6c43a2b750d14f09bc3bf7290214e78ff3..b4f4485d8c6c2d7df6c1b4ad4d139169094915a1 100644 (file)
--- a/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java
+++ b/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java
@@ -40,9 +40,9 @@ class DefaultSettings {
   private static final int ES_JMX_PORT_DEFVAL = 9002;
 
   static final String ES_JAVA_OPTS_KEY = "sonar.search.javaOpts";
-  private static final String ES_JAVA_OPTS_DEFVAL = "-server -Xmx256m -Xms256m -Xss256k -Djava.net.preferIPv4Stack=true " +
+  private static final String ES_JAVA_OPTS_DEFVAL = "-Xmx256m -Xms256m -Xss256k -Djava.net.preferIPv4Stack=true " +
     "-XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly " +
-    "-XX:+HeapDumpOnOutOfMemoryError";
+    "-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true";
 
 
   static final String WEB_JMX_PORT_KEY = "sonar.web.jmxPort";