svn commit: r950403 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java

[djencks]

Author: djencks
Date: Wed Jun  2 07:50:54 2010
New Revision: 950403

URL: http://svn.apache.org/viewvc?rev=950403&view=rev
Log:
initialize base jndi contexts differently for geronimo (can have empty 
contexts) and openejb (apparently cannot)

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java?rev=950403&r1=950402&r2=950403&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
 Wed Jun  2 07:50:54 2010
@@ -54,13 +54,21 @@ public class CoreContainerSystem impleme
         }
         jndiContext = jndiFactory.createRootContext();
         try {
-            jndiContext.bind("openejb/local/.", "");
-            jndiContext.bind("openejb/remote/.", "");
-            jndiContext.bind("openejb/client/.", "");
-            jndiContext.bind("openejb/Deployment/.", "");
+            if (System.getProperty("duct tape") == null)  {
+                jndiContext.bind("openejb/local/.", "");
+                jndiContext.bind("openejb/remote/.", "");
+                jndiContext.bind("openejb/client/.", "");
+                jndiContext.bind("openejb/Deployment/.", "");
+            } else {
+                Context openejb = jndiContext.createSubcontext("openejb");
+                openejb.createSubcontext("local");
+                openejb.createSubcontext("remote");
+                openejb.createSubcontext("client");
+                openejb.createSubcontext("Deployment");
+            }
         }
         catch (javax.naming.NamingException exception) {
-            throw new RuntimeException(exception);
+            throw new RuntimeException("Could not initialize openejb core 
naming context", exception);
         }
         SystemInstance.get().setComponent(JndiFactory.class, jndiFactory);
     }