[jboss-cvs] JBossAS SVN: r58258 - in projects/microcontainer/trunk/aop-mc-int/src: main/org/jboss/aop/microcontainer/beans main/org/jboss/aop/microcontainer/beans/xml resources/schema resources/tests/org/jboss/test/microcontainer/advisor/test resources/tests/org/jboss/test/microcontainer/test tests/org/jboss/test/microcontainer/support

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sat Nov 11 09:23:37 EST 2006


Author: kabir.khan at jboss.com
Date: 2006-11-11 09:23:25 -0500 (Sat, 11 Nov 2006)
New Revision: 58258

Added:
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/AspectManagerHolder.java
Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectBeanMetaDataFactory.java
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/xml/AOPBeansSchemaInitializer.java
   projects/microcontainer/trunk/aop-mc-int/src/resources/schema/aop-beans_1_0.xsd
   projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAnnotationOverrideProxyAdvisorTestCase.xml
   projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml
   projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptedUseCaseXmlTestCase.xml
   projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml
   projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCaseNotAutomatic1.xml
   projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml
   projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml
   projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml
   projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml
   projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml
   projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/IntroductionDependencyTestCaseNotAutomatic1.xml
Log:
[JBAOP-271] Get rid of hardcoded aspect manager in ASpectBeanMetaDataFactory. By default we will depend on a bean called "AspectManager", this is overridable in the aspect using the manager-bean and manager-property attributes of <aop:aspect/>

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectBeanMetaDataFactory.java	2006-11-11 14:20:53 UTC (rev 58257)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectBeanMetaDataFactory.java	2006-11-11 14:23:25 UTC (rev 58258)
@@ -25,7 +25,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.jboss.aop.AspectManager;
 import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
 import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
 import org.jboss.beans.metadata.plugins.AbstractInstallMetaData;
@@ -47,9 +46,18 @@
  */
 public class AspectBeanMetaDataFactory extends GenericBeanFactoryMetaData implements BeanMetaDataFactory
 {
+   /** Unless specified use the bean with this name as the aspect manager */
+   final static String DEFAULT_ASPECT_MANAGER = "AspectManager";
+   
    /** The pointcut */
    private String pointcut;
    
+   /** The bean name of the aspect manager to use */
+   private String managerBean = DEFAULT_ASPECT_MANAGER;
+   
+   /** The property of the aspect manager bean, if any, containing the aspect manager */
+   private String managerProperty;
+   
    /**
     * Get the pointcut.
     * 
@@ -70,22 +78,39 @@
       this.pointcut = pointcut;
    }
 
+
+   public String getManager()
+   {
+      return managerBean;
+   }
+
+   public void setManagerBean(String managerBean)
+   {
+      this.managerBean = managerBean;
+   }
+
+   public String getManagerProperty()
+   {
+      return managerProperty;
+   }
+
+   public void setManagerProperty(String aspectManagerProperty)
+   {
+      this.managerProperty = aspectManagerProperty;
+   }   
+   
    public List<BeanMetaData> getBeans()
    {
       ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
 
-      // TODO [JBAOP-271] Hardcoded aspect manager in AspectBeanMetaDataFactory
-      AspectManager aspectManager = AspectManager.instance();
 
       result.add(this);
       
-      boolean b = hasInjectedBeans();
-      
       String aspectName = name + "$Aspect";
       AbstractBeanMetaData aspect = new AbstractBeanMetaData();
       aspect.setName(aspectName);
       aspect.setBean("org.jboss.aop.microcontainer.beans.Aspect");
-      aspect.addProperty(new AbstractPropertyMetaData("manager", aspectManager));
+      aspect.addProperty(new AbstractPropertyMetaData("manager", new AbstractDependencyValueMetaData(managerBean, managerProperty)));
       result.add(aspect);
       
       String aspectBindingName = name + "$AspectBinding";
@@ -94,7 +119,7 @@
       aspectBinding.setBean("org.jboss.aop.microcontainer.beans.AspectBinding");
       aspectBinding.addProperty(new AbstractPropertyMetaData("pointcut", pointcut));
       aspectBinding.addProperty(new AbstractPropertyMetaData("aspect", new AbstractDependencyValueMetaData(aspectName, "definition")));
-      aspectBinding.addProperty(new AbstractPropertyMetaData("manager", aspectManager));
+      aspectBinding.addProperty(new AbstractPropertyMetaData("manager", new AbstractDependencyValueMetaData(managerBean, managerProperty)));
       result.add(aspectBinding);
       
       if (hasInjectedBeans())
@@ -185,4 +210,5 @@
          }
       }
    }
+
 }

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/xml/AOPBeansSchemaInitializer.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/xml/AOPBeansSchemaInitializer.java	2006-11-11 14:20:53 UTC (rev 58257)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/xml/AOPBeansSchemaInitializer.java	2006-11-11 14:23:25 UTC (rev 58258)
@@ -70,6 +70,10 @@
                String localName = attrs.getLocalName(i);
                if ("pointcut".equals(localName))
                   factory.setPointcut(attrs.getValue(i));
+               else if ("manager-bean".equals(localName))
+                  factory.setManagerBean(attrs.getValue(i));
+               else if ("manager-property".equals(localName))
+                  factory.setManagerProperty(attrs.getValue(i));
             }
          }
       });

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/schema/aop-beans_1_0.xsd
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/schema/aop-beans_1_0.xsd	2006-11-11 14:20:53 UTC (rev 58257)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/schema/aop-beans_1_0.xsd	2006-11-11 14:23:25 UTC (rev 58258)
@@ -42,6 +42,8 @@
       <xsd:complexContent>
          <xsd:extension base="mc:beanfactoryType">
             <xsd:attribute name="pointcut" type="xsd:string" use="required"/>
+            <xsd:attribute name="manager-bean" type="xsd:string" use="optional"/>
+            <xsd:attribute name="manager-property" type="xsd:string" use="optional"/>
          </xsd:extension>
       </xsd:complexContent>
    </xsd:complexType>

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAnnotationOverrideProxyAdvisorTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAnnotationOverrideProxyAdvisorTestCase.xml	2006-11-11 14:20:53 UTC (rev 58257)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAnnotationOverrideProxyAdvisorTestCase.xml	2006-11-11 14:23:25 UTC (rev 58258)
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
+   <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+      <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+   </bean>
    <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"
-               name="InterceptedAdvice" 
+               name="InterceptedAdvice"
                class="org.jboss.test.microcontainer.support.MetaDataContextInterceptor"
                pointcut="execution(* @org.jboss.test.microcontainer.advisor.test.AnnotationWithValue->doSomething(..)) OR execution(* @org.jboss.test.microcontainer.advisor.test.AnnotationWithValue->@org.jboss.test.microcontainer.advisor.test.AnnotationWithValue(..))">
       <property name="annotation">org.jboss.test.microcontainer.advisor.test.AnnotationWithValue</property>
    </aop:aspect>
-            
+
    <bean name="Intercepted" class="org.jboss.test.microcontainer.advisor.test.SomeBean"/>
 </deployment>

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml	2006-11-11 14:20:53 UTC (rev 58257)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml	2006-11-11 14:23:25 UTC (rev 58258)
@@ -2,11 +2,16 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
+   <bean name="TheAspectManager" class="org.jboss.aop.AspectManager">
+      <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+   </bean>
+
    <bean name="Repository" class="org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository"/>
 
    <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"
                name="InterceptedAdvice"
                class="org.jboss.test.microcontainer.support.InterceptorWithDependency"
+               manager-bean="TheAspectManager"
                pointcut="execution(@org.jboss.test.microcontainer.support.Test->new(..))">
       <property name="simpleBean"><inject bean="Dependency"/></property>
    </aop:aspect>

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptedUseCaseXmlTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptedUseCaseXmlTestCase.xml	2006-11-11 14:20:53 UTC (rev 58257)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptedUseCaseXmlTestCase.xml	2006-11-11 14:23:25 UTC (rev 58258)
@@ -1,22 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
-   
+
+   <bean name="TheAspectManager" class="org.jboss.aop.AspectManager">
+      <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+   </bean>
+
+   <bean name="AspectManagerHolder" class="org.jboss.test.microcontainer.support.AspectManagerHolder">
+      <property name="manager"><inject bean="TheAspectManager"/></property>
+   </bean>
+
    <bean name="Dependency" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
 
    <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"
-               name="InterceptedAdvice" 
+               name="InterceptedAdvice"
                class="org.jboss.test.microcontainer.support.CalledInterceptor"
+               manager-bean="AspectManagerHolder"
+               manager-property="manager"
                pointcut="execution(* $instanceof{org.jboss.test.microcontainer.support.SimpleBean}->*(..))">
    </aop:aspect>
-            
+
    <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"
-               name="DependentAdvice" 
+               name="DependentAdvice"
                class="org.jboss.test.microcontainer.support.InterceptorWithDependency"
+               manager-bean="AspectManagerHolder"
+               manager-property="manager"
                pointcut="execution(* $instanceof{org.jboss.test.microcontainer.support.SimpleBean}->*(..))">
       <property name="simpleBean"><inject bean="Dependency"/></property>
    </aop:aspect>
-            
+
    <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
-   
+
 </deployment>

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml	2006-11-11 14:20:53 UTC (rev 58257)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml	2006-11-11 14:23:25 UTC (rev 58258)
@@ -2,6 +2,10 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
+   <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+      <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+   </bean>
+
    <bean name="Repository" class="org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository"/>
 
    <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCaseNotAutomatic1.xml	2006-11-11 14:20:53 UTC (rev 58257)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCaseNotAutomatic1.xml	2006-11-11 14:23:25 UTC (rev 58258)
@@ -2,6 +2,10 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
+   <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+      <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+   </bean>
+
    <bean name="Repository" class="org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository"/>
 
    <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml	2006-11-11 14:20:53 UTC (rev 58257)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml	2006-11-11 14:23:25 UTC (rev 58258)
@@ -2,6 +2,10 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
+   <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+      <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+   </bean>
+
    <bean name="Repository" class="org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository"/>
 
    <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml	2006-11-11 14:20:53 UTC (rev 58257)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml	2006-11-11 14:23:25 UTC (rev 58258)
@@ -2,6 +2,10 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
+   <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+      <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+   </bean>
+
    <bean name="Repository" class="org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository"/>
 
    <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml	2006-11-11 14:20:53 UTC (rev 58257)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml	2006-11-11 14:23:25 UTC (rev 58258)
@@ -2,6 +2,10 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
+   <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+      <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+   </bean>
+
    <bean name="Repository" class="org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository"/>
 
    <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml	2006-11-11 14:20:53 UTC (rev 58257)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml	2006-11-11 14:23:25 UTC (rev 58258)
@@ -2,6 +2,10 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
+   <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+      <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+   </bean>
+
    <bean name="Repository" class="org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository"/>
 
    <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml	2006-11-11 14:20:53 UTC (rev 58257)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml	2006-11-11 14:23:25 UTC (rev 58258)
@@ -2,6 +2,10 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
+   <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+      <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+   </bean>
+
    <bean name="Repository" class="org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository"/>
 
    <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/IntroductionDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/IntroductionDependencyTestCaseNotAutomatic1.xml	2006-11-11 14:20:53 UTC (rev 58257)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/IntroductionDependencyTestCaseNotAutomatic1.xml	2006-11-11 14:23:25 UTC (rev 58258)
@@ -2,6 +2,10 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
+   <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+      <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+   </bean>
+
    <bean name="Repository" class="org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository"/>
 
    <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"

Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/AspectManagerHolder.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/AspectManagerHolder.java	2006-11-11 14:20:53 UTC (rev 58257)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/AspectManagerHolder.java	2006-11-11 14:23:25 UTC (rev 58258)
@@ -0,0 +1,46 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.microcontainer.support;
+
+import org.jboss.aop.AspectManager;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class AspectManagerHolder
+{
+   AspectManager manager;
+
+   public AspectManager getManager()
+   {
+      return manager;
+   }
+
+   public void setManager(AspectManager manager)
+   {
+      this.manager = manager;
+   }
+   
+   
+}




More information about the jboss-cvs-commits mailing list