[jboss-cvs] JBossAS SVN: r59372 - branches/Branch_4_2/server/src/etc/conf/default

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

Author: dimitris at jboss.org
Date: 2007-01-05 06:22:04 -0500 (Fri, 05 Jan 2007)
New Revision: 59372

Modified:
   branches/Branch_4_2/server/src/etc/conf/default/jboss-service.xml
Log:
JBAS-3892, Replace TxManager with JBoss Transactions 4.2.3.CR2

Modified: branches/Branch_4_2/server/src/etc/conf/default/jboss-service.xml
===================================================================
--- branches/Branch_4_2/server/src/etc/conf/default/jboss-service.xml	2007-01-05 11:04:34 UTC (rev 59371)
+++ branches/Branch_4_2/server/src/etc/conf/default/jboss-service.xml	2007-01-05 11:22:04 UTC (rev 59372)
@@ -305,6 +305,7 @@
    <!-- ==================================================================== -->
    <!-- Transactions                                                         -->
    <!-- ==================================================================== -->
+
    <!-- The configurable Xid factory.  For use with Oracle, set pad to true -->
    <mbean code="org.jboss.tm.XidFactory"
       name="jboss:service=XidFactory">
@@ -313,23 +314,32 @@
 
    <!--
       | The fast in-memory transaction manager.
-    -->
+      | Deprecated in JBossAS v4.2. Use JBossTS JTA instead.
+    - ->
    <mbean code="org.jboss.tm.TransactionManagerService"
       name="jboss:service=TransactionManager"
       xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
       <attribute name="TransactionTimeout">300</attribute>
-      <!-- set to false to disable transaction demarcation over IIOP -->
+      <!- - set to false to disable transaction demarcation over IIOP - ->
       <attribute name="GlobalIdsEnabled">true</attribute>
       <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
 
-      <!-- Transaction Integrity Checking -->
-      <!-- Force a rollback if another thread is associated with the transaction at commit -->
-      <!--depends optional-attribute-name="TransactionIntegrityFactory" 
+      <!- - Transaction Integrity Checking - ->
+      <!- - Force a rollback if another thread is associated with the transaction at commit - ->
+      <!- - <depends optional-attribute-name="TransactionIntegrityFactory" 
                proxy-type="org.jboss.tm.integrity.TransactionIntegrityFactory">
          <mbean code="org.jboss.tm.integrity.FailIncompleteTransaction"
                 name="jboss:service=TransactionManager,plugin=TransactionIntegrity"/>
-      </depends-->
+      </depends> - ->
    </mbean>
+   -->
+   
+   <!-- JBoss Transactions JTA -->
+   <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
+      name="jboss:service=TransactionManager">
+      <attribute name="TransactionTimeout">300</attribute>
+   </mbean>
+   
    <!--
       | UserTransaction support.
     -->