Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-08 06:25:45 +01:00
Code Issues Packages Projects Releases Activity

renamed Plugin to InstalledPluginDescriptor and added PluginDescriptor interface

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-08-20 08:05:41 +02:00
parent ae19ad9327
commit 1a01216f62
19 changed files with 74 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java
View File

@@ -95,7 +95,7 @@ public class DefaultPluginLoader implements PluginLoader
try
{
JAXBContext context = JAXBContext.newInstance(ScmModule.class,
Plugin.class);
InstalledPluginDescriptor.class);
modules = getInstalled(parent, context, PATH_MODULECONFIG);
@@ -178,7 +178,7 @@ public class DefaultPluginLoader implements PluginLoader
*
* @return
*/
private Iterable<Plugin> unwrap()
private Iterable<InstalledPluginDescriptor> unwrap()
{
return PluginsInternal.unwrap(installedPlugins);
}

16
scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
View File

@@ -131,7 +131,7 @@ public class DefaultPluginManager implements PluginManager
for (InstalledPlugin wrapper : pluginLoader.getInstalledPlugins())
{
Plugin plugin = wrapper.getPlugin();
InstalledPluginDescriptor plugin = wrapper.getPlugin();
PluginInformation info = plugin.getInformation();
if ((info != null) && info.isValid())
@@ -192,7 +192,7 @@ public class DefaultPluginManager implements PluginManager
plugin.setState(PluginState.INSTALLED);
// ugly workaround
Plugin newPlugin = new Plugin();
InstalledPluginDescriptor newPlugin = new InstalledPluginDescriptor();
// TODO check
// newPlugin.setInformation(plugin);
@@ -220,8 +220,8 @@ public class DefaultPluginManager implements PluginManager
{
new ZipUnArchiver().extractArchive(packageStream, tempDirectory);
Plugin plugin = JAXB.unmarshal(new File(tempDirectory, "plugin.xml"),
Plugin.class);
InstalledPluginDescriptor plugin = JAXB.unmarshal(new File(tempDirectory, "plugin.xml"),
InstalledPluginDescriptor.class);
PluginCondition condition = plugin.getCondition();
@@ -262,7 +262,7 @@ public class DefaultPluginManager implements PluginManager
{
PluginPermissions.manage().check();
Plugin plugin = installedPlugins.get(id);
InstalledPluginDescriptor plugin = installedPlugins.get(id);
if (plugin == null)
{
@@ -457,7 +457,7 @@ public class DefaultPluginManager implements PluginManager
Set<PluginInformation> infoSet = new LinkedHashSet<>();
for (Plugin plugin : installedPlugins.values())
for (InstalledPluginDescriptor plugin : installedPlugins.values())
{
infoSet.add(plugin.getInformation());
}
@@ -647,7 +647,7 @@ public class DefaultPluginManager implements PluginManager
{
boolean core = false;
for (Plugin installedPlugin : installedPlugins.values())
for (InstalledPluginDescriptor installedPlugin : installedPlugins.values())
{
PluginInformation installed = installedPlugin.getInformation();
@@ -715,5 +715,5 @@ public class DefaultPluginManager implements PluginManager
private final SCMContextProvider context;
/** Field description */
private final Map<String, Plugin> installedPlugins;
private final Map<String, InstalledPluginDescriptor> installedPlugins;
}

6
scm-webapp/src/main/java/sonia/scm/plugin/ExplodedSmp.java
View File

@@ -63,7 +63,7 @@ public final class ExplodedSmp implements Comparable<ExplodedSmp>
* @param path
* @param plugin
*/
ExplodedSmp(Path path, Plugin plugin)
ExplodedSmp(Path path, InstalledPluginDescriptor plugin)
{
logger.trace("create exploded scm for plugin {} and dependencies {}", plugin.getInformation().getName(), plugin.getDependencies());
this.path = path;
@@ -163,7 +163,7 @@ public final class ExplodedSmp implements Comparable<ExplodedSmp>
*
* @return plugin descriptor
*/
public Plugin getPlugin()
public InstalledPluginDescriptor getPlugin()
{
return plugin;
}
@@ -202,5 +202,5 @@ public final class ExplodedSmp implements Comparable<ExplodedSmp>
private final Path path;
/** plugin object */
private final Plugin plugin;
private final InstalledPluginDescriptor plugin;
}

10
scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java
View File

@@ -123,7 +123,7 @@ public final class PluginProcessor
try
{
this.context = JAXBContext.newInstance(Plugin.class);
this.context = JAXBContext.newInstance(InstalledPluginDescriptor.class);
}
catch (JAXBException ex)
{
@@ -371,7 +371,7 @@ public final class PluginProcessor
ClassLoader classLoader;
URL[] urlArray = urls.toArray(new URL[urls.size()]);
Plugin plugin = smp.getPlugin();
InstalledPluginDescriptor plugin = smp.getPlugin();
String id = plugin.getInformation().getName(false);
@@ -441,7 +441,7 @@ public final class PluginProcessor
*
* @return
*/
private Plugin createPlugin(ClassLoader classLoader, Path descriptor)
private InstalledPluginDescriptor createPlugin(ClassLoader classLoader, Path descriptor)
{
ClassLoader ctxcl = Thread.currentThread().getContextClassLoader();
@@ -449,7 +449,7 @@ public final class PluginProcessor
try
{
return (Plugin) context.createUnmarshaller().unmarshal(
return (InstalledPluginDescriptor) context.createUnmarshaller().unmarshal(
descriptor.toFile());
}
catch (JAXBException ex)
@@ -486,7 +486,7 @@ public final class PluginProcessor
{
ClassLoader cl = createClassLoader(classLoader, smp);
Plugin plugin = createPlugin(cl, descriptor);
InstalledPluginDescriptor plugin = createPlugin(cl, descriptor);
WebResourceLoader resourceLoader = createWebResourceLoader(directory);

2
scm-webapp/src/main/java/sonia/scm/plugin/PluginTree.java
View File

@@ -86,7 +86,7 @@ public final class PluginTree
for (ExplodedSmp smp : smpOrdered)
{
Plugin plugin = smp.getPlugin();
InstalledPluginDescriptor plugin = smp.getPlugin();
if (plugin.getScmVersion() != SCM_VERSION)
{

8
scm-webapp/src/main/java/sonia/scm/plugin/PluginsInternal.java
View File

@@ -105,7 +105,7 @@ public final class PluginsInternal
*
* @return
*/
public static File createPluginDirectory(File parent, Plugin plugin)
public static File createPluginDirectory(File parent, InstalledPluginDescriptor plugin)
{
PluginInformation info = plugin.getInformation();
@@ -159,7 +159,7 @@ public final class PluginsInternal
*
* @return
*/
public static Iterable<Plugin> unwrap(Iterable<InstalledPlugin> wrapped)
public static Iterable<InstalledPluginDescriptor> unwrap(Iterable<InstalledPlugin> wrapped)
{
return Iterables.transform(wrapped, new Unwrap());
}
@@ -188,7 +188,7 @@ public final class PluginsInternal
* @version Enter version here..., 14/06/05
* @author Enter your name here...
*/
private static class Unwrap implements Function<InstalledPlugin, Plugin>
private static class Unwrap implements Function<InstalledPlugin, InstalledPluginDescriptor>
{
/**
@@ -200,7 +200,7 @@ public final class PluginsInternal
* @return
*/
@Override
public Plugin apply(InstalledPlugin wrapper)
public InstalledPluginDescriptor apply(InstalledPlugin wrapper)
{
return wrapper.getPlugin();
}