SONAR-4898 - Renamed sonar.es.* properties to sonar.search.*

diff --git a/run.sh b/run.sh
index 096e1eac15caee781756e7e363ee096d86b84e1e..6ea64a19f02e943ca4711bef7fea4c5eee6e3f85 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -17,6 +17,6 @@ if ! ls sonarqube-*/bin/$OS/sonar.sh &> /dev/null; then
 fi
 cd sonarqube-*
 bin/$OS/sonar.sh restart
-echo "sonar.es.http.port=9200" >>  conf/sonar.properties
+echo "sonar.search.http.port=9200" >>  conf/sonar.properties
 sleep 1
 tail -100f logs/sonar.log

diff --git a/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java b/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java
index 1ea426d399e5d7073ccc549a7c7f38458e332121..bfdb5c909a8a745516dc4ba3b612b19337324382 100644 (file)
--- a/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java
+++ b/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java
@@ -35,8 +35,8 @@ import java.io.File;
 public class ElasticSearch extends Process {
 
   public static final String ES_DEBUG_PROPERTY = "esDebug";
-  public static final String ES_PORT_PROPERTY = "sonar.es.port";
-  public static final String ES_CLUSTER_PROPERTY = "sonar.es.clusterName";
+  public static final String ES_PORT_PROPERTY = "sonar.search.port";
+  public static final String ES_CLUSTER_PROPERTY = "sonar.search.clusterName";
 
   private Node node;
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/IndexProperties.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexProperties.java
index 996c8ec477ce64542415e021effb5353b7b67d51..3e55619a06d30eb70781f530703b671c0cbaa4cf 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/search/IndexProperties.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/search/IndexProperties.java
@@ -29,9 +29,9 @@ public final class IndexProperties {
     MEMORY, TRANSPORT, DATA
   }
 
-  public static final String TYPE = "sonar.es.type";
-  public static final String HTTP_PORT = "sonar.es.http.port";
-  public static final String NODE_PORT = "sonar.es.port";
-  public static final String CLUSTER_NAME = "sonar.es.cluster.name";
+  public static final String TYPE = "sonar.search.type";
+  public static final String HTTP_PORT = "sonar.search.http.port";
+  public static final String NODE_PORT = "sonar.search.port";
+  public static final String CLUSTER_NAME = "sonar.search.cluster.name";
 
 }

diff --git a/server/sonar-web/pom.xml b/server/sonar-web/pom.xml
index a90aad2498ff5f6414c443e4a27abca6dfe8395f..6aec8f63f3361ebc372192ae098f3ed181e6d8c3 100644 (file)
--- a/server/sonar-web/pom.xml
+++ b/server/sonar-web/pom.xml
@@ -346,8 +346,8 @@
                 <rails.env>development</rails.env>
                 <jruby.max.runtimes>3</jruby.max.runtimes>
                 <sonar.jdbc.url>${sonar.jdbc.url}</sonar.jdbc.url>
-                <sonar.es.http.host>127.0.0.1</sonar.es.http.host>
-                <sonar.es.http.port>9200</sonar.es.http.port>
+                <sonar.search.http.host>127.0.0.1</sonar.search.http.host>
+                <sonar.search.http.port>9200</sonar.search.http.port>
                 <sonar.log.console>true</sonar.log.console>
                 <sonar.log.profilingLevel>BASIC</sonar.log.profilingLevel>
                 <sonar.web.context>/dev</sonar.web.context>

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index be3d1c09d70a408e23f8053724dd3fc9886820ae..340a85251783f7f5dbc99feb60681f60dbda8348 100644 (file)
--- 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 eb414f7127216bd7f442b74864ce14671b379584..99ebcd6c43a2b750d14f09bc3bf7290214e78ff3 100644 (file)
--- 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");