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

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

Author: adrian at jboss.org
Date: 2007-07-02 07:34:12 -0400 (Mon, 02 Jul 2007)
New Revision: 63765

Added:
   trunk/connector/src/resources/deployers/jca-hack-for-tomcat-service.xml
Modified:
   trunk/build/build-distr.xml
   trunk/connector/src/resources/jca-sar/jbossjca-service.xml
   trunk/tomcat/src/resources/server.xml
   trunk/tomcat/src/resources/war-deployers-beans.xml
Log:
[JBAS-4511] - Temporary hack to make this working, needs fixing properly in
the WAR/Tomcat deployers

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2007-07-02 08:42:54 UTC (rev 63764)
+++ trunk/build/build-distr.xml	2007-07-02 11:34:12 UTC (rev 63765)
@@ -513,6 +513,13 @@
       </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"/>
+      </fileset>
+    </copy>
+    
     <!--
     <copy todir="${install.server}/all/deployers" filtering="no">
       <fileset dir="${_module.output}/resources/deployers">

Added: trunk/connector/src/resources/deployers/jca-hack-for-tomcat-service.xml
===================================================================
--- trunk/connector/src/resources/deployers/jca-hack-for-tomcat-service.xml	                        (rev 0)
+++ trunk/connector/src/resources/deployers/jca-hack-for-tomcat-service.xml	2007-07-02 11:34:12 UTC (rev 63765)
@@ -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>

Modified: trunk/connector/src/resources/jca-sar/jbossjca-service.xml
===================================================================
--- trunk/connector/src/resources/jca-sar/jbossjca-service.xml	2007-07-02 08:42:54 UTC (rev 63764)
+++ trunk/connector/src/resources/jca-sar/jbossjca-service.xml	2007-07-02 11:34:12 UTC (rev 63765)
@@ -61,18 +61,19 @@
    </mbean>
    -->
 
-
   <!-- 
      | 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>
 
-    <!-- Enable connection close debug monitoring -->
     <attribute name="Debug">true</attribute>
 
   </mbean>
+   -->
 
 </server>

Modified: trunk/tomcat/src/resources/server.xml
===================================================================
--- trunk/tomcat/src/resources/server.xml	2007-07-02 08:42:54 UTC (rev 63764)
+++ trunk/tomcat/src/resources/server.xml	2007-07-02 11:34:12 UTC (rev 63765)
@@ -143,11 +143,11 @@
                  
                  Important: The dependency on the CachedConnectionManager
                  in META-INF/jboss-service.xml must be uncommented, too
-            TODO:
+           -->
+
             <Valve className="org.jboss.web.tomcat.service.jca.CachedConnectionValve"
                 cachedConnectionManagerObjectName="jboss.jca:service=CachedConnectionManager"
                 transactionManagerObjectName="jboss:service=TransactionManager" />
-           -->
                 
          </Host>
 

Modified: trunk/tomcat/src/resources/war-deployers-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-beans.xml	2007-07-02 08:42:54 UTC (rev 63764)
+++ trunk/tomcat/src/resources/war-deployers-beans.xml	2007-07-02 11:34:12 UTC (rev 63765)
@@ -204,12 +204,7 @@
       
       <depends>jboss:service=TransactionManager</depends>
       <depends>SecurityDeployer</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>
 
 </deployment>