[jboss-cvs] JBossAS SVN: r69448 - projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans.

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

Author: kabir.khan at jboss.com
Date: 2008-01-29 10:30:08 -0500 (Tue, 29 Jan 2008)
New Revision: 69448

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/Aspect.java
Log:
Use the passed in name as the name of the Aspect bean, rather than relying on a GUID. This fixes the precedence tests

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/Aspect.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/Aspect.java	2008-01-29 13:50:25 UTC (rev 69447)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/Aspect.java	2008-01-29 15:30:08 UTC (rev 69448)
@@ -56,8 +56,6 @@
     */
    protected AspectManager manager;
 
-   protected String adviceName = GUID.asString();
-   
    /**
     * True if aspect is an aspect factory, rather than the aspect itself
     */
@@ -108,7 +106,7 @@
     */
    public String getAdviceName()
    {
-      return adviceName;
+      return myname;
    }
 
    /**
@@ -126,7 +124,7 @@
     */
    public void setAdviceName(String adviceName)
    {
-      this.adviceName = adviceName;
+      this.myname = adviceName;
    }
 
    /**
@@ -284,7 +282,7 @@
    protected ManagedAspectDefinition getAspectDefinitionNoDependencies()
    {
       AspectFactory factory = this.factory ?  
-            new DelegatingBeanAspectFactory(adviceName, advice) : new GenericBeanAspectFactory(adviceName, advice);
+            new DelegatingBeanAspectFactory(myname, advice) : new GenericBeanAspectFactory(myname, advice);
       return new ManagedAspectDefinition(aspectDefName, scope, factory);
    }
 
@@ -298,7 +296,7 @@
    protected ManagedAspectDefinition getAspectDefinitionPlainAspectFactory()
    {
       AspectFactory factory = this.factory ?  
-            new AspectFactoryDelegator(adviceName, null) : new GenericAspectFactory(adviceName, null);
+            new AspectFactoryDelegator(myname, null) : new GenericAspectFactory(myname, null);
       return new ManagedAspectDefinition(aspectDefName, scope, factory);
    }