[jboss-cvs] JBossAS SVN: r86200 - in branches/Branch_5_x: server/src/etc/conf/default/bootstrap and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2009-03-23 07:28:09 -0400 (Mon, 23 Mar 2009)
New Revision: 86200

Modified:
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/server/src/etc/conf/default/bootstrap/aop.xml
Log:
Wrong commit msg in last commit, undoing

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-03-23 11:19:23 UTC (rev 86199)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-03-23 11:28:09 UTC (rev 86200)
@@ -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.1.0.CR1</version.org.jboss.aop>
+    <version.org.jboss.aop>2.0.1.GA</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>

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-03-23 11:19:23 UTC (rev 86199)
+++ branches/Branch_5_x/server/src/etc/conf/default/bootstrap/aop.xml	2009-03-23 11:28:09 UTC (rev 86200)
@@ -15,36 +15,14 @@
    </classloader>
 
    <!-- Integration -->
-   <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"/>
 
-   <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