[jboss-cvs] JBossAS SVN: r86663 - in trunk: build and 3 other directories.

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

Author: stalep
Date: 2009-04-02 08:04:38 -0400 (Thu, 02 Apr 2009)
New Revision: 86663

Removed:
   trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/
Modified:
   trunk/build/build-distr.xml
   trunk/build/pom.xml
   trunk/component-matrix/pom.xml
   trunk/server/src/etc/conf/default/bootstrap/aop.xml
   trunk/thirdparty/pom.xml
Log:
[JBAS-6642]
removed deployers that have been moved to aop.
updated poms,builds and aop.xml accordingly.


Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2009-04-02 12:03:56 UTC (rev 86662)
+++ trunk/build/build-distr.xml	2009-04-02 12:04:38 UTC (rev 86663)
@@ -251,6 +251,7 @@
         <include name="jboss-aop-asintegration-core.jar"/>
         <include name="jboss-aop-asintegration-jmx.jar"/>
         <include name="jboss-aop-asintegration-mc.jar"/>
+        <include name="jboss-aop-deployers.jar"/>
       </fileset>
     </copy>
 

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2009-04-02 12:03:56 UTC (rev 86662)
+++ trunk/build/pom.xml	2009-04-02 12:04:38 UTC (rev 86663)
@@ -21,6 +21,11 @@
     </dependency>
     
     <dependency>
+      <groupId>org.jboss.aop</groupId>
+      <artifactId>jboss-aop-deployers</artifactId>
+    </dependency>
+    
+    <dependency>
       <groupId>org.jboss.bootstrap</groupId>
       <artifactId>jboss-bootstrap</artifactId>
     </dependency>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-04-02 12:03:56 UTC (rev 86662)
+++ trunk/component-matrix/pom.xml	2009-04-02 12:04:38 UTC (rev 86663)
@@ -47,7 +47,7 @@
     <version.org.hibernate.entity.manager>3.4.0.GA</version.org.hibernate.entity.manager>
     <version.org.hibernate.validator>3.1.0.GA</version.org.hibernate.validator>
     <version.org.hibernate>3.3.1.GA</version.org.hibernate>
-    <version.org.jboss.aop>2.0.1.GA</version.org.jboss.aop>
+    <version.org.jboss.aop>2.1.0.CR2</version.org.jboss.aop>
     <version.org.jboss.aspects.currentinvocation>1.0.0.GA</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.0.GA</version.org.jboss.aspects.security>
@@ -697,6 +697,12 @@
       
       <dependency>
         <groupId>org.jboss.aop</groupId>
+        <artifactId>jboss-aop-deployers</artifactId>
+        <version>${version.org.jboss.aop}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>org.jboss.aop</groupId>
         <artifactId>jboss-aop</artifactId>
         <version>${version.org.jboss.aop}</version>
         <classifier>client</classifier>

Modified: trunk/server/src/etc/conf/default/bootstrap/aop.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/aop.xml	2009-04-02 12:03:56 UTC (rev 86662)
+++ trunk/server/src/etc/conf/default/bootstrap/aop.xml	2009-04-02 12:04:38 UTC (rev 86663)
@@ -11,18 +11,41 @@
       <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-deployers.jar</root>
       <root>${jboss.lib.url}jboss-aop-jboss5.jar</root>
    </classloader>
 
    <!-- Integration -->
-   <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration"/>
+   <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/>
+   
+   <bean name="AOPClassPoolFactory" class="org.jboss.aop.classpool.jbosscl.JBossClDelegatingClassPoolFactory">
+      <constructor>
+         <parameter><inject bean="AOPClassLoaderScopingPolicy" property="registry"/></parameter>
+         <parameter><inject bean="AOPRegisterModuleCallback"/></parameter>
+      </constructor>
+   </bean>
 
+   <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration">
+      <property name="classPoolFactory"><inject bean="AOPClassPoolFactory"/></property>
+      <property name="aopClassLoaderScopingPolicy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
+   </bean>
+
    <bean name="DefaultAspectManager" class="org.jboss.aop.microcontainer.beans.metadata.DefaultAspectManager">
       <property name="managerBean">AspectManager</property>
       <property name="managerProperty">aspectManager</property>
    </bean>
 
+   <!-- bean name="AOPBootstrap" class="org.jboss.aop.asintegration.jboss5.AOPBootstrap" -->
+      <!--  This one lives in AS 5 source tree -->
+      <!-- property name="policy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
+       <property name="manager"><inject bean="AspectManager" property="aspectManager"/></property>
+   </bean-->
 
+   <bean name="AOPRegisterModuleCallback" class="org.jboss.aop.asintegration.jboss5.RegisterModuleCallback">
+      <!-- classloader><null/></classloader -->
+      <incallback method="addModule" state="Installed"/>
+      <uncallback method="removeModule" state="Installed"/>
+   </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

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2009-04-02 12:03:56 UTC (rev 86662)
+++ trunk/thirdparty/pom.xml	2009-04-02 12:04:38 UTC (rev 86663)
@@ -396,6 +396,15 @@
             </dependency>
             <dependency>
               <groupId>org.jboss.aop</groupId>
+              <artifactId>jboss-aop-deployers</artifactId>
+              <version>${version.org.jboss.aop}</version>
+              <mapping>
+                <componentId>jboss.aop</componentId>
+              </mapping>
+            </dependency>
+
+            <dependency>
+              <groupId>org.jboss.aop</groupId>
               <artifactId>jboss-aop</artifactId>
               <version>${version.org.jboss.aop}</version>
               <mapping>
@@ -1141,6 +1150,10 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.aop</groupId>
+      <artifactId>jboss-aop-deployers</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.aop</groupId>
       <artifactId>pluggable-instrumentor</artifactId>
     </dependency>
     <dependency>