aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorStephane Gamard <stephane.gamard@searchbox.com>2014-07-28 17:04:45 +0200
committerStephane Gamard <stephane.gamard@searchbox.com>2014-07-28 17:04:45 +0200
commit2702b09f74bfbbf78bfadcd48d6ce3ef3ff42f4c (patch)
tree81d58033c2c2dc08d47004918e4179b7bd338bf1 /server
parentb16c54633a335da1713c05720f0c079205790572 (diff)
downloadsonarqube-2702b09f74bfbbf78bfadcd48d6ce3ef3ff42f4c.tar.gz
sonarqube-2702b09f74bfbbf78bfadcd48d6ce3ef3ff42f4c.zip
SONAR-4898 - Renamed sonar.es.* properties to sonar.search.*
Diffstat (limited to 'server')
-rw-r--r--server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java4
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/search/IndexProperties.java8
-rw-r--r--server/sonar-web/pom.xml4
3 files changed, 8 insertions, 8 deletions
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 1ea426d399e..bfdb5c909a8 100644
--- 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 996c8ec477c..3e55619a06d 100644
--- 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 a90aad2498f..6aec8f63f33 100644
--- 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>