svn commit: r1406708 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

[rmannibucau]

Author: rmannibucau
Date: Wed Nov  7 16:28:51 2012
New Revision: 1406708

URL: http://svn.apache.org/viewvc?rev=1406708&view=rev
Log:
trying to bind historical JNDI names (XXXLocal, ...)

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1406708&r1=1406707&r2=1406708&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 Wed Nov  7 16:28:51 2012
@@ -897,11 +897,14 @@ public class Assembler extends Assembler
             // bind all global values on global context
             for (Map.Entry<String, Object> value : 
appContext.getBindings().entrySet()) {
                 String path = value.getKey();
-                if (!path.startsWith("global") || 
path.equalsIgnoreCase("global/dummy")) { // dummy bound for each app
+                // keep only global bindings
+                // the second part (path contains /) assume short name are 
openejb 3 ones (XXXLocal...)
+                if ((!path.startsWith("global") || 
path.equalsIgnoreCase("global/dummy"))
+                        && path.contains("/")) {
                     continue;
                 }
 
-                // a bit weird but just < ></>o be consistent if user doesn't 
lookup directly the resource
+                // a bit weird but just to be consistent if user doesn't 
lookup directly the resource
                 Context lastContext = 
Contexts.createSubcontexts(containerSystemContext, path);
                 try {
                     lastContext.rebind(path.substring(path.lastIndexOf("/") + 
1, path.length()), value.getValue());