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

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

Author: kabir.khan at jboss.com
Date: 2008-05-21 12:34:27 -0400 (Wed, 21 May 2008)
New Revision: 73558

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerAwareBeanMetaDataFactory.java
Log:
Add a DefaultAspectManager bean to be able to configure the name of the ASpectManager if not specified

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerAwareBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerAwareBeanMetaDataFactory.java	2008-05-21 15:57:12 UTC (rev 73557)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerAwareBeanMetaDataFactory.java	2008-05-21 16:34:27 UTC (rev 73558)
@@ -38,7 +38,7 @@
    protected final static String DEFAULT_ASPECT_MANAGER = "AspectManager";
    
    /** The bean name of the aspect manager to use */
-   protected String managerBean = DEFAULT_ASPECT_MANAGER;
+   protected String managerBean;
 
    /** The property of the aspect manager bean, if any, containing the aspect manager */
    protected String managerProperty;
@@ -72,7 +72,9 @@
 
    protected void setAspectManagerProperty(BeanMetaDataBuilder builder, String propertyName)
    {
-      setAspectManagerProperty(builder, propertyName, managerBean, managerProperty);
+      String bean = (managerBean != null && managerBean.length() > 0) ? managerBean : DefaultAspectManager.getManagerBeanName();
+      String property = (managerProperty != null && managerProperty.length() > 0) ? managerProperty : DefaultAspectManager.getManagerPropertyName();
+      setAspectManagerProperty(builder, propertyName, bean, property);
    }
 
    protected void setAspectManagerProperty(BeanMetaDataBuilder builder, String managerBean, String managerProperty)