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

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

Author: dimitris at jboss.org
Date: 2006-12-17 06:38:45 -0500 (Sun, 17 Dec 2006)
New Revision: 59067

Modified:
   branches/Branch_4_2/server/src/etc/conf/default/jboss-service.xml
Log:
JBAS-3892, revert to JBossTM until we decide whether JBossTS will be used and which version of it

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	2006-12-16 13:03:07 UTC (rev 59066)
+++ branches/Branch_4_2/server/src/etc/conf/default/jboss-service.xml	2006-12-17 11:38:45 UTC (rev 59067)
@@ -305,7 +305,6 @@
    <!-- ==================================================================== -->
    <!-- Transactions                                                         -->
    <!-- ==================================================================== -->
-
    <!-- The configurable Xid factory.  For use with Oracle, set pad to true -->
    <mbean code="org.jboss.tm.XidFactory"
       name="jboss:service=XidFactory">
@@ -314,32 +313,23 @@
 
    <!--
       | 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.
     -->