[jboss-cvs] JBossAS SVN: r78832 - trunk/server/src/etc/conf/default.

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

Author: kabir.khan at jboss.com
Date: 2008-09-24 12:03:05 -0400 (Wed, 24 Sep 2008)
New Revision: 78832

Modified:
   trunk/server/src/etc/conf/default/aop.xml
   trunk/server/src/etc/conf/default/deployers.xml
Log:
[JBAS-5985] Switch to the new mc based aop deployers

Modified: trunk/server/src/etc/conf/default/aop.xml
===================================================================
--- trunk/server/src/etc/conf/default/aop.xml	2008-09-24 16:00:43 UTC (rev 78831)
+++ trunk/server/src/etc/conf/default/aop.xml	2008-09-24 16:03:05 UTC (rev 78832)
@@ -16,12 +16,10 @@
    <!-- Integration -->
    <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration"/>
 
-   <!-- For use once the aop-mc-int metadata stuff goes live 
    <bean name="DefaultAspectManager" class="org.jboss.aop.microcontainer.beans.metadata.DefaultAspectManager">
       <property name="managerBean">AspectManager</property>
       <property name="managerProperty">aspectManager</property>
    </bean>
-   -->
 
 
    <!--

Modified: trunk/server/src/etc/conf/default/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/default/deployers.xml	2008-09-24 16:00:43 UTC (rev 78831)
+++ trunk/server/src/etc/conf/default/deployers.xml	2008-09-24 16:03:05 UTC (rev 78832)
@@ -113,13 +113,13 @@
        </constructor>
     </bean>
 
-    <!-- AOP deployment -->
+    <!-- Old AOP deployment 
     <bean name="AspectAppParsingDeployer" class="org.jboss.aop.asintegration.jboss5.AspectAppParsingDeployer"/>
     <bean name="AspectDeployer" class="org.jboss.aop.asintegration.jboss5.AspectDeployer">
        <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
    </bean>
+   -->
 
-   <!-- Use these instead of AspectDeployer
    <bean name="AOPXMLMetaDataParserDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
       <constructor>
          <parameter>org.jboss.aop.microcontainer.beans.metadata.AOPDeployment</parameter>
@@ -145,7 +145,6 @@
       <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
       <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
    </bean>
-   -->
 
    <!-- POJO Deployment -->
    <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">