Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 07:25:44 +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

12
scm-webapp/src/main/java/sonia/scm/resources/DefaultResourceManager.java
View File

@@ -30,10 +30,12 @@
*/
package sonia.scm.resources;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.collect.Lists;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -46,7 +48,6 @@ import sonia.scm.plugin.PluginLoader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -79,8 +80,7 @@ public class DefaultResourceManager extends AbstractResourceManager
*/
@Inject
public DefaultResourceManager(ServletContext servletContext,
PluginLoader pluginLoader,
Set<ResourceHandler> resourceHandlers)
PluginLoader pluginLoader, Set<ResourceHandler> resourceHandlers)
{
super(servletContext, pluginLoader, resourceHandlers);
}
@@ -100,12 +100,12 @@ public class DefaultResourceManager extends AbstractResourceManager
try
{
Resource resource = new DefaultResource(servletContext, resources,
new ArrayList<ResourceHandler>(resourceHandlers),
Resource resource = new DefaultResource(servletContext, pluginLoader,
resources, Lists.newArrayList(resourceHandlers),
ResourceType.SCRIPT);
resourceMap.put(new ResourceKey(resource.getName(), ResourceType.SCRIPT),
resource);
resource);
}
catch (IOException ex)
{