[jboss-cvs] JBossAS SVN: r71363 - in trunk: connector/src/resources/deployers and 1 other directories.

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

Author: bstansberry at jboss.com
Date: 2008-03-27 18:46:10 -0400 (Thu, 27 Mar 2008)
New Revision: 71363

Removed:
   trunk/connector/src/resources/deployers/cached-connmgr-service.xml
Modified:
   trunk/build/build-distr.xml
   trunk/connector/src/resources/jca-sar/jbossjca-service.xml
Log:
[JBAS-5346] Move the CachedConnectionManager back into deploy

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-03-27 22:38:50 UTC (rev 71362)
+++ trunk/build/build-distr.xml	2008-03-27 22:46:10 UTC (rev 71363)
@@ -560,12 +560,6 @@
       </fileset>
     </copy>
 
-    <copy todir="${install.server}/all/deployers" filtering="no">
-      <fileset dir="${_module.output}/resources/deployers">
-        <include name="cached-connmgr-service.xml"/>
-      </fileset>
-    </copy>
-
     <!--
     <copy todir="${install.server}/all/deployers" filtering="no">
       <fileset dir="${_module.output}/resources/deployers">

Deleted: trunk/connector/src/resources/deployers/cached-connmgr-service.xml
===================================================================
--- trunk/connector/src/resources/deployers/cached-connmgr-service.xml	2008-03-27 22:38:50 UTC (rev 71362)
+++ trunk/connector/src/resources/deployers/cached-connmgr-service.xml	2008-03-27 22:46:10 UTC (rev 71363)
@@ -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/connector/src/resources/jca-sar/jbossjca-service.xml
===================================================================
--- trunk/connector/src/resources/jca-sar/jbossjca-service.xml	2008-03-27 22:38:50 UTC (rev 71362)
+++ trunk/connector/src/resources/jca-sar/jbossjca-service.xml	2008-03-27 22:46:10 UTC (rev 71363)
@@ -64,9 +64,8 @@
   <!-- 
      | 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>
@@ -74,6 +73,6 @@
     <attribute name="Debug">true</attribute>
 
   </mbean>
-   -->
+   
 
 </server>