[jboss-cvs] JBossAS SVN: r63964 - in projects/microcontainer/trunk: deployers-vfs/src/resources/tests/alias/toplevel and 1 other directories.

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

Author: alesj
Date: 2007-07-11 04:02:27 -0400 (Wed, 11 Jul 2007)
New Revision: 63964

Added:
   projects/microcontainer/trunk/deployers-vfs/src/resources/tests/alias/toplevel/justx-beans.xml
   projects/microcontainer/trunk/deployers-vfs/src/resources/tests/alias/toplevel/tcalias-beans.xml
Modified:
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
   projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java
Log:
Small dependency fix.
Additional alias remove test.

Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java	2007-07-11 06:35:26 UTC (rev 63963)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java	2007-07-11 08:02:27 UTC (rev 63964)
@@ -44,6 +44,7 @@
 import org.jboss.dependency.spi.LifecycleCallbackItem;
 import org.jboss.dependency.plugins.action.ControllerContextAction;
 import org.jboss.util.JBossObject;
+import org.jboss.util.JBossStringBuilder;
 
 /**
  * Abstract controller.
@@ -1523,7 +1524,7 @@
          this.alias = alias;
          this.original = original;
          DependencyInfo info = getDependencyInfo();
-         info.addIDependOn(new AbstractDependencyItem(alias, original, ControllerState.INSTALLED, ControllerState.INSTANTIATED));
+         info.addIDependOn(new AbstractDependencyItem(getName(), original, ControllerState.INSTALLED, ControllerState.INSTANTIATED));
       }
 
       public Object getAlias()
@@ -1535,6 +1536,20 @@
       {
          return original;
       }
+
+      public void toString(JBossStringBuilder buffer)
+      {
+         buffer.append("alias=").append(alias);
+         buffer.append(" original=").append(original).append(" ");
+         super.toString(buffer);
+      }
+
+      public void toShortString(JBossStringBuilder buffer)
+      {
+         buffer.append("alias=").append(alias);
+         buffer.append(" original=").append(original).append(" ");
+         super.toShortString(buffer);
+      }
    }
 
    private class AliasControllerContextAction implements ControllerContextAction
@@ -1542,6 +1557,7 @@
       public void install(ControllerContext context) throws Throwable
       {
          AliasControllerContext acc = (AliasControllerContext)context;
+
          Object alias = acc.getAlias();
          Object jmxAlias = JMXObjectNameFix.needsAnAlias(alias);
          if (jmxAlias != null)
@@ -1575,10 +1591,12 @@
          try
          {
             AliasControllerContext acc = (AliasControllerContext)context;
+
             Object alias = acc.getAlias();
             Object jmxAlias = JMXObjectNameFix.needsAnAlias(alias);
             if (jmxAlias != null)
                alias = jmxAlias;
+
             unregisterControllerContext(alias);
             if (log.isTraceEnabled())
                log.trace("Removed alias " + alias);

Added: projects/microcontainer/trunk/deployers-vfs/src/resources/tests/alias/toplevel/justx-beans.xml
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/resources/tests/alias/toplevel/justx-beans.xml	                        (rev 0)
+++ projects/microcontainer/trunk/deployers-vfs/src/resources/tests/alias/toplevel/justx-beans.xml	2007-07-11 08:02:27 UTC (rev 63964)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+   <bean name="ServiceX" class="org.jboss.test.deployers.vfs.deployer.bean.support.SimpleInjectee">
+      <depends>JBossWeb</depends>
+   </bean>
+</deployment>

Added: projects/microcontainer/trunk/deployers-vfs/src/resources/tests/alias/toplevel/tcalias-beans.xml
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/resources/tests/alias/toplevel/tcalias-beans.xml	                        (rev 0)
+++ projects/microcontainer/trunk/deployers-vfs/src/resources/tests/alias/toplevel/tcalias-beans.xml	2007-07-11 08:02:27 UTC (rev 63964)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+   <alias name="Tomcat">JBossWeb</alias>
+</deployment>

Modified: projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java	2007-07-11 06:35:26 UTC (rev 63963)
+++ projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java	2007-07-11 08:02:27 UTC (rev 63964)
@@ -163,4 +163,35 @@
       assertNull(controller.getContext("JBossWeb", null));
       assertNull(controller.getContext("ServiceX", null));
    }
+
+   public void testRemovingAlias() throws Exception
+   {
+      VFSDeployment justx = createDeployment("/alias", "toplevel/justx-beans.xml");
+      assertDeploy(justx);
+      assertNotNull(controller.getContext("ServiceX", ControllerState.CONFIGURED));
+
+      VFSDeployment alias = createDeployment("/alias", "toplevel/tcalias-beans.xml");
+      assertDeploy(alias);
+
+      VFSDeployment context = createDeployment("/alias", "toplevel/tomcat-beans.xml");
+      assertDeploy(context);
+      assertNotNull(controller.getInstalledContext("Tomcat"));
+      assertNotNull(controller.getInstalledContext("JBossWeb"));
+      assertNotNull(controller.getInstalledContext("ServiceX"));
+
+      assertUndeploy(alias);
+      assertNull(controller.getInstalledContext("JBossWeb"));
+      assertNotNull(controller.getInstalledContext("Tomcat"));
+      assertNotNull(controller.getInstalledContext("ServiceX"));
+
+      assertUndeploy(context);
+      assertNull(controller.getContext("Tomcat", null));
+      assertNull(controller.getContext("ServiceX", ControllerState.CREATE));
+      assertNotNull(controller.getContext("ServiceX", ControllerState.CONFIGURED));
+
+      assertUndeploy(justx);
+      assertNull(controller.getContext("JBossWeb", null));
+      assertNull(controller.getContext("ServiceX", null));
+   }
+
 }