[jboss-svn-commits] JBL Code SVN: r27800 - in labs/jbosstm/trunk: ArjunaJTA/docs/user_guide and 4 other directories.

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

Author: mark.little at jboss.com
Date: 2009-07-09 15:36:36 -0400 (Thu, 09 Jul 2009)
New Revision: 27800

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java
   labs/jbosstm/trunk/ArjunaJTA/docs/user_guide/ProgrammersGuide.odt
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/transaction/Transaction.java
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XAModifier.java
   labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java
Log:
https://jira.jboss.org/jira/browse/JBTM-156

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java	2009-07-09 19:30:38 UTC (rev 27799)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java	2009-07-09 19:36:36 UTC (rev 27800)
@@ -346,7 +346,7 @@
 	static int numberOfTransactions = 100;
 
     /**
-     * flag which is tue if TxControl is enabled and false if it is disabled
+     * flag which is true if transaction service is enabled and false if it is disabled
      */
 	static boolean enable = true;
 

Modified: labs/jbosstm/trunk/ArjunaJTA/docs/user_guide/ProgrammersGuide.odt
===================================================================
(Binary files differ)

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java	2009-07-09 19:30:38 UTC (rev 27799)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java	2009-07-09 19:36:36 UTC (rev 27800)
@@ -1203,6 +1203,16 @@
 		return _theTransaction.get_uid();
 	}
 
+	public final Xid getTxId ()
+	{
+	    Xid res = baseXid();
+	    
+	    if (res == null)
+	        res = new XidImple(_theTransaction, false);
+	    
+	    return res;
+	}
+	
 	public String toString()
 	{
 		if (_theTransaction == null)

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/transaction/Transaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/transaction/Transaction.java	2009-07-09 19:30:38 UTC (rev 27799)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/transaction/Transaction.java	2009-07-09 19:36:36 UTC (rev 27800)
@@ -66,4 +66,6 @@
     long getRemainingTimeoutMills(); // time remaining until possible expire, in ms. 0 if unknown.
     
     public Uid get_uid(); // get the tx id.
+    
+    public Xid getTxId ();  // get the global Xid (no branch qualifier).
 }

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XAModifier.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XAModifier.java	2009-07-09 19:30:38 UTC (rev 27799)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XAModifier.java	2009-07-09 19:36:36 UTC (rev 27800)
@@ -31,13 +31,8 @@
 
 package com.arjuna.ats.jta.xa;
 
-import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple;
-
 import java.sql.*;
 import javax.transaction.xa.Xid;
-import javax.sql.*;
-import javax.transaction.*;
-import javax.transaction.xa.*;
 
 import com.arjuna.ats.jta.exceptions.NotImplementedException;
 
@@ -50,6 +45,8 @@
  * @since JTS 1.2.4.
  */
 
+// TODO may be worth revisiting now as things may have changed in 10 years!
+
 public interface XAModifier
 {
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java	2009-07-09 19:30:38 UTC (rev 27799)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java	2009-07-09 19:36:36 UTC (rev 27800)
@@ -1162,6 +1162,16 @@
 	{
 		return _theTransaction.get_uid();
 	}
+	
+	public final Xid getTxId ()
+	{
+	    Xid res = baseXid();
+	    
+	    if (res == null)
+	        res = new XidImple(_theTransaction.get_xid(false));
+	    
+	    return res;
+	}
 
 	public String toString ()
 	{