[jboss-cvs] JBossAS SVN: r76110 - in projects/microcontainer/trunk/aop-mc-int/src: main/org/jboss/aop/microcontainer/beans/metadata and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 22 13:00:18 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-07-22 13:00:18 -0400 (Tue, 22 Jul 2008)
New Revision: 76110
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/ManagedAspectDefinition.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyBeansTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/CFlowBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyBeansTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectBeanTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinExprBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyBeansTestCaseNotAutomatic2.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyBeansTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleStackBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/PrecedenceBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/ScopedAspectBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyBeansTestCaseNotAutomatic2.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyBeansTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/TypeDefBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/UndeploySimpleBeansTestCaseNotAutomatic.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayBeansTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/ScopingAopTestCase.xml
Log:
[JBMICROCONT-316] Explicitly pass in name of org.jboss.aop.microcontainer.beans.Aspect
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-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/Aspect.java 2008-07-22 17:00:18 UTC (rev 76110)
@@ -28,15 +28,10 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.advice.AspectDefinition;
import org.jboss.aop.advice.AspectFactory;
-import org.jboss.aop.advice.AspectFactoryDelegator;
-import org.jboss.aop.advice.GenericAspectFactory;
import org.jboss.aop.advice.Scope;
import org.jboss.aop.advice.ScopeUtil;
import org.jboss.aop.instrument.Untransformable;
import org.jboss.beans.metadata.plugins.factory.GenericBeanFactory;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.kernel.spi.dependency.ConfigureKernelControllerContextAware;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.logging.Logger;
import org.w3c.dom.Element;
@@ -47,7 +42,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
-public class Aspect implements ConfigureKernelControllerContextAware, Untransformable
+public class Aspect implements Untransformable
{
private static final Logger log = Logger.getLogger(Aspect.class);
@@ -83,17 +78,11 @@
protected String adviceBean;
/**
- * The KernelControllerContext for this Aspect
+ * The name of the aspect definition. This should be the same as the raw form of this bean's name
+ * (when run in AS, the name is massaged to avoid name clashes)
*/
- protected ControllerContext context;
+ protected String name;
- /** The name of this bean */
- protected String myname;
-
- /** The name of the AspectDefinition. If not lazy (i.e, bean has no dependencies), use myname.
- * If lazy (i.e. bean has dependencies), use adviceBean */
- protected String aspectDefName;
-
/**
* All the AspectBindings referencing this Aspect
*/
@@ -105,13 +94,13 @@
private Element element;
/**
- * Get the adviceName.
+ * Get the name.
*
* @return the adviceName.
*/
- public String getAdviceName()
+ public String getName()
{
- return myname;
+ return name;
}
/**
@@ -125,13 +114,13 @@
}
/**
- * Set the adviceName.
+ * Set the name.
*
- * @param adviceName The adviceName to set.
+ * @param name The name to set.
*/
- public void setAdviceName(String adviceName)
+ public void setName(String name)
{
- this.myname = adviceName;
+ this.name = name;
}
/**
@@ -224,17 +213,6 @@
this.scope = ScopeUtil.parse(scope);
}
- public void setKernelControllerContext(KernelControllerContext context) throws Exception
- {
- myname = (String)context.getName();
- this.context = context;
- }
-
- public void unsetKernelControllerContext(KernelControllerContext context) throws Exception
- {
- this.context = null;
- }
-
public void setElement(Element element)
{
this.element = element;
@@ -250,14 +228,16 @@
{
if (definition == null)
{
- aspectDefName = (adviceBean != null) ? adviceBean : myname;
if (manager == null)
throw new IllegalArgumentException("Null manager");
+ if (name == null)
+ throw new IllegalArgumentException("Null name");
+
if (advice != null)
{
definition = getAspectDefinitionNoDependencies();
}
- else if (adviceBean != null && context.getController() != null)
+ else if (adviceBean != null)
{
definition = getAspectDefintionDependencies();
}
@@ -287,21 +267,21 @@
binding.rebind();
}
- log.debug("Bound aspect " + aspectDefName + "; deployed:" + definition.isDeployed());
+ log.debug("Bound aspect " + name + "; deployed:" + definition.isDeployed());
}
protected ManagedAspectDefinition getAspectDefinitionNoDependencies()
{
AspectFactory factory = this.factory ?
- new DelegatingBeanAspectFactory(myname, advice, element) : new GenericBeanAspectFactory(myname, advice, element);
- return new ManagedAspectDefinition(aspectDefName, scope, factory);
+ new DelegatingBeanAspectFactory(name, advice, element) : new GenericBeanAspectFactory(name, advice, element);
+ return new ManagedAspectDefinition(name, scope, factory);
}
protected ManagedAspectDefinition getAspectDefintionDependencies()
{
AspectFactory factory = this.factory ?
- new DelegatingBeanAspectFactory(aspectDefName, advice, element) : new GenericBeanAspectFactory(aspectDefName, advice, element);
- return new ManagedAspectDefinition(aspectDefName, scope, factory, false);
+ new DelegatingBeanAspectFactory(name, advice, element) : new GenericBeanAspectFactory(name, advice, element);
+ return new ManagedAspectDefinition(name, scope, factory, adviceBean, false);
}
protected void addDefinitionToManager()
@@ -317,9 +297,8 @@
public void stop()
{
- aspectDefName = (adviceBean != null) ? adviceBean : myname;
- log.debug("Unbinding aspect " + aspectDefName);
- manager.removeAspectDefinition(aspectDefName);
+ log.debug("Unbinding aspect " + name);
+ manager.removeAspectDefinition(name);
if (definition != null)
{
definition.undeploy();
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ManagedAspectDefinition.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ManagedAspectDefinition.java 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ManagedAspectDefinition.java 2008-07-22 17:00:18 UTC (rev 76110)
@@ -32,7 +32,8 @@
*/
public class ManagedAspectDefinition extends AspectDefinition
{
-
+ private String dependentAspectName;
+
public ManagedAspectDefinition()
{
super();
@@ -40,17 +41,23 @@
public ManagedAspectDefinition(String name, Scope scope, AspectFactory factory)
{
- this(name, scope, factory, true);
+ this(name, scope, factory, null, true);
}
- public ManagedAspectDefinition(String name, Scope scope, AspectFactory factory, boolean deployed)
+ public ManagedAspectDefinition(String name, Scope scope, AspectFactory factory, String dependentAdviceName, boolean deployed)
{
super(name, scope, factory);
super.deployed = deployed;
+ this.dependentAspectName = dependentAdviceName;
}
public void setDeployed(boolean deployed)
{
this.deployed = true;
}
+
+ public String getDependentAspectName()
+ {
+ return dependentAspectName;
+ }
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java 2008-07-22 17:00:18 UTC (rev 76110)
@@ -143,6 +143,7 @@
//Add the Aspect
BeanMetaDataBuilder aspectBuilder = BeanMetaDataBuilder.createBuilder(aspectName, Aspect.class.getName());
aspectBuilder.addPropertyMetaData("scope", scope);
+ aspectBuilder.addPropertyMetaData("name", aspectName);
HashMap<String, String> attributes = new HashMap<String, String>();
attributes.put("name", name);
if (factory != null)
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 2008-07-22 17:00:18 UTC (rev 76110)
@@ -111,7 +111,11 @@
AspectDefinition def = (AspectDefinition) it.next();
if (def instanceof ManagedAspectDefinition)
{
- depends.add(new AspectDependencyBuilderListItem(def.getName()));
+ String name = ((ManagedAspectDefinition)def).getDependentAspectName();
+ if (name != null)
+ {
+ depends.add(new AspectDependencyBuilderListItem(name));
+ }
}
}
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -25,6 +25,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -12,6 +12,7 @@
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.SimpleAspectFactory"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
<property name="factory">true</property>
+ <property name="name">org.jboss.test.microcontainer.beans.SimpleAspectFactory</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -11,6 +11,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyBeansTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyBeansTestCaseNotAutomatic1.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyBeansTestCaseNotAutomatic1.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -17,6 +17,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspectWithDependency" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="adviceBean">Factory$org.jboss.test.microcontainer.beans.TestAspectWithDependency</property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspectWithDependency</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/CFlowBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/CFlowBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/CFlowBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -11,6 +11,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<bean name="CFlow" class="org.jboss.aop.microcontainer.beans.CFlowStack">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -39,6 +39,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestClassMetaDataAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestClassMetaDataAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestClassMetaDataAspect</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -30,6 +30,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestClassMetaDataAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestClassMetaDataAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestClassMetaDataAspect</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -112,18 +112,21 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspectWithProperty" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspectWithProperty"/></property>
<property name="manager"><inject bean="AOPDomain" property="domain"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspectWithProperty</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
<bean name="org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestInterceptor"/></property>
<property name="manager"><inject bean="AOPDomain" property="domain"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestInterceptor</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.test.microcontainer.beans.TestAspect"/>
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AOPDomain" property="domain"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<bean name="TestStack" class="org.jboss.aop.microcontainer.beans.Stack">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -11,6 +11,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<bean name="DynamicCFlow" class="org.jboss.aop.microcontainer.beans.DynamicCFlowDef">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -12,6 +12,7 @@
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
<property name="factory">true</property>
+ <property name="name">org.jboss.test.microcontainer.beans.SimpleInterceptorFactory</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -11,6 +11,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestInterceptor"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestInterceptor</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyBeansTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyBeansTestCaseNotAutomatic1.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyBeansTestCaseNotAutomatic1.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -17,6 +17,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="adviceBean">Factory$org.jboss.test.microcontainer.beans.TestInterceptorWithDependency</property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestInterceptorWithDependency</property>
</bean>
<bean name="TestInterceptorBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -21,6 +21,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -21,6 +21,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectBeanTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectBeanTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectBeanTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -11,6 +11,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.LightweightAspect" class="org.jboss.test.microcontainer.beans.LightweightAspect"/>
@@ -18,6 +19,7 @@
<bean name="org.jboss.test.microcontainer.beans.LightweightAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.LightweightAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.LightweightAspect</property>
</bean>
<bean name="Binding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -29,6 +29,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinExprBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinExprBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinExprBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -30,6 +30,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -11,6 +11,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
@@ -18,6 +19,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestInterceptor"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestInterceptor</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyBeansTestCaseNotAutomatic2.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyBeansTestCaseNotAutomatic2.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyBeansTestCaseNotAutomatic2.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -18,6 +18,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspectWithDependency" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="adviceBean">Factory$org.jboss.test.microcontainer.beans.TestAspectWithDependency</property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspectWithDependency"</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.TestInterceptorWithDependency" class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
@@ -31,6 +32,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="adviceBean">Factory$org.jboss.test.microcontainer.beans.TestInterceptorWithDependency</property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestInterceptorWithDependency</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyBeansTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyBeansTestCaseNotAutomatic1.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyBeansTestCaseNotAutomatic1.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -18,6 +18,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspectWithDependency" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="adviceBean">Factory$org.jboss.test.microcontainer.beans.TestAspectWithDependency</property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspectWithDependency</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
@@ -25,6 +26,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestInterceptor"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestInterceptor</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleStackBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleStackBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleStackBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -12,6 +12,7 @@
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.SimpleAspectFactory"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
<property name="factory">true</property>
+ <property name="name">org.jboss.test.microcontainer.beans.SimpleAspectFactory</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.test.microcontainer.beans.TestAspect"/>
@@ -19,6 +20,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.SimpleInterceptorFactory" class="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
@@ -27,6 +29,7 @@
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
<property name="factory">true</property>
+ <property name="name">org.jboss.test.microcontainer.beans.SimpleInterceptorFactory</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
@@ -34,6 +37,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestInterceptor"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestInterceptor</property>
</bean>
<bean name="TestStackA" class="org.jboss.aop.microcontainer.beans.Stack">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -11,6 +11,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<bean name="NamedPointcut" class="org.jboss.aop.microcontainer.beans.NamedPointcut">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -13,6 +13,7 @@
<bean name="AspectA" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$AspectA"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">AspectA</property>
</bean>
<beanfactory name="Factory$AspectB" class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
@@ -22,6 +23,7 @@
<bean name="AspectB" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$AspectB"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">AspectB</property>
</bean>
<bean name="BindingA" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/PrecedenceBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/PrecedenceBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/PrecedenceBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -11,6 +11,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
@@ -18,6 +19,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestInterceptor"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestInterceptor</property>
</bean>
<bean name="PrecedenceBinding" class="org.jboss.aop.microcontainer.beans.PrecedenceDef">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/ScopedAspectBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/ScopedAspectBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/ScopedAspectBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -11,6 +11,7 @@
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.PerVmAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
<property name="scope">PER_VM</property>
+ <property name="name">org.jboss.test.microcontainer.beans.PerVmAspect</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.PerClassAspect" class="org.jboss.test.microcontainer.beans.PerClassAspect"/>
@@ -18,6 +19,7 @@
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.PerClassAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
<property name="scope">PER_CLASS</property>
+ <property name="name">org.jboss.test.microcontainer.beans.PerClassAspect</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.PerInstanceAspect" class="org.jboss.test.microcontainer.beans.PerInstanceAspect"/>
@@ -25,6 +27,7 @@
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.PerInstanceAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
<property name="scope">PER_INSTANCE</property>
+ <property name="name">org.jboss.test.microcontainer.beans.PerInstanceAspect</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.PerJoinPointAspect" class="org.jboss.test.microcontainer.beans.PerJoinPointAspect"/>
@@ -32,6 +35,7 @@
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.PerJoinPointAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
<property name="scope">PER_JOINPOINT</property>
+ <property name="name">org.jboss.test.microcontainer.beans.PerJoinPointAspect</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.PerClassJoinPointAspect" class="org.jboss.test.microcontainer.beans.PerClassJoinPointAspect"/>
@@ -39,6 +43,7 @@
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.PerClassJoinPointAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
<property name="scope">PER_CLASS_JOINPOINT</property>
+ <property name="name">org.jboss.test.microcontainer.beans.PerClassJoinPointAspect</property>
</bean>
<bean name="TestAspectBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -12,6 +12,7 @@
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.SimpleAspectFactory"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
<property name="factory">true</property>
+ <property name="name">org.jboss.test.microcontainer.beans.SimpleAspectFactory</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.test.microcontainer.beans.TestAspect"/>
@@ -19,6 +20,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<bean name="TestStack" class="org.jboss.aop.microcontainer.beans.Stack">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyBeansTestCaseNotAutomatic2.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyBeansTestCaseNotAutomatic2.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyBeansTestCaseNotAutomatic2.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -18,6 +18,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspectWithDependency" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="adviceBean">Factory$org.jboss.test.microcontainer.beans.TestAspectWithDependency</property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspectWithDependency</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.test.microcontainer.beans.TestAspect"/>
@@ -25,6 +26,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
@@ -40,6 +42,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="adviceBean">Factory$org.jboss.test.microcontainer.beans.TestInterceptorWithDependency</property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestInterceptorWithDependency</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
@@ -47,6 +50,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestInterceptor"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestInterceptor</property>
</bean>
<bean name="AspectStack" class="org.jboss.aop.microcontainer.beans.Stack">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyBeansTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyBeansTestCaseNotAutomatic1.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyBeansTestCaseNotAutomatic1.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -17,6 +17,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspectWithDependency" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="adviceBean">Factory$org.jboss.test.microcontainer.beans.TestAspectWithDependency</property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspectWithDependency</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
@@ -24,6 +25,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestInterceptor"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestInterceptor</property>
</bean>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/TypeDefBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/TypeDefBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/TypeDefBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -11,6 +11,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<bean name="TypeDef" class="org.jboss.aop.microcontainer.beans.TypeDef">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/UndeploySimpleBeansTestCaseNotAutomatic.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/UndeploySimpleBeansTestCaseNotAutomatic.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/UndeploySimpleBeansTestCaseNotAutomatic.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -107,18 +107,21 @@
<bean name="org.jboss.test.microcontainer.beans.TestAspectWithProperty" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspectWithProperty"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspectWithProperty</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
<bean name="org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestInterceptor"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestInterceptor</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.test.microcontainer.beans.TestAspect"/>
<bean name="org.jboss.test.microcontainer.beans.TestAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestAspect</property>
</bean>
<bean name="TestStack" class="org.jboss.aop.microcontainer.beans.Stack">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayBeansTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayBeansTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -11,6 +11,7 @@
<bean name="org.jboss.test.microcontainer.beans.woven.test.TestArrayAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.woven.test.TestArrayAspect"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.woven.test.TestArrayAspect</property>
</bean>
<beanfactory name="Factory$org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
@@ -18,6 +19,7 @@
<bean name="org.jboss.test.microcontainer.beans.TestInterceptor" class="org.jboss.aop.microcontainer.beans.Aspect">
<property name="advice"><inject bean="Factory$org.jboss.test.microcontainer.beans.TestInterceptor"/></property>
<property name="manager"><inject bean="AspectManager"/></property>
+ <property name="name">org.jboss.test.microcontainer.beans.TestInterceptor</property>
</bean>
<bean name="TestArrayReplacement" class="org.jboss.aop.microcontainer.beans.ArrayReplacement">
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/ScopingAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/ScopingAopTestCase.xml 2008-07-22 16:47:22 UTC (rev 76109)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/ScopingAopTestCase.xml 2008-07-22 17:00:18 UTC (rev 76110)
@@ -17,6 +17,7 @@
<annotation>@org.jboss.metadata.plugins.scope.DeploymentScope("deployment1")</annotation>
<property name="advice"><inject bean="InterceptedAdvice"/></property>
<property name="manager"><inject bean="AspectManagerDeployment1"/></property>
+ <property name="name">InterceptedAspect</property>
</bean>
<bean name="InterceptedBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
More information about the jboss-cvs-commits
mailing list