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 e0dec9378282644fe8b0fbf304d4830ab0cd7061..bba8ce6de5823a9bbc509f1aa7beb9d2c7dad591 100644 (file)
--- 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 e9ebff7589e49e10986c59e48cb0b729caae6061..383b5e0cc5a8a159041eeaacb7fcc2b8eb95f79f 100644 (file)
--- 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 b4397d030d6558c5b66b8e1d180f4fcb9ab2fd9b..f1639085e539e3aff7280481418df6889639d709 100644 (file)
--- 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 a9c7cf4852f2982d86869d8f5f7151bef978c1f8..decc9c5339d1d82da6cef418681e59974cdd6940 100644 (file)
--- 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 96067a6482ab9ec0c888d24197c9f9878515de6e..c0e33fbd308d673353f07909b4651d7139e2b2f5 100644 (file)
--- 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 9eb73a50d5ca7d2890cfbc7e9798bc45cbe8c608..ae56996ba201f982ab199807d879d5ba6289139b 100644 (file)
--- 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"