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

[andygumbrecht]

Author: andygumbrecht
Date: Wed Feb 19 09:18:15 2014
New Revision: 1569663

URL: http://svn.apache.org/r1569663
Log:
Fix webBeansContext initialization

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

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1569663&r1=1569662&r2=1569663&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 Wed Feb 19 09:18:15 2014
@@ -1218,14 +1218,18 @@ public class Assembler extends Assembler
             services.put(JNDIService.class, new OpenEJBJndiService());
             services.put(AppContext.class, appContext);
             services.put(TransactionService.class, new 
OpenEJBTransactionService());
-            services.put(ContextsService.class, new 
CdiAppContextsService(null, true));
-            services.put(ResourceInjectionService.class, new 
CdiResourceInjectionService(null));
             services.put(ScannerService.class, new CdiScanner());
             services.put(ELAdaptor.class, new CustomELAdapter(appContext));
             services.put(LoaderService.class, new OptimizedLoaderService());
+
             final Properties properties = new Properties();
             
properties.setProperty(org.apache.webbeans.spi.SecurityService.class.getName(), 
ManagedSecurityService.class.getName());
+
             webBeansContext = new WebBeansContext(services, properties);
+
+            webBeansContext.registerService(ContextsService.class, new 
CdiAppContextsService(webBeansContext, true));
+            webBeansContext.registerService(ResourceInjectionService.class, 
new CdiResourceInjectionService(webBeansContext));
+
             appContext.setCdiEnabled(false);
             
OpenEJBTransactionService.class.cast(services.get(TransactionService.class)).setWebBeansContext(webBeansContext);
         }