svn commit: r1423695 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

[rmannibucau]

Author: rmannibucau
Date: Tue Dec 18 22:15:39 2012
New Revision: 1423695

URL: http://svn.apache.org/viewvc?rev=1423695&view=rev
Log:
restoring singleton startup (lost in last refactoring)

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
    
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.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=1423695&r1=1423694&r2=1423695&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
 Tue Dec 18 22:15:39 2012
@@ -706,9 +706,7 @@ public class Assembler extends Assembler
                 }
             }
 
-            List<BeanContext> allDeployments = new ArrayList<BeanContext>();
-
-            initEjbs(classLoader, appInfo, appContext, injections, 
allDeployments, null);
+            List<BeanContext> allDeployments = initEjbs(classLoader, appInfo, 
appContext, injections, new ArrayList<BeanContext>(), null);
 
             new CdiBuilder().build(appInfo, appContext, allDeployments);
 

Modified: 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1423695&r1=1423694&r2=1423695&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 Tue Dec 18 22:15:39 2012
@@ -1098,8 +1098,7 @@ public class TomcatWebAppBuilder impleme
                 cs.addWebContext(webContext);
 
                 if (!contextInfo.appInfo.webAppAlone) {
-                    final List<BeanContext> beanContexts = new 
ArrayList<BeanContext>();
-                    assembler.initEjbs(classLoader, contextInfo.appInfo, 
appContext, injections, beanContexts, webAppInfo.moduleId  );
+                    final List<BeanContext> beanContexts = 
assembler.initEjbs(classLoader, contextInfo.appInfo, appContext, injections, 
new ArrayList<BeanContext>(), webAppInfo.moduleId);
                     appContext.getBeanContexts().addAll(beanContexts);
                     new CdiBuilder().build(contextInfo.appInfo, appContext, 
appContext.getBeanContexts(), webContext);
                     assembler.startEjbs(true, beanContexts);