aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2015-05-06 22:14:58 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2015-05-11 10:24:03 +0200
commit7e3ed6a5d13706b54bd3eea9b3382d39f9f222ad (patch)
treefe85653ee395add10bd1c33092fc0e3b1f099566
parent1b0e00bd132798475390145f52ab429ddb8c301c (diff)
downloadsonarqube-7e3ed6a5d13706b54bd3eea9b3382d39f9f222ad.tar.gz
sonarqube-7e3ed6a5d13706b54bd3eea9b3382d39f9f222ad.zip
SONAR-6517 rename field "homepage" by "homepageUrl" in api/plugins
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java4
-rw-r--r--server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json8
-rw-r--r--server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json6
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledPluginsWsActionTest.java2
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingPluginsWsActionTest.java4
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java4
6 files changed, 14 insertions, 14 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java
index c2f8a8b6b63..82b70cdf8df 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java
@@ -48,7 +48,7 @@ public class PluginWSCommons {
static final String PROPERTY_ORGANIZATION_URL = "organizationUrl";
static final String PROPERTY_DATE = "date";
static final String PROPERTY_STATUS = "status";
- static final String PROPERTY_HOMEPAGE = "homepage";
+ static final String PROPERTY_HOMEPAGE_URL = "homepageUrl";
static final String PROPERTY_ISSUE_TRACKER_URL = "issueTrackerUrl";
static final String OBJECT_ARTIFACT = "artifact";
static final String PROPERTY_URL = "url";
@@ -90,7 +90,7 @@ public class PluginWSCommons {
jsonWriter.prop(PROPERTY_LICENSE, pluginMetadata.getLicense());
jsonWriter.prop(PROPERTY_ORGANIZATION_NAME, pluginMetadata.getOrganizationName());
jsonWriter.prop(PROPERTY_ORGANIZATION_URL, pluginMetadata.getOrganizationUrl());
- jsonWriter.prop(PROPERTY_HOMEPAGE, pluginMetadata.getHomepageUrl());
+ jsonWriter.prop(PROPERTY_HOMEPAGE_URL, pluginMetadata.getHomepageUrl());
jsonWriter.prop(PROPERTY_ISSUE_TRACKER_URL, pluginMetadata.getIssueTrackerUrl());
jsonWriter.prop(PROPERTY_IMPLEMENTATION_BUILD, pluginMetadata.getImplementationBuild());
}
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json
index c0035e3c45a..bf4326a6390 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json
@@ -8,7 +8,7 @@
"license": "GNU LGPL 3",
"organizationName": "SonarSource",
"organizationUrl": "http://www.sonarsource.com",
- "homepage": "http://redirect.sonarsource.com/plugins/scmgit.html",
+ "homepageUrl": "http://redirect.sonarsource.com/plugins/scmgit.html",
"issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCGIT",
"implementationBuild": "9ce9d330c313c296fab051317cc5ad4b26319e07"
},
@@ -20,7 +20,7 @@
"license": "GNU LGPL 3",
"organizationName": "SonarSource",
"organizationUrl": "http://www.sonarsource.com",
- "homepage": "http://redirect.sonarsource.com/plugins/java.html",
+ "homepageUrl": "http://redirect.sonarsource.com/plugins/java.html",
"issueTrackerUrl": "http://jira.codehaus.org/browse/SONARJAVA",
"implementationBuild": "65396a609ddface8b311a6a665aca92a7da694f1"
},
@@ -32,9 +32,9 @@
"license": "GNU LGPL 3",
"organizationName": "SonarSource",
"organizationUrl": "http://www.sonarsource.com",
- "homepage": "http://redirect.sonarsource.com/plugins/scmsvn.html",
+ "homepageUrl": "http://redirect.sonarsource.com/plugins/scmsvn.html",
"issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCSVN",
"implementationBuild": "213fc8a8b582ff530b12dd4a59a6512be1071234"
}
]
-} \ No newline at end of file
+}
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json
index 078d33d862b..85515adbd91 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json
@@ -8,7 +8,7 @@
"license": "GNU LGPL 3",
"organizationName": "SonarSource",
"organizationUrl": "http://www.sonarsource.com",
- "homepage": "http://redirect.sonarsource.com/plugins/scmgit.html",
+ "homepageUrl": "http://redirect.sonarsource.com/plugins/scmgit.html",
"issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCGIT",
"implementationBuild": "9ce9d330c313c296fab051317cc5ad4b26319e07"
},
@@ -20,7 +20,7 @@
"license": "GNU LGPL 3",
"organizationName": "SonarSource",
"organizationUrl": "http://www.sonarsource.com",
- "homepage": "http://redirect.sonarsource.com/plugins/java.html",
+ "homepageUrl": "http://redirect.sonarsource.com/plugins/java.html",
"issueTrackerUrl": "http://jira.codehaus.org/browse/SONARJAVA",
"implementationBuild": "65396a609ddface8b311a6a665aca92a7da694f1"
}
@@ -34,7 +34,7 @@
"license": "GNU LGPL 3",
"organizationName": "SonarSource",
"organizationUrl": "http://www.sonarsource.com",
- "homepage": "http://redirect.sonarsource.com/plugins/scmsvn.html",
+ "homepageUrl": "http://redirect.sonarsource.com/plugins/scmsvn.html",
"issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCSVN",
"implementationBuild": "213fc8a8b582ff530b12dd4a59a6512be1071234"
}
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledPluginsWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledPluginsWsActionTest.java
index 1279f978501..ab79848ff97 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledPluginsWsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledPluginsWsActionTest.java
@@ -132,7 +132,7 @@ public class InstalledPluginsWsActionTest {
" \"license\": \"license_hey\"," +
" \"organizationName\": \"org_name\"," +
" \"organizationUrl\": \"org_url\"," +
- " \"homepage\": \"homepage_url\"," +
+ " \"homepageUrl\": \"homepage_url\"," +
" \"issueTrackerUrl\": \"issueTracker_url\"," +
" \"implementationBuild\": \"sou_rev_sha1\"" +
" }" +
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingPluginsWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingPluginsWsActionTest.java
index 17586f0ec18..bc3bea14a3a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingPluginsWsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingPluginsWsActionTest.java
@@ -93,7 +93,7 @@ public class PendingPluginsWsActionTest {
" \"license\": \"GNU LGPL 3\"," +
" \"organizationName\": \"SonarSource\"," +
" \"organizationUrl\": \"http://www.sonarsource.com\"," +
- " \"homepage\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
+ " \"homepageUrl\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
" \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"," +
" \"implementationBuild\": \"9ce9d330c313c296fab051317cc5ad4b26319e07\"" +
" }" +
@@ -122,7 +122,7 @@ public class PendingPluginsWsActionTest {
" \"license\": \"GNU LGPL 3\"," +
" \"organizationName\": \"SonarSource\"," +
" \"organizationUrl\": \"http://www.sonarsource.com\"," +
- " \"homepage\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
+ " \"homepageUrl\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
" \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"," +
" \"implementationBuild\": \"9ce9d330c313c296fab051317cc5ad4b26319e07\"" +
" }" +
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
index c7e5151d57e..761cf9ee45c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
@@ -56,7 +56,7 @@ public class PluginWSCommonsTest {
" \"license\": \"GNU LGPL 3\"," +
" \"organizationName\": \"SonarSource\"," +
" \"organizationUrl\": \"http://www.sonarsource.com\"," +
- " \"homepage\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
+ " \"homepageUrl\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
" \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"" +
"}");
}
@@ -76,7 +76,7 @@ public class PluginWSCommonsTest {
" \"license\": \"GNU LGPL 3\"," +
" \"organizationName\": \"SonarSource\"," +
" \"organizationUrl\": \"http://www.sonarsource.com\"," +
- " \"homepage\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
+ " \"homepageUrl\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
" \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"," +
"}");
}