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

merge with branch 1.x

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-06-04 15:51:19 +02:00
parent fff682397b abf871fa88
commit 18c5c3ec97
42 changed files with 1689 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scm-webapp/src/main/java/sonia/scm/boot/BootstrapUtil.java
View File

@@ -40,12 +40,12 @@ import com.google.common.base.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.net.ChildFirstURLClassLoader;
import sonia.scm.plugin.ChildFirstPluginClassLoader;
import sonia.scm.plugin.DefaultPluginClassLoader;
//~--- JDK imports ------------------------------------------------------------
import java.net.URL;
import java.net.URLClassLoader;
import java.util.List;
@@ -107,7 +107,7 @@ public final class BootstrapUtil
{
logger.info("using {} as plugin classloading strategy",
STRATEGY_CHILDFIRST);
classLoader = new ChildFirstURLClassLoader(urls, parent);
classLoader = new ChildFirstPluginClassLoader(urls, parent);
}
else if (!STRATEGY_PARENTFIRST.equals(strategy))
{
@@ -119,7 +119,7 @@ public final class BootstrapUtil
{
logger.info("using {} as plugin classloading strategy",
STRATEGY_PARENTFIRST);
classLoader = new URLClassLoader(urls, parent);
classLoader = new DefaultPluginClassLoader(urls, parent);
}
return classLoader;
@@ -238,4 +238,17 @@ public final class BootstrapUtil
{
context.setAttribute(CLASSLOADER, classLoader);
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*
* @param context
*/
public static void removeClassLoader(ServletContext context)
{
context.removeAttribute(CLASSLOADER);
}
}