[teiid-commits] teiid SVN: r588 - in trunk/txn-jbossts/src: test/java/com/metamatrix/xa/arjuna and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2009-03-18 16:09:30 -0400 (Wed, 18 Mar 2009)
New Revision: 588

Modified:
   trunk/txn-jbossts/src/main/java/com/metamatrix/xa/arjuna/ArjunaTransactionProvider.java
   trunk/txn-jbossts/src/main/java/com/metamatrix/xa/arjuna/XAConnectorRecovery.java
   trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArjunaRecovery.java
Log:
TEIID-346 adding in a compatibility layer with 5.5 connectors.

Modified: trunk/txn-jbossts/src/main/java/com/metamatrix/xa/arjuna/ArjunaTransactionProvider.java
===================================================================
--- trunk/txn-jbossts/src/main/java/com/metamatrix/xa/arjuna/ArjunaTransactionProvider.java	2009-03-18 20:09:28 UTC (rev 587)
+++ trunk/txn-jbossts/src/main/java/com/metamatrix/xa/arjuna/ArjunaTransactionProvider.java	2009-03-18 20:09:30 UTC (rev 588)
@@ -37,6 +37,7 @@
 import org.apache.log4j.PatternLayout;
 import org.apache.log4j.RollingFileAppender;
 import org.apache.log4j.spi.LoggingEvent;
+import org.teiid.dqp.internal.transaction.TransactionProvider;
 
 import com.arjuna.ats.arjuna.common.Configuration;
 import com.arjuna.ats.arjuna.common.arjPropertyManager;
@@ -56,7 +57,6 @@
 import com.metamatrix.common.xa.MMXid;
 import com.metamatrix.common.xa.XATransactionException;
 import com.metamatrix.core.log.MessageLevel;
-import com.metamatrix.dqp.internal.transaction.TransactionProvider;
 import com.metamatrix.dqp.service.TransactionService;
 
 public class ArjunaTransactionProvider implements TransactionProvider {
@@ -83,7 +83,7 @@
     }
     
     /** 
-     * @see com.metamatrix.dqp.internal.transaction.TransactionProvider#init(java.lang.String)
+     * @see org.teiid.dqp.internal.transaction.TransactionProvider#init(java.lang.String)
      */
     public void init(Properties props) throws XATransactionException {
         // unique name for this txn manager
@@ -151,28 +151,28 @@
     }
     
     /** 
-     * @see com.metamatrix.dqp.internal.transaction.TransactionProvider#getXATerminator()
+     * @see org.teiid.dqp.internal.transaction.TransactionProvider#getXATerminator()
      */
     public XATerminator getXATerminator() {
         return terminator;
     }
 
     /** 
-     * @see com.metamatrix.dqp.internal.transaction.TransactionProvider#getTransactionManager()
+     * @see org.teiid.dqp.internal.transaction.TransactionProvider#getTransactionManager()
      */
     public TransactionManager getTransactionManager() {
         return com.arjuna.ats.jta.TransactionManager.transactionManager();
     }
     
     /** 
-     * @see com.metamatrix.dqp.internal.transaction.TransactionProvider#importTransaction(com.metamatrix.common.xa.MMXid, int)
+     * @see org.teiid.dqp.internal.transaction.TransactionProvider#importTransaction(com.metamatrix.common.xa.MMXid, int)
      */
     public Transaction importTransaction(MMXid xid, int timeout) throws XAException {
         return TxImporter.importTransaction(xid, timeout);
     }
 
     /** 
-     * @see com.metamatrix.dqp.internal.transaction.TransactionProvider#getTransactionID(javax.transaction.Transaction)
+     * @see org.teiid.dqp.internal.transaction.TransactionProvider#getTransactionID(javax.transaction.Transaction)
      */
     public String getTransactionID(Transaction tx) {
         TransactionImple arjunaTx = (TransactionImple)tx;
@@ -180,7 +180,7 @@
     }
 
     /** 
-     * @see com.metamatrix.dqp.internal.transaction.TransactionProvider#shutdown()
+     * @see org.teiid.dqp.internal.transaction.TransactionProvider#shutdown()
      */
     public void shutdown() {
         if (this.recoveryManager != null) {

Modified: trunk/txn-jbossts/src/main/java/com/metamatrix/xa/arjuna/XAConnectorRecovery.java
===================================================================
--- trunk/txn-jbossts/src/main/java/com/metamatrix/xa/arjuna/XAConnectorRecovery.java	2009-03-18 20:09:28 UTC (rev 587)
+++ trunk/txn-jbossts/src/main/java/com/metamatrix/xa/arjuna/XAConnectorRecovery.java	2009-03-18 20:09:30 UTC (rev 588)
@@ -30,8 +30,9 @@
 
 import javax.transaction.xa.XAResource;
 
+import org.teiid.dqp.internal.transaction.TransactionProvider.XAConnectionSource;
+
 import com.arjuna.ats.jta.recovery.XAResourceRecovery;
-import com.metamatrix.dqp.internal.transaction.TransactionProvider.XAConnectionSource;
 
 
 /** 

Modified: trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArjunaRecovery.java
===================================================================
--- trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArjunaRecovery.java	2009-03-18 20:09:28 UTC (rev 587)
+++ trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArjunaRecovery.java	2009-03-18 20:09:30 UTC (rev 588)
@@ -31,13 +31,13 @@
 import javax.transaction.xa.Xid;
 
 import org.teiid.connector.api.ConnectorException;
+import org.teiid.dqp.internal.transaction.TransactionProvider;
 
 import junit.framework.TestCase;
 
 import com.arjuna.ats.arjuna.common.Configuration;
 import com.arjuna.ats.arjuna.recovery.RecoveryConfiguration;
 import com.metamatrix.common.xa.MMXid;
-import com.metamatrix.dqp.internal.transaction.TransactionProvider;
 import com.metamatrix.dqp.service.TransactionService;