[jboss-cvs] JBossAS SVN: r82232 - in projects/demos/microcontainer/branches/DZone_1_0: jmx/src/main/resources/META-INF and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 11 12:22:57 EST 2008
Author: alesj
Date: 2008-12-11 12:22:57 -0500 (Thu, 11 Dec 2008)
New Revision: 82232
Modified:
projects/demos/microcontainer/branches/DZone_1_0/jmx/src/main/resources/META-INF/aop-beans.xml
projects/demos/microcontainer/branches/DZone_1_0/pom.xml
Log:
Update lib.
Fix aop.
Modified: projects/demos/microcontainer/branches/DZone_1_0/jmx/src/main/resources/META-INF/aop-beans.xml
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/jmx/src/main/resources/META-INF/aop-beans.xml 2008-12-11 17:03:37 UTC (rev 82231)
+++ projects/demos/microcontainer/branches/DZone_1_0/jmx/src/main/resources/META-INF/aop-beans.xml 2008-12-11 17:22:57 UTC (rev 82232)
@@ -6,25 +6,19 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- Integration -->
- <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/>
- <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration">
- <property name="scopingPolicy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
- </bean>
+ <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration"/>
- <!-- For use once the aop-mc-int metadata stuff goes live
<bean name="DefaultAspectManager" class="org.jboss.aop.microcontainer.beans.metadata.DefaultAspectManager">
- <property name="managerBean">AspectManager</property>
+ <property name="managerBean">AspectManagerJDK5</property>
<property name="managerProperty">aspectManager</property>
</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">
+ <bean name="AspectManagerJDK5" class="org.jboss.aop.deployers.AspectManagerJDK5">
<constructor>
<parameter><![CDATA[
<aop>
@@ -65,36 +59,29 @@
-->
</bean>
+ <!-- Simplify name usage -->
+ <bean name="AspectManager">
+ <constructor factoryMethod="getAspectManager"><factory bean="AspectManagerJDK5"/></constructor>
+ </bean>
+
<!-- Support for @JMX -->
<lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
name="JMXRegistrationAdvice"
class="org.jboss.system.microcontainer.jmx.ServiceControllerRegistrationLifecycleCallback"
- classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
- manager-bean="AspectManager"
- manager-property="aspectManager">
+ classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX">
<property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
</lifecycle-configure>
<lifecycle-create xmlns="urn:jboss:aop-beans:1.0"
name="JMXCreateDestroyAdvice"
class="org.jboss.system.microcontainer.jmx.ServiceControllerCreateDestroyLifecycleCallback"
- classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
- manager-bean="AspectManager"
- manager-property="aspectManager">
+ classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX">
<property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
</lifecycle-create>
<lifecycle-install xmlns="urn:jboss:aop-beans:1.0"
name="JMXStartStopAdvice"
class="org.jboss.system.microcontainer.jmx.ServiceControllerStartStopLifecycleCallback"
- classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
- manager-bean="AspectManager"
- manager-property="aspectManager">
+ classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX">
<property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
</lifecycle-install>
- <!-- MBean for making sure that the underlying AspectManagerService gets registered in JMX -->
- <bean name="AspectManagerJMXRegistrar" class="org.jboss.aop.deployers.AspectManagerJMXRegistrar">
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <property name="aspectManager"><inject bean="AspectManager"/></property>
- </bean>
-
</deployment>
Modified: projects/demos/microcontainer/branches/DZone_1_0/pom.xml
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/pom.xml 2008-12-11 17:03:37 UTC (rev 82231)
+++ projects/demos/microcontainer/branches/DZone_1_0/pom.xml 2008-12-11 17:22:57 UTC (rev 82232)
@@ -38,7 +38,7 @@
<version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer>
<version.jboss.deployers>2.0.3.GA</version.jboss.deployers>
<version.jboss.classloader>2.0.1.GA</version.jboss.classloader>
- <version.jboss.common.core>2.2.9.GA</version.jboss.common.core>
+ <version.jboss.common.core>2.2.10.GA</version.jboss.common.core>
<version.jboss.common.logging.spi>2.0.5.GA</version.jboss.common.logging.spi>
<version.jboss.common.logging.log4j>2.0.5.GA</version.jboss.common.logging.log4j>
<version.jbossxb>2.0.0.GA</version.jbossxb>
More information about the jboss-cvs-commits
mailing list