[jboss-cvs] JBossAS SVN: r86656 - in branches/Branch_5_x: build and 3 other directories.

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

Author: stalep
Date: 2009-04-02 07:06:11 -0400 (Thu, 02 Apr 2009)
New Revision: 86656

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


Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml	2009-04-02 10:48:22 UTC (rev 86655)
+++ branches/Branch_5_x/build/build-distr.xml	2009-04-02 11:06:11 UTC (rev 86656)
@@ -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: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-04-02 10:48:22 UTC (rev 86655)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-04-02 11:06:11 UTC (rev 86656)
@@ -698,6 +698,26 @@
           </exclusion>
         </exclusions>
       </dependency>
+
+      <dependency>
+        <groupId>org.jboss.aop</groupId>
+        <artifactId>jboss-aop-deployers</artifactId>
+        <version>${version.org.jboss.aop}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.microcontainer</groupId>
+            <artifactId>jboss-kernel</artifactId>
+          </exclusion>        
+          <exclusion>
+            <groupId>org.jboss.microcontainer</groupId>
+            <artifactId>jboss-aop-mc-int</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.jboss</groupId>
+            <artifactId>jboss-vfs</artifactId>
+          </exclusion>          
+        </exclusions>        
+      </dependency>
       
       <dependency>
         <groupId>org.jboss.aop</groupId>

Modified: branches/Branch_5_x/server/src/etc/conf/default/bootstrap/aop.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/bootstrap/aop.xml	2009-04-02 10:48:22 UTC (rev 86655)
+++ branches/Branch_5_x/server/src/etc/conf/default/bootstrap/aop.xml	2009-04-02 11:06:11 UTC (rev 86656)
@@ -11,6 +11,7 @@
       <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>
 

Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml	2009-04-02 10:48:22 UTC (rev 86655)
+++ branches/Branch_5_x/thirdparty/pom.xml	2009-04-02 11:06:11 UTC (rev 86656)
@@ -410,6 +410,14 @@
             </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>
@@ -1127,6 +1135,10 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.aop</groupId>
+      <artifactId>jboss-aop-deployers</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.aop</groupId>
       <artifactId>jrockit-pluggable-instrumentor</artifactId>
     </dependency>
     <dependency>