[jboss-svn-commits] JBL Code SVN: r33715 - labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta.

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

Author: jhalliday
Date: 2010-07-01 07:06:12 -0400 (Thu, 01 Jul 2010)
New Revision: 33715

Modified:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/AppServerJDBCXARecovery.java
Log:
Deprecate AppServerJDBCXARecovery. JBTM-756


Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/AppServerJDBCXARecovery.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/AppServerJDBCXARecovery.java	2010-07-01 09:27:47 UTC (rev 33714)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/AppServerJDBCXARecovery.java	2010-07-01 11:06:12 UTC (rev 33715)
@@ -96,6 +96,7 @@
  *    <!-- xaRecoveryNode should match value in nodeIdentifier or be * -->
  *    <property name="com.arjuna.ats.jta.xaRecoveryNode" value="1"/>
  *
+ * @deprecated see JBTM-756
  */
 public class AppServerJDBCXARecovery implements XAResourceRecovery {
 
@@ -148,6 +149,10 @@
 
     public boolean hasMoreResources()
     {
+        if(!_force) {
+            return false;
+        }
+
         if (_dataSource == null)
             try
             {
@@ -459,6 +464,10 @@
                 {
                     _dataSourceId=data.substring(9);
                 }
+                if(_FORCE.equals(data.substring(0, 10)))
+                {
+                    _force = true;
+                }
             }
         }
         
@@ -466,6 +475,10 @@
             // try to fallback to old parameter format where only the dataSourceId is given, without jndiname= prefix
             _dataSourceId = parameter;
         }
+
+        if(!_force) {
+            log.warn("AppServerJDBCXARecovery is no longer required. See jira.jboss.org/browse/JBTM-756");
+        }
     }
     
     private String getValueForKey(String config, String key)
@@ -519,6 +532,8 @@
     private boolean                      _hasMoreResources;
     private boolean _encrypted;
 
+    private boolean _force = false;
+
     private String _dataSourceId;
     private String _username;
     private String _password;
@@ -528,6 +543,7 @@
     private final String _JNDINAME = "jndiname";
     private final String _USERNAME = "username";
     private final String _PASSWORD = "password";
+    private final String _FORCE = "force=true";
     private final String _MODULE = "LoginModule Class";
     private final String _DELIMITER = ",";