[jboss-cvs] JBossAS SVN: r91686 - in projects/jboss-jca/trunk: standalone/src/main/resources and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 27 14:21:15 EDT 2009
Author: jesper.pedersen
Date: 2009-07-27 14:21:14 -0400 (Mon, 27 Jul 2009)
New Revision: 91686
Removed:
projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/aop.xml
Modified:
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/ivy.xml
projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap.xml
projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/deployers.xml
Log:
[JBJCA-124] Remove AOP stack from MC configuration
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2009-07-27 18:17:29 UTC (rev 91685)
+++ projects/jboss-jca/trunk/build.xml 2009-07-27 18:21:14 UTC (rev 91686)
@@ -81,7 +81,6 @@
<property name="version.jaxb.api" value="2.1"/>
<property name="version.jaxb.impl" value="2.1"/>
<property name="version.jaxb.xjc" value="2.1.6"/>
- <property name="version.jboss.aop" value="2.1.1.GA"/>
<property name="version.jboss.bootstrap" value="1.0.0-Beta-3"/>
<property name="version.jboss.classloading" value="2.2.0.M4"/>
<property name="version.jboss.common" value="2.2.14.GA"/>
@@ -95,7 +94,6 @@
<property name="version.jboss.logmanager" value="1.1.0.CR4"/>
<property name="version.jboss.logmanager.log4j" value="1.0.0.CR2"/>
<property name="version.jboss.managed" value="2.1.0.CR7"/>
- <property name="version.jboss.mc.aop-int" value="2.2.0.M1"/>
<property name="version.jboss.mc.dependency" value="2.2.0.M1"/>
<property name="version.jboss.mc.kernel" value="2.2.0.M1"/>
<property name="version.jboss.mdr" value="2.0.1.GA"/>
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2009-07-27 18:17:29 UTC (rev 91685)
+++ projects/jboss-jca/trunk/ivy.xml 2009-07-27 18:21:14 UTC (rev 91686)
@@ -56,11 +56,6 @@
<dependency org="org.jboss" name="jboss-reflect" rev="${version.jboss.reflect}" conf="standalone->default;sjc->*"/>
<dependency org="org.jboss" name="jboss-vfs" rev="${version.jboss.vfs}" conf="standalone->default"/>
<dependency org="org.jboss" name="jbossxb" rev="${version.jboss.xb}" conf="standalone->default;sjc->*"/>
- <dependency org="org.jboss.aop" name="jboss-aop" rev="${version.jboss.aop}" conf="standalone->default"/>
- <dependency org="org.jboss.aop" name="jboss-aop-asintegration-core" rev="${version.jboss.aop}" conf="standalone->default"/>
- <dependency org="org.jboss.aop" name="jboss-aop-asintegration-jmx" rev="${version.jboss.aop}" conf="standalone->default"/>
- <dependency org="org.jboss.aop" name="jboss-aop-asintegration-mc" rev="${version.jboss.aop}" conf="standalone->default"/>
- <dependency org="org.jboss.aop" name="jboss-aop-deployers" rev="${version.jboss.aop}" conf="standalone->default"/>
<dependency org="org.jboss.bootstrap" name="jboss-bootstrap" rev="${version.jboss.bootstrap}" conf="standalone->default"/>
<dependency org="org.jboss.cl" name="jboss-classloader" rev="${version.jboss.classloading}" conf="standalone->default"/>
<dependency org="org.jboss.cl" name="jboss-classloading" rev="${version.jboss.classloading}" conf="standalone->default"/>
@@ -88,7 +83,6 @@
<dependency org="org.jboss.man" name="jboss-metatype" rev="${version.jboss.managed}" conf="standalone->default"/>
<dependency org="org.jboss.metadata" name="metadata-common" rev="${version.jboss.metadata}" conf="standalone->default;sjc->*"/>
<dependency org="org.jboss.metadata" name="metadata-rar" rev="${version.jboss.metadata}" conf="standalone->default;sjc->*"/>
- <dependency org="org.jboss.microcontainer" name="jboss-aop-mc-int" rev="${version.jboss.mc.aop-int}" conf="standalone->default"/>
<dependency org="org.jboss.microcontainer" name="jboss-dependency" rev="${version.jboss.mc.dependency}" conf="standalone->default"/>
<dependency org="org.jboss.microcontainer" name="jboss-kernel" rev="${version.jboss.mc.kernel}" conf="standalone->default"/>
<dependency org="org.jboss.naming" name="jnpserver" rev="${version.jboss.naming}" conf="standalone->default;sjc->*"/>
Deleted: projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/aop.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/aop.xml 2009-07-27 18:17:29 UTC (rev 91685)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/aop.xml 2009-07-27 18:21:14 UTC (rev 91686)
@@ -1,93 +0,0 @@
-<?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 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>
- </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">
- <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
- * 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>
- </aop>]]>
- </parameter>
- </constructor>
-
- <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>
-
-</deployment>
Modified: projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/deployers.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/deployers.xml 2009-07-27 18:17:29 UTC (rev 91685)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/deployers.xml 2009-07-27 18:21:14 UTC (rev 91686)
@@ -96,7 +96,7 @@
<!-- JAR Structure -->
<bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
- <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar, .war, .sar, .har, .aop -->
+ <!-- Unless specified the default list of suffixes is .zip, .jar, ,.rar, -->
<constructor>
<parameter>
<set elementClass="java.lang.String">
@@ -126,43 +126,18 @@
<!-- File Structure -->
<bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
- <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml -->
+ <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml -->
<constructor>
<parameter>
<set elementClass="java.lang.String">
<value>-service.xml</value>
<value>-beans.xml</value>
<value>-ds.xml</value>
- <value>-aop.xml</value>
</set>
</parameter>
</constructor>
</bean>
- <!-- AOP -->
- <bean name="AOPXMLMetaDataParserDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
- <constructor>
- <parameter>org.jboss.aop.microcontainer.beans.metadata.AOPDeployment</parameter>
- </constructor>
- <property name="suffix">-aop.xml</property>
- </bean>
- <bean name="AOPAnnotationMetaDataParserDeployer" class="org.jboss.aop.asintegration.jboss5.AOPAnnotationMetaDataParserDeployer">
- <constructor>
- <parameter><inject bean="AOPXMLMetaDataParserDeployer" property="relativeOrder"/></parameter>
- </constructor>
- </bean>
- <bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer">
- <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
- </bean>
- <bean name="AOPDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.AOPDeploymentAopMetaDataDeployer">
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
- </bean>
- <bean name="BeansDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.BeansDeploymentAopMetaDataDeployer">
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
- </bean>
-
<!-- POJO Deployment -->
<bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
<property name="suffix">jboss-beans.xml</property>
Modified: projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap.xml 2009-07-27 18:17:29 UTC (rev 91685)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap.xml 2009-07-27 18:21:14 UTC (rev 91686)
@@ -4,7 +4,6 @@
<url>bootstrap/vfs.xml</url>
<url>bootstrap/classloader.xml</url>
- <url>bootstrap/aop.xml</url>
<url>bootstrap/deployers.xml</url>
<url>bootstrap/naming.xml</url>
<url>bootstrap/transaction.xml</url>
More information about the jboss-cvs-commits
mailing list