diff --git a/src/test/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java b/src/test/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java index 0e7fe04..c867259 100644 --- a/src/test/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java +++ b/src/test/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java @@ -55,7 +55,7 @@ public class FirstPriorityConfigTestCase extends TestCase { // class through a dummy loader though this is not absolutely // necessary... PathableClassLoader dummy = new PathableClassLoader(null); - dummy.useSystemLoader("junit."); + dummy.useExplicitLoader("junit.", Test.class.getClassLoader()); dummy.addLogicalLib("testclasses"); dummy.addLogicalLib("commons-logging"); @@ -70,7 +70,7 @@ public class FirstPriorityConfigTestCase extends TestCase { // so we can check that the first one in the classpath is // used. PathableClassLoader containerLoader = new PathableClassLoader(null); - containerLoader.useSystemLoader("junit."); + containerLoader.useExplicitLoader("junit.", Test.class.getClassLoader()); containerLoader.addLogicalLib("commons-logging"); PathableClassLoader webappLoader = new PathableClassLoader(containerLoader); diff --git a/src/test/org/apache/commons/logging/config/PriorityConfigTestCase.java b/src/test/org/apache/commons/logging/config/PriorityConfigTestCase.java index faa3eb0..6c7d66a 100644 --- a/src/test/org/apache/commons/logging/config/PriorityConfigTestCase.java +++ b/src/test/org/apache/commons/logging/config/PriorityConfigTestCase.java @@ -62,7 +62,7 @@ public class PriorityConfigTestCase extends TestCase { // class through a dummy loader though this is not absolutely // necessary... PathableClassLoader dummy = new PathableClassLoader(null); - dummy.useSystemLoader("junit."); + dummy.useExplicitLoader("junit.", Test.class.getClassLoader()); dummy.addLogicalLib("testclasses"); dummy.addLogicalLib("commons-logging"); @@ -77,7 +77,7 @@ public class PriorityConfigTestCase extends TestCase { // so we can check that the first one in the classpath is // used. PathableClassLoader containerLoader = new PathableClassLoader(null); - containerLoader.useSystemLoader("junit."); + containerLoader.useExplicitLoader("junit.", Test.class.getClassLoader()); containerLoader.addLogicalLib("commons-logging"); URL pri10URL = new URL(baseUrl, "priority10/"); diff --git a/src/test/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java b/src/test/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java index fb1e3b0..83f86d1 100644 --- a/src/test/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java +++ b/src/test/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java @@ -41,7 +41,8 @@ public class CustomConfigAPITestCase extends CustomConfigTestCase { */ public static Test suite() throws Exception { PathableClassLoader parent = new PathableClassLoader(null); - parent.useSystemLoader("junit."); + parent.useExplicitLoader("junit.", Test.class.getClassLoader()); + // the TestHandler class must be accessable from the System classloader // in order for java.util.logging.LogManager.readConfiguration to // be able to instantiate it. And this test case must see the same diff --git a/src/test/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java b/src/test/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java index 9a283a6..12bf8bd 100644 --- a/src/test/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java +++ b/src/test/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java @@ -42,7 +42,8 @@ public class CustomConfigFullTestCase extends CustomConfigTestCase { */ public static Test suite() throws Exception { PathableClassLoader parent = new PathableClassLoader(null); - parent.useSystemLoader("junit."); + parent.useExplicitLoader("junit.", Test.class.getClassLoader()); + // the TestHandler class must be accessable from the System classloader // in order for java.util.logging.LogManager.readConfiguration to // be able to instantiate it. And this test case must see the same diff --git a/src/test/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java b/src/test/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java index 9805192..866f1e3 100644 --- a/src/test/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java +++ b/src/test/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java @@ -36,7 +36,7 @@ public class ApiClasspathStandardTestCase { */ public static Test suite() throws Exception { PathableClassLoader parent = new PathableClassLoader(null); - parent.useSystemLoader("junit."); + parent.useExplicitLoader("junit.", Test.class.getClassLoader()); parent.addLogicalLib("commons-logging-api"); PathableClassLoader child = new PathableClassLoader(parent); diff --git a/src/test/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java b/src/test/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java index 92a968d..428582b 100644 --- a/src/test/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java +++ b/src/test/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java @@ -34,7 +34,7 @@ public class AppClasspathStandardTestCase { */ public static Test suite() throws Exception { PathableClassLoader loader = new PathableClassLoader(null); - loader.useSystemLoader("junit."); + loader.useExplicitLoader("junit.", Test.class.getClassLoader()); loader.addLogicalLib("testclasses"); loader.addLogicalLib("log4j12"); loader.addLogicalLib("commons-logging"); diff --git a/src/test/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java b/src/test/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java index cd17d98..a56b04b 100644 --- a/src/test/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java +++ b/src/test/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java @@ -35,7 +35,7 @@ public class ChildClasspathStandardTestCase { */ public static Test suite() throws Exception { PathableClassLoader parent = new PathableClassLoader(null); - parent.useSystemLoader("junit."); + parent.useExplicitLoader("junit.", Test.class.getClassLoader()); PathableClassLoader child = new PathableClassLoader(parent); child.addLogicalLib("testclasses"); diff --git a/src/test/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java b/src/test/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java index 98f9592..1825b27 100644 --- a/src/test/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java +++ b/src/test/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java @@ -34,7 +34,7 @@ public class ParentClasspathStandardTestCase { */ public static Test suite() throws Exception { PathableClassLoader parent = new PathableClassLoader(null); - parent.useSystemLoader("junit."); + parent.useExplicitLoader("junit.", Test.class.getClassLoader()); parent.addLogicalLib("commons-logging"); parent.addLogicalLib("log4j12"); diff --git a/src/test/org/apache/commons/logging/logkit/StandardTestCase.java b/src/test/org/apache/commons/logging/logkit/StandardTestCase.java index 8ef1d48..f06d999 100644 --- a/src/test/org/apache/commons/logging/logkit/StandardTestCase.java +++ b/src/test/org/apache/commons/logging/logkit/StandardTestCase.java @@ -67,7 +67,7 @@ public class StandardTestCase extends AbstractLogTest { Class thisClass = StandardTestCase.class; PathableClassLoader loader = new PathableClassLoader(null); - loader.useSystemLoader("junit."); + loader.useExplicitLoader("junit.", Test.class.getClassLoader()); loader.addLogicalLib("testclasses"); loader.addLogicalLib("commons-logging"); loader.addLogicalLib("logkit"); diff --git a/src/test/org/apache/commons/logging/security/SecurityAllowedTestCase.java b/src/test/org/apache/commons/logging/security/SecurityAllowedTestCase.java index e869533..0b31662 100644 --- a/src/test/org/apache/commons/logging/security/SecurityAllowedTestCase.java +++ b/src/test/org/apache/commons/logging/security/SecurityAllowedTestCase.java @@ -57,7 +57,7 @@ public class SecurityAllowedTestCase extends TestCase */ public static Test suite() throws Exception { PathableClassLoader parent = new PathableClassLoader(null); - parent.useSystemLoader("junit."); + parent.useExplicitLoader("junit.", Test.class.getClassLoader()); parent.addLogicalLib("commons-logging"); parent.addLogicalLib("testclasses"); diff --git a/src/test/org/apache/commons/logging/security/SecurityForbiddenTestCase.java b/src/test/org/apache/commons/logging/security/SecurityForbiddenTestCase.java index da4a5e7..e6f40c6 100644 --- a/src/test/org/apache/commons/logging/security/SecurityForbiddenTestCase.java +++ b/src/test/org/apache/commons/logging/security/SecurityForbiddenTestCase.java @@ -60,7 +60,7 @@ public class SecurityForbiddenTestCase extends TestCase */ public static Test suite() throws Exception { PathableClassLoader parent = new PathableClassLoader(null); - parent.useSystemLoader("junit."); + parent.useExplicitLoader("junit.", Test.class.getClassLoader()); parent.addLogicalLib("commons-logging"); parent.addLogicalLib("testclasses"); diff --git a/src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java b/src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java index 6703c97..d0fcf5e 100644 --- a/src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java +++ b/src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java @@ -44,7 +44,7 @@ public class BasicServletTestCase extends TestCase { // that class is deployed via a shared classloader. PathableClassLoader parent = new PathableClassLoader(null); - parent.useSystemLoader("junit."); + parent.useExplicitLoader("junit.", Test.class.getClassLoader()); parent.addLogicalLib("commons-logging"); parent.addLogicalLib("servletapi"); diff --git a/src/test/org/apache/commons/logging/simple/CustomConfigTestCase.java b/src/test/org/apache/commons/logging/simple/CustomConfigTestCase.java index ef15929..7fe141c 100644 --- a/src/test/org/apache/commons/logging/simple/CustomConfigTestCase.java +++ b/src/test/org/apache/commons/logging/simple/CustomConfigTestCase.java @@ -109,7 +109,7 @@ public class CustomConfigTestCase extends DefaultConfigTestCase { Class thisClass = CustomConfigTestCase.class; PathableClassLoader loader = new PathableClassLoader(null); - loader.useSystemLoader("junit."); + loader.useExplicitLoader("junit.", Test.class.getClassLoader()); loader.addLogicalLib("testclasses"); loader.addLogicalLib("commons-logging"); diff --git a/src/test/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java b/src/test/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java index c20c6df..6619024 100644 --- a/src/test/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java +++ b/src/test/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java @@ -50,7 +50,7 @@ public class DateTimeCustomConfigTestCase extends CustomConfigTestCase { Class thisClass = DateTimeCustomConfigTestCase.class; PathableClassLoader loader = new PathableClassLoader(null); - loader.useSystemLoader("junit."); + loader.useExplicitLoader("junit.", Test.class.getClassLoader()); loader.addLogicalLib("testclasses"); loader.addLogicalLib("commons-logging"); diff --git a/src/test/org/apache/commons/logging/simple/DefaultConfigTestCase.java b/src/test/org/apache/commons/logging/simple/DefaultConfigTestCase.java index 22ff7fc..a7e1858 100644 --- a/src/test/org/apache/commons/logging/simple/DefaultConfigTestCase.java +++ b/src/test/org/apache/commons/logging/simple/DefaultConfigTestCase.java @@ -78,7 +78,7 @@ public class DefaultConfigTestCase extends TestCase { Class thisClass = DefaultConfigTestCase.class; PathableClassLoader loader = new PathableClassLoader(null); - loader.useSystemLoader("junit."); + loader.useExplicitLoader("junit.", Test.class.getClassLoader()); loader.addLogicalLib("testclasses"); loader.addLogicalLib("commons-logging"); diff --git a/src/test/org/apache/commons/logging/tccl/BadTCCLTestCase.java b/src/test/org/apache/commons/logging/tccl/BadTCCLTestCase.java index c3f6a21..00b5904 100644 --- a/src/test/org/apache/commons/logging/tccl/BadTCCLTestCase.java +++ b/src/test/org/apache/commons/logging/tccl/BadTCCLTestCase.java @@ -31,7 +31,7 @@ public class BadTCCLTestCase extends TestCase { public static Test suite() throws Exception { PathableClassLoader contextClassLoader = new PathableClassLoader(null); - contextClassLoader.useSystemLoader("junit."); + contextClassLoader.useExplicitLoader("junit.", Test.class.getClassLoader()); PathableTestSuite suite = new PathableTestSuite(BadTCCLTestCase.class, contextClassLoader); return suite; } diff --git a/src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java b/src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java index c84ef34..a12257b 100644 --- a/src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java +++ b/src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java @@ -55,7 +55,7 @@ public class TcclDisabledTestCase extends TestCase { // class through a dummy loader though this is not absolutely // necessary... PathableClassLoader dummy = new PathableClassLoader(null); - dummy.useSystemLoader("junit."); + dummy.useExplicitLoader("junit.", Test.class.getClassLoader()); dummy.addLogicalLib("testclasses"); dummy.addLogicalLib("commons-logging"); @@ -71,7 +71,7 @@ public class TcclDisabledTestCase extends TestCase { PathableClassLoader emptyLoader = new PathableClassLoader(null); PathableClassLoader parentLoader = new PathableClassLoader(null); - parentLoader.useSystemLoader("junit."); + parentLoader.useExplicitLoader("junit.", Test.class.getClassLoader()); parentLoader.addLogicalLib("commons-logging"); parentLoader.addLogicalLib("testclasses"); // hack to ensure that the testcase classloader can't see diff --git a/src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java b/src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java index 7d5a484..b4fe96b 100644 --- a/src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java +++ b/src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java @@ -55,7 +55,7 @@ public class TcclEnabledTestCase extends TestCase { // class through a dummy loader though this is not absolutely // necessary... PathableClassLoader dummy = new PathableClassLoader(null); - dummy.useSystemLoader("junit."); + dummy.useExplicitLoader("junit.", Test.class.getClassLoader()); dummy.addLogicalLib("testclasses"); dummy.addLogicalLib("commons-logging"); @@ -71,7 +71,7 @@ public class TcclEnabledTestCase extends TestCase { PathableClassLoader emptyLoader = new PathableClassLoader(null); PathableClassLoader parentLoader = new PathableClassLoader(null); - parentLoader.useSystemLoader("junit."); + parentLoader.useExplicitLoader("junit.", Test.class.getClassLoader()); parentLoader.addLogicalLib("commons-logging"); parentLoader.addLogicalLib("testclasses"); // hack to ensure that the testcase classloader can't see diff --git a/src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java b/src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java index 03736d2..9b00f54 100644 --- a/src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java +++ b/src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java @@ -55,7 +55,7 @@ public class TcclDisabledTestCase extends TestCase { // class through a dummy loader though this is not absolutely // necessary... PathableClassLoader dummy = new PathableClassLoader(null); - dummy.useSystemLoader("junit."); + dummy.useExplicitLoader("junit.", Test.class.getClassLoader()); dummy.addLogicalLib("testclasses"); dummy.addLogicalLib("commons-logging"); @@ -72,7 +72,7 @@ public class TcclDisabledTestCase extends TestCase { PathableClassLoader emptyLoader = new PathableClassLoader(null); PathableClassLoader parentLoader = new PathableClassLoader(null); - parentLoader.useSystemLoader("junit."); + parentLoader.useExplicitLoader("junit.", Test.class.getClassLoader()); parentLoader.addLogicalLib("commons-logging"); parentLoader.addLogicalLib("testclasses"); // hack to ensure that the testcase classloader can't see diff --git a/src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java b/src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java index 674c3ba..a4f232a 100644 --- a/src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java +++ b/src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java @@ -49,7 +49,7 @@ public class TcclEnabledTestCase extends TestCase { // class through a dummy loader though this is not absolutely // necessary... PathableClassLoader dummy = new PathableClassLoader(null); - dummy.useSystemLoader("junit."); + dummy.useExplicitLoader("junit.", Test.class.getClassLoader()); dummy.addLogicalLib("testclasses"); dummy.addLogicalLib("commons-logging"); @@ -66,7 +66,7 @@ public class TcclEnabledTestCase extends TestCase { PathableClassLoader emptyLoader = new PathableClassLoader(null); PathableClassLoader parentLoader = new PathableClassLoader(null); - parentLoader.useSystemLoader("junit."); + parentLoader.useExplicitLoader("junit.", Test.class.getClassLoader()); parentLoader.addLogicalLib("commons-logging"); parentLoader.addLogicalLib("testclasses"); // hack to ensure that the testcase classloader can't see