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

start implementation of isolated classloaders

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-06-06 08:57:41 +02:00
parent 18c5c3ec97
commit 1d6db4424b
41 changed files with 1391 additions and 2430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,8 +46,6 @@ import com.google.inject.Module;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.util.ClassLoaders;
//~--- JDK imports ------------------------------------------------------------
import java.io.IOException;
@@ -83,24 +81,33 @@ public class DefaultPluginLoader implements PluginLoader
/**
* Constructs ...
*
* @param parent
* @param wrappedPlugins
*/
public DefaultPluginLoader()
public DefaultPluginLoader(ClassLoader parent,
Set<PluginWrapper> wrappedPlugins)
{
ClassLoader classLoader =
ClassLoaders.getContextClassLoader(DefaultPluginLoader.class);
this.uberClassLoader = new UberClassLoader(parent, wrappedPlugins);
try
{
JAXBContext context = JAXBContext.newInstance(ScmModule.class,
Plugin.class);
modules = getInstalled(classLoader, context, PATH_MODULECONFIG);
plugins = getInstalled(classLoader, context, PATH_PLUGINCONFIG);
modules = getInstalled(parent, context, PATH_MODULECONFIG);
// hidden plugins ???
Set<Plugin> ips = getInstalled(parent, context, PATH_PLUGINCONFIG);
Builder<Plugin> builder = ImmutableSet.builder();
builder.addAll(ips);
builder.addAll(Plugins.unwrap(wrappedPlugins));
plugins = builder.build();
appendExtensions(multiple, single, extensions, modules);
appendExtensions(multiple, single, extensions, plugins);
}
catch (Exception ex)
catch (IOException | JAXBException ex)
{
throw Throwables.propagate(ex);
}
@@ -171,6 +178,18 @@ public class DefaultPluginLoader implements PluginLoader
return plugins;
}
/**
* Method description
*
*
* @return
*/
@Override
public ClassLoader getUberClassLoader()
{
return uberClassLoader;
}
//~--- methods --------------------------------------------------------------
/**
@@ -259,6 +278,9 @@ public class DefaultPluginLoader implements PluginLoader
//~--- fields ---------------------------------------------------------------
/** Field description */
private final ClassLoader uberClassLoader;
/** Field description */
private Set<ScmModule> modules;