You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/10 20:43:40 UTC

svn commit: r1609551 - in /tomee/tomee/branches/tomee-1.7.0: ./ container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/event/

Author: andygumbrecht
Date: Thu Jul 10 18:43:39 2014
New Revision: 1609551

URL: http://svn.apache.org/r1609551
Log:
Merged revision(s) 1609550 from tomee/tomee/trunk:
removing BeanContextsInitializedEvent which is breaking info model

Removed:
    tomee/tomee/branches/tomee-1.7.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/event/BeanContextsInitializedEvent.java
Modified:
    tomee/tomee/branches/tomee-1.7.0/   (props changed)
    tomee/tomee/branches/tomee-1.7.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

Propchange: tomee/tomee/branches/tomee-1.7.0/
------------------------------------------------------------------------------
  Merged /tomee/tomee/trunk:r1609550

Modified: tomee/tomee/branches/tomee-1.7.0/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.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1609551&r1=1609550&r2=1609551&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ tomee/tomee/branches/tomee-1.7.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Thu Jul 10 18:43:39 2014
@@ -45,7 +45,6 @@ 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;
@@ -800,10 +799,6 @@ 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
@@ -849,6 +844,7 @@ public class Assembler extends Assembler
             }
 
             // WebApp
+            final SystemInstance systemInstance = SystemInstance.get();
 
             final WebAppBuilder webAppBuilder = systemInstance.getComponent(WebAppBuilder.class);
             if (webAppBuilder != null) {