[jboss-cvs] JBossAS SVN: r75249 - in projects/microcontainer/trunk: kernel/src/main/org/jboss/kernel/plugins/annotations and 1 other directory.

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

Author: alesj
Date: 2008-07-01 03:20:23 -0400 (Tue, 01 Jul 2008)
New Revision: 75249

Modified:
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AliasesAnnotationPlugin.java
Log:
[JBMICROCONT-309]; remove obsolete/bad code.

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	2008-07-01 06:36:44 UTC (rev 75248)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java	2008-07-01 07:20:23 UTC (rev 75249)
@@ -1732,8 +1732,6 @@
             registerControllerContext(alias, lookup);
             if (log.isTraceEnabled())
                log.trace("Added alias " + alias + " for context " + context);
-            // try to resolve existing beans with new alias
-            resolveContexts(log.isTraceEnabled());
          }
          finally
          {

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AliasesAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AliasesAnnotationPlugin.java	2008-07-01 06:36:44 UTC (rev 75248)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AliasesAnnotationPlugin.java	2008-07-01 07:20:23 UTC (rev 75249)
@@ -28,11 +28,10 @@
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
 import org.jboss.dependency.spi.Controller;
-import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.metadata.spi.MetaData;
 import org.jboss.reflect.spi.ClassInfo;
 import org.jboss.util.StringPropertyReplacer;
-import org.jboss.metadata.spi.MetaData;
 
 /**
  * Aliases annotation plugin.
@@ -48,20 +47,6 @@
       super(Aliases.class);
    }
 
-   /**
-    * Get controller id - impl detail.
-    *
-    * @param controller the controller
-    * @return controller's id
-    */
-   protected String getId(Controller controller)
-   {
-      StringBuffer buffer = new StringBuffer();
-      buffer.append(controller.getClass().getSimpleName());
-      buffer.append("[").append(System.identityHashCode(controller)).append("]");
-      return buffer.toString();
-   }
-
    protected List<? extends MetaDataVisitorNode> internalApplyAnnotation(ClassInfo info, MetaData retrieval, Aliases annotation, KernelControllerContext context) throws Throwable
    {
       BeanMetaData beanMetaData = context.getBeanMetaData();
@@ -75,17 +60,7 @@
 
          if (aliases == null || aliases.contains(alias) == false)
          {
-            // impl detail (_Alias_<Controller>)
-            if (controller.getContext(alias + "_Alias_" + getId(controller), null) == null)
-            {
-               controller.addAlias(alias, beanMetaData.getName());
-            }
-            else
-            {
-               ControllerContext existingContext = controller.getContext(alias, null);
-               if (existingContext != null && existingContext != context)
-                  throw new IllegalArgumentException("Alias " + alias + " already registered for different bean: " + existingContext);
-            }
+            controller.addAlias(alias, beanMetaData.getName());
          }
       }
       // no metadata added
@@ -105,12 +80,8 @@
 
          if (aliases == null || aliases.contains(alias) == false)
          {
-            // impl detail (_Alias_<Controller>)
-            if (controller.getContext(alias + "_Alias_" + getId(controller), null) != null)
-            {
-               controller.removeAlias(alias);
-            }
-         }         
+            controller.removeAlias(alias);
+         }
       }
    }
 }