gistfile1.diff

Index: container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
===================================================================
--- container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java	(revision 785410)
+++ container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java	(working copy)
@@ -21,6 +21,7 @@
 import org.apache.openejb.core.ivm.naming.IvmContext;
 import org.apache.openejb.loader.SystemInstance;
 
+import javax.naming.Context;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -31,7 +32,7 @@
     Map<Object, DeploymentInfo> deployments = new ConcurrentHashMap<Object, DeploymentInfo>();
     Map<Object, Container> containers = new ConcurrentHashMap<Object, Container>();
     Map<String, WebDeploymentInfo> webDeployments = new ConcurrentHashMap<String, WebDeploymentInfo>();
-    IvmContext jndiRootContext = null;
+    Context jndiRootContext = null;
     /**
      * Constructs a CoreContainerSystem and initializes the root JNDI context.
      * It also creates three sub contexts, namely
@@ -47,7 +48,8 @@
 
         try {
 
-            jndiRootContext = IvmContext.createRootContext();
+            JndiFactory jndiFactory = SystemInstance.get().getComponent(JndiFactory.class);
+            jndiRootContext = jndiFactory.createRootContext();
 
             jndiRootContext.bind("openejb/local/.", "");
             jndiRootContext.bind("openejb/remote/.", "");