From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Tue, 19 May 2015 11:03:51 +0000 (+0200)
Subject: SONAR-6429 Be consistent with project navigation (plugins -> extensions)
X-Git-Tag: 5.2-RC1~1921
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=53b9346b5f8d43896230b2f70d3c3068f34ded90;p=sonarqube.git

SONAR-6429 Be consistent with project navigation (plugins -> extensions)
---

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java
index e0dec937828..bba8ce6de58 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java
@@ -69,7 +69,7 @@ public class SettingsNavigationAction implements NavigationWsAction {
     json.prop("showUpdateCenter", isAdmin && settings.getBoolean(UpdateCenterClient.ACTIVATION_PROPERTY));
     json.prop("showProvisioning", userSession.hasGlobalPermission(GlobalPermissions.PROVISIONING));
 
-    json.name("plugins").beginArray();
+    json.name("extensions").beginArray();
     if (isAdmin) {
       for (ViewProxy<Page> page : views.getPages(NavigationSection.CONFIGURATION, null, null, null, null)) {
         json.beginObject()
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-settings.json b/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-settings.json
index e9ebff7589e..383b5e0cc5a 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-settings.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-settings.json
@@ -1,6 +1,6 @@
 {
   "showUpdateCenter": true,
-  "plugins": [
+  "extensions": [
     {
       "name": "Views",
       "url": "/plugins/configuration/views"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/empty.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/empty.json
index b4397d030d6..f1639085e53 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/empty.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/empty.json
@@ -1,4 +1,4 @@
 {
   "showUpdateCenter": false,
-  "plugins": []
+  "extensions": []
 }
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_provisioning.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_provisioning.json
index a9c7cf4852f..decc9c5339d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_provisioning.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_provisioning.json
@@ -1,5 +1,5 @@
 {
   "showUpdateCenter": false,
   "showProvisioning": true,
-  "plugins": []
+  "extensions": []
 }
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_update_center.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_update_center.json
index 96067a6482a..c0e33fbd308 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_update_center.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_update_center.json
@@ -1,5 +1,5 @@
 {
   "showUpdateCenter": true,
   "showProvisioning": false,
-  "plugins": []
+  "extensions": []
 }
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_views.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_views.json
index 9eb73a50d5c..ae56996ba20 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_views.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_views.json
@@ -1,7 +1,7 @@
 {
   "showUpdateCenter": false,
   "showProvisioning": false,
-  "plugins": [
+  "extensions": [
     {
       "name": "First Page",
       "url": "/plugins/configuration/first_page"