[jboss-cvs] JBossAS SVN: r67069 - in trunk/embedded: src/main/resources/javase/deployers and 1 other directory.

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

Author: alesj
Date: 2007-11-14 10:05:08 -0500 (Wed, 14 Nov 2007)
New Revision: 67069

Added:
   trunk/embedded/src/main/resources/javase/deployers/jboss-aspect-library-beans.xml
Modified:
   trunk/embedded/build.xml
   trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml
Log:
Upgrading aspects integration.

Modified: trunk/embedded/build.xml
===================================================================
--- trunk/embedded/build.xml	2007-11-14 15:04:33 UTC (rev 67068)
+++ trunk/embedded/build.xml	2007-11-14 15:05:08 UTC (rev 67069)
@@ -369,6 +369,7 @@
          <zipfileset src="${jboss.security.int.lib}/jbosssx-server.jar"/>
          <zipfileset src="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar"/>
          <zipfileset src="${jboss.integration.lib}/jboss-transaction-spi.jar"/>
+         <zipfileset src="${jboss.integration.lib}/jboss-classloading-spi.jar"/>
          <zipfileset src="${jboss.naming.lib}/jnpserver.jar"/>
          <zipfileset src="${jboss.common.core.lib}/jboss-common-core.jar"/>
          <zipfileset src="${jboss.common.logging.log4j.lib}/jboss-logging-log4j.jar"/>
@@ -378,6 +379,7 @@
          <zipfileset src="${jboss.jboss.security.spi.lib}/jboss-security-spi.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-kernel.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-container.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-classloader.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-dependency.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-client.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-client-spi.jar"/>

Modified: trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml	2007-11-14 15:04:33 UTC (rev 67068)
+++ trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml	2007-11-14 15:05:08 UTC (rev 67069)
@@ -5,6 +5,16 @@
 -->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
+   <!-- Repository classloader -->
+   <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss4.RepositoryClassLoaderScopingPolicy"/>
+   <!-- VFS ClassLoader -->
+   <!-- bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/-->
+
+   <!-- Integration -->
+   <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration">
+      <property name="scopingPolicy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
+   </bean>
+
    <!--
       Valid values for the AspectManager bean for use with enableTransformer=true are:
       * org.jboss.aop.deployers.AspectManagerJDK5 - works with the -javaagent:pluggable-instrumentor.jar switch
@@ -14,10 +24,20 @@
       <constructor>
          <parameter><![CDATA[
 	         <aop>
+			      <aspect name="mainDeployer" class="org.jboss.profileservice.aop.MainDeployerAspect"/>
+					   <bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployment.MainDeployer}->process(..))">
+				      <advice name="process" aspect="mainDeployer"/>
+				   </bind>
+					<aspect name="persist" class="org.jboss.profileservice.aop.PersistAspect"/>
+					<bind pointcut="execution(* $instanceof{org.jboss.managed.api.ManagedProperty}->setValue(..))">
+				      <advice name="setValue" aspect="persist"/>
+				   </bind>
 				</aop>]]>
 	      </parameter>
       </constructor>
 
+      <property name="jbossIntegration"><inject bean="AOPJBossIntegration"/></property>
+
       <property name="enableLoadtimeWeaving">false</property>
       <!-- only relevant when EnableLoadtimeWeaving is true.
            When transformer is on, every loaded class gets
@@ -42,8 +62,8 @@
    </bean>
 
    <!-- Aspect Deployment -->
-    <bean name="AspectDeployer" class="org.jboss.aop.deployers.AspectDeployer">
-       <property name="type">aop</property>
-       <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
+   <bean name="AspectDeployer" class="org.jboss.aop.deployers.AspectDeployer">
+      <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
    </bean>
+
 </deployment>

Added: trunk/embedded/src/main/resources/javase/deployers/jboss-aspect-library-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/jboss-aspect-library-beans.xml	                        (rev 0)
+++ trunk/embedded/src/main/resources/javase/deployers/jboss-aspect-library-beans.xml	2007-11-14 15:05:08 UTC (rev 67069)
@@ -0,0 +1,23 @@
+<?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.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>