[jboss-cvs] JBossAS SVN: r65358 - in trunk/aspects: src/etc and 1 other directories.

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

Author: adrian at jboss.org
Date: 2007-09-13 09:50:21 -0400 (Thu, 13 Sep 2007)
New Revision: 65358

Added:
   trunk/aspects/src/etc/META-INF/
   trunk/aspects/src/etc/META-INF/jboss-aspect-library-beans.xml
Modified:
   trunk/aspects/build.xml
Log:
[JBAS-4717] - the aspect library config should be in the appserver so we can change it without a new release of aop

Modified: trunk/aspects/build.xml
===================================================================
--- trunk/aspects/build.xml	2007-09-13 13:49:30 UTC (rev 65357)
+++ trunk/aspects/build.xml	2007-09-13 13:50:21 UTC (rev 65358)
@@ -267,9 +267,9 @@
          <fileset file="${build.lib}/jboss-aspect-library-jdk50.jar"/>
       	<fileset file="${jboss.aop.lib}/jboss-standalone-aspect-library-jdk50.jar"/>
       	<fileset file="${build.meta.inf}/base-aspects.xml"/>
-         <zipfileset prefix="META-INF" dir="${jboss.aop.resources}">
-			   <include name="jboss-aspect-library-beans.xml"/>
-         </zipfileset> 
+         <fileset dir="${build.etc}">
+            <include name="META-INF/*.xml"/>
+         </fileset>
       </jar>
       <delete dir="${build.meta.inf}"/>
    </target>

Added: trunk/aspects/src/etc/META-INF/jboss-aspect-library-beans.xml
===================================================================
--- trunk/aspects/src/etc/META-INF/jboss-aspect-library-beans.xml	                        (rev 0)
+++ trunk/aspects/src/etc/META-INF/jboss-aspect-library-beans.xml	2007-09-13 13:50:21 UTC (rev 65358)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Aspect  Deployer
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <!-- Aspect Library -->
+   <bean name="AspectLibrary" class="org.jboss.aop.deployers.JBossAspectLibrary">
+      <property name="aspectManager"><inject bean="AspectManager"/></property>
+   </bean>
+
+   <!-- Add the JMX -->
+   <!--aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
+               name="JMXAdvice"
+               class="org.jboss.system.microcontainer.jmx.ServiceControllerLifecycleCallback"
+               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+               manager-bean="AspectManager"
+               manager-property="aspectManager">
+      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
+   </aop:lifecycle-configure-->
+
+   <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
+               name="JMXAdvice"
+               class="org.jboss.aop.microcontainer.aspects.jmx.JMXLifecycleCallback"
+               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+               manager-bean="AspectManager"
+               manager-property="aspectManager">
+      <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+   </aop:lifecycle-configure>
+
+</deployment>