[jboss-cvs] JBossAS SVN: r97500 - in trunk: component-matrix and 1 other directories.

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

Author: kabir.khan at jboss.com
Date: 2009-12-07 07:44:57 -0500 (Mon, 07 Dec 2009)
New Revision: 97500

Modified:
   trunk/build/build.xml
   trunk/component-matrix/pom.xml
   trunk/server/src/etc/conf/all/bootstrap/aop.xml
Log:
[JBAS-7513][JBAS-7504] Get rid of jboss-aop-asintegration-jmx.jar and upgrade aop to 2.1.6

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-12-07 11:52:56 UTC (rev 97499)
+++ trunk/build/build.xml	2009-12-07 12:44:57 UTC (rev 97500)
@@ -2103,7 +2103,6 @@
       <fileset refid="com.sun.xml.bind:jaxb-xjc:jar"/>
       <fileset refid="org.codehaus.woodstox:wstx-lgpl:jar"/>
       <fileset refid="org.jboss.aop:jboss-aop-asintegration-core:jar"/>
-      <fileset refid="org.jboss.aop:jboss-aop-asintegration-jmx:jar"/>
       <fileset refid="org.jboss.aop:jboss-aop-asintegration-mc:jar"/>
       <fileset refid="org.jboss.aop:jboss-aop-deployers:jar"/>
       <fileset refid="gnu-getopt:getopt:jar"/>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-12-07 11:52:56 UTC (rev 97499)
+++ trunk/component-matrix/pom.xml	2009-12-07 12:44:57 UTC (rev 97500)
@@ -58,7 +58,7 @@
     <version.org.hibernate.entity.manager>3.5.0-Beta-2</version.org.hibernate.entity.manager>
     <version.org.hibernate.validator>4.0.2.GA</version.org.hibernate.validator>
     <version.org.hibernate>3.5.0-Beta-2</version.org.hibernate>
-    <version.org.jboss.aop>2.1.3.GA</version.org.jboss.aop>
+    <version.org.jboss.aop>2.1.6.GA</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	2009-12-07 11:52:56 UTC (rev 97499)
+++ trunk/server/src/etc/conf/all/bootstrap/aop.xml	2009-12-07 12:44:57 UTC (rev 97500)
@@ -9,7 +9,6 @@
 
    <classloader name="aop-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
       <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>