[jboss-cvs] JBossAS SVN: r88815 - in projects/microcontainer/trunk: dependency/src/main/java/org/jboss/dependency/spi and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed May 13 09:13:46 EDT 2009


Author: alesj
Date: 2009-05-13 09:13:46 -0400 (Wed, 13 May 2009)
New Revision: 88815

Modified:
   projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
   projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerMode.java
   projects/microcontainer/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyTestCase.java
   projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/GenericBeanFactoryOnDemandDependencyTestCase.java
   projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/OnDemandDependencyTestCase.java
   projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/lazy/test/LazyInstantiationTest.java
Log:
[JBMICROCONT-431]; OnDemand should wait in Described.

Modified: projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2009-05-13 13:06:07 UTC (rev 88814)
+++ projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2009-05-13 13:13:46 UTC (rev 88815)
@@ -726,8 +726,9 @@
             }
          }
 
-         if (ControllerMode.AUTOMATIC.equals(context.getMode()))
-            context.setRequiredState(ControllerState.INSTALLED);
+         // set the required state
+         ControllerMode mode = context.getMode();
+         context.setRequiredState(mode.getRequiredState());
 
          if (trace)
             log.trace("Installing " + context.toShortString());

Modified: projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerMode.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerMode.java	2009-05-13 13:06:07 UTC (rev 88814)
+++ projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerMode.java	2009-05-13 13:13:46 UTC (rev 88815)
@@ -32,13 +32,14 @@
  * Mode of the context.
  * 
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  * @version $Revision$
  */
 @JBossXmlEnum(ignoreCase=true)
 public enum ControllerMode
 {
-   AUTOMATIC("Automatic"),
-   @XmlEnumValue("On Demand") ON_DEMAND("On Demand"),
+   AUTOMATIC("Automatic", ControllerState.INSTALLED),
+   @XmlEnumValue("On Demand") ON_DEMAND("On Demand", ControllerState.DESCRIBED),
    MANUAL("Manual"),
    DISABLED("Disabled"),
    ASYNCHRONOUS("Asynchronous");
@@ -46,6 +47,9 @@
    /** The mode string */
    private final String modeString;
 
+   /** The required state */
+   private ControllerState requiredState;
+
    /**
     * Create a new mode
     * 
@@ -53,9 +57,18 @@
     */
    private ControllerMode(String modeString)
    {
+      this(modeString, null);
+   }
+
+   private ControllerMode(String modeString, ControllerState requiredState)
+   {
       if (modeString == null)
          throw new IllegalArgumentException("Null mode string");
+      if (requiredState == null)
+         requiredState = ControllerState.NOT_INSTALLED;
+
       this.modeString = modeString;
+      this.requiredState = requiredState;
    }
 
    /**
@@ -87,6 +100,16 @@
       return modeString;
    }
 
+   /**
+    * The required state.
+    *
+    * @return the required state
+    */
+   public ControllerState getRequiredState()
+   {
+      return requiredState;
+   }
+
    public void toString(JBossStringBuilder buffer)
    {
       buffer.append(modeString);

Modified: projects/microcontainer/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyTestCase.java	2009-05-13 13:06:07 UTC (rev 88814)
+++ projects/microcontainer/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyTestCase.java	2009-05-13 13:13:46 UTC (rev 88815)
@@ -50,8 +50,8 @@
    public void testOnDemandDependencyOnDemandFirst() throws Throwable
    {
       TestDelegate delegate1 = getDelegate1();
-      ControllerContext context1 = assertInstall(delegate1, ControllerState.NOT_INSTALLED);
-      assertEquals(-1, delegate1.describeInstallOrder);
+      ControllerContext context1 = assertInstall(delegate1, ControllerState.DESCRIBED);
+      assertEquals(1, delegate1.describeInstallOrder);
       assertEquals(-1, delegate1.instantiateInstallOrder);
       assertEquals(-1, delegate1.configureInstallOrder);
       assertEquals(-1, delegate1.createInstallOrder);
@@ -65,9 +65,9 @@
       assertEquals(-1, delegate1.describeUninstallOrder);
       TestDelegate delegate2 = getDelegate2();
       assertInstall(delegate2);
-      assertEquals(1, delegate2.describeInstallOrder);
-      assertEquals(2, delegate2.instantiateInstallOrder);
-      assertEquals(3, delegate2.configureInstallOrder);
+      assertEquals(2, delegate2.describeInstallOrder);
+      assertEquals(3, delegate2.instantiateInstallOrder);
+      assertEquals(4, delegate2.configureInstallOrder);
       assertEquals(10, delegate2.createInstallOrder);
       assertEquals(11, delegate2.startInstallOrder);
       assertEquals(12, delegate2.installInstallOrder);
@@ -78,7 +78,7 @@
       assertEquals(-1, delegate2.instantiateUninstallOrder);
       assertEquals(-1, delegate2.describeUninstallOrder);
       assertContext(context1);
-      assertEquals(4, delegate1.describeInstallOrder);
+      assertEquals(1, delegate1.describeInstallOrder);
       assertEquals(5, delegate1.instantiateInstallOrder);
       assertEquals(6, delegate1.configureInstallOrder);
       assertEquals(7, delegate1.createInstallOrder);
@@ -153,8 +153,8 @@
    public void testChangeDependencyReinstall() throws Throwable
    {
       TestDelegate delegate1 = getDelegate1();
-      ControllerContext context1 = assertInstall(delegate1, ControllerState.NOT_INSTALLED);
-      assertEquals(-1, delegate1.describeInstallOrder);
+      ControllerContext context1 = assertInstall(delegate1, ControllerState.DESCRIBED);
+      assertEquals(1, delegate1.describeInstallOrder);
       assertEquals(-1, delegate1.instantiateInstallOrder);
       assertEquals(-1, delegate1.configureInstallOrder);
       assertEquals(-1, delegate1.createInstallOrder);
@@ -168,9 +168,9 @@
       assertEquals(-1, delegate1.describeUninstallOrder);
       TestDelegate delegate2 = getDelegate2();
       ControllerContext context2 = assertInstall(delegate2);
-      assertEquals(1, delegate2.describeInstallOrder);
-      assertEquals(2, delegate2.instantiateInstallOrder);
-      assertEquals(3, delegate2.configureInstallOrder);
+      assertEquals(2, delegate2.describeInstallOrder);
+      assertEquals(3, delegate2.instantiateInstallOrder);
+      assertEquals(4, delegate2.configureInstallOrder);
       assertEquals(10, delegate2.createInstallOrder);
       assertEquals(11, delegate2.startInstallOrder);
       assertEquals(12, delegate2.installInstallOrder);
@@ -181,7 +181,7 @@
       assertEquals(-1, delegate2.instantiateUninstallOrder);
       assertEquals(-1, delegate2.describeUninstallOrder);
       assertContext(context1);
-      assertEquals(4, delegate1.describeInstallOrder);
+      assertEquals(1, delegate1.describeInstallOrder);
       assertEquals(5, delegate1.instantiateInstallOrder);
       assertEquals(6, delegate1.configureInstallOrder);
       assertEquals(7, delegate1.createInstallOrder);
@@ -194,9 +194,9 @@
       assertEquals(-1, delegate1.instantiateUninstallOrder);
       assertEquals(-1, delegate1.describeUninstallOrder);
       assertUninstall(context2);
-      assertEquals(1, delegate2.describeInstallOrder);
-      assertEquals(2, delegate2.instantiateInstallOrder);
-      assertEquals(3, delegate2.configureInstallOrder);
+      assertEquals(2, delegate2.describeInstallOrder);
+      assertEquals(3, delegate2.instantiateInstallOrder);
+      assertEquals(4, delegate2.configureInstallOrder);
       assertEquals(10, delegate2.createInstallOrder);
       assertEquals(11, delegate2.startInstallOrder);
       assertEquals(12, delegate2.installInstallOrder);
@@ -207,7 +207,7 @@
       assertEquals(17, delegate2.instantiateUninstallOrder);
       assertEquals(18, delegate2.describeUninstallOrder);
       assertContext("Name1", ControllerState.INSTALLED);
-      assertEquals(4, delegate1.describeInstallOrder);
+      assertEquals(1, delegate1.describeInstallOrder);
       assertEquals(5, delegate1.instantiateInstallOrder);
       assertEquals(6, delegate1.configureInstallOrder);
       assertEquals(7, delegate1.createInstallOrder);
@@ -233,7 +233,7 @@
       assertEquals(17, delegate2.instantiateUninstallOrder);
       assertEquals(18, delegate2.describeUninstallOrder);
       assertUninstall(context1);
-      assertEquals(4, delegate1.describeInstallOrder);
+      assertEquals(1, delegate1.describeInstallOrder);
       assertEquals(5, delegate1.instantiateInstallOrder);
       assertEquals(6, delegate1.configureInstallOrder);
       assertEquals(7, delegate1.createInstallOrder);

Modified: projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/GenericBeanFactoryOnDemandDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/GenericBeanFactoryOnDemandDependencyTestCase.java	2009-05-13 13:06:07 UTC (rev 88814)
+++ projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/GenericBeanFactoryOnDemandDependencyTestCase.java	2009-05-13 13:13:46 UTC (rev 88815)
@@ -63,7 +63,7 @@
    {
       onDemandDependencyOnDemandFirst();
 
-      ControllerContext context1 = assertInstall(0, "Name1", ControllerState.NOT_INSTALLED);
+      ControllerContext context1 = assertInstall(0, "Name1", ControllerState.DESCRIBED);
       ControllerContext context2 = assertInstall(1, "Name2");
       assertContext("Name1");
       
@@ -113,7 +113,7 @@
    {
       onDemandDependencyReinstall();
 
-      ControllerContext context1 = assertInstall(0, "Name1", ControllerState.NOT_INSTALLED);
+      ControllerContext context1 = assertInstall(0, "Name1", ControllerState.DESCRIBED);
       ControllerContext context2 = assertInstall(1, "Name2");
       assertContext("Name1");
       

Modified: projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/OnDemandDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/OnDemandDependencyTestCase.java	2009-05-13 13:06:07 UTC (rev 88814)
+++ projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/OnDemandDependencyTestCase.java	2009-05-13 13:13:46 UTC (rev 88815)
@@ -65,7 +65,7 @@
    {
       onDemandDependencyOnDemandFirst();
 
-      ControllerContext context1 = assertInstall(0, "Name1", ControllerState.NOT_INSTALLED);
+      ControllerContext context1 = assertInstall(0, "Name1", ControllerState.DESCRIBED);
       ControllerContext context2 = assertInstall(1, "Name2");
       assertContext("Name1");
       
@@ -111,7 +111,7 @@
    {
       onDemandDependencyReinstall();
 
-      ControllerContext context1 = assertInstall(0, "Name1", ControllerState.NOT_INSTALLED);
+      ControllerContext context1 = assertInstall(0, "Name1", ControllerState.DESCRIBED);
       ControllerContext context2 = assertInstall(1, "Name2");
       assertContext("Name1");
       

Modified: projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/lazy/test/LazyInstantiationTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/lazy/test/LazyInstantiationTest.java	2009-05-13 13:06:07 UTC (rev 88814)
+++ projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/lazy/test/LazyInstantiationTest.java	2009-05-13 13:13:46 UTC (rev 88815)
@@ -135,7 +135,7 @@
          assertNotNull(lazyRare);
 
          // should not be fully installed yet
-         assertEquals(ControllerState.NOT_INSTALLED, beanContext.getState());
+         assertEquals(ControllerState.DESCRIBED, beanContext.getState());
          assertEquals(0, lazyRare.getHits());
          // the hit should install it
          assertEquals(ControllerState.INSTALLED, beanContext.getState());




More information about the jboss-cvs-commits mailing list