[jboss-cvs] JBossAS SVN: r103478 - in trunk: server/src/etc/conf/all/bootstrap and 1 other directory.

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

Author: flavia.rainone at jboss.com
Date: 2010-04-02 09:58:02 -0400 (Fri, 02 Apr 2010)
New Revision: 103478

Modified:
   trunk/component-matrix/pom.xml
   trunk/server/src/etc/conf/all/bootstrap/aop.xml
Log:
[JBAS-7887] Upgrade JBoss AOP to 2.2.0.Final. Update server/src/etc/conf/all/bootstrap/aop.xml accordingly.

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-04-02 13:35:47 UTC (rev 103477)
+++ trunk/component-matrix/pom.xml	2010-04-02 13:58:02 UTC (rev 103478)
@@ -82,7 +82,7 @@
     <version.org.hibernate.entity.manager>3.5.0-CR-1</version.org.hibernate.entity.manager>
     <version.org.hibernate.javax.persistence>1.0.0-CR-1</version.org.hibernate.javax.persistence>
     <version.org.hibernate.validator>4.0.2.GA</version.org.hibernate.validator>
-    <version.org.jboss.aop>2.1.9.Alpha1</version.org.jboss.aop>
+    <version.org.jboss.aop>2.2.0.Final</version.org.jboss.aop>
     <version.org.jboss.aspects.currentinvocation>1.0.1</version.org.jboss.aspects.currentinvocation>
     <version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
     <version.org.jboss.aspects.security>1.0.1</version.org.jboss.aspects.security>

Modified: trunk/server/src/etc/conf/all/bootstrap/aop.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/aop.xml	2010-04-02 13:35:47 UTC (rev 103477)
+++ trunk/server/src/etc/conf/all/bootstrap/aop.xml	2010-04-02 13:58:02 UTC (rev 103478)
@@ -12,12 +12,14 @@
       <root>${jboss.lib.url}jboss-aop-asintegration-mc.jar</root>
       <root>${jboss.lib.url}jboss-aop-deployers.jar</root>
       <root>${jboss.lib.url}jboss-aop-jboss5.jar</root>
+      <root>${jboss.lib.url}jboss-classpool-jbosscl.jar</root>
+      <root>${jboss.lib.url}jboss-deployers-impl.jar</root>
    </classloader>
 
    <!-- Integration -->
    <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/>
    
-   <bean name="AOPClassPoolFactory" class="org.jboss.aop.classpool.jbosscl.JBossClDelegatingClassPoolFactory">
+   <bean name="AOPClassPoolFactory" class="org.jboss.classpool.plugins.jbosscl.JBossClDelegatingClassPoolFactory">
       <constructor>
          <parameter><inject bean="AOPClassLoaderScopingPolicy" property="registry"/></parameter>
          <parameter><inject bean="AOPRegisterModuleCallback"/></parameter>
@@ -40,12 +42,33 @@
        <property name="manager"><inject bean="AspectManager" property="aspectManager"/></property>
    </bean-->
 
-   <bean name="AOPRegisterModuleCallback" class="org.jboss.aop.asintegration.jboss5.RegisterModuleCallback">
+<bean name="ClassLoaderDomainRegistry" class="org.jboss.aop.asintegration.jboss5.AOPVFSClassLoaderDomainRegistry">
+     <constructor factoryMethod="getRegistry">
+   <factory bean="AOPClassLoaderScopingPolicy"/>
+     </constructor>
+        </bean>
+
+
+   <bean name="AOPRegisterModuleCallback" class="org.jboss.classpool.plugins.jbosscl.RegisterModuleCallback">
       <!-- classloader><null/></classloader -->
-      <incallback method="addModule" state="Installed"/>
-      <uncallback method="removeModule" state="Installed"/>
-   </bean>
-   <!--
+     <constructor>
+            <parameter><inject bean="ClassLoaderDomainRegistry"/></parameter>
+                 </constructor>
+                      <install method="addModuleRegistry" bean="ClassLoading" whenRequired="Start">
+                             <parameter><this/></parameter>
+                                  </install>
+                                  <install method="addModule">
+                                    <parameter><inject bean="bootstrap-classloader:0.0.0$MODULE"/></parameter>
+                                  </install>
+<!--                                  <install method="addModule" -->
+                                       <uninstall method="removeModuleRegistry" bean="ClassLoading" whenRequired="Start">
+                                              <parameter><this/></parameter>
+                                                   </uninstall>
+                                                     </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
       * org.jboss.aop.deployers.AspectManagerJRockit - works with JRockit and the -Xmanagement:class=org.jboss.aop.hook.JRockitPluggableClassPreProcessor switch
@@ -53,17 +76,17 @@
    <bean name="AspectManager" class="org.jboss.aop.deployers.AspectManagerJDK5">
       <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>
+            <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>
@@ -89,12 +112,12 @@
             org.jboss.aop.instrument.GeneratedAdvisorInstrumentor
        <property name="instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</property>
       -->
-	  <!-- 
-		By default the deployment of the aspects contained in 
-		../deployers/jboss-aop-jboss5.deployer/base-aspects.xml
-		are not deployed. To turn on deployment uncomment this property
-	  <property name="useBaseXml">true</property>
-	  -->
+     <!-- 
+      By default the deployment of the aspects contained in 
+      ../deployers/jboss-aop-jboss5.deployer/base-aspects.xml
+      are not deployed. To turn on deployment uncomment this property
+     <property name="useBaseXml">true</property>
+     -->
    </bean>
 
-</deployment>
+</deployment>
\ No newline at end of file