[jboss-cvs] JBossAS SVN: r78646 - in trunk/tomcat: src/resources and 1 other directory.

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

Author: pferraro
Date: 2008-09-17 11:47:31 -0400 (Wed, 17 Sep 2008)
New Revision: 78646

Added:
   trunk/tomcat/src/resources/jboss-beans.xml
Removed:
   trunk/tomcat/src/resources/jboss-web-service.xml
Modified:
   trunk/tomcat/build.xml
Log:
[JBAS-5966] Replace TomcatService mbean deployment descriptor with MC bean descriptor.

Modified: trunk/tomcat/build.xml
===================================================================
--- trunk/tomcat/build.xml	2008-09-17 15:41:25 UTC (rev 78645)
+++ trunk/tomcat/build.xml	2008-09-17 15:47:31 UTC (rev 78646)
@@ -260,8 +260,8 @@
 
     <!-- SAR for the webserver runtime -->
   	<mkdir dir="${build.deploy}/jbossweb.sar/META-INF"/>
-    <copy tofile="${build.deploy}/jbossweb.sar/META-INF/jboss-service.xml"
-          file="${build.resources}/jboss-web-service.xml"/>
+    <copy tofile="${build.deploy}/jbossweb.sar/META-INF/jboss-beans.xml"
+          file="${build.resources}/jboss-beans.xml"/>
     <copy tofile="${build.deploy}/jbossweb.sar/META-INF/jboss-structure.xml"
           file="${build.resources}/jboss-structure-sar.xml"/>
         

Added: trunk/tomcat/src/resources/jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/jboss-beans.xml	                        (rev 0)
+++ trunk/tomcat/src/resources/jboss-beans.xml	2008-09-17 15:47:31 UTC (rev 78646)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <bean name="WebServer"
+         class="org.jboss.web.tomcat.service.deployers.TomcatService">
+         
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=WebServer", exposedInterface=org.jboss.web.tomcat.service.deployers.TomcatServiceMBean.class,registerDirectly=true)</annotation>
+
+      <!-- Only needed if the org.jboss.web.tomcat.service.jca.CachedConnectionValve
+           is enabled in the tomcat server.xml file.
+      -->
+      <depends>jboss.jca:service=CachedConnectionManager</depends>
+
+      <!-- Transaction manager for unfinished transaction checking in the CachedConnectionValve -->      
+      <depends>jboss:service=TransactionManager</depends>
+
+      <!-- Inject the TomcatDeployer -->
+      <property name="tomcatDeployer"><inject bean="WarDeployer"/></property> 
+    
+      <!-- 
+         Do not configure other JMX attributes via this file.
+         Use the WarDeployer bean in deployers/jboss-web.deployer/war-deployers-beans.xml
+      -->
+
+   </bean>
+
+</deployment>

Deleted: trunk/tomcat/src/resources/jboss-web-service.xml
===================================================================
--- trunk/tomcat/src/resources/jboss-web-service.xml	2008-09-17 15:41:25 UTC (rev 78645)
+++ trunk/tomcat/src/resources/jboss-web-service.xml	2008-09-17 15:47:31 UTC (rev 78646)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: jboss-service-all.xml 60489 2007-02-12 08:22:28Z scott.stark at jboss.org $ -->
-
-<server> 
-   <!-- 
-       JBoss Web Service
-       
-       This is a wrapper around the WarDeployer bean deployed in
-       deployers/jboss-web.deployer/war-deployers-beans.xml.  This wrapper
-       controls the lifecycle of the JBoss Web runtime exposed by the
-       WarDeployer bean.
-   -->   
-   <mbean code="org.jboss.web.tomcat.service.deployers.TomcatService"
-      name="jboss.web:service=WebServer">
-      
-    <!-- Inject the TomcatDeployer -->
-    <attribute name="TomcatDeployer">
-       <inject bean="WarDeployer"/>
-    </attribute> 
-
-    <!-- Only needed if the org.jboss.web.tomcat.service.jca.CachedConnectionValve
-         is enabled in the tomcat server.xml file.
-         TODO: injection      
-    -->
-    <depends>jboss.jca:service=CachedConnectionManager</depends>
-
-    <!-- Transaction manager for unfinished transaction checking in the CachedConnectionValve -->      
-    <depends>jboss:service=TransactionManager</depends>
-    
-    <!-- 
-       Do not configure other JMX attributes via this file.
-       Use the WarDeployer bean in deployers/jboss-web.deployer/war-deployers-beans.xml
-    -->
-      
-   </mbean>
-</server>