[jboss-cvs] JBossAS SVN: r71374 - trunk/tomcat/src/resources.

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

Author: adrian at jboss.org
Date: 2008-03-28 09:33:21 -0400 (Fri, 28 Mar 2008)
New Revision: 71374

Modified:
   trunk/tomcat/src/resources/jboss-web-service.xml
   trunk/tomcat/src/resources/war-deployers-all-beans.xml
   trunk/tomcat/src/resources/war-deployers-beans.xml
Log:
[JBAS-5144] - Move the transaction manager dependency to jboss.web service from the deployer

Modified: trunk/tomcat/src/resources/jboss-web-service.xml
===================================================================
--- trunk/tomcat/src/resources/jboss-web-service.xml	2008-03-28 13:08:54 UTC (rev 71373)
+++ trunk/tomcat/src/resources/jboss-web-service.xml	2008-03-28 13:33:21 UTC (rev 71374)
@@ -23,6 +23,9 @@
          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.
@@ -30,4 +33,4 @@
     -->
       
    </mbean>
-</server>
\ No newline at end of file
+</server>

Modified: trunk/tomcat/src/resources/war-deployers-all-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-all-beans.xml	2008-03-28 13:08:54 UTC (rev 71373)
+++ trunk/tomcat/src/resources/war-deployers-all-beans.xml	2008-03-28 13:33:21 UTC (rev 71374)
@@ -198,8 +198,6 @@
        <!-- Specify a SecurityContext FQN class name -->
        <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property> 
       
-      <depends>jboss:service=TransactionManager</depends>
-      
    </bean>
    
    <bean name="MergedJBossWebMetaDataDeployer" 

Modified: trunk/tomcat/src/resources/war-deployers-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-beans.xml	2008-03-28 13:08:54 UTC (rev 71373)
+++ trunk/tomcat/src/resources/war-deployers-beans.xml	2008-03-28 13:33:21 UTC (rev 71374)
@@ -199,8 +199,6 @@
 
        <!-- Specify a SecurityContext FQN class name -->
        <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property> 
-      
-      <depends>jboss:service=TransactionManager</depends>
    </bean>
    
    <bean name="MergedJBossWebMetaDataDeployer"