[webbeans-commits] Webbeans SVN: r1671 - in extensions/trunk/se: src/main/java/org/jboss/webbeans/environment/se and 1 other directories.

[webbeans-commits at lists.jboss.org]

Author: peteroyle
Date: 2009-02-23 19:45:57 -0500 (Mon, 23 Feb 2009)
New Revision: 1671

Modified:
   extensions/trunk/se/
   extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java
   extensions/trunk/se/src/main/java/org/jboss/webbeans/lifecycle/ApplicationLifecycle.java
Log:
Ignoring nbactions.xml
Updating to refactored BeanMap --> BeanStore


Property changes on: extensions/trunk/se
___________________________________________________________________
Name: svn:ignore
   + nbactions.xml
target


Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java	2009-02-24 00:44:38 UTC (rev 1670)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java	2009-02-24 00:45:57 UTC (rev 1671)
@@ -16,7 +16,7 @@
  */
 package org.jboss.webbeans.environment.se;
 
-import org.jboss.webbeans.context.beanmap.SimpleBeanMap;
+import org.jboss.webbeans.context.beanstore.SimpleBeanStore;
 import org.jboss.webbeans.environment.se.boot.WebBeansBootstrap;
 import org.jboss.webbeans.lifecycle.ApplicationLifecycle;
 
@@ -46,12 +46,12 @@
 
         ApplicationLifecycle lifecycle = ApplicationLifecycle.instance();
         lifecycle.initialize();
-        final SimpleBeanMap appBeanMap = new SimpleBeanMap();
-        lifecycle.beginApplication( "TODO: application id?", appBeanMap );
+        final SimpleBeanStore appBeanStore = new SimpleBeanStore();
+        lifecycle.beginApplication( "TODO: application id?", appBeanStore );
 
         webBeansBootstrap.boot();
 
-        lifecycle.endApplication( "TODO: application id?", appBeanMap );
+        lifecycle.endApplication( "TODO: application id?", appBeanStore );
 
     }
 

Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/lifecycle/ApplicationLifecycle.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/lifecycle/ApplicationLifecycle.java	2009-02-24 00:44:38 UTC (rev 1670)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/lifecycle/ApplicationLifecycle.java	2009-02-24 00:45:57 UTC (rev 1671)
@@ -20,7 +20,7 @@
 import org.jboss.webbeans.ManagerImpl;
 import org.jboss.webbeans.context.ApplicationContext;
 import org.jboss.webbeans.context.DependentContext;
-import org.jboss.webbeans.context.beanmap.BeanMap;
+import org.jboss.webbeans.context.api.BeanStore;
 import org.jboss.webbeans.environment.se.events.Shutdown;
 import org.jboss.webbeans.log.Log;
 import org.jboss.webbeans.log.Logging;
@@ -58,10 +58,10 @@
         manager.addContext( ApplicationContext.create() );
     }
 
-    public void beginApplication( String id, BeanMap applicationBeanMap )
+    public void beginApplication( String id, BeanStore applicationBeanStore )
     {
         log.trace( "Starting application " + id );
-        ApplicationContext.INSTANCE.setBeanMap( applicationBeanMap );
+        ApplicationContext.INSTANCE.setBeanStore( applicationBeanStore );
         ApplicationContext.INSTANCE.setActive( true );
         // TODO (PR): I have no idea if this is OK??? The WB spec says that the
         // dependant scoe is only active when the manager is doing its work.
@@ -70,7 +70,7 @@
         DependentContext.INSTANCE.setActive( true );
     }
 
-    public void endApplication( String id, BeanMap applicationBeanMap )
+    public void endApplication( String id, BeanStore applicationBeanStore )
     {
         log.trace( "Ending application " + id );
 
@@ -79,7 +79,7 @@
 
         ApplicationContext.INSTANCE.destroy();
         ApplicationContext.INSTANCE.setActive( false );
-        ApplicationContext.INSTANCE.setBeanMap( null );
+        ApplicationContext.INSTANCE.setBeanStore( null );
 
     }
 }