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

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

Author: kabir.khan at jboss.com
Date: 2007-02-02 12:07:38 -0500 (Fri, 02 Feb 2007)
New Revision: 60202

Modified:
   trunk/server/src/etc/conf/default/bootstrap-beans.xml
Log:
Remove dependency from AspectManager on the JMXKernel.mbeanServer

Modified: trunk/server/src/etc/conf/default/bootstrap-beans.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-beans.xml	2007-02-02 17:06:58 UTC (rev 60201)
+++ trunk/server/src/etc/conf/default/bootstrap-beans.xml	2007-02-02 17:07:38 UTC (rev 60202)
@@ -45,7 +45,6 @@
 	      </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
@@ -55,7 +54,7 @@
            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, org.jboss.cache.jmx, org.jboss.cache.pojo.jmx, org.jboss.ha, org.jboss.invocation</property>
+      <property name="include">org.jboss.test, org.jboss.injbossaop, org.jboss.cache.jmx, org.jboss.cache.pojo.jmx, org.jboss.ha, org.jboss.invocation, org.jboss.deployers</property>
       <property name="exclude">org.jboss.</property>
       <!-- This avoids instrumentation of hibernate cglib enhanced proxies
       <property name="ignore">*$$EnhancerByCGLIB$$*</property> -->
@@ -146,25 +145,25 @@
                <depends>AspectManager</depends>
             </bean>
             <!-- POJO Deployment -->
-            <bean name="BeanDeployer" class="org.jboss.deployers.plugins.deployers.kernel.BeanDeployer">
-               <property name="type">beans</property>               
+            <bean name="BeanDeployer" class="org.jboss.deployers.plugins.deployers.kernel.BeanDeployer">
+               <property name="type">beans</property>               
             </bean>
-            <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.plugins.deployers.kernel.KernelDeploymentDeployer">
-               <property name="type">beans</property>                              
+            <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.plugins.deployers.kernel.KernelDeploymentDeployer">
+               <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>               
             </bean>
             <!-- JMX Deployment -->
-            <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer">
-               <property name="type">sar</property>                              
+            <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer">
+               <property name="type">sar</property>                              
             </bean>
             <bean name="ServiceClassLoaderDeployer" class="org.jboss.system.deployers.ServiceClassLoaderDeployer">
                <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor>
             </bean>
-            <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer">
-               <property name="type">sar</property>
+            <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer">
+               <property name="type">sar</property>
             </bean>
             <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer">
                <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor>