svn commit: r1185190 - in /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi: OpenEJBLifecycle.java ThreadSingletonServiceImpl.java

[rmannibucau]

Author: rmannibucau
Date: Mon Oct 17 14:14:27 2011
New Revision: 1185190

URL: http://svn.apache.org/viewvc?rev=1185190&view=rev
Log:
registering earlier OWB internal beans since it is needed before 
beforediscovery event

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java?rev=1185190&r1=1185189&r2=1185190&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
 Mon Oct 17 14:14:27 2011
@@ -196,6 +196,10 @@ public class OpenEJBLifecycle implements
             //Initialize contexts
             this.contextsService.init(startupObject);
 
+            //Configure Default Beans
+            // need to be done before fireBeforeBeanDiscoveryEvent
+            deployer.configureDefaultBeans();
+
             //Fire Event
             deployer.fireBeforeBeanDiscoveryEvent();
 
@@ -218,9 +222,6 @@ public class OpenEJBLifecycle implements
             //Checking stereotype conditions
             deployer.checkStereoTypes(scannerService);
 
-            //Configure Default Beans
-            deployer.configureDefaultBeans();
-
             //Discover classpath classes
             deployManagedBeans(scannerService.getBeanClasses(), 
stuff.getBeanContexts());
 

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java?rev=1185190&r1=1185189&r2=1185190&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
 Mon Oct 17 14:14:27 2011
@@ -27,7 +27,6 @@ import org.apache.openejb.util.LogCatego
 import org.apache.openejb.util.Logger;
 import org.apache.webbeans.config.OpenWebBeansConfiguration;
 import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.el.el22.EL22Adaptor;
 import org.apache.webbeans.spi.ContainerLifecycle;
 import org.apache.webbeans.spi.ContextsService;
 import org.apache.webbeans.spi.ConversationService;
@@ -79,7 +78,7 @@ public class ThreadSingletonServiceImpl 
 
         services.put(AppContext.class, appContext);
         services.put(TransactionService.class, new 
OpenEJBTransactionService());
-        services.put(ELAdaptor.class,(ELAdaptor) new 
CustomELAdapter(appContext));
+        services.put(ELAdaptor.class,new CustomELAdapter(appContext));
         services.put(ContextsService.class, new CdiAppContextsService(true));
         services.put(ResourceInjectionService.class, new 
CdiResourceInjectionService());
         services.put(ScannerService.class, new CdiScanner());