[jboss-cvs] JBossAS SVN: r60226 - trunk/server/src/etc/conf/default.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Feb 2 18:22:28 EST 2007


Author: kabir.khan at jboss.com
Date: 2007-02-02 18:22:28 -0500 (Fri, 02 Feb 2007)
New Revision: 60226

Modified:
   trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml
Log:
Fix the AspectManager bean config

Modified: trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml	2007-02-02 23:21:33 UTC (rev 60225)
+++ trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml	2007-02-02 23:22:28 UTC (rev 60226)
@@ -6,7 +6,7 @@
     $Id:$
 -->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
-    
+
     <!--
         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
@@ -18,7 +18,7 @@
 	         <aop>
 					<aspect name="deployers" class="org.jboss.profileservice.aop.DeployerAspects"/>
 					<bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployer.Deployer}->*(..))">
-				      <advice name="invoke" aspect="deployers"/>							         
+				      <advice name="invoke" aspect="deployers"/>
 				   </bind>
 			      <aspect name="mainDeployer" class="org.jboss.profileservice.aop.MainDeployerAspect"/>
 					<bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployment.MainDeployer}->process(..))">
@@ -34,7 +34,6 @@
 				</aop>]]>
             </parameter>
         </constructor>
-        <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
         <property name="enableLoadtimeWeaving">false</property>
         <!-- only relevant when EnableLoadtimeWeaving is true.
             When transformer is on, every loaded class gets
@@ -57,7 +56,7 @@
             <property name="instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</property>
         -->
     </bean>
-    
+
     <!-- The file repository profile service which provides full
         support ProfileService spi.
     -->
@@ -66,7 +65,6 @@
             <parameter>${jboss.server.name}</parameter>
         </constructor>
         <property name="profileRepository"><inject bean="FileProfileRepository"/></property>
-        <depends>AspectManager</depends>
     </bean>
     <bean name="FileProfileRepository" class="org.jboss.system.server.profileservice.repository.FileProfileRepository">
         <property name="storeRoot">${jboss.server.base.dir}</property>
@@ -79,13 +77,19 @@
     <bean name="JavaSerializationAttachmentsSerializer" class="org.jboss.system.server.profileservice.repository.JavaSerializationAttachmentsSerializer">
         <property name="attachmentsStoreDir">${jboss.server.home.dir}/attachments</property>
     </bean>
-    
+
     <!-- The legacy JMX kernel -->
     <bean name="JMXKernel" class="org.jboss.system.server.jmx.JMXKernel">
         <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
         <property name="serverImpl"><inject bean="JBossServer"/></property>
     </bean>
-    
+
+   <!-- 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>
+
     <!--
         <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
         name="DeployerAspects"
@@ -97,19 +101,19 @@
         </aop:lifecycle-configure>
         <beanfactory name="DeployersAdvice" class="org.jboss.profileservice.aop.DeployerAspects">
         </beanfactory>
-        
+
         <bean name="DeployersAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
         <property name="advice"><inject bean="DeployersAdvice"/></property>
         <property name="manager"><inject bean="AspectManager" property="aspectManager"/></property>
         </bean>
-        
+
         <bean name="DeployersBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
         <property name="pointcut">execution(* $instanceof{org.jboss.deployers.spi.deployer.Deployer}->*(..))</property>
         <property name="aspect"><inject bean="DeployersAspect" property="definition"/></property>
         <property name="manager"><inject bean="AspectManager" property="aspectManager" /></property>
         </bean>
     -->
-    
+
     <!-- The MainDeployer -->
     <bean name="MainDeployer" class="org.jboss.deployers.plugins.deployment.MainDeployerImpl">
         <property name="structureDeployers">
@@ -117,7 +121,7 @@
                 <!-- A declared structure descriptor deployer -->
                 <bean name="DeclaredStructure" class="org.jboss.deployers.plugins.structure.vfs.explicit.DeclaredStructure">
                 </bean>
-                
+
                 <!-- WAR Structure -->
                 <bean name="WARStructure" class="org.jboss.deployers.plugins.structure.vfs.war.WARStructure">
                     <property name="webInfLibFilter">
@@ -184,22 +188,21 @@
                 <!-- AOP deployment -->
                 <bean name="AspectDeployer" class="org.jboss.aop.deployers.AspectDeployer">
                     <property name="type">aop</property>
-                    <depends>AspectManager</depends>
                 </bean>
                 <!-- POJO Deployment -->
                 <bean name="BeanDeployer" class="org.jboss.deployers.plugins.deployers.kernel.BeanDeployer">
-                    <property name="type">beans</property>               
+                    <property name="type">beans</property>
                 </bean>
                 <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.plugins.deployers.kernel.KernelDeploymentDeployer">
-                    <property name="type">beans</property>                              
+                    <property name="type">beans</property>
                 </bean>
                 <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.plugins.deployers.kernel.BeanMetaDataDeployer">
                     <constructor><parameter><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
-                    <property name="type">beans</property>               
+                    <property name="type">beans</property>
                 </bean>
                 <!-- JMX Deployment -->
                 <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer">
-                    <property name="type">sar</property>                              
+                    <property name="type">sar</property>
                 </bean>
                 <bean name="ServiceClassLoaderDeployer" class="org.jboss.system.deployers.ServiceClassLoaderDeployer">
                     <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor>
@@ -214,5 +217,5 @@
             </list>
         </property>
     </bean>
-    
+
 </deployment>




More information about the jboss-cvs-commits mailing list