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

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

Author: kabir.khan at jboss.com
Date: 2008-10-03 11:26:57 -0400 (Fri, 03 Oct 2008)
New Revision: 79097

Modified:
   trunk/server/src/etc/conf/default/aop.xml
Log:
[JBAS-5894] Upgrade to AOP 2.0.0.CR18 while waiting for GA

Modified: trunk/server/src/etc/conf/default/aop.xml
===================================================================
--- trunk/server/src/etc/conf/default/aop.xml	2008-10-03 15:25:59 UTC (rev 79096)
+++ trunk/server/src/etc/conf/default/aop.xml	2008-10-03 15:26:57 UTC (rev 79097)
@@ -8,8 +8,9 @@
    <classloader><inject bean="aop-classloader:0.0.0"/></classloader>
 
    <classloader name="aop-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
-      <root>${jboss.lib.url}/jboss-aop-deployer-jdk50.jar</root>
-      <root>${jboss.lib.url}/jboss-aop-jboss4-jdk50.jar</root>
+      <root>${jboss.lib.url}/jboss-aop-asintegration-core.jar</root>
+      <root>${jboss.lib.url}/jboss-aop-asintegration-jmx.jar</root>
+      <root>${jboss.lib.url}/jboss-aop-asintegration-mc.jar</root>
       <root>${jboss.lib.url}/jboss-aop-jboss5.jar</root>
    </classloader>
 
@@ -103,7 +104,7 @@
 	<!-- MBean for making sure that the underlying AspectManagerService gets registered in JMX -->
 	<bean name="AspectManagerJMXRegistrar" class="org.jboss.aop.deployers.AspectManagerJMXRegistrar">
 	   <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
-	   <property name="aspectManager"><inject bean="AspectManager"/></property>
+	   <property name="aspectManager"><inject bean="AspectManager" property="delegate"/></property>
 	</bean>
 
 </deployment>