svn commit: r1608630 - in /tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic: Assembler.java event/BeanContextsInitializedEvent.java

[jlmonteiro]

Author: jlmonteiro
Date: Mon Jul  7 23:47:29 2014
New Revision: 1608630

URL: http://svn.apache.org/r1608630
Log:
Merge new event from trunk

Added:
    
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/event/BeanContextsInitializedEvent.java
      - copied unchanged from r1608629, 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/event/BeanContextsInitializedEvent.java
Modified:
    
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

Modified: 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1608630&r1=1608629&r2=1608630&view=diff
==============================================================================
--- 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 (original)
+++ 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 Mon Jul  7 23:47:29 2014
@@ -45,6 +45,7 @@ import org.apache.openejb.assembler.clas
 import 
org.apache.openejb.assembler.classic.event.AssemblerBeforeApplicationDestroyed;
 import org.apache.openejb.assembler.classic.event.AssemblerCreated;
 import org.apache.openejb.assembler.classic.event.AssemblerDestroyed;
+import org.apache.openejb.assembler.classic.event.BeanContextsInitializedEvent;
 import org.apache.openejb.assembler.classic.event.ContainerSystemPostCreate;
 import org.apache.openejb.assembler.classic.event.ContainerSystemPreDestroy;
 import org.apache.openejb.assembler.monitoring.JMXContainer;
@@ -799,6 +800,10 @@ public class Assembler extends Assembler
                 appContext.getBindings().put("app/BeanManager", 
appContext.getBeanManager());
             }
 
+            // before starting everything, give the user the opportunity to 
hack on the AppContext/BeanContext
+            final SystemInstance systemInstance = SystemInstance.get();
+            systemInstance.fireEvent(new BeanContextsInitializedEvent(appInfo, 
appContext, allDeployments));
+
             startEjbs(start, allDeployments);
 
             // App Client
@@ -843,8 +848,6 @@ public class Assembler extends Assembler
                 }
             }
 
-            final SystemInstance systemInstance = SystemInstance.get();
-
             // WebApp
 
             final WebAppBuilder webAppBuilder = 
systemInstance.getComponent(WebAppBuilder.class);