svn commit: r987056 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: config/BeansDeployer.java container/ManagerObjectFactory.java

[gerdogdu]

Author: gerdogdu
Date: Thu Aug 19 07:50:53 2010
New Revision: 987056

URL: http://svn.apache.org/viewvc?rev=987056&view=rev
Log:
Update JNDI registration of BeanManagerImpl

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=987056&r1=987055&r2=987056&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
 Thu Aug 19 07:50:53 2010
@@ -51,8 +51,10 @@ import org.apache.webbeans.component.Web
 import org.apache.webbeans.component.creation.ManagedBeanCreatorImpl;
 import org.apache.webbeans.component.creation.BeanCreator.MetaDataProvider;
 import org.apache.webbeans.container.BeanManagerImpl;
+import org.apache.webbeans.container.InjectableBeanManager;
 import org.apache.webbeans.container.InjectionResolver;
 import org.apache.webbeans.corespi.ServiceLoader;
+import org.apache.webbeans.corespi.se.DefaultJndiService;
 import org.apache.webbeans.decorator.DecoratorsManager;
 import org.apache.webbeans.decorator.WebBeansDecorator;
 import org.apache.webbeans.deployment.StereoTypeManager;
@@ -137,7 +139,17 @@ public class BeansDeployer
 
                 // Bind manager
                 JNDIService service = 
ServiceLoader.getService(JNDIService.class);
-                service.bind(WebBeansConstants.WEB_BEANS_MANAGER_JNDI_NAME, 
BeanManagerImpl.getManager());
+                
+                //Default jndi is just a map
+                if(service instanceof DefaultJndiService)
+                {
+                    
service.bind(WebBeansConstants.WEB_BEANS_MANAGER_JNDI_NAME, new 
InjectableBeanManager());
+                }
+                //Assume, actual JNDI implementation
+                else
+                {
+                    
service.bind(WebBeansConstants.WEB_BEANS_MANAGER_JNDI_NAME, 
BeanManagerImpl.getManager().getReference());   
+                }
 
                 // Register Manager built-in component
                 
BeanManagerImpl.getManager().addBean(WebBeansUtil.getManagerBean());

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java?rev=987056&r1=987055&r2=987056&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java
 Thu Aug 19 07:50:53 2010
@@ -29,7 +29,7 @@ public class ManagerObjectFactory implem
 
     public Object getObjectInstance(Object obj, Name name, Context nameCtx, 
Hashtable<?, ?> environment) throws Exception
     {
-        return BeanManagerImpl.getManager();
+        return new InjectableBeanManager();
     }
 
 }