[jboss-cvs] JBossAS SVN: r69825 - in projects/microcontainer/trunk/kernel/src: main/org/jboss/beans/metadata/plugins and 1 other directories.

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

Author: adrian at jboss.org
Date: 2008-02-13 09:34:59 -0500 (Wed, 13 Feb 2008)
New Revision: 69825

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Install.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Uninstall.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackTestCase.java
Log:
In/UnCallbacks should be happening at Install by default

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Install.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Install.java	2008-02-13 14:25:25 UTC (rev 69824)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Install.java	2008-02-13 14:34:59 UTC (rev 69825)
@@ -49,7 +49,7 @@
     *
     * @return when required.
     */
-   String whenRequired() default "Configured";
+   String whenRequired() default "Installed";
 
    /**
     * Get dependent state.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Uninstall.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Uninstall.java	2008-02-13 14:25:25 UTC (rev 69824)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Uninstall.java	2008-02-13 14:34:59 UTC (rev 69825)
@@ -49,7 +49,7 @@
     *
     * @return when required.
     */
-   String whenRequired() default "Configured";
+   String whenRequired() default "Installed";
 
    /**
     * Get dependent state.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java	2008-02-13 14:25:25 UTC (rev 69824)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java	2008-02-13 14:34:59 UTC (rev 69825)
@@ -55,7 +55,7 @@
    protected String property;
 
    /** The required state of the dependency */
-   protected ControllerState whenRequired = ControllerState.CONFIGURED;
+   protected ControllerState whenRequired = ControllerState.INSTALLED;
 
    /** The required state of the dependency */
    protected ControllerState dependentState = ControllerState.INSTALLED;
@@ -71,7 +71,7 @@
 
    public AbstractCallbackMetaData()
    {
-      setState(ControllerState.CONFIGURED);
+      setState(ControllerState.INSTALLED);
    }
 
    public String getProperty()

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackTestCase.java	2008-02-13 14:25:25 UTC (rev 69824)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackTestCase.java	2008-02-13 14:34:59 UTC (rev 69825)
@@ -148,7 +148,7 @@
    {
       callbackCardinalityCorrectOrder();
 
-      ControllerContext context1 = assertInstall(0, "Name1", ControllerState.INSTANTIATED);
+      ControllerContext context1 = assertInstall(0, "Name1", ControllerState.START);
       SimpleBeanRepository repository = (SimpleBeanRepository)context1.getTarget();
       assertNotNull(repository);
       assertEmpty(repository.getBeans());
@@ -212,7 +212,7 @@
    {
       callbackCardinalityReinstall();
 
-      ControllerContext context1 = assertInstall(0, "Name1", ControllerState.INSTANTIATED);
+      ControllerContext context1 = assertInstall(0, "Name1", ControllerState.START);
       SimpleBeanRepository repository = (SimpleBeanRepository)context1.getTarget();
       assertNotNull(repository);
       assertEmpty(repository.getBeans());
@@ -241,7 +241,7 @@
 
       assertUninstall("Name2");
       assertEquals(ControllerState.ERROR, context2.getState());
-      assertEquals(ControllerState.INSTANTIATED, context1.getState());
+      assertEquals(ControllerState.START, context1.getState());
       assertEmpty(repository.getBeans());
 
       assertInstall(1, "Name2");
@@ -250,7 +250,7 @@
 
       assertUninstall("Name3");
       assertEquals(ControllerState.ERROR, context3.getState());
-      assertEquals(ControllerState.INSTANTIATED, context1.getState());
+      assertEquals(ControllerState.START, context1.getState());
       assertEmpty(repository.getBeans());
    }