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

18
scm-webapp/src/main/java/sonia/scm/resources/AbstractResource.java
View File

@@ -30,6 +30,7 @@
*/
package sonia.scm.resources;
//~--- non-JDK imports --------------------------------------------------------
@@ -37,7 +38,7 @@ package sonia.scm.resources;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.boot.BootstrapUtil;
import sonia.scm.plugin.PluginLoader;
import sonia.scm.util.IOUtil;
import sonia.scm.util.Util;
@@ -72,14 +73,16 @@ public abstract class AbstractResource implements Resource
*
*
* @param servletContext
* @param pluginLoader
* @param resources
* @param resourceHandlers
*/
public AbstractResource(ServletContext servletContext,
List<String> resources,
List<ResourceHandler> resourceHandlers)
PluginLoader pluginLoader, List<String> resources,
List<ResourceHandler> resourceHandlers)
{
this.servletContext = servletContext;
this.pluginLoader = pluginLoader;
this.resources = resources;
this.resourceHandlers = resourceHandlers;
}
@@ -128,7 +131,7 @@ public abstract class AbstractResource implements Resource
* @throws IOException
*/
private void appendResource(OutputStream stream, String resource)
throws IOException
throws IOException
{
InputStream input = getResourceAsStream(resource);
@@ -152,7 +155,7 @@ public abstract class AbstractResource implements Resource
* @throws IOException
*/
private void appendResource(InputStream input, OutputStream stream)
throws IOException
throws IOException
{
if (input != null)
{
@@ -180,7 +183,7 @@ public abstract class AbstractResource implements Resource
private InputStream getResourceAsStream(String resource)
{
InputStream input = null;
ClassLoader classLoader = BootstrapUtil.getClassLoader(servletContext);
ClassLoader classLoader = pluginLoader.getUberClassLoader();
if (classLoader != null)
{
@@ -204,6 +207,9 @@ public abstract class AbstractResource implements Resource
//~--- fields ---------------------------------------------------------------
/** Field description */
private final PluginLoader pluginLoader;
/** Field description */
protected List<ResourceHandler> resourceHandlers;