[jboss-cvs] JBossAS SVN: r86923 - in branches/Branch_5_x: build and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 7 09:22:28 EDT 2009
Author: kabir.khan at jboss.com
Date: 2009-04-07 09:22:28 -0400 (Tue, 07 Apr 2009)
New Revision: 86923
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-6652] Upgrade to AOP 2.1.0.CR3 and update the dependent files reverted in 86755
Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml 2009-04-07 13:19:57 UTC (rev 86922)
+++ branches/Branch_5_x/build/build-distr.xml 2009-04-07 13:22:28 UTC (rev 86923)
@@ -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-07 13:19:57 UTC (rev 86922)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-04-07 13:22:28 UTC (rev 86923)
@@ -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.CR3</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>
@@ -687,6 +687,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-07 13:19:57 UTC (rev 86922)
+++ branches/Branch_5_x/server/src/etc/conf/default/bootstrap/aop.xml 2009-04-07 13:22:28 UTC (rev 86923)
@@ -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: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml 2009-04-07 13:19:57 UTC (rev 86922)
+++ branches/Branch_5_x/thirdparty/pom.xml 2009-04-07 13:22:28 UTC (rev 86923)
@@ -403,6 +403,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>
@@ -1116,6 +1124,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>
More information about the jboss-cvs-commits
mailing list