[jboss-cvs] JBossAS SVN: r72290 - in trunk: server/src/etc/conf/default and 1 other directory.

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

Author: adrian at jboss.org
Date: 2008-04-16 11:34:20 -0400 (Wed, 16 Apr 2008)
New Revision: 72290

Modified:
   trunk/aspects/src/etc/META-INF/jboss-aspect-library-beans.xml
   trunk/server/src/etc/conf/default/bootstrap-beans.xml
   trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml
Log:
Move the aop jmx advice to bootstrap-beans to avoid the race condition when it is in deployers

Modified: trunk/aspects/src/etc/META-INF/jboss-aspect-library-beans.xml
===================================================================
--- trunk/aspects/src/etc/META-INF/jboss-aspect-library-beans.xml	2008-04-16 15:22:13 UTC (rev 72289)
+++ trunk/aspects/src/etc/META-INF/jboss-aspect-library-beans.xml	2008-04-16 15:34:20 UTC (rev 72290)
@@ -10,14 +10,4 @@
       <property name="aspectManager"><inject bean="AspectManager"/></property>
    </bean>
 
-   <!-- Add the JMX -->
-   <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
-               name="JMXAdvice"
-               class="org.jboss.system.microcontainer.jmx.ServiceControllerLifecycleCallback"
-               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
-               manager-bean="AspectManager"
-               manager-property="aspectManager">
-      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
-   </lifecycle-configure>
-
 </deployment>

Modified: trunk/server/src/etc/conf/default/bootstrap-beans.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-beans.xml	2008-04-16 15:22:13 UTC (rev 72289)
+++ trunk/server/src/etc/conf/default/bootstrap-beans.xml	2008-04-16 15:34:20 UTC (rev 72290)
@@ -126,6 +126,16 @@
       -->
    </bean>
 
+   <!-- Add the JMX -->
+   <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
+               name="JMXAdvice"
+               class="org.jboss.system.microcontainer.jmx.ServiceControllerLifecycleCallback"
+               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+               manager-bean="AspectManager"
+               manager-property="aspectManager">
+      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
+   </lifecycle-configure>
+
    <!-- The MainDeployer -->
    <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
       <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>

Modified: trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml	2008-04-16 15:22:13 UTC (rev 72289)
+++ trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml	2008-04-16 15:34:20 UTC (rev 72290)
@@ -138,6 +138,16 @@
       <property name="oldClassLoader">false</property>
    </bean>
 
+   <!-- Add the JMX -->
+   <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
+               name="JMXAdvice"
+               class="org.jboss.system.microcontainer.jmx.ServiceControllerLifecycleCallback"
+               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+               manager-bean="AspectManager"
+               manager-property="aspectManager">
+      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
+   </lifecycle-configure>
+
    <!-- The MainDeployer -->
    <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
       <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>