[jboss-cvs] JBossAS SVN: r92213 - in projects/webbeans-ri-int/trunk/deployer/src: test/java/org/jboss/test/deployers/support and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-08-10 20:08:59 -0400 (Mon, 10 Aug 2009)
New Revision: 92213

Modified:
   projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/helpers/BootstrapBean.java
   projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/CheckableBootstrap.java
   projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/MockWBBootstrap.java
   projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java
Log:
WBRI-332

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/helpers/BootstrapBean.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/helpers/BootstrapBean.java	2009-08-10 20:21:53 UTC (rev 92212)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/helpers/BootstrapBean.java	2009-08-11 00:08:59 UTC (rev 92213)
@@ -115,7 +115,7 @@
    
    public void boot()
    {
-      bootstrap.boot();
+      bootstrap.startInitialization().deployBeans().validateBeans().endInitialization();
    }
    
    /**
@@ -128,7 +128,7 @@
    
    public void initialize()
    {
-      bootstrap.initialize();
+      bootstrap.startContainer();
    }
    
    public void setEnvironment(Environment environment)

Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/CheckableBootstrap.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/CheckableBootstrap.java	2009-08-10 20:21:53 UTC (rev 92212)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/CheckableBootstrap.java	2009-08-11 00:08:59 UTC (rev 92213)
@@ -28,7 +28,7 @@
  */
 public interface CheckableBootstrap extends Bootstrap
 {
-   boolean isInit();
+   boolean isCreate();
 
    boolean isBoot();
 

Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/MockWBBootstrap.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/MockWBBootstrap.java	2009-08-10 20:21:53 UTC (rev 92212)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/MockWBBootstrap.java	2009-08-11 00:08:59 UTC (rev 92213)
@@ -21,6 +21,7 @@
  */
 package org.jboss.test.deployers.support;
 
+import org.jboss.webbeans.bootstrap.api.Bootstrap;
 import org.jboss.webbeans.bootstrap.api.helpers.AbstractBootstrap;
 import org.jboss.webbeans.manager.api.WebBeansManager;
 
@@ -29,29 +30,38 @@
  */
 public class MockWBBootstrap extends AbstractBootstrap implements CheckableBootstrap
 {
-   private boolean init;
-   private boolean boot;
+   private boolean create;
+   private boolean startInit;
    private boolean shutdown;
+   private boolean validateBeans;
+   private boolean endInit;
+   private boolean deployBeans;
 
    public MockWBBootstrap()
    {
       System.out.println(">>>>>>>>>>>>>>>>>> " + getClass());
       System.out.println(">>>>>>>>>>>>>>>>>> " + getClass().getClassLoader());
    }
-
+   
    public void initialize()
    {
-      init = true;
+      startContainer();
    }
+   
+   public void boot()
+   {
+      startInitialization().deployBeans().validateBeans().endInitialization();
+   }
 
-   public WebBeansManager getManager()
+   public Bootstrap startContainer()
    {
-      return null;
+      create = true;
+      return this;
    }
 
-   public void boot()
+   public WebBeansManager getManager()
    {
-      boot = true;
+      return null;
    }
 
    public void shutdown()
@@ -59,18 +69,42 @@
       shutdown = true;
    }
 
-   public boolean isInit()
+   public boolean isCreate()
    {
-      return init;
+      return create;
    }
 
    public boolean isBoot()
    {
-      return boot;
+      return startInit && deployBeans && validateBeans && endInit;
    }
 
    public boolean isShutdown()
    {
       return shutdown;
    }
+
+   public Bootstrap deployBeans()
+   {
+      this.deployBeans = true;
+      return this;
+   }
+
+   public Bootstrap endInitialization()
+   {
+      this.endInit = true;
+      return this;
+   }
+
+   public Bootstrap startInitialization()
+   {
+      this.startInit = true;
+      return this;
+   }
+
+   public Bootstrap validateBeans()
+   {
+      this.validateBeans = true;
+      return this;
+   }
 }
\ No newline at end of file

Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java	2009-08-10 20:21:53 UTC (rev 92212)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java	2009-08-11 00:08:59 UTC (rev 92213)
@@ -22,6 +22,7 @@
 package org.jboss.test.deployers.test;
 
 import junit.framework.Test;
+
 import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.deployers.client.spi.DeployerClient;
@@ -62,7 +63,7 @@
          bootstrap = getBean(bootName, null);
          assertInstanceOf(bootstrap, "org.jboss.test.deployers.support.CheckableBootstrap", earDU.getClassLoader());
          // waiting on ejb
-         assertTrue(invoke(bootstrap, "Init"));
+         assertTrue(invoke(bootstrap, "Create"));
          assertFalse(invoke(bootstrap, "Boot")); // not yet booted
          assertFalse(invoke(bootstrap, "Shutdown"));
          // install ejb
@@ -71,7 +72,7 @@
          {
             assertTrue(ejb.getState().equals(ControllerState.INSTALLED));
             /// check boot
-            assertTrue(invoke(bootstrap, "Init"));
+            assertTrue(invoke(bootstrap, "Create"));
             assertTrue(invoke(bootstrap, "Boot"));
             assertFalse(invoke(bootstrap, "Shutdown"));
          }