diff options
| author | Stephane Gamard <stephane.gamard@searchbox.com> | 2014-07-28 17:04:45 +0200 |
|---|---|---|
| committer | Stephane Gamard <stephane.gamard@searchbox.com> | 2014-07-28 17:04:45 +0200 |
| commit | 2702b09f74bfbbf78bfadcd48d6ce3ef3ff42f4c (patch) | |
| tree | 81d58033c2c2dc08d47004918e4179b7bd338bf1 /sonar-application | |
| parent | b16c54633a335da1713c05720f0c079205790572 (diff) | |
| download | sonarqube-2702b09f74bfbbf78bfadcd48d6ce3ef3ff42f4c.tar.gz sonarqube-2702b09f74bfbbf78bfadcd48d6ce3ef3ff42f4c.zip | |
SONAR-4898 - Renamed sonar.es.* properties to sonar.search.*
Diffstat (limited to 'sonar-application')
| -rw-r--r-- | sonar-application/src/main/assembly/conf/sonar.properties | 8 | ||||
| -rw-r--r-- | sonar-application/src/main/java/org/sonar/application/DefaultSettings.java | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index be3d1c09d70..340a8525178 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -8,12 +8,12 @@ #-------------------------------------------------------------------------------------------------- # TO BE DOCUMENTED - WORK IN PROGRESS -#sonar.es.javaOpts=-Djava.net.preferIPv4Stack=true -server -Xmx256m -Xms256m -Xss256k -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly -#sonar.es.port=9001 -#sonar.es.jmxPort=9002 +#sonar.search.javaOpts=-Djava.net.preferIPv4Stack=true -server -Xmx256m -Xms256m -Xss256k -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly +#sonar.search.port=9001 +#sonar.search.jmxPort=9002 # For debug only -#sonar.es.httpPort= +#sonar.search.httpPort= #sonar.web.javaOpts=-server -Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError #sonar.web.jmxPort=9003 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 eb414f71272..99ebcd6c43a 100644 --- a/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java +++ b/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java @@ -30,16 +30,16 @@ class DefaultSettings { static final String PATH_LOGS_KEY = "sonar.path.logs"; - static final String ES_PORT_KEY = "sonar.es.port"; + static final String ES_PORT_KEY = "sonar.search.port"; private static final int ES_PORT_DEFVAL = 9001; - static final String ES_CLUSTER_NAME_KEY = "sonar.es.clusterName"; + static final String ES_CLUSTER_NAME_KEY = "sonar.search.clusterName"; private static final String ES_CLUSTER_NAME_DEFVAL = "sonarqube"; - static final String ES_JMX_PORT_KEY = "sonar.es.jmxPort"; + static final String ES_JMX_PORT_KEY = "sonar.search.jmxPort"; private static final int ES_JMX_PORT_DEFVAL = 9002; - static final String ES_JAVA_OPTS_KEY = "sonar.es.javaOpts"; + 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 " + "-XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly " + "-XX:+HeapDumpOnOutOfMemoryError"; @@ -59,7 +59,7 @@ class DefaultSettings { static void initDefaults(Props props) { // elasticsearch - props.set("sonar.es.type", "TRANSPORT"); + props.set("sonar.search.type", "TRANSPORT"); props.setDefault(DefaultSettings.ES_CLUSTER_NAME_KEY, DefaultSettings.ES_CLUSTER_NAME_DEFVAL); setDefaultPort(props, DefaultSettings.ES_PORT_KEY, DefaultSettings.ES_PORT_DEFVAL, "Elasticsearch"); setDefaultPort(props, DefaultSettings.ES_JMX_PORT_KEY, DefaultSettings.ES_JMX_PORT_DEFVAL, "Elasticsearch JMX"); |