[openejb-scm] openejb1/modules/core/src/java/org/openejb/util ClasspathUtils.java

[dblevins]

dblevins    2005/07/05 22:04:04

  Modified:    modules/core/src/java/org/openejb/util ClasspathUtils.java
  Log:

  Moved the getContextClassLoader method to the OpenEJB class so ClasspathUtils 
only contains the classpath modifying methods used by the Loaders and other 
code.
  
  Going to kill the ClasspathUtils and make everyone as the loaders directly to 
modify the classpath, rather than sometimes using the loader and then asking 
ClasspathUtils to guess what loader to use.
  
  Part of the fix for OPENEJB-40, OPENEJB-41 and OPENEJB-42.
  
  Revision  Changes    Path
  1.11      +10 -9     
openejb1/modules/core/src/java/org/openejb/util/ClasspathUtils.java
  
  Index: ClasspathUtils.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/util/ClasspathUtils.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ClasspathUtils.java       5 Jul 2005 00:59:42 -0000       1.10
  +++ ClasspathUtils.java       6 Jul 2005 02:04:04 -0000       1.11
  @@ -191,14 +191,6 @@
           }
       }
   
  -    public static ClassLoader getContextClassLoader() {
  -        return (ClassLoader) java.security.AccessController.doPrivileged(new 
java.security.PrivilegedAction() {
  -            public Object run() {
  -                return Thread.currentThread().getContextClassLoader();
  -            }
  -        });
  -    }
  -
       public static void rebuildJavaClassPathVariable() throws Exception {
   
       }
  @@ -500,4 +492,13 @@
               return webappLoader;
           }
       }
  +
  +    protected static ClassLoader getContextClassLoader() {
  +        return (ClassLoader) java.security.AccessController.doPrivileged(new 
java.security.PrivilegedAction() {
  +            public Object run() {
  +                return Thread.currentThread().getContextClassLoader();
  +            }
  +        });
  +    }
  +
   }