--- /james/server/trunk/src/java/org/apache/james/core/AvalonMailStore.java        2006-07-28 03:30:10.000000000 +0200
+++ /james/server/trunk/src/java/org/apache/james/core/AvalonMailStore.java        2006-09-18 15:51:39.000000000 +0200
@@ -275,7 +275,7 @@
                 }
 
                 try {
-                    reply = this.getClass().getClassLoader().loadClass(repClass).newInstance();
+                    reply = Thread.currentThread().getContextClassLoader().loadClass(repClass).newInstance();
                     ContainerUtil.enableLogging(reply,getLogger());
                     ContainerUtil.contextualize(reply,context);
                     ContainerUtil.service(reply,m_manager);
--- /james/server/trunk/src/java/org/apache/james/core/AvalonUsersStore.java       2006-07-28 03:30:10.000000000 +0200
+++ /james/server/trunk/src/java/org/apache/james/core/AvalonUsersStore.java       2006-09-18 15:51:51.000000000 +0200
@@ -115,7 +115,7 @@
             }
 
             if (theClassLoader == null) {
-                theClassLoader = this.getClass().getClassLoader();
+                theClassLoader = Thread.currentThread().getContextClassLoader();
             }
 
             UsersRepository rep = (UsersRepository) theClassLoader.loadClass(repClass).newInstance();
--- /james/server/trunk/src/java/org/apache/james/transport/mailets/CommandListservManager.java    2006-08-11 03:06:56.000000000 +0200
+++ /james/server/trunk/src/java/org/apache/james/transport/mailets/CommandListservManager.java    2006-09-18 15:52:03.000000000 +0200
@@ -376,7 +376,7 @@
                                String className,
                                Configuration configuration)
             throws ConfigurationException, ClassNotFoundException, IllegalAccessException, InstantiationException {
-        ClassLoader theClassLoader = getClass().getClassLoader();
+        ClassLoader theClassLoader = Thread.currentThread().getContextClassLoader();
         for (Iterator it = commandPackages.iterator(); it.hasNext();) {
             String packageName = (String) it.next();
 
--- /james/server/trunk/src/java/org/apache/james/pop3server/POP3HandlerChain.java 2006-07-28 03:30:14.000000000 +0200
+++ /james/server/trunk/src/java/org/apache/james/pop3server/POP3HandlerChain.java 2006-09-18 15:52:21.000000000 +0200
@@ -91,7 +91,7 @@
         if(configuration != null) {
             Configuration[] children = configuration.getChildren("handler");
             if ( children != null ) {
-                ClassLoader classLoader = getClass().getClassLoader();
+                ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
                 for ( int i = 0 ; i < children.length ; i++ ) {
                     String className = children[i].getAttribute("class");
                     if(className != null) {
--- /james/server/trunk/src/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java    2006-07-28 03:30:14.000000000 +0200
+++ /james/server/trunk/src/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java    2006-09-18 15:52:30.000000000 +0200
@@ -463,7 +463,7 @@
             // Use the default class.
         }
         try {
-            Object obj = getClass().getClassLoader().loadClass(className).newInstance();
+            Object obj = Thread.currentThread().getContextClassLoader().loadClass(className).newInstance();
             // TODO: Need to support service
             ContainerUtil.enableLogging(obj, getLogger());
             ContainerUtil.contextualize(obj, context);