[jboss-svn-commits] JBL Code SVN: r33713 - in labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats: jbossatx/logging and 1 other directory.

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

Author: jhalliday
Date: 2010-07-01 05:08:16 -0400 (Thu, 01 Jul 2010)
New Revision: 33713

Modified:
   labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/AppServerJDBCXARecovery.java
   labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLogger.java
   labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLoggerImpl.java
Log:
Deprecate AppServerJDBCXARecovery. JBTM-756


Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/AppServerJDBCXARecovery.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/AppServerJDBCXARecovery.java	2010-07-01 08:17:01 UTC (rev 33712)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/AppServerJDBCXARecovery.java	2010-07-01 09:08:16 UTC (rev 33713)
@@ -93,12 +93,13 @@
  *
  * <bean name="JTAEnvironmentBean" class="com.arjuna.ats.jta.common.JTAEnvironmentBean">
  *   ...
- *   <property name="xaResourceRecoveryInstances">
+ *   <property name="xaResourceRecoveryClassNames">
  *     <list elementClass="java.lang.String">
  *       <value>com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery;jndiname=MyExampleDbName[,username=foo,password=bar]</value>
  *     </list>
  *   </property>
  *
+ * @deprecated see JBTM-756
  */
 public class AppServerJDBCXARecovery implements XAResourceRecovery {
 
@@ -149,6 +150,10 @@
 
     public boolean hasMoreResources()
     {
+        if(!_force) {
+            return false;
+        }
+
         if (_dataSource == null)
             try
             {
@@ -478,6 +483,10 @@
                 {
                     _dataSourceId=data.substring(9);
                 }
+                if(_FORCE.equals(data.substring(0, 10)))
+                {
+                    _force = true;
+                }
             }
         }
 
@@ -485,6 +494,10 @@
             // try to fallback to old parameter format where only the dataSourceId is given, without jndiname= prefix
             _dataSourceId = parameter;
         }
+
+        if(!_force) {
+            jbossatxLogger.i18NLogger.warn_AppServerJDBCXARecovery_deprecation();
+        }
     }
 
     private String getValueForKey(String config, String key)
@@ -538,6 +551,8 @@
     private boolean                      _hasMoreResources;
     private boolean _encrypted;
 
+    private boolean _force = false;
+
     private String _dataSourceId;
     private String _username;
     private String _password;
@@ -547,6 +562,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 = ",";
 }

Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLogger.java	2010-07-01 08:17:01 UTC (rev 33712)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLogger.java	2010-07-01 09:08:16 UTC (rev 33713)
@@ -152,6 +152,11 @@
 	@Message(id = 32032, value = "Work not registered!", format = MESSAGE_FORMAT)
 	public String get_jts_jca_unknownwork();
 
+
+    @Message(id = 32033, value = "AppServerJDBCXARecovery should no longer be used. See jira.jboss.org/browse/JBTM-756", format = MESSAGE_FORMAT)
+    @LogMessage(level = WARN)
+    public void warn_AppServerJDBCXARecovery_deprecation();
+
     /*
         Allocate new messages directly above this notice.
           - id: use the next id number in numeric sequence. Don't reuse ids.

Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLoggerImpl.java	2010-07-01 08:17:01 UTC (rev 33712)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLoggerImpl.java	2010-07-01 09:08:16 UTC (rev 33713)
@@ -166,4 +166,8 @@
 	public String get_jts_jca_unknownwork() {
 		return "ARJUNA-32032 Work not registered!";
 	}
+
+    public void warn_AppServerJDBCXARecovery_deprecation() {
+        logger.logv(WARN, "ARJUNA-32033 AppServerJDBCXARecovery is no longer required. See jira.jboss.org/browse/JBTM-756", (Object)null);
+    }
 }