private List<File> deprecatedExtensions = Lists.newArrayList();
private String[] pathsToInternalDeps = new String[0];
private String key;
- private String group;
private String version;
private String sonarVersion;
private String name;
return this;
}
- public String getGroup() {
- return group != null ? group : key;
- }
-
- public DefaultPluginMetadata setGroup(String group) {
- this.group = group;
- return this;
- }
-
public String getName() {
return name;
}
PluginManifest manifest = new PluginManifest(file);
DefaultPluginMetadata metadata = DefaultPluginMetadata.create(file);
metadata.setKey(manifest.getKey());
- metadata.setGroup(manifest.getGroup());
metadata.setName(manifest.getName());
metadata.setDescription(manifest.getDescription());
metadata.setLicense(manifest.getLicense());
public void testGettersAndSetters() {
DefaultPluginMetadata metadata = DefaultPluginMetadata.create(new File("sonar-checkstyle-plugin.jar"));
metadata.setKey("checkstyle")
- .setGroup("java")
.setLicense("LGPL")
.setDescription("description")
.setHomepage("http://home")
.setImplementationBuild("abcdef");
assertThat(metadata.getKey()).isEqualTo("checkstyle");
- assertThat(metadata.getGroup()).isEqualTo("java");
assertThat(metadata.getLicense()).isEqualTo("LGPL");
assertThat(metadata.getDescription()).isEqualTo("description");
assertThat(metadata.getHomepage()).isEqualTo("http://home");
String getKey();
- String getGroup();
-
String getName();
String getMainClass();
package org.sonar.server.plugins;
import com.google.common.base.Joiner;
+
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
}
}
- public void uninstall(String groupKey) {
- for (PluginMetadata plugin : pluginByKeys.values()) {
- if (plugin.getGroup().equals(groupKey)) {
- uninstallPlugin(plugin.getKey());
- }
- }
- }
-
- private void uninstallPlugin(String pluginKey) {
+ public void uninstall(String pluginKey) {
PluginMetadata metadata = pluginByKeys.get(pluginKey);
if ((metadata != null) && !metadata.isCore()) {
try {
*/
package org.sonar.server.plugins;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.sonar.api.ServerComponent;
import org.sonar.api.utils.SonarException;
import org.sonar.server.platform.DefaultServerFileSystem;
import org.sonar.updatecenter.common.Plugin;
-import org.sonar.updatecenter.common.PluginsGroup;
import org.sonar.updatecenter.common.Release;
import org.sonar.updatecenter.common.Version;
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
public class PluginDownloader implements ServerComponent {
private UpdateCenterClient center;
public List<String> getDownloads() {
List<String> names = new ArrayList<String>();
- List<File> files = (List<File>) FileUtils.listFiles(downloadDir, new String[]{"jar"}, false);
+ List<File> files = (List<File>) FileUtils.listFiles(downloadDir, new String[] { "jar" }, false);
for (File file : files) {
names.add(file.getName());
}
return names;
}
- public void download(String groupKey, Version version) {
- PluginsGroup group = center.getCenter().getGroup(groupKey);
- if (group == null) {
- String message = "This plugin does not exist: " + groupKey;
+ public void download(String pluginKey, Version version) {
+ Plugin plugin = center.getCenter().getPlugin(pluginKey);
+ if (plugin == null) {
+ String message = "This plugin does not exist: " + pluginKey;
Logs.INFO.warn(message);
throw new SonarException(message);
}
- for (Plugin plugin : group.getPlugins()) {
- String pluginKey = plugin.getKey();
- Release release = plugin.getRelease(version);
- if (release == null || StringUtils.isBlank(release.getDownloadUrl())) {
- String message = "This release can not be installed: " + pluginKey + ", version " + version;
- Logs.INFO.warn(message);
- throw new SonarException(message);
- }
+ Release release = plugin.getRelease(version);
+ if (release == null || StringUtils.isBlank(release.getDownloadUrl())) {
+ String message = "This release can not be installed: " + pluginKey + ", version " + version;
+ Logs.INFO.warn(message);
+ throw new SonarException(message);
+ }
- try {
- URI uri = new URI(release.getDownloadUrl());
- String filename = StringUtils.substringAfterLast(uri.getPath(), "/");
- downloader.download(uri, new File(downloadDir, filename));
+ try {
+ URI uri = new URI(release.getDownloadUrl());
+ String filename = StringUtils.substringAfterLast(uri.getPath(), "/");
+ downloader.download(uri, new File(downloadDir, filename));
- } catch (Exception e) {
- String message = "Fail to download the plugin (" + pluginKey + ", version " + version + ") from " + release.getDownloadUrl();
- Logs.INFO.warn(message, e);
- throw new SonarException(message, e);
- }
+ } catch (Exception e) {
+ String message = "Fail to download the plugin (" + pluginKey + ", version " + version + ") from " + release.getDownloadUrl();
+ Logs.INFO.warn(message, e);
+ throw new SonarException(message, e);
}
}
}
import org.sonar.updatecenter.common.Release;
import org.sonar.updatecenter.common.Version;
-@Deprecated
public final class PluginUpdate {
public enum Status {
import java.util.ArrayList;
import java.util.List;
-@Deprecated
public final class SonarUpdate implements Comparable<SonarUpdate> {
private Release release;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.sonar.updatecenter.common.Artifact;
-import org.sonar.updatecenter.common.Plugin;
-import org.sonar.updatecenter.common.Release;
-import org.sonar.updatecenter.common.UpdateCenter;
-import org.sonar.updatecenter.common.Version;
+import org.sonar.updatecenter.common.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.SortedSet;
-@Deprecated
public final class UpdateCenterMatrix {
private UpdateCenter center;
this.downloader = downloader;
}
- public org.sonar.updatecenter.common.UpdateCenterMatrix getMatrix(boolean refresh) {
+ public UpdateCenterMatrix getMatrix(boolean refresh) {
UpdateCenter center = centerClient.getCenter(refresh);
- org.sonar.updatecenter.common.UpdateCenterMatrix matrix = null;
+ UpdateCenterMatrix matrix = null;
if (center != null) {
- matrix = new org.sonar.updatecenter.common.UpdateCenterMatrix(center, sonarVersion);
+ matrix = new UpdateCenterMatrix(center, sonarVersion);
matrix.setDate(centerClient.getLastRefreshDate());
for (PluginMetadata metadata : pluginRepository.getMetadata()) {
- if (!metadata.isCore()) {
- matrix.registerInstalledPlugin(metadata.getKey(), Version.create(metadata.getVersion()));
- }
+ matrix.registerInstalledPlugin(metadata.getKey(), Version.create(metadata.getVersion()));
}
for (String filename : downloader.getDownloads()) {
matrix.registerPendingPluginsByFilename(filename);
import org.sonar.server.plugins.DefaultServerPluginRepository;
import org.sonar.server.plugins.PluginDeployer;
import org.sonar.server.plugins.PluginDownloader;
+import org.sonar.server.plugins.UpdateCenterMatrix;
import org.sonar.server.plugins.UpdateCenterMatrixFactory;
import org.sonar.server.rules.ProfilesConsole;
import org.sonar.server.rules.RulesConsole;
-import org.sonar.updatecenter.common.UpdateCenterMatrix;
import org.sonar.updatecenter.common.Version;
import javax.annotation.Nullable;
public void ruleSeverityChanged(int parentProfileId, int activeRuleId, int oldSeverityId, int newSeverityId, String userName) {
getProfilesManager().ruleSeverityChanged(parentProfileId, activeRuleId, RulePriority.values()[oldSeverityId],
- RulePriority.values()[newSeverityId], userName);
+ RulePriority.values()[newSeverityId], userName);
}
public void ruleDeactivated(int parentProfileId, int deactivatedRuleId, String userName) {
// notifier is null when creating the administrator in the migration script 011.
if (notifier != null) {
notifier.onNewUser(NewUserHandler.Context.builder()
- .setLogin(fields.get("login"))
- .setName(fields.get("name"))
- .setEmail(fields.get("email"))
- .build());
+ .setLogin(fields.get("login"))
+ .setName(fields.get("name"))
+ .setEmail(fields.get("email"))
+ .build());
}
}
@uninstalls=java_facade.getPluginUninstalls()
@downloads=java_facade.getPluginDownloads()
- @plugins_groups = {}
- installed_plugins.each do |plugin|
- group_key = plugin.group
- plugins = @plugins_groups[group_key] || []
- plugins << plugin
- @plugins_groups[group_key] = plugins
- end
+ @user_plugins=user_plugins()
+ @core_plugins=core_plugins()
end
def updates
@center=nil
@matrix=nil
@updates_by_plugin={}
- @installed_plugins={}
+ @user_plugins={}
@last_compatible={}
- installed_plugins.each do |plugin|
- @installed_plugins[plugin.getKey()]=plugin.getVersion()
+ user_plugins.each do |plugin|
+ @user_plugins[plugin.getKey()]=plugin.getVersion()
end
load_matrix()
if @matrix
@center=@matrix.getCenter()
- #@matrix.getInstalledGroups().each do |group|
- # @installed_plugins[group.key()]=group.masterPlugin.getVersion()
- #end
-
- @matrix.findGroupUpdates().each do |update|
- plugin = update.pluginsGroup.masterPlugin
+ @matrix.findPluginUpdates().each do |update|
+ plugin=update.getPlugin()
@updates_by_plugin[plugin]||=[]
@updates_by_plugin[plugin]<<update
if update.isCompatible
- @last_compatible[plugin.key]=update.release.version
+ @last_compatible[plugin.getKey()]=update.getRelease().getVersion()
end
end
end
load_matrix()
if @matrix
@center=@matrix.getCenter()
- @matrix.findAvailableGroups().each do |update|
- category = update.pluginsGroup.masterPlugin.category||''
+ @matrix.findAvailablePlugins().each do |update|
+ category=update.getPlugin().getCategory()||''
@updates_by_category[category]||=[]
@updates_by_category[category]<<update
end
-
end
end
end
private
-
def load_matrix
@matrix=java_facade.getUpdateCenterMatrix(params[:reload]=='true')
end
end
end
- def installed_plugins
+ def user_plugins
java_facade.getPluginsMetadata().select{|plugin| !plugin.isCore()}.sort
end
+
+ def core_plugins
+ java_facade.getPluginsMetadata().select{|plugin| plugin.isCore()}.sort
+ end
end
</tr>
</thead>
<tbody>
- <% updates.sort_by{|c| c.pluginsGroup.key}.each do |update|
- plugins_group = update.pluginsGroup
- plugin = plugins_group.masterPlugin
+ <% updates.sort_by{|c| c.getPlugin().getName()}.each do |update|
+ plugin=update.getPlugin()
%>
<tr class="<%= cycle('even','odd', :name => category) -%>">
<td width="150" nowrap>
<td>
<%= plugin.getDescription() %>
<div id="detail-<%= plugin.getKey() -%>" style="display:none">
-
- <% plugins_group.plugins.each do |sub_plugin| %>
- <% if sub_plugin.key != plugin.key %>
- <div>
- <span><%= sub_plugin.name -%></span> : <span><%= sub_plugin.description -%></span>
- </div>
- <% end %>
- <% end %>
-
<table class="spaced width100">
<% if plugin.getLicense() %>
<tr>
</tr>
</thead>
<tbody>
- <% if @plugins_groups.empty? %>
+ <% if @user_plugins.empty? %>
<tr class="even"><td colspan="5">No plugins</td></tr>
<% else
- @plugins_groups.each do |group_key, plugins|
- plugin = plugins.find {|plugin| plugin.key == group_key}
+ @user_plugins.each do |plugin|
%>
<tr class="select <%= cycle('even', 'odd', :name => 'user') -%>" id="select_<%= plugin.getKey() -%>">
<td width="1%" nowrap><b><a href="#plugin" onclick="showPlugin('<%= plugin.getKey() -%>')"><%= h(plugin.getName()) -%></a></b> <span class="note">[<%= h plugin.getKey() -%>]</span></td>
<%= plugin.getDescription() -%>
<div id="detail-<%= plugin.getKey() -%>" style="display:none">
-
-
- <% plugins.each do |sub_plugin| %>
- <% if sub_plugin.key != plugin.key %>
- <div>
- <span><%= sub_plugin.name -%></span> : <span><%= sub_plugin.description -%></span>
- </div>
- <% end %>
- <% end %>
-
<table class="spaced width100">
<% if plugin.getLicense() %><tr><td class="thin nowrap"><b>License:</b> </td><td><%= plugin.getLicense() -%></td></tr><% end %>
<% if plugin.getOrganization() %>
</tbody>
</table>
+ <div class="break30"> </div>
+
+ <table class="data width100" id="system-plugins">
+ <thead>
+ <tr><th colspan="3"><h2>System plugins</h2></th></tr>
+ </thead>
+ <tbody>
+ <%
+ @core_plugins.each do |plugin|
+ %>
+ <tr class="<%= cycle('even','odd', :name => 'core') -%>" id="<%= u plugin.getKey() -%>">
+ <td width="1%" nowrap><b><%= plugin.getName() -%></b> <span class="note">[<%= h plugin.getKey() -%>]</span></td>
+ <td><%= plugin.getDescription() -%></td>
+ </tr>
+ <% end %>
+ </tbody>
+ </table>
+
</div>
release=update.getRelease()
%>
<tr class="<%= css -%>">
- <td width="1%" nowrap><% if index==0 %><b><%= h(plugin.getName()) -%></b> <%= @installed_plugins[plugin.getKey()] -%> -> <% end %></td>
+ <td width="1%" nowrap><% if index==0 %><b><%= h(plugin.getName()) -%></b> <%= @user_plugins[plugin.getKey()] -%> -> <% end %></td>
<td width="1%" nowrap><b><%= release.getVersion() -%></b></td>
<td width="1%" nowrap><%= release_date(release.getDate()) if release.getDate() -%></td>
<td><%= release.getDescription() -%></td>
}
@Test
- public void should_deploy_plugin() {
+ public void deployPlugin() {
deployer.start();
// check that the plugin is registered
}
@Test
- public void should_deploy_plugin_extensions() {
+ public void deployPluginExtensions() {
deployer.start();
// check that the plugin is registered
}
@Test
- public void should_ignore_jars_which_are_not_plugins() {
+ public void ignoreJarsWhichAreNotPlugins() {
deployer.start();
assertThat(deployer.getMetadata()).isEmpty();
}
@Test(expected = ServerStartException.class)
- public void should_fail_if_two_plugins_with_same_key() {
+ public void failIfTwoPluginsWithSameKey() {
deployer.start();
}
}
projects / sonarqube.git / commitdiff