[jboss-cvs] JBossAS SVN: r104607 - in branches/KABIR_JAVASSIST_REFLECT: server/src/etc/conf/all/bootstrap and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon May 10 08:33:24 EDT 2010 

Author: kabir.khan at jboss.com
Date: 2010-05-10 08:33:23 -0400 (Mon, 10 May 2010)
New Revision: 104607

Modified:
   branches/KABIR_JAVASSIST_REFLECT/component-matrix/pom.xml
   branches/KABIR_JAVASSIST_REFLECT/server/src/etc/conf/all/bootstrap/aop.xml
Log:
Proper releases of reflect, classpool and kernel + update aop config to reuse classpools set up by bootstrap

Modified: branches/KABIR_JAVASSIST_REFLECT/component-matrix/pom.xml
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/component-matrix/pom.xml	2010-05-10 12:02:05 UTC (rev 104606)
+++ branches/KABIR_JAVASSIST_REFLECT/component-matrix/pom.xml	2010-05-10 12:33:23 UTC (rev 104607)
@@ -82,7 +82,7 @@
     <version.org.hibernate.entity.manager>3.5.0-CR-1</version.org.hibernate.entity.manager>
     <version.org.hibernate.javax.persistence>1.0.0-CR-1</version.org.hibernate.javax.persistence>
     <version.org.hibernate.validator>4.0.2.GA</version.org.hibernate.validator>
-    <version.org.jboss.aop>2.2.0.Final</version.org.jboss.aop>
+    <version.org.jboss.aop>2.2.1-SNAPSHOT</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>
@@ -91,7 +91,7 @@
     <version.org.jboss.cache.core>3.2.1.GA</version.org.jboss.cache.core>
     <version.org.jboss.cache.pojo>3.0.0.GA</version.org.jboss.cache.pojo>
     <version.org.jboss.cl>2.2.0.Alpha4</version.org.jboss.cl>
-    <version.org.jboss.classpool>1.0.0-SNAPSHOT</version.org.jboss.classpool>
+    <version.org.jboss.classpool>1.0.0.Alpha6</version.org.jboss.classpool>
     <version.org.jboss.cluster.cache.jbc>2.2.0.Final</version.org.jboss.cluster.cache.jbc>
     <version.org.jboss.cluster.cache.spi>2.1.0.Final</version.org.jboss.cluster.cache.spi>
     <version.org.jboss.cluster.client>1.1.1.GA</version.org.jboss.cluster.client>
@@ -107,7 +107,7 @@
     <version.org.jboss.jpa.deployers>1.0.2-alpha-1</version.org.jboss.jpa.deployers>
     <version.org.jboss.jpa.impl>2.0.0</version.org.jboss.jpa.impl>
     <version.org.jboss.jpa.spi>1.0.0</version.org.jboss.jpa.spi>
-    <version.org.jboss.kernel>2.2.0-SNAPSHOT</version.org.jboss.kernel>
+    <version.org.jboss.kernel>2.2.0.Alpha10</version.org.jboss.kernel>
     <version.org.jboss.logging>3.0.0.Beta2</version.org.jboss.logging>
     <version.org.jboss.logging-service-metadata>1.0.0.CR8</version.org.jboss.logging-service-metadata>
     <version.org.jboss.logmanager>1.2.0.CR2</version.org.jboss.logmanager>
@@ -126,7 +126,7 @@
     <version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
     <version.org.jboss.naming>5.0.5.Final</version.org.jboss.naming>
     <version.org.jboss.profileservice>0.1.0.Alpha1</version.org.jboss.profileservice>
-    <version.org.jboss.reflect>2.2.0-SNAPSHOT</version.org.jboss.reflect>
+    <version.org.jboss.reflect>2.2.0.Alpha5</version.org.jboss.reflect>
     <version.org.jboss.reloaded.naming>0.1.0</version.org.jboss.reloaded.naming>
     <version.org.jboss.reloaded.naming.deployers>0.1.0</version.org.jboss.reloaded.naming.deployers>
     <version.org.jboss.resteasy>2.0-beta-2</version.org.jboss.resteasy>

Modified: branches/KABIR_JAVASSIST_REFLECT/server/src/etc/conf/all/bootstrap/aop.xml
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/server/src/etc/conf/all/bootstrap/aop.xml	2010-05-10 12:02:05 UTC (rev 104606)
+++ branches/KABIR_JAVASSIST_REFLECT/server/src/etc/conf/all/bootstrap/aop.xml	2010-05-10 12:33:23 UTC (rev 104607)
@@ -12,22 +12,22 @@
       <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>
-      <root>${jboss.lib.url}jboss-classpool-jbosscl.jar</root>
       <root>${jboss.lib.url}jboss-deployers-impl.jar</root>
+      <root>${jboss.lib.url}jboss-classpool-jbosscl-as.jar</root>
    </classloader>
 
+
+
    <!-- Integration -->
-   <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/>
-   
-   <bean name="AOPClassPoolFactory" class="org.jboss.classpool.plugins.jbosscl.JBossClDelegatingClassPoolFactory">
-      <constructor>
-         <parameter><inject bean="AOPClassLoaderScopingPolicy" property="registry"/></parameter>
-         <parameter><inject bean="AOPRegisterModuleCallback"/></parameter>
-      </constructor>
+   <!--  
+      It now wraps and delegates to the plain VFSClassLoaderDomainRegistry provided by AS
+   -->
+   <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy">
+      <property name="domainRegistry"><inject bean="JBossClClassPoolConfig" property="domainRegistry"/></property>
    </bean>
-
+   
    <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration">
-      <property name="classPoolFactory"><inject bean="AOPClassPoolFactory"/></property>
+      <property name="classPoolFactory"><inject bean="JBossClClassPoolConfig" property="classPoolFactory"/></property>
       <property name="aopClassLoaderScopingPolicy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
    </bean>
 
@@ -36,46 +36,12 @@
       <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="ClassLoaderDomainRegistry" class="org.jboss.aop.asintegration.jboss5.AOPVFSClassLoaderDomainRegistry">
+   <bean name="ClassLoaderDomainRegistry" class="org.jboss.aop.asintegration.jboss5.AOPVFSClassLoaderDomainRegistry">
      <constructor factoryMethod="getRegistry">
-   <factory bean="AOPClassLoaderScopingPolicy"/>
+       <factory bean="AOPClassLoaderScopingPolicy"/>
      </constructor>
-        </bean>
-
-
-   <bean name="AOPRegisterModuleCallback" class="org.jboss.classpool.plugins.jbosscl.RegisterModuleCallback">
-      <!-- classloader><null/></classloader -->
-     <constructor>
-       <parameter><inject bean="ClassLoaderDomainRegistry"/></parameter>
-     </constructor>
-     <install method="addModuleRegistry" bean="ClassLoading" whenRequired="Start">
-       <parameter><this/></parameter>
-     </install>
-     <install method="addModule">
-       <parameter><inject bean="bootstrap-classloader:0.0.0$MODULE"/></parameter>
-     </install>
-     <install method="addModule">
-       <parameter><inject bean="stdio-classloader:0.0.0$MODULE"/></parameter>
-     </install>
-     <install method="addModule">
-       <parameter><inject bean="asynch-classloader:0.0.0$MODULE"/></parameter>
-     </install>
-     <install method="addModule">
-       <parameter><inject bean="aop-classloader:0.0.0$MODULE"/></parameter>
-     </install>
-     <uninstall method="removeModuleRegistry" bean="ClassLoading" whenRequired="Start">
-       <parameter><this/></parameter>
-     </uninstall>
    </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
@@ -128,4 +94,4 @@
      -->
    </bean>
 
-</deployment>
\ No newline at end of file
+</deployment>

More information about the jboss-cvs-commits mailing list