[jboss-cvs] JBossAS SVN: r71360 - in trunk: connector/src/resources/deployers and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 27 18:15:29 EDT 2008
Author: bstansberry at jboss.com
Date: 2008-03-27 18:15:29 -0400 (Thu, 27 Mar 2008)
New Revision: 71360
Added:
trunk/connector/src/resources/deployers/cached-connmgr-service.xml
Removed:
trunk/connector/src/resources/deployers/jca-hack-for-tomcat-service.xml
Modified:
trunk/build/build-distr.xml
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-5346] Move the CachedConnectionManager back into deploy
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-03-27 21:10:51 UTC (rev 71359)
+++ trunk/build/build-distr.xml 2008-03-27 22:15:29 UTC (rev 71360)
@@ -560,10 +560,9 @@
</fileset>
</copy>
- <!-- FIXME when Tomcat is fixed -->
<copy todir="${install.server}/all/deployers" filtering="no">
<fileset dir="${_module.output}/resources/deployers">
- <include name="jca-hack-for-tomcat-service.xml"/>
+ <include name="cached-connmgr-service.xml"/>
</fileset>
</copy>
Added: trunk/connector/src/resources/deployers/cached-connmgr-service.xml
===================================================================
--- trunk/connector/src/resources/deployers/cached-connmgr-service.xml (rev 0)
+++ trunk/connector/src/resources/deployers/cached-connmgr-service.xml 2008-03-27 22:15:29 UTC (rev 71360)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- JBoss JCA Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: jbossjca-service.xml 57108 2006-09-23 20:55:54Z scott.stark at jboss.org $ -->
+
+<server>
+
+ <!--
+ | The CachedConnectionManager is used partly to relay started UserTransactions to
+ | open connections so they may be enrolled in the new tx.
+
+ FIXME THIS IS CURRENTLY IN THE DEPLOYERS BECAUSE OF TOMCAT
+ -->
+
+ <mbean code="org.jboss.resource.connectionmanager.CachedConnectionManager"
+ name="jboss.jca:service=CachedConnectionManager">
+ <depends optional-attribute-name="TransactionManagerServiceName">jboss:service=TransactionManager</depends>
+
+ <attribute name="Debug">true</attribute>
+
+ </mbean>
+
+</server>
Deleted: trunk/connector/src/resources/deployers/jca-hack-for-tomcat-service.xml
===================================================================
--- trunk/connector/src/resources/deployers/jca-hack-for-tomcat-service.xml 2008-03-27 21:10:51 UTC (rev 71359)
+++ trunk/connector/src/resources/deployers/jca-hack-for-tomcat-service.xml 2008-03-27 22:15:29 UTC (rev 71360)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss JCA Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: jbossjca-service.xml 57108 2006-09-23 20:55:54Z scott.stark at jboss.org $ -->
-
-<server>
-
- <!--
- | The CachedConnectionManager is used partly to relay started UserTransactions to
- | open connections so they may be enrolled in the new tx.
-
- FIXME THIS IS CURRENTLY IN THE DEPLOYERS BECAUSE OF TOMCAT
- -->
-
- <mbean code="org.jboss.resource.connectionmanager.CachedConnectionManager"
- name="jboss.jca:service=CachedConnectionManager">
- <depends optional-attribute-name="TransactionManagerServiceName">jboss:service=TransactionManager</depends>
-
- <attribute name="Debug">true</attribute>
-
- </mbean>
-
-</server>
Modified: trunk/tomcat/src/resources/jboss-web-service.xml
===================================================================
--- trunk/tomcat/src/resources/jboss-web-service.xml 2008-03-27 21:10:51 UTC (rev 71359)
+++ trunk/tomcat/src/resources/jboss-web-service.xml 2008-03-27 22:15:29 UTC (rev 71360)
@@ -17,6 +17,12 @@
<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>
<!--
Do not configure other JMX attributes via this file.
Modified: trunk/tomcat/src/resources/war-deployers-all-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-all-beans.xml 2008-03-27 21:10:51 UTC (rev 71359)
+++ trunk/tomcat/src/resources/war-deployers-all-beans.xml 2008-03-27 22:15:29 UTC (rev 71360)
@@ -198,13 +198,8 @@
<!-- Specify a SecurityContext FQN class name -->
<property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property>
- <depends>jboss:service=TransactionManager</depends>
+ <depends>jboss:service=TransactionManager</depends>
- <!-- Only needed if the org.jboss.web.tomcat.service.jca.CachedConnectionValve
-TODO: injection
- is enabled in the tomcat server.xml file.
- -->
- <depends>jboss.jca:service=CachedConnectionManager</depends>
</bean>
<bean name="MergedJBossWebMetaDataDeployer"
Modified: trunk/tomcat/src/resources/war-deployers-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-beans.xml 2008-03-27 21:10:51 UTC (rev 71359)
+++ trunk/tomcat/src/resources/war-deployers-beans.xml 2008-03-27 22:15:29 UTC (rev 71360)
@@ -201,7 +201,6 @@
<property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property>
<depends>jboss:service=TransactionManager</depends>
- <depends>jboss.jca:service=CachedConnectionManager</depends>
</bean>
<bean name="MergedJBossWebMetaDataDeployer"
More information about the jboss-cvs-commits
mailing list