[jboss-cvs] JBossAS SVN: r105800 - in trunk: main/src/main/java/org/jboss and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 8 08:26:23 EDT 2010
Author: kabir.khan at jboss.com
Date: 2010-06-08 08:26:21 -0400 (Tue, 08 Jun 2010)
New Revision: 105800
Modified:
trunk/component-matrix/pom.xml
trunk/main/src/main/java/org/jboss/Main.java
trunk/server/src/etc/conf/all/bootstrap/aop.xml
Log:
[JBAS-8081][JBAS-8082][JBAS-8083] Update to jboss-aop 2.2.1.Alpha3, jboss-classpool 1.0.0.Alpha6 and make necessary changes to aop.xml + classpath in Main.java
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-06-08 12:25:32 UTC (rev 105799)
+++ trunk/component-matrix/pom.xml 2010-06-08 12:26:21 UTC (rev 105800)
@@ -45,7 +45,7 @@
<version.hornetq>2.1.0.CR1</version.hornetq>
<version.rhq>1.4.0.B01</version.rhq>
<version.jacorb>2.3.1jboss.patch01-brew</version.jacorb>
- <version.javassist>3.11.0.GA</version.javassist>
+ <version.javassist>3.12.0.GA</version.javassist>
<version.javax.faces>2.0.2-FCS</version.javax.faces>
<version.javax.validation>1.0.0.GA</version.javax.validation>
<version.jaxrpc.api>1.1</version.jaxrpc.api>
@@ -87,7 +87,7 @@
<version.org.hibernate.entity.manager>${version.org.hibernate}</version.org.hibernate.entity.manager>
<version.org.hibernate.javax.persistence>1.0.0.Final</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.Alpha3</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>
@@ -96,7 +96,7 @@
<version.org.jboss.cache.core>3.2.5.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.Alpha5</version.org.jboss.cl>
- <version.org.jboss.classpool>1.0.0.Alpha5</version.org.jboss.classpool>
+ <version.org.jboss.classpool>1.0.0.Alpha6</version.org.jboss.classpool>
<version.org.jboss.cluster.cache.jbc>2.4.0.Alpha2</version.org.jboss.cluster.cache.jbc>
<version.org.jboss.cluster.cache.spi>2.2.0.Final</version.org.jboss.cluster.cache.spi>
<version.org.jboss.cluster.client>1.1.1.GA</version.org.jboss.cluster.client>
Modified: trunk/main/src/main/java/org/jboss/Main.java
===================================================================
--- trunk/main/src/main/java/org/jboss/Main.java 2010-06-08 12:25:32 UTC (rev 105799)
+++ trunk/main/src/main/java/org/jboss/Main.java 2010-06-08 12:26:21 UTC (rev 105800)
@@ -95,6 +95,8 @@
// Microcontainer
"javassist.jar", "jboss-reflect.jar", "jboss-mdr.jar", "jboss-dependency.jar", "jboss-kernel.jar",
"jboss-metatype.jar", "jboss-managed.jar", "javax.inject.jar", "jboss-classpool.jar", "jboss-classpool-scoped.jar",
+ "jboss-classpool-jbosscl.jar",
+
// Fixme ClassLoading
"jboss-vfs.jar", "jboss-classloading-spi.jar", "jboss-classloader.jar", "jboss-classloading.jar",
"jboss-classloading-vfs.jar",
Modified: trunk/server/src/etc/conf/all/bootstrap/aop.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/aop.xml 2010-06-08 12:25:32 UTC (rev 105799)
+++ trunk/server/src/etc/conf/all/bootstrap/aop.xml 2010-06-08 12:26:21 UTC (rev 105800)
@@ -1,118 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
+<!--
AOP configuration
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <classloader>
- <inject bean="aop-classloader:0.0.0" />
- </classloader>
+ <classloader><inject bean="aop-classloader:0.0.0"/></classloader>
- <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-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>
- </classloader>
+ <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-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-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" />
+ <!--
+ AS > 6.0.0.M3 installs this as part of its bootstrap
+ -->
+ <bean name="JBossClClassPoolConfig" class="org.jboss.classpool.plugins.jbosscl.JBossClClassPoolConfig">
+ <constructor factoryMethod="getInstance"/>
+ <property name="classLoading"><inject bean="ClassLoading"/></property>
+ </bean>
- <bean name="AOPClassPoolFactory"
- class="org.jboss.classpool.plugins.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>
+ <!-- Integration -->
+ <!--
+ 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="JBossClClassPoolConfig" property="classPoolFactory"/></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="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="ClassLoaderDomainRegistry" class="org.jboss.aop.asintegration.jboss5.AOPVFSClassLoaderDomainRegistry">
+ <constructor factoryMethod="getRegistry">
+ <factory bean="AOPClassLoaderScopingPolicy"/>
+ </constructor>
+ </bean>
- <bean name="ClassLoaderDomainRegistry"
- class="org.jboss.aop.asintegration.jboss5.AOPVFSClassLoaderDomainRegistry">
- <constructor factoryMethod="getRegistry">
- <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" -->
- <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 *
- org.jboss.aop.deployers.AspectManagerJRockit - works with JRockit and
- the
- -Xmanagement:class=org.jboss.aop.hook.JRockitPluggableClassPreProcessor
- switch
- -->
- <bean name="AspectManager" class="org.jboss.aop.deployers.AspectManagerJDK5">
- <constructor>
- <parameter><![CDATA[
+<!--
+ 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
+ * org.jboss.aop.deployers.AspectManagerJRockit - works with JRockit and the -Xmanagement:class=org.jboss.aop.hook.JRockitPluggableClassPreProcessor switch
+ -->
+ <bean name="AspectManager" class="org.jboss.aop.deployers.AspectManagerJDK5">
+ <constructor>
+ <parameter><![CDATA[
<aop>
<aspect name="mainDeployer" class="org.jboss.profileservice.aop.MainDeployerAspect"/>
<bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployment.MainDeployer}->process(..))">
@@ -123,43 +67,38 @@
<advice name="setValue" aspect="persist"/>
</bind>
</aop>]]>
- </parameter>
- </constructor>
+ </parameter>
+ </constructor>
- <property name="jbossIntegration">
- <inject bean="AOPJBossIntegration" />
- </property>
+ <property name="jbossIntegration"><inject bean="AOPJBossIntegration"/></property>
- <property name="enableLoadtimeWeaving">false</property>
- <!--
- only relevant when EnableLoadtimeWeaving is true. When transformer is
- on, every loaded class gets transformed. If AOP can't find the class,
- then it throws an exception. Sometimes, classes may not have all the
- classes they reference. So, the Suppressing is needed. (i.e. Jboss
- cache in the default configuration
- -->
- <property name="suppressTransformationErrors">true</property>
- <property name="prune">true</property>
- <property name="include">org.jboss.test., org.jboss.injbossaop.</property>
- <property name="exclude">org.jboss.</property>
- <!--
- This avoids instrumentation of hibernate cglib enhanced proxies
- <property name="ignore">*$$EnhancerByCGLIB$$*</property>
- -->
- <property name="optimized">true</property>
- <property name="verbose">false</property>
- <!--
- Available choices for this attribute are:
- org.jboss.aop.instrument.ClassicInstrumentor (default)
- org.jboss.aop.instrument.GeneratedAdvisorInstrumentor <property
- name="instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</property>
- -->
- <!--
- By default the deployment of the aspects contained in
- ../deployers/jboss-aop-jboss5.deployer/base-aspects.xml are not
- deployed. To turn on deployment uncomment this property <property
- name="useBaseXml">true</property>
- -->
- </bean>
+ <property name="enableLoadtimeWeaving">false</property>
+ <!-- only relevant when EnableLoadtimeWeaving is true.
+ When transformer is on, every loaded class gets
+ transformed. If AOP can't find the class, then it
+ throws an exception. Sometimes, classes may not have
+ all the classes they reference. So, the Suppressing
+ is needed. (i.e. Jboss cache in the default configuration -->
+ <property name="suppressTransformationErrors">true</property>
+ <property name="prune">true</property>
+ <property name="include">org.jboss.test., org.jboss.injbossaop.</property>
+ <property name="exclude">org.jboss.</property>
+ <!-- This avoids instrumentation of hibernate cglib enhanced proxies
+ <property name="ignore">*$$EnhancerByCGLIB$$*</property> -->
+ <property name="optimized">true</property>
+ <property name="verbose">false</property>
+ <!--
+ Available choices for this attribute are:
+ org.jboss.aop.instrument.ClassicInstrumentor (default)
+ org.jboss.aop.instrument.GeneratedAdvisorInstrumentor
+ <property name="instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</property>
+ -->
+ <!--
+ By default the deployment of the aspects contained in
+ ../deployers/jboss-aop-jboss5.deployer/base-aspects.xml
+ are not deployed. To turn on deployment uncomment this property
+ <property name="useBaseXml">true</property>
+ -->
+ </bean>
</deployment>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list