Merge remote-tracking branch 'remotes/origin/branch-4.5'

Conflicts:
	sonar-application/src/main/java/org/sonar/application/DefaultSettings.java

2 files changed, 7 insertions, 3 deletions

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 0c70358e1c1..064e2beafac 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -235,6 +235,7 @@ sonar.jdbc.timeBetweenEvictionRunsMillis=30000
 
 #--------------------------------------------------------------------------------------------------
 # DEVELOPMENT - only for developers
+# The following properties MUST NOT be used in production environments.
 
 # Dev mode allows to reload web sources on changes and to restart server when new versions
 # of plugins are deployed.
@@ -243,3 +244,7 @@ sonar.jdbc.timeBetweenEvictionRunsMillis=30000
 # Path to webapp sources for hot-reloading of Ruby on Rails, JS and CSS (only core,
 # plugins not supported).
 #sonar.web.dev.sources=/path/to/server/sonar-web/src/main/webapp
+
+# Uncomment to enable the Elasticsearch HTTP connector, so that ES can be directly requested through
+# http://lmenezes.com/elasticsearch-kopf/?location=http://localhost:9010
+#sonar.search.httpPort=9010
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 3a710e779c5..cfb395a8f8b 100644
--- a/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java
+++ b/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java
@@ -60,11 +60,10 @@ class DefaultSettings {
     defaults.put(ProcessConstants.CLUSTER_NAME, "sonarqube");
     defaults.put(ProcessConstants.SEARCH_JAVA_OPTS, "-Xmx256m -Xms256m -Xss256k -Djava.net.preferIPv4Stack=true " +
       "-XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly " +
-      "-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true");
+      "-XX:+HeapDumpOnOutOfMemoryError");
     defaults.put(ProcessConstants.SEARCH_JAVA_ADDITIONAL_OPTS, "");
     defaults.put(ProcessConstants.CLUSTER_NODE_NAME, "sonar-" + System.currentTimeMillis());
-    defaults.put(ProcessConstants.WEB_JAVA_OPTS, "-Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true " +
-      "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -Djruby.management.enabled=false");
+    defaults.put(ProcessConstants.WEB_JAVA_OPTS, "-Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true");
     defaults.put(ProcessConstants.WEB_JAVA_ADDITIONAL_OPTS, "");
     defaults.put(ProcessConstants.JDBC_URL, "jdbc:h2:tcp://localhost:9092/sonar");
     defaults.put(ProcessConstants.JDBC_LOGIN, "sonar");