[jboss-cvs] JBossAS SVN: r84312 - trunk/server/src/etc/conf/web.

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

Author: emuckenhuber
Date: 2009-02-17 10:28:56 -0500 (Tue, 17 Feb 2009)
New Revision: 84312

Modified:
   trunk/server/src/etc/conf/web/jboss-service.xml
Log:
merge with rev. 79824, remove jsr77 mbeans

Modified: trunk/server/src/etc/conf/web/jboss-service.xml
===================================================================
--- trunk/server/src/etc/conf/web/jboss-service.xml	2009-02-17 14:47:54 UTC (rev 84311)
+++ trunk/server/src/etc/conf/web/jboss-service.xml	2009-02-17 15:28:56 UTC (rev 84312)
@@ -27,36 +27,6 @@
    </mbean>
 
    <!-- ==================================================================== -->
-   <!-- SAR Deployer                                                         -->
-   <!-- ==================================================================== -->
-   <mbean code="org.jboss.deployment.SARDeployer"
-          name="jboss.system:service=ServiceDeployer">
-      <depends>jboss.system:service=MainDeployer</depends>
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- JSR-77 Single JBoss Server Management Domain                         -->
-   <!-- ==================================================================== -->
-   <mbean code="org.jboss.management.j2ee.LocalJBossServerDomain"
-      name="jboss.management.local:j2eeType=J2EEDomain,name=Manager">
-      <attribute name="MainDeployer">jboss.system:service=MainDeployer</attribute>
-      <attribute name="SARDeployer">jboss.system:service=ServiceDeployer</attribute>
-      <attribute name="EARDeployer">jboss.j2ee:service=EARDeployer</attribute>
-      <attribute name="EJBDeployer">jboss.ejb:service=EJBDeployer</attribute>
-      <attribute name="RARDeployer">jboss.jca:service=RARDeployer</attribute>
-      <attribute name="CMDeployer">jboss.jca:service=ConnectionFactoryDeployer</attribute>
-      <attribute name="WARDeployer">jboss.web:service=WebServer</attribute>
-      <attribute name="CARDeployer">jboss.j2ee:service=ClientDeployer</attribute>
-      <attribute name="MailService">jboss:service=Mail</attribute>
-      <attribute name="JMSService">jboss.mq:service=DestinationManager</attribute>
-      <attribute name="JNDIService">jboss:service=Naming</attribute>
-      <attribute name="JTAService">jboss:service=TransactionManager</attribute>
-      <attribute name="UserTransactionService">jboss:service=DistributedTransactionManager</attribute>
-      <attribute name="RMI_IIOPService">jboss:service=CorbaORB</attribute>
-      <depends>jboss.system:service=MainDeployer</depends>
-   </mbean>
-
-   <!-- ==================================================================== -->
    <!-- XMBean Persistence                                                   -->
    <!-- ==================================================================== -->
    <mbean code="org.jboss.system.pm.AttributePersistenceService"