geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1140957 - /geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
Date Wed, 29 Jun 2011 03:45:16 GMT
Author: genspring
Date: Wed Jun 29 03:45:16 2011
New Revision: 1140957

URL: http://svn.apache.org/viewvc?rev=1140957&view=rev
Log:
Now global jndi will be handled in RootContext.   We only need to convert and copy app scope
ejb ref to appclient app context.

Modified:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java?rev=1140957&r1=1140956&r2=1140957&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
Wed Jun 29 03:45:16 2011
@@ -209,28 +209,13 @@ public class EjbRefBuilder extends Abstr
         
         if (uri != null) {
             
-           /* Map<String, Object> appclientAppContext = new HashMap<String, Object>();
+            Map<String, Object> appclientAppContext = new HashMap<String, Object>();
             Map<String, Object> sharedAppScopeContext = module.getJndiScope(JndiScope.app);
             for (Entry<String, Object> entry : sharedAppScopeContext.entrySet()) {
                 appclientAppContext.put(entry.getKey(), createClientRef(entry.getValue()));
             }
             module.getJndiContext().put(JndiScope.app, appclientAppContext);
 
-            Map<String, Object> appclientGlobalContext = new HashMap<String, Object>();
-            Map<String, Object> sharedGlobalScopeContext = module.getJndiScope(JndiScope.global);
-            for (Entry<String, Object> entry : sharedGlobalScopeContext.entrySet())
{
-                appclientGlobalContext.put(entry.getKey(), createClientRef(entry.getValue()));
-            }
-            module.getJndiContext().put(JndiScope.global, appclientGlobalContext);*/
-            
-            
-            Map<String, Object> appclientModuleContext = new HashMap<String, Object>();
-            Map<String, Object> sharedModuleScopeContext = module.getJndiScope(JndiScope.module);
-            for (Entry<String, Object> entry : sharedModuleScopeContext.entrySet())
{
-                appclientModuleContext.put(entry.getKey(), createClientRef(entry.getValue()));
-            }
-            module.getJndiContext().put(JndiScope.module, appclientModuleContext);
-
         }
     }
     
@@ -243,14 +228,9 @@ public class EjbRefBuilder extends Abstr
      *   ...
      *   <lookup-name>java:app/xxxx</lookup-name>
      * </ejb-ref>
-     * <ejb-ref>
-     *   ...
-     *   <lookup-name>java:global/xxxx</lookup-name>
-     * </ejb-ref>
-     * ...
      * </application-client>
      * 
-     * we need to convert the corresponding app and global ejb ref into ClientEjbReference
+     * we need to convert the corresponding app ejb ref into ClientEjbReference
      * so that they could be used in application client.
      * 
      */
@@ -269,12 +249,8 @@ public class EjbRefBuilder extends Abstr
 
         Object valueToConvert = null;
 
-/*        if (moduleJndiContext.get(JndiScope.app).containsKey(name)) {
+        if (moduleJndiContext.get(JndiScope.app).containsKey(name)) {
             valueToConvert = moduleJndiContext.get(JndiScope.app).get(name);
-        } else if (moduleJndiContext.get(JndiScope.global).containsKey(name)) {
-            valueToConvert = moduleJndiContext.get(JndiScope.global).get(name);
-        } else */if (moduleJndiContext.get(JndiScope.module).containsKey(name)) {
-            valueToConvert = moduleJndiContext.get(JndiScope.module).get(name);
         } else {
             return;
         }



Mime
View raw message