SONAR-2603 provide a dedicated page to generate server id

2 files changed, 4 insertions, 4 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
index df3a8584548..958e01870d3 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
@@ -240,15 +240,15 @@ public interface CoreProperties {
   /**
    * @since 2.11
    */
-  String ORGANIZATION = "sonar.organization";
+  String ORGANISATION = "sonar.organisation";
 
   /**
    * @since 2.11
    */
-  String SERVER_KEY = "sonar.server_key";
+  String PERMANENT_SERVER_ID = "sonar.server_id";
 
   /**
    * @since 2.11
    */
-  String SERVER_KEY_IP_ADDRESS = "sonar.server_key.ip_address";
+  String SERVER_ID_IP_ADDRESS = "sonar.server_id.ip_address";
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java b/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java
index f5043073dbb..195671febe5 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java
@@ -44,5 +44,5 @@ public abstract class Server implements BatchComponent, ServerComponent {
   /**
    * @since 2.10
    */
-  public abstract String getKey();
+  public abstract String getPermanentServerId();
 }