[openejb-scm] openejb1/modules/core/src/java/org/openejb/core/ivm/naming IvmContext.java

[dblevins]

dblevins    2005/07/05 22:04:03

  Modified:    modules/core/src/java/org/openejb/core/ivm/naming
                        IvmContext.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.2       +3 -2      
openejb1/modules/core/src/java/org/openejb/core/ivm/naming/IvmContext.java
  
  Index: IvmContext.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/core/ivm/naming/IvmContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IvmContext.java   26 Mar 2004 21:42:31 -0000      1.1
  +++ IvmContext.java   6 Jul 2005 02:04:03 -0000       1.2
  @@ -68,6 +68,7 @@
   import javax.naming.spi.ObjectFactory;
   
   import org.openejb.core.ThreadContext;
  +import org.openejb.OpenEJB;
   
   import com.sun.naming.internal.ResourceManager;
   
  @@ -200,7 +201,7 @@
                   
if(className.equals("org.openejb.core.ivm.naming.java.javaURLContextFactory"))
                       continue;
                   try {
  -                    ClassLoader cl = 
org.openejb.util.ClasspathUtils.getContextClassLoader();
  +                    ClassLoader cl = OpenEJB.getContextClassLoader();
                       Class factoryClass = Class.forName(className, true, cl);
                       ObjectFactory factoryInstance = 
(ObjectFactory)factoryClass.newInstance();
                       factories.add(factoryInstance);