[jboss-svn-commits] JBL Code SVN: r33571 - in labs/jbosstm/trunk: ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common and 19 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Jun 21 11:06:41 EDT 2010


Author: jhalliday
Date: 2010-06-21 11:06:39 -0400 (Mon, 21 Jun 2010)
New Revision: 33571

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/ActionHierarchy.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/CheckedAction.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TwoPhaseCoordinator.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/arjunaI18NLogger.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/arjunaI18NLoggerImpl.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/tsLogger.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreType.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/ActionStatusService.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryManager.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/InputBuffer.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputBuffer.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/StateManagerWrapper.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/UidWrapper.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/util/JMXServer.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/Utility.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/LogWriteStateManager.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/TxLogWritePersistenceRecord.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/ActivationRecord.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverRecord.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/DisposeRecord.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/PersistenceRecord.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/RecoveryRecord.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/StateManagerFriend.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/BasicMutex.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/ClassloadingUtility.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/CacheStore.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCImple.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/jdbc/oracle_driver.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/AtomicActionRecoveryModule.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Connection.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionScanner.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecActivatorLoader.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecoveryManagerImple.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusConnector.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusManagerItem.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/WorkerService.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/tools/log/EditableAtomicAction.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ExecProcessId.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/FileProcessId.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/MBeanProcessId.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ManualProcessId.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/SocketProcessId.java
   labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java
   labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/rootprovider/InFlightTransactionPseudoStore.java
   labs/jbosstm/trunk/common/build.xml
Log:
Replace CLF with jboss-logging for i18n messages in ArjunaCore. JBTM-750


Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -333,11 +333,9 @@
 				ThreadActionData.purgeActions();
 			else
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				{
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.atomicaction_1", new Object[]
-					{ curr.toString() });
-				}
+				if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_ats_atomicaction_1(curr.toString());
+                }
 
 				curr = null;
 			}

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -194,8 +194,7 @@
             if ((action != null) && (action.status() == ActionStatus.RUNNING))
             {
                 if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                    tsLogger.arjLoggerI18N
-                            .warn("com.arjuna.ats.arjuna.StateManager_1");
+                    tsLogger.i18NLogger.warn_StateManager_1();
                 cleanup(false);
             }
         }
@@ -348,12 +347,8 @@
                     }
                     else
                     {
-                        if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                        {
-                            tsLogger.arjLoggerI18N.warn(
-                                    "com.arjuna.ats.arjuna.StateManager_2",
-                                    new Object[]
-                                    { objectUid, type() });
+                        if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                            tsLogger.i18NLogger.warn_StateManager_2(objectUid, type());
                         }
 
                         return false;
@@ -501,8 +496,7 @@
                     catch (ObjectStoreException e)
                     {
                         if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                            tsLogger.arjLoggerI18N.warn(
-                                    "com.arjuna.ats.arjuna.StateManager_3", e);
+                            tsLogger.i18NLogger.warn_StateManager_3(e);
 
                         result = false;
                     }
@@ -510,8 +504,7 @@
                 else
                 {
                     if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                        tsLogger.arjLoggerI18N
-                                .warn("com.arjuna.ats.arjuna.StateManager_4");
+                        tsLogger.i18NLogger.warn_StateManager_4();
                 }
 
                 /*
@@ -589,10 +582,8 @@
                 {
                     dr = null;
 
-                    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                    {
-                        tsLogger.arjLoggerI18N
-                                .warn("com.arjuna.ats.arjuna.StateManager_6", new Object[] { action.get_uid() });
+                    if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                        tsLogger.i18NLogger.warn_StateManager_6(action.get_uid());
                     }
                 }
                 else
@@ -614,8 +605,7 @@
                 catch (Exception e)
                 {
                     if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                        tsLogger.arjLoggerI18N.warn(
-                                "com.arjuna.ats.arjuna.StateManager_7", e);
+                        tsLogger.i18NLogger.warn_StateManager_7(e);
 
                     result = false;
                 }
@@ -627,10 +617,8 @@
              * Not a persistent object!
              */
 
-            if (tsLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                tsLogger.arjLoggerI18N
-                        .warn("com.arjuna.ats.arjuna.StateManager_8");
+            if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_StateManager_8();
             }
         }
 
@@ -795,14 +783,11 @@
             }
             else
             {
-                if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    tsLogger.arjLoggerI18N
-                            .warn("com.arjuna.ats.arjuna.StateManager_9");
+                if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_StateManager_9();
                 }
 
-                throw new IOException(tsLogger.arjLoggerI18N
-                        .getString("com.arjuna.ats.arjuna.StateManager_15"));
+                throw new IOException(tsLogger.i18NLogger.get_StateManager_15());
             }
             
             long birthDate = os.unpackLong();
@@ -965,8 +950,7 @@
         if (currentStatus == ObjectStatus.PASSIVE)
         {
             if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                tsLogger.arjLoggerI18N
-                        .warn("com.arjuna.ats.arjuna.StateManager_10");
+                tsLogger.i18NLogger.warn_StateManager_10();
             
             activate();
         }
@@ -1101,13 +1085,8 @@
                         {
                             OutputObjectState state = null;
 
-                            if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                            {
-                                tsLogger.arjLoggerI18N
-                                        .warn(
-                                                "com.arjuna.ats.arjuna.StateManager_11",
-                                                new Object[]
-                                                { objectUid, type() });
+                            if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                                tsLogger.i18NLogger.warn_StateManager_11(objectUid, type());
                             }
 
                             /*
@@ -1122,8 +1101,7 @@
                                 if (!save_state(state, myType))
                                 {
                                     if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                                        tsLogger.arjLoggerI18N
-                                                .warn("com.arjuna.ats.arjuna.StateManager_12");
+                                        tsLogger.i18NLogger.warn_StateManager_12();
                                     /* force action abort */
 
                                     action.preventCommit();
@@ -1159,10 +1137,8 @@
                             }
                             else
                             {
-                                if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                                {
-                                    tsLogger.arjLoggerI18N
-                                            .warn("com.arjuna.ats.arjuna.StateManager_6", new Object[] { action.get_uid() });
+                                if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                                    tsLogger.i18NLogger.warn_StateManager_6(action.get_uid());
                                 }
                                 
                                 record = null;
@@ -1289,8 +1265,7 @@
             }
             catch (final Throwable ex)
             {
-                throw new FatalError(tsLogger.arjLoggerI18N
-                        .getString("com.arjuna.ats.arjuna.StateManager_16")
+                throw new FatalError(tsLogger.i18NLogger.get_StateManager_16()
                         + " " + objectStoreType);
             }
         }
@@ -1303,11 +1278,9 @@
              */
 
             if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                tsLogger.arjLoggerI18N
-                        .warn("com.arjuna.ats.arjuna.StateManager_13");
+                tsLogger.i18NLogger.warn_StateManager_13();
 
-            throw new FatalError(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.StateManager_14"));
+            throw new FatalError(tsLogger.i18NLogger.get_StateManager_14());
 
             // objectStore = new
             // ObjectStore(ArjunaNames.Implementation_ObjectStore_VolatileStore

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -131,8 +131,7 @@
         catch (UnknownHostException e)
         {
             if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                tsLogger.arjLoggerI18N
-                        .warn("com.arjuna.ats.arjuna.common.Uid_1");
+                tsLogger.i18NLogger.warn_common_Uid_1();
             _valid = false;
         }
     }
@@ -172,8 +171,7 @@
         catch (final Throwable ex)
         {
             if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                tsLogger.arjLoggerI18N
-                        .warn("com.arjuna.ats.arjuna.common.Uid_bytes", ex);
+                tsLogger.i18NLogger.warn_common_Uid_bytes(ex);
             
             _valid = false;
         }
@@ -263,12 +261,8 @@
             {
                 if (!errsOk)
                 {
-                    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                    {
-                        tsLogger.arjLoggerI18N.warn(
-                                "com.arjuna.ats.arjuna.common.Uid_3",
-                                new Object[]
-                                { uidString }, e);
+                    if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                        tsLogger.i18NLogger.warn_common_Uid_3(uidString, e);
                     }
                 }
 
@@ -278,11 +272,8 @@
             {
                 if (!errsOk)
                 {
-                    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                    {
-                        tsLogger.arjLoggerI18N.warn(
-                                "com.arjuna.ats.arjuna.common.Uid_3", new Object[]
-                                { uidString }, e);
+                    if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                        tsLogger.i18NLogger.warn_common_Uid_3(uidString, e);
                     }
                 }
 
@@ -290,11 +281,8 @@
             }
             catch (final Throwable ex)
             {
-                if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    tsLogger.arjLoggerI18N.warn(
-                            "com.arjuna.ats.arjuna.common.Uid_npe", new Object[]
-                            { uidString }, ex);
+                if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_common_Uid_npe(uidString, ex);
                 }
 
                 _valid = false;
@@ -322,30 +310,16 @@
                 }
                 catch (Exception e)
                 {
-                    if (tsLogger.arjLoggerI18N.isFatalEnabled())
-                    {
-                        tsLogger.arjLoggerI18N.fatal(
-                                "com.arjuna.ats.arjuna.common.Uid_4",
-                                new Object[]
-                                { uidString });
+                    if (tsLogger.arjLoggerI18N.isFatalEnabled()) {
+                        tsLogger.i18NLogger.fatal_common_Uid_4(uidString);
                     }
 
-                    throw new FatalError(tsLogger.arjLoggerI18N
-                            .getString("com.arjuna.ats.arjuna.common.Uid_2"), e);
+                    throw new FatalError(tsLogger.i18NLogger.get_common_Uid_2(), e);
                 }
             }
             else
             {
-                if (tsLogger.arjLoggerI18N.isFatalEnabled())
-                {
-                    tsLogger.arjLoggerI18N.fatal(
-                            "com.arjuna.ats.arjuna.common.Uid_5", new Object[]
-                            { uidString });
-                }
-
-                throw new FatalError(tsLogger.arjLoggerI18N
-                        .getString("com.arjuna.ats.arjuna.common.Uid_3")
-                        + uidString);
+                throw new FatalError(tsLogger.i18NLogger.get_common_Uid_5(uidString));
             }
         }
     }
@@ -370,8 +344,7 @@
         {
             _valid = false;
 
-            throw new FatalError(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.common.Uid_11")
+            throw new FatalError(tsLogger.i18NLogger.get_common_Uid_11()
                     + ex);
         }
     }
@@ -459,8 +432,7 @@
             catch (final Throwable ex)
             {
                 if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                    tsLogger.arjLoggerI18N
-                            .warn("com.arjuna.ats.arjuna.common.Uid_getbytes", ex);
+                    tsLogger.i18NLogger.warn_common_Uid_getbytes(ex);
                 
                 _byteForm = null;
             }
@@ -789,8 +761,7 @@
         else
         {
             if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                tsLogger.arjLoggerI18N
-                        .warn("com.arjuna.ats.arjuna.common.Uid_6");
+                tsLogger.i18NLogger.warn_common_Uid_6();
         }
     }
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -451,10 +451,9 @@
 	    }
 	    catch (final NullPointerException ex)
 	    {
-	        if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                        tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.AbstractRecord_npe", new Object[] {new Integer(type)});
-                }
+	        if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_coordinator_AbstractRecord_npe(Integer.toString(type));
+            }
 	        
 	        return null;
 	    }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/ActionHierarchy.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/ActionHierarchy.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/ActionHierarchy.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -317,7 +317,7 @@
 	}
 	catch (OutOfMemoryError ex)
 	{
-        IOException ioException = new IOException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.arjuna.coordinator.ActionHierarchy_1"));
+        IOException ioException = new IOException(tsLogger.i18NLogger.get_coordinator_ActionHierarchy_1());
         ioException.initCause(ex);
         throw ioException;
 	}

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -323,19 +323,15 @@
 
 				if (currentAct.isAncestor(get_uid()))
 				{
-					if (tsLogger.arjLoggerI18N.isWarnEnabled())
-					{
-						tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_1", new Object[]
-						{ get_uid() });
-					}
+					if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                        tsLogger.i18NLogger.warn_coordinator_BasicAction_1(get_uid());
+                    }
 
 					while ((currentAct != this) && (currentAct != null))
 					{
-						if (tsLogger.arjLoggerI18N.isWarnEnabled())
-						{
-							tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_2", new Object[]
-							{ currentAct.get_uid() });
-						}
+						if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                            tsLogger.i18NLogger.warn_coordinator_BasicAction_2(currentAct.get_uid());
+                        }
 
 						currentAct.Abort();
 
@@ -354,11 +350,9 @@
 				parentAct = parentAct.parent();
 			}
 
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			{
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_3", new Object[]
-				{ get_uid() });
-			}
+			if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_coordinator_BasicAction_3(get_uid());
+            }
 
 			/* This will also kill any children */
 
@@ -663,11 +657,9 @@
 			}
 			else
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				{
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_5", new Object[]
-					{ get_uid(), type() });
-				}
+				if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_coordinator_BasicAction_5(get_uid(), type());
+                }
 
 				restored = false;
 			}
@@ -728,11 +720,9 @@
 			/** If we failed to deactivate then output warning * */
 			if (!deactivated)
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				{
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_5a", new Object[]
-					{ get_uid(), type() });
-				}
+				if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_coordinator_BasicAction_5a(get_uid(), type());
+                }
 			}
 		}
 		catch (ObjectStoreException e)
@@ -1289,11 +1279,9 @@
 
 			if (record == null)
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				{
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_21", new Object[]
-					{ Integer.toString(record_type) });
-				}
+				if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_coordinator_BasicAction_21(Integer.toString(record_type));
+                }
 
 				res = false;
 			}
@@ -1372,8 +1360,8 @@
 				}
 				catch (final NullPointerException ex)
 				{
-				    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                                        tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.norecordfound", new Object[] { record_type});
+                    if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                        tsLogger.i18NLogger.warn_coordinator_norecordfound(Integer.toString(record_type));
 				    
 				    res = false;
 				}
@@ -1390,8 +1378,8 @@
 			}
 			catch (IOException e)
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_24");
+                if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                    tsLogger.i18NLogger.warn_coordinator_BasicAction_24();
 
 				res = false;
 			}
@@ -1546,20 +1534,17 @@
 		    
 		    actionStatus = ActionStatus.ABORT_ONLY;
 		    
-		    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                    {
-                            tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.notrunning");
-                    }
+		    if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_coordinator_notrunning();
+            }
 		}
 		else
 		{   
 		    if (actionStatus != ActionStatus.CREATED)
 		    {
-		        if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		        {
-		            tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_29", new Object[]
-		                                                                                                       { get_uid(), ActionStatus.stringForm(actionStatus) });
-		        }
+		        if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_coordinator_BasicAction_29(get_uid(), ActionStatus.stringForm(actionStatus));
+                }
 		    }
 		    else
 		    {
@@ -1573,19 +1558,15 @@
 
 		            if (parentAct == null)
 		            {
-		                if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		                {
-		                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_30", new Object[]
-		                                                                                                               { get_uid() });
-		                }
+		                if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                            tsLogger.i18NLogger.warn_coordinator_BasicAction_30(get_uid());
+                        }
 		            }
 		            else
 		            {
-		                if (tsLogger.arjLoggerI18N.isDebugEnabled())
-		                {
-		                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_31", new Object[]
-		                                                                                                               { get_uid(), parentAct.get_uid(), Integer.toString(parentAct.status()) });
-		                }
+		                if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
+                            tsLogger.i18NLogger.warn_coordinator_BasicAction_31(get_uid(), parentAct.get_uid(), Integer.toString(parentAct.status()));
+                        }
 		            }
 		        }
 
@@ -1638,21 +1619,17 @@
 		{
 			if (tsLogger.arjLoggerI18N.isWarnEnabled())
 			{
-				switch (actionStatus)
-				{
-				case ActionStatus.CREATED:
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_33", new Object[]
-					{ get_uid() });
-					break;
-				case ActionStatus.COMMITTED:
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_34", new Object[]
-					{ get_uid() });
-					break;
-				default:
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_35", new Object[]
-					{ get_uid() });
-					break;
-				}
+				switch (actionStatus) {
+                    case ActionStatus.CREATED:
+                        tsLogger.i18NLogger.warn_coordinator_BasicAction_33(get_uid());
+                        break;
+                    case ActionStatus.COMMITTED:
+                        tsLogger.i18NLogger.warn_coordinator_BasicAction_34(get_uid());
+                        break;
+                    default:
+                        tsLogger.i18NLogger.warn_coordinator_BasicAction_35(get_uid());
+                        break;
+                }
 			}
 
 			return actionStatus;
@@ -1686,23 +1663,19 @@
 			{			
 				if (prepare(reportHeuristics) == TwoPhaseOutcome.PREPARE_NOTOK)
 				{
-					if (tsLogger.arjLoggerI18N.isWarnEnabled())
-					{
-						tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_36", new Object[]
-						{ get_uid() });
-					}
+					if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                        tsLogger.i18NLogger.warn_coordinator_BasicAction_36(get_uid());
+                    }
 
 					if (heuristicDecision != TwoPhaseOutcome.PREPARE_OK)
 					{
-						if (tsLogger.arjLoggerI18N.isWarnEnabled())
-						{
-							tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_37", new Object[]
-							{ TwoPhaseOutcome.stringForm(heuristicDecision) });
-						}
+						if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                            tsLogger.i18NLogger.warn_coordinator_BasicAction_37(TwoPhaseOutcome.stringForm(heuristicDecision));
+                        }
 					}
 
-					if (tsLogger.arjLoggerI18N.isWarnEnabled())
-						tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_38");
+                    if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                        tsLogger.i18NLogger.warn_coordinator_BasicAction_38();
 
 					if (!reportHeuristics && TxControl.asyncCommit
 							&& (parentAction == null))
@@ -1811,21 +1784,17 @@
 		{
 			if (tsLogger.arjLoggerI18N.isWarnEnabled())
 			{
-				switch (actionStatus)
-				{
-				case ActionStatus.CREATED:
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_39", new Object[]
-					{ get_uid() });
-					break;
-				case ActionStatus.ABORTED:
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_40", new Object[]
-					{ get_uid() });
-					break;
-				default:
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_41", new Object[]
-					{ get_uid() });
-					break;
-				}
+				switch (actionStatus) {
+                    case ActionStatus.CREATED:
+                        tsLogger.i18NLogger.warn_coordinator_BasicAction_39(get_uid());
+                        break;
+                    case ActionStatus.ABORTED:
+                        tsLogger.i18NLogger.warn_coordinator_BasicAction_40(get_uid());
+                        break;
+                    default:
+                        tsLogger.i18NLogger.warn_coordinator_BasicAction_41(get_uid());
+                        break;
+                }
 			}
 
 			return actionStatus;
@@ -2019,11 +1988,9 @@
 		{
 			int size = ((pendingList == null) ? 0 : pendingList.size());
 
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			{
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_42", new Object[]
-				{ get_uid(), Integer.toString(size), pendingList });
-			}
+			if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_coordinator_BasicAction_42(get_uid(), Integer.toString(size), pendingList.toString());
+            }
 
 			phase2Abort(reportHeuristics);
 		}
@@ -2203,11 +2170,9 @@
 
 		if (!commitAllowed)
 		{
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			{
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_43", new Object[]
-				{ get_uid() });
-			}
+			if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_coordinator_BasicAction_43(get_uid());
+            }
 
 			actionStatus = ActionStatus.PREPARED;
 
@@ -2372,8 +2337,8 @@
 					parentAction.preventCommit();
 				else
 				{
-					if (tsLogger.arjLoggerI18N.isWarnEnabled())
-						tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_44");
+                    if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                        tsLogger.i18NLogger.warn_coordinator_BasicAction_44();
 				}
 			}
 
@@ -2470,11 +2435,9 @@
 
 			if (!save_state(state, ObjectType.ANDPERSISTENT))
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				{
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_45", new Object[]
-					{ get_uid() });
-				}
+				if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_coordinator_BasicAction_45(get_uid());
+                }
 
 				criticalEnd();
 
@@ -2487,11 +2450,9 @@
 				{
 					if (!currentStore.write_committed(u, tn, state))
 					{                                               
-						if (tsLogger.arjLoggerI18N.isWarnEnabled())
-						{
-							tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_46", new Object[]
-							{ get_uid() });
-						}
+						if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                            tsLogger.i18NLogger.warn_coordinator_BasicAction_46(get_uid());
+                        }
 
 						criticalEnd();
 
@@ -2533,11 +2494,9 @@
 
 		if (actionStatus == ActionStatus.ABORT_ONLY)
 		{
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			{
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_43", new Object[]
-				{ get_uid() });
-			}
+			if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_coordinator_BasicAction_43(get_uid());
+            }
 
 			Abort();
 
@@ -2625,11 +2584,9 @@
         			 * Heuristic decision!!
         			 */
         
-        			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-        			{
-        			    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_47", new Object[]
-        			                                                                                               { get_uid(), TwoPhaseOutcome.stringForm(p) });
-        			}
+        			if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                        tsLogger.i18NLogger.warn_coordinator_BasicAction_47(get_uid(), TwoPhaseOutcome.stringForm(p));
+                    }
         
         			if (reportHeuristics)
         			{
@@ -2678,12 +2635,12 @@
 				{
 					if (tsLogger.arjLoggerI18N.isFatalEnabled())
 					{
-						tsLogger.arjLoggerI18N.fatal("com.arjuna.ats.arjuna.coordinator.BasicAction_48");
+						tsLogger.i18NLogger.fatal_coordinator_BasicAction_48();
 					}
 
 					throw new com.arjuna.ats.arjuna.exceptions.FatalError(
-							tsLogger.arjLoggerI18N.getString("com.arjuna.ats.arjuna.coordinator.BasicAction_69")
-									+ get_uid());
+                            tsLogger.i18NLogger.get_coordinator_BasicAction_69()
+                                    + get_uid());
 				}
 
 				updateState();
@@ -2888,11 +2845,9 @@
 							if ((preparedList.size() > 0)
 									&& (p == TwoPhaseOutcome.ONE_PHASE_ERROR))
 							{
-								if (tsLogger.arjLoggerI18N.isWarnEnabled())
-								{
-									tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_49", new Object[]
-									{ get_uid() });
-								}
+								if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                                    tsLogger.i18NLogger.warn_coordinator_BasicAction_49(get_uid());
+                                }
 
 								/*
 								 * Force parent to rollback. If this is not the
@@ -2944,11 +2899,9 @@
 						 * Only report if request to do so.
 						 */
 
-						if (tsLogger.arjLoggerI18N.isWarnEnabled())
-						{
-							tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_50", new Object[]
-							{ get_uid(), TwoPhaseOutcome.stringForm(p) });
-						}
+						if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                            tsLogger.i18NLogger.warn_coordinator_BasicAction_50(get_uid(), TwoPhaseOutcome.stringForm(p));
+                        }
 
 						if (reportHeuristics)
 							updateHeuristic(p, false);
@@ -3234,12 +3187,10 @@
 					{
 						if (tsLogger.arjLoggerI18N.isWarnEnabled())
 						{
-							if (actionType == ActionType.TOP_LEVEL)
-								tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_52", new Object[]
-								{ get_uid(), TwoPhaseOutcome.stringForm(ok) });
-							else
-								tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_53", new Object[]
-								{ get_uid(), TwoPhaseOutcome.stringForm(ok) });
+                            if (actionType == ActionType.TOP_LEVEL)
+                                tsLogger.i18NLogger.warn_coordinator_BasicAction_52(get_uid(), TwoPhaseOutcome.stringForm(ok));
+                            else
+                                tsLogger.i18NLogger.warn_coordinator_BasicAction_53(get_uid(), TwoPhaseOutcome.stringForm(ok));
 						}
 
 						updateHeuristic(ok, false);
@@ -3251,12 +3202,14 @@
 						{
 							if (tsLogger.arjLoggerI18N.isWarnEnabled())
 							{
-								if (actionType == ActionType.TOP_LEVEL)
-									tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_54", new Object[]
-									{ get_uid(), TwoPhaseOutcome.stringForm(ok), RecordType.typeToClass(recordBeingHandled.typeIs()) });
-								else
-									tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_55", new Object[]
-									{ get_uid(), TwoPhaseOutcome.stringForm(ok), RecordType.typeToClass(recordBeingHandled.typeIs()) });
+                                if (actionType == ActionType.TOP_LEVEL)
+                                    tsLogger.i18NLogger.warn_coordinator_BasicAction_54(get_uid(),
+                                            TwoPhaseOutcome.stringForm(ok),
+                                            RecordType.typeToClass(recordBeingHandled.typeIs()).getCanonicalName());
+                                else
+                                    tsLogger.i18NLogger.warn_coordinator_BasicAction_55(get_uid(),
+                                            TwoPhaseOutcome.stringForm(ok),
+                                            RecordType.typeToClass(recordBeingHandled.typeIs()).getCanonicalName());
 							}
 						}
 					}
@@ -3449,21 +3402,19 @@
 				String tn = type();
 				OutputObjectState state = new OutputObjectState(u, tn);
 
-				if (!save_state(state, ObjectType.ANDPERSISTENT))
-				{
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_64");
+				if (!save_state(state, ObjectType.ANDPERSISTENT)) {
+                    tsLogger.i18NLogger.warn_coordinator_BasicAction_64();
 
-					// what else?
-				}
+                    // what else?
+                }
 
 				if (state.notempty())
 				{
 					try
 					{
-						if (!currentStore.write_committed(u, tn, state))
-						{
-							tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_65");
-						}
+						if (!currentStore.write_committed(u, tn, state)) {
+                            tsLogger.i18NLogger.warn_coordinator_BasicAction_65();
+                        }
 					}
 					catch (ObjectStoreException e)
 					{
@@ -3483,11 +3434,9 @@
 						}
 					}
 				}
-				catch (ObjectStoreException e)
-				{
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_70", new Object[]
-					{ e });
-				}
+				catch (ObjectStoreException e) {
+                    tsLogger.i18NLogger.warn_coordinator_BasicAction_70(e);
+                }
 			}
 		}
 	}
@@ -3535,11 +3484,9 @@
 
 			if ((currentAct != null) && (currentAct != this))
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				{
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_56", new Object[]
-					{ currentAct.get_uid(), get_uid() });
-				}
+				if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_coordinator_BasicAction_56(currentAct.get_uid(), get_uid());
+                }
 
 				isCurrent = false;
 
@@ -3586,16 +3533,12 @@
 
 				if (tsLogger.arjLoggerI18N.isWarnEnabled())
 				{
-					if (isCommit)
-					{
-						tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_57", new Object[]
-						{ get_uid() });
-					}
-					else
-					{
-						tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_58", new Object[]
-						{ get_uid() });
-					}
+					if (isCommit) {
+                        tsLogger.i18NLogger.warn_coordinator_BasicAction_57(get_uid());
+                    }
+					else {
+                        tsLogger.i18NLogger.warn_coordinator_BasicAction_58(get_uid());
+                    }
 				}
 
 				if (_checkedAction != null)
@@ -3634,26 +3577,20 @@
 					{
 						if (tsLogger.arjLoggerI18N.isWarnEnabled())
 						{
-							if (isCommit)
-							{
-								tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_59", new Object[]
-								{ get_uid() });
-							}
-							else
-							{
-								tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_60", new Object[]
-								{ get_uid() });
-							}
+							if (isCommit) {
+                                tsLogger.i18NLogger.warn_coordinator_BasicAction_59(get_uid());
+                            }
+							else {
+                                tsLogger.i18NLogger.warn_coordinator_BasicAction_60(get_uid());
+                            }
 						}
 
 						printError = false;
 					}
 
-					if (tsLogger.arjLoggerI18N.isWarnEnabled())
-					{
-						tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_61", new Object[]
-						{ child.get_uid() });
-					}
+					if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                        tsLogger.i18NLogger.warn_coordinator_BasicAction_61(child.get_uid());
+                    }
 
 					child.Abort();
 					child = null;
@@ -3664,11 +3601,9 @@
 
 			if (isCommit)
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				{
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_62", new Object[]
-					{ ((child != null ? child.get_uid() : "null"))});
-				}
+				if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_coordinator_BasicAction_62(((child != null ? child.get_uid().toString() : "null")));
+                }
 			}
 		}
 
@@ -3911,8 +3846,8 @@
 		{
 			A = null;
 
-			if (as == AddOutcome.AR_REJECTED)
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_68");
+            if (as == AddOutcome.AR_REJECTED)
+                tsLogger.i18NLogger.warn_coordinator_BasicAction_68();
 		}
 	}
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/CheckedAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/CheckedAction.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/CheckedAction.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -71,15 +71,9 @@
         if (tsLogger.arjLoggerI18N.isWarnEnabled())
         {
             if (isCommit)
-                tsLogger.arjLoggerI18N.warn(
-                        "com.arjuna.ats.arjuna.coordinator.CheckedAction_1",
-                        new Object[]
-                        { actUid, Integer.toString(list.size()) });
+                tsLogger.i18NLogger.warn_coordinator_CheckedAction_1(actUid, Integer.toString(list.size()));
             else
-                tsLogger.arjLoggerI18N.warn(
-                        "com.arjuna.ats.arjuna.coordinator.CheckedAction_2",
-                        new Object[]
-                        { actUid, Integer.toString(list.size()) });
+                tsLogger.i18NLogger.warn_coordinator_CheckedAction_2(actUid, Integer.toString(list.size()));
         }
     }
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -187,8 +187,7 @@
             }
 
             if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
-                tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_18",
-                                new Object[] {reaperElement._control.get_uid(), reaperElement.statusName()});
+                tsLogger.i18NLogger.warn_coordinator_TransactionReaper_18(reaperElement._control.get_uid(), reaperElement.statusName());
             }
 
             // if we have to synchronize on multiple objects we always
@@ -285,9 +284,7 @@
                                 // log zombie overflow error call()
 
                                 if (tsLogger.arjLoggerI18N.isErrorEnabled()) {
-                                    tsLogger.arjLoggerI18N.error(
-                                                    "com.arjuna.ats.arjuna.coordinator.TransactionReaper_5",
-                                                    new Object[]{new Integer(_zombieCount)});
+                                    tsLogger.i18NLogger.error_coordinator_TransactionReaper_5(Integer.toString(_zombieCount));
                                 }
                             }
                         }
@@ -300,10 +297,8 @@
                         // log a failed cancel()
 
                         if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
-                            tsLogger.arjLoggerI18N.warn(
-                                            "com.arjuna.ats.arjuna.coordinator.TransactionReaper_6",
-                                            new Object[]{reaperElement._worker,
-                                                    reaperElement._control.get_uid()});
+                            tsLogger.i18NLogger.warn_coordinator_TransactionReaper_6(reaperElement._worker.toString(),
+                                    reaperElement._control.get_uid());
                         }
 
                         // ok, since the worker was wedged we need to
@@ -320,9 +315,7 @@
                                 // log a successful preventCommit()
 
                                 if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
-                                    tsLogger.arjLoggerI18N.warn(
-                                                    "com.arjuna.ats.arjuna.coordinator.TransactionReaper_10",
-                                                    new Object[]{reaperElement._control.get_uid()});
+                                    tsLogger.i18NLogger.warn_coordinator_TransactionReaper_10(reaperElement._control.get_uid());
                                 }
 
                                 notifyListeners(reaperElement._control, false);
@@ -330,9 +323,7 @@
                                 // log a failed preventCommit()
 
                                 if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
-                                    tsLogger.arjLoggerI18N.warn(
-                                                    "com.arjuna.ats.arjuna.coordinator.TransactionReaper_11",
-                                                    new Object[]{reaperElement._control.get_uid()});
+                                    tsLogger.i18NLogger.warn_coordinator_TransactionReaper_11(reaperElement._control.get_uid());
                                 }
                             }
                         }
@@ -340,9 +331,7 @@
                             // log an exception under preventCommit()
 
                             if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
-                                tsLogger.arjLoggerI18N
-                                        .warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_12",
-                                                new Object[]{reaperElement._control.get_uid()}, e1);
+                                tsLogger.i18NLogger.warn_coordinator_TransactionReaper_12(reaperElement._control.get_uid(), e1);
                             }
                         }
                     }
@@ -468,12 +457,8 @@
                     }
 
                     if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
-                        tsLogger.arjLoggerI18N
-                                .warn(
-                                        "com.arjuna.ats.arjuna.coordinator.TransactionReaper_13",
-                                        new Object[]{Thread.currentThread(),
-                                                e._control.get_uid(),
-                                                new Integer(_zombieCount)});
+                        tsLogger.i18NLogger.warn_coordinator_TransactionReaper_13(Thread.currentThread().toString(),
+                                e._control.get_uid(), Integer.toString(_zombieCount));
                     }
 
                     // this gets us out of the for(;;) loop and
@@ -504,29 +489,18 @@
 
             if (cancelled) {
                 if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
-                    tsLogger.arjLoggerI18N
-                            .warn(
-                                    "com.arjuna.ats.arjuna.coordinator.TransactionReaper_7",
-                                    new Object[]{Thread.currentThread(),
-                                            e._control.get_uid()});
+                    tsLogger.i18NLogger.warn_coordinator_TransactionReaper_7(Thread.currentThread().toString(),
+                            e._control.get_uid());
                 }
             } else if (e._control.running()) {
                 if (exception != null) {
                     if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
-                        tsLogger.arjLoggerI18N
-                                .warn(
-                                        "com.arjuna.ats.arjuna.coordinator.TransactionReaper_9",
-                                        new Object[]{Thread.currentThread(),
-                                                e._control.get_uid()},
-                                        exception);
+                        tsLogger.i18NLogger.warn_coordinator_TransactionReaper_9(Thread.currentThread().toString(), e._control.get_uid(), exception);
                     }
                 } else {
                     if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
-                        tsLogger.arjLoggerI18N
-                                .warn(
-                                        "com.arjuna.ats.arjuna.coordinator.TransactionReaper_8",
-                                        new Object[]{Thread.currentThread(),
-                                                e._control.get_uid()});
+                        tsLogger.i18NLogger.warn_coordinator_TransactionReaper_8(Thread.currentThread().toString(),
+                                e._control.get_uid());
                     }
                 }
 
@@ -535,11 +509,8 @@
                         // log a successful preventCommit()
 
                         if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
-                            tsLogger.arjLoggerI18N
-                                    .warn(
-                                            "com.arjuna.ats.arjuna.coordinator.TransactionReaper_14",
-                                            new Object[]{Thread.currentThread(),
-                                                    e._control.get_uid()});
+                            tsLogger.i18NLogger.warn_coordinator_TransactionReaper_14(Thread.currentThread().toString(),
+                                    e._control.get_uid());
                         }
 
                         notifyListeners(e._control, false);
@@ -547,11 +518,8 @@
                         // log a failed preventCommit()
 
                         if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
-                            tsLogger.arjLoggerI18N
-                                    .warn(
-                                            "com.arjuna.ats.arjuna.coordinator.TransactionReaper_15",
-                                            new Object[]{Thread.currentThread(),
-                                                    e._control.get_uid()});
+                            tsLogger.i18NLogger.warn_coordinator_TransactionReaper_15(Thread.currentThread().toString(),
+                                    e._control.get_uid());
                         }
                     }
                 }
@@ -559,12 +527,7 @@
                     // log an exception under preventCommit()
 
                     if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
-                        tsLogger.arjLoggerI18N
-                                .warn(
-                                        "com.arjuna.ats.arjuna.coordinator.TransactionReaper_16",
-                                        new Object[]{Thread.currentThread(),
-                                                e._control.get_uid()},
-                                        e1);
+                        tsLogger.i18NLogger.warn_coordinator_TransactionReaper_16(Thread.currentThread().toString(), e._control.get_uid(), e1);
                     }
                 }
             }
@@ -635,7 +598,7 @@
         if ((_timeouts.putIfAbsent(reaperElement._control, reaperElement) == null)) {
             _reaperElements.add(reaperElement);
         } else {
-            throw new IllegalStateException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.arjuna.coordinator.TransactionReaper_1"));
+            throw new IllegalStateException(tsLogger.i18NLogger.get_coordinator_TransactionReaper_1());
         }
 
         if (_dynamic && reaperElement.getAbsoluteTimeout() < nextDynamicCheckTime.get()) {
@@ -925,7 +888,7 @@
                 TransactionReaper._dynamic = false;
 
                 if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
-                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_19");
+                    tsLogger.i18NLogger.warn_coordinator_TransactionReaper_19();
                 }
             }
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TwoPhaseCoordinator.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TwoPhaseCoordinator.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TwoPhaseCoordinator.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -282,37 +282,32 @@
 		                    // we want later, so we keep a reference to it as well as logging it.
 
 		                }
-		                catch (Exception ex)
-		                {
-		                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator_2", new Object[]
-		                                                                                                                      { _currentRecord }, ex);
-		                    if(_deferredThrowable == null) {
-		                        _deferredThrowable = ex;
-		                    }
-		                    problem = true;
-		                }
-		                catch (Error er)
-		                {
-		                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator_2", new Object[]
-		                                                                                                                      { _currentRecord }, er);
-		                    if(_deferredThrowable == null) {
-		                        _deferredThrowable = er;
-		                    }
-		                    problem = true;
-		                }
+		                catch (Exception ex) {
+                            tsLogger.i18NLogger.warn_coordinator_TwoPhaseCoordinator_2(_currentRecord.toString(), ex);
+                            if (_deferredThrowable == null) {
+                                _deferredThrowable = ex;
+                            }
+                            problem = true;
+                        }
+		                catch (Error er) {
+                            tsLogger.i18NLogger.warn_coordinator_TwoPhaseCoordinator_2(_currentRecord.toString(), er);
+                            if (_deferredThrowable == null) {
+                                _deferredThrowable = er;
+                            }
+                            problem = true;
+                        }
 		            }
 
 		            if (problem)
 		            {
-		                if (!preventCommit())
-		                {
-		                    /*
-		                     * This should not happen. If it does, continue with commit
-		                     * to tidy-up.
-		                     */
+		                if (!preventCommit()) {
+                            /*
+                                    * This should not happen. If it does, continue with commit
+                                    * to tidy-up.
+                                    */
 
-		                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator_1");
-		                }
+                            tsLogger.i18NLogger.warn_coordinator_TwoPhaseCoordinator_1();
+                        }
 		            }
 		        }
 		    }
@@ -350,12 +345,11 @@
 
 	protected boolean afterCompletion (int myStatus)
 	{
-		if (myStatus == ActionStatus.RUNNING)
-		{
-			tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator_3");
+		if (myStatus == ActionStatus.RUNNING) {
+            tsLogger.i18NLogger.warn_coordinator_TwoPhaseCoordinator_3();
 
-			return false;
-		}
+            return false;
+        }
 
 		boolean problem = false;
 
@@ -387,26 +381,20 @@
 
 						try
 						{
-							if (!record.afterCompletion(myStatus))
-							{
-								tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator_4", new Object[]
-								{ record });
+							if (!record.afterCompletion(myStatus)) {
+                                tsLogger.i18NLogger.warn_coordinator_TwoPhaseCoordinator_4(record.toString());
 
-								problem = true;
-							}
+                                problem = true;
+                            }
 						}
-						catch (Exception ex)
-						{
-							tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator_4a", new Object[]
-							{ record, ex }, ex);
-							problem = true;
-						}
-						catch (Error er)
-						{
-							tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator_4b", new Object[]
-							{ record, er }, er);
-							problem = true;
-						}
+						catch (Exception ex) {
+                            tsLogger.i18NLogger.warn_coordinator_TwoPhaseCoordinator_4a(record.toString(), ex);
+                            problem = true;
+                        }
+						catch (Error er) {
+                            tsLogger.i18NLogger.warn_coordinator_TwoPhaseCoordinator_4b(record.toString(), er);
+                            problem = true;
+                        }
 					}
 
                     synchronized (_synchs) {

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	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -210,7 +210,7 @@
             }
             catch (final Throwable ex)
             {
-                throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.arjuna.coordinator.invalidos")+" "+recoveryType);
+                throw new FatalError(tsLogger.i18NLogger.get_coordinator_invalidos() + " "+recoveryType);
             }
             
             return _recoveryStore;
@@ -264,7 +264,7 @@
 	        {
 	            ex.printStackTrace();
 	            
-	            throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.arjuna.coordinator.invalidos")+" "+actionStoreType);
+	            throw new FatalError(tsLogger.i18NLogger.get_coordinator_invalidos() + " "+actionStoreType);
 	        }
 
         return _objectStore;
@@ -294,11 +294,9 @@
 	{
 	    if (name.length > NODE_NAME_SIZE)
 	    {
-	        if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                        tsLogger.arjLoggerI18N.warn(
-                                        "com.arjuna.ats.arjuna.coordinator.toolong");
-                }
+	        if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_coordinator_toolong();
+            }
 	        
 	        throw new IllegalArgumentException();
 	    }
@@ -416,13 +414,9 @@
 		    
 		    String nodeName = DEFAULT_NODE_NAME+Utility.getpid();
 
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			{
-				tsLogger.arjLoggerI18N.warn(
-						"com.arjuna.ats.arjuna.coordinator.TxControl_1",
-						new Object[]
-						{ nodeName });
-			}
+			if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_coordinator_TxControl_1(nodeName);
+            }
 
 			xaNodeName = nodeName.getBytes();
 
@@ -433,13 +427,9 @@
 		{
 		    String nodeName = DEFAULT_NODE_NAME+Utility.getpid();
 
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			{
-				tsLogger.arjLoggerI18N.warn(
-						"com.arjuna.ats.arjuna.coordinator.TxControl_2",
-						new Object[]
-						{ nodeName });
-			}
+			if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_coordinator_TxControl_2(nodeName);
+            }
 
 			xaNodeName = nodeName.getBytes();
 
@@ -450,13 +440,9 @@
 		{
 		    String nodeName = DEFAULT_NODE_NAME+Utility.getpid();
 
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			{
-				tsLogger.arjLoggerI18N.warn(
-						"com.arjuna.ats.arjuna.coordinator.TxControl_3",
-						new Object[]
-						{ nodeName });
-			}
+			if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_coordinator_TxControl_3(nodeName);
+            }
 
 			xaNodeName = nodeName.getBytes();
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/arjunaI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/arjunaI18NLogger.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/arjunaI18NLogger.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -20,6 +20,7 @@
  */
 package com.arjuna.ats.arjuna.logging;
 
+import com.arjuna.ats.arjuna.common.Uid;
 import org.jboss.logging.*;
 import static org.jboss.logging.Logger.Level.*;
 import static org.jboss.logging.Message.Format.*;
@@ -41,1716 +42,1395 @@
 
 	@Message(id = 12001, value = "ActivationRecord::set_value() called illegally", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_ActivationRecord_1();
+	public void warn_ActivationRecord_1();
 
 	@Message(id = 12002, value = "Invocation of ActivationRecord::restore_state for {0} inappropriate - ignored for {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_ActivationRecord_2(String arg0, String arg1);
+	public void warn_ActivationRecord_2(String arg0, Uid arg1);
 
 	@Message(id = 12003, value = "Attempted abort operation on deleted object id {0} of type {1} ignored", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_CadaverRecord_1(String arg0, String arg1);
+	public void warn_CadaverRecord_1(Uid arg0, String arg1);
 
 	@Message(id = 12004, value = "DisposeRecord::save_state - type of store is unknown", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_DisposeRecord_1();
+	public void warn_DisposeRecord_1();
 
 	@Message(id = 12005, value = "DisposeRecord::save_state - failed", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_DisposeRecord_2();
+	public void warn_DisposeRecord_2();
 
 	@Message(id = 12006, value = "DisposeRecord::save_state - no object store defined.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_DisposeRecord_3();
+	public void warn_DisposeRecord_3();
 
 	@Message(id = 12007, value = "DisposeRecord::restore_state - invalid store type {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_DisposeRecord_4(String arg0);
+	public void warn_DisposeRecord_4(String arg0);
 
-	@Message(id = 12008, value = "DisposeRecord::topLevelCommit - exception while deleting state {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12008, value = "DisposeRecord::topLevelCommit - exception while deleting state", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_DisposeRecord_5(String arg0);
+	public void warn_DisposeRecord_5(Throwable arg0);
 
-	@Message(id = 12009, value = "PersistenceRecord::topLevelCommit() : About to commit state, uid = {0}, ObjType = {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12009, value = "PersistenceRecord::restore_state: Failed to unpack object store type", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_1(String arg0, String arg1);
+	public void warn_PersistenceRecord_10();
 
-	@Message(id = 12010, value = "PersistenceRecord::restore_state: Failed to unpack object store type", format = MESSAGE_FORMAT)
+	@Message(id = 12010, value = "PersistenceRecord::save_state - type of store is unknown", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_10();
+	public void warn_PersistenceRecord_11();
 
-	@Message(id = 12011, value = "PersistenceRecord::save_state - type of store is unknown", format = MESSAGE_FORMAT)
+	@Message(id = 12011, value = "PersistenceRecord::save_state - packing top level state failed", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_11();
+	public void warn_PersistenceRecord_14();
 
-	@Message(id = 12012, value = "PersistenceRecord::save_state: Packed object store type = {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12012, value = "PersistenceRecord::save_state - failed", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_12(String arg0);
+	public void warn_PersistenceRecord_15();
 
-	@Message(id = 12013, value = "PersistenceRecord::save_state: Packed object store root", format = MESSAGE_FORMAT)
+	@Message(id = 12013, value = "PersistenceRecord::save_state - no object store defined for object", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_13();
+	public void warn_PersistenceRecord_16();
 
-	@Message(id = 12014, value = "PersistenceRecord::save_state - packing top level state failed", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_14();
+//	@Message(id = 12014, value = "PersistenceRecord::topLevelAbort() - Expecting state but found none!", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_PersistenceRecord_18();
 
-	@Message(id = 12015, value = "PersistenceRecord::save_state - failed", format = MESSAGE_FORMAT)
+	@Message(id = 12015, value = "PersistenceRecord::topLevelAbort() - Could not remove state from object store!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_15();
+	public void warn_PersistenceRecord_19();
 
-	@Message(id = 12016, value = "PersistenceRecord::save_state - no object store defined for object", format = MESSAGE_FORMAT)
+	@Message(id = 12016, value = "PersistenceRecord::topLevelCommit - commit_state call failed for {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_16();
+	public void warn_PersistenceRecord_2(Uid arg0);
 
-	@Message(id = 12017, value = "PersistenceRecord::PersistenceRecord() - crash recovery constructor", format = MESSAGE_FORMAT)
+	@Message(id = 12017, value = "PersistenceRecord::topLevelAbort() - Received ObjectStoreException", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_17();
+	public void warn_PersistenceRecord_20(Throwable arg0);
 
-	@Message(id = 12018, value = "PersistenceRecord::topLevelAbort() - Expecting state but found none!", format = MESSAGE_FORMAT)
+	@Message(id = 12018, value = "PersistenceRecord.topLevelPrepare - write_uncommitted error", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_18();
+	public void warn_PersistenceRecord_21(Throwable arg0);
 
-	@Message(id = 12019, value = "PersistenceRecord::topLevelAbort() - Could not remove state from object store!", format = MESSAGE_FORMAT)
+	@Message(id = 12019, value = "PersistenceRecord::topLevelCommit - no state to commit!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_19();
+	public void warn_PersistenceRecord_3();
 
-	@Message(id = 12020, value = "PersistenceRecord::topLevelCommit - commit_state call failed for {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12020, value = "PersistenceRecord::topLevelCommit - caught exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_2(String arg0);
+	public void warn_PersistenceRecord_4(Throwable arg0);
 
-	@Message(id = 12021, value = "PersistenceRecord::topLevelAbort() - Received ObjectStoreException {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12021, value = "PersistenceRecord::topLevelCommit - no object store specified!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_20(String arg0);
+	public void warn_PersistenceRecord_5();
 
-	@Message(id = 12022, value = "PersistenceRecord.topLevelPrepare - write_uncommitted error", format = MESSAGE_FORMAT)
+	@Message(id = 12022, value = "PersistenceRecord::topLevelCommit - commit_state error", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_21();
+	public void warn_PersistenceRecord_6();
 
-	@Message(id = 12023, value = "PersistenceRecord::topLevelCommit - no state to commit!", format = MESSAGE_FORMAT)
+	@Message(id = 12023, value = "PersistenceRecord deactivate error, object probably already deactivated!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_3();
+	public void warn_PersistenceRecord_7();
 
-	@Message(id = 12024, value = "PersistenceRecord::topLevelCommit - caught exception: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12024, value = "PersistenceRecord.topLevelPrepare - setup error!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_4(String arg0);
+	public void warn_PersistenceRecord_8();
 
-	@Message(id = 12025, value = "PersistenceRecord::topLevelCommit - no object store specified!", format = MESSAGE_FORMAT)
+	@Message(id = 12025, value = "RecoveryRecord::setValue not given OutputObjectState.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_5();
+	public void warn_RecoveryRecord_1();
 
-	@Message(id = 12026, value = "PersistenceRecord::topLevelCommit - commit_state error", format = MESSAGE_FORMAT)
+	@Message(id = 12026, value = "RecoveryRecord::nestedAbort - restore_state on object failed!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_6();
+	public void warn_RecoveryRecord_2();
 
-	@Message(id = 12027, value = "PersistenceRecord deactivate error, object probably already deactivated!", format = MESSAGE_FORMAT)
+	@Message(id = 12027, value = "StateManager::terminate() should be invoked in every destructor", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_7();
+	public void warn_StateManager_1();
 
-	@Message(id = 12028, value = "PersistenceRecord.topLevelPrepare - setup error!", format = MESSAGE_FORMAT)
+	@Message(id = 12028, value = "StateManager::modified() invocation on an object whose state has not been restored - activating object", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_8();
+	public void warn_StateManager_10();
 
-	@Message(id = 12029, value = "PersistenceRecord::restore_state: Just unpacked object store type = {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12029, value = "Delete called on object with uid {0} and type {1} within atomic action.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_PersistenceRecord_9(String arg0);
+	public void warn_StateManager_11(Uid arg0, String arg1);
 
-	@Message(id = 12030, value = "RecoveryRecord::setValue not given OutputObjectState.", format = MESSAGE_FORMAT)
+	@Message(id = 12030, value = "StateManager.cleanup - could not save_state from terminate!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_RecoveryRecord_1();
+	public void warn_StateManager_12();
 
-	@Message(id = 12031, value = "RecoveryRecord::nestedAbort - restore_state on object failed!", format = MESSAGE_FORMAT)
+	@Message(id = 12031, value = "Attempt to use volatile store.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_RecoveryRecord_2();
+	public void warn_StateManager_13();
 
-	@Message(id = 12032, value = "StateManager::terminate() should be invoked in every destructor", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_StateManager_1();
+	@Message(id = 12032, value = "Volatile store not implemented!", format = MESSAGE_FORMAT)
+	public String get_StateManager_14();
 
-	@Message(id = 12033, value = "StateManager::modified() invocation on an object whose state has not been restored - activating object", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_StateManager_10();
+	@Message(id = 12033, value = "Invalid object state.", format = MESSAGE_FORMAT)
+	public String get_StateManager_15();
 
-	@Message(id = 12034, value = "Delete called on object with uid {0} and type {1} within atomic action.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_StateManager_11(String arg0, String arg1);
+	@Message(id = 12034, value = "Invalid object store type:", format = MESSAGE_FORMAT)
+	public String get_StateManager_16();
 
-	@Message(id = 12035, value = "StateManager.cleanup - could not save_state from terminate!", format = MESSAGE_FORMAT)
+	@Message(id = 12035, value = "Activate of object with id = {0} and type {1} unexpectedly failed", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_StateManager_12();
+	public void warn_StateManager_2(Uid arg0, String arg1);
 
-	@Message(id = 12036, value = "Attempt to use volatile store.", format = MESSAGE_FORMAT)
+	@Message(id = 12036, value = "StateManager::deactivate - object store error", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_StateManager_13();
+	public void warn_StateManager_3(Throwable arg0);
 
-	@Message(id = 12037, value = "Volatile store not implemented!", format = MESSAGE_FORMAT)
+	@Message(id = 12037, value = "StateManager::deactivate - save_state error", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_StateManager_14();
+	public void warn_StateManager_4();
 
-	@Message(id = 12038, value = "Invalid object state.", format = MESSAGE_FORMAT)
+	@Message(id = 12038, value = "StateManager.destroy - failed to add abstract record to transaction {0}; check transaction status.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_StateManager_15();
+	public void warn_StateManager_6(Uid arg0);
 
-	@Message(id = 12039, value = "Invalid object store type:", format = MESSAGE_FORMAT)
+	@Message(id = 12039, value = "StateManager.destroy - caught object store exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_StateManager_16();
+	public void warn_StateManager_7(Throwable arg0);
 
-	@Message(id = 12040, value = "Activate of object with id = {0} and type {1} unexpectedly failed\"", format = MESSAGE_FORMAT)
+	@Message(id = 12040, value = "StateManager.destroy - called on non-persistent or new object!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_StateManager_2(String arg0, String arg1);
+	public void warn_StateManager_8();
 
-	@Message(id = 12041, value = "StateManager::deactivate - object store error", format = MESSAGE_FORMAT)
+	@Message(id = 12041, value = "StateManager.restore_state - could not find StateManager state in object state!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_StateManager_3();
+	public void warn_StateManager_9();
 
-	@Message(id = 12042, value = "StateManager::deactivate - save_state error", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_StateManager_4();
+//	@Message(id = 12042, value = "Mutex being destroyed with waiters.", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_common_Mutex_1();
 
-	@Message(id = 12043, value = "StateManager::destroy for object-id {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12043, value = "Mutex.unlock - called by non-owning thread!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_StateManager_5(String arg0);
+	public void warn_common_Mutex_2();
 
-	@Message(id = 12044, value = "StateManager.destroy - failed to add abstract record to transaction {0}; check transaction status.", format = MESSAGE_FORMAT)
+	@Message(id = 12044, value = "cannot get local host.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_StateManager_6(String arg0);
+	public void warn_common_Uid_1();
 
-	@Message(id = 12045, value = "StateManager.destroy - caught object store exception: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_StateManager_7(String arg0);
+//	@Message(id = 12045, value = "Cannot unpack into nullUid!", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_common_Uid_10();
 
-	@Message(id = 12046, value = "StateManager.destroy - called on non-persistent or new object!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_StateManager_8();
+	@Message(id = 12046, value = "Uid.Uid recreate constructor could not recreate Uid!", format = MESSAGE_FORMAT)
+	public String get_common_Uid_11();
 
-	@Message(id = 12047, value = "StateManager.restore_state - could not find StateManager state in object state!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_StateManager_9();
+	@Message(id = 12047, value = "Uid.Uid string constructor could not create nullUid", format = MESSAGE_FORMAT)
+	public String get_common_Uid_2();
 
-	@Message(id = 12048, value = "Mutex being destroyed with waiters.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_common_Mutex_1();
+	@Message(id = 12048, value = "Uid general parsing error: {0}", format = MESSAGE_FORMAT)
+    @LogMessage(level = WARN)
+	public void warn_common_Uid_3(String arg0, Throwable arg1);
 
-	@Message(id = 12049, value = "Mutex.unlock - called by non-owning thread!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_common_Mutex_2();
+	@Message(id = 12049, value = "Uid.Uid string constructor could not create nullUid for incorrect string: {0}", format = MESSAGE_FORMAT)
+	@LogMessage(level = FATAL)
+	public void fatal_common_Uid_4(String arg0);
 
-	@Message(id = 12050, value = "cannot get local host.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_common_Uid_1();
+	@Message(id = 12050, value = "Uid.Uid string constructor incorrect: {0}", format = MESSAGE_FORMAT)
+	public String get_common_Uid_5(String arg0);
 
-	@Message(id = 12051, value = "Cannot unpack into nullUid!", format = MESSAGE_FORMAT)
+	@Message(id = 12051, value = "Uid.generateHash called for invalid Uid. Will ignore.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_common_Uid_10();
+	public void warn_common_Uid_6();
 
-	@Message(id = 12052, value = "Uid.Uid recreate constructor could not recreate Uid!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_common_Uid_11();
+//	@Message(id = 12052, value = "nullUid error for", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_common_Uid_7();
 
-	@Message(id = 12053, value = "Uid.Uid string constructor could not create nullUid", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_common_Uid_2();
+//	@Message(id = 12053, value = "Invalid string:", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_common_Uid_8();
 
-	@Message(id = 12054, value = "Uid general parsing error: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_common_Uid_3(String arg0);
+//	@Message(id = 12054, value = "Invalid Uid object.", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_common_Uid_9();
 
-	@Message(id = 12055, value = "Uid.Uid string constructor could not create nullUid for incorrect string: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12055, value = "Exception thrown creating Uid from bytes!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_common_Uid_4(String arg0);
+	public void warn_common_Uid_bytes(Throwable arg0);
 
-	@Message(id = 12056, value = "Uid.Uid string constructor incorrect: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12056, value = "Exception thrown getting bytes!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_common_Uid_5(String arg0);
+	public void warn_common_Uid_getbytes(Throwable arg0);
 
-	@Message(id = 12057, value = "Uid.generateHash called for invalid Uid. Will ignore.", format = MESSAGE_FORMAT)
+	@Message(id = 12057, value = "Uid.Uid string constructor {0} caught other throwable", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_common_Uid_6();
+	public void warn_common_Uid_npe(String arg0, Throwable arg1);
 
-	@Message(id = 12058, value = "nullUid error for", format = MESSAGE_FORMAT)
+	@Message(id = 12058, value = "AbstractRecord.create {0} failed to find record.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_common_Uid_7();
+	public void warn_coordinator_AbstractRecord_npe(String arg0);
 
-	@Message(id = 12059, value = "Invalid string:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_common_Uid_8();
+	@Message(id = 12059, value = "Memory exhausted.", format = MESSAGE_FORMAT)
+	public String get_coordinator_ActionHierarchy_1();
 
-	@Message(id = 12060, value = "Invalid Uid object.", format = MESSAGE_FORMAT)
+	@Message(id = 12060, value = "Action nesting error - deletion of action id {0} invoked while child actions active", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_common_Uid_9();
+	public void warn_coordinator_BasicAction_1(Uid arg0);
 
-	@Message(id = 12061, value = "Exception thrown creating Uid from bytes!", format = MESSAGE_FORMAT)
+	@Message(id = 12061, value = "Aborting child {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_common_Uid_bytes();
+	public void warn_coordinator_BasicAction_2(Uid arg0);
 
-	@Message(id = 12062, value = "Exception thrown getting bytes!", format = MESSAGE_FORMAT)
+	@Message(id = 12062, value = "BasicAction.restore_state - could not recover {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_common_Uid_getbytes();
+	public void warn_coordinator_BasicAction_21(String arg0);
 
-	@Message(id = 12063, value = "Uid.Uid string constructor {0} caught other throwable: {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12063, value = "BasicAction.restore_state - error unpacking action status.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_common_Uid_npe(String arg0, String arg1);
+	public void warn_coordinator_BasicAction_24();
 
-	@Message(id = 12064, value = "AbstractRecord::AbstractRecord () - crash recovery constructor", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_AbstractRecord_1();
+//	@Message(id = 12064, value = "BasicAction.destroy called on {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_coordinator_BasicAction_28(String arg0);
 
-	@Message(id = 12065, value = "AbstractRecord.create {0} failed to find record.", format = MESSAGE_FORMAT)
+	@Message(id = 12065, value = "BasicAction.Begin of action {0} ignored - incorrect invocation sequence {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_AbstractRecord_npe(String arg0);
+	public void warn_coordinator_BasicAction_29(Uid arg0, String arg1);
 
-	@Message(id = 12066, value = "Memory exhausted.", format = MESSAGE_FORMAT)
+	@Message(id = 12066, value = "Destructor of still running action id {0} invoked - Aborting", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_ActionHierarchy_1();
+	public void warn_coordinator_BasicAction_3(Uid arg0);
 
-	@Message(id = 12067, value = "Action nesting error - deletion of action id {0} invoked while child actions active", format = MESSAGE_FORMAT)
+	@Message(id = 12067, value = "BasicAction.Begin of action {0} ignored - no parent and set as nested action!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_1(String arg0);
+	public void warn_coordinator_BasicAction_30(Uid arg0);
 
-	@Message(id = 12068, value = "BasicAction::addAction () action {0} adding {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12068, value = "BasicAction.Begin of action {0} ignored - parent action {1} is not running: {2}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_10(String arg0, String arg1);
+	public void warn_coordinator_BasicAction_31(Uid arg0, Uid arg1, String arg2);
 
-	@Message(id = 12069, value = "BasicAction::addChildAction () action {0} adding {1} result = {2}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_11(String arg0, String arg1, String arg2);
+//	@Message(id = 12069, value = "The Arjuna licence does not permit any further transactions to be committed!", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_coordinator_BasicAction_32();
 
-	@Message(id = 12070, value = "BasicAction::removeChildAction () action {0} removing {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12070, value = "End called on non-running atomic action {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_12(String arg0, String arg1);
+	public void warn_coordinator_BasicAction_33(Uid arg0);
 
-	@Message(id = 12071, value = "BasicAction::removeChildAction () action {0} removing {1} result = {2}", format = MESSAGE_FORMAT)
+	@Message(id = 12071, value = "End called on already committed atomic action {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_13(String arg0, String arg1, String arg2);
+	public void warn_coordinator_BasicAction_34(Uid arg0);
 
-	@Message(id = 12072, value = "BasicAction::save_state - next record to pack is a   {0} record ({1}) should save it? = {2}", format = MESSAGE_FORMAT)
+	@Message(id = 12072, value = "End called illegally on atomic action {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_14(String arg0, String arg1, String arg2);
+	public void warn_coordinator_BasicAction_35(Uid arg0);
 
-	@Message(id = 12073, value = "Packing a {0} record", format = MESSAGE_FORMAT)
+	@Message(id = 12073, value = "BasicAction.End() - prepare phase of action-id {0} failed.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_15(String arg0);
+	public void warn_coordinator_BasicAction_36(Uid arg0);
 
-	@Message(id = 12074, value = "Packing a NONE_RECORD", format = MESSAGE_FORMAT)
+	@Message(id = 12074, value = "Received heuristic: {0} .", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_16();
+	public void warn_coordinator_BasicAction_37(String arg0);
 
-	@Message(id = 12075, value = "HeuristicList - packing a {0} record", format = MESSAGE_FORMAT)
+	@Message(id = 12075, value = "Action Aborting", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_17(String arg0);
+	public void warn_coordinator_BasicAction_38();
 
-	@Message(id = 12076, value = "HeuristicList - packing a NONE_RECORD", format = MESSAGE_FORMAT)
+	@Message(id = 12076, value = "Abort called on non-running atomic action {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_18();
+	public void warn_coordinator_BasicAction_39(Uid arg0);
 
-	@Message(id = 12077, value = "Packing action status of {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12077, value = "Abort called on already aborted atomic action {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_19(String arg0);
+	public void warn_coordinator_BasicAction_40(Uid arg0);
 
-	@Message(id = 12078, value = "Aborting child {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12078, value = "Abort called illegaly on atomic action {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_2(String arg0);
+	public void warn_coordinator_BasicAction_41(Uid arg0);
 
-	@Message(id = 12079, value = "Unpacked a {0} record", format = MESSAGE_FORMAT)
+	@Message(id = 12079, value = "BasicAction {0} - non-empty ( {1} ) pendingList {2}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_20(String arg0);
+	public void warn_coordinator_BasicAction_42(Uid arg0, String arg1, String arg2);
 
-	@Message(id = 12080, value = "BasicAction.restore_state - could not recover {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12080, value = "Transaction {0} marked as rollback only. Will abort.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_21(String arg0);
+	public void warn_coordinator_BasicAction_43(Uid arg0);
 
-	@Message(id = 12081, value = "HeuristicList - Unpacked heuristic list size of {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12081, value = "Cannot force parent to rollback - no handle!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_22(String arg0);
+	public void warn_coordinator_BasicAction_44();
 
-	@Message(id = 12082, value = "HeuristicList - Unpacked a {0} record", format = MESSAGE_FORMAT)
+	@Message(id = 12082, value = "BasicAction::prepare - creating intentions list failed for {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_23(String arg0);
+	public void warn_coordinator_BasicAction_45(Uid arg0);
 
-	@Message(id = 12083, value = "BasicAction.restore_state - error unpacking action status.", format = MESSAGE_FORMAT)
+	@Message(id = 12083, value = "BasicAction::prepare - intentions list write failed for {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_24();
+	public void warn_coordinator_BasicAction_46(Uid arg0);
 
-	@Message(id = 12084, value = "Restored action status of {0} {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12084, value = "One-phase commit of action {0} received heuristic decision: {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_25(String arg0, String arg1);
+	public void warn_coordinator_BasicAction_47(Uid arg0, String arg1);
 
-	@Message(id = 12085, value = "Restored action type {0} {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_26(String arg0, String arg1);
+	@Message(id = 12085, value = "BasicAction.onePhaseCommit failed - no object store for atomic action state!", format = MESSAGE_FORMAT)
+	@LogMessage(level = FATAL)
+	public void fatal_coordinator_BasicAction_48();
 
-	@Message(id = 12086, value = "Restored heuristic decision of {0} {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12086, value = "Prepare phase of nested action {0} received inconsistent outcomes.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_27(String arg0, String arg1);
+	public void warn_coordinator_BasicAction_49(Uid arg0);
 
-	@Message(id = 12087, value = "BasicAction.destroy called on {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12087, value = "Activate of atomic action with id {0} and type {1} unexpectedly failed, could not load state.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_28(String arg0);
+	public void warn_coordinator_BasicAction_5(Uid arg0, String arg1);
 
-	@Message(id = 12088, value = "BasicAction.Begin of action {0} ignored - incorrect invocation sequence {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12088, value = "Prepare phase of action {0} received heuristic decision: {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_29(String arg0, String arg1);
+	public void warn_coordinator_BasicAction_50(Uid arg0, String arg1);
 
-	@Message(id = 12089, value = "Destructor of still running action id {0} invoked - Aborting", format = MESSAGE_FORMAT)
+	@Message(id = 12089, value = "Top-level abort of action {0} received heuristic decision: {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_3(String arg0);
+	public void warn_coordinator_BasicAction_52(Uid arg0, String arg1);
 
-	@Message(id = 12090, value = "BasicAction.Begin of action {0} ignored - no parent and set as nested action!", format = MESSAGE_FORMAT)
+	@Message(id = 12090, value = "Nested abort of action {0} received heuristic decision: {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_30(String arg0);
+	public void warn_coordinator_BasicAction_53(Uid arg0, String arg1);
 
-	@Message(id = 12091, value = "BasicAction.Begin of action {0} ignored - parent action {1} is not running: {2}", format = MESSAGE_FORMAT)
+	@Message(id = 12091, value = "Top-level abort of action {0} received {1} from {2}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_31(String arg0, String arg1, String arg2);
+	public void warn_coordinator_BasicAction_54(Uid arg0, String arg1, String arg2);
 
-	@Message(id = 12092, value = "The Arjuna licence does not permit any further transactions to be committed!", format = MESSAGE_FORMAT)
+	@Message(id = 12092, value = "Nested abort of action {0} received {1} from {2}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_32();
+	public void warn_coordinator_BasicAction_55(Uid arg0, String arg1, String arg2);
 
-	@Message(id = 12093, value = "End called on non-running atomic action {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12093, value = "BasicAction.checkIsCurrent {0} - terminating non-current transaction: {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_33(String arg0);
+	public void warn_coordinator_BasicAction_56(Uid arg0, Uid arg1);
 
-	@Message(id = 12094, value = "End called on already committed atomic action {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12094, value = "Commit of action id {0} invoked while multiple threads active within it.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_34(String arg0);
+	public void warn_coordinator_BasicAction_57(Uid arg0);
 
-	@Message(id = 12095, value = "End called illegally on atomic action {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12095, value = "Abort of action id {0} invoked while multiple threads active within it.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_35(String arg0);
+	public void warn_coordinator_BasicAction_58(Uid arg0);
 
-	@Message(id = 12096, value = "BasicAction.End() - prepare phase of action-id {0} failed.", format = MESSAGE_FORMAT)
+	@Message(id = 12096, value = "Commit of action id {0} invoked while child actions active", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_36(String arg0);
+	public void warn_coordinator_BasicAction_59(Uid arg0);
 
-	@Message(id = 12097, value = "Received heuristic: {0} .", format = MESSAGE_FORMAT)
+	@Message(id = 12097, value = "Deactivate of atomic action with id {0} and type {1} unexpectedly failed, could not save state.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_37(String arg0);
+	public void warn_coordinator_BasicAction_5a(Uid arg0, String arg1);
 
-	@Message(id = 12098, value = "Action Aborting", format = MESSAGE_FORMAT)
+	@Message(id = 12098, value = "Abort of action id {0} invoked while child actions active", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_38();
+	public void warn_coordinator_BasicAction_60(Uid arg0);
 
-	@Message(id = 12099, value = "Abort called on non-running atomic action {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12099, value = "Aborting child: {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_39(String arg0);
+	public void warn_coordinator_BasicAction_61(Uid arg0);
 
-	@Message(id = 12100, value = "Abort called on already aborted atomic action {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12100, value = "Now aborting self: {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_40(String arg0);
+	public void warn_coordinator_BasicAction_62(String arg0);
 
-	@Message(id = 12101, value = "Abort called illegaly on atomic action {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12101, value = "BasicAction.updateState - Could not create ObjectState for failedList", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_41(String arg0);
+	public void warn_coordinator_BasicAction_64();
 
-	@Message(id = 12102, value = "BasicAction {0} - non-empty ( {1} ) pendingList {2}", format = MESSAGE_FORMAT)
+	@Message(id = 12102, value = "BasicAction.End - Could not write failed list", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_42(String arg0, String arg1, String arg2);
+	public void warn_coordinator_BasicAction_65();
 
-	@Message(id = 12103, value = "Transaction {0} marked as rollback only. Will abort.", format = MESSAGE_FORMAT)
+	@Message(id = 12103, value = "(Internal) BasicAction.merge - record rejected", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_43(String arg0);
+	public void warn_coordinator_BasicAction_68();
 
-	@Message(id = 12104, value = "Cannot force parent to rollback - no handle!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_44();
+	@Message(id = 12104, value = "No object store for:", format = MESSAGE_FORMAT)
+	public String get_coordinator_BasicAction_69();
 
-	@Message(id = 12105, value = "BasicAction::prepare - creating intentions list failed for {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12105, value = "Could not remove intentions list:", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_45(String arg0);
+	public void warn_coordinator_BasicAction_70(Throwable arg0);
 
-	@Message(id = 12106, value = "BasicAction::prepare - intentions list write failed for {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_46(String arg0);
+//	@Message(id = 12106, value = "Deactivation of atomic action with id {0} and type {1} unexpectedly failed", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_coordinator_BasicAction_71(String arg0, String arg1);
 
-	@Message(id = 12107, value = "One-phase commit of action {0} received heuristic decision: {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12107, value = "CheckedAction::check - atomic action {0} commiting with {1} threads active!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_47(String arg0, String arg1);
+	public void warn_coordinator_CheckedAction_1(Uid arg0, String arg1);
 
-	@Message(id = 12108, value = "BasicAction.onePhaseCommit failed - no object store for atomic action state!", format = MESSAGE_FORMAT)
+	@Message(id = 12108, value = "CheckedAction::check - atomic action {0} aborting with {1} threads active!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_48();
+	public void warn_coordinator_CheckedAction_2(Uid arg0, String arg1);
 
-	@Message(id = 12109, value = "Prepare phase of nested action {0} received inconsistent outcomes.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_49(String arg0);
+	@Message(id = 12109, value = "TransactionReaper - attempting to insert an element that is already present.", format = MESSAGE_FORMAT)
+	public String get_coordinator_TransactionReaper_1();
 
-	@Message(id = 12110, value = "Activate of atomic action with id {0} and type {1} unexpectedly failed, could not load state.", format = MESSAGE_FORMAT)
+	@Message(id = 12110, value = "TransactionReaper::check successfuly marked TX {0} as rollback only", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_5(String arg0, String arg1);
+	public void warn_coordinator_TransactionReaper_10(Uid arg0);
 
-	@Message(id = 12111, value = "Prepare phase of action {0} received heuristic decision: {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12111, value = "TransactionReaper::check failed to mark TX {0}  as rollback only", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_50(String arg0, String arg1);
+	public void warn_coordinator_TransactionReaper_11(Uid arg0);
 
-	@Message(id = 12112, value = "BasicAction.doCommit for {0} received {1} from {2}", format = MESSAGE_FORMAT)
+	@Message(id = 12112, value = "TransactionReaper::check exception while marking TX {0} as rollback only", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_51(String arg0, String arg1, String arg2);
+	public void warn_coordinator_TransactionReaper_12(Uid arg0, Throwable arg1);
 
-	@Message(id = 12113, value = "Top-level abort of action {0} received heuristic decision: {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12113, value = "TransactionReaper::doCancellations worker {0} missed interrupt when cancelling TX {1} -- exiting as zombie (zombie count decremented to {2})", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_52(String arg0, String arg1);
+	public void warn_coordinator_TransactionReaper_13(String arg0, Uid arg1, String arg2);
 
-	@Message(id = 12114, value = "Nested abort of action {0} received heuristic decision: {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12114, value = "TransactionReaper::doCancellations worker {0} successfuly marked TX {1} as rollback only", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_53(String arg0, String arg1);
+	public void warn_coordinator_TransactionReaper_14(String arg0, Uid arg1);
 
-	@Message(id = 12115, value = "Top-level abort of action {0} received {1} from {2}", format = MESSAGE_FORMAT)
+	@Message(id = 12115, value = "TransactionReaper::doCancellations worker {0} failed to mark TX {1}  as rollback only", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_54(String arg0, String arg1, String arg2);
+	public void warn_coordinator_TransactionReaper_15(String arg0, Uid arg1);
 
-	@Message(id = 12116, value = "Nested abort of action {0} received {1} from {2}", format = MESSAGE_FORMAT)
+	@Message(id = 12116, value = "TransactionReaper::doCancellations worker {0} exception while marking TX {1} as rollback only", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_55(String arg0, String arg1, String arg2);
+	public void warn_coordinator_TransactionReaper_16(String arg0, Uid arg1, Throwable arg2);
 
-	@Message(id = 12117, value = "BasicAction.checkIsCurrent {0} - terminating non-current transaction: {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12117, value = "TransactionReaper::check timeout for TX {0} in state  {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_56(String arg0, String arg1);
+	public void warn_coordinator_TransactionReaper_18(Uid arg0, String arg1);
 
-	@Message(id = 12118, value = "Commit of action id {0} invoked while multiple threads active within it.", format = MESSAGE_FORMAT)
+	@Message(id = 12118, value = "TransactionReaper NORMAL mode is deprecated. Update config to use PERIODIC for equivalent behaviour.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_57(String arg0);
+	public void warn_coordinator_TransactionReaper_19();
 
-	@Message(id = 12119, value = "Abort of action id {0} invoked while multiple threads active within it.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_58(String arg0);
+	@Message(id = 12119, value = "TransactionReaper::check worker zombie count {0} exceeds specified limit", format = MESSAGE_FORMAT)
+	@LogMessage(level = ERROR)
+	public void error_coordinator_TransactionReaper_5(String arg0);
 
-	@Message(id = 12120, value = "Commit of action id {0} invoked while child actions active", format = MESSAGE_FORMAT)
+	@Message(id = 12120, value = "TransactionReaper::check worker {0} not responding to interrupt when cancelling TX {1} -- worker marked as zombie and TX scheduled for mark-as-rollback", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_59(String arg0);
+	public void warn_coordinator_TransactionReaper_6(String arg0, Uid arg1);
 
-	@Message(id = 12121, value = "Deactivate of atomic action with id {0} and type {1} unexpectedly failed, could not save state.", format = MESSAGE_FORMAT)
+	@Message(id = 12121, value = "TransactionReaper::doCancellations worker {0} successfully canceled TX {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_5a(String arg0, String arg1);
+	public void warn_coordinator_TransactionReaper_7(String arg0, Uid arg1);
 
-	@Message(id = 12122, value = "BasicAction::addChildThread () action {0} adding {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12122, value = "TransactionReaper::doCancellations worker {0} failed to cancel TX {1} -- rescheduling for mark-as-rollback", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_6(String arg0, String arg1);
+	public void warn_coordinator_TransactionReaper_8(String arg0, Uid arg1);
 
-	@Message(id = 12123, value = "Abort of action id {0} invoked while child actions active", format = MESSAGE_FORMAT)
+	@Message(id = 12123, value = "TransactionReaper::doCancellations worker {0} exception during cancel of TX {1} -- rescheduling for mark-as-rollback", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_60(String arg0);
+	public void warn_coordinator_TransactionReaper_9(String arg0, Uid arg1, Throwable arg2);
 
-	@Message(id = 12124, value = "Aborting child: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12124, value = "TwoPhaseCoordinator.beforeCompletion - attempted rollback_only failed!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_61(String arg0);
+	public void warn_coordinator_TwoPhaseCoordinator_1();
 
-	@Message(id = 12125, value = "Now aborting self: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12125, value = "TwoPhaseCoordinator.beforeCompletion - failed for {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_62(String arg0);
+	public void warn_coordinator_TwoPhaseCoordinator_2(String arg0, Throwable arg1);
 
-	@Message(id = 12126, value = "BasicAction::removeAllChildThreads () action {0} removing {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12126, value = "TwoPhaseCoordinator.beforeCompletion TwoPhaseCoordinator.afterCompletion called on still running transaction!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_63(String arg0, String arg1);
+	public void warn_coordinator_TwoPhaseCoordinator_3();
 
-	@Message(id = 12127, value = "BasicAction.updateState - Could not create ObjectState for failedList", format = MESSAGE_FORMAT)
+	@Message(id = 12127, value = "TwoPhaseCoordinator.afterCompletion - returned failure for {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_64();
+	public void warn_coordinator_TwoPhaseCoordinator_4(String arg0);
 
-	@Message(id = 12128, value = "BasicAction.End - Could not write failed list", format = MESSAGE_FORMAT)
+	@Message(id = 12128, value = "TwoPhaseCoordinator.afterCompletion - failed for {0} with exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_65();
+	public void warn_coordinator_TwoPhaseCoordinator_4a(String arg0, Throwable arg1);
 
-	@Message(id = 12129, value = "Action {0} with parent status {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12129, value = "TwoPhaseCoordinator.afterCompletion - failed for {0} with error", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_66(String arg0, String arg1);
+	public void warn_coordinator_TwoPhaseCoordinator_4b(String arg0, Throwable arg1);
 
-	@Message(id = 12130, value = "Running Top Level Action {0} from within nested action ({1})", format = MESSAGE_FORMAT)
+	@Message(id = 12130, value = "Name of XA node not defined. Using {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_67(String arg0, String arg1);
+	public void warn_coordinator_TxControl_1(String arg0);
 
-	@Message(id = 12131, value = "(Internal) BasicAction.merge - record rejected", format = MESSAGE_FORMAT)
+	@Message(id = 12131, value = "Supplied name of node is too long. Using {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_68();
+	public void warn_coordinator_TxControl_2(String arg0);
 
-	@Message(id = 12132, value = "No object store for:", format = MESSAGE_FORMAT)
+	@Message(id = 12132, value = "Supplied name of node contains reserved character '-'. Using {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_69();
+	public void warn_coordinator_TxControl_3(String arg0);
 
-	@Message(id = 12133, value = "BasicAction::addChildThread () action {0} adding {1} result = {2}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_7(String arg0, String arg1, String arg2);
+//	@Message(id = 12133, value = "Cannot continue due to CheckedActionFactory resolution problem with", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_coordinator_cafactoryerror();
 
-	@Message(id = 12134, value = "Could not remove intentions list:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_70();
+//	@Message(id = 12134, value = "Failed to resolve CheckedActionFactory class {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_coordinator_checkedactionfactory(String arg0);
 
-	@Message(id = 12135, value = "Deactivation of atomic action with id {0} and type {1} unexpectedly failed", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_71(String arg0, String arg1);
+	@Message(id = 12135, value = "Could not create ObjectStore type:", format = MESSAGE_FORMAT)
+    public String get_coordinator_invalidos();
 
-	@Message(id = 12136, value = "BasicAction::removeChildThread () action {0} removing {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12136, value = "Could not recreate abstract record {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_8(String arg0, String arg1);
+	public void warn_coordinator_norecordfound(String arg0);
 
-	@Message(id = 12137, value = "BasicAction::removeChildThread () action {0} removing {1} result = {2}", format = MESSAGE_FORMAT)
+	@Message(id = 12137, value = "Cannot begin new transaction as TM is disabled. Marking as rollback-only.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_BasicAction_9(String arg0, String arg1, String arg2);
+	public void warn_coordinator_notrunning();
 
-	@Message(id = 12138, value = "CheckedAction::check - atomic action {0} commiting with {1} threads active!", format = MESSAGE_FORMAT)
+	@Message(id = 12138, value = "Node name cannot exceed 64 bytes!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_CheckedAction_1(String arg0, String arg1);
+	public void warn_coordinator_toolong();
 
-	@Message(id = 12139, value = "CheckedAction::check - atomic action {0} aborting with {1} threads active!", format = MESSAGE_FORMAT)
+	@Message(id = 12139, value = "You have chosen to disable the Multiple Last Resources warning. You will see it only once.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_CheckedAction_2(String arg0, String arg1);
+	public void warn_lastResource_disableWarning();
 
-	@Message(id = 12140, value = "RecordList::insert({0}) : merging {1} and {2} for {3}", format = MESSAGE_FORMAT)
+	@Message(id = 12140, value = "Adding multiple last resources is disallowed. Current resource is {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_RecordList_1(String arg0, String arg1, String arg2, String arg3);
+	public void warn_lastResource_disallow(String arg0);
 
-	@Message(id = 12141, value = "RecordList::insert({0}) : replacing {1} and {2} for {3}", format = MESSAGE_FORMAT)
+	@Message(id = 12141, value = "Multiple last resources have been added to the current transaction. This is transactionally unsafe and should not be relied upon. Current resource is {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_RecordList_2(String arg0, String arg1, String arg2, String arg3);
+	public void warn_lastResource_multipleWarning(String arg0);
 
-	@Message(id = 12142, value = "RecordList::insert({0}) : adding extra record of type {1} before {2} for {3}", format = MESSAGE_FORMAT)
+	@Message(id = 12142, value = "You have chosen to enable multiple last resources in the transaction manager. This is transactionally unsafe and should not be relied upon.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_RecordList_3(String arg0, String arg1, String arg2, String arg3);
+	public void warn_lastResource_startupWarning();
 
-	@Message(id = 12143, value = "RecordList::insert({0}) : inserting {1} for {2} before {3}", format = MESSAGE_FORMAT)
+	@Message(id = 12143, value = "unknown store: {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_RecordList_4(String arg0, String arg1, String arg2, String arg3);
+	public void warn_objectstore_ObjectStoreType_1(String arg0);
 
-	@Message(id = 12144, value = "RecordList::insert({0}) : appending {1} for {2}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_RecordList_5(String arg0, String arg1, String arg2);
+	@Message(id = 12144, value = "unknown store:", format = MESSAGE_FORMAT)
+	public String get_objectstore_ObjectStoreType_2();
 
-	@Message(id = 12145, value = "RecordList::insert({0}) : inserting {1} for {2} before {3} for {4}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_RecordList_6(String arg0, String arg1, String arg2, String arg3, String arg4);
+//	@Message(id = 12145, value = "No implementation!", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_objectstore_ObjectStore_1();
 
-	@Message(id = 12146, value = "TransactionReaper - attempting to insert an element that is already present.", format = MESSAGE_FORMAT)
+	@Message(id = 12146, value = "ActionStatusService: searching for uid: {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_1();
+	public void warn_recovery_ActionStatusService_5(Uid arg0, Throwable arg1);
 
-	@Message(id = 12147, value = "TransactionReaper::check successfuly marked TX {0} as rollback only", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_10(String arg0);
+	@Message(id = 12147, value = "transactionType: {0} uid: {1}   Status is {2}", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_ActionStatusService_1(String arg0, String arg1, String arg2);
 
-	@Message(id = 12148, value = "TransactionReaper::check failed to mark TX {0}  as rollback only", format = MESSAGE_FORMAT)
+	@Message(id = 12148, value = "Other Exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_11(String arg0);
+	public void warn_recovery_ActionStatusService_2(Throwable arg0);
 
-	@Message(id = 12149, value = "TransactionReaper::check exception while marking TX {0} as rollback only", format = MESSAGE_FORMAT)
+	@Message(id = 12149, value = "Exception retrieving action status", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_12(String arg0);
+	public void warn_recovery_ActionStatusService_3(Throwable arg0);
 
-	@Message(id = 12150, value = "TransactionReaper::doCancellations worker {0} missed interrupt when cancelling TX {1} -- exiting as zombie (zombie count decremented to {2})", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_13(String arg0, String arg1, String arg2);
+	@Message(id = 12150, value = "matching Uid {0} found", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_ActionStatusService_4(Uid arg0);
 
-	@Message(id = 12151, value = "TransactionReaper::doCancellations worker {0} successfuly marked TX {1} as rollback only", format = MESSAGE_FORMAT)
+	@Message(id = 12151, value = "Exception when accessing transaction store", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_14(String arg0, String arg1);
+	public void warn_recovery_ActionStatusService_6(Throwable arg0);
 
-	@Message(id = 12152, value = "TransactionReaper::doCancellations worker {0} failed to mark TX {1}  as rollback only", format = MESSAGE_FORMAT)
+	@Message(id = 12152, value = "Connection Lost to Recovery Manager", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_15(String arg0, String arg1);
+	public void warn_recovery_ActionStatusService_7();
 
-	@Message(id = 12153, value = "TransactionReaper::doCancellations worker {0} exception while marking TX {1} as rollback only", format = MESSAGE_FORMAT)
+	@Message(id = 12153, value = "RecoverAtomicAction.replayPhase2: Unexpected status: {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_16(String arg0, String arg1);
+	public void warn_recovery_RecoverAtomicAction_2(String arg0);
 
-	@Message(id = 12154, value = "TransactionReaper::getRemainingTimeoutMillis for {0} returning {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12154, value = "RecoverAtomicAction: transaction {0} not activated, unable to replay phase 2 commit. Check state has not already been completed.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_17(String arg0, String arg1);
+	public void warn_recovery_RecoverAtomicAction_4(Uid arg0);
 
-	@Message(id = 12155, value = "TransactionReaper::check timeout for TX {0} in state  {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12155, value = "RecoverAtomicAction - tried to move failed activation log {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_18(String arg0, String arg1);
+	public void warn_recovery_RecoverAtomicAction_5(Uid arg0);
 
-	@Message(id = 12156, value = "TransactionReaper NORMAL mode is deprecated. Update config to use PERIODIC for equivalent behaviour.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_19();
+//	@Message(id = 12156, value = "Invalid recovery manager port specified {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_RecoveryManager_1(String arg0);
 
-	@Message(id = 12157, value = "TransactionReaper::check - comparing {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_2(String arg0);
+//	@Message(id = 12157, value = "Invalid recovery manager host specified {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_RecoveryManager_2(String arg0);
 
-	@Message(id = 12158, value = "TransactionReaper::getTimeout for {0} returning {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_3(String arg0, String arg1);
+//	@Message(id = 12158, value = "Recovery manager bound to {0}:{1}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_RecoveryManager_3(String arg0, String arg1);
 
-	@Message(id = 12159, value = "TransactionReaper::check interrupting cancel in progress for {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_4(String arg0);
+	@Message(id = 12159, value = "Connected to recovery manager on {0}:{1}", format = MESSAGE_FORMAT)
+    @LogMessage(level = INFO)
+	public void info_recovery_RecoveryManager_4(String arg0, String arg1);
+//
+//	@Message(id = 12160, value = "Invalid recovery manager port specified", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_RecoveryManager_5();
 
-	@Message(id = 12160, value = "TransactionReaper::check worker zombie count {0} exceeds specified limit", format = MESSAGE_FORMAT)
+	@Message(id = 12161, value = "Exception when accessing data store", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_5(String arg0);
+	public void warn_recovery_TransactionStatusConnectionManager_1(Throwable arg0);
 
-	@Message(id = 12161, value = "TransactionReaper::check worker {0} not responding to interrupt when cancelling TX {1} -- worker marked as zombie and TX scheduled for mark-as-rollback", format = MESSAGE_FORMAT)
+	@Message(id = 12162, value = "Object store exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_6(String arg0, String arg1);
+	public void warn_recovery_TransactionStatusConnectionManager_2(Throwable arg0);
 
-	@Message(id = 12162, value = "TransactionReaper::doCancellations worker {0} successfully canceled TX {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_7(String arg0, String arg1);
+	@Message(id = 12163, value = "Starting service {0} on port {1}", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_TransactionStatusManager_1(String arg0, String arg1);
 
-	@Message(id = 12163, value = "TransactionReaper::doCancellations worker {0} failed to cancel TX {1} -- rescheduling for mark-as-rollback", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_8(String arg0, String arg1);
+//	@Message(id = 12164, value = "Unknown host {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_TransactionStatusManager_10(String arg0);
 
-	@Message(id = 12164, value = "TransactionReaper::doCancellations worker {0} exception during cancel of TX {1} -- rescheduling for mark-as-rollback", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_TransactionReaper_9(String arg0, String arg1);
+//	@Message(id = 12165, value = "Invalid port specified", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_TransactionStatusManager_11();
 
-	@Message(id = 12165, value = "TwoPhaseCoordinator.beforeCompletion - attempted rollback_only failed!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_TwoPhaseCoordinator_1();
+//	@Message(id = 12166, value = "Unknown host specified", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_TransactionStatusManager_12();
 
-	@Message(id = 12166, value = "TwoPhaseCoordinator.beforeCompletion - failed for {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_TwoPhaseCoordinator_2(String arg0);
+	@Message(id = 12167, value = "Invalid host or port", format = MESSAGE_FORMAT)
+	public String get_recovery_TransactionStatusManager_13();
 
-	@Message(id = 12167, value = "TwoPhaseCoordinator.beforeCompletion TwoPhaseCoordinator.afterCompletion called on still running transaction!", format = MESSAGE_FORMAT)
+	@Message(id = 12168, value = "Failed to create server socket on address {0} and port: {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_TwoPhaseCoordinator_3();
+	public void warn_recovery_TransactionStatusManager_14(String arg0, String arg1);
 
-	@Message(id = 12168, value = "TwoPhaseCoordinator.afterCompletion - returned failure for {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12169, value = "Listener failed", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_TwoPhaseCoordinator_4(String arg0);
+	public void warn_recovery_TransactionStatusManager_2();
 
-	@Message(id = 12169, value = "TwoPhaseCoordinator.afterCompletion - failed for {0} with exception {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_TwoPhaseCoordinator_4a(String arg0, String arg1);
+	@Message(id = 12170, value = "TransactionStatusManager started on port {0} and host {1} with service {2}", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_TransactionStatusManager_3(String arg0, String arg1, String arg2);
 
-	@Message(id = 12170, value = "TwoPhaseCoordinator.afterCompletion - failed for {0} with error {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12171, value = "Class not found: {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_TwoPhaseCoordinator_4b(String arg0, String arg1);
+	public void warn_recovery_TransactionStatusManager_4(String arg0);
 
-	@Message(id = 12171, value = "Name of XA node not defined. Using {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12172, value = "Failed to instantiate service class: {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_TxControl_1(String arg0);
+	public void warn_recovery_TransactionStatusManager_5(String arg0);
 
-	@Message(id = 12172, value = "Supplied name of node is too long. Using {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12173, value = "Illegal access to service class: {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_TxControl_2(String arg0);
+	public void warn_recovery_TransactionStatusManager_6(String arg0);
 
-	@Message(id = 12173, value = "Supplied name of node contains reserved character '-'. Using {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_TxControl_3(String arg0);
+//	@Message(id = 12174, value = "Failed to create server socket on port: {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_TransactionStatusManager_7(String arg0);
 
-	@Message(id = 12174, value = "Cannot continue due to CheckedActionFactory resolution problem with", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_cafactoryerror();
+//	@Message(id = 12175, value = "Invalid port specified {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_TransactionStatusManager_8(String arg0);
 
-	@Message(id = 12175, value = "Failed to resolve CheckedActionFactory class {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_checkedactionfactory(String arg0);
+	@Message(id = 12176, value = "Could not get unique port.", format = MESSAGE_FORMAT)
+	public String get_recovery_TransactionStatusManager_9();
 
-	@Message(id = 12176, value = "Could not create ObjectStore type:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_invalidos();
+	@Message(id = 12177, value = "com.arjuna.ats.arjuna.state.InputBuffer_1 - Invalid input buffer: byte.", format = MESSAGE_FORMAT)
+	public String get_state_InputBuffer_1();
 
-	@Message(id = 12177, value = "Could not recreate abstract record {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_norecordfound(String arg0);
+	@Message(id = 12178, value = "com.arjuna.ats.arjuna.state.InputBuffer_10 - Invalid input buffer: string.", format = MESSAGE_FORMAT)
+	public String get_state_InputBuffer_10();
 
-	@Message(id = 12178, value = "Cannot begin new transaction as TM is disabled. Marking as rollback-only.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_notrunning();
+	@Message(id = 12179, value = "com.arjuna.ats.arjuna.state.InputBuffer_11 - Invalid from buffer", format = MESSAGE_FORMAT)
+	public String get_state_InputBuffer_11();
 
-	@Message(id = 12179, value = "Node name cannot exceed 64 bytes!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_coordinator_toolong();
+	@Message(id = 12180, value = "com.arjuna.ats.arjuna.state.InputBuffer_2 - Invalid input buffer: bytes.", format = MESSAGE_FORMAT)
+	public String get_state_InputBuffer_2();
 
-	@Message(id = 12180, value = "You have chosen to disable the Multiple Last Resources warning. You will see it only once.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_lastResource_disableWarning();
+	@Message(id = 12181, value = "com.arjuna.ats.arjuna.state.InputBuffer_3 - Invalid input buffer: boolean.", format = MESSAGE_FORMAT)
+	public String get_state_InputBuffer_3();
 
-	@Message(id = 12181, value = "Adding multiple last resources is disallowed. Current resource is {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_lastResource_disallow(String arg0);
+	@Message(id = 12182, value = "com.arjuna.ats.arjuna.state.InputBuffer_4 - Invalid input buffer: char.", format = MESSAGE_FORMAT)
+	public String get_state_InputBuffer_4();
 
-	@Message(id = 12182, value = "Multiple last resources have been added to the current transaction. This is transactionally unsafe and should not be relied upon. Current resource is {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_lastResource_multipleWarning(String arg0);
+	@Message(id = 12183, value = "com.arjuna.ats.arjuna.state.InputBuffer_5 - Invalid input buffer: short.", format = MESSAGE_FORMAT)
+	public String get_state_InputBuffer_5();
 
-	@Message(id = 12183, value = "You have chosen to enable multiple last resources in the transaction manager. This is transactionally unsafe and should not be relied upon.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_lastResource_startupWarning();
+	@Message(id = 12184, value = "com.arjuna.ats.arjuna.state.InputBuffer_6 - Invalid input buffer: int.", format = MESSAGE_FORMAT)
+	public String get_state_InputBuffer_6();
 
-	@Message(id = 12184, value = "unknown store: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_ObjectStoreType_1(String arg0);
+	@Message(id = 12185, value = "com.arjuna.ats.arjuna.state.InputBuffer_7 - Invalid input buffer: long.", format = MESSAGE_FORMAT)
+	public String get_state_InputBuffer_7();
 
-	@Message(id = 12185, value = "unknown store:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_ObjectStoreType_2();
+	@Message(id = 12186, value = "com.arjuna.ats.arjuna.state.InputBuffer_8 - Invalid input buffer: float.", format = MESSAGE_FORMAT)
+	public String get_state_InputBuffer_8();
 
-	@Message(id = 12186, value = "No implementation!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_ObjectStore_1();
+	@Message(id = 12187, value = "com.arjuna.ats.arjuna.state.InputBuffer_9 - Invalid input buffer: double", format = MESSAGE_FORMAT)
+	public String get_state_InputBuffer_9();
 
-	@Message(id = 12187, value = "ActionStatusService: searching for uid: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ActionStatucService_5(String arg0);
+	@Message(id = 12188, value = "com.arjuna.ats.arjuna.state.OutputBuffer_1 - Invalid input buffer: byte.", format = MESSAGE_FORMAT)
+	public String get_state_OutputBuffer_1();
 
-	@Message(id = 12188, value = "transactionType: {0} uid: {1}   Status is {2}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ActionStatusService_1(String arg0, String arg1, String arg2);
+	@Message(id = 12189, value = "com.arjuna.ats.arjuna.state.OutputBuffer_10 - Invalid input buffer: string.", format = MESSAGE_FORMAT)
+	public String get_state_OutputBuffer_10();
 
-	@Message(id = 12189, value = "Other Exception: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ActionStatusService_2(String arg0);
+	@Message(id = 12190, value = "com.arjuna.ats.arjuna.state.OutputBuffer_11 - Invalid from buffer", format = MESSAGE_FORMAT)
+	public String get_state_OutputBuffer_11();
 
-	@Message(id = 12190, value = "Exception retrieving action status", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ActionStatusService_3();
+	@Message(id = 12191, value = "com.arjuna.ats.arjuna.state.OutputBuffer_2 - Invalid input buffer: bytes.", format = MESSAGE_FORMAT)
+	public String get_state_OutputBuffer_2();
 
-	@Message(id = 12191, value = "matching Uid {0} found", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ActionStatusService_4(String arg0);
+	@Message(id = 12192, value = "com.arjuna.ats.arjuna.state.OutputBuffer_3 - Invalid input buffer: boolean.", format = MESSAGE_FORMAT)
+	public String get_state_OutputBuffer_3();
 
-	@Message(id = 12192, value = "Exception when accessing transaction store {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ActionStatusService_6(String arg0);
+	@Message(id = 12193, value = "com.arjuna.ats.arjuna.state.OutputBuffer_4 - Invalid input buffer: char.", format = MESSAGE_FORMAT)
+	public String get_state_OutputBuffer_4();
 
-	@Message(id = 12193, value = "Connection Lost to Recovery Manager", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ActionStatusService_7();
+	@Message(id = 12194, value = "com.arjuna.ats.arjuna.state.OutputBuffer_5 - Invalid input buffer: short.", format = MESSAGE_FORMAT)
+	public String get_state_OutputBuffer_5();
 
-	@Message(id = 12194, value = "RecoverAtomicAction.replayPhase2 recovering {0} ActionStatus is {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecoverAtomicAction_1(String arg0, String arg1);
+	@Message(id = 12195, value = "com.arjuna.ats.arjuna.state.OutputBuffer_6 - Invalid input buffer: int.", format = MESSAGE_FORMAT)
+	public String get_state_OutputBuffer_6();
 
-	@Message(id = 12195, value = "RecoverAtomicAction.replayPhase2: Unexpected status: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecoverAtomicAction_2(String arg0);
+	@Message(id = 12196, value = "com.arjuna.ats.arjuna.state.OutputBuffer_7 - Invalid input buffer: long.", format = MESSAGE_FORMAT)
+	public String get_state_OutputBuffer_7();
 
-	@Message(id = 12196, value = "RecoverAtomicAction.replayPhase2( {0} )  finished", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecoverAtomicAction_3(String arg0);
+	@Message(id = 12197, value = "com.arjuna.ats.arjuna.state.OutputBuffer_8 - Invalid input buffer: float.", format = MESSAGE_FORMAT)
+	public String get_state_OutputBuffer_8();
 
-	@Message(id = 12197, value = "RecoverAtomicAction: transaction {0} not activated, unable to replay phase 2 commit. Check state has not already been completed.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecoverAtomicAction_4(String arg0);
+	@Message(id = 12198, value = "com.arjuna.ats.arjuna.state.OutputBuffer_9 - Invalid input buffer: double", format = MESSAGE_FORMAT)
+	public String get_state_OutputBuffer_9();
 
-	@Message(id = 12198, value = "RecoverAtomicAction - tried to move failed activation log {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecoverAtomicAction_5(String arg0);
+//	@Message(id = 12199, value = "remove committed failed.", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_tools_osb_mbean_m_1();
 
-	@Message(id = 12199, value = "Invalid recovery manager port specified {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecoveryManager_1(String arg0);
+//	@Message(id = 12200, value = "remove ok.", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_tools_osb_mbean_m_2();
 
-	@Message(id = 12200, value = "Invalid recovery manager host specified {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecoveryManager_2(String arg0);
+//	@Message(id = 12201, value = "remove committed exception: {0}.", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_tools_osb_mbean_m_3(String arg0);
 
-	@Message(id = 12201, value = "Recovery manager bound to {0}:{1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecoveryManager_3(String arg0, String arg1);
+	@Message(id = 12202, value = "registering bean {0}.", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_tools_osb_util_JMXServer_m_1(String arg0);
 
-	@Message(id = 12202, value = "Connected to recovery manager on {0}:{1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecoveryManager_4(String arg0, String arg1);
+	@Message(id = 12203, value = "Instance already exists: {0}.", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_tools_osb_util_JMXServer_m_2(String arg0);
 
-	@Message(id = 12203, value = "Invalid recovery manager port specified", format = MESSAGE_FORMAT)
+	@Message(id = 12204, value = "Error registering {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_RecoveryManager_5();
+	public void warn_tools_osb_util_JMXServer_m_3(String arg0, Throwable arg1);
 
-	@Message(id = 12204, value = "Exception when accessing data store {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusConnectionManager_1(String arg0);
+//	@Message(id = 12205, value = "Try to unregister mbean with invalid name {0}.", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_tools_osb_util_JMXServer_m_4(String arg0);
 
-	@Message(id = 12205, value = "Object store exception {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12206, value = "Unable to unregister bean {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusConnectionManager_2(String arg0);
+	public void warn_tools_osb_util_JMXServer_m_5(String arg0, Throwable arg1);
 
-	@Message(id = 12206, value = "found process uid {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12207, value = "Unable to unregister bean {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusConnectionManager_3(String arg0);
+	public void warn_tools_osb_util_JMXServer_m_6(String arg0, Throwable arg1);
 
-	@Message(id = 12207, value = "added TransactionStatusConnector to table for process uid {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12208, value = "An error occurred while creating file {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusConnectionManager_4(String arg0);
+	public void warn_utils_FileLock_4(String arg0);
 
-	@Message(id = 12208, value = "Starting service {0} on port {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12209, value = "Utility.getDefaultProcess - failed with", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManager_1(String arg0, String arg1);
+	public void warn_utils_Utility_1(Throwable arg0);
 
-	@Message(id = 12209, value = "Unknown host {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12210, value = "Unable to use InetAddress.getLocalHost() to resolve address.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManager_10(String arg0);
+	public void warn_utils_Utility_2();
 
-	@Message(id = 12210, value = "Invalid port specified", format = MESSAGE_FORMAT)
+	@Message(id = 12211, value = "Attempt to suspend a non-AtomicAction transaction. Type is {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManager_11();
+	public void warn_ats_atomicaction_1(String arg0);
 
-	@Message(id = 12211, value = "Unknown host specified", format = MESSAGE_FORMAT)
+	@Message(id = 12212, value = "StateManagerFriend.forgetAction", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManager_12();
+	public void warn_abstractrecords_smf1(Throwable arg0);
 
-	@Message(id = 12212, value = "Invalid host or port", format = MESSAGE_FORMAT)
+	@Message(id = 12213, value = "StateManagerFriend.destroyed", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManager_13();
+	public void warn_abstractrecords_smf2(Throwable arg0);
 
-	@Message(id = 12213, value = "Failed to create server socket on address {0} and port: {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12214, value = "StateManagerFriend.rememberAction", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManager_14(String arg0, String arg1);
+	public void warn_abstractrecords_smf3(Throwable arg0);
 
-	@Message(id = 12214, value = "Listener failed", format = MESSAGE_FORMAT)
+	@Message(id = 12215, value = "className is null", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManager_2();
+	public void warn_common_ClassloadingUtility_1();
 
-	@Message(id = 12215, value = "TransactionStatusManager started on port {0} and host {1} with service {2}", format = MESSAGE_FORMAT)
+	@Message(id = 12216, value = "attempt to load {0} threw ClassNotFound. Wrong classloader?", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManager_3(String arg0, String arg1, String arg2);
+	public void warn_common_ClassloadingUtility_2(String arg0, Throwable arg1);
 
-	@Message(id = 12216, value = "Class not found: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12217, value = "class {0} does not implement {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManager_4(String arg0);
+	public void warn_common_ClassloadingUtility_3(String arg0, String arg1, Throwable arg2);
 
-	@Message(id = 12217, value = "Failed to instantiate service class: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12218, value = "can't create new instance of {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManager_5(String arg0);
+	public void warn_common_ClassloadingUtility_4(String arg0, Throwable arg1);
 
-	@Message(id = 12218, value = "Illegal access to service class: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12219, value = "can't access {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManager_6(String arg0);
+	public void warn_common_ClassloadingUtility_5(String arg0, Throwable arg1);
 
-	@Message(id = 12219, value = "Failed to create server socket on port: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12220, value = "can't initialize from string {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManager_7(String arg0);
+	public void warn_common_ClassloadingUtility_6(String arg0, Throwable arg1);
 
-	@Message(id = 12220, value = "Invalid port specified {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12221, value = "Commit state failed for {0} and {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManager_8(String arg0);
+	public void warn_objectstore_CacheStore_1(Uid arg0, String arg1);
 
-	@Message(id = 12221, value = "Could not get unique port.", format = MESSAGE_FORMAT)
+	@Message(id = 12222, value = "Remove state failed for {0} and {1} and {2}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManager_9();
+	public void warn_objectstore_CacheStore_2(Uid arg0, String arg1, String arg2);
 
-	@Message(id = 12222, value = "com.arjuna.ats.arjuna.state.InputBuffer_1 - Invalid input buffer: byte.", format = MESSAGE_FORMAT)
+	@Message(id = 12223, value = "Write state failed for {0} and {1} and {2} and {3}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_state_InputBuffer_1();
+	public void warn_objectstore_CacheStore_3(Uid arg0, String arg1, String arg2, String arg3);
 
-	@Message(id = 12223, value = "com.arjuna.ats.arjuna.state.InputBuffer_10 - Invalid input buffer: string.", format = MESSAGE_FORMAT)
+	@Message(id = 12224, value = "Unknown work type {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_state_InputBuffer_10();
+	public void warn_objectstore_CacheStore_4(String arg0);
 
-	@Message(id = 12224, value = "com.arjuna.ats.arjuna.state.InputBuffer_11 - Invalid from buffer", format = MESSAGE_FORMAT)
+	@Message(id = 12225, value = "FileSystemStore::setupStore - cannot access root of object store: {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_state_InputBuffer_11();
+	public void warn_objectstore_FileSystemStore_1(String arg0);
 
-	@Message(id = 12225, value = "com.arjuna.ats.arjuna.state.InputBuffer_2 - Invalid input buffer: bytes.", format = MESSAGE_FORMAT)
+	@Message(id = 12226, value = "FileSystemStore.removeFromCache - no entry for {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_state_InputBuffer_2();
+	public void warn_objectstore_FileSystemStore_2(String arg0);
 
-	@Message(id = 12226, value = "com.arjuna.ats.arjuna.state.InputBuffer_3 - Invalid input buffer: boolean.", format = MESSAGE_FORMAT)
+	@Message(id = 12227, value = "FileSystemStore.renameFromTo - from {0} not present. Possibly renamed by crash recovery.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_state_InputBuffer_3();
+	public void warn_objectstore_FileSystemStore_20(String arg0);
 
-	@Message(id = 12227, value = "com.arjuna.ats.arjuna.state.InputBuffer_4 - Invalid input buffer: char.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_state_InputBuffer_4();
+	@Message(id = 12228, value = "FileSystemStore::allObjUids - could not pack Uid.", format = MESSAGE_FORMAT)
+	public String get_objectstore_FileSystemStore_2a();
 
-	@Message(id = 12228, value = "com.arjuna.ats.arjuna.state.InputBuffer_5 - Invalid input buffer: short.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_state_InputBuffer_5();
+	@Message(id = 12229, value = "FileSystemStore::allObjUids - could not pack end of list Uid.", format = MESSAGE_FORMAT)
+	public String get_objectstore_FileSystemStore_3();
 
-	@Message(id = 12229, value = "com.arjuna.ats.arjuna.state.InputBuffer_6 - Invalid input buffer: int.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_state_InputBuffer_6();
+	@Message(id = 12230, value = "FileSytemStore::allTypes - could not pack entry string.", format = MESSAGE_FORMAT)
+	public String get_objectstore_FileSystemStore_4();
 
-	@Message(id = 12230, value = "com.arjuna.ats.arjuna.state.InputBuffer_7 - Invalid input buffer: long.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_state_InputBuffer_7();
+	@Message(id = 12231, value = "FileSystemStore::allTypes - could not pack end of list string.", format = MESSAGE_FORMAT)
+	public String get_objectstore_FileSystemStore_5();
 
-	@Message(id = 12231, value = "com.arjuna.ats.arjuna.state.InputBuffer_8 - Invalid input buffer: float.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_state_InputBuffer_8();
+	@Message(id = 12232, value = "FileSystemStore::setupStore - error from unpack object store.", format = MESSAGE_FORMAT)
+	public String get_objectstore_FileSystemStore_6();
 
-	@Message(id = 12232, value = "com.arjuna.ats.arjuna.state.InputBuffer_9 - Invalid input buffer: double", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_state_InputBuffer_9();
+	@Message(id = 12233, value = "FileSystemStore::allTypes - could not pack entry string.", format = MESSAGE_FORMAT)
+	public String get_objectstore_FileSystemStore_7();
 
-	@Message(id = 12233, value = "com.arjuna.ats.arjuna.state.OutputBuffer_1 - Invalid input buffer: byte.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_state_OutputBuffer_1();
+	@Message(id = 12234, value = "FileSystemStore::createHierarchy - null directory name.", format = MESSAGE_FORMAT)
+	public String get_objectstore_FileSystemStore_8();
 
-	@Message(id = 12234, value = "com.arjuna.ats.arjuna.state.OutputBuffer_10 - Invalid input buffer: string.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_state_OutputBuffer_10();
+//	@Message(id = 12235, value = "HashedStore.create caught: {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_objectstore_HashedStore_1(String arg0);
 
-	@Message(id = 12235, value = "com.arjuna.ats.arjuna.state.OutputBuffer_11 - Invalid from buffer", format = MESSAGE_FORMAT)
+	@Message(id = 12236, value = "invalid number of hash directories: {0}. Will use default.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_state_OutputBuffer_11();
+	public void warn_objectstore_HashedStore_2(String arg0);
 
-	@Message(id = 12236, value = "com.arjuna.ats.arjuna.state.OutputBuffer_2 - Invalid input buffer: bytes.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_state_OutputBuffer_2();
+	@Message(id = 12237, value = "HashedStore.allObjUids - could not pack Uid.", format = MESSAGE_FORMAT)
+	public String get_objectstore_HashedStore_5();
 
-	@Message(id = 12237, value = "com.arjuna.ats.arjuna.state.OutputBuffer_3 - Invalid input buffer: boolean.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_state_OutputBuffer_3();
+	@Message(id = 12238, value = "HashedStore.allObjUids - could not pack end of list Uid.", format = MESSAGE_FORMAT)
+	public String get_objectstore_HashedStore_6();
 
-	@Message(id = 12238, value = "com.arjuna.ats.arjuna.state.OutputBuffer_4 - Invalid input buffer: char.", format = MESSAGE_FORMAT)
+	@Message(id = 12239, value = "hide_state caught exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_state_OutputBuffer_4();
+	public void warn_objectstore_JDBCImple_1(Throwable arg0);
 
-	@Message(id = 12239, value = "com.arjuna.ats.arjuna.state.OutputBuffer_5 - Invalid input buffer: short.", format = MESSAGE_FORMAT)
+	@Message(id = 12240, value = "remove_state - type() operation of object with uid {0} returns NULL", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_state_OutputBuffer_5();
+	public void warn_objectstore_JDBCImple_10(Uid arg0);
 
-	@Message(id = 12240, value = "com.arjuna.ats.arjuna.state.OutputBuffer_6 - Invalid input buffer: int.", format = MESSAGE_FORMAT)
+	@Message(id = 12241, value = "invalid initial pool size: {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_state_OutputBuffer_6();
+	public void warn_objectstore_JDBCImple_11(String arg0);
 
-	@Message(id = 12241, value = "com.arjuna.ats.arjuna.state.OutputBuffer_7 - Invalid input buffer: long.", format = MESSAGE_FORMAT)
+	@Message(id = 12242, value = "invalid maximum pool size: {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_state_OutputBuffer_7();
+	public void warn_objectstore_JDBCImple_12(String arg0);
 
-	@Message(id = 12242, value = "com.arjuna.ats.arjuna.state.OutputBuffer_8 - Invalid input buffer: float.", format = MESSAGE_FORMAT)
+	@Message(id = 12243, value = "initialise caught exceptionatorLoader_3", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_state_OutputBuffer_8();
+	public void warn_objectstore_JDBCImple_13(Throwable arg0);
 
-	@Message(id = 12243, value = "com.arjuna.ats.arjuna.state.OutputBuffer_9 - Invalid input buffer: double", format = MESSAGE_FORMAT)
+	@Message(id = 12244, value = "getState caught exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_state_OutputBuffer_9();
+	public void warn_objectstore_JDBCImple_14(Throwable arg0);
 
-	@Message(id = 12244, value = "remove committed failed.", format = MESSAGE_FORMAT)
+	@Message(id = 12245, value = "removeFromCache - no entry for {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_tools_osb_mbean_m_1();
+	public void warn_objectstore_JDBCImple_15(String arg0);
 
-	@Message(id = 12245, value = "remove ok.", format = MESSAGE_FORMAT)
+	@Message(id = 12246, value = "getPool caught exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_tools_osb_mbean_m_2();
+	public void warn_objectstore_JDBCImple_16(Throwable arg0);
 
-	@Message(id = 12246, value = "remove committed exception: {0}.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_tools_osb_mbean_m_3(String arg0);
+	@Message(id = 12247, value = "getPool - interrupted while waiting for a free connection", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_objectstore_JDBCImple_17();
 
-	@Message(id = 12247, value = "registering bean {0}.", format = MESSAGE_FORMAT)
+	@Message(id = 12248, value = "freePool - freeing a connection which is already free!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_tools_osb_util_JMXServer_m_1(String arg0);
+	public void warn_objectstore_JDBCImple_18();
 
-	@Message(id = 12248, value = "Instance already exists: {0}.", format = MESSAGE_FORMAT)
+	@Message(id = 12249, value = "reveal_state caught exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_tools_osb_util_JMXServer_m_2(String arg0);
+	public void warn_objectstore_JDBCImple_2(Throwable arg0);
 
-	@Message(id = 12249, value = "Error registrating {0} - {1}.", format = MESSAGE_FORMAT)
+	@Message(id = 12250, value = "currentState caught exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_tools_osb_util_JMXServer_m_3(String arg0, String arg1);
+	public void warn_objectstore_JDBCImple_3(Throwable arg0);
 
-	@Message(id = 12250, value = "Try to unregister mbean with invalid name {0}.", format = MESSAGE_FORMAT)
+	@Message(id = 12251, value = "allObjUids caught exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_tools_osb_util_JMXServer_m_4(String arg0);
+	public void warn_objectstore_JDBCImple_4(Throwable arg0);
 
-	@Message(id = 12251, value = "Unable to unregister bean {0} error: {1}.", format = MESSAGE_FORMAT)
+	@Message(id = 12252, value = "allObjUids - pack of Uid failed", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_tools_osb_util_JMXServer_m_5(String arg0, String arg1);
+	public void warn_objectstore_JDBCImple_5(Throwable arg0);
 
-	@Message(id = 12252, value = "Unable to unregister bean {0} error: {1}.", format = MESSAGE_FORMAT)
+	@Message(id = 12253, value = "allTypes caught exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_tools_osb_util_JMXServer_m_6(String arg0, String arg1);
+	public void warn_objectstore_JDBCImple_6(Throwable arg0);
 
-	@Message(id = 12253, value = "FileLock.lock called for {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12254, value = "allTypes - pack of Uid failed", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_utils_FileLock_1(String arg0);
+	public void warn_objectstore_JDBCImple_7(Throwable arg0);
 
-	@Message(id = 12254, value = "FileLock.unlock called for {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12255, value = "remove_state caught exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_utils_FileLock_2(String arg0);
+	public void warn_objectstore_JDBCImple_8(Throwable arg0);
 
-	@Message(id = 12255, value = "FileLock.createFile called for {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12256, value = "remove_state() attempted removal of {0} state for object with uid {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_utils_FileLock_3(String arg0);
+	public void warn_objectstore_JDBCImple_9(String arg0, Uid arg1);
 
-	@Message(id = 12256, value = "An error occurred while creating file {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12257, value = "JDBCImple:read_state failed", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_utils_FileLock_4(String arg0);
+	public void warn_objectstore_JDBCImple_readfailed();
 
-	@Message(id = 12257, value = "FileLock.lockFile called for {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12258, value = "JDBCImple:write_state caught exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_utils_FileLock_5(String arg0);
+	public void warn_objectstore_JDBCImple_writefailed(Throwable arg0);
 
-	@Message(id = 12258, value = "FileLock.unlockFile called for {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_utils_FileLock_6(String arg0);
+	@Message(id = 12259, value = "JDBCStore could not setup store < {0} , {1} >", format = MESSAGE_FORMAT)
+	@LogMessage(level = FATAL)
+	public void fatal_objectstore_JDBCStore_1(String arg0, String arg1);
 
-	@Message(id = 12259, value = "Utility.getDefaultProcess - failed with", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_utils_Utility_1();
+	@Message(id = 12260, value = "Received exception for {0}", format = MESSAGE_FORMAT)
+	@LogMessage(level = FATAL)
+	public void fatal_objectstore_JDBCStore_2(String arg0, Throwable arg1);
 
-	@Message(id = 12260, value = "Unable to use InetAddress.getLocalHost() to resolve address.", format = MESSAGE_FORMAT)
+	@Message(id = 12261, value = "JDBCStore.setupStore failed to initialise!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_utils_Utility_2();
+	public void warn_objectstore_JDBCStore_3();
 
-	@Message(id = 12261, value = "Attempt to suspend a non-AtomicAction transaction. Type is {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_ats_atomicaction_1(String arg0);
+//	@Message(id = 12262, value = "JDBCStore invalid Object parameter: {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_objectstore_JDBCStore_4(String arg0);
 
-	@Message(id = 12262, value = "StateManagerFriend.forgetAction", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_abstractrecords_smf1();
+	@Message(id = 12263, value = "No JDBCAccess implementation provided!", format = MESSAGE_FORMAT)
+	public String get_objectstore_JDBCStore_5();
 
-	@Message(id = 12263, value = "StateManagerFriend.destroyed", format = MESSAGE_FORMAT)
+	@Message(id = 12264, value = "ShadowingStore.commit_state - store invalid!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_abstractrecords_smf2();
+	public void warn_objectstore_ShadowingStore_1();
 
-	@Message(id = 12264, value = "StateManagerFriend.rememberAction", format = MESSAGE_FORMAT)
+	@Message(id = 12265, value = "ShadowingStore::remove_state() - state {0} does not exist for type {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_abstractrecords_smf3();
+	public void warn_objectstore_ShadowingStore_10(Uid arg0, String arg1);
 
-	@Message(id = 12265, value = "className is null", format = MESSAGE_FORMAT)
+	@Message(id = 12266, value = "ShadowingStore::remove_state() - unlink failed on {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_common_ClassloadingUtility_1();
+	public void warn_objectstore_ShadowingStore_11(String arg0);
 
-	@Message(id = 12266, value = "attempt to load {0} threw ClassNotFound. Wrong classloader?", format = MESSAGE_FORMAT)
+	@Message(id = 12267, value = "ShadowingStore.remove_state() - fd error for {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_common_ClassloadingUtility_2(String arg0);
+	public void warn_objectstore_ShadowingStore_12(Uid arg0);
 
-	@Message(id = 12267, value = "class {0} does not implement {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_common_ClassloadingUtility_3(String arg0, String arg1);
+//	@Message(id = 12268, value = "ShadowingStore::remove_state() attempted removal of", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_objectstore_ShadowingStore_13();
 
-	@Message(id = 12268, value = "can't create new instance of {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_common_ClassloadingUtility_4(String arg0);
+	@Message(id = 12269, value = "UNKNOWN state for object with uid {0} , type {1}", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_objectstore_ShadowingStore_14(Uid arg0, String arg1);
 
-	@Message(id = 12269, value = "can't access {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_common_ClassloadingUtility_5(String arg0);
+	@Message(id = 12270, value = "HIDDEN state for object with uid {0} , type {1}", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_objectstore_ShadowingStore_15(Uid arg0, String arg1);
 
-	@Message(id = 12270, value = "can't initialize from string {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_common_ClassloadingUtility_6(String arg0);
+//	@Message(id = 12271, value = "state for object with uid {0} , type {1}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_objectstore_ShadowingStore_16(String arg0, String arg1);
 
-	@Message(id = 12271, value = "Thread {0} sleeping for {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12272, value = "ShadowingStore.remove_state - type() operation of object with uid {0} returns NULL", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_ReaperThread_1(String arg0, String arg1);
+	public void warn_objectstore_ShadowingStore_17(Uid arg0);
 
-	@Message(id = 12272, value = "Thread {0} waiting for cancelled TXs", format = MESSAGE_FORMAT)
+	@Message(id = 12273, value = "ShadowingStore::write_state() - openAndLock failed for {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_ReaperWorkerThread_1(String arg0);
+	public void warn_objectstore_ShadowingStore_18(String arg0);
 
-	@Message(id = 12273, value = "Thread {0} performing cancellations", format = MESSAGE_FORMAT)
+	@Message(id = 12274, value = "ShadowingStore::write_state - unlock or close of {0} failed.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_coordinator_ReaperWorkerThread_2(String arg0);
+	public void warn_objectstore_ShadowingStore_19(String arg0);
 
-	@Message(id = 12274, value = "ActionStore.currentState({0}, {1}) - returning {2}", format = MESSAGE_FORMAT)
+	@Message(id = 12275, value = "ShadowStore::commit_state - failed to rename {0} to {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ActionStore_1(String arg0, String arg1, String arg2);
+	public void warn_objectstore_ShadowingStore_2(String arg0, String arg1);
 
-	@Message(id = 12275, value = "Commit state failed for {0} and {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_CacheStore_1(String arg0, String arg1);
+//	@Message(id = 12276, value = "ShadowingStore.renameFromTo - from {0} not present. Possibly renamed by crash recovery.", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_objectstore_ShadowingStore_20(String arg0);
 
-	@Message(id = 12276, value = "Remove state failed for {0} and {1} and {2}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_CacheStore_2(String arg0, String arg1, String arg2);
+//	@Message(id = 12277, value = "ShadowingStore.renameFromTo - failed to lock: {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_objectstore_ShadowingStore_21(String arg0);
 
-	@Message(id = 12277, value = "Write state failed for {0} and {1} and {2} and {3}", format = MESSAGE_FORMAT)
+	@Message(id = 12278, value = "ShadowStore::hide_state - failed to rename {0} to {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_CacheStore_3(String arg0, String arg1, String arg2, String arg3);
+	public void warn_objectstore_ShadowingStore_3(String arg0, String arg1);
 
-	@Message(id = 12278, value = "Unknown work type {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12279, value = "ShadowStore::reveal_state - failed to rename {0} to {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_CacheStore_4(String arg0);
+	public void warn_objectstore_ShadowingStore_4(String arg0, String arg1);
 
-	@Message(id = 12279, value = "FileSystemStore::setupStore - cannot access root of object store: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_FileSystemStore_1(String arg0);
+//	@Message(id = 12280, value = "ShadowingStore.create caught: {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_objectstore_ShadowingStore_5(String arg0);
 
-	@Message(id = 12280, value = "FileSystemStore.removeFromCache - no entry for {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12281, value = "ShadowingStore.read_state - store invalid!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_FileSystemStore_2(String arg0);
+	public void warn_objectstore_ShadowingStore_6();
 
-	@Message(id = 12281, value = "FileSystemStore.renameFromTo - from {0} not present. Possibly renamed by crash recovery.", format = MESSAGE_FORMAT)
+	@Message(id = 12282, value = "ShadowingStore::read_state() failed", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_FileSystemStore_20(String arg0);
+	public void warn_objectstore_ShadowingStore_7();
 
-	@Message(id = 12282, value = "FileSystemStore::allObjUids - could not pack Uid.", format = MESSAGE_FORMAT)
+	@Message(id = 12283, value = "ShadowingStore::read_state - unlock or close of {0} failed", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_FileSystemStore_2a();
+	public void warn_objectstore_ShadowingStore_8(String arg0);
 
-	@Message(id = 12283, value = "FileSystemStore::allObjUids - could not pack end of list Uid.", format = MESSAGE_FORMAT)
+	@Message(id = 12284, value = "ShadowingStore::remove_state() - access problems on {0} and {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_FileSystemStore_3();
+	public void warn_objectstore_ShadowingStore_9(Uid arg0, String arg1);
 
-	@Message(id = 12284, value = "FileSytemStore::allTypes - could not pack entry string.", format = MESSAGE_FORMAT)
+	@Message(id = 12285, value = "oracle:read_state failed", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_FileSystemStore_4();
+	public void warn_objectstore_jdbc_oracle_1();
 
-	@Message(id = 12285, value = "FileSystemStore::allTypes - could not pack end of list string.", format = MESSAGE_FORMAT)
+	@Message(id = 12286, value = "oracle:write_state caught exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_FileSystemStore_5();
+	public void warn_objectstore_jdbc_oracle_2(Throwable arg0);
 
-	@Message(id = 12286, value = "FileSystemStore::setupStore - error from unpack object store.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_FileSystemStore_6();
+	@Message(id = 12287, value = "No typename for object:", format = MESSAGE_FORMAT)
+	public String get_objectstore_notypenameuid();
 
-	@Message(id = 12287, value = "FileSystemStore::allTypes - could not pack entry string.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_FileSystemStore_7();
+	@Message(id = 12288, value = "allTypes - could not pack end of list string.", format = MESSAGE_FORMAT)
+	public String get_objectstore_packProblem();
 
-	@Message(id = 12288, value = "FileSystemStore::createHierarchy - null directory name.", format = MESSAGE_FORMAT)
+	@Message(id = 12289, value = "RecoveryManagerStatusModule: Object store exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_FileSystemStore_8();
+	public void warn_recovery_AtomicActionRecoveryModule_1(Throwable arg0);
 
-	@Message(id = 12289, value = "HashedStore.create caught: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12290, value = "failed to recover Transaction {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_HashedStore_1(String arg0);
+	public void warn_recovery_AtomicActionRecoveryModule_2(Uid arg0, Throwable arg1);
 
-	@Message(id = 12290, value = "invalid number of hash directories: {0}. Will use default.", format = MESSAGE_FORMAT)
+	@Message(id = 12291, value = "failed to access transaction store {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_HashedStore_2(String arg0);
+	public void warn_recovery_AtomicActionRecoveryModule_3(Uid arg0, Throwable arg1);
 
-	@Message(id = 12291, value = "HashedStore.allObjUids - could not pack Uid.", format = MESSAGE_FORMAT)
+	@Message(id = 12292, value = "Connection - IOException", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_HashedStore_5();
+	public void warn_recovery_Connection_1();
 
-	@Message(id = 12292, value = "HashedStore.allObjUids - could not pack end of list Uid.", format = MESSAGE_FORMAT)
+	@Message(id = 12293, value = "Setting timeout exception.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_HashedStore_6();
+	public void warn_recovery_Connection_2();
 
-	@Message(id = 12293, value = "hide_state caught exception: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12294, value = "Loading expiry scanner: could not find class {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_1(String arg0);
+	public void warn_recovery_ExpiredEntryMonitor_10(String arg0);
 
-	@Message(id = 12294, value = "remove_state - type() operation of object with uid {0} returns NULL", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_10(String arg0);
+//	@Message(id = 12295, value = "{0} has inappropriate value ({1})", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_ExpiredEntryMonitor_11(String arg0, String arg1);
 
-	@Message(id = 12295, value = "invalid initial pool size: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12296, value = "ExpiredEntryMonitor running at {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_11(String arg0);
+	public void warn_recovery_ExpiredEntryMonitor_12(String arg0);
 
-	@Message(id = 12296, value = "invalid maximum pool size: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_12(String arg0);
+	@Message(id = 12297, value = "ExpiredEntryMonitor - no scans on first iteration", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_ExpiredEntryMonitor_5();
 
-	@Message(id = 12297, value = "initialise caught exception: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12298, value = "Attempt to load expiry scanner with null class name!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_13(String arg0);
+	public void warn_recovery_ExpiredEntryMonitor_7();
 
-	@Message(id = 12298, value = "getState caught exception: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12299, value = "Expiry scanner {0} does not conform to ExpiryScanner interface", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_14(String arg0);
+	public void warn_recovery_ExpiredEntryMonitor_9(String arg0);
 
-	@Message(id = 12299, value = "removeFromCache - no entry for {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_15(String arg0);
+//	@Message(id = 12300, value = "ExpiredTransactionScanner created, with expiry time of {0} seconds", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_ExpiredTransactionScanner_1(String arg0);
 
-	@Message(id = 12300, value = "getPool caught exception: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12301, value = "ExpiredTransactionScanner - exception during attempted move {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_16(String arg0);
+	public void warn_recovery_ExpiredTransactionScanner_2(Uid arg0, Throwable arg1);
 
-	@Message(id = 12301, value = "getPool - interrupted while waiting for a free connection", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_17();
+//	@Message(id = 12302, value = "ExpiredTransactionScanner - could not moved log {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_ExpiredTransactionScanner_3(String arg0);
 
-	@Message(id = 12302, value = "freePool - freeing a connection which is already free!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_18();
+	@Message(id = 12303, value = "ExpiredTransactionScanner - log {0} is assumed complete and will be moved.", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_ExpiredTransactionScanner_4(Uid arg0);
 
-	@Message(id = 12303, value = "reveal_state caught exception: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_2(String arg0);
+	@Message(id = 12304, value = "Removing old transaction status manager item {0}", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_ExpiredTransactionStatusManagerScanner_3(Uid arg0);
 
-	@Message(id = 12304, value = "currentState caught exception: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_3(String arg0);
+//	@Message(id = 12305, value = "{0}  has inappropriate value ({1})", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_ExpiredTransactionStatusManagerScanner_5(String arg0, String arg1);
 
-	@Message(id = 12305, value = "allObjUids caught exception: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12306, value = "Attempt to load recovery module with null class name!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_4(String arg0);
+	public void warn_recovery_PeriodicRecovery_1();
 
-	@Message(id = 12306, value = "allObjUids - pack of Uid failed: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_5(String arg0);
+//	@Message(id = 12307, value = "Ignoring request to scan because RecoveryManager state is: {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_PeriodicRecovery_10(String arg0);
 
-	@Message(id = 12307, value = "allTypes caught exception: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_6(String arg0);
+//	@Message(id = 12308, value = "Invalid host specified {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_PeriodicRecovery_11(String arg0);
 
-	@Message(id = 12308, value = "allTypes - pack of Uid failed:{0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_7(String arg0);
+//	@Message(id = 12309, value = "Could not create recovery listener", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_PeriodicRecovery_12();
 
-	@Message(id = 12309, value = "remove_state caught exception: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_8(String arg0);
+	@Message(id = 12310, value = "Recovery manager listening on endpoint {0}:{1}", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_PeriodicRecovery_13(String arg0, String arg1);
 
-	@Message(id = 12310, value = "remove_state() attempted removal of {0} state for object with uid {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12311, value = "Recovery module {0} does not conform to RecoveryModule interface", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_9(String arg0, String arg1);
+	public void warn_recovery_PeriodicRecovery_2(String arg0);
 
-	@Message(id = 12311, value = "JDBCImple:read_state failed", format = MESSAGE_FORMAT)
+	@Message(id = 12312, value = "Loading recovery module", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_readfailed();
+	public void warn_recovery_PeriodicRecovery_3(Throwable arg0);
 
-	@Message(id = 12312, value = "JDBCImple:write_state caught exception: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12313, value = "Loading recovery module", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCImple_writefailed(String arg0);
+	public void warn_recovery_PeriodicRecovery_4(Throwable arg0);
 
-	@Message(id = 12313, value = "JDBCStore could not setup store < {0} , {1} >", format = MESSAGE_FORMAT)
+	@Message(id = 12314, value = "Loading recovery module: could not find class {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCStore_1(String arg0, String arg1);
+	public void warn_recovery_PeriodicRecovery_5(String arg0);
 
-	@Message(id = 12314, value = "Received: {0} for: {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCStore_2(String arg0, String arg1);
+//	@Message(id = 12315, value = "{0} has inappropriate value ( {1} )", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_PeriodicRecovery_6(String arg0, String arg1);
 
-	@Message(id = 12315, value = "JDBCStore.setupStore failed to initialise!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCStore_3();
+//	@Message(id = 12316, value = "{0} has inappropriate value ( {1} )", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_PeriodicRecovery_7(String arg0, String arg1);
 
-	@Message(id = 12316, value = "JDBCStore invalid Object parameter: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCStore_4(String arg0);
+//	@Message(id = 12317, value = "Invalid port specified {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_PeriodicRecovery_8(String arg0);
 
-	@Message(id = 12317, value = "No JDBCAccess implementation provided!", format = MESSAGE_FORMAT)
+	@Message(id = 12318, value = "Could not create recovery listener", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_JDBCStore_5();
+	public void warn_recovery_PeriodicRecovery_9(Throwable arg0);
 
-	@Message(id = 12318, value = "ShadowingStore.commit_state - store invalid!", format = MESSAGE_FORMAT)
+	@Message(id = 12319, value = "Attempt to load recovery activator with null class name!", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_1();
+	public void warn_recovery_RecActivatorLoader_1();
 
-	@Message(id = 12319, value = "ShadowingStore::remove_state() - state {0} does not exist for type {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12320, value = "Recovery module {0} does not conform to RecoveryActivator interface", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_10(String arg0, String arg1);
+	public void warn_recovery_RecActivatorLoader_2(String arg0);
 
-	@Message(id = 12320, value = "ShadowingStore::remove_state() - unlink failed on {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12321, value = "Loading recovery activator", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_11(String arg0);
+	public void warn_recovery_RecActivatorLoader_3(Throwable arg0);
 
-	@Message(id = 12321, value = "ShadowingStore.remove_state() - fd error for {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12322, value = "Loading recovery activator", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_12(String arg0);
+	public void warn_recovery_RecActivatorLoader_4(Throwable arg0);
 
-	@Message(id = 12322, value = "ShadowingStore::remove_state() attempted removal of", format = MESSAGE_FORMAT)
+	@Message(id = 12323, value = "Loading recovery module: could not find class {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_13();
+	public void warn_recovery_RecActivatorLoader_5(String arg0);
 
-	@Message(id = 12323, value = "UNKNOWN state for object with uid {0} , type {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_14(String arg0, String arg1);
+	@Message(id = 12324, value = "Start RecoveryActivators", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_RecActivatorLoader_6();
 
-	@Message(id = 12324, value = "HIDDEN state for object with uid {0} , type {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_15(String arg0, String arg1);
+//	@Message(id = 12325, value = "property io exception {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_recovery_RecoveryManagerImple_1(String arg0);
 
-	@Message(id = 12325, value = "state for object with uid {0} , type {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12326, value = "socket I/O exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_16(String arg0, String arg1);
+	public void warn_recovery_RecoveryManagerImple_2(Throwable arg0);
 
-	@Message(id = 12326, value = "ShadowingStore.remove_state - type() operation of object with uid {0} returns NULL", format = MESSAGE_FORMAT)
+	@Message(id = 12327, value = "TransactionStatusConnector.delete called erroneously", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_17(String arg0);
+	public void warn_recovery_TransactionStatusConnector_1();
 
-	@Message(id = 12327, value = "ShadowingStore::write_state() - openAndLock failed for {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12328, value = "Connection lost to TransactionStatusManagers' process", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_18(String arg0);
+	public void warn_recovery_TransactionStatusConnector_2();
 
-	@Message(id = 12328, value = "ShadowingStore::write_state - unlock or close of {0} failed.", format = MESSAGE_FORMAT)
+	@Message(id = 12329, value = "Connection lost to TransactionStatusManagers' process", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_19(String arg0);
+	public void warn_recovery_TransactionStatusConnector_3();
 
-	@Message(id = 12329, value = "ShadowStore::commit_state - failed to rename {0} to {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_2(String arg0, String arg1);
+	@Message(id = 12330, value = "TransactionStatusManager process for uid {0} is ALIVE. connected to host: {1}, port: {2} on socket: {3}", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_TransactionStatusConnector_4(String arg0, String arg1, String arg2, String arg3);
 
-	@Message(id = 12330, value = "ShadowingStore.renameFromTo - from {0} not present. Possibly renamed by crash recovery.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_20(String arg0);
+	@Message(id = 12331, value = "TransactionStatusManager process for uid {0} is DEAD.", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_TransactionStatusConnector_5(String arg0);
 
-	@Message(id = 12331, value = "ShadowingStore.renameFromTo - failed to lock: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_21(String arg0);
+	@Message(id = 12332, value = "Failed to establish connection to server", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_TransactionStatusConnector_6();
 
-	@Message(id = 12332, value = "ShadowingStore.currentState({0}, {1}) - returning {2}", format = MESSAGE_FORMAT)
+	@Message(id = 12333, value = "Problem with removing host/port item", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_22(String arg0, String arg1, String arg2);
+	public void warn_recovery_TransactionStatusManagerItem_1(Throwable arg0);
 
-	@Message(id = 12333, value = "ShadowStore::hide_state - failed to rename {0} to {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12334, value = "Problem with storing host/port", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_3(String arg0, String arg1);
+	public void warn_recovery_TransactionStatusManagerItem_2(Throwable arg0);
 
-	@Message(id = 12334, value = "ShadowStore::reveal_state - failed to rename {0} to {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12335, value = "Problem retrieving host/port", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_4(String arg0, String arg1);
+	public void warn_recovery_TransactionStatusManagerItem_3(Throwable arg0);
 
-	@Message(id = 12335, value = "ShadowingStore.create caught: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12336, value = "Failed to obtain host", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_5(String arg0);
+	public void warn_recovery_TransactionStatusManagerItem_4(Throwable arg0);
 
-	@Message(id = 12336, value = "ShadowingStore.read_state - store invalid!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_6();
+	@Message(id = 12337, value = "TransactionStatusManagerItem host: {0} port: {1}", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_TransactionStatusManagerItem_5(String arg0, String arg1);
 
-	@Message(id = 12337, value = "ShadowingStore::read_state() failed", format = MESSAGE_FORMAT)
+	@Message(id = 12338, value = "Other Exception:", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_7();
+	public void warn_recovery_WorkerService_1(Throwable arg0);
 
-	@Message(id = 12338, value = "ShadowingStore::read_state - unlock or close of {0} failed", format = MESSAGE_FORMAT)
+	@Message(id = 12339, value = "IOException", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_8(String arg0);
+	public void warn_recovery_WorkerService_2();
 
-	@Message(id = 12339, value = "ShadowingStore::remove_state() - access problems on {0} and {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_ShadowingStore_9(String arg0, String arg1);
+	@Message(id = 12340, value = "RecoveryManager scan scheduled to begin.", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_WorkerService_3();
 
-	@Message(id = 12340, value = "oracle:read_state failed", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_jdbc_oracle_1();
+	@Message(id = 12341, value = "RecoveryManager scan completed.", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_WorkerService_4();
 
-	@Message(id = 12341, value = "oracle:write_state caught exception: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_jdbc_oracle_2(String arg0);
+	@Message(id = 12342, value = "RecoveryManagerImple: cannot bind to socket on address {0} and port {1}", format = MESSAGE_FORMAT)
+	@LogMessage(level = FATAL)
+	public void fatal_recovery_fail(String arg0, String arg1);
 
-	@Message(id = 12342, value = "No typename for object:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_notypenameuid();
+	@Message(id = 12343, value = "RecoveryManagerImple is ready. Socket listener is turned off.", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_localready();
 
-	@Message(id = 12343, value = "allTypes - could not pack end of list string.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_objectstore_packProblem();
+	@Message(id = 12344, value = "RecoveryManagerImple is ready on port {0}", format = MESSAGE_FORMAT)
+	@LogMessage(level = INFO)
+	public void info_recovery_socketready(String arg0);
 
-	@Message(id = 12344, value = "RecoveryManagerStatusModule: Object store exception: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 12345, value = "Transaction {0} and {1} not activate.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_AtomicActionRecoveryModule_1(String arg0);
+	public void warn_tools_log_eaa1(Uid arg0, String arg1);
 
-	@Message(id = 12345, value = "failed to recover Transaction {0} {1}", format = MESSAGE_FORMAT)
+	@Message(id = 12346, value = "Error - could not get resource to forget heuristic. Left on Heuristic List.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_AtomicActionRecoveryModule_2(String arg0, String arg1);
+	public void warn_tools_log_eaa2();
 
-	@Message(id = 12346, value = "failed to access transaction store {0} {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_AtomicActionRecoveryModule_3(String arg0, String arg1);
+	@Message(id = 12347, value = "Could not get back a valid pid.", format = MESSAGE_FORMAT)
+	public String get_utils_ExecProcessId_1();
 
-	@Message(id = 12347, value = "AtomicActionRecoveryModule first pass", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_AtomicActionRecoveryModule_4();
+	@Message(id = 12348, value = "Problem executing getpids utility:", format = MESSAGE_FORMAT)
+	public String get_utils_ExecProcessId_2();
 
-	@Message(id = 12348, value = "AtomicActionRecoveryModule second pass", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_AtomicActionRecoveryModule_5();
+	@Message(id = 12349, value = "Problem executing command:", format = MESSAGE_FORMAT)
+	public String get_utils_ExecProcessId_3();
 
-	@Message(id = 12349, value = "Connection - IOException", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_Connection_1();
+	@Message(id = 12350, value = "Problem getting pid information from stream:", format = MESSAGE_FORMAT)
+	public String get_utils_ExecProcessId_4();
 
-	@Message(id = 12350, value = "Setting timeout exception.", format = MESSAGE_FORMAT)
+	@Message(id = 12351, value = "Encountered a problem when closing the data stream", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void log_recovery_Connection_2();
+	public void warn_utils_ExecProcessId_5(Throwable arg0);
 
-	@Message(id = 12351, value = "Expiry scan interval set to {0} seconds", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredEntryMonitor_1(String arg0);
+	@Message(id = 12352, value = "FileProcessId.getpid - could not locate temporary directory.", format = MESSAGE_FORMAT)
+	public String get_utils_FileProcessId_1();
 
-	@Message(id = 12352, value = "Loading expiry scanner: could not find class {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredEntryMonitor_10(String arg0);
+	@Message(id = 12353, value = "FileProcessId.getpid could not create unique file.", format = MESSAGE_FORMAT)
+	public String get_utils_FileProcessId_2();
 
-	@Message(id = 12353, value = "{0} has inappropriate value ({1})", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredEntryMonitor_11(String arg0, String arg1);
+	@Message(id = 12354, value = "Could not get back a valid pid.", format = MESSAGE_FORMAT)
+	public String get_utils_MBeanProcessId_1();
 
-	@Message(id = 12354, value = "ExpiredEntryMonitor running at {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredEntryMonitor_12(String arg0);
+	@Message(id = 12355, value = "getName returned unrecognized format:", format = MESSAGE_FORMAT)
+	public String get_utils_MBeanProcessId_2();
 
-	@Message(id = 12355, value = "Expiry scan zero - not scanning", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredEntryMonitor_2();
+	@Message(id = 12356, value = "Could not get back a valid pid.", format = MESSAGE_FORMAT)
+	public String get_utils_ManualProcessId_1();
 
-	@Message(id = 12356, value = "No Expiry scanners loaded - not scanning", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredEntryMonitor_3();
+//	@Message(id = 12357, value = "No process identifier specified in configuration!", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_utils_ManualProcessId_2();
 
-	@Message(id = 12357, value = "ExpiredEntryMonitor - constructed", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredEntryMonitor_4();
+//	@Message(id = 12358, value = "Invalid process identifier specified:", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_utils_ManualProcessId_3();
 
-	@Message(id = 12358, value = "ExpiredEntryMonitor - no scans on first iteration", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredEntryMonitor_5();
+	@Message(id = 12359, value = "SocketProcessId.getpid could not get unique port.", format = MESSAGE_FORMAT)
+	public String get_utils_SocketProcessId_2();
 
-	@Message(id = 12359, value = "Loading expiry scanner {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredEntryMonitor_6(String arg0);
+    @Message(id = 12360, value = "Unable to instantiate ExpiryScanner", format = MESSAGE_FORMAT)
+    @LogMessage(level = WARN)
+    public void warn_recovery_ExpiredEntryMonitor_6(Throwable arg0);
 
-	@Message(id = 12360, value = "Attempt to load expiry scanner with null class name!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredEntryMonitor_7();
+    @Message(id = 12361, value = "Error constructing mbean", format = MESSAGE_FORMAT)
+    @LogMessage(level = INFO)
+    public void info_osb_MBeanCtorFail(Throwable arg0);
 
-	@Message(id = 12361, value = "Loading expiry scanner {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredEntryMonitor_8(String arg0);
-
-	@Message(id = 12362, value = "Expiry scanner {0} does not conform to ExpiryScanner interface", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredEntryMonitor_9(String arg0);
-
-	@Message(id = 12363, value = "ExpiredTransactionScanner created, with expiry time of {0} seconds", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredTransactionScanner_1(String arg0);
-
-	@Message(id = 12364, value = "ExpiredTransactionScanner - exception during attempted move {0} {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredTransactionScanner_2(String arg0, String arg1);
-
-	@Message(id = 12365, value = "ExpiredTransactionScanner - could not moved log {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredTransactionScanner_3(String arg0);
-
-	@Message(id = 12366, value = "ExpiredTransactionScanner - log {0} is assumed complete and will be moved.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredTransactionScanner_4(String arg0);
-
-	@Message(id = 12367, value = "ExpiredTransactionStatusManagerScanner created, with expiry time of {0}  seconds", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredTransactionStatusManagerScanner_1(String arg0);
-
-	@Message(id = 12368, value = "ExpiredTransactionStatusManagerScanner - scanning to remove items from before {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredTransactionStatusManagerScanner_2(String arg0);
-
-	@Message(id = 12369, value = "Removing old transaction status manager item {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredTransactionStatusManagerScanner_3(String arg0);
-
-	@Message(id = 12370, value = "Expiry scan interval set to  {0}  seconds", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredTransactionStatusManagerScanner_4(String arg0);
-
-	@Message(id = 12371, value = "{0}  has inappropriate value ({1})", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_ExpiredTransactionStatusManagerScanner_5(String arg0, String arg1);
-
-	@Message(id = 12372, value = "Listener - IOException", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_Listener_2();
-
-	@Message(id = 12373, value = "Attempt to load recovery module with null class name!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_PeriodicRecovery_1();
-
-	@Message(id = 12374, value = "Ignoring request to scan because RecoveryManager state is: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_PeriodicRecovery_10(String arg0);
-
-	@Message(id = 12375, value = "Invalid host specified {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_PeriodicRecovery_11(String arg0);
-
-	@Message(id = 12376, value = "Could not create recovery listener", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_PeriodicRecovery_12();
-
-	@Message(id = 12377, value = "Recovery manager listening on endpoint {0}:{1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_PeriodicRecovery_13(String arg0, String arg1);
-
-	@Message(id = 12378, value = "Periodic recovery first pass at {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_PeriodicRecovery_14(String arg0);
-
-	@Message(id = 12379, value = "Periodic recovery second pass at {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_PeriodicRecovery_15(String arg0);
-
-	@Message(id = 12380, value = "Recovery module {0} does not conform to RecoveryModule interface", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_PeriodicRecovery_2(String arg0);
-
-	@Message(id = 12381, value = "Loading recovery module: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_PeriodicRecovery_3(String arg0);
-
-	@Message(id = 12382, value = "Loading recovery module: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_PeriodicRecovery_4(String arg0);
-
-	@Message(id = 12383, value = "Loading recovery module: could not find class {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_PeriodicRecovery_5(String arg0);
-
-	@Message(id = 12384, value = "{0} has inappropriate value ( {1} )", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_PeriodicRecovery_6(String arg0, String arg1);
-
-	@Message(id = 12385, value = "{0} has inappropriate value ( {1} )", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_PeriodicRecovery_7(String arg0, String arg1);
-
-	@Message(id = 12386, value = "Invalid port specified {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_PeriodicRecovery_8(String arg0);
-
-	@Message(id = 12387, value = "Could not create recovery listener {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_PeriodicRecovery_9(String arg0);
-
-	@Message(id = 12388, value = "Attempt to load recovery activator with null class name!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecActivatorLoader_1();
-
-	@Message(id = 12389, value = "Recovery module {0} does not conform to RecoveryActivator interface", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecActivatorLoader_2(String arg0);
-
-	@Message(id = 12390, value = "Loading recovery activator: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecActivatorLoader_3(String arg0);
-
-	@Message(id = 12391, value = "Loading recovery activator: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecActivatorLoader_4(String arg0);
-
-	@Message(id = 12392, value = "Loading recovery module: could not find class {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecActivatorLoader_5(String arg0);
-
-	@Message(id = 12393, value = "Start RecoveryActivators", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecActivatorLoader_6();
-
-	@Message(id = 12394, value = "property io exception {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecoveryManagerImple_1(String arg0);
-
-	@Message(id = 12395, value = "socket io exception {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_RecoveryManagerImple_2(String arg0);
-
-	@Message(id = 12396, value = "TransactionStatusConnector.delete called erroneously", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusConnector_1();
-
-	@Message(id = 12397, value = "Connection lost to TransactionStatusManagers' process", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusConnector_2();
-
-	@Message(id = 12398, value = "Connection lost to TransactionStatusManagers' process", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusConnector_3();
-
-	@Message(id = 12399, value = "TransactionStatusManager process for uid {0} is ALIVE. connected to host: {1}, port: {2} on socket: {3}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusConnector_4(String arg0, String arg1, String arg2, String arg3);
-
-	@Message(id = 12400, value = "TransactionStatusManager process for uid {0} is DEAD.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusConnector_5(String arg0);
-
-	@Message(id = 12401, value = "Failed to establish connection to server", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusConnector_6();
-
-	@Message(id = 12402, value = "Problem with removing host/port item {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManagerItem_1(String arg0);
-
-	@Message(id = 12403, value = "Problem with storing host/port {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManagerItem_2(String arg0);
-
-	@Message(id = 12404, value = "Problem retrieving host/port {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManagerItem_3(String arg0);
-
-	@Message(id = 12405, value = "Failed to obtain host {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManagerItem_4(String arg0);
-
-	@Message(id = 12406, value = "TransactionStatusManagerItem host: {0} port: {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_TransactionStatusManagerItem_5(String arg0, String arg1);
-
-	@Message(id = 12407, value = "Other Exception:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_WorkerService_1();
-
-	@Message(id = 12408, value = "IOException", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_WorkerService_2();
-
-	@Message(id = 12409, value = "RecoveryManager scan scheduled to begin.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_WorkerService_3();
-
-	@Message(id = 12410, value = "RecoveryManager scan completed.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_WorkerService_4();
-
-	@Message(id = 12411, value = "RecoveryManagerImple: cannot bind to socket on address {0} and port {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_fail(String arg0, String arg1);
-
-	@Message(id = 12412, value = "RecoveryManagerImple is ready. Socket listener is turned off.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_localready();
-
-	@Message(id = 12413, value = "RecoveryManagerImple is ready on port {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_recovery_socketready(String arg0);
-
-	@Message(id = 12414, value = "Transaction {0} and {1} not activate.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_tools_log_eaa1(String arg0, String arg1);
-
-	@Message(id = 12415, value = "Error - could not get resource to forget heuristic. Left on Heuristic List.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_tools_log_eaa2();
-
-	@Message(id = 12416, value = "Could not get back a valid pid.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_utils_ExecProcessId_1();
-
-	@Message(id = 12417, value = "Problem executing getpids utility:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_utils_ExecProcessId_2();
-
-	@Message(id = 12418, value = "Problem executing command:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_utils_ExecProcessId_3();
-
-	@Message(id = 12419, value = "Problem getting pid information from stream:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_utils_ExecProcessId_4();
-
-	@Message(id = 12420, value = "Encountered a problem when closing the data stream {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_utils_ExecProcessId_5(String arg0);
-
-	@Message(id = 12421, value = "FileProcessId.getpid - could not locate temporary directory.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_utils_FileProcessId_1();
-
-	@Message(id = 12422, value = "FileProcessId.getpid could not create unique file.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_utils_FileProcessId_2();
-
-	@Message(id = 12423, value = "Could not get back a valid pid.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_utils_MBeanProcessId_1();
-
-	@Message(id = 12424, value = "getName returned unrecognized format:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_utils_MBeanProcessId_2();
-
-	@Message(id = 12425, value = "Could not get back a valid pid.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_utils_ManualProcessId_1();
-
-	@Message(id = 12426, value = "No process identifier specified in configuration!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_utils_ManualProcessId_2();
-
-	@Message(id = 12427, value = "Invalid process identifier specified:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_utils_ManualProcessId_3();
-
-	@Message(id = 12428, value = "SocketProcessId.getpid could not get unique port.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void log_utils_SocketProcessId_2();
-
+    @Message(id = 12362, value = "Failed to create StateManagerWrapper", format = MESSAGE_FORMAT)
+    @LogMessage(level = INFO)
+    public void info_osb_StateManagerWrapperFail(Throwable arg0);
+    
     /*
         Allocate new messages directly above this notice.
           - id: use the next id number in numeric sequence. Don't reuse ids.
@@ -1759,5 +1439,7 @@
           - value: default (English) version of the log message.
           - level: according to severity semantics defined at http://docspace.corp.redhat.com/docs/DOC-30217
           Debug and trace don't get i18n. Everything else MUST be i18n.
+          By convention methods with String return type have prefix get_,
+            all others are log methods and have prefix <level>_
      */
 }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/arjunaI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/arjunaI18NLoggerImpl.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/arjunaI18NLoggerImpl.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -20,7 +20,10 @@
  */
 package com.arjuna.ats.arjuna.logging;
 
-import com.arjuna.common.util.logging.Logi18n;
+import org.jboss.logging.Logger;
+import static org.jboss.logging.Logger.Level.*;
+import java.text.MessageFormat;
+import com.arjuna.ats.arjuna.common.Uid;
 
 /**
  * i18n log messages for the arjuna module.
@@ -30,2577 +33,1280 @@
  */
 public class arjunaI18NLoggerImpl implements arjunaI18NLogger {
 
-	private final Logi18n logi18n;
+	private final Logger logger;
 
-	arjunaI18NLoggerImpl(Logi18n logi18n) {
-		this.logi18n = logi18n;
+	arjunaI18NLoggerImpl(Logger logger) {
+		this.logger = logger;
 	}
 
-	public void log_ActivationRecord_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.ActivationRecord_1");
-		}
+	public void warn_ActivationRecord_1() {
+		logger.logv(WARN, "ARJUNA-12001 ActivationRecord::set_value() called illegally", (Object)null);
 	}
 
-	public void log_ActivationRecord_2(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.ActivationRecord_2", new Object[] {arg0, arg1});
-		}
+	public void warn_ActivationRecord_2(String arg0, Uid arg1) {
+		logger.logv(WARN, "ARJUNA-12002 Invocation of ActivationRecord::restore_state for {0} inappropriate - ignored for {1}", arg0, arg1);
 	}
 
-	public void log_CadaverRecord_1(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.CadaverRecord_1", new Object[] {arg0, arg1});
-		}
+	public void warn_CadaverRecord_1(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12003 Attempted abort operation on deleted object id {0} of type {1} ignored", arg0, arg1);
 	}
 
-	public void log_DisposeRecord_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.DisposeRecord_1");
-		}
+	public void warn_DisposeRecord_1() {
+		logger.logv(WARN, "ARJUNA-12004 DisposeRecord::save_state - type of store is unknown", (Object)null);
 	}
 
-	public void log_DisposeRecord_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.DisposeRecord_2");
-		}
+	public void warn_DisposeRecord_2() {
+		logger.logv(WARN, "ARJUNA-12005 DisposeRecord::save_state - failed", (Object)null);
 	}
 
-	public void log_DisposeRecord_3() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.DisposeRecord_3");
-		}
+	public void warn_DisposeRecord_3() {
+		logger.logv(WARN, "ARJUNA-12006 DisposeRecord::save_state - no object store defined.", (Object)null);
 	}
 
-	public void log_DisposeRecord_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.DisposeRecord_4", new Object[] {arg0});
-		}
+	public void warn_DisposeRecord_4(String arg0) {
+		logger.logv(WARN, "ARJUNA-12007 DisposeRecord::restore_state - invalid store type {0}", arg0);
 	}
 
-	public void log_DisposeRecord_5(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.DisposeRecord_5", new Object[] {arg0});
-		}
+	public void warn_DisposeRecord_5(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12008 DisposeRecord::topLevelCommit - exception while deleting state", (Object)null);
 	}
 
-	public void log_PersistenceRecord_1(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_1", new Object[] {arg0, arg1});
-		}
+	public void warn_PersistenceRecord_10() {
+		logger.logv(WARN, "ARJUNA-12009 PersistenceRecord::restore_state: Failed to unpack object store type", (Object)null);
 	}
 
-	public void log_PersistenceRecord_10() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_10");
-		}
+	public void warn_PersistenceRecord_11() {
+		logger.logv(WARN, "ARJUNA-12010 PersistenceRecord::save_state - type of store is unknown", (Object)null);
 	}
 
-	public void log_PersistenceRecord_11() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_11");
-		}
+	public void warn_PersistenceRecord_14() {
+		logger.logv(WARN, "ARJUNA-12011 PersistenceRecord::save_state - packing top level state failed", (Object)null);
 	}
 
-	public void log_PersistenceRecord_12(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_12", new Object[] {arg0});
-		}
+	public void warn_PersistenceRecord_15() {
+		logger.logv(WARN, "ARJUNA-12012 PersistenceRecord::save_state - failed", (Object)null);
 	}
 
-	public void log_PersistenceRecord_13() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_13");
-		}
+	public void warn_PersistenceRecord_16() {
+		logger.logv(WARN, "ARJUNA-12013 PersistenceRecord::save_state - no object store defined for object", (Object)null);
 	}
 
-	public void log_PersistenceRecord_14() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_14");
-		}
+	public void warn_PersistenceRecord_19() {
+		logger.logv(WARN, "ARJUNA-12015 PersistenceRecord::topLevelAbort() - Could not remove state from object store!", (Object)null);
 	}
 
-	public void log_PersistenceRecord_15() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_15");
-		}
+	public void warn_PersistenceRecord_2(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12016 PersistenceRecord::topLevelCommit - commit_state call failed for {0}", arg0);
 	}
 
-	public void log_PersistenceRecord_16() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_16");
-		}
+	public void warn_PersistenceRecord_20(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12017 PersistenceRecord::topLevelAbort() - Received ObjectStoreException", (Object)null);
 	}
 
-	public void log_PersistenceRecord_17() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_17");
-		}
+	public void warn_PersistenceRecord_21(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12018 PersistenceRecord.topLevelPrepare - write_uncommitted error", (Object)null);
 	}
 
-	public void log_PersistenceRecord_18() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_18");
-		}
+	public void warn_PersistenceRecord_3() {
+		logger.logv(WARN, "ARJUNA-12019 PersistenceRecord::topLevelCommit - no state to commit!", (Object)null);
 	}
 
-	public void log_PersistenceRecord_19() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_19");
-		}
+	public void warn_PersistenceRecord_4(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12020 PersistenceRecord::topLevelCommit - caught exception", (Object)null);
 	}
 
-	public void log_PersistenceRecord_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_2", new Object[] {arg0});
-		}
+	public void warn_PersistenceRecord_5() {
+		logger.logv(WARN, "ARJUNA-12021 PersistenceRecord::topLevelCommit - no object store specified!", (Object)null);
 	}
 
-	public void log_PersistenceRecord_20(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_20", new Object[] {arg0});
-		}
+	public void warn_PersistenceRecord_6() {
+		logger.logv(WARN, "ARJUNA-12022 PersistenceRecord::topLevelCommit - commit_state error", (Object)null);
 	}
 
-	public void log_PersistenceRecord_21() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_21");
-		}
+	public void warn_PersistenceRecord_7() {
+		logger.logv(WARN, "ARJUNA-12023 PersistenceRecord deactivate error, object probably already deactivated!", (Object)null);
 	}
 
-	public void log_PersistenceRecord_3() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_3");
-		}
+	public void warn_PersistenceRecord_8() {
+		logger.logv(WARN, "ARJUNA-12024 PersistenceRecord.topLevelPrepare - setup error!", (Object)null);
 	}
 
-	public void log_PersistenceRecord_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_4", new Object[] {arg0});
-		}
+	public void warn_RecoveryRecord_1() {
+		logger.logv(WARN, "ARJUNA-12025 RecoveryRecord::setValue not given OutputObjectState.", (Object)null);
 	}
 
-	public void log_PersistenceRecord_5() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_5");
-		}
+	public void warn_RecoveryRecord_2() {
+		logger.logv(WARN, "ARJUNA-12026 RecoveryRecord::nestedAbort - restore_state on object failed!", (Object)null);
 	}
 
-	public void log_PersistenceRecord_6() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_6");
-		}
+	public void warn_StateManager_1() {
+		logger.logv(WARN, "ARJUNA-12027 StateManager::terminate() should be invoked in every destructor", (Object)null);
 	}
 
-	public void log_PersistenceRecord_7() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_7");
-		}
+	public void warn_StateManager_10() {
+		logger.logv(WARN, "ARJUNA-12028 StateManager::modified() invocation on an object whose state has not been restored - activating object", (Object)null);
 	}
 
-	public void log_PersistenceRecord_8() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_8");
-		}
+	public void warn_StateManager_11(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12029 Delete called on object with uid {0} and type {1} within atomic action.", arg0, arg1);
 	}
 
-	public void log_PersistenceRecord_9(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.PersistenceRecord_9", new Object[] {arg0});
-		}
+	public void warn_StateManager_12() {
+		logger.logv(WARN, "ARJUNA-12030 StateManager.cleanup - could not save_state from terminate!", (Object)null);
 	}
 
-	public void log_RecoveryRecord_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.RecoveryRecord_1");
-		}
+	public void warn_StateManager_13() {
+		logger.logv(WARN, "ARJUNA-12031 Attempt to use volatile store.", (Object)null);
 	}
 
-	public void log_RecoveryRecord_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.RecoveryRecord_2");
-		}
+	public String get_StateManager_14() {
+		return "ARJUNA-12032 Volatile store not implemented!";
 	}
 
-	public void log_StateManager_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_1");
-		}
+	public String get_StateManager_15() {
+		return "ARJUNA-12033 Invalid object state.";
 	}
 
-	public void log_StateManager_10() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_10");
-		}
+	public String get_StateManager_16() {
+		return "ARJUNA-12034 Invalid object store type:";
 	}
 
-	public void log_StateManager_11(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_11", new Object[] {arg0, arg1});
-		}
+	public void warn_StateManager_2(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12035 Activate of object with id = {0} and type {1} unexpectedly failed", arg0, arg1);
 	}
 
-	public void log_StateManager_12() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_12");
-		}
+	public void warn_StateManager_3(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12036 StateManager::deactivate - object store error", (Object)null);
 	}
 
-	public void log_StateManager_13() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_13");
-		}
+	public void warn_StateManager_4() {
+		logger.logv(WARN, "ARJUNA-12037 StateManager::deactivate - save_state error", (Object)null);
 	}
 
-	public void log_StateManager_14() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_14");
-		}
+	public void warn_StateManager_6(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12038 StateManager.destroy - failed to add abstract record to transaction {0}; check transaction status.", arg0);
 	}
 
-	public void log_StateManager_15() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_15");
-		}
+	public void warn_StateManager_7(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12039 StateManager.destroy - caught object store exception", (Object)null);
 	}
 
-	public void log_StateManager_16() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_16");
-		}
+	public void warn_StateManager_8() {
+		logger.logv(WARN, "ARJUNA-12040 StateManager.destroy - called on non-persistent or new object!", (Object)null);
 	}
 
-	public void log_StateManager_2(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_2", new Object[] {arg0, arg1});
-		}
+	public void warn_StateManager_9() {
+		logger.logv(WARN, "ARJUNA-12041 StateManager.restore_state - could not find StateManager state in object state!", (Object)null);
 	}
 
-	public void log_StateManager_3() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_3");
-		}
+	public void warn_common_Mutex_2() {
+		logger.logv(WARN, "ARJUNA-12043 Mutex.unlock - called by non-owning thread!", (Object)null);
 	}
 
-	public void log_StateManager_4() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_4");
-		}
+	public void warn_common_Uid_1() {
+		logger.logv(WARN, "ARJUNA-12044 cannot get local host.", (Object)null);
 	}
 
-	public void log_StateManager_5(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_5", new Object[] {arg0});
-		}
+	public String get_common_Uid_11() {
+		return "ARJUNA-12046 Uid.Uid recreate constructor could not recreate Uid!";
 	}
 
-	public void log_StateManager_6(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_6", new Object[] {arg0});
-		}
+	public String get_common_Uid_2() {
+		return "ARJUNA-12047 Uid.Uid string constructor could not create nullUid";
 	}
 
-	public void log_StateManager_7(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_7", new Object[] {arg0});
-		}
+	public void warn_common_Uid_3(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12048 Uid general parsing error: {0}", arg0);
 	}
 
-	public void log_StateManager_8() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_8");
-		}
+	public void fatal_common_Uid_4(String arg0) {
+		logger.logv(FATAL, "ARJUNA-12049 Uid.Uid string constructor could not create nullUid for incorrect string: {0}", arg0);
 	}
 
-	public void log_StateManager_9() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.StateManager_9");
-		}
+	public String get_common_Uid_5(String arg0) {
+		return MessageFormat.format("ARJUNA-12050 Uid.Uid string constructor incorrect: {0}", arg0);
 	}
 
-	public void log_common_Mutex_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Mutex_1");
-		}
+	public void warn_common_Uid_6() {
+		logger.logv(WARN, "ARJUNA-12051 Uid.generateHash called for invalid Uid. Will ignore.", (Object)null);
 	}
 
-	public void log_common_Mutex_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Mutex_2");
-		}
+	public void warn_common_Uid_bytes(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12055 Exception thrown creating Uid from bytes!", (Object)null);
 	}
 
-	public void log_common_Uid_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Uid_1");
-		}
+	public void warn_common_Uid_getbytes(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12056 Exception thrown getting bytes!", (Object)null);
 	}
 
-	public void log_common_Uid_10() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Uid_10");
-		}
+	public void warn_common_Uid_npe(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12057 Uid.Uid string constructor {0} caught other throwable", arg0);
 	}
 
-	public void log_common_Uid_11() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Uid_11");
-		}
+	public void warn_coordinator_AbstractRecord_npe(String arg0) {
+		logger.logv(WARN, "ARJUNA-12058 AbstractRecord.create {0} failed to find record.", arg0);
 	}
 
-	public void log_common_Uid_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Uid_2");
-		}
+	public String get_coordinator_ActionHierarchy_1() {
+		return "ARJUNA-12059 Memory exhausted.";
 	}
 
-	public void log_common_Uid_3(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Uid_3", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_1(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12060 Action nesting error - deletion of action id {0} invoked while child actions active", arg0);
 	}
 
-	public void log_common_Uid_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Uid_4", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_2(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12061 Aborting child {0}", arg0);
 	}
 
-	public void log_common_Uid_5(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Uid_5", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_21(String arg0) {
+		logger.logv(WARN, "ARJUNA-12062 BasicAction.restore_state - could not recover {0}", arg0);
 	}
 
-	public void log_common_Uid_6() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Uid_6");
-		}
+	public void warn_coordinator_BasicAction_24() {
+		logger.logv(WARN, "ARJUNA-12063 BasicAction.restore_state - error unpacking action status.", (Object)null);
 	}
 
-	public void log_common_Uid_7() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Uid_7");
-		}
+	public void warn_coordinator_BasicAction_29(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12065 BasicAction.Begin of action {0} ignored - incorrect invocation sequence {1}", arg0, arg1);
 	}
 
-	public void log_common_Uid_8() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Uid_8");
-		}
+	public void warn_coordinator_BasicAction_3(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12066 Destructor of still running action id {0} invoked - Aborting", arg0);
 	}
 
-	public void log_common_Uid_9() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Uid_9");
-		}
+	public void warn_coordinator_BasicAction_30(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12067 BasicAction.Begin of action {0} ignored - no parent and set as nested action!", arg0);
 	}
 
-	public void log_common_Uid_bytes() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Uid_bytes");
-		}
+	public void warn_coordinator_BasicAction_31(Uid arg0, Uid arg1, String arg2) {
+		logger.logv(WARN, "ARJUNA-12068 BasicAction.Begin of action {0} ignored - parent action {1} is not running: {2}", arg0, arg1, arg2);
 	}
 
-	public void log_common_Uid_getbytes() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Uid_getbytes");
-		}
+	public void warn_coordinator_BasicAction_33(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12070 End called on non-running atomic action {0}", arg0);
 	}
 
-	public void log_common_Uid_npe(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.common.Uid_npe", new Object[] {arg0, arg1});
-		}
+	public void warn_coordinator_BasicAction_34(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12071 End called on already committed atomic action {0}", arg0);
 	}
 
-	public void log_coordinator_AbstractRecord_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.AbstractRecord_1");
-		}
+	public void warn_coordinator_BasicAction_35(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12072 End called illegally on atomic action {0}", arg0);
 	}
 
-	public void log_coordinator_AbstractRecord_npe(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.AbstractRecord_npe", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_36(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12073 BasicAction.End() - prepare phase of action-id {0} failed.", arg0);
 	}
 
-	public void log_coordinator_ActionHierarchy_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.ActionHierarchy_1");
-		}
+	public void warn_coordinator_BasicAction_37(String arg0) {
+		logger.logv(WARN, "ARJUNA-12074 Received heuristic: {0} .", arg0);
 	}
 
-	public void log_coordinator_BasicAction_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_1", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_38() {
+		logger.logv(WARN, "ARJUNA-12075 Action Aborting", (Object)null);
 	}
 
-	public void log_coordinator_BasicAction_10(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_10", new Object[] {arg0, arg1});
-		}
+	public void warn_coordinator_BasicAction_39(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12076 Abort called on non-running atomic action {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_11(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_11", new Object[] {arg0, arg1, arg2});
-		}
+	public void warn_coordinator_BasicAction_40(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12077 Abort called on already aborted atomic action {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_12(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_12", new Object[] {arg0, arg1});
-		}
+	public void warn_coordinator_BasicAction_41(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12078 Abort called illegaly on atomic action {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_13(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_13", new Object[] {arg0, arg1, arg2});
-		}
+	public void warn_coordinator_BasicAction_42(Uid arg0, String arg1, String arg2) {
+		logger.logv(WARN, "ARJUNA-12079 BasicAction {0} - non-empty ( {1} ) pendingList {2}", arg0, arg1, arg2);
 	}
 
-	public void log_coordinator_BasicAction_14(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_14", new Object[] {arg0, arg1, arg2});
-		}
+	public void warn_coordinator_BasicAction_43(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12080 Transaction {0} marked as rollback only. Will abort.", arg0);
 	}
 
-	public void log_coordinator_BasicAction_15(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_15", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_44() {
+		logger.logv(WARN, "ARJUNA-12081 Cannot force parent to rollback - no handle!", (Object)null);
 	}
 
-	public void log_coordinator_BasicAction_16() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_16");
-		}
+	public void warn_coordinator_BasicAction_45(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12082 BasicAction::prepare - creating intentions list failed for {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_17(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_17", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_46(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12083 BasicAction::prepare - intentions list write failed for {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_18() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_18");
-		}
+	public void warn_coordinator_BasicAction_47(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12084 One-phase commit of action {0} received heuristic decision: {1}", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_19(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_19", new Object[] {arg0});
-		}
+	public void fatal_coordinator_BasicAction_48() {
+		logger.logv(FATAL, "ARJUNA-12085 BasicAction.onePhaseCommit failed - no object store for atomic action state!", (Object)null);
 	}
 
-	public void log_coordinator_BasicAction_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_2", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_49(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12086 Prepare phase of nested action {0} received inconsistent outcomes.", arg0);
 	}
 
-	public void log_coordinator_BasicAction_20(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_20", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_5(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12087 Activate of atomic action with id {0} and type {1} unexpectedly failed, could not load state.", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_21(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_21", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_50(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12088 Prepare phase of action {0} received heuristic decision: {1}", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_22(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_22", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_52(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12089 Top-level abort of action {0} received heuristic decision: {1}", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_23(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_23", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_53(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12090 Nested abort of action {0} received heuristic decision: {1}", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_24() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_24");
-		}
+	public void warn_coordinator_BasicAction_54(Uid arg0, String arg1, String arg2) {
+		logger.logv(WARN, "ARJUNA-12091 Top-level abort of action {0} received {1} from {2}", arg0, arg1, arg2);
 	}
 
-	public void log_coordinator_BasicAction_25(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_25", new Object[] {arg0, arg1});
-		}
+	public void warn_coordinator_BasicAction_55(Uid arg0, String arg1, String arg2) {
+		logger.logv(WARN, "ARJUNA-12092 Nested abort of action {0} received {1} from {2}", arg0, arg1, arg2);
 	}
 
-	public void log_coordinator_BasicAction_26(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_26", new Object[] {arg0, arg1});
-		}
+	public void warn_coordinator_BasicAction_56(Uid arg0, Uid arg1) {
+		logger.logv(WARN, "ARJUNA-12093 BasicAction.checkIsCurrent {0} - terminating non-current transaction: {1}", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_27(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_27", new Object[] {arg0, arg1});
-		}
+	public void warn_coordinator_BasicAction_57(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12094 Commit of action id {0} invoked while multiple threads active within it.", arg0);
 	}
 
-	public void log_coordinator_BasicAction_28(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_28", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_58(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12095 Abort of action id {0} invoked while multiple threads active within it.", arg0);
 	}
 
-	public void log_coordinator_BasicAction_29(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_29", new Object[] {arg0, arg1});
-		}
+	public void warn_coordinator_BasicAction_59(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12096 Commit of action id {0} invoked while child actions active", arg0);
 	}
 
-	public void log_coordinator_BasicAction_3(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_3", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_5a(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12097 Deactivate of atomic action with id {0} and type {1} unexpectedly failed, could not save state.", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_30(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_30", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_60(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12098 Abort of action id {0} invoked while child actions active", arg0);
 	}
 
-	public void log_coordinator_BasicAction_31(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_31", new Object[] {arg0, arg1, arg2});
-		}
+	public void warn_coordinator_BasicAction_61(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12099 Aborting child: {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_32() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_32");
-		}
+	public void warn_coordinator_BasicAction_62(String arg0) {
+		logger.logv(WARN, "ARJUNA-12100 Now aborting self: {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_33(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_33", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_64() {
+		logger.logv(WARN, "ARJUNA-12101 BasicAction.updateState - Could not create ObjectState for failedList", (Object)null);
 	}
 
-	public void log_coordinator_BasicAction_34(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_34", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_65() {
+		logger.logv(WARN, "ARJUNA-12102 BasicAction.End - Could not write failed list", (Object)null);
 	}
 
-	public void log_coordinator_BasicAction_35(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_35", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_68() {
+		logger.logv(WARN, "ARJUNA-12103 (Internal) BasicAction.merge - record rejected", (Object)null);
 	}
 
-	public void log_coordinator_BasicAction_36(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_36", new Object[] {arg0});
-		}
+	public String get_coordinator_BasicAction_69() {
+		return "ARJUNA-12104 No object store for:";
 	}
 
-	public void log_coordinator_BasicAction_37(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_37", new Object[] {arg0});
-		}
+	public void warn_coordinator_BasicAction_70(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12105 Could not remove intentions list:", (Object)null);
 	}
 
-	public void log_coordinator_BasicAction_38() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_38");
-		}
+	public void warn_coordinator_CheckedAction_1(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12107 CheckedAction::check - atomic action {0} commiting with {1} threads active!", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_39(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_39", new Object[] {arg0});
-		}
+	public void warn_coordinator_CheckedAction_2(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12108 CheckedAction::check - atomic action {0} aborting with {1} threads active!", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_40(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_40", new Object[] {arg0});
-		}
+	public String get_coordinator_TransactionReaper_1() {
+		return "ARJUNA-12109 TransactionReaper - attempting to insert an element that is already present.";
 	}
 
-	public void log_coordinator_BasicAction_41(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_41", new Object[] {arg0});
-		}
+	public void warn_coordinator_TransactionReaper_10(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12110 TransactionReaper::check successfuly marked TX {0} as rollback only", arg0);
 	}
 
-	public void log_coordinator_BasicAction_42(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_42", new Object[] {arg0, arg1, arg2});
-		}
+	public void warn_coordinator_TransactionReaper_11(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12111 TransactionReaper::check failed to mark TX {0}  as rollback only", arg0);
 	}
 
-	public void log_coordinator_BasicAction_43(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_43", new Object[] {arg0});
-		}
+	public void warn_coordinator_TransactionReaper_12(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12112 TransactionReaper::check exception while marking TX {0} as rollback only", arg0);
 	}
 
-	public void log_coordinator_BasicAction_44() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_44");
-		}
+	public void warn_coordinator_TransactionReaper_13(String arg0, Uid arg1, String arg2) {
+		logger.logv(WARN, "ARJUNA-12113 TransactionReaper::doCancellations worker {0} missed interrupt when cancelling TX {1} -- exiting as zombie (zombie count decremented to {2})", arg0, arg1, arg2);
 	}
 
-	public void log_coordinator_BasicAction_45(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_45", new Object[] {arg0});
-		}
+	public void warn_coordinator_TransactionReaper_14(String arg0, Uid arg1) {
+		logger.logv(WARN, "ARJUNA-12114 TransactionReaper::doCancellations worker {0} successfuly marked TX {1} as rollback only", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_46(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_46", new Object[] {arg0});
-		}
+	public void warn_coordinator_TransactionReaper_15(String arg0, Uid arg1) {
+		logger.logv(WARN, "ARJUNA-12115 TransactionReaper::doCancellations worker {0} failed to mark TX {1}  as rollback only", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_47(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_47", new Object[] {arg0, arg1});
-		}
+	public void warn_coordinator_TransactionReaper_16(String arg0, Uid arg1, Throwable arg2) {
+		logger.logv(WARN, arg2, "ARJUNA-12116 TransactionReaper::doCancellations worker {0} exception while marking TX {1} as rollback only", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_48() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_48");
-		}
+	public void warn_coordinator_TransactionReaper_18(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12117 TransactionReaper::check timeout for TX {0} in state  {1}", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_49(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_49", new Object[] {arg0});
-		}
+	public void warn_coordinator_TransactionReaper_19() {
+		logger.logv(WARN, "ARJUNA-12118 TransactionReaper NORMAL mode is deprecated. Update config to use PERIODIC for equivalent behaviour.", (Object)null);
 	}
 
-	public void log_coordinator_BasicAction_5(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_5", new Object[] {arg0, arg1});
-		}
+	public void error_coordinator_TransactionReaper_5(String arg0) {
+		logger.logv(ERROR, "ARJUNA-12119 TransactionReaper::check worker zombie count {0} exceeds specified limit", arg0);
 	}
 
-	public void log_coordinator_BasicAction_50(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_50", new Object[] {arg0, arg1});
-		}
+	public void warn_coordinator_TransactionReaper_6(String arg0, Uid arg1) {
+		logger.logv(WARN, "ARJUNA-12120 TransactionReaper::check worker {0} not responding to interrupt when cancelling TX {1} -- worker marked as zombie and TX scheduled for mark-as-rollback", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_51(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_51", new Object[] {arg0, arg1, arg2});
-		}
+	public void warn_coordinator_TransactionReaper_7(String arg0, Uid arg1) {
+		logger.logv(WARN, "ARJUNA-12121 TransactionReaper::doCancellations worker {0} successfully canceled TX {1}", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_52(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_52", new Object[] {arg0, arg1});
-		}
+	public void warn_coordinator_TransactionReaper_8(String arg0, Uid arg1) {
+		logger.logv(WARN, "ARJUNA-12122 TransactionReaper::doCancellations worker {0} failed to cancel TX {1} -- rescheduling for mark-as-rollback", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_53(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_53", new Object[] {arg0, arg1});
-		}
+	public void warn_coordinator_TransactionReaper_9(String arg0, Uid arg1, Throwable arg2) {
+		logger.logv(WARN, arg2, "ARJUNA-12123 TransactionReaper::doCancellations worker {0} exception during cancel of TX {1} -- rescheduling for mark-as-rollback", arg0, arg1);
 	}
 
-	public void log_coordinator_BasicAction_54(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_54", new Object[] {arg0, arg1, arg2});
-		}
+	public void warn_coordinator_TwoPhaseCoordinator_1() {
+		logger.logv(WARN, "ARJUNA-12124 TwoPhaseCoordinator.beforeCompletion - attempted rollback_only failed!", (Object)null);
 	}
 
-	public void log_coordinator_BasicAction_55(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_55", new Object[] {arg0, arg1, arg2});
-		}
+	public void warn_coordinator_TwoPhaseCoordinator_2(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12125 TwoPhaseCoordinator.beforeCompletion - failed for {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_56(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_56", new Object[] {arg0, arg1});
-		}
+	public void warn_coordinator_TwoPhaseCoordinator_3() {
+		logger.logv(WARN, "ARJUNA-12126 TwoPhaseCoordinator.beforeCompletion TwoPhaseCoordinator.afterCompletion called on still running transaction!", (Object)null);
 	}
 
-	public void log_coordinator_BasicAction_57(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_57", new Object[] {arg0});
-		}
+	public void warn_coordinator_TwoPhaseCoordinator_4(String arg0) {
+		logger.logv(WARN, "ARJUNA-12127 TwoPhaseCoordinator.afterCompletion - returned failure for {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_58(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_58", new Object[] {arg0});
-		}
+	public void warn_coordinator_TwoPhaseCoordinator_4a(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12128 TwoPhaseCoordinator.afterCompletion - failed for {0} with exception", arg0);
 	}
 
-	public void log_coordinator_BasicAction_59(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_59", new Object[] {arg0});
-		}
+	public void warn_coordinator_TwoPhaseCoordinator_4b(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12129 TwoPhaseCoordinator.afterCompletion - failed for {0} with error", arg0);
 	}
 
-	public void log_coordinator_BasicAction_5a(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_5a", new Object[] {arg0, arg1});
-		}
+	public void warn_coordinator_TxControl_1(String arg0) {
+		logger.logv(WARN, "ARJUNA-12130 Name of XA node not defined. Using {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_6(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_6", new Object[] {arg0, arg1});
-		}
+	public void warn_coordinator_TxControl_2(String arg0) {
+		logger.logv(WARN, "ARJUNA-12131 Supplied name of node is too long. Using {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_60(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_60", new Object[] {arg0});
-		}
+	public void warn_coordinator_TxControl_3(String arg0) {
+		logger.logv(WARN, "ARJUNA-12132 Supplied name of node contains reserved character '-'. Using {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_61(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_61", new Object[] {arg0});
-		}
+	public String get_coordinator_invalidos() {
+		return "ARJUNA-12135 Could not create ObjectStore type:";
 	}
 
-	public void log_coordinator_BasicAction_62(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_62", new Object[] {arg0});
-		}
+	public void warn_coordinator_norecordfound(String arg0) {
+		logger.logv(WARN, "ARJUNA-12136 Could not recreate abstract record {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_63(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_63", new Object[] {arg0, arg1});
-		}
+	public void warn_coordinator_notrunning() {
+		logger.logv(WARN, "ARJUNA-12137 Cannot begin new transaction as TM is disabled. Marking as rollback-only.", (Object)null);
 	}
 
-	public void log_coordinator_BasicAction_64() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_64");
-		}
+	public void warn_coordinator_toolong() {
+		logger.logv(WARN, "ARJUNA-12138 Node name cannot exceed 64 bytes!", (Object)null);
 	}
 
-	public void log_coordinator_BasicAction_65() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_65");
-		}
+	public void warn_lastResource_disableWarning() {
+		logger.logv(WARN, "ARJUNA-12139 You have chosen to disable the Multiple Last Resources warning. You will see it only once.", (Object)null);
 	}
 
-	public void log_coordinator_BasicAction_66(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_66", new Object[] {arg0, arg1});
-		}
+	public void warn_lastResource_disallow(String arg0) {
+		logger.logv(WARN, "ARJUNA-12140 Adding multiple last resources is disallowed. Current resource is {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_67(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_67", new Object[] {arg0, arg1});
-		}
+	public void warn_lastResource_multipleWarning(String arg0) {
+		logger.logv(WARN, "ARJUNA-12141 Multiple last resources have been added to the current transaction. This is transactionally unsafe and should not be relied upon. Current resource is {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_68() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_68");
-		}
+	public void warn_lastResource_startupWarning() {
+		logger.logv(WARN, "ARJUNA-12142 You have chosen to enable multiple last resources in the transaction manager. This is transactionally unsafe and should not be relied upon.", (Object)null);
 	}
 
-	public void log_coordinator_BasicAction_69() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_69");
-		}
+	public void warn_objectstore_ObjectStoreType_1(String arg0) {
+		logger.logv(WARN, "ARJUNA-12143 unknown store: {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_7(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_7", new Object[] {arg0, arg1, arg2});
-		}
+	public String get_objectstore_ObjectStoreType_2() {
+		return "ARJUNA-12144 unknown store:";
 	}
 
-	public void log_coordinator_BasicAction_70() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_70");
-		}
+	public void warn_recovery_ActionStatusService_5(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12146 ActionStatusService: searching for uid: {0}", arg0);
 	}
 
-	public void log_coordinator_BasicAction_71(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_71", new Object[] {arg0, arg1});
-		}
+	public void info_recovery_ActionStatusService_1(String arg0, String arg1, String arg2) {
+		logger.logv(INFO, "ARJUNA-12147 transactionType: {0} uid: {1}   Status is {2}", arg0, arg1, arg2);
 	}
 
-	public void log_coordinator_BasicAction_8(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_8", new Object[] {arg0, arg1});
-		}
+	public void warn_recovery_ActionStatusService_2(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12148 Other Exception", (Object)null);
 	}
 
-	public void log_coordinator_BasicAction_9(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_9", new Object[] {arg0, arg1, arg2});
-		}
+	public void warn_recovery_ActionStatusService_3(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12149 Exception retrieving action status", (Object)null);
 	}
 
-	public void log_coordinator_CheckedAction_1(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.CheckedAction_1", new Object[] {arg0, arg1});
-		}
+	public void info_recovery_ActionStatusService_4(Uid arg0) {
+		logger.logv(INFO, "ARJUNA-12150 matching Uid {0} found", arg0);
 	}
 
-	public void log_coordinator_CheckedAction_2(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.CheckedAction_2", new Object[] {arg0, arg1});
-		}
+	public void warn_recovery_ActionStatusService_6(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12151 Exception when accessing transaction store", (Object)null);
 	}
 
-	public void log_coordinator_RecordList_1(String arg0, String arg1, String arg2, String arg3) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.RecordList_1", new Object[] {arg0, arg1, arg2, arg3});
-		}
+	public void warn_recovery_ActionStatusService_7() {
+		logger.logv(WARN, "ARJUNA-12152 Connection Lost to Recovery Manager", (Object)null);
 	}
 
-	public void log_coordinator_RecordList_2(String arg0, String arg1, String arg2, String arg3) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.RecordList_2", new Object[] {arg0, arg1, arg2, arg3});
-		}
+	public void warn_recovery_RecoverAtomicAction_2(String arg0) {
+		logger.logv(WARN, "ARJUNA-12153 RecoverAtomicAction.replayPhase2: Unexpected status: {0}", arg0);
 	}
 
-	public void log_coordinator_RecordList_3(String arg0, String arg1, String arg2, String arg3) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.RecordList_3", new Object[] {arg0, arg1, arg2, arg3});
-		}
+	public void warn_recovery_RecoverAtomicAction_4(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12154 RecoverAtomicAction: transaction {0} not activated, unable to replay phase 2 commit. Check state has not already been completed.", arg0);
 	}
 
-	public void log_coordinator_RecordList_4(String arg0, String arg1, String arg2, String arg3) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.RecordList_4", new Object[] {arg0, arg1, arg2, arg3});
-		}
+	public void warn_recovery_RecoverAtomicAction_5(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12155 RecoverAtomicAction - tried to move failed activation log {0}", arg0);
 	}
 
-	public void log_coordinator_RecordList_5(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.RecordList_5", new Object[] {arg0, arg1, arg2});
-		}
+	public void info_recovery_RecoveryManager_4(String arg0, String arg1) {
+		logger.logv(INFO, "ARJUNA-12159 Connected to recovery manager on {0}:{1}", arg0, arg1);
 	}
 
-	public void log_coordinator_RecordList_6(String arg0, String arg1, String arg2, String arg3, String arg4) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.RecordList_6", new Object[] {arg0, arg1, arg2, arg3, arg4});
-		}
+	public void warn_recovery_TransactionStatusConnectionManager_1(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12161 Exception when accessing data store", (Object)null);
 	}
 
-	public void log_coordinator_TransactionReaper_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_1");
-		}
+	public void warn_recovery_TransactionStatusConnectionManager_2(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12162 Object store exception", (Object)null);
 	}
 
-	public void log_coordinator_TransactionReaper_10(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_10", new Object[] {arg0});
-		}
+	public void info_recovery_TransactionStatusManager_1(String arg0, String arg1) {
+		logger.logv(INFO, "ARJUNA-12163 Starting service {0} on port {1}", arg0, arg1);
 	}
 
-	public void log_coordinator_TransactionReaper_11(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_11", new Object[] {arg0});
-		}
+	public String get_recovery_TransactionStatusManager_13() {
+		return "ARJUNA-12167 Invalid host or port";
 	}
 
-	public void log_coordinator_TransactionReaper_12(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_12", new Object[] {arg0});
-		}
+	public void warn_recovery_TransactionStatusManager_14(String arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12168 Failed to create server socket on address {0} and port: {1}", arg0, arg1);
 	}
 
-	public void log_coordinator_TransactionReaper_13(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_13", new Object[] {arg0, arg1, arg2});
-		}
+	public void warn_recovery_TransactionStatusManager_2() {
+		logger.logv(WARN, "ARJUNA-12169 Listener failed", (Object)null);
 	}
 
-	public void log_coordinator_TransactionReaper_14(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_14", new Object[] {arg0, arg1});
-		}
+	public void info_recovery_TransactionStatusManager_3(String arg0, String arg1, String arg2) {
+		logger.logv(INFO, "ARJUNA-12170 TransactionStatusManager started on port {0} and host {1} with service {2}", arg0, arg1, arg2);
 	}
 
-	public void log_coordinator_TransactionReaper_15(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_15", new Object[] {arg0, arg1});
-		}
+	public void warn_recovery_TransactionStatusManager_4(String arg0) {
+		logger.logv(WARN, "ARJUNA-12171 Class not found: {0}", arg0);
 	}
 
-	public void log_coordinator_TransactionReaper_16(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_16", new Object[] {arg0, arg1});
-		}
+	public void warn_recovery_TransactionStatusManager_5(String arg0) {
+		logger.logv(WARN, "ARJUNA-12172 Failed to instantiate service class: {0}", arg0);
 	}
 
-	public void log_coordinator_TransactionReaper_17(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_17", new Object[] {arg0, arg1});
-		}
+	public void warn_recovery_TransactionStatusManager_6(String arg0) {
+		logger.logv(WARN, "ARJUNA-12173 Illegal access to service class: {0}", arg0);
 	}
 
-	public void log_coordinator_TransactionReaper_18(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_18", new Object[] {arg0, arg1});
-		}
+	public String get_recovery_TransactionStatusManager_9() {
+		return "ARJUNA-12176 Could not get unique port.";
 	}
 
-	public void log_coordinator_TransactionReaper_19() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_19");
-		}
+	public String get_state_InputBuffer_1() {
+		return "ARJUNA-12177 com.arjuna.ats.arjuna.state.InputBuffer_1 - Invalid input buffer: byte.";
 	}
 
-	public void log_coordinator_TransactionReaper_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_2", new Object[] {arg0});
-		}
+	public String get_state_InputBuffer_10() {
+		return "ARJUNA-12178 com.arjuna.ats.arjuna.state.InputBuffer_10 - Invalid input buffer: string.";
 	}
 
-	public void log_coordinator_TransactionReaper_3(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_3", new Object[] {arg0, arg1});
-		}
+	public String get_state_InputBuffer_11() {
+		return "ARJUNA-12179 com.arjuna.ats.arjuna.state.InputBuffer_11 - Invalid from buffer";
 	}
 
-	public void log_coordinator_TransactionReaper_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_4", new Object[] {arg0});
-		}
+	public String get_state_InputBuffer_2() {
+		return "ARJUNA-12180 com.arjuna.ats.arjuna.state.InputBuffer_2 - Invalid input buffer: bytes.";
 	}
 
-	public void log_coordinator_TransactionReaper_5(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_5", new Object[] {arg0});
-		}
+	public String get_state_InputBuffer_3() {
+		return "ARJUNA-12181 com.arjuna.ats.arjuna.state.InputBuffer_3 - Invalid input buffer: boolean.";
 	}
 
-	public void log_coordinator_TransactionReaper_6(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_6", new Object[] {arg0, arg1});
-		}
+	public String get_state_InputBuffer_4() {
+		return "ARJUNA-12182 com.arjuna.ats.arjuna.state.InputBuffer_4 - Invalid input buffer: char.";
 	}
 
-	public void log_coordinator_TransactionReaper_7(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_7", new Object[] {arg0, arg1});
-		}
+	public String get_state_InputBuffer_5() {
+		return "ARJUNA-12183 com.arjuna.ats.arjuna.state.InputBuffer_5 - Invalid input buffer: short.";
 	}
 
-	public void log_coordinator_TransactionReaper_8(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_8", new Object[] {arg0, arg1});
-		}
+	public String get_state_InputBuffer_6() {
+		return "ARJUNA-12184 com.arjuna.ats.arjuna.state.InputBuffer_6 - Invalid input buffer: int.";
 	}
 
-	public void log_coordinator_TransactionReaper_9(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TransactionReaper_9", new Object[] {arg0, arg1});
-		}
+	public String get_state_InputBuffer_7() {
+		return "ARJUNA-12185 com.arjuna.ats.arjuna.state.InputBuffer_7 - Invalid input buffer: long.";
 	}
 
-	public void log_coordinator_TwoPhaseCoordinator_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator_1");
-		}
+	public String get_state_InputBuffer_8() {
+		return "ARJUNA-12186 com.arjuna.ats.arjuna.state.InputBuffer_8 - Invalid input buffer: float.";
 	}
 
-	public void log_coordinator_TwoPhaseCoordinator_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator_2", new Object[] {arg0});
-		}
+	public String get_state_InputBuffer_9() {
+		return "ARJUNA-12187 com.arjuna.ats.arjuna.state.InputBuffer_9 - Invalid input buffer: double";
 	}
 
-	public void log_coordinator_TwoPhaseCoordinator_3() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator_3");
-		}
+	public String get_state_OutputBuffer_1() {
+		return "ARJUNA-12188 com.arjuna.ats.arjuna.state.OutputBuffer_1 - Invalid input buffer: byte.";
 	}
 
-	public void log_coordinator_TwoPhaseCoordinator_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator_4", new Object[] {arg0});
-		}
+	public String get_state_OutputBuffer_10() {
+		return "ARJUNA-12189 com.arjuna.ats.arjuna.state.OutputBuffer_10 - Invalid input buffer: string.";
 	}
 
-	public void log_coordinator_TwoPhaseCoordinator_4a(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator_4a", new Object[] {arg0, arg1});
-		}
+	public String get_state_OutputBuffer_11() {
+		return "ARJUNA-12190 com.arjuna.ats.arjuna.state.OutputBuffer_11 - Invalid from buffer";
 	}
 
-	public void log_coordinator_TwoPhaseCoordinator_4b(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator_4b", new Object[] {arg0, arg1});
-		}
+	public String get_state_OutputBuffer_2() {
+		return "ARJUNA-12191 com.arjuna.ats.arjuna.state.OutputBuffer_2 - Invalid input buffer: bytes.";
 	}
 
-	public void log_coordinator_TxControl_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TxControl_1", new Object[] {arg0});
-		}
+	public String get_state_OutputBuffer_3() {
+		return "ARJUNA-12192 com.arjuna.ats.arjuna.state.OutputBuffer_3 - Invalid input buffer: boolean.";
 	}
 
-	public void log_coordinator_TxControl_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TxControl_2", new Object[] {arg0});
-		}
+	public String get_state_OutputBuffer_4() {
+		return "ARJUNA-12193 com.arjuna.ats.arjuna.state.OutputBuffer_4 - Invalid input buffer: char.";
 	}
 
-	public void log_coordinator_TxControl_3(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.TxControl_3", new Object[] {arg0});
-		}
+	public String get_state_OutputBuffer_5() {
+		return "ARJUNA-12194 com.arjuna.ats.arjuna.state.OutputBuffer_5 - Invalid input buffer: short.";
 	}
 
-	public void log_coordinator_cafactoryerror() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.cafactoryerror");
-		}
+	public String get_state_OutputBuffer_6() {
+		return "ARJUNA-12195 com.arjuna.ats.arjuna.state.OutputBuffer_6 - Invalid input buffer: int.";
 	}
 
-	public void log_coordinator_checkedactionfactory(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.checkedactionfactory", new Object[] {arg0});
-		}
+	public String get_state_OutputBuffer_7() {
+		return "ARJUNA-12196 com.arjuna.ats.arjuna.state.OutputBuffer_7 - Invalid input buffer: long.";
 	}
 
-	public void log_coordinator_invalidos() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.invalidos");
-		}
+	public String get_state_OutputBuffer_8() {
+		return "ARJUNA-12197 com.arjuna.ats.arjuna.state.OutputBuffer_8 - Invalid input buffer: float.";
 	}
 
-	public void log_coordinator_norecordfound(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.norecordfound", new Object[] {arg0});
-		}
+	public String get_state_OutputBuffer_9() {
+		return "ARJUNA-12198 com.arjuna.ats.arjuna.state.OutputBuffer_9 - Invalid input buffer: double";
 	}
 
-	public void log_coordinator_notrunning() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.notrunning");
-		}
+	public void info_tools_osb_util_JMXServer_m_1(String arg0) {
+		logger.logv(INFO, "ARJUNA-12202 registering bean {0}.", arg0);
 	}
 
-	public void log_coordinator_toolong() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.coordinator.toolong");
-		}
+	public void info_tools_osb_util_JMXServer_m_2(String arg0) {
+		logger.logv(INFO, "ARJUNA-12203 Instance already exists: {0}.", arg0);
 	}
 
-	public void log_lastResource_disableWarning() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.lastResource.disableWarning");
-		}
+	public void warn_tools_osb_util_JMXServer_m_3(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12204 Error registering {0}", arg0);
 	}
 
-	public void log_lastResource_disallow(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.lastResource.disallow", new Object[] {arg0});
-		}
+	public void warn_tools_osb_util_JMXServer_m_5(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12206 Unable to unregister bean {0}", arg0);
 	}
 
-	public void log_lastResource_multipleWarning(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.lastResource.multipleWarning", new Object[] {arg0});
-		}
+	public void warn_tools_osb_util_JMXServer_m_6(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12207 Unable to unregister bean {0}", arg0);
 	}
 
-	public void log_lastResource_startupWarning() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.lastResource.startupWarning");
-		}
+	public void warn_utils_FileLock_4(String arg0) {
+		logger.logv(WARN, "ARJUNA-12208 An error occurred while creating file {0}", arg0);
 	}
 
-	public void log_objectstore_ObjectStoreType_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.objectstore.ObjectStoreType_1", new Object[] {arg0});
-		}
+	public void warn_utils_Utility_1(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12209 Utility.getDefaultProcess - failed with", (Object)null);
 	}
 
-	public void log_objectstore_ObjectStoreType_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.objectstore.ObjectStoreType_2");
-		}
+	public void warn_utils_Utility_2() {
+		logger.logv(WARN, "ARJUNA-12210 Unable to use InetAddress.getLocalHost() to resolve address.", (Object)null);
 	}
 
-	public void log_objectstore_ObjectStore_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.objectstore.ObjectStore_1");
-		}
+	public void warn_ats_atomicaction_1(String arg0) {
+		logger.logv(WARN, "ARJUNA-12211 Attempt to suspend a non-AtomicAction transaction. Type is {0}", arg0);
 	}
 
-	public void log_recovery_ActionStatucService_5(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.ActionStatucService_5", new Object[] {arg0});
-		}
+	public void warn_abstractrecords_smf1(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12212 StateManagerFriend.forgetAction", (Object)null);
 	}
 
-	public void log_recovery_ActionStatusService_1(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_1", new Object[] {arg0, arg1, arg2});
-		}
+	public void warn_abstractrecords_smf2(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12213 StateManagerFriend.destroyed", (Object)null);
 	}
 
-	public void log_recovery_ActionStatusService_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_2", new Object[] {arg0});
-		}
+	public void warn_abstractrecords_smf3(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12214 StateManagerFriend.rememberAction", (Object)null);
 	}
 
-	public void log_recovery_ActionStatusService_3() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_3");
-		}
+	public void warn_common_ClassloadingUtility_1() {
+		logger.logv(WARN, "ARJUNA-12215 className is null", (Object)null);
 	}
 
-	public void log_recovery_ActionStatusService_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_4", new Object[] {arg0});
-		}
+	public void warn_common_ClassloadingUtility_2(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12216 attempt to load {0} threw ClassNotFound. Wrong classloader?", arg0);
 	}
 
-	public void log_recovery_ActionStatusService_6(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_6", new Object[] {arg0});
-		}
+	public void warn_common_ClassloadingUtility_3(String arg0, String arg1, Throwable arg2) {
+		logger.logv(WARN, arg2, "ARJUNA-12217 class {0} does not implement {1}", arg0, arg1);
 	}
 
-	public void log_recovery_ActionStatusService_7() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_7");
-		}
+	public void warn_common_ClassloadingUtility_4(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12218 can't create new instance of {0}", arg0);
 	}
 
-	public void log_recovery_RecoverAtomicAction_1(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_1", new Object[] {arg0, arg1});
-		}
+	public void warn_common_ClassloadingUtility_5(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12219 can't access {0}", arg0);
 	}
 
-	public void log_recovery_RecoverAtomicAction_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_2", new Object[] {arg0});
-		}
+	public void warn_common_ClassloadingUtility_6(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12220 can't initialize from string {0}", arg0);
 	}
 
-	public void log_recovery_RecoverAtomicAction_3(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_3", new Object[] {arg0});
-		}
+	public void warn_objectstore_CacheStore_1(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12221 Commit state failed for {0} and {1}", arg0, arg1);
 	}
 
-	public void log_recovery_RecoverAtomicAction_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_4", new Object[] {arg0});
-		}
+	public void warn_objectstore_CacheStore_2(Uid arg0, String arg1, String arg2) {
+		logger.logv(WARN, "ARJUNA-12222 Remove state failed for {0} and {1} and {2}", arg0, arg1, arg2);
 	}
 
-	public void log_recovery_RecoverAtomicAction_5(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_5", new Object[] {arg0});
-		}
+	public void warn_objectstore_CacheStore_3(Uid arg0, String arg1, String arg2, String arg3) {
+		logger.logv(WARN, "ARJUNA-12223 Write state failed for {0} and {1} and {2} and {3}", arg0, arg1, arg2, arg3);
 	}
 
-	public void log_recovery_RecoveryManager_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.RecoveryManager_1", new Object[] {arg0});
-		}
+	public void warn_objectstore_CacheStore_4(String arg0) {
+		logger.logv(WARN, "ARJUNA-12224 Unknown work type {0}", arg0);
 	}
 
-	public void log_recovery_RecoveryManager_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.RecoveryManager_2", new Object[] {arg0});
-		}
+	public void warn_objectstore_FileSystemStore_1(String arg0) {
+		logger.logv(WARN, "ARJUNA-12225 FileSystemStore::setupStore - cannot access root of object store: {0}", arg0);
 	}
 
-	public void log_recovery_RecoveryManager_3(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.RecoveryManager_3", new Object[] {arg0, arg1});
-		}
+	public void warn_objectstore_FileSystemStore_2(String arg0) {
+		logger.logv(WARN, "ARJUNA-12226 FileSystemStore.removeFromCache - no entry for {0}", arg0);
 	}
 
-	public void log_recovery_RecoveryManager_4(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.RecoveryManager_4", new Object[] {arg0, arg1});
-		}
+	public void warn_objectstore_FileSystemStore_20(String arg0) {
+		logger.logv(WARN, "ARJUNA-12227 FileSystemStore.renameFromTo - from {0} not present. Possibly renamed by crash recovery.", arg0);
 	}
 
-	public void log_recovery_RecoveryManager_5() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.RecoveryManager_5");
-		}
+	public String get_objectstore_FileSystemStore_2a() {
+		return "ARJUNA-12228 FileSystemStore::allObjUids - could not pack Uid.";
 	}
 
-	public void log_recovery_TransactionStatusConnectionManager_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_1", new Object[] {arg0});
-		}
+	public String get_objectstore_FileSystemStore_3() {
+		return "ARJUNA-12229 FileSystemStore::allObjUids - could not pack end of list Uid.";
 	}
 
-	public void log_recovery_TransactionStatusConnectionManager_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_2", new Object[] {arg0});
-		}
+	public String get_objectstore_FileSystemStore_4() {
+		return "ARJUNA-12230 FileSytemStore::allTypes - could not pack entry string.";
 	}
 
-	public void log_recovery_TransactionStatusConnectionManager_3(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_3", new Object[] {arg0});
-		}
+	public String get_objectstore_FileSystemStore_5() {
+		return "ARJUNA-12231 FileSystemStore::allTypes - could not pack end of list string.";
 	}
 
-	public void log_recovery_TransactionStatusConnectionManager_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_4", new Object[] {arg0});
-		}
+	public String get_objectstore_FileSystemStore_6() {
+		return "ARJUNA-12232 FileSystemStore::setupStore - error from unpack object store.";
 	}
 
-	public void log_recovery_TransactionStatusManager_1(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1", new Object[] {arg0, arg1});
-		}
+	public String get_objectstore_FileSystemStore_7() {
+		return "ARJUNA-12233 FileSystemStore::allTypes - could not pack entry string.";
 	}
 
-	public void log_recovery_TransactionStatusManager_10(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_10", new Object[] {arg0});
-		}
+	public String get_objectstore_FileSystemStore_8() {
+		return "ARJUNA-12234 FileSystemStore::createHierarchy - null directory name.";
 	}
 
-	public void log_recovery_TransactionStatusManager_11() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_11");
-		}
+	public void warn_objectstore_HashedStore_2(String arg0) {
+		logger.logv(WARN, "ARJUNA-12236 invalid number of hash directories: {0}. Will use default.", arg0);
 	}
 
-	public void log_recovery_TransactionStatusManager_12() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_12");
-		}
+	public String get_objectstore_HashedStore_5() {
+		return "ARJUNA-12237 HashedStore.allObjUids - could not pack Uid.";
 	}
 
-	public void log_recovery_TransactionStatusManager_13() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_13");
-		}
+	public String get_objectstore_HashedStore_6() {
+		return "ARJUNA-12238 HashedStore.allObjUids - could not pack end of list Uid.";
 	}
 
-	public void log_recovery_TransactionStatusManager_14(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_14", new Object[] {arg0, arg1});
-		}
+	public void warn_objectstore_JDBCImple_1(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12239 hide_state caught exception", (Object)null);
 	}
 
-	public void log_recovery_TransactionStatusManager_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_2");
-		}
+	public void warn_objectstore_JDBCImple_10(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12240 remove_state - type() operation of object with uid {0} returns NULL", arg0);
 	}
 
-	public void log_recovery_TransactionStatusManager_3(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3", new Object[] {arg0, arg1, arg2});
-		}
+	public void warn_objectstore_JDBCImple_11(String arg0) {
+		logger.logv(WARN, "ARJUNA-12241 invalid initial pool size: {0}", arg0);
 	}
 
-	public void log_recovery_TransactionStatusManager_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_4", new Object[] {arg0});
-		}
+	public void warn_objectstore_JDBCImple_12(String arg0) {
+		logger.logv(WARN, "ARJUNA-12242 invalid maximum pool size: {0}", arg0);
 	}
 
-	public void log_recovery_TransactionStatusManager_5(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_5", new Object[] {arg0});
-		}
+	public void warn_objectstore_JDBCImple_13(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12243 initialise caught exceptionatorLoader_3", (Object)null);
 	}
 
-	public void log_recovery_TransactionStatusManager_6(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_6", new Object[] {arg0});
-		}
+	public void warn_objectstore_JDBCImple_14(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12244 getState caught exception", (Object)null);
 	}
 
-	public void log_recovery_TransactionStatusManager_7(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_7", new Object[] {arg0});
-		}
+	public void warn_objectstore_JDBCImple_15(String arg0) {
+		logger.logv(WARN, "ARJUNA-12245 removeFromCache - no entry for {0}", arg0);
 	}
 
-	public void log_recovery_TransactionStatusManager_8(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_8", new Object[] {arg0});
-		}
+	public void warn_objectstore_JDBCImple_16(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12246 getPool caught exception", (Object)null);
 	}
 
-	public void log_recovery_TransactionStatusManager_9() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_9");
-		}
+	public void info_objectstore_JDBCImple_17() {
+		logger.logv(INFO, "ARJUNA-12247 getPool - interrupted while waiting for a free connection", (Object)null);
 	}
 
-	public void log_state_InputBuffer_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.InputBuffer_1");
-		}
+	public void warn_objectstore_JDBCImple_18() {
+		logger.logv(WARN, "ARJUNA-12248 freePool - freeing a connection which is already free!", (Object)null);
 	}
 
-	public void log_state_InputBuffer_10() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.InputBuffer_10");
-		}
+	public void warn_objectstore_JDBCImple_2(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12249 reveal_state caught exception", (Object)null);
 	}
 
-	public void log_state_InputBuffer_11() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.InputBuffer_11");
-		}
+	public void warn_objectstore_JDBCImple_3(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12250 currentState caught exception", (Object)null);
 	}
 
-	public void log_state_InputBuffer_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.InputBuffer_2");
-		}
+	public void warn_objectstore_JDBCImple_4(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12251 allObjUids caught exception", (Object)null);
 	}
 
-	public void log_state_InputBuffer_3() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.InputBuffer_3");
-		}
+	public void warn_objectstore_JDBCImple_5(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12252 allObjUids - pack of Uid failed", (Object)null);
 	}
 
-	public void log_state_InputBuffer_4() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.InputBuffer_4");
-		}
+	public void warn_objectstore_JDBCImple_6(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12253 allTypes caught exception", (Object)null);
 	}
 
-	public void log_state_InputBuffer_5() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.InputBuffer_5");
-		}
+	public void warn_objectstore_JDBCImple_7(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12254 allTypes - pack of Uid failed", (Object)null);
 	}
 
-	public void log_state_InputBuffer_6() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.InputBuffer_6");
-		}
+	public void warn_objectstore_JDBCImple_8(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12255 remove_state caught exception", (Object)null);
 	}
 
-	public void log_state_InputBuffer_7() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.InputBuffer_7");
-		}
+	public void warn_objectstore_JDBCImple_9(String arg0, Uid arg1) {
+		logger.logv(WARN, "ARJUNA-12256 remove_state() attempted removal of {0} state for object with uid {1}", arg0, arg1);
 	}
 
-	public void log_state_InputBuffer_8() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.InputBuffer_8");
-		}
+	public void warn_objectstore_JDBCImple_readfailed() {
+		logger.logv(WARN, "ARJUNA-12257 JDBCImple:read_state failed", (Object)null);
 	}
 
-	public void log_state_InputBuffer_9() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.InputBuffer_9");
-		}
+	public void warn_objectstore_JDBCImple_writefailed(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12258 JDBCImple:write_state caught exception", (Object)null);
 	}
 
-	public void log_state_OutputBuffer_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.OutputBuffer_1");
-		}
+	public void fatal_objectstore_JDBCStore_1(String arg0, String arg1) {
+		logger.logv(FATAL, "ARJUNA-12259 JDBCStore could not setup store < {0} , {1} >", arg0, arg1);
 	}
 
-	public void log_state_OutputBuffer_10() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.OutputBuffer_10");
-		}
+	public void fatal_objectstore_JDBCStore_2(String arg0, Throwable arg1) {
+		logger.logv(FATAL, arg1, "ARJUNA-12260 Received exception for {0}", arg0);
 	}
 
-	public void log_state_OutputBuffer_11() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.OutputBuffer_11");
-		}
+	public void warn_objectstore_JDBCStore_3() {
+		logger.logv(WARN, "ARJUNA-12261 JDBCStore.setupStore failed to initialise!", (Object)null);
 	}
 
-	public void log_state_OutputBuffer_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.OutputBuffer_2");
-		}
+	public String get_objectstore_JDBCStore_5() {
+		return "ARJUNA-12263 No JDBCAccess implementation provided!";
 	}
 
-	public void log_state_OutputBuffer_3() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.OutputBuffer_3");
-		}
+	public void warn_objectstore_ShadowingStore_1() {
+		logger.logv(WARN, "ARJUNA-12264 ShadowingStore.commit_state - store invalid!", (Object)null);
 	}
 
-	public void log_state_OutputBuffer_4() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.OutputBuffer_4");
-		}
+	public void warn_objectstore_ShadowingStore_10(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12265 ShadowingStore::remove_state() - state {0} does not exist for type {1}", arg0, arg1);
 	}
 
-	public void log_state_OutputBuffer_5() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.OutputBuffer_5");
-		}
+	public void warn_objectstore_ShadowingStore_11(String arg0) {
+		logger.logv(WARN, "ARJUNA-12266 ShadowingStore::remove_state() - unlink failed on {0}", arg0);
 	}
 
-	public void log_state_OutputBuffer_6() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.OutputBuffer_6");
-		}
+	public void warn_objectstore_ShadowingStore_12(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12267 ShadowingStore.remove_state() - fd error for {0}", arg0);
 	}
 
-	public void log_state_OutputBuffer_7() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.OutputBuffer_7");
-		}
+	public void info_objectstore_ShadowingStore_14(Uid arg0, String arg1) {
+		logger.logv(INFO, "ARJUNA-12269 UNKNOWN state for object with uid {0} , type {1}", arg0, arg1);
 	}
 
-	public void log_state_OutputBuffer_8() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.OutputBuffer_8");
-		}
+	public void info_objectstore_ShadowingStore_15(Uid arg0, String arg1) {
+		logger.logv(INFO, "ARJUNA-12270 HIDDEN state for object with uid {0} , type {1}", arg0, arg1);
 	}
 
-	public void log_state_OutputBuffer_9() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.state.OutputBuffer_9");
-		}
+	public void warn_objectstore_ShadowingStore_17(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-12272 ShadowingStore.remove_state - type() operation of object with uid {0} returns NULL", arg0);
 	}
 
-	public void log_tools_osb_mbean_m_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.tools.osb.mbean.m_1");
-		}
+	public void warn_objectstore_ShadowingStore_18(String arg0) {
+		logger.logv(WARN, "ARJUNA-12273 ShadowingStore::write_state() - openAndLock failed for {0}", arg0);
 	}
 
-	public void log_tools_osb_mbean_m_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.tools.osb.mbean.m_2");
-		}
+	public void warn_objectstore_ShadowingStore_19(String arg0) {
+		logger.logv(WARN, "ARJUNA-12274 ShadowingStore::write_state - unlock or close of {0} failed.", arg0);
 	}
 
-	public void log_tools_osb_mbean_m_3(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.tools.osb.mbean.m_3", new Object[] {arg0});
-		}
+	public void warn_objectstore_ShadowingStore_2(String arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12275 ShadowStore::commit_state - failed to rename {0} to {1}", arg0, arg1);
 	}
 
-	public void log_tools_osb_util_JMXServer_m_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_1", new Object[] {arg0});
-		}
+	public void warn_objectstore_ShadowingStore_3(String arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12278 ShadowStore::hide_state - failed to rename {0} to {1}", arg0, arg1);
 	}
 
-	public void log_tools_osb_util_JMXServer_m_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_2", new Object[] {arg0});
-		}
+	public void warn_objectstore_ShadowingStore_4(String arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12279 ShadowStore::reveal_state - failed to rename {0} to {1}", arg0, arg1);
 	}
 
-	public void log_tools_osb_util_JMXServer_m_3(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_3", new Object[] {arg0, arg1});
-		}
+	public void warn_objectstore_ShadowingStore_6() {
+		logger.logv(WARN, "ARJUNA-12281 ShadowingStore.read_state - store invalid!", (Object)null);
 	}
 
-	public void log_tools_osb_util_JMXServer_m_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_4", new Object[] {arg0});
-		}
+	public void warn_objectstore_ShadowingStore_7() {
+		logger.logv(WARN, "ARJUNA-12282 ShadowingStore::read_state() failed", (Object)null);
 	}
 
-	public void log_tools_osb_util_JMXServer_m_5(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_5]", new Object[] {arg0, arg1});
-		}
+	public void warn_objectstore_ShadowingStore_8(String arg0) {
+		logger.logv(WARN, "ARJUNA-12283 ShadowingStore::read_state - unlock or close of {0} failed", arg0);
 	}
 
-	public void log_tools_osb_util_JMXServer_m_6(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_6", new Object[] {arg0, arg1});
-		}
+	public void warn_objectstore_ShadowingStore_9(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12284 ShadowingStore::remove_state() - access problems on {0} and {1}", arg0, arg1);
 	}
 
-	public void log_utils_FileLock_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.utils.FileLock_1", new Object[] {arg0});
-		}
+	public void warn_objectstore_jdbc_oracle_1() {
+		logger.logv(WARN, "ARJUNA-12285 oracle:read_state failed", (Object)null);
 	}
 
-	public void log_utils_FileLock_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.utils.FileLock_2", new Object[] {arg0});
-		}
+	public void warn_objectstore_jdbc_oracle_2(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12286 oracle:write_state caught exception", (Object)null);
 	}
 
-	public void log_utils_FileLock_3(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.utils.FileLock_3", new Object[] {arg0});
-		}
+	public String get_objectstore_notypenameuid() {
+		return "ARJUNA-12287 No typename for object:";
 	}
 
-	public void log_utils_FileLock_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.utils.FileLock_4", new Object[] {arg0});
-		}
+	public String get_objectstore_packProblem() {
+		return "ARJUNA-12288 allTypes - could not pack end of list string.";
 	}
 
-	public void log_utils_FileLock_5(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.utils.FileLock_5", new Object[] {arg0});
-		}
+	public void warn_recovery_AtomicActionRecoveryModule_1(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12289 RecoveryManagerStatusModule: Object store exception", (Object)null);
 	}
 
-	public void log_utils_FileLock_6(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.utils.FileLock_6", new Object[] {arg0});
-		}
+	public void warn_recovery_AtomicActionRecoveryModule_2(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12290 failed to recover Transaction {0}", arg0);
 	}
 
-	public void log_utils_Utility_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.utils.Utility_1");
-		}
+	public void warn_recovery_AtomicActionRecoveryModule_3(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12291 failed to access transaction store {0}", arg0);
 	}
 
-	public void log_utils_Utility_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.arjuna.utils.Utility_2");
-		}
+	public void warn_recovery_Connection_1() {
+		logger.logv(WARN, "ARJUNA-12292 Connection - IOException", (Object)null);
 	}
 
-	public void log_ats_atomicaction_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.atomicaction_1", new Object[] {arg0});
-		}
+	public void warn_recovery_Connection_2() {
+		logger.logv(WARN, "ARJUNA-12293 Setting timeout exception.", (Object)null);
 	}
 
-	public void log_abstractrecords_smf1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.abstractrecords.smf1");
-		}
+	public void warn_recovery_ExpiredEntryMonitor_10(String arg0) {
+		logger.logv(WARN, "ARJUNA-12294 Loading expiry scanner: could not find class {0}", arg0);
 	}
 
-	public void log_abstractrecords_smf2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.abstractrecords.smf2");
-		}
+	public void warn_recovery_ExpiredEntryMonitor_12(String arg0) {
+		logger.logv(WARN, "ARJUNA-12296 ExpiredEntryMonitor running at {0}", arg0);
 	}
 
-	public void log_abstractrecords_smf3() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.abstractrecords.smf3");
-		}
+	public void info_recovery_ExpiredEntryMonitor_5() {
+		logger.logv(INFO, "ARJUNA-12297 ExpiredEntryMonitor - no scans on first iteration", (Object)null);
 	}
 
-	public void log_common_ClassloadingUtility_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.common.ClassloadingUtility_1");
-		}
+	public void warn_recovery_ExpiredEntryMonitor_7() {
+		logger.logv(WARN, "ARJUNA-12298 Attempt to load expiry scanner with null class name!", (Object)null);
 	}
 
-	public void log_common_ClassloadingUtility_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.common.ClassloadingUtility_2", new Object[] {arg0});
-		}
+	public void warn_recovery_ExpiredEntryMonitor_9(String arg0) {
+		logger.logv(WARN, "ARJUNA-12299 Expiry scanner {0} does not conform to ExpiryScanner interface", arg0);
 	}
 
-	public void log_common_ClassloadingUtility_3(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.common.ClassloadingUtility_3", new Object[] {arg0, arg1});
-		}
+	public void warn_recovery_ExpiredTransactionScanner_2(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-12301 ExpiredTransactionScanner - exception during attempted move {0}", arg0);
 	}
 
-	public void log_common_ClassloadingUtility_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.common.ClassloadingUtility_4", new Object[] {arg0});
-		}
+	public void info_recovery_ExpiredTransactionScanner_4(Uid arg0) {
+		logger.logv(INFO, "ARJUNA-12303 ExpiredTransactionScanner - log {0} is assumed complete and will be moved.", arg0);
 	}
 
-	public void log_common_ClassloadingUtility_5(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.common.ClassloadingUtility_5", new Object[] {arg0});
-		}
+	public void info_recovery_ExpiredTransactionStatusManagerScanner_3(Uid arg0) {
+		logger.logv(INFO, "ARJUNA-12304 Removing old transaction status manager item {0}", arg0);
 	}
 
-	public void log_common_ClassloadingUtility_6(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.common.ClassloadingUtility_6", new Object[] {arg0});
-		}
+	public void warn_recovery_PeriodicRecovery_1() {
+		logger.logv(WARN, "ARJUNA-12306 Attempt to load recovery module with null class name!", (Object)null);
 	}
 
-	public void log_coordinator_ReaperThread_1(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.coordinator.ReaperThread_1", new Object[] {arg0, arg1});
-		}
+	public void info_recovery_PeriodicRecovery_13(String arg0, String arg1) {
+        System.out.println("jjh1");
+		logger.logv(INFO, "ARJUNA-12310 Recovery manager listening on endpoint {0}:{1}", arg0, arg1);
 	}
 
-	public void log_coordinator_ReaperWorkerThread_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.coordinator.ReaperWorkerThread_1", new Object[] {arg0});
-		}
+	public void warn_recovery_PeriodicRecovery_2(String arg0) {
+		logger.logv(WARN, "ARJUNA-12311 Recovery module {0} does not conform to RecoveryModule interface", arg0);
 	}
 
-	public void log_coordinator_ReaperWorkerThread_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.coordinator.ReaperWorkerThread_2", new Object[] {arg0});
-		}
+	public void warn_recovery_PeriodicRecovery_3(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12312 Loading recovery module", (Object)null);
 	}
 
-	public void log_objectstore_ActionStore_1(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ActionStore_1", new Object[] {arg0, arg1, arg2});
-		}
+	public void warn_recovery_PeriodicRecovery_4(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12313 Loading recovery module", (Object)null);
 	}
 
-	public void log_objectstore_CacheStore_1(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.CacheStore_1", new Object[] {arg0, arg1});
-		}
+	public void warn_recovery_PeriodicRecovery_5(String arg0) {
+		logger.logv(WARN, "ARJUNA-12314 Loading recovery module: could not find class {0}", arg0);
 	}
 
-	public void log_objectstore_CacheStore_2(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.CacheStore_2", new Object[] {arg0, arg1, arg2});
-		}
+	public void warn_recovery_PeriodicRecovery_9(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12318 Could not create recovery listener", (Object)null);
 	}
 
-	public void log_objectstore_CacheStore_3(String arg0, String arg1, String arg2, String arg3) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.CacheStore_3", new Object[] {arg0, arg1, arg2, arg3});
-		}
+	public void warn_recovery_RecActivatorLoader_1() {
+		logger.logv(WARN, "ARJUNA-12319 Attempt to load recovery activator with null class name!", (Object)null);
 	}
 
-	public void log_objectstore_CacheStore_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.CacheStore_4", new Object[] {arg0});
-		}
+	public void warn_recovery_RecActivatorLoader_2(String arg0) {
+		logger.logv(WARN, "ARJUNA-12320 Recovery module {0} does not conform to RecoveryActivator interface", arg0);
 	}
 
-	public void log_objectstore_FileSystemStore_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_1", new Object[] {arg0});
-		}
+	public void warn_recovery_RecActivatorLoader_3(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12321 Loading recovery activator", (Object)null);
 	}
 
-	public void log_objectstore_FileSystemStore_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_2", new Object[] {arg0});
-		}
+	public void warn_recovery_RecActivatorLoader_4(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12322 Loading recovery activator", (Object)null);
 	}
 
-	public void log_objectstore_FileSystemStore_20(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_20", new Object[] {arg0});
-		}
+	public void warn_recovery_RecActivatorLoader_5(String arg0) {
+		logger.logv(WARN, "ARJUNA-12323 Loading recovery module: could not find class {0}", arg0);
 	}
 
-	public void log_objectstore_FileSystemStore_2a() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_2a");
-		}
+	public void info_recovery_RecActivatorLoader_6() {
+		logger.logv(INFO, "ARJUNA-12324 Start RecoveryActivators", (Object)null);
 	}
 
-	public void log_objectstore_FileSystemStore_3() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_3");
-		}
+	public void warn_recovery_RecoveryManagerImple_2(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12326 socket I/O exception", (Object)null);
 	}
 
-	public void log_objectstore_FileSystemStore_4() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_4");
-		}
+	public void warn_recovery_TransactionStatusConnector_1() {
+		logger.logv(WARN, "ARJUNA-12327 TransactionStatusConnector.delete called erroneously", (Object)null);
 	}
 
-	public void log_objectstore_FileSystemStore_5() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_5");
-		}
+	public void warn_recovery_TransactionStatusConnector_2() {
+		logger.logv(WARN, "ARJUNA-12328 Connection lost to TransactionStatusManagers' process", (Object)null);
 	}
 
-	public void log_objectstore_FileSystemStore_6() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_6");
-		}
+	public void warn_recovery_TransactionStatusConnector_3() {
+		logger.logv(WARN, "ARJUNA-12329 Connection lost to TransactionStatusManagers' process", (Object)null);
 	}
 
-	public void log_objectstore_FileSystemStore_7() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_7");
-		}
+	public void info_recovery_TransactionStatusConnector_4(String arg0, String arg1, String arg2, String arg3) {
+		logger.logv(INFO, "ARJUNA-12330 TransactionStatusManager process for uid {0} is ALIVE. connected to host: {1}, port: {2} on socket: {3}", arg0, arg1, arg2, arg3);
 	}
 
-	public void log_objectstore_FileSystemStore_8() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_8");
-		}
+	public void info_recovery_TransactionStatusConnector_5(String arg0) {
+		logger.logv(INFO, "ARJUNA-12331 TransactionStatusManager process for uid {0} is DEAD.", arg0);
 	}
 
-	public void log_objectstore_HashedStore_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.HashedStore_1", new Object[] {arg0});
-		}
+	public void info_recovery_TransactionStatusConnector_6() {
+		logger.logv(INFO, "ARJUNA-12332 Failed to establish connection to server", (Object)null);
 	}
 
-	public void log_objectstore_HashedStore_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.HashedStore_2", new Object[] {arg0});
-		}
+	public void warn_recovery_TransactionStatusManagerItem_1(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12333 Problem with removing host/port item", (Object)null);
 	}
 
-	public void log_objectstore_HashedStore_5() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.HashedStore_5");
-		}
+	public void warn_recovery_TransactionStatusManagerItem_2(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12334 Problem with storing host/port", (Object)null);
 	}
 
-	public void log_objectstore_HashedStore_6() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.HashedStore_6");
-		}
+	public void warn_recovery_TransactionStatusManagerItem_3(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12335 Problem retrieving host/port", (Object)null);
 	}
 
-	public void log_objectstore_JDBCImple_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_1", new Object[] {arg0});
-		}
+	public void warn_recovery_TransactionStatusManagerItem_4(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12336 Failed to obtain host", (Object)null);
 	}
 
-	public void log_objectstore_JDBCImple_10(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_10", new Object[] {arg0});
-		}
+	public void info_recovery_TransactionStatusManagerItem_5(String arg0, String arg1) {
+		logger.logv(INFO, "ARJUNA-12337 TransactionStatusManagerItem host: {0} port: {1}", arg0, arg1);
 	}
 
-	public void log_objectstore_JDBCImple_11(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_11", new Object[] {arg0});
-		}
+	public void warn_recovery_WorkerService_1(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12338 Other Exception:", (Object)null);
 	}
 
-	public void log_objectstore_JDBCImple_12(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_12", new Object[] {arg0});
-		}
+	public void warn_recovery_WorkerService_2() {
+		logger.logv(WARN, "ARJUNA-12339 IOException", (Object)null);
 	}
 
-	public void log_objectstore_JDBCImple_13(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_13", new Object[] {arg0});
-		}
+	public void info_recovery_WorkerService_3() {
+		logger.logv(INFO, "ARJUNA-12340 RecoveryManager scan scheduled to begin.", (Object)null);
 	}
 
-	public void log_objectstore_JDBCImple_14(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_14", new Object[] {arg0});
-		}
+	public void info_recovery_WorkerService_4() {
+		logger.logv(INFO, "ARJUNA-12341 RecoveryManager scan completed.", (Object)null);
 	}
 
-	public void log_objectstore_JDBCImple_15(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_15", new Object[] {arg0});
-		}
+	public void fatal_recovery_fail(String arg0, String arg1) {
+		logger.logv(FATAL, "ARJUNA-12342 RecoveryManagerImple: cannot bind to socket on address {0} and port {1}", arg0, arg1);
 	}
 
-	public void log_objectstore_JDBCImple_16(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_16", new Object[] {arg0});
-		}
+	public void info_recovery_localready() {
+		logger.logv(INFO, "ARJUNA-12343 RecoveryManagerImple is ready. Socket listener is turned off.", (Object)null);
 	}
 
-	public void log_objectstore_JDBCImple_17() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_17");
-		}
+	public void info_recovery_socketready(String arg0) {
+		logger.logv(INFO, "ARJUNA-12344 RecoveryManagerImple is ready on port {0}", arg0);
 	}
 
-	public void log_objectstore_JDBCImple_18() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_18");
-		}
+	public void warn_tools_log_eaa1(Uid arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-12345 Transaction {0} and {1} not activate.", arg0, arg1);
 	}
 
-	public void log_objectstore_JDBCImple_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_2", new Object[] {arg0});
-		}
+	public void warn_tools_log_eaa2() {
+		logger.logv(WARN, "ARJUNA-12346 Error - could not get resource to forget heuristic. Left on Heuristic List.", (Object)null);
 	}
 
-	public void log_objectstore_JDBCImple_3(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_3", new Object[] {arg0});
-		}
+	public String get_utils_ExecProcessId_1() {
+		return "ARJUNA-12347 Could not get back a valid pid.";
 	}
 
-	public void log_objectstore_JDBCImple_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_4", new Object[] {arg0});
-		}
+	public String get_utils_ExecProcessId_2() {
+		return "ARJUNA-12348 Problem executing getpids utility:";
 	}
 
-	public void log_objectstore_JDBCImple_5(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_5", new Object[] {arg0});
-		}
+	public String get_utils_ExecProcessId_3() {
+		return "ARJUNA-12349 Problem executing command:";
 	}
 
-	public void log_objectstore_JDBCImple_6(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_6", new Object[] {arg0});
-		}
+	public String get_utils_ExecProcessId_4() {
+		return "ARJUNA-12350 Problem getting pid information from stream:";
 	}
 
-	public void log_objectstore_JDBCImple_7(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_7", new Object[] {arg0});
-		}
+	public void warn_utils_ExecProcessId_5(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12351 Encountered a problem when closing the data stream", (Object)null);
 	}
 
-	public void log_objectstore_JDBCImple_8(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_8", new Object[] {arg0});
-		}
+	public String get_utils_FileProcessId_1() {
+		return "ARJUNA-12352 FileProcessId.getpid - could not locate temporary directory.";
 	}
 
-	public void log_objectstore_JDBCImple_9(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_9", new Object[] {arg0, arg1});
-		}
+	public String get_utils_FileProcessId_2() {
+		return "ARJUNA-12353 FileProcessId.getpid could not create unique file.";
 	}
 
-	public void log_objectstore_JDBCImple_readfailed() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_readfailed");
-		}
+	public String get_utils_MBeanProcessId_1() {
+		return "ARJUNA-12354 Could not get back a valid pid.";
 	}
 
-	public void log_objectstore_JDBCImple_writefailed(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_writefailed", new Object[] {arg0});
-		}
+	public String get_utils_MBeanProcessId_2() {
+		return "ARJUNA-12355 getName returned unrecognized format:";
 	}
 
-	public void log_objectstore_JDBCStore_1(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_1", new Object[] {arg0, arg1});
-		}
+	public String get_utils_ManualProcessId_1() {
+		return "ARJUNA-12356 Could not get back a valid pid.";
 	}
 
-	public void log_objectstore_JDBCStore_2(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_2", new Object[] {arg0, arg1});
-		}
+	public String get_utils_SocketProcessId_2() {
+		return "ARJUNA-12359 SocketProcessId.getpid could not get unique port.";
 	}
 
-	public void log_objectstore_JDBCStore_3() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_3");
-		}
+	public void warn_recovery_ExpiredEntryMonitor_6(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-12360 Unable to instantiate ExpiryScanner", (Object)null);
 	}
 
-	public void log_objectstore_JDBCStore_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_4", new Object[] {arg0});
-		}
+	public void info_osb_MBeanCtorFail(Throwable arg0) {
+		logger.logv(INFO, arg0, "ARJUNA-12361 Error constructing mbean", (Object)null);
 	}
 
-	public void log_objectstore_JDBCStore_5() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_5");
-		}
+	public void info_osb_StateManagerWrapperFail(Throwable arg0) {
+		logger.logv(INFO, arg0, "ARJUNA-12362 Failed to create StateManagerWrapper", (Object)null);
 	}
 
-	public void log_objectstore_ShadowingStore_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_1");
-		}
-	}
 
-	public void log_objectstore_ShadowingStore_10(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_10", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_11(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_11", new Object[] {arg0});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_12(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_12", new Object[] {arg0});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_13() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_13");
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_14(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_14", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_15(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_15", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_16(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_16", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_17(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_17", new Object[] {arg0});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_18(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_18", new Object[] {arg0});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_19(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_19", new Object[] {arg0});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_2(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_2", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_20(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_20", new Object[] {arg0});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_21(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_21", new Object[] {arg0});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_22(String arg0, String arg1, String arg2) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_22", new Object[] {arg0, arg1, arg2});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_3(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_3", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_4(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_4", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_5(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_5", new Object[] {arg0});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_6() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_6");
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_7() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_7");
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_8(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_8", new Object[] {arg0});
-		}
-	}
-
-	public void log_objectstore_ShadowingStore_9(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_9", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_objectstore_jdbc_oracle_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.jdbc.oracle_1");
-		}
-	}
-
-	public void log_objectstore_jdbc_oracle_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.jdbc.oracle_2", new Object[] {arg0});
-		}
-	}
-
-	public void log_objectstore_notypenameuid() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.notypenameuid");
-		}
-	}
-
-	public void log_objectstore_packProblem() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.objectstore.packProblem");
-		}
-	}
-
-	public void log_recovery_AtomicActionRecoveryModule_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_1", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_AtomicActionRecoveryModule_2(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_2", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_recovery_AtomicActionRecoveryModule_3(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_3", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_recovery_AtomicActionRecoveryModule_4() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_4");
-		}
-	}
-
-	public void log_recovery_AtomicActionRecoveryModule_5() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_5");
-		}
-	}
-
-	public void log_recovery_Connection_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.Connection_1");
-		}
-	}
-
-	public void log_recovery_Connection_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.Connection_2");
-		}
-	}
-
-	public void log_recovery_ExpiredEntryMonitor_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_1", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_ExpiredEntryMonitor_10(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_10", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_ExpiredEntryMonitor_11(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_11", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_recovery_ExpiredEntryMonitor_12(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_12", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_ExpiredEntryMonitor_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_2");
-		}
-	}
-
-	public void log_recovery_ExpiredEntryMonitor_3() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_3");
-		}
-	}
-
-	public void log_recovery_ExpiredEntryMonitor_4() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_4");
-		}
-	}
-
-	public void log_recovery_ExpiredEntryMonitor_5() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_5");
-		}
-	}
-
-	public void log_recovery_ExpiredEntryMonitor_6(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_6", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_ExpiredEntryMonitor_7() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_7");
-		}
-	}
-
-	public void log_recovery_ExpiredEntryMonitor_8(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_8", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_ExpiredEntryMonitor_9(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_9", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_ExpiredTransactionScanner_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionScanner_1", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_ExpiredTransactionScanner_2(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionScanner_2", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_recovery_ExpiredTransactionScanner_3(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionScanner_3", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_ExpiredTransactionScanner_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionScanner_4", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_ExpiredTransactionStatusManagerScanner_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_1", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_ExpiredTransactionStatusManagerScanner_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_2", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_ExpiredTransactionStatusManagerScanner_3(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_3", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_ExpiredTransactionStatusManagerScanner_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_4", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_ExpiredTransactionStatusManagerScanner_5(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_5", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_recovery_Listener_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.Listener_2");
-		}
-	}
-
-	public void log_recovery_PeriodicRecovery_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_1");
-		}
-	}
-
-	public void log_recovery_PeriodicRecovery_10(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_10", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_PeriodicRecovery_11(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_11", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_PeriodicRecovery_12() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_12");
-		}
-	}
-
-	public void log_recovery_PeriodicRecovery_13(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_13", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_recovery_PeriodicRecovery_14(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_14", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_PeriodicRecovery_15(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_15", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_PeriodicRecovery_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_2", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_PeriodicRecovery_3(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_3", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_PeriodicRecovery_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_4", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_PeriodicRecovery_5(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_5", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_PeriodicRecovery_6(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_6", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_recovery_PeriodicRecovery_7(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_7", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_recovery_PeriodicRecovery_8(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_8", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_PeriodicRecovery_9(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_9", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_RecActivatorLoader_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_1");
-		}
-	}
-
-	public void log_recovery_RecActivatorLoader_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_2", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_RecActivatorLoader_3(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_3", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_RecActivatorLoader_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_4", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_RecActivatorLoader_5(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_5", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_RecActivatorLoader_6() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_6");
-		}
-	}
-
-	public void log_recovery_RecoveryManagerImple_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.RecoveryManagerImple_1", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_RecoveryManagerImple_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.RecoveryManagerImple_2", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_TransactionStatusConnector_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusConnector_1");
-		}
-	}
-
-	public void log_recovery_TransactionStatusConnector_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusConnector_2");
-		}
-	}
-
-	public void log_recovery_TransactionStatusConnector_3() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusConnector_3");
-		}
-	}
-
-	public void log_recovery_TransactionStatusConnector_4(String arg0, String arg1, String arg2, String arg3) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusConnector_4", new Object[] {arg0, arg1, arg2, arg3});
-		}
-	}
-
-	public void log_recovery_TransactionStatusConnector_5(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusConnector_5", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_TransactionStatusConnector_6() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusConnector_6");
-		}
-	}
-
-	public void log_recovery_TransactionStatusManagerItem_1(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_1", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_TransactionStatusManagerItem_2(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_2", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_TransactionStatusManagerItem_3(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_3", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_TransactionStatusManagerItem_4(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_4", new Object[] {arg0});
-		}
-	}
-
-	public void log_recovery_TransactionStatusManagerItem_5(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_recovery_WorkerService_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.WorkerService_1");
-		}
-	}
-
-	public void log_recovery_WorkerService_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.WorkerService_2");
-		}
-	}
-
-	public void log_recovery_WorkerService_3() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.WorkerService_3");
-		}
-	}
-
-	public void log_recovery_WorkerService_4() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.WorkerService_4");
-		}
-	}
-
-	public void log_recovery_fail(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.fail", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_recovery_localready() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.localready");
-		}
-	}
-
-	public void log_recovery_socketready(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.socketready", new Object[] {arg0});
-		}
-	}
-
-	public void log_tools_log_eaa1(String arg0, String arg1) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.tools.log.eaa1", new Object[] {arg0, arg1});
-		}
-	}
-
-	public void log_tools_log_eaa2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.tools.log.eaa2");
-		}
-	}
-
-	public void log_utils_ExecProcessId_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.utils.ExecProcessId_1");
-		}
-	}
-
-	public void log_utils_ExecProcessId_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.utils.ExecProcessId_2");
-		}
-	}
-
-	public void log_utils_ExecProcessId_3() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.utils.ExecProcessId_3");
-		}
-	}
-
-	public void log_utils_ExecProcessId_4() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.utils.ExecProcessId_4");
-		}
-	}
-
-	public void log_utils_ExecProcessId_5(String arg0) {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.utils.ExecProcessId_5", new Object[] {arg0});
-		}
-	}
-
-	public void log_utils_FileProcessId_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.utils.FileProcessId_1");
-		}
-	}
-
-	public void log_utils_FileProcessId_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.utils.FileProcessId_2");
-		}
-	}
-
-	public void log_utils_MBeanProcessId_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.utils.MBeanProcessId_1");
-		}
-	}
-
-	public void log_utils_MBeanProcessId_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.utils.MBeanProcessId_2");
-		}
-	}
-
-	public void log_utils_ManualProcessId_1() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.utils.ManualProcessId_1");
-		}
-	}
-
-	public void log_utils_ManualProcessId_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.utils.ManualProcessId_2");
-		}
-	}
-
-	public void log_utils_ManualProcessId_3() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.utils.ManualProcessId_3");
-		}
-	}
-
-	public void log_utils_SocketProcessId_2() {
-		if(logi18n.isWarnEnabled()) {
-			logi18n.warn("com.arjuna.ats.internal.arjuna.utils.SocketProcessId_2");
-		}
-	}
 }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/tsLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/tsLogger.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/tsLogger.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -32,6 +32,7 @@
 package com.arjuna.ats.arjuna.logging;
 
 import com.arjuna.common.util.logging.*;
+import org.jboss.logging.Logger;
 
 public class tsLogger
 {
@@ -43,7 +44,7 @@
     {
         arjLogger = noi18n;
         arjLoggerI18N = i18n;
-        i18NLogger = new arjunaI18NLoggerImpl(i18n);
+        i18NLogger = new arjunaI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.arjuna"));
     }
 
     static

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreType.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreType.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreType.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -191,15 +191,12 @@
         if (type >= 0)
             return type;
         
-        if (tsLogger.arjLoggerI18N.isWarnEnabled())
-        {
-            tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.objectstore.ObjectStoreType_1", new Object[]
-            { c });
+        if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_objectstore_ObjectStoreType_1(c.getCanonicalName());
         }
 
         throw new com.arjuna.ats.arjuna.exceptions.FatalError(
-                tsLogger.arjLoggerI18N
-                        .getString("com.arjuna.ats.arjuna.objectstore.ObjectStoreType_2")
+                tsLogger.i18NLogger.get_objectstore_ObjectStoreType_2()
                         + c);
     }
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/ActionStatusService.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/ActionStatusService.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/ActionStatusService.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -155,22 +155,20 @@
 
 	       if (tsLogger.arjLoggerI18N.isInfoEnabled())
 	       {
-		   tsLogger.arjLoggerI18N.info("com.arjuna.ats.arjuna.recovery.ActionStatusService_1",
-						new Object[]{transactionType, strUid, strStatus});
+               tsLogger.i18NLogger.info_recovery_ActionStatusService_1(transactionType, strUid, strStatus);
 	       }
 	    }
          }
       }
       catch ( IOException ex )
       {
-	  if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_7");
+          if (tsLogger.arjLoggerI18N.isWarnEnabled())
+              tsLogger.i18NLogger.warn_recovery_ActionStatusService_7();
       }
       catch ( Exception ex )
       {
           if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
-              tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_2",
-                      new Object[]{ex}, ex);
+              tsLogger.i18NLogger.warn_recovery_ActionStatusService_2(ex);
           }
       }
    }
@@ -209,11 +207,9 @@
 	}
 	catch ( Exception ex )
 	{
-	    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	    {
-		tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_3",
-					    new Object[]{ex});
-	    }
+	    if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_recovery_ActionStatusService_3(ex);
+        }
 	}
 
 	return action_status;
@@ -251,12 +247,10 @@
       }
       catch ( Exception ex )
       {
-	  if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	  {
-	      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_3",
-					  new Object[]{ex});
-	  }
+	  if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+          tsLogger.i18NLogger.warn_recovery_ActionStatusService_3(ex);
       }
+      }
 
       return action_status;
    }
@@ -323,7 +317,7 @@
                                  matchingUidTypeVector.addElement( theTypeName );
                                  if (tsLogger.arjLoggerI18N.isInfoEnabled())
 				 {
-				     tsLogger.arjLoggerI18N.info("com.arjuna.ats.arjuna.recovery.ActionStatusService_4",new Object[]{tranUid});
+				     tsLogger.i18NLogger.info_recovery_ActionStatusService_4(tranUid);
 				 }
 			      }
                            }
@@ -331,10 +325,9 @@
                      }
                      catch ( Exception ex )
                      {
-			 if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			 {
-			     tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_5", new Object[]{ex});
-			 }
+			 if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                 tsLogger.i18NLogger.warn_recovery_ActionStatusService_5(tranUid, ex);
+             }
                      }
                   }
                }
@@ -343,14 +336,14 @@
             {
 		if (tsLogger.arjLoggerI18N.isWarnEnabled())
 		{
-		    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_5", new Object[]{ex});
+		    tsLogger.i18NLogger.warn_recovery_ActionStatusService_5(tranUid, ex);
 		}
             }
             catch ( Exception ex )
             {
 		if (tsLogger.arjLoggerI18N.isWarnEnabled())
 		{
-		    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_5", new Object[]{ex});
+		    tsLogger.i18NLogger.warn_recovery_ActionStatusService_5(tranUid, ex);
 		}
             }
          }
@@ -359,7 +352,7 @@
       {
 	  if (tsLogger.arjLoggerI18N.isWarnEnabled())
 	  {
-	      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_5", new Object[]{ex});
+	      tsLogger.i18NLogger.warn_recovery_ActionStatusService_5(tranUid, ex);
 	  }
       }
 
@@ -430,11 +423,10 @@
       }
       catch ( Exception ex )
       {
-	  if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	  {
-	      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_6", new Object[]{ex});
-	  }
+	  if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+          tsLogger.i18NLogger.warn_recovery_ActionStatusService_6(ex);
       }
+      }
 
       return action_status;
    }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -86,39 +86,32 @@
 	   }
 	   else
 	   {
-	       if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	       {
-		   tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_2", 
-					       new Object[]{ActionStatus.stringForm(_theStatus)});
-	       }
+	       if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+               tsLogger.i18NLogger.warn_recovery_RecoverAtomicAction_2(ActionStatus.stringForm(_theStatus));
+           }
 	   }
 
 	   if (tsLogger.arjLogger.isDebugEnabled()) {
            tsLogger.arjLogger.debug("RecoverAtomicAction.replayPhase2( "+get_uid()+" )  finished");
        }
        }
-       else
-       {
-	   tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_4", new Object[]{get_uid()});
-	   
-	   /*
-	    * Failure to activate so move the log. Unlikely to get better automatically!
-	    */
-	   
-	  AtomicActionExpiryScanner scanner = new AtomicActionExpiryScanner();
-	  
-	  try
-	  {
-	      scanner.moveEntry(get_uid());
-	  }
-	  catch (final Exception ex)
-	  {
-	      if (tsLogger.arjLoggerI18N.isWarnEnabled())
-              {
-                  tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_5", 
-                                              new Object[]{get_uid()});
-              }
-	  }
+       else {
+           tsLogger.i18NLogger.warn_recovery_RecoverAtomicAction_4(get_uid());
+
+           /*
+          * Failure to activate so move the log. Unlikely to get better automatically!
+          */
+
+           AtomicActionExpiryScanner scanner = new AtomicActionExpiryScanner();
+
+           try {
+               scanner.moveEntry(get_uid());
+           }
+           catch (final Exception ex) {
+               if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                   tsLogger.i18NLogger.warn_recovery_RecoverAtomicAction_5(get_uid());
+               }
+           }
        }
    }
    

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryManager.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryManager.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -358,7 +358,7 @@
     {
         String host = recoveryPropertyManager.getRecoveryEnvironmentBean().getRecoveryAddress();
 
-        return Utility.hostNameToInetAddress(host, "com.arjuna.ats.arjuna.recovery.RecoveryManager_2");
+        return Utility.hostNameToInetAddress(host);
     }
 
     public static int getRecoveryManagerPort()
@@ -378,8 +378,7 @@
 
         if (tsLogger.arjLoggerI18N.isInfoEnabled())
         {
-            tsLogger.arjLoggerI18N.info("com.arjuna.ats.arjuna.recovery.RecoveryManager_4",
-                    new Object[]{socket.getInetAddress().getHostAddress(), socket.getLocalPort()});
+            tsLogger.i18NLogger.info_recovery_RecoveryManager_4(socket.getInetAddress().getHostAddress(), Integer.toString(socket.getLocalPort()));
         }
 
         return socket;

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -123,9 +123,8 @@
             }
             catch ( Exception ex )
             {
-                if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_1", ex);
+                if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_recovery_TransactionStatusConnectionManager_1(ex);
                 }
             }
         }
@@ -194,10 +193,9 @@
 	}
 	catch ( ObjectStoreException ex )
 	{
-	    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	    {
-		tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_2", new Object[]{ex});
-	    }
+	    if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_recovery_TransactionStatusConnectionManager_2(ex);
+        }
 	}
 
 	// cycle through each item, and update tsmTable with any

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -99,16 +99,14 @@
 
 	 if (tsLogger.arjLoggerI18N.isInfoEnabled())
 	 {
-	     tsLogger.arjLoggerI18N.info("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1",
-					 new Object[]{service.getClass().getName(),
-							  Integer.toString(serverSocket.getLocalPort())});
+         tsLogger.i18NLogger.info_recovery_TransactionStatusManager_1(service.getClass().getName(),
+							  Integer.toString(serverSocket.getLocalPort()));
 	 }
 
          _listener.start() ;
       }
-      catch ( IOException ex )
-      {
-	  tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_2");
+      catch ( IOException ex ) {
+          tsLogger.i18NLogger.warn_recovery_TransactionStatusManager_2();
       }
    }
 
@@ -152,43 +150,35 @@
 
          if (tsLogger.arjLoggerI18N.isInfoEnabled())
 	 {
-	     tsLogger.arjLoggerI18N.info("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3",
-					  new Object[]{Integer.toString(socketServer.getLocalPort()), socketServer.getInetAddress().getHostAddress(), serviceName});
+         tsLogger.i18NLogger.info_recovery_TransactionStatusManager_3(Integer.toString(socketServer.getLocalPort()),
+                 socketServer.getInetAddress().getHostAddress(), serviceName);
 	 }
       }
       catch ( ClassNotFoundException ex )
       {
-	  if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	  {
-	      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_4",
-					  new Object[]{serviceName});
-	  }
+	  if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+          tsLogger.i18NLogger.warn_recovery_TransactionStatusManager_4(serviceName);
       }
+      }
       catch ( InstantiationException ex )
       {
-	  if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	  {
-	      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_5",
-					  new Object[]{serviceName});
-	  }
+	  if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+          tsLogger.i18NLogger.warn_recovery_TransactionStatusManager_5(serviceName);
       }
+      }
       catch ( IllegalAccessException ex )
       {
-	  if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	  {
-	      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_6",
-					  new Object[]{serviceName});
-	  }
+	  if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+          tsLogger.i18NLogger.warn_recovery_TransactionStatusManager_6(serviceName);
       }
+      }
       catch ( IOException ex )
       {
-	  if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	  {
-          tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_14",
-					  new Object[]{getListenerHostName(), getListenerPort(-1)});
-	  }
+	  if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+          tsLogger.i18NLogger.warn_recovery_TransactionStatusManager_14(getListenerHostName(), Integer.toString(getListenerPort(-1)));
+      }
 
-	  throw new com.arjuna.ats.arjuna.exceptions.FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_9"), ex);
+	  throw new com.arjuna.ats.arjuna.exceptions.FatalError(tsLogger.i18NLogger.get_recovery_TransactionStatusManager_9(), ex);
       }
    }
 
@@ -240,13 +230,13 @@
         if (_port == -1)
         {
             // a previous attempt to create the socket failed
-            throw new com.arjuna.ats.arjuna.exceptions.FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_13"));
+            throw new com.arjuna.ats.arjuna.exceptions.FatalError(tsLogger.i18NLogger.get_recovery_TransactionStatusManager_13());
         }
 
         try
         {
             String host = hostNameOverride == null ? getListenerHostName() : hostNameOverride;
-            InetAddress bindAddress = Utility.hostNameToInetAddress(host, "com.arjuna.ats.arjuna.recovery.TransactionStatusManager_10");
+            InetAddress bindAddress = Utility.hostNameToInetAddress(host);
 
             _port = portOverride == -1 ? getListenerPort(null) : portOverride;
             _socket = new ServerSocket(_port, Utility.BACKLOG, bindAddress);

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/InputBuffer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/InputBuffer.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/InputBuffer.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -223,8 +223,7 @@
     public final synchronized byte unpackByte () throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.InputBuffer_1"));
+            throw new IOException(tsLogger.i18NLogger.get_state_InputBuffer_1());
 
         int i = unpackInt();
 
@@ -239,8 +238,7 @@
     public final synchronized byte[] unpackBytes () throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.InputBuffer_2"));
+            throw new IOException(tsLogger.i18NLogger.get_state_InputBuffer_2());
 
         int size = unpackInt();
         byte b[] = new byte[size];
@@ -263,8 +261,7 @@
     public final synchronized boolean unpackBoolean () throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.InputBuffer_3"));
+            throw new IOException(tsLogger.i18NLogger.get_state_InputBuffer_3());
 
         _valid = false;
 
@@ -285,8 +282,7 @@
     public final synchronized char unpackChar () throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.InputBuffer_4"));
+            throw new IOException(tsLogger.i18NLogger.get_state_InputBuffer_4());
 
         int i = unpackInt();
 
@@ -301,8 +297,7 @@
     public final synchronized short unpackShort () throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.InputBuffer_5"));
+            throw new IOException(tsLogger.i18NLogger.get_state_InputBuffer_5());
 
         int i = unpackInt();
 
@@ -317,8 +312,7 @@
     public final synchronized int unpackInt () throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.InputBuffer_6"));
+            throw new IOException(tsLogger.i18NLogger.get_state_InputBuffer_6());
 
         _valid = false;
 
@@ -337,8 +331,7 @@
     public final synchronized long unpackLong () throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.InputBuffer_7"));
+            throw new IOException(tsLogger.i18NLogger.get_state_InputBuffer_7());
 
         _valid = false;
 
@@ -357,8 +350,7 @@
     public final synchronized float unpackFloat () throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.InputBuffer_8"));
+            throw new IOException(tsLogger.i18NLogger.get_state_InputBuffer_8());
 
         _valid = false;
 
@@ -377,8 +369,7 @@
     public final synchronized double unpackDouble () throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.InputBuffer_9"));
+            throw new IOException(tsLogger.i18NLogger.get_state_InputBuffer_9());
 
         _valid = false;
 
@@ -400,8 +391,7 @@
     public final synchronized String unpackString () throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.InputBuffer_10"));
+            throw new IOException(tsLogger.i18NLogger.get_state_InputBuffer_10());
 
         int length = unpackInt();
 
@@ -433,8 +423,7 @@
     public synchronized void unpackFrom (InputBuffer buff) throws IOException
     {
         if (buff == null)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.InputBuffer_11"));
+            throw new IOException(tsLogger.i18NLogger.get_state_InputBuffer_11());
 
         _valid = false;
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputBuffer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputBuffer.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputBuffer.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -245,8 +245,7 @@
     public final synchronized void packByte (byte b) throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.OutputBuffer_1"));
+            throw new IOException(tsLogger.i18NLogger.get_state_OutputBuffer_1());
 
         packInt((byte) b);
     }
@@ -259,8 +258,7 @@
     public final synchronized void packBytes (byte[] b) throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.OutputBuffer_2"));
+            throw new IOException(tsLogger.i18NLogger.get_state_OutputBuffer_2());
 
         packInt(b.length);
 
@@ -278,8 +276,7 @@
     public final synchronized void packBoolean (boolean b) throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.OutputBuffer_3"));
+            throw new IOException(tsLogger.i18NLogger.get_state_OutputBuffer_3());
 
         _valid = false;
 
@@ -299,8 +296,7 @@
     public final synchronized void packChar (char c) throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.OutputBuffer_4"));
+            throw new IOException(tsLogger.i18NLogger.get_state_OutputBuffer_4());
 
         packInt((int) c);
     }
@@ -312,8 +308,7 @@
     public final synchronized void packShort (short s) throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.OutputBuffer_5"));
+            throw new IOException(tsLogger.i18NLogger.get_state_OutputBuffer_5());
 
         packInt((int) s);
     }
@@ -325,8 +320,7 @@
     public final synchronized void packInt (int i) throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.OutputBuffer_6"));
+            throw new IOException(tsLogger.i18NLogger.get_state_OutputBuffer_6());
 
         _valid = false;
 
@@ -342,8 +336,7 @@
     public final synchronized void packLong (long l) throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.OutputBuffer_7"));
+            throw new IOException(tsLogger.i18NLogger.get_state_OutputBuffer_7());
 
         _valid = false;
 
@@ -359,8 +352,7 @@
     public final synchronized void packFloat (float f) throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.OutputBuffer_8"));
+            throw new IOException(tsLogger.i18NLogger.get_state_OutputBuffer_8());
 
         _valid = false;
 
@@ -376,8 +368,7 @@
     public final synchronized void packDouble (double d) throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.OutputBuffer_9"));
+            throw new IOException(tsLogger.i18NLogger.get_state_OutputBuffer_9());
 
         _valid = false;
 
@@ -395,8 +386,7 @@
     public final synchronized void packString (String s) throws IOException
     {
         if (!_valid)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.OutputBuffer_10"));
+            throw new IOException(tsLogger.i18NLogger.get_state_OutputBuffer_10());
 
         int sz = 0;
         String dummy = null;
@@ -430,8 +420,7 @@
     public synchronized void packInto (OutputBuffer buff) throws IOException
     {
         if (buff == null)
-            throw new IOException(tsLogger.arjLoggerI18N
-                    .getString("com.arjuna.ats.arjuna.state.OutputBuffer_11"));
+            throw new IOException(tsLogger.i18NLogger.get_state_OutputBuffer_11());
 
         if (_valid)
         {

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/StateManagerWrapper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/StateManagerWrapper.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/StateManagerWrapper.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -28,12 +28,10 @@
 			unpackHeader(os.read_committed(uid, type));
 		} catch (IOException e) {
 			if (tsLogger.arjLoggerI18N.isInfoEnabled())
-				  tsLogger.arjLoggerI18N.info("org.jboss.jbosstm.tools.jmx.osb.MbState.m_1",
-						  new Object[] { e.getMessage() });
+                tsLogger.i18NLogger.info_osb_StateManagerWrapperFail(e);
 		} catch (ObjectStoreException e) {
 			  if (tsLogger.arjLoggerI18N.isInfoEnabled())
-				  tsLogger.arjLoggerI18N.info("org.jboss.jbosstm.tools.jmx.osb.MbState.m_1",
-						  new Object[] { e.getMessage() });
+                  tsLogger.i18NLogger.info_osb_StateManagerWrapperFail(e);
 		}
 	}
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/UidWrapper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/UidWrapper.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/UidWrapper.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -123,7 +123,7 @@
 			mbean = constructor.newInstance(this);
 		} catch (Exception e) { // ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException
 			if (tsLogger.arjLoggerI18N.isInfoEnabled())
-				tsLogger.arjLoggerI18N.info("Error constructing mbean: " + e);
+				tsLogger.i18NLogger.info_osb_MBeanCtorFail(e);
 			mbean = new OSEntryBean(this);
 		}
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/util/JMXServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/util/JMXServer.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/util/JMXServer.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -115,17 +115,14 @@
 
 		try {
 			if (tsLogger.arjLoggerI18N.isInfoEnabled())
-				tsLogger.arjLoggerI18N.info("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_1",
-						new Object[] { name });
+                tsLogger.i18NLogger.info_tools_osb_util_JMXServer_m_1(name);
 			oi = getServer().registerMBean(bean, new ObjectName(name));
 		} catch (InstanceAlreadyExistsException e) {
 			if (tsLogger.arjLoggerI18N.isInfoEnabled())
-				tsLogger.arjLoggerI18N.info("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_2",
-						new Object[] { name });
+                tsLogger.i18NLogger.info_tools_osb_util_JMXServer_m_2(name);
 		} catch (javax.management.JMException e) {
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_3",
-						new Object[] { name, e.getMessage() });
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_tools_osb_util_JMXServer_m_3(name, e);
 		}
 
 		return oi;
@@ -137,18 +134,15 @@
 			getServer().unregisterMBean(new ObjectName(name));
 			return true;
 		} catch (MalformedObjectNameException e) {
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_5",
-						new Object[] { name, e.getMessage() });
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_tools_osb_util_JMXServer_m_5(name, e);
 		} catch (InstanceNotFoundException e) {
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_5",
-						new Object[] { name, e.getMessage() });
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_tools_osb_util_JMXServer_m_5(name, e);
 		} catch (MBeanRegistrationException e) {
 			// can't happen - none of our beans implement the MBeanRegistration interface
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_6",
-						new Object[] { name, e.getMessage() });
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_tools_osb_util_JMXServer_m_6(name, e);
 		}
 
 		return false;

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -309,11 +309,8 @@
         catch (IOException e)
         {
 
-            if (tsLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                tsLogger.arjLoggerI18N.warn(
-                        "com.arjuna.ats.arjuna.utils.FileLock_4", new Object[]
-                        { _lockFile });
+            if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_utils_FileLock_4(_lockFile.getName());
             }
 
             return false;

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/Utility.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/Utility.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/Utility.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -205,7 +205,7 @@
             catch (final UnknownHostException uhe)
             { 
                 if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                    tsLogger.arjLoggerI18N.warn("Utility_2");
+                    tsLogger.i18NLogger.warn_utils_Utility_2();
 
                 addr = InetAddress.getByName(null); 
             } 
@@ -276,29 +276,13 @@
      *
      * @param host
      *            if empty or null then the loopback address is used
-     * @param messageKey
-     *            message key to a report warning if host is unknown
      * @return an InetAddress structure corresponding the desired host name
      * @throws UnknownHostException
      *             if the hostname cannot be found
      */
-    public static InetAddress hostNameToInetAddress (String host,
-            String messageKey) throws UnknownHostException
+    public static InetAddress hostNameToInetAddress (String host) throws UnknownHostException
     {
-        try
-        {
-            return InetAddress.getByName(host);
-        }
-        catch (UnknownHostException ex)
-        {
-            /*
-             * The hostname is unknown
-             */
-            if (tsLogger.arjLoggerI18N.isWarnEnabled() && messageKey != null)
-                tsLogger.arjLoggerI18N.warn(messageKey, ex);
-
-            throw ex;
-        }
+        return InetAddress.getByName(host);
     }
 
     /**
@@ -368,7 +352,7 @@
             catch (final Exception e)
             {
                 if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                    tsLogger.arjLoggerI18N.warn("Utility_1", e);
+                    tsLogger.i18NLogger.warn_utils_Utility_1(e);
             }
         }
     }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/LogWriteStateManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/LogWriteStateManager.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/LogWriteStateManager.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -110,8 +110,8 @@
     
 	if (super.status() == ObjectStatus.PASSIVE)
 	{
-	    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.StateManager_10");
+        if (tsLogger.arjLoggerI18N.isWarnEnabled())
+            tsLogger.i18NLogger.warn_StateManager_10();
 
 	    activate();
 	}

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/TxLogWritePersistenceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/TxLogWritePersistenceRecord.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/TxLogWritePersistenceRecord.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -91,10 +91,9 @@
 			    
 		    if (!result)
 		    {
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			{
-			    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_2", new Object[] {order()});
-			}
+			if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_PersistenceRecord_2(order());
+            }
 		    }
 		}
 		else
@@ -180,10 +179,9 @@
 			store.write_uncommitted(sm.get_uid(), sm.type(), dummy);
 			result = TwoPhaseOutcome.PREPARE_OK;
 		    }
-		    catch (ObjectStoreException e)
-		    {
-			tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_21",e);
-		    }
+		    catch (ObjectStoreException e) {
+                tsLogger.i18NLogger.warn_PersistenceRecord_21(e);
+            }
 		
 		    dummy = null;
 		}
@@ -202,15 +200,15 @@
 		}
 		else
 		{
-		    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_7");
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_PersistenceRecord_7();
 		}
 	    }
 	}
 	else
 	{
-	    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_8");
+        if (tsLogger.arjLoggerI18N.isWarnEnabled())
+            tsLogger.i18NLogger.warn_PersistenceRecord_8();
 	}
 
 	return result;

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/ActivationRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/ActivationRecord.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/ActivationRecord.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -80,8 +80,7 @@
     public void setValue (Object v)
     {
         if (tsLogger.arjLoggerI18N.isWarnEnabled())
-            tsLogger.arjLoggerI18N
-                    .warn("com.arjuna.ats.arjuna.ActivationRecord_1");
+            tsLogger.i18NLogger.warn_ActivationRecord_1();
     }
 
     /**
@@ -199,11 +198,8 @@
 
     public boolean restore_state (InputObjectState os, int v)
     {
-        if (tsLogger.arjLoggerI18N.isWarnEnabled())
-        {
-            tsLogger.arjLoggerI18N.warn(
-                    "com.arjuna.ats.arjuna.ActivationRecord_2", new Object[]
-                    { type(), order() });
+        if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_ActivationRecord_2(type(), order());
         }
 
         return false;

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverRecord.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverRecord.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -139,11 +139,9 @@
 
 	if (oType == RecordType.RECOVERY)
 	{
-	    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	    {
-		tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.CadaverRecord_1",
-					    new Object[]{ order(), getTypeOfObject() } );
-	    }
+	    if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_CadaverRecord_1(order(), getTypeOfObject());
+        }
 	}
 
 	/*
@@ -192,11 +190,9 @@
 
 	if (oType == RecordType.RECOVERY)
 	{
-	    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	    {
-		tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.CadaverRecord_1",
-					    new Object[]{ order(), getTypeOfObject() } );
-	    }
+	    if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_CadaverRecord_1(order(), getTypeOfObject());
+        }
 	}
 
 	// super.forgetAction(false);

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/DisposeRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/DisposeRecord.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/DisposeRecord.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -156,11 +156,9 @@
 	    }
 	    catch (final Throwable e)
 	    {
-		if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		{
-		    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.DisposeRecord_5", 
-						new Object[]{e});
-		}
+		if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_DisposeRecord_5(e);
+        }
 	    }
 	}
 	
@@ -207,8 +205,8 @@
 	{
 	    if (!ObjectStoreType.valid(store.typeIs()))
 	    {
-		if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.DisposeRecord_1");
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_DisposeRecord_1();
 			
 		res = false;
 	    }
@@ -224,16 +222,16 @@
 		}
 		catch (IOException e)
 		{
-		    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.DisposeRecord_2");
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_DisposeRecord_2();
 		    res = false;
 		}
 	    }
 	}
 	else
 	{
-	    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.DisposeRecord_3");
+        if (tsLogger.arjLoggerI18N.isWarnEnabled())
+            tsLogger.i18NLogger.warn_DisposeRecord_3();
 		
 	    res = false;
 	}
@@ -262,11 +260,9 @@
 	    }
 	    else
 	    {
-		if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		{
-		    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.DisposeRecord_4", 
-						new Object[]{Integer.toString(objStoreType)});
-		}
+		if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_DisposeRecord_4(Integer.toString(objStoreType));
+        }
 
 		res = false;
 	    }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -196,13 +196,8 @@
                 if (tsLogger.arjLoggerI18N.isWarnEnabled())
                 {
                     if (!_disableMLRWarning
-                            || (_disableMLRWarning && !_issuedWarning))
-                    {
-                        tsLogger.arjLoggerI18N
-                                .warn(
-                                        "com.arjuna.ats.arjuna.lastResource.multipleWarning",
-                                        new Object[]
-                                        { a });
+                            || (_disableMLRWarning && !_issuedWarning)) {
+                        tsLogger.i18NLogger.warn_lastResource_multipleWarning(a.toString());
                         _issuedWarning = true;
                     }
                 }
@@ -211,12 +206,8 @@
             }
             else
             {
-                if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    tsLogger.arjLoggerI18N.warn(
-                            "com.arjuna.ats.arjuna.lastResource.disallow",
-                            new Object[]
-                            { a });
+                if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_lastResource_disallow(a.toString());
                 }
 
                 return false;
@@ -287,20 +278,16 @@
                 .getCoreEnvironmentBean().isAllowMultipleLastResources();
 
         if (ALLOW_MULTIPLE_LAST_RESOURCES
-                && tsLogger.arjLoggerI18N.isWarnEnabled())
-        {
-            tsLogger.arjLoggerI18N
-                    .warn("com.arjuna.ats.arjuna.lastResource.startupWarning");
+                && tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_lastResource_startupWarning();
         }
 
         _disableMLRWarning = arjPropertyManager.getCoreEnvironmentBean()
                 .isDisableMultipleLastResourcesWarning();
 
         if (arjPropertyManager.getCoreEnvironmentBean()
-                .isDisableMultipleLastResourcesWarning())
-        {
-            tsLogger.arjLoggerI18N
-                    .warn("com.arjuna.ats.arjuna.lastResource.disableWarning");
+                .isDisableMultipleLastResourcesWarning()) {
+            tsLogger.i18NLogger.warn_lastResource_disableWarning();
 
             _disableMLRWarning = true;
         }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/PersistenceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/PersistenceRecord.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/PersistenceRecord.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -176,20 +176,18 @@
 		{
 			if (!store.remove_uncommitted(uid, type))
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				{
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_19");
-				}
+				if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_PersistenceRecord_19();
+                }
 
 				return TwoPhaseOutcome.FINISH_ERROR;
 			}
 		}
 		catch (ObjectStoreException e)
 		{
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			{
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_20", new Object[] { e }, e);
-			}
+			if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_PersistenceRecord_20(e);
+            }
 
 			return TwoPhaseOutcome.FINISH_ERROR;
 		}
@@ -231,11 +229,9 @@
 
 					if (!result)
 					{
-						if (tsLogger.arjLoggerI18N.isWarnEnabled())
-						{
-							tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_2", new Object[]
-							{ order() });
-						}
+						if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                            tsLogger.i18NLogger.warn_PersistenceRecord_2(order());
+                        }
 					}
 				}
 				else
@@ -246,30 +242,29 @@
 					}
 					else
 					{
-						if (tsLogger.arjLoggerI18N.isWarnEnabled())
-							tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_3");
+                        if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                            tsLogger.i18NLogger.warn_PersistenceRecord_3();
 					}
 				}
 			}
 			catch (ObjectStoreException e)
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_4", new Object[]
-					{ e });
+                if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                    tsLogger.i18NLogger.warn_PersistenceRecord_4(e);
 
 				result = false;
 			}
 		}
 		else
 		{
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_5");
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_PersistenceRecord_5();
 		}
 
 		if (!result)
 		{
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_6");
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_PersistenceRecord_6();
 		}
 
 		super.forgetAction(true);
@@ -335,10 +330,9 @@
 						store.write_uncommitted(sm.get_uid(), sm.type(), dummy);
 						result = TwoPhaseOutcome.PREPARE_OK;
 					}
-					catch (ObjectStoreException e)
-					{
-						tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_21", e);
-					}
+					catch (ObjectStoreException e) {
+                        tsLogger.i18NLogger.warn_PersistenceRecord_21(e);
+                    }
 
 					dummy = null;
 				}
@@ -361,15 +355,15 @@
 				}
 				else
 				{
-					if (tsLogger.arjLoggerI18N.isWarnEnabled())
-						tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_7");
+                    if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                        tsLogger.i18NLogger.warn_PersistenceRecord_7();
 				}
 			}
 		}
 		else
 		{
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_8");
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_PersistenceRecord_8();
 		}
 
 		return result;
@@ -449,8 +443,8 @@
 		}
 		catch (final Exception e)
 		{
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_10");
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_PersistenceRecord_10();
 		}
 
 		return res;
@@ -469,10 +463,9 @@
 		{
 			if (!ObjectStoreType.valid(store.typeIs()))
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				{
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_11");
-				}
+				if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_PersistenceRecord_11();
+                }
 
 				res = false;
 			}
@@ -508,8 +501,8 @@
 							topLevelState.packInto(os);
 						else
 						{
-							if (tsLogger.arjLoggerI18N.isWarnEnabled())
-								tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_14");
+                            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                                tsLogger.i18NLogger.warn_PersistenceRecord_14();
 						}
 					}
 				}
@@ -517,15 +510,15 @@
 				{
 					res = false;
 
-					if (tsLogger.arjLoggerI18N.isWarnEnabled())
-						tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_15");
+                    if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                        tsLogger.i18NLogger.warn_PersistenceRecord_15();
 				}
 			}
 		}
 		else
 		{
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_16");
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_PersistenceRecord_16();
 
 			try
 			{

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/RecoveryRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/RecoveryRecord.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/RecoveryRecord.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -93,8 +93,7 @@
         else
         {
             if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                tsLogger.arjLoggerI18N
-                        .warn("com.arjuna.ats.arjuna.RecoveryRecord_1");
+                tsLogger.i18NLogger.warn_RecoveryRecord_1();
         }
     }
 
@@ -133,8 +132,7 @@
                 if (result == TwoPhaseOutcome.FINISH_ERROR)
                 {
                     if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                        tsLogger.arjLoggerI18N
-                                .warn("com.arjuna.ats.arjuna.RecoveryRecord_2");
+                        tsLogger.i18NLogger.warn_RecoveryRecord_2();
                 }
 
                 return result;

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/StateManagerFriend.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/StateManagerFriend.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/StateManagerFriend.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -69,8 +69,7 @@
         catch (final Throwable ex)
         {
             if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                tsLogger.arjLoggerI18N
-                .warn("com.arjuna.ats.internal.arjuna.abstractrecords.smf1", ex);
+                tsLogger.i18NLogger.warn_abstractrecords_smf1(ex);
             
             return false;
         }
@@ -92,8 +91,7 @@
         catch (final Throwable ex)
         {
             if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                tsLogger.arjLoggerI18N
-                .warn("com.arjuna.ats.internal.arjuna.abstractrecords.smf3", ex);
+                tsLogger.i18NLogger.warn_abstractrecords_smf3(ex);
             
             return false;
         }
@@ -112,8 +110,7 @@
         catch (final Throwable ex)
         {
             if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                tsLogger.arjLoggerI18N
-                .warn("com.arjuna.ats.internal.arjuna.abstractrecords.smf2", ex);
+                tsLogger.i18NLogger.warn_abstractrecords_smf2(ex);
         }
     }
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/BasicMutex.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/BasicMutex.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/BasicMutex.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -129,10 +129,9 @@
 	{
 	    if (_users <= 0)
 	    {
-		if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		{
-		    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.common.Mutex_2");
-		}
+		if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_common_Mutex_2();
+        }
 		
 		return BasicMutex.ERROR;
 	    }
@@ -151,10 +150,9 @@
 		    }
 		    else
 		    {
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			{
-			    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.common.Mutex_2");
-			}
+			if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_common_Mutex_2();
+            }
 			
 			return BasicMutex.LOCKED;
 		    }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/ClassloadingUtility.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/ClassloadingUtility.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/ClassloadingUtility.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -60,9 +60,8 @@
             tsLogger.arjLogger.debug("Loading class " + className);
         }
 
-        if (className == null)
-        {
-            tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.common.ClassloadingUtility_1");
+        if (className == null) {
+            tsLogger.i18NLogger.warn_common_ClassloadingUtility_1();
             return null;
         }
 
@@ -72,7 +71,7 @@
         {
             clazz = Thread.currentThread().getContextClassLoader().loadClass( className ) ;
         } catch(ClassNotFoundException e) {
-            tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.common.ClassloadingUtility_2",  new Object[]{className}, e);
+            tsLogger.i18NLogger.warn_common_ClassloadingUtility_2(className, e);
             return null;
         }
 
@@ -82,12 +81,12 @@
             Class<? extends T> clazz2 = clazz.asSubclass(iface);
             instance = (T)clazz2.newInstance();
         } catch (ClassCastException e) {
-            tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.common.ClassloadingUtility_3", new Object[]{className, iface.getName()}, e);
+            tsLogger.i18NLogger.warn_common_ClassloadingUtility_3(className, iface.getName(), e);
         }
         catch (InstantiationException e) {
-            tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.common.ClassloadingUtility_4", new Object[]{className}, e);
+            tsLogger.i18NLogger.warn_common_ClassloadingUtility_4(className, e);
         } catch (IllegalAccessException e) {
-            tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.common.ClassloadingUtility_5", new Object[]{className}, e);
+            tsLogger.i18NLogger.warn_common_ClassloadingUtility_5(className, e);
         }
 
         return instance;
@@ -125,7 +124,7 @@
                     Method method = instance.getClass().getMethod("initialise", new Class[] {String.class}); // yup, UK English spelling
                     method.invoke(instance, theParameter);
                 } catch(Exception e) {
-                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.common.ClassloadingUtility_6", new Object[]{theClassAndParameter}, e);
+                    tsLogger.i18NLogger.warn_common_ClassloadingUtility_6(theClassAndParameter, e);
                     continue;
                 }
             }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/CacheStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/CacheStore.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/CacheStore.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -753,56 +753,32 @@
 
             try
             {
-                switch (_work.typeOfWork)
-                {
-                case AsyncStore.COMMIT:
-                {
-                    if (!_work.store.commitState(_work.objUid, _work.tName))
-                    {
-                        tsLogger.arjLoggerI18N
-                                .warn(
-                                        "com.arjuna.ats.internal.arjuna.objectstore.CacheStore_1",
-                                        new Object[]
-                                        { _work.objUid, _work.tName });
+                switch (_work.typeOfWork) {
+                    case AsyncStore.COMMIT: {
+                        if (!_work.store.commitState(_work.objUid, _work.tName)) {
+                            tsLogger.i18NLogger.warn_objectstore_CacheStore_1(_work.objUid, _work.tName);
+                        }
                     }
-                }
                     break;
-                case AsyncStore.REMOVE:
-                {
-                    if (!_work.store.removeState(_work.objUid, _work.tName,
-                            _work.fileType))
-                    {
-                        tsLogger.arjLoggerI18N
-                                .warn(
-                                        "com.arjuna.ats.internal.arjuna.objectstore.CacheStore_2",
-                                        new Object[]
-                                        { _work.objUid, _work.tName,
-                                                new Integer(_work.fileType) });
+                    case AsyncStore.REMOVE: {
+                        if (!_work.store.removeState(_work.objUid, _work.tName,
+                                _work.fileType)) {
+                            tsLogger.i18NLogger.warn_objectstore_CacheStore_2(_work.objUid, _work.tName,
+                                    Integer.toString(_work.fileType));
+                        }
                     }
-                }
                     break;
-                case AsyncStore.WRITE:
-                {
-                    if (!_work.store.writeState(_work.objUid, _work.tName,
-                            _work.state, _work.fileType))
-                    {
-                        tsLogger.arjLoggerI18N
-                                .warn(
-                                        "com.arjuna.ats.internal.arjuna.objectstore.CacheStore_3",
-                                        new Object[]
-                                        { _work.objUid, _work.tName,
-                                                _work.state,
-                                                new Integer(_work.fileType) });
+                    case AsyncStore.WRITE: {
+                        if (!_work.store.writeState(_work.objUid, _work.tName,
+                                _work.state, _work.fileType)) {
+                            tsLogger.i18NLogger.warn_objectstore_CacheStore_3(_work.objUid, _work.tName,
+                                    _work.state.toString(), Integer.toString(_work.fileType));
+                        }
                     }
-                }
                     break;
-                default:
-                    tsLogger.arjLoggerI18N
-                            .warn(
-                                    "com.arjuna.ats.internal.arjuna.objectstore.CacheStore_3",
-                                    new Object[]
-                                    { new Integer(_work.typeOfWork) });
-                    break;
+                    default:
+                        tsLogger.i18NLogger.warn_objectstore_CacheStore_4(Integer.toString(_work.typeOfWork));
+                        break;
                 }
             }
             catch (ObjectStoreException ex)

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -262,7 +262,7 @@
                 }
                 catch (IOException e)
                 {
-                    throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_2a"), e);
+                    throw new ObjectStoreException(tsLogger.i18NLogger.get_objectstore_FileSystemStore_2a(), e);
                 }
             }
         }
@@ -273,7 +273,7 @@
         }
         catch (IOException e)
         {
-            throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_3"), e);
+            throw new ObjectStoreException(tsLogger.i18NLogger.get_objectstore_FileSystemStore_3(), e);
         }
 
         state.setBuffer(store.buffer());
@@ -315,7 +315,7 @@
                     }
                     catch (IOException e)
                     {
-                        throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_4"), e);
+                        throw new ObjectStoreException(tsLogger.i18NLogger.get_objectstore_FileSystemStore_4(), e);
                     }
                 }
 
@@ -329,7 +329,7 @@
         }
         catch (IOException e)
         {
-            throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_5"), e);
+            throw new ObjectStoreException(tsLogger.i18NLogger.get_objectstore_FileSystemStore_5(), e);
         }
 
         foundTypes.setBuffer(store.buffer());
@@ -359,7 +359,7 @@
         }
         catch (ObjectStoreException e)
         {
-            throw new IOException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_6"));
+            throw new IOException(tsLogger.i18NLogger.get_objectstore_FileSystemStore_6());
         }
     }
 
@@ -525,10 +525,8 @@
 
                 removeFromCache(from.toString());
 
-                if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_20",
-                                                new Object[]{from});
+                if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_objectstore_FileSystemStore_20(from.getName());
                 }
 
                 return true;
@@ -619,7 +617,7 @@
                     }
                     catch (IOException e)
                     {
-                        throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_7"), e);
+                        throw new ObjectStoreException(tsLogger.i18NLogger.get_objectstore_FileSystemStore_7(), e);
                     }
                 }
             }
@@ -705,10 +703,8 @@
 
         if ((fullStoreName == null) || !createHierarchy(fullStoreName))
         {
-            if (tsLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_1",
-                                            new Object[]{fullStoreName});
+            if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_objectstore_FileSystemStore_1(fullStoreName);
             }
 
             isValid = false;
@@ -806,7 +802,7 @@
             return f.exists();
         }
         else
-            throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_8"));
+            throw new ObjectStoreException(tsLogger.i18NLogger.get_objectstore_FileSystemStore_8());
     }
 
     /**
@@ -867,10 +863,8 @@
         {
             if ((FileSystemStore.fileCache.remove(fname) == null) && warn)
             {
-                if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_2",
-                                                new Object[]{fname});
+                if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_objectstore_FileSystemStore_2(fname);
                 }
             }
         }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -156,7 +156,7 @@
                             }
                             catch (IOException e)
                             {
-                                throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.HashedStore_5"), e);
+                                throw new ObjectStoreException(tsLogger.i18NLogger.get_objectstore_HashedStore_5(), e);
                             }
                         }
                     }
@@ -176,7 +176,7 @@
         }
         catch (IOException e)
         {
-            throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.HashedStore_6"), e);
+            throw new ObjectStoreException(tsLogger.i18NLogger.get_objectstore_HashedStore_6(), e);
         }
 
         state.setBuffer(store.buffer());
@@ -357,10 +357,8 @@
 
         if (NUMBEROFDIRECTORIES <= 0)
         {
-            if (tsLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.objectstore.HashedStore_2",
-                        new Object[]{NUMBEROFDIRECTORIES});
+            if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_objectstore_HashedStore_2(Integer.toString(NUMBEROFDIRECTORIES));
             }
 
             NUMBEROFDIRECTORIES = DEFAULT_NUMBER_DIRECTORIES;

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCImple.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCImple.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -195,12 +195,8 @@
 			}
 			catch (Exception e)
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-					tsLogger.arjLoggerI18N
-							.warn(
-									"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_1",
-									new Object[]
-									{ e });
+                if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                    tsLogger.i18NLogger.warn_objectstore_JDBCImple_1(e);
 
 				freePool(pool);
 				return false;
@@ -294,12 +290,8 @@
 			}
 			catch (Exception e)
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-					tsLogger.arjLoggerI18N
-							.warn(
-									"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_2",
-									new Object[]
-									{ e });
+                if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                    tsLogger.i18NLogger.warn_objectstore_JDBCImple_2(e);
 
 				freePool(pool);
 				return false;
@@ -464,17 +456,12 @@
 				}
 				else
 				{
-				    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				    {
-					tsLogger.arjLoggerI18N
-							.warn(
-									"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_3",
-									new Object[]
-									{ e });
-					
-					e.printStackTrace();
-				    }
+				    if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                        tsLogger.i18NLogger.warn_objectstore_JDBCImple_3(e);
 
+                        e.printStackTrace();
+                    }
+
 					return StateStatus.OS_UNKNOWN;
 				}
 			}
@@ -542,23 +529,15 @@
 					}
 					catch (IOException ex)
 					{
-						if (tsLogger.arjLoggerI18N.isWarnEnabled())
-							tsLogger.arjLoggerI18N
-									.warn(
-											"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_5",
-											new Object[]
-											{ ex });
+                        if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                            tsLogger.i18NLogger.warn_objectstore_JDBCImple_5(ex);
 
 						return false;
 					}
 					catch (Exception e)
 					{
-						if (tsLogger.arjLoggerI18N.isWarnEnabled())
-							tsLogger.arjLoggerI18N
-									.warn(
-											"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_4",
-											new Object[]
-											{ e });
+                        if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                            tsLogger.i18NLogger.warn_objectstore_JDBCImple_4(e);
 
 						finished = true;
 					}
@@ -566,12 +545,8 @@
 			}
 			catch (Exception e)
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-					tsLogger.arjLoggerI18N
-							.warn(
-									"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_4",
-									new Object[]
-									{ e });
+                if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                    tsLogger.i18NLogger.warn_objectstore_JDBCImple_4(e);
 			}
 			finally
 			{
@@ -612,12 +587,8 @@
 		}
 		catch (Exception e)
 		{
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				tsLogger.arjLoggerI18N
-						.warn(
-								"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_4",
-								new Object[]
-								{ e });
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_objectstore_JDBCImple_4(e);
 		}
 		finally
 		{
@@ -668,23 +639,15 @@
 					}
 					catch (IOException ex)
 					{
-						if (tsLogger.arjLoggerI18N.isWarnEnabled())
-							tsLogger.arjLoggerI18N
-									.warn(
-											"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_7",
-											new Object[]
-											{ ex });
+                        if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                            tsLogger.i18NLogger.warn_objectstore_JDBCImple_7(ex);
 
 						return false;
 					}
 					catch (Exception e)
 					{
-						if (tsLogger.arjLoggerI18N.isWarnEnabled())
-							tsLogger.arjLoggerI18N
-									.warn(
-											"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_6",
-											new Object[]
-											{ e });
+                        if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                            tsLogger.i18NLogger.warn_objectstore_JDBCImple_6(e);
 
 						finished = true;
 					}
@@ -692,12 +655,8 @@
 			}
 			catch (Exception e)
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-					tsLogger.arjLoggerI18N
-							.warn(
-									"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_6",
-									new Object[]
-									{ e });
+                if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                    tsLogger.i18NLogger.warn_objectstore_JDBCImple_6(e);
 			}
 			finally
 			{
@@ -727,7 +686,7 @@
 			}
 			catch (IOException e)
 			{
-				throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.packProblem"), e);
+				throw new ObjectStoreException(tsLogger.i18NLogger.get_objectstore_packProblem(), e);
 			}
 
 			foundTypes.setBuffer(store.buffer());
@@ -736,12 +695,8 @@
 		}
 		catch (Exception e)
 		{
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				tsLogger.arjLoggerI18N
-						.warn(
-								"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_6",
-								new Object[]
-								{ e });
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_objectstore_JDBCImple_6(e);
 		}
 		finally
 		{
@@ -811,12 +766,8 @@
 					}
 					else
 					{
-						if (tsLogger.arjLoggerI18N.isWarnEnabled())
-							tsLogger.arjLoggerI18N
-									.warn(
-											"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_8",
-											new Object[]
-											{ e });
+                        if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                            tsLogger.i18NLogger.warn_objectstore_JDBCImple_8(e);
 
 						removeOk = false;
 					}
@@ -833,11 +784,7 @@
 				// can only remove (UN)COMMITTED objs
 				if (tsLogger.arjLoggerI18N.isWarnEnabled())
 				{
-					tsLogger.arjLoggerI18N
-							.warn(
-									"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_9",
-									new Object[]
-									{ new Integer(ft), objUid });
+                    tsLogger.i18NLogger.warn_objectstore_JDBCImple_9(Integer.toString(ft), objUid);
 				}
 			}
 		}
@@ -845,14 +792,9 @@
 		{
 			removeOk = false;
 
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			{
-				tsLogger.arjLoggerI18N
-						.warn(
-								"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_10",
-								new Object[]
-								{ objUid });
-			}
+			if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_objectstore_JDBCImple_10(objUid);
+            }
 		}
 
 		return removeOk;
@@ -903,8 +845,8 @@
 						newImage = new InputObjectState(objUid, tName, buffer);
 					}
 					else {
-					    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-						tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_readfailed");
+                        if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                            tsLogger.i18NLogger.warn_objectstore_JDBCImple_readfailed();
 					}
 				}
 				catch (Throwable e)
@@ -1003,8 +945,8 @@
 				if(retryConnection(e, pool)) {
 					return write_state(objUid, tName, state, s, tableName);
 				} else {
-				    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_writefailed", new Object[] {e});
+                    if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                        tsLogger.i18NLogger.warn_objectstore_JDBCImple_writefailed(e);
 				}
 			}
 			finally
@@ -1040,13 +982,8 @@
         _poolSizeInit = arjPropertyManager.getObjectStoreEnvironmentBean().getJdbcPoolSizeInitial();
         if (_poolSizeInit < 1)
         {
-            if (tsLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                tsLogger.arjLoggerI18N
-                        .warn(
-                                "com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_11",
-                                new Object[]
-                                        { _poolSizeInit });
+            if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_objectstore_JDBCImple_11(Integer.toString(_poolSizeInit));
             }
             _poolSizeInit = 1;
         }
@@ -1054,13 +991,8 @@
         _poolSizeMax = arjPropertyManager.getObjectStoreEnvironmentBean().getJdbcPoolSizeMaximum();
         if (_poolSizeMax < _poolSizeInit)
         {
-            if (tsLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                tsLogger.arjLoggerI18N
-                        .warn(
-                                "com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_12",
-                                new Object[]
-                                        { _poolSizeMax });
+            if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_objectstore_JDBCImple_12(Integer.toString(_poolSizeMax));
             }
             _poolSizeMax = _poolSizeInit;
         }
@@ -1082,12 +1014,8 @@
 		}
 		catch (Exception e)
 		{
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				tsLogger.arjLoggerI18N
-						.warn(
-								"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_13",
-								new Object[]
-								{ e });
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_objectstore_JDBCImple_13(e);
 
 			_isValid = false;
 			return _isValid;
@@ -1149,12 +1077,8 @@
 		}
 		catch (Exception e)
 		{
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				tsLogger.arjLoggerI18N
-						.warn(
-								"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_13",
-								new Object[]
-								{ e });
+            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                tsLogger.i18NLogger.warn_objectstore_JDBCImple_13(e);
 
 			_isValid = false;
 		}
@@ -1218,14 +1142,9 @@
 		}
 		catch (Exception ex)
 		{
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			{
-				tsLogger.arjLoggerI18N
-						.warn(
-								"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_14",
-								new Object[]
-								{ ex });
-			}
+			if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_objectstore_JDBCImple_14(ex);
+            }
 		}
 
 		return StateStatus.OS_UNKNOWN;
@@ -1257,14 +1176,9 @@
 		{
 			if ((stateCache.remove(state) == null) && warn)
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				{
-					tsLogger.arjLoggerI18N
-							.warn(
-									"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_15",
-									new Object[]
-									{ state });
-				}
+				if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_objectstore_JDBCImple_15(state);
+                }
 			}
 		}
 	}
@@ -1389,12 +1303,8 @@
 						}
 						catch (Exception e)
 						{
-							if (tsLogger.arjLoggerI18N.isWarnEnabled())
-								tsLogger.arjLoggerI18N
-										.warn(
-												"com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_16",
-												new Object[]
-												{ e });
+                            if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                                tsLogger.i18NLogger.warn_objectstore_JDBCImple_16(e);
 						}
 					}
 					else
@@ -1417,8 +1327,7 @@
 					{
 						if (tsLogger.arjLoggerI18N.isInfoEnabled())
 						{
-							tsLogger.arjLoggerI18N
-									.info("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_17");
+                            tsLogger.i18NLogger.info_objectstore_JDBCImple_17();
 						}
 					}
 				}
@@ -1445,9 +1354,8 @@
 		{
 			if (_inUse[pool] == false)
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-					tsLogger.arjLoggerI18N
-							.warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCImple_18");
+                if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                    tsLogger.i18NLogger.warn_objectstore_JDBCImple_18();
 			}
 			_inUse[pool] = false;
 			_inUse.notifyAll();

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -31,8 +31,6 @@
 
 package com.arjuna.ats.internal.arjuna.objectstore;
 
-import com.arjuna.ats.internal.arjuna.objectstore.JDBCImple;
-
 import com.arjuna.ats.arjuna.state.*;
 
 import com.arjuna.ats.arjuna.logging.tsLogger;
@@ -426,8 +424,7 @@
                                                 .fatal("com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_5");
 
                         throw new FatalError(
-                                        tsLogger.arjLoggerI18N
-                                                        .getString("com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_5"));
+                                tsLogger.i18NLogger.get_objectstore_JDBCStore_5());
                 }
 
                 try
@@ -438,11 +435,7 @@
                 {
                         if (tsLogger.arjLoggerI18N.isFatalEnabled())
                         {
-                                tsLogger.arjLoggerI18N
-                                                .fatal(
-                                                                "com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_1",
-                                                                new Object[]
-                                                                { getJDBCAccess(), getTableName() });
+                            tsLogger.i18NLogger.fatal_objectstore_JDBCStore_1(getJDBCAccess().toString(), getTableName());
                         }
                         throw e;
                 }
@@ -483,11 +476,7 @@
                                 {
                                         if (tsLogger.arjLoggerI18N.isFatalEnabled())
                                         {
-                                                tsLogger.arjLoggerI18N
-                                                                .fatal(
-                                                                                "com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_2",
-                                                                                new Object[]
-                                                                                { ex, jdbcAccessClassName });
+                                            tsLogger.i18NLogger.fatal_objectstore_JDBCStore_2(jdbcAccessClassName, ex);
                                         }
                                         throw ex;
                                 }
@@ -543,11 +532,7 @@
                                         {
                                                 if (tsLogger.arjLoggerI18N.isFatalEnabled())
                                                 {
-                                                        tsLogger.arjLoggerI18N
-                                                                        .fatal(
-                                                                                        "com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_2",
-                                                                                        new Object[]
-                                                                                        { sqle, "getConnection()" });
+                                                    tsLogger.i18NLogger.fatal_objectstore_JDBCStore_2("getConnection()", sqle);
                                                 }
                                                 throw sqle;
                                         }
@@ -556,11 +541,7 @@
                                         {
                                                 if (tsLogger.arjLoggerI18N.isFatalEnabled())
                                                 {
-                                                        tsLogger.arjLoggerI18N
-                                                                        .fatal(
-                                                                                        "com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_1",
-                                                                                        new Object[]
-                                                                                        { getJDBCAccess(), getTableName() });
+                                                    tsLogger.i18NLogger.fatal_objectstore_JDBCStore_1(getJDBCAccess().toString(), getTableName());
                                                 }
                                                 throw new SQLException("getConnection returned null");
                                         }
@@ -580,11 +561,7 @@
                                                 {
                                                         if (tsLogger.arjLoggerI18N.isFatalEnabled())
                                                         {
-                                                                tsLogger.arjLoggerI18N
-                                                                                .fatal(
-                                                                                                "com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_2",
-                                                                                                new Object[]
-                                                                                                { ex, getJDBCAccess() });
+                                                            tsLogger.i18NLogger.fatal_objectstore_JDBCStore_2(getJDBCAccess().toString(), ex);
                                                         }
                                                         throw ex;
                                                 }
@@ -592,9 +569,8 @@
                                                 if (!jdbcImple.initialise(connection, jdbcAccess,
                                                                 impleTableName))
                                                 {
-                                                        if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                                                                tsLogger.arjLoggerI18N
-                                                                                .warn("com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_3");
+                                                    if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                                                        tsLogger.i18NLogger.warn_objectstore_JDBCStore_3();
                                                         throw new ObjectStoreException();
                                                 }
                                                 else

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -812,13 +812,9 @@
 
 				if (fd == null)
 				{
-					if (tsLogger.arjLoggerI18N.isWarnEnabled())
-					{
-						tsLogger.arjLoggerI18N.warn(
-								"com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_18",
-								new Object[]
-								           { fname });
-					}
+					if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                        tsLogger.i18NLogger.warn_objectstore_ShadowingStore_18(fname);
+                    }
 
 					return false;
 				}
@@ -906,14 +902,9 @@
 
 			if (!unlockAndClose(fd, ofile))
 			{
-				if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				{
-					tsLogger.arjLoggerI18N
-							.warn(
-									"com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_19",
-									new Object[]
-									{ fname });
-				}
+				if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_objectstore_ShadowingStore_19(fname);
+                }
 			}
 
 			super.addToCache(fname);
@@ -922,9 +913,8 @@
 		}
 		else
 			throw new ObjectStoreException(
-					"ShadowStore::write_state - "
-							+ tsLogger.arjLoggerI18N
-									.getString("com.arjuna.ats.internal.arjuna.objectstore.notypenameuid")
+                    "ShadowStore::write_state - "
+                            + tsLogger.i18NLogger.get_objectstore_notypenameuid()
 							+ objUid);
 	}
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -212,8 +212,7 @@
         if (!storeValid())
         {
             if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                tsLogger.arjLoggerI18N
-                        .warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_1");
+                tsLogger.i18NLogger.warn_objectstore_ShadowingStore_1();
 
             return false;
         }
@@ -253,11 +252,7 @@
                 {
                     if (tsLogger.arjLoggerI18N.isWarnEnabled())
                     {
-                        tsLogger.arjLoggerI18N
-                                .warn(
-                                        "com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_2",
-                                        new Object[]
-                                        { shadow, filename });
+                        tsLogger.i18NLogger.warn_objectstore_ShadowingStore_2(shadow, filename);
                     }
                 }
                 else
@@ -275,8 +270,7 @@
         else
             throw new ObjectStoreException(
                     "ShadowStore::commit_state - "
-                            + tsLogger.arjLoggerI18N
-                                    .getString("com.arjuna.ats.internal.arjuna.objectstore.notypenameuid")
+                            + tsLogger.i18NLogger.get_objectstore_notypenameuid()
                             + objUid);
 
         return result;
@@ -326,11 +320,7 @@
                 {
                     if (tsLogger.arjLoggerI18N.isWarnEnabled())
                     {
-                        tsLogger.arjLoggerI18N
-                                .warn(
-                                        "com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_3",
-                                        new Object[]
-                                        { newState, oldState });
+                        tsLogger.i18NLogger.warn_objectstore_ShadowingStore_3(newState.getName(), oldState.getName());
                     }
                 }
 
@@ -356,11 +346,7 @@
                 {
                     if (tsLogger.arjLoggerI18N.isWarnEnabled())
                     {
-                        tsLogger.arjLoggerI18N
-                                .warn(
-                                        "com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_3",
-                                        new Object[]
-                                        { newState, oldState });
+                        tsLogger.i18NLogger.warn_objectstore_ShadowingStore_3(newState.getName(), oldState.getName());
                     }
                 }
 
@@ -413,11 +399,7 @@
                 {
                     if (tsLogger.arjLoggerI18N.isWarnEnabled())
                     {
-                        tsLogger.arjLoggerI18N
-                                .warn(
-                                        "com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_4",
-                                        new Object[]
-                                        { newState, oldState });
+                        tsLogger.i18NLogger.warn_objectstore_ShadowingStore_4(newState.getName(), oldState.getName());
                     }
                 }
 
@@ -443,11 +425,7 @@
                 {
                     if (tsLogger.arjLoggerI18N.isWarnEnabled())
                     {
-                        tsLogger.arjLoggerI18N
-                                .warn(
-                                        "com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_4",
-                                        new Object[]
-                                        { newState, oldState });
+                        tsLogger.i18NLogger.warn_objectstore_ShadowingStore_4(newState.getName(), oldState.getName());
                     }
                 }
 
@@ -515,8 +493,7 @@
         if (!storeValid())
         {
             if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                tsLogger.arjLoggerI18N
-                        .warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_6");
+                tsLogger.i18NLogger.warn_objectstore_ShadowingStore_6();
 
             return null;
         }
@@ -571,10 +548,8 @@
                             new_image = new InputObjectState(objUid, tName,
                                     buffer);
                         }
-                        else
-                        {
-                            tsLogger.arjLoggerI18N
-                                    .warn("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_7");
+                        else {
+                            tsLogger.i18NLogger.warn_objectstore_ShadowingStore_7();
                         }
                     }
                     catch (IOException e)
@@ -587,13 +562,8 @@
 
                     if (!closeAndUnlock(fd, ifile, null))
                     {
-                        if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                        {
-                            tsLogger.arjLoggerI18N
-                                    .warn(
-                                            "com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_8",
-                                            new Object[]
-                                            { fname });
+                        if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                            tsLogger.i18NLogger.warn_objectstore_ShadowingStore_8(fname);
                         }
                     }
                 }
@@ -602,8 +572,7 @@
         else
             throw new ObjectStoreException(
                     "ShadowStore::read_state - "
-                            + tsLogger.arjLoggerI18N
-                                    .getString("com.arjuna.ats.internal.arjuna.objectstore.notypenameuid")
+                            + tsLogger.i18NLogger.get_objectstore_notypenameuid()
                             + objUid);
 
         return new_image;
@@ -641,22 +610,14 @@
                         {
                             if (tsLogger.arjLoggerI18N.isWarnEnabled())
                             {
-                                tsLogger.arjLoggerI18N
-                                        .warn(
-                                                "com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_9",
-                                                new Object[]
-                                                { objUid, name });
+                                tsLogger.i18NLogger.warn_objectstore_ShadowingStore_9(objUid, name);
                             }
 
                             if (!fd.exists())
                             {
                                 if (tsLogger.arjLoggerI18N.isWarnEnabled())
                                 {
-                                    tsLogger.arjLoggerI18N
-                                            .warn(
-                                                    "com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_10",
-                                                    new Object[]
-                                                    { objUid, name });
+                                    tsLogger.i18NLogger.warn_objectstore_ShadowingStore_10(objUid, name);
                                 }
                             }
                         }
@@ -669,13 +630,8 @@
 
                             if (ft == StateType.OS_ORIGINAL)
                             {
-                                if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                                {
-                                    tsLogger.arjLoggerI18N
-                                            .warn(
-                                                    "com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_11",
-                                                    new Object[]
-                                                    { fname });
+                                if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                                    tsLogger.i18NLogger.warn_objectstore_ShadowingStore_11(fname);
                                 }
                             }
                         }
@@ -685,13 +641,8 @@
                 }
                 else
                 {
-                    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                    {
-                        tsLogger.arjLoggerI18N
-                                .warn(
-                                        "com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_12",
-                                        new Object[]
-                                        { objUid });
+                    if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                        tsLogger.i18NLogger.warn_objectstore_ShadowingStore_12(objUid);
                     }
 
                     removeOk = false;
@@ -705,30 +656,17 @@
                 removeOk = false;
 
                 if (state == StateStatus.OS_UNKNOWN)
-                    tsLogger.arjLoggerI18N
-                            .info(
-                                    "com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_14",
-                                    new Object[]
-                                    { objUid, name });
+                    tsLogger.i18NLogger.info_objectstore_ShadowingStore_14(objUid, name);
                 else
-                    tsLogger.arjLoggerI18N
-                            .info(
-                                    "com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_15",
-                                    new Object[]
-                                    { objUid, name });
+                    tsLogger.i18NLogger.info_objectstore_ShadowingStore_15(objUid, name);
             }
         }
         else
         {
             removeOk = false;
 
-            if (tsLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                tsLogger.arjLoggerI18N
-                        .warn(
-                                "com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_17",
-                                new Object[]
-                                { objUid });
+            if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_objectstore_ShadowingStore_17(objUid);
             }
         }
 
@@ -760,13 +698,8 @@
 
             if (fd == null)
             {
-                if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    tsLogger.arjLoggerI18N
-                            .warn(
-                                    "com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_18",
-                                    new Object[]
-                                    { fname });
+                if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_objectstore_ShadowingStore_18(fname);
                 }
 
                 return false;
@@ -825,13 +758,8 @@
 
             if (!closeAndUnlock(fd, null, ofile))
             {
-                if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    tsLogger.arjLoggerI18N
-                            .warn(
-                                    "com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_19",
-                                    new Object[]
-                                    { fname });
+                if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_objectstore_ShadowingStore_19(fname);
                 }
             }
 
@@ -842,8 +770,7 @@
         else
             throw new ObjectStoreException(
                     "ShadowStore::write_state - "
-                            + tsLogger.arjLoggerI18N
-                                    .getString("com.arjuna.ats.internal.arjuna.objectstore.notypenameuid")
+                            + tsLogger.i18NLogger.get_objectstore_notypenameuid()
                             + objUid);
     }
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/jdbc/oracle_driver.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/jdbc/oracle_driver.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/jdbc/oracle_driver.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -125,8 +125,7 @@
                             else
                             {
                                 if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                                    tsLogger.arjLoggerI18N
-                                            .warn("com.arjuna.ats.internal.arjuna.objectstore.jdbc.oracle_1");
+                                    tsLogger.i18NLogger.warn_objectstore_jdbc_oracle_1();
                             }
 
                             return newImage;
@@ -274,13 +273,8 @@
                     {
                         if (count == MAX_RETRIES - 1)
                         {
-                            if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                            {
-                                tsLogger.arjLoggerI18N
-                                        .warn(
-                                                "com.arjuna.ats.internal.arjuna.objectstore.jdbc.oracle_2",
-                                                new Object[]
-                                                { e });
+                            if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                                tsLogger.i18NLogger.warn_objectstore_jdbc_oracle_2(e);
                             }
                             return false;
                         }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/AtomicActionRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/AtomicActionRecoveryModule.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/AtomicActionRecoveryModule.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -96,12 +96,10 @@
       }
       catch ( ObjectStoreException ex )
       {
-	  if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	  {
-	      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_1",
-					  new Object[]{ex});
-	  }
+	  if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+          tsLogger.i18NLogger.warn_recovery_AtomicActionRecoveryModule_1(ex);
       }
+      }
 
       if ( AtomicActions )
       {
@@ -164,8 +162,7 @@
          {
 	     if (tsLogger.arjLoggerI18N.isWarnEnabled())
 	     {
-		 tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_2",
-					     new Object[]{recoverUid.toString(), ex});
+             tsLogger.i18NLogger.warn_recovery_AtomicActionRecoveryModule_2(recoverUid, ex);
 	     }
          }
       }
@@ -269,8 +266,7 @@
          {
 	     if (tsLogger.arjLogger.isWarnEnabled())
 	     {
-		 tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_3",
-					     new Object[]{currentUid.toString(), ex});
+             tsLogger.i18NLogger.warn_recovery_AtomicActionRecoveryModule_3(currentUid, ex);
 	     }
          }
       }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Connection.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Connection.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Connection.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -67,8 +67,8 @@
       }
       catch (java.net.SocketException ex)
       {
-	  if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.Connection_2");
+          if (tsLogger.arjLoggerI18N.isWarnEnabled())
+              tsLogger.i18NLogger.warn_recovery_Connection_2();
       }
 
       _service = service;
@@ -94,8 +94,8 @@
       }
       catch ( IOException ex )
       {
-	  if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.Connection_1");
+          if (tsLogger.arjLoggerI18N.isWarnEnabled())
+              tsLogger.i18NLogger.warn_recovery_Connection_1();
       }
       finally
       {

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -150,8 +150,7 @@
     {
 	if (tsLogger.arjLoggerI18N.isInfoEnabled())
 	{
-	    tsLogger.arjLoggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_12",
-                new Object[] {_theTimestamper.format(new Date())});
+        tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_12(_theTimestamper.format(new Date()));
 	}
 	
 	if (_skipNext)
@@ -162,7 +161,7 @@
 
         if (tsLogger.arjLoggerI18N.isInfoEnabled())
         {
-            tsLogger.arjLoggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_5");
+            tsLogger.i18NLogger.info_recovery_ExpiredEntryMonitor_5();
         }
     }
     else
@@ -266,8 +265,8 @@
       
       if (className == null)
       {
-	  if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_7");
+          if (tsLogger.arjLoggerI18N.isWarnEnabled())
+              tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_7();
 	  
 	  return;
       }
@@ -294,38 +293,30 @@
 		}
 		catch (ClassCastException e)
 		{
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			{
-			    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_9", 
-							new Object[]{className});
-			}
+			if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_9(className);
+            }
 		}
 		catch (IllegalAccessException e1)
 		{
-		    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		    {
-			tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_6", 
-						    new Object[]{e1});
-		    }
+		    if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_6(e1);
+            }
 		}
 		catch (InstantiationException e2)
 		{
-		    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		    {
-			tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_6", 
-						    new Object[]{e2});
-		    }
+		    if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_6(e2);
+            }
 		}
 		
 		c = null;
 	  }
 	  catch (ClassNotFoundException e)
 	  {
-	      if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	      {
-		  tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_10", 
-					      new Object[]{className});
-	      }
+	      if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+              tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_10(className);
+          }
 	  }
       }
   }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionScanner.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionScanner.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionScanner.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -116,11 +116,7 @@
 							// log is present in this iteration, so move it
 							{
 								if (tsLogger.arjLoggerI18N.isInfoEnabled())
-									tsLogger.arjLoggerI18N
-											.info(
-													"com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionScanner_4",
-													new Object[]
-													{ newUid });
+                                    tsLogger.i18NLogger.info_recovery_ExpiredTransactionScanner_4(newUid);
 
 								try
 								{
@@ -128,11 +124,7 @@
 								}
 								catch (Exception ex)
 								{
-									tsLogger.arjLoggerI18N
-											.warn(
-													"com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionScanner_2",
-													new Object[]
-													{ newUid, ex });
+                                    tsLogger.i18NLogger.warn_recovery_ExpiredTransactionScanner_2(newUid, ex);
 
 									_scanN.put(newUid, newUid);
 								}
@@ -169,13 +161,9 @@
 	    {
 	        boolean moved = _objectStore.write_committed(newUid, _movedTypeName, new OutputObjectState(state));
 
-	        if (!moved)
-	        {
-	            tsLogger.arjLoggerI18N.warn(
-	                    "com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_3",
-	                    new Object[]
-	                               { newUid });
-	        }
+	        if (!moved) {
+                tsLogger.i18NLogger.info_recovery_ExpiredTransactionStatusManagerScanner_3(newUid);
+            }
 	        else
 	            res = _objectStore.remove_committed(newUid, _typeName);
 	    }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -113,7 +113,7 @@
                      {
 			 if (tsLogger.arjLoggerI18N.isInfoEnabled())
 			 {
-			     tsLogger.arjLoggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_3", new Object[]{newUid});
+                 tsLogger.i18NLogger.info_recovery_ExpiredTransactionStatusManagerScanner_3(newUid);
 			 }
 			 
 			 _objectStore.remove_committed( newUid, _itemTypeName ) ;
@@ -136,7 +136,7 @@
                         {
 			    if (tsLogger.arjLoggerI18N.isInfoEnabled())
 			    {
-				tsLogger.arjLoggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_3", new Object[]{newUid});
+                    tsLogger.i18NLogger.info_recovery_ExpiredTransactionStatusManagerScanner_3(newUid);
 			    }
 			    
                            tsc.delete() ;

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -144,17 +144,13 @@
                 _listener.setDaemon(true);
 
                 if (tsLogger.arjLoggerI18N.isInfoEnabled())
-                    tsLogger.arjLoggerI18N.info(
-                            "com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_13",
-                            new Object[] {
-                                    _socket.getInetAddress().getHostAddress(), _socket.getLocalPort()
-                            });
+                    tsLogger.i18NLogger.info_recovery_PeriodicRecovery_13(_socket.getInetAddress().getHostAddress(),
+                            Integer.toString(_socket.getLocalPort()));
             }
             catch (Exception ex)
             {
-                if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_9", new Object[]{ex});
+                if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_9(ex);
                 }
             }
         }
@@ -901,8 +897,8 @@
 
       if (className == null)
       {
-  	  if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_1");
+          if (tsLogger.arjLoggerI18N.isWarnEnabled())
+              tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_1();
 
          return;
       }
@@ -919,38 +915,30 @@
             }
             catch (ClassCastException e)
             {
-		if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		{
-		    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_2",
-						new Object[]{className});
-		}
+		if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_2(className);
+        }
             }
             catch (IllegalAccessException iae)
             {
-		if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		{
-		    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_3",
-						new Object[]{iae});
-		}
+		if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_3(iae);
+        }
             }
             catch (InstantiationException ie)
             {
-		if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		{
-		    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_4",
-						new Object[]{ie});
-		}
+		if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_4(ie);
+        }
             }
 
             c = null;
          }
          catch ( ClassNotFoundException cnfe )
          {
- 	     if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	     {
-		 tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_5",
-					     new Object[]{className});
-	     }
+ 	     if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+              tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_5(className);
+          }
          }
       }
    }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecActivatorLoader.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecActivatorLoader.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecActivatorLoader.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -66,7 +66,7 @@
   {
       if (tsLogger.arjLoggerI18N.isInfoEnabled())
 	  {
-	      tsLogger.arjLoggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_6");
+          tsLogger.i18NLogger.info_recovery_RecActivatorLoader_6();
 	  }
 
       Enumeration activators = _recoveryActivators.elements();
@@ -100,8 +100,8 @@
 
       if (className == null)
 	  {
-	      if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		  tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_1");
+          if (tsLogger.arjLoggerI18N.isWarnEnabled())
+              tsLogger.i18NLogger.warn_recovery_RecActivatorLoader_1();
 
 	      return;
 	  }
@@ -118,38 +118,30 @@
 			  }
 		      catch (ClassCastException e)
 			  {
-			      if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				  {
-				      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.RecActivatorLooader_2",
-								  new Object[]{className});
-				  }
+			      if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                      tsLogger.i18NLogger.warn_recovery_RecActivatorLoader_2(className);
+                  }
 			  }
 		      catch (IllegalAccessException iae)
 			  {
-			      if (tsLogger.arjLoggerI18N.isWarnEnabled())
-				  {
-				      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_3",
-								  new Object[]{iae});
-				  }
+			      if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                      tsLogger.i18NLogger.warn_recovery_RecActivatorLoader_3(iae);
+                  }
 			    }
 		      catch (InstantiationException ie)
             {
-		if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		    {
-			tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_4",
-						    new Object[]{ie});
-		    }
+		if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_recovery_RecActivatorLoader_4(ie);
+        }
             }
 
 		      c = null;
 		  }
 	      catch ( ClassNotFoundException cnfe )
 		  {
-		      if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			  {
-			      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_5",
-							  new Object[]{className});
-			  }
+		      if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                  tsLogger.i18NLogger.warn_recovery_RecActivatorLoader_5(className);
+              }
 		  }
       }
   }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecoveryManagerImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecoveryManagerImple.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecoveryManagerImple.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -100,21 +100,12 @@
             {
                 try
                 {
-                    tsLogger.arjLoggerI18N.fatal(
-                            "com.arjuna.ats.internal.arjuna.recovery.fail",
-                            new Object[] {
-                                    RecoveryManager.getRecoveryManagerHost(), RecoveryManager.getRecoveryManagerPort()
-                            }
-                    );
+                    tsLogger.i18NLogger.fatal_recovery_fail(RecoveryManager.getRecoveryManagerHost().getHostAddress(),
+                            Integer.toString(RecoveryManager.getRecoveryManagerPort()));
                 }
                 catch (Throwable t)
                 {
-                    tsLogger.arjLoggerI18N.fatal(
-                            "com.arjuna.ats.internal.arjuna.recovery.fail",
-                            new Object[] {
-                                    "unknown", "unknown"
-                            }
-                    );
+                    tsLogger.i18NLogger.fatal_recovery_fail("unknown", "unknown");
                 }
             }
 
@@ -142,25 +133,18 @@
                         {
                                 if(useListener)
                 {
-                    tsLogger.arjLoggerI18N.info(
-                            "com.arjuna.ats.internal.arjuna.recovery.socketready",
-                            new Object[] { _periodicRecovery.getServerSocket().getLocalPort() });
+                    tsLogger.i18NLogger.info_recovery_socketready( Integer.toString(_periodicRecovery.getServerSocket().getLocalPort()));
                 }
                 else
                 {
-                    tsLogger.arjLoggerI18N.info(
-                            "com.arjuna.ats.internal.arjuna.recovery.localready");
+                    tsLogger.i18NLogger.info_recovery_localready();
                 }
             }
                 }
                 catch (IOException ex)
                 {
-                        if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                        {
-                                tsLogger.arjLoggerI18N
-                                                .warn(
-                                                                "com.arjuna.ats.internal.arjuna.recovery.RecoveryManagerImple_2",
-                                                                new Object[] { ex });
+                        if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                            tsLogger.i18NLogger.warn_recovery_RecoveryManagerImple_2(ex);
                         }
                 }
         }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusConnector.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusConnector.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusConnector.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -96,8 +96,8 @@
       }
       else
       {
-	  if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	      tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusConnector_1");
+          if (tsLogger.arjLoggerI18N.isWarnEnabled())
+              tsLogger.i18NLogger.warn_recovery_TransactionStatusConnector_1();
       }
    }
    
@@ -157,19 +157,17 @@
             }
             catch ( IOException ex )
             {
-		if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		{
-		    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusConnector_2");
-		}
+		if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_recovery_TransactionStatusConnector_2();
+        }
 		
 		_tsmFound = false ;
             }
             catch ( Exception other )
             {
-		if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		{
-		    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusConnector_3");
-		}
+		if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_recovery_TransactionStatusConnector_3();
+        }
 		
 		_tsmFound = false ;
             }
@@ -228,9 +226,7 @@
 		  
 		  if (tsLogger.arjLoggerI18N.isInfoEnabled())
 		  {
-		      tsLogger.arjLoggerI18N.info
-			  ( "com.arjuna.ats.internal.arjuna.recovery.TransactionStatusConnector_4", 
-			    new Object[]{_pid, serverHost, Integer.toString(serverPort), _connector_socket});
+              tsLogger.i18NLogger.info_recovery_TransactionStatusConnector_4(_pid, serverHost, Integer.toString(serverPort), _connector_socket.toString());
 		  }
                }
                else
@@ -256,7 +252,7 @@
 	       
        	       if (tsLogger.arjLoggerI18N.isInfoEnabled())
 	       {
-		   tsLogger.arjLoggerI18N.info( "com.arjuna.ats.internal.arjuna.recovery.TransactionStatusConnector_5", new Object[]{_pid});
+               tsLogger.i18NLogger.info_recovery_TransactionStatusConnector_5(_pid);
 	       }
 	       
             }
@@ -265,8 +261,7 @@
          {
 	     if (tsLogger.arjLoggerI18N.isInfoEnabled())
 	     {
-		 tsLogger.arjLoggerI18N.info
-		     ("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusConnector_6");
+             tsLogger.i18NLogger.info_recovery_TransactionStatusConnector_6();
 	     }
          }
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusManagerItem.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusManagerItem.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusManagerItem.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -178,11 +178,9 @@
 	  }
       catch ( ObjectStoreException ex )
 	  {
-	      if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	      {
-		  tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_1",
-					      new Object[]{ex});
-	      }
+	      if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+              tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_1(ex);
+          }
 	  }
       
       return ret_status ;
@@ -218,11 +216,9 @@
 	   {
 	       ret_status = false ;
 	       
-	       if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	       {
-		   tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_2",
-					       new Object[]{ex});
-	       }
+	       if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+               tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_2(ex);
+           }
 	   }
        
        return ret_status ;
@@ -251,11 +247,9 @@
 	}
 	catch ( IOException ex )
 	    {
-		if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		{
-		    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_3",
-						new Object[]{ex});
-		}
+		if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_3(ex);
+        }
 	    }
 	
 	return ret_status ;
@@ -284,11 +278,9 @@
 	    }
 	catch ( IOException ex )
 	    {
-		if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		{
-		    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_2",
-						new Object[]{ex});
-	  }
+		if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_2(ex);
+        }
 	    }
 	
 	return ret_status ;
@@ -315,11 +307,9 @@
 	    }
 	catch ( ObjectStoreException ex )
 	    {
-		if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		{
-		    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_2",
-						new Object[]{ex});
-		}
+		if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_2(ex);
+        }
 	    }
 	
 	return ret_status ;
@@ -340,16 +330,14 @@
          
 	    if (tsLogger.arjLoggerI18N.isInfoEnabled())
 	    {
-            tsLogger.arjLoggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5", new Object[] {_host, _port});
+            tsLogger.i18NLogger.info_recovery_TransactionStatusManagerItem_5(_host, Integer.toString(_port));
 	    }
 	}
 	catch ( UnknownHostException ex )
 	{
-	    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	    {
-		tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_4",
-					    new Object[]{ex});
-	    }
+	    if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_4(ex);
+        }
 	}
     }
 
@@ -365,20 +353,18 @@
         try
         {
             // make sure the passed in host is valid
-            Utility.hostNameToInetAddress(host, "com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_4");
+            Utility.hostNameToInetAddress(host);
             _host = host;
 
             if (tsLogger.arjLoggerI18N.isInfoEnabled())
             {
-                tsLogger.arjLoggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5", new Object[] {_host, _port});
+                tsLogger.i18NLogger.info_recovery_TransactionStatusManagerItem_5(_host, Integer.toString(_port));
             }
         }
         catch ( UnknownHostException ex )
         {
-            if (tsLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_4",
-                        new Object[]{ex});
+            if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_4(ex);
             }
         }
     }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/WorkerService.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/WorkerService.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/WorkerService.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -81,7 +81,7 @@
             // now we only need to hold one lock
 		_periodicRecovery.wakeUp();
 
-		tsLogger.arjLoggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.WorkerService_3");
+            tsLogger.i18NLogger.info_recovery_WorkerService_3();
 
 		if (request.equals(RecoveryDriver.SCAN))
 		{
@@ -96,7 +96,7 @@
 		    }
 		    catch (Exception ex)
 		    {
-    			tsLogger.arjLoggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.WorkerService_4");
+                tsLogger.i18NLogger.info_recovery_WorkerService_4();
 		    }
                 }
             }
@@ -110,15 +110,14 @@
 	}
 	catch (IOException ex)
 	{
-	    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-		tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.WorkerService_2");
+        if (tsLogger.arjLoggerI18N.isWarnEnabled())
+            tsLogger.i18NLogger.warn_recovery_WorkerService_2();
 	}
 	catch ( Exception ex )
 	{
-	    if (tsLogger.arjLoggerI18N.isWarnEnabled())
-	    {
-		tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.recovery.WorkerService_1", new Object[]{ex});
-	    }
+	    if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+            tsLogger.i18NLogger.warn_recovery_WorkerService_1(ex);
+        }
 	}
     }
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/tools/log/EditableAtomicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/tools/log/EditableAtomicAction.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/tools/log/EditableAtomicAction.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -46,8 +46,7 @@
         {
             if (tsLogger.arjLoggerI18N.isWarnEnabled())
             {
-                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.tools.log.eaa1", new Object[]
-                    { u, type() });
+                tsLogger.i18NLogger.warn_tools_log_eaa1(u, type());
             }
         }
     }
@@ -104,9 +103,8 @@
             }
             else
             {
-                if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                        tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.tools.log.eaa2");
+                if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                    tsLogger.i18NLogger.warn_tools_log_eaa2();
                 }
             }
         }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ExecProcessId.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ExecProcessId.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ExecProcessId.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -111,8 +111,7 @@
                     catch (final Exception ex)
                     {
                         throw new FatalError(
-                                tsLogger.arjLoggerI18N
-                                        .getString("com.arjuna.ats.internal.arjuna.utils.ExecProcessId_2")+" "+ex, ex);
+                                tsLogger.i18NLogger.get_utils_ExecProcessId_2() + " "+ex, ex);
                     }
                 }
 
@@ -127,8 +126,7 @@
                     catch (final IOException ex)
                     {
                         throw new FatalError(
-                                tsLogger.arjLoggerI18N
-                                        .getString("com.arjuna.ats.internal.arjuna.utils.ExecProcessId_3")+" "+ex, ex);
+                                tsLogger.i18NLogger.get_utils_ExecProcessId_3() + " "+ex, ex);
                     }
 
                     ByteArrayOutputStream bstream = new ByteArrayOutputStream();
@@ -143,8 +141,7 @@
                     catch (final Exception ex)
                     {
                         throw new FatalError(
-                                tsLogger.arjLoggerI18N
-                                        .getString("com.arjuna.ats.internal.arjuna.utils.ExecProcessId_4")+" "+ex, ex);
+                                tsLogger.i18NLogger.get_utils_ExecProcessId_4() + " "+ex, ex);
                     }
                     finally
                     {
@@ -154,10 +151,8 @@
                         }
                         catch (final Exception ex)
                         {
-                            if (tsLogger.arjLoggerI18N.isWarnEnabled())
-                            {
-                                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.utils.ExecProcessId_5", new Object[]
-                                    { ex });
+                            if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+                                tsLogger.i18NLogger.warn_utils_ExecProcessId_5(ex);
                             }
                         }
                     }
@@ -184,8 +179,7 @@
 
         if (_pid == -1)
             throw new FatalError(
-                    tsLogger.arjLoggerI18N
-                            .getString("com.arjuna.ats.internal.arjuna.utils.ExecProcessId_1"));
+                    tsLogger.i18NLogger.get_utils_ExecProcessId_1());
 
         return _pid;
     }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/FileProcessId.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/FileProcessId.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/FileProcessId.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -92,7 +92,7 @@
 		    File tmpDir = new File(dir);
 
 		    if (tmpDir.isDirectory() == false && tmpDir.mkdirs() == false)
-			throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.utils.FilePocessId_1"));
+			throw new FatalError(tsLogger.i18NLogger.get_utils_FileProcessId_1());
 
 		    for (int i = 0; i < retry; i++)
 		    {
@@ -117,7 +117,7 @@
 		    }
 
 		    if (processId == 0)
-			throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.utils.FilePocessId_2"));
+			throw new FatalError(tsLogger.i18NLogger.get_utils_FileProcessId_2());
 		}
 	    }
 	}

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/MBeanProcessId.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/MBeanProcessId.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/MBeanProcessId.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -73,13 +73,13 @@
                 }
                 catch (final Exception ex)
                 {
-                    throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.utils.MBeanProcessId_2")+" "+name, ex);
+                    throw new FatalError(tsLogger.i18NLogger.get_utils_MBeanProcessId_2() + " "+name, ex);
                 }
             }
         }
 
         if (_pid == -1)
-            throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.utils.MBeanProcessId_1"));
+            throw new FatalError(tsLogger.i18NLogger.get_utils_MBeanProcessId_1());
 
         return _pid;
     }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ManualProcessId.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ManualProcessId.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ManualProcessId.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -108,7 +108,7 @@
         }
 
         if (_pid == -1)
-            throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.utils.ManualProcessId_1"));
+            throw new FatalError(tsLogger.i18NLogger.get_utils_ManualProcessId_1());
 
         return _pid;
     }

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/SocketProcessId.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/SocketProcessId.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/SocketProcessId.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -82,7 +82,7 @@
         _thePort = ((_theSocket == null) ? -1 : _theSocket.getLocalPort());
 
         if (_thePort == -1) {
-            throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.utils.SocketProcessId_2"));
+            throw new FatalError(tsLogger.i18NLogger.get_utils_SocketProcessId_2());
         }
     }
 

Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -112,7 +112,7 @@
         }
         catch (final Throwable ex)
         {
-            throw new FatalError(tsLogger.arjLoggerI18N
+            throw new FatalError(txojLogger.aitLoggerI18N
                     .getString("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_osproblem"), ex);
         }
     }

Modified: labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/rootprovider/InFlightTransactionPseudoStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/rootprovider/InFlightTransactionPseudoStore.java	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/rootprovider/InFlightTransactionPseudoStore.java	2010-06-21 15:06:39 UTC (rev 33571)
@@ -114,7 +114,7 @@
         }
         catch (IOException e)
         {
-            throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.packProblem"), e);
+            throw new ObjectStoreException(tsLogger.i18NLogger.get_objectstore_packProblem(), e);
         }
     }
 

Modified: labs/jbosstm/trunk/common/build.xml
===================================================================
--- labs/jbosstm/trunk/common/build.xml	2010-06-21 14:29:05 UTC (rev 33570)
+++ labs/jbosstm/trunk/common/build.xml	2010-06-21 15:06:39 UTC (rev 33571)
@@ -22,7 +22,7 @@
 
     <property name="modulename" value="common"/>
 
-    <property name="global.ext.libs" value="commons-logging.jar log4j.jar"/>
+    <property name="global.ext.libs" value="commons-logging.jar log4j.jar jboss-logging.jar"/>
 
     <import file="../sharedbuild.xml"/>
 
@@ -52,7 +52,10 @@
 
         <run.tests.macro>
             <tests>
-                <fileset dir="tests" includes="**/*.java" excludes="**/Dummy*.java"/>
+                <fileset dir="tests" includes="**/*.java">
+                    <exclude name="**/Dummy*.java"/>
+                    <exclude name="**/MyLogger.java"/>
+                </fileset>
             </tests>
         </run.tests.macro>
 



More information about the jboss-svn-commits mailing list