[jboss-svn-commits] JBL Code SVN: r33682 - in labs/jbosstm/trunk/XTS: WS-C/dev/src/com/arjuna/webservices and 27 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Jun 29 05:40:25 EDT 2010


Author: jhalliday
Date: 2010-06-29 05:40:24 -0400 (Tue, 29 Jun 2010)
New Revision: 33682

Added:
   labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/wscI18NLoggerImpl.java
   labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasI18NLoggerImpl.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/xtsrecoveryI18NLoggerImpl.java
Modified:
   labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/services/framework/task/TaskWorker.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/SoapFaultType.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/WSCLogger.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/wscI18NLogger.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/BaseXMLStreamWriter.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/DOMXMLStreamReader.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/SAAJXMLStreamReader.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/SAAJXMLStreamWriter.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/base/handlers/LoggingFaultHandler.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/Soap11Details.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/Soap12Details.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/SoapNotUnderstoodType.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/SoapParser.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/stax/ParsingSupport.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/stax/TextElement.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/transport/http/HttpClient.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/util/StreamHelper.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr/AddressingContext.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr/AttributedQNameType.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr/EndpointReferenceType.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/AddressingContext.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/AttributedAnyType.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/AttributedQNameType.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/EndpointReferenceType.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/ProblemActionType.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/client/WSAddr2005Client.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/handlers/AddressingInterceptorHandler.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsarj/ArjunaContext.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsarj/InstanceIdentifier.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/AttributedUnsignedIntType.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/CoordinationContextType.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/CreateCoordinationContextResponseType.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/CreateCoordinationContextType.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/RegisterResponseType.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/RegisterType.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/ActivationCoordinator.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/RegistrationCoordinator.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/messaging/ActivationCoordinatorProcessorImpl.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/messaging/RegistrationCoordinatorProcessorImpl.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/util/StreamHelper.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java
   labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/context/ContextManager.java
   labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasI18NLogger.java
   labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasLogger.java
   labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/utils/Configuration.java
   labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/UserActivityImple.java
   labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ActivityImple.java
   labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ActivityReaper.java
   labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/HLSManager.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/XTSLogger.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/xtsrecoveryI18NLogger.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/ATCoordinatorRecoveryModule.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoveryATCoordinator.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoverySubordinateATCoordinator.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/SubordinateATCoordinatorRecoveryModule.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/BACoordinatorRecoveryModule.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/RecoveryBACoordinator.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/RecoverySubordinateBACoordinator.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/SubordinateBACoordinatorRecoveryModule.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/ATParticipantRecoveryModule.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManagerImple.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/ba/BAParticipantRecoveryModule.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/ba/XTSBARecoveryManagerImple.java
Log:
Replace CLF with jboss-logging for i18n messages in XTS modules recovery, wsas and wsc. JBTM-750


Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/services/framework/task/TaskWorker.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/services/framework/task/TaskWorker.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/services/framework/task/TaskWorker.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -66,7 +66,7 @@
             }
             catch (final Throwable th)
             {
-                WSCLogger.arjLoggerI18N.error("com.arjuna.services.framework.task.TaskWorker.run_1", th) ;
+                WSCLogger.i18NLogger.error_services_framework_task_TaskWorker_run_1(th);
             }
         }
     }

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/SoapFaultType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/SoapFaultType.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/SoapFaultType.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -110,9 +110,7 @@
         final Object state = ENUM_MAP.get(value) ;
         if (state == null)
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.SoapFaultType_1") ;
-            final String message = MessageFormat.format(pattern, new Object[] {value}) ;
-            throw new InvalidEnumerationException(message) ;
+            throw new InvalidEnumerationException(WSCLogger.i18NLogger.get_webservices_SoapFaultType_1(value)) ;
         }
         return (SoapFaultType)state ;
     }

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/WSCLogger.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/WSCLogger.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/WSCLogger.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -52,13 +52,14 @@
     /**
      * The I18N logger.
      */
-    public static Logi18n        arjLoggerI18N;
+    //public static Logi18n        arjLoggerI18N;
 
     public static void initialize(LogNoi18n noi18n, Logi18n i18n)
     {
         arjLogger = noi18n;
-        arjLoggerI18N = i18n;
+        //arjLoggerI18N = i18n;
         logger = Logger.getLogger("com.arjuna.wsc");
+        i18NLogger = new wscI18NLoggerImpl(Logger.getLogger("com.arjuna.wsc"));
     }
 
     static

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/wscI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/wscI18NLogger.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/wscI18NLogger.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -21,6 +21,9 @@
 package com.arjuna.webservices.logging;
 
 import org.jboss.logging.*;
+
+import javax.xml.namespace.QName;
+
 import static org.jboss.logging.Logger.Level.*;
 import static org.jboss.logging.Message.Format.*;
 
@@ -40,340 +43,263 @@
      */
 
 	@Message(id = 42001, value = "Unhandled error executing task", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_services_framework_task_TaskWorker_run_1();
+	@LogMessage(level = ERROR)
+	public void error_services_framework_task_TaskWorker_run_1(Throwable arg0);
 
 	@Message(id = 42002, value = "Invalid fault type enumeration: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_SoapFaultType_1(String arg0);
+	public String get_webservices_SoapFaultType_1(String arg0);
 
 	@Message(id = 42003, value = "setNamespaceContext unsupported", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_BaseXMLStreamWriter_1();
+	public String get_webservices_adapters_BaseXMLStreamWriter_1();
 
 	@Message(id = 42004, value = "writeEndDocument unsupported", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_BaseXMLStreamWriter_10();
+	public String get_webservices_adapters_BaseXMLStreamWriter_10();
 
 	@Message(id = 42005, value = "close unsupported", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_BaseXMLStreamWriter_11();
+	public String get_webservices_adapters_BaseXMLStreamWriter_11();
 
 	@Message(id = 42006, value = "writeComment unsupported", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_BaseXMLStreamWriter_2();
+	public String get_webservices_adapters_BaseXMLStreamWriter_2();
 
 	@Message(id = 42007, value = "writeProcessingInstruction unsupported", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_BaseXMLStreamWriter_3();
+	public String get_webservices_adapters_BaseXMLStreamWriter_3();
 
 	@Message(id = 42008, value = "writeProcessingInstruction unsupported", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_BaseXMLStreamWriter_4();
+	public String get_webservices_adapters_BaseXMLStreamWriter_4();
 
 	@Message(id = 42009, value = "writeEntityRef unsupported", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_BaseXMLStreamWriter_5();
+	public String get_webservices_adapters_BaseXMLStreamWriter_5();
 
 	@Message(id = 42010, value = "writeDTD unsupported", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_BaseXMLStreamWriter_6();
+	public String get_webservices_adapters_BaseXMLStreamWriter_6();
 
 	@Message(id = 42011, value = "writeStartDocument unsupported", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_BaseXMLStreamWriter_7();
+	public String get_webservices_adapters_BaseXMLStreamWriter_7();
 
 	@Message(id = 42012, value = "writeStartDocument unsupported", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_BaseXMLStreamWriter_8();
+	public String get_webservices_adapters_BaseXMLStreamWriter_8();
 
 	@Message(id = 42013, value = "writeStartDocument unsupported", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_BaseXMLStreamWriter_9();
+	public String get_webservices_adapters_BaseXMLStreamWriter_9();
 
 	@Message(id = 42014, value = "End of stream", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_DOMXMLStreamReader_1();
+	public String get_webservices_adapters_DOMXMLStreamReader_1();
 
 	@Message(id = 42015, value = "Unexpected child node: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_DOMXMLStreamReader_2(String arg0);
+	public String get_webservices_adapters_DOMXMLStreamReader_2(String arg0);
 
-	@Message(id = 42016, value = "Unexpected type: [0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_DOMXMLStreamReader_3();
+	@Message(id = 42016, value = "Unexpected type: {0}", format = MESSAGE_FORMAT)
+	public String get_webservices_adapters_DOMXMLStreamReader_3(String arg0);
 
 	@Message(id = 42017, value = "Unexpected type: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_DOMXMLStreamReader_4(String arg0);
+	public String get_webservices_adapters_DOMXMLStreamReader_4(String arg0);
 
 	@Message(id = 42018, value = "Unexpected event type", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_DOMXMLStreamReader_5();
+	public String get_webservices_adapters_DOMXMLStreamReader_5();
 
 	@Message(id = 42019, value = "Unsupported operation", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_DOMXMLStreamReader_6();
+	public String get_webservices_adapters_DOMXMLStreamReader_6();
 
 	@Message(id = 42020, value = "Unsupported operation", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_DOMXMLStreamReader_7();
+	public String get_webservices_adapters_DOMXMLStreamReader_7();
 
 	@Message(id = 42021, value = "CData sections not currently supported.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_adapters_SAAJXMLStreamWriter_1();
+	public String get_webservices_adapters_SAAJXMLStreamWriter_1();
 
 	@Message(id = 42022, value = "Service {0} received unexpected fault: {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
 	public void warn_webservices_base_handlers_LoggingFaultHandler_1(String arg0, String arg1);
 
 	@Message(id = 42023, value = "Unexpected start element: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_soap_Soap11Details_1(String arg0);
+	public String get_webservices_soap_Soap11Details_1(QName arg0);
 
 	@Message(id = 42024, value = "Unexpected start element: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_soap_Soap12Details_1(String arg0);
+	public String get_webservices_soap_Soap12Details_1(QName arg0);
 
 	@Message(id = 42025, value = "NotUnderstood elements cannot have embedded elements.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_soap_SoapNotUnderstoodType_1();
+	public String get_webservices_soap_SoapNotUnderstoodType_1();
 
 	@Message(id = 42026, value = "Unexpected element: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_soap_SoapParser_1(String arg0);
+	public String get_webservices_soap_SoapParser_1(QName arg0);
 
 	@Message(id = 42027, value = "Unexpected body element: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_soap_SoapParser_2(String arg0);
+	public String get_webservices_soap_SoapParser_2(QName arg0);
 
 	@Message(id = 42028, value = "Did not understand header: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_soap_SoapParser_3(String arg0);
+	public String get_webservices_soap_SoapParser_3(QName arg0);
 
 	@Message(id = 42029, value = "Encountered unexpected event type: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_stax_ParsingSupport_1(String arg0);
+	public String get_webservices_stax_ParsingSupport_1(String arg0);
 
 	@Message(id = 42030, value = "Text elements cannot have embedded elements.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_stax_TextElement_1();
+	public String get_webservices_stax_TextElement_1();
 
 	@Message(id = 42031, value = "No response from RPC request", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_transport_http_HttpClient_1();
+	public String get_webservices_transport_http_HttpClient_1();
 
 	@Message(id = 42032, value = "Invalid destination URL", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_transport_http_HttpClient_2();
+	public String get_webservices_transport_http_HttpClient_2();
 
 	@Message(id = 42033, value = "Unsupported URL type, not HTTP or HTTPS", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_transport_http_HttpClient_3();
+	public String get_webservices_transport_http_HttpClient_3();
 
 	@Message(id = 42034, value = "Invalid response code returned: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_transport_http_HttpClient_4(String arg0);
+	public String get_webservices_transport_http_HttpClient_4(String arg0);
 
 	@Message(id = 42035, value = "Unexpected end element: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_util_StreamHelper_1(String arg0);
+	public String get_webservices_util_StreamHelper_1(QName arg0);
 
 	@Message(id = 42036, value = "Unexpected end of document reached", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_util_StreamHelper_2();
+	public String get_webservices_util_StreamHelper_2();
 
 	@Message(id = 42037, value = "Unexpected start element: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_util_StreamHelper_3(String arg0);
+	public String get_webservices_util_StreamHelper_3(QName arg0);
 
 	@Message(id = 42038, value = "Addressing context is not valid", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr_AddressingContext_1();
+	public String get_webservices_wsaddr_AddressingContext_1();
 
 	@Message(id = 42039, value = "Unexpected element name: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr_AddressingContext_2(String arg0);
+	public String get_webservices_wsaddr_AddressingContext_2(QName arg0);
 
 	@Message(id = 42040, value = "Invalid QName value for attributed QName", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr_AttributedQNameType_1();
+	public String get_webservices_wsaddr_AttributedQNameType_1();
 
 	@Message(id = 42041, value = "Unexpected element name: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr_EndpointReferenceType_1(String arg0);
+	public String get_webservices_wsaddr_EndpointReferenceType_1(QName arg0);
 
-	@Message(id = 42042, value = "Addressing context is not valid", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr2005_AddressingContext_1();
+//	@Message(id = 42042, value = "Addressing context is not valid", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_webservices_wsaddr2005_AddressingContext_1();
 
 	@Message(id = 42043, value = "Unexpected element name: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr2005_AddressingContext_2(String arg0);
+	public String get_webservices_wsaddr2005_AddressingContext_2(QName arg0);
 
 	@Message(id = 42044, value = "Unexpected second element name: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr2005_AttributedAnyType_1(String arg0);
+	public String get_webservices_wsaddr2005_AttributedAnyType_1(QName arg0);
 
 	@Message(id = 42045, value = "Invalid QName value for attributed QName", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr2005_AttributedQNameType_1();
+	public String get_webservices_wsaddr2005_AttributedQNameType_1();
 
 	@Message(id = 42046, value = "Unexpected element name: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr2005_EndpointReferenceType_1(String arg0);
+	public String get_webservices_wsaddr2005_EndpointReferenceType_1(QName arg0);
 
 	@Message(id = 42047, value = "Unexpected element name: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr2005_ProblemActionType_1(String arg0);
+	public String get_webservices_wsaddr2005_ProblemActionType_1(QName arg0);
 
 	@Message(id = 42048, value = "Addressing context does not specify destination.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr2005_client_WSAddr2005Client_1();
+	public String get_webservices_wsaddr2005_client_WSAddr2005Client_1();
 
 	@Message(id = 42049, value = "Invalid destination specified in addressing context.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr2005_client_WSAddr2005Client_2();
+	public String get_webservices_wsaddr2005_client_WSAddr2005Client_2();
 
 	@Message(id = 42050, value = "No SOAP client registered for scheme: {0}.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr2005_client_WSAddr2005Client_3(String arg0);
+	public String get_webservices_wsaddr2005_client_WSAddr2005Client_3(String arg0);
 
 	@Message(id = 42051, value = "Invalid replyTo specified in addressing context.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr2005_client_WSAddr2005Client_4();
+	public String get_webservices_wsaddr2005_client_WSAddr2005Client_4();
 
 	@Message(id = 42052, value = "Unexpected SOAP message type returned.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr2005_client_WSAddr2005Client_5();
+	public String get_webservices_wsaddr2005_client_WSAddr2005Client_5();
 
-	@Message(id = 42053, value = "Unhandled SOAP fault during asynchronous execution of service.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsaddr2005_handlers_AddressingInterceptorHandler_3();
+	@Message(id = 42053, value = "Unhandled SOAP fault {0} during asynchronous execution of service.", format = MESSAGE_FORMAT)
+	@LogMessage(level = ERROR)
+	public void error_webservices_wsaddr2005_handlers_AddressingInterceptorHandler_3(String arg0);
 
 	@Message(id = 42054, value = "Arjuna context is not valid", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsarj_ArjunaContext_1();
+	public String get_webservices_wsarj_ArjunaContext_1();
 
 	@Message(id = 42055, value = "Unexpected element name: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsarj_ArjunaContext_2(String arg0);
+	public String get_webservices_wsarj_ArjunaContext_2(QName arg0);
 
 	@Message(id = 42056, value = "InstanceIdentifier elements cannot have embedded elements.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wsarj_InstanceIdentifier_1();
+	public String get_webservices_wsarj_InstanceIdentifier_1();
 
 	@Message(id = 42057, value = "non numerical value: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wscoor_AttributedUnsignedIntType_1(String arg0);
+	public String get_webservices_wscoor_AttributedUnsignedIntType_1(String arg0);
 
 	@Message(id = 42058, value = "Coordination Context is not valid", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wscoor_CoordinationContextType_1();
+	public String get_webservices_wscoor_CoordinationContextType_1();
 
 	@Message(id = 42059, value = "Unexpected element name: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wscoor_CoordinationContextType_2(String arg0);
+	public String get_webservices_wscoor_CoordinationContextType_2(QName arg0);
 
 	@Message(id = 42060, value = "Create Coordination Context Response is not valid", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wscoor_CreateCoordinationContextResponseType_1();
+	public String get_webservices_wscoor_CreateCoordinationContextResponseType_1();
 
 	@Message(id = 42061, value = "Unexpected element name: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wscoor_CreateCoordinationContextResponseType_2(String arg0);
+	public String get_webservices_wscoor_CreateCoordinationContextResponseType_2(QName arg0);
 
 	@Message(id = 42062, value = "Create Coordination Context is not valid", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wscoor_CreateCoordinationContextType_1();
+	public String get_webservices_wscoor_CreateCoordinationContextType_1();
 
 	@Message(id = 42063, value = "Unexpected element name: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wscoor_CreateCoordinationContextType_2(String arg0);
+	public String get_webservices_wscoor_CreateCoordinationContextType_2(QName arg0);
 
 	@Message(id = 42064, value = "Register is not valid", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wscoor_RegisterResponseType_1();
+	public String get_webservices_wscoor_RegisterResponseType_1();
 
 	@Message(id = 42065, value = "Unexpected element name: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wscoor_RegisterResponseType_2(String arg0);
+	public String get_webservices_wscoor_RegisterResponseType_2(QName arg0);
 
 	@Message(id = 42066, value = "Register is not valid", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wscoor_RegisterType_1();
+	public String get_webservices_wscoor_RegisterType_1();
 
 	@Message(id = 42067, value = "Unexpected element name: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices_wscoor_RegisterType_2(String arg0);
+	public String get_webservices_wscoor_RegisterType_2(QName arg0);
 
-	@Message(id = 42068, value = "Unexpected end element: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices11_util_StreamHelper_1(String arg0);
+//	@Message(id = 42068, value = "Unexpected end element: {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_webservices11_util_StreamHelper_1(String arg0);
 
-	@Message(id = 42069, value = "Unexpected end of document reached", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices11_util_StreamHelper_2();
+//	@Message(id = 42069, value = "Unexpected end of document reached", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_webservices11_util_StreamHelper_2();
 
-	@Message(id = 42070, value = "Unexpected start element: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_webservices11_util_StreamHelper_3(String arg0);
+//	@Message(id = 42070, value = "Unexpected start element: {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_webservices11_util_StreamHelper_3(String arg0);
 
 	@Message(id = 42071, value = "Callback execution failed", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_ActivationCoordinator_1();
+	public String get_ActivationCoordinator_1();
 
 	@Message(id = 42072, value = "Callback wasn't triggered", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_ActivationCoordinator_2();
+	public String get_ActivationCoordinator_2();
 
 	@Message(id = 42073, value = "Callback execution failed", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_RegistrationCoordinator_1();
+	public String get_RegistrationCoordinator_1();
 
 	@Message(id = 42074, value = "Callback wasn't triggered", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_RegistrationCoordinator_2();
+	public String get_RegistrationCoordinator_2();
 
 	@Message(id = 42075, value = "Invalid create coordination context parameters", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_messaging_ActivationCoordinatorProcessorImpl_1();
+	public String get_messaging_ActivationCoordinatorProcessorImpl_1();
 
 	@Message(id = 42076, value = "Participant already registered", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_messaging_RegistrationCoordinatorProcessorImpl_1();
+	public String get_messaging_RegistrationCoordinatorProcessorImpl_1();
 
 	@Message(id = 42077, value = "Invalid protocol identifier", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_messaging_RegistrationCoordinatorProcessorImpl_2();
+	public String get_messaging_RegistrationCoordinatorProcessorImpl_2();
 
 	@Message(id = 42078, value = "Invalid coordination context state", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_messaging_RegistrationCoordinatorProcessorImpl_3();
+	public String get_messaging_RegistrationCoordinatorProcessorImpl_3();
 
 	@Message(id = 42079, value = "Unknown activity identifier", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_messaging_RegistrationCoordinatorProcessorImpl_4();
+	public String get_messaging_RegistrationCoordinatorProcessorImpl_4();
 
 	@Message(id = 42080, value = "Invalid create coordination context parameters", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_wsc11_messaging_ActivationCoordinatorProcessorImpl_1();
+	public String get_wsc11_messaging_ActivationCoordinatorProcessorImpl_1();
 
 	@Message(id = 42081, value = "Participant already registered", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_wsc11_messaging_RegistrationCoordinatorProcessorImpl_1();
+	public String get_wsc11_messaging_RegistrationCoordinatorProcessorImpl_1();
 
 	@Message(id = 42082, value = "Invalid protocol identifier", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_wsc11_messaging_RegistrationCoordinatorProcessorImpl_2();
+	public String get_wsc11_messaging_RegistrationCoordinatorProcessorImpl_2();
 
 	@Message(id = 42083, value = "Invalid coordination context state", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_wsc11_messaging_RegistrationCoordinatorProcessorImpl_3();
+	public String get_wsc11_messaging_RegistrationCoordinatorProcessorImpl_3();
 
 	@Message(id = 42084, value = "Unknown activity identifier", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_wsc11_messaging_RegistrationCoordinatorProcessorImpl_4();
+	public String get_wsc11_messaging_RegistrationCoordinatorProcessorImpl_4();
 
     /*
         Allocate new messages directly above this notice.

Added: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/wscI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/wscI18NLoggerImpl.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/wscI18NLoggerImpl.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -0,0 +1,362 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates,
+ * and individual contributors as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2010,
+ * @author JBoss, by Red Hat.
+ */
+package com.arjuna.webservices.logging;
+
+import org.jboss.logging.Logger;
+import static org.jboss.logging.Logger.Level.*;
+import java.text.MessageFormat;
+
+import javax.xml.namespace.QName;
+
+/**
+ * i18n log messages for the wsc module.
+ * This class is autogenerated. Don't mess with it.
+ *
+ * @author Jonathan Halliday (jonathan.halliday at redhat.com) 2010-06
+ */
+public class wscI18NLoggerImpl implements wscI18NLogger {
+
+	private final Logger logger;
+
+	wscI18NLoggerImpl(Logger logger) {
+		this.logger = logger;
+	}
+
+	public void error_services_framework_task_TaskWorker_run_1(Throwable arg0) {
+		logger.logv(ERROR, arg0, "ARJUNA-42001 Unhandled error executing task", (Object)null);
+	}
+
+	public String get_webservices_SoapFaultType_1(String arg0) {
+		return MessageFormat.format("ARJUNA-42002 Invalid fault type enumeration: {0}", arg0);
+	}
+
+	public String get_webservices_adapters_BaseXMLStreamWriter_1() {
+		return "ARJUNA-42003 setNamespaceContext unsupported";
+	}
+
+	public String get_webservices_adapters_BaseXMLStreamWriter_10() {
+		return "ARJUNA-42004 writeEndDocument unsupported";
+	}
+
+	public String get_webservices_adapters_BaseXMLStreamWriter_11() {
+		return "ARJUNA-42005 close unsupported";
+	}
+
+	public String get_webservices_adapters_BaseXMLStreamWriter_2() {
+		return "ARJUNA-42006 writeComment unsupported";
+	}
+
+	public String get_webservices_adapters_BaseXMLStreamWriter_3() {
+		return "ARJUNA-42007 writeProcessingInstruction unsupported";
+	}
+
+	public String get_webservices_adapters_BaseXMLStreamWriter_4() {
+		return "ARJUNA-42008 writeProcessingInstruction unsupported";
+	}
+
+	public String get_webservices_adapters_BaseXMLStreamWriter_5() {
+		return "ARJUNA-42009 writeEntityRef unsupported";
+	}
+
+	public String get_webservices_adapters_BaseXMLStreamWriter_6() {
+		return "ARJUNA-42010 writeDTD unsupported";
+	}
+
+	public String get_webservices_adapters_BaseXMLStreamWriter_7() {
+		return "ARJUNA-42011 writeStartDocument unsupported";
+	}
+
+	public String get_webservices_adapters_BaseXMLStreamWriter_8() {
+		return "ARJUNA-42012 writeStartDocument unsupported";
+	}
+
+	public String get_webservices_adapters_BaseXMLStreamWriter_9() {
+		return "ARJUNA-42013 writeStartDocument unsupported";
+	}
+
+	public String get_webservices_adapters_DOMXMLStreamReader_1() {
+		return "ARJUNA-42014 End of stream";
+	}
+
+	public String get_webservices_adapters_DOMXMLStreamReader_2(String arg0) {
+		return MessageFormat.format("ARJUNA-42015 Unexpected child node: {0}", arg0);
+	}
+
+	public String get_webservices_adapters_DOMXMLStreamReader_3(String arg0) {
+		return MessageFormat.format("ARJUNA-42016 Unexpected type: {0}", arg0);
+	}
+
+	public String get_webservices_adapters_DOMXMLStreamReader_4(String arg0) {
+		return MessageFormat.format("ARJUNA-42017 Unexpected type: {0}", arg0);
+	}
+
+	public String get_webservices_adapters_DOMXMLStreamReader_5() {
+		return "ARJUNA-42018 Unexpected event type";
+	}
+
+	public String get_webservices_adapters_DOMXMLStreamReader_6() {
+		return "ARJUNA-42019 Unsupported operation";
+	}
+
+	public String get_webservices_adapters_DOMXMLStreamReader_7() {
+		return "ARJUNA-42020 Unsupported operation";
+	}
+
+	public String get_webservices_adapters_SAAJXMLStreamWriter_1() {
+		return "ARJUNA-42021 CData sections not currently supported.";
+	}
+
+	public void warn_webservices_base_handlers_LoggingFaultHandler_1(String arg0, String arg1) {
+		logger.logv(WARN, "ARJUNA-42022 Service {0} received unexpected fault: {1}", arg0, arg1);
+	}
+
+	public String get_webservices_soap_Soap11Details_1(QName arg0) {
+		return MessageFormat.format("ARJUNA-42023 Unexpected start element: {0}", arg0);
+	}
+
+	public String get_webservices_soap_Soap12Details_1(QName arg0) {
+		return MessageFormat.format("ARJUNA-42024 Unexpected start element: {0}", arg0);
+	}
+
+	public String get_webservices_soap_SoapNotUnderstoodType_1() {
+		return "ARJUNA-42025 NotUnderstood elements cannot have embedded elements.";
+	}
+
+	public String get_webservices_soap_SoapParser_1(QName arg0) {
+		return MessageFormat.format("ARJUNA-42026 Unexpected element: {0}", arg0);
+	}
+
+	public String get_webservices_soap_SoapParser_2(QName arg0) {
+		return MessageFormat.format("ARJUNA-42027 Unexpected body element: {0}", arg0);
+	}
+
+	public String get_webservices_soap_SoapParser_3(QName arg0) {
+		return MessageFormat.format("ARJUNA-42028 Did not understand header: {0}", arg0);
+	}
+
+	public String get_webservices_stax_ParsingSupport_1(String arg0) {
+		return MessageFormat.format("ARJUNA-42029 Encountered unexpected event type: {0}", arg0);
+	}
+
+	public String get_webservices_stax_TextElement_1() {
+		return "ARJUNA-42030 Text elements cannot have embedded elements.";
+	}
+
+	public String get_webservices_transport_http_HttpClient_1() {
+		return "ARJUNA-42031 No response from RPC request";
+	}
+
+	public String get_webservices_transport_http_HttpClient_2() {
+		return "ARJUNA-42032 Invalid destination URL";
+	}
+
+	public String get_webservices_transport_http_HttpClient_3() {
+		return "ARJUNA-42033 Unsupported URL type, not HTTP or HTTPS";
+	}
+
+	public String get_webservices_transport_http_HttpClient_4(String arg0) {
+		return MessageFormat.format("ARJUNA-42034 Invalid response code returned: {0}", arg0);
+	}
+
+	public String get_webservices_util_StreamHelper_1(QName arg0) {
+		return MessageFormat.format("ARJUNA-42035 Unexpected end element: {0}", arg0);
+	}
+
+	public String get_webservices_util_StreamHelper_2() {
+		return "ARJUNA-42036 Unexpected end of document reached";
+	}
+
+	public String get_webservices_util_StreamHelper_3(QName arg0) {
+		return MessageFormat.format("ARJUNA-42037 Unexpected start element: {0}", arg0);
+	}
+
+	public String get_webservices_wsaddr_AddressingContext_1() {
+		return "ARJUNA-42038 Addressing context is not valid";
+	}
+
+	public String get_webservices_wsaddr_AddressingContext_2(QName arg0) {
+		return MessageFormat.format("ARJUNA-42039 Unexpected element name: {0}", arg0);
+	}
+
+	public String get_webservices_wsaddr_AttributedQNameType_1() {
+		return "ARJUNA-42040 Invalid QName value for attributed QName";
+	}
+
+	public String get_webservices_wsaddr_EndpointReferenceType_1(QName arg0) {
+		return MessageFormat.format("ARJUNA-42041 Unexpected element name: {0}", arg0);
+	}
+
+	public String get_webservices_wsaddr2005_AddressingContext_2(QName arg0) {
+		return MessageFormat.format("ARJUNA-42043 Unexpected element name: {0}", arg0);
+	}
+
+	public String get_webservices_wsaddr2005_AttributedAnyType_1(QName arg0) {
+		return MessageFormat.format("ARJUNA-42044 Unexpected second element name: {0}", arg0);
+	}
+
+	public String get_webservices_wsaddr2005_AttributedQNameType_1() {
+		return "ARJUNA-42045 Invalid QName value for attributed QName";
+	}
+
+	public String get_webservices_wsaddr2005_EndpointReferenceType_1(QName arg0) {
+		return MessageFormat.format("ARJUNA-42046 Unexpected element name: {0}", arg0);
+	}
+
+	public String get_webservices_wsaddr2005_ProblemActionType_1(QName arg0) {
+		return MessageFormat.format("ARJUNA-42047 Unexpected element name: {0}", arg0);
+	}
+
+	public String get_webservices_wsaddr2005_client_WSAddr2005Client_1() {
+		return "ARJUNA-42048 Addressing context does not specify destination.";
+	}
+
+	public String get_webservices_wsaddr2005_client_WSAddr2005Client_2() {
+		return "ARJUNA-42049 Invalid destination specified in addressing context.";
+	}
+
+	public String get_webservices_wsaddr2005_client_WSAddr2005Client_3(String arg0) {
+		return MessageFormat.format("ARJUNA-42050 No SOAP client registered for scheme: {0}.", arg0);
+	}
+
+	public String get_webservices_wsaddr2005_client_WSAddr2005Client_4() {
+		return "ARJUNA-42051 Invalid replyTo specified in addressing context.";
+	}
+
+	public String get_webservices_wsaddr2005_client_WSAddr2005Client_5() {
+		return "ARJUNA-42052 Unexpected SOAP message type returned.";
+	}
+
+	public void error_webservices_wsaddr2005_handlers_AddressingInterceptorHandler_3(String arg0) {
+		logger.logv(ERROR, "ARJUNA-42053 Unhandled SOAP fault {0} during asynchronous execution of service.", arg0);
+	}
+
+	public String get_webservices_wsarj_ArjunaContext_1() {
+		return "ARJUNA-42054 Arjuna context is not valid";
+	}
+
+	public String get_webservices_wsarj_ArjunaContext_2(QName arg0) {
+		return MessageFormat.format("ARJUNA-42055 Unexpected element name: {0}", arg0);
+	}
+
+	public String get_webservices_wsarj_InstanceIdentifier_1() {
+		return "ARJUNA-42056 InstanceIdentifier elements cannot have embedded elements.";
+	}
+
+	public String get_webservices_wscoor_AttributedUnsignedIntType_1(String arg0) {
+		return MessageFormat.format("ARJUNA-42057 non numerical value: {0}", arg0);
+	}
+
+	public String get_webservices_wscoor_CoordinationContextType_1() {
+		return "ARJUNA-42058 Coordination Context is not valid";
+	}
+
+	public String get_webservices_wscoor_CoordinationContextType_2(QName arg0) {
+		return MessageFormat.format("ARJUNA-42059 Unexpected element name: {0}", arg0);
+	}
+
+	public String get_webservices_wscoor_CreateCoordinationContextResponseType_1() {
+		return "ARJUNA-42060 Create Coordination Context Response is not valid";
+	}
+
+	public String get_webservices_wscoor_CreateCoordinationContextResponseType_2(QName arg0) {
+		return MessageFormat.format("ARJUNA-42061 Unexpected element name: {0}", arg0);
+	}
+
+	public String get_webservices_wscoor_CreateCoordinationContextType_1() {
+		return "ARJUNA-42062 Create Coordination Context is not valid";
+	}
+
+	public String get_webservices_wscoor_CreateCoordinationContextType_2(QName arg0) {
+		return MessageFormat.format("ARJUNA-42063 Unexpected element name: {0}", arg0);
+	}
+
+	public String get_webservices_wscoor_RegisterResponseType_1() {
+		return "ARJUNA-42064 Register is not valid";
+	}
+
+	public String get_webservices_wscoor_RegisterResponseType_2(QName arg0) {
+		return MessageFormat.format("ARJUNA-42065 Unexpected element name: {0}", arg0);
+	}
+
+	public String get_webservices_wscoor_RegisterType_1() {
+		return "ARJUNA-42066 Register is not valid";
+	}
+
+	public String get_webservices_wscoor_RegisterType_2(QName arg0) {
+		return MessageFormat.format("ARJUNA-42067 Unexpected element name: {0}", arg0);
+	}
+
+	public String get_ActivationCoordinator_1() {
+		return "ARJUNA-42071 Callback execution failed";
+	}
+
+	public String get_ActivationCoordinator_2() {
+		return "ARJUNA-42072 Callback wasn't triggered";
+	}
+
+	public String get_RegistrationCoordinator_1() {
+		return "ARJUNA-42073 Callback execution failed";
+	}
+
+	public String get_RegistrationCoordinator_2() {
+		return "ARJUNA-42074 Callback wasn't triggered";
+	}
+
+	public String get_messaging_ActivationCoordinatorProcessorImpl_1() {
+		return "ARJUNA-42075 Invalid create coordination context parameters";
+	}
+
+	public String get_messaging_RegistrationCoordinatorProcessorImpl_1() {
+		return "ARJUNA-42076 Participant already registered";
+	}
+
+	public String get_messaging_RegistrationCoordinatorProcessorImpl_2() {
+		return "ARJUNA-42077 Invalid protocol identifier";
+	}
+
+	public String get_messaging_RegistrationCoordinatorProcessorImpl_3() {
+		return "ARJUNA-42078 Invalid coordination context state";
+	}
+
+	public String get_messaging_RegistrationCoordinatorProcessorImpl_4() {
+		return "ARJUNA-42079 Unknown activity identifier";
+	}
+
+	public String get_wsc11_messaging_ActivationCoordinatorProcessorImpl_1() {
+		return "ARJUNA-42080 Invalid create coordination context parameters";
+	}
+
+	public String get_wsc11_messaging_RegistrationCoordinatorProcessorImpl_1() {
+		return "ARJUNA-42081 Participant already registered";
+	}
+
+	public String get_wsc11_messaging_RegistrationCoordinatorProcessorImpl_2() {
+		return "ARJUNA-42082 Invalid protocol identifier";
+	}
+
+	public String get_wsc11_messaging_RegistrationCoordinatorProcessorImpl_3() {
+		return "ARJUNA-42083 Invalid coordination context state";
+	}
+
+	public String get_wsc11_messaging_RegistrationCoordinatorProcessorImpl_4() {
+		return "ARJUNA-42084 Unknown activity identifier";
+	}
+}

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/BaseXMLStreamWriter.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/BaseXMLStreamWriter.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/BaseXMLStreamWriter.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -97,7 +97,7 @@
     public void setNamespaceContext(final NamespaceContext namespaceContext)
         throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.BaseXMLStreamWriter_1")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_BaseXMLStreamWriter_1()) ;
     }
     
     /**
@@ -123,7 +123,7 @@
     public void writeComment(final String comment)
         throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.BaseXMLStreamWriter_2")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_BaseXMLStreamWriter_2()) ;
     }
 
     /**
@@ -133,7 +133,7 @@
     public void writeProcessingInstruction(final String target)
             throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.BaseXMLStreamWriter_3")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_BaseXMLStreamWriter_3()) ;
     }
 
     /**
@@ -144,7 +144,7 @@
     public void writeProcessingInstruction(final String target, final String data)
             throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.BaseXMLStreamWriter_4")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_BaseXMLStreamWriter_4()) ;
     }
 
     /**
@@ -154,7 +154,7 @@
     public void writeEntityRef(final String name)
         throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.BaseXMLStreamWriter_5")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_BaseXMLStreamWriter_5()) ;
     }
 
     /**
@@ -164,7 +164,8 @@
     public void writeDTD(final String dtd)
         throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.BaseXMLStreamWriter_6")) ;    }
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_BaseXMLStreamWriter_6()) ;
+    }
 
     /**
      * Write the XML encoding.
@@ -172,7 +173,7 @@
     public void writeStartDocument()
         throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.BaseXMLStreamWriter_7")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_BaseXMLStreamWriter_7()) ;
     }
 
     /**
@@ -182,7 +183,7 @@
     public void writeStartDocument(final String version)
         throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.BaseXMLStreamWriter_8")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_BaseXMLStreamWriter_8()) ;
     }
 
     /**
@@ -193,7 +194,7 @@
     public void writeStartDocument(final String encoding, final String version)
             throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.BaseXMLStreamWriter_9")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_BaseXMLStreamWriter_9()) ;
     }
 
     /**
@@ -202,7 +203,7 @@
     public void writeEndDocument()
         throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.BaseXMLStreamWriter_10")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_BaseXMLStreamWriter_10()) ;
     }
 
     /**
@@ -222,7 +223,7 @@
     public void close()
         throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.BaseXMLStreamWriter_11")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_BaseXMLStreamWriter_11()) ;
     }
 
     /**

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/DOMXMLStreamReader.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/DOMXMLStreamReader.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/DOMXMLStreamReader.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -20,7 +20,6 @@
  */
 package com.arjuna.webservices.adapters;
 
-import java.text.MessageFormat;
 import java.util.ArrayList;
 
 import javax.xml.namespace.NamespaceContext;
@@ -99,7 +98,7 @@
         // just returns start, end, characters, CData
         if ((currentNode == headerElement) && (type == END_ELEMENT))
         {
-            throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.DOMXMLStreamReader_1")) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_DOMXMLStreamReader_1()) ;
         }
         else if (type == START_ELEMENT)
         {
@@ -133,9 +132,7 @@
         }
         else
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.DOMXMLStreamReader_3") ;
-            final String message = MessageFormat.format(pattern, new Object[] {new Integer(type)}) ;
-            throw new XMLStreamException(message) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_DOMXMLStreamReader_3(Integer.toString(type))) ;
         }
         return type ;
     }
@@ -150,9 +147,7 @@
         final int nextType = next() ;
         if ((nextType != START_ELEMENT) && (nextType != END_ELEMENT))
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.DOMXMLStreamReader_4") ;
-            final String message = MessageFormat.format(pattern, new Object[] {new Integer(nextType)}) ;
-            throw new XMLStreamException(message) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_DOMXMLStreamReader_4(Integer.toString(nextType))) ;
         }
         return nextType ;
     }
@@ -236,7 +231,7 @@
     {
         if ((type != this.type) || (hasName() && !(testEquals(namespaceURI, getNamespaceURI()) && testEquals(localName, getLocalName()))))
         {
-            throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.DOMXMLStreamReader_5")) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_DOMXMLStreamReader_5()) ;
         }
     }
 
@@ -466,7 +461,7 @@
     public int getTextCharacters(final int sourceStart, final char[] target, final int targetStart, final int length)
             throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.DOMXMLStreamReader_6")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_DOMXMLStreamReader_6()) ;
     }
 
     /**
@@ -498,7 +493,7 @@
     public String getElementText()
         throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.DOMXMLStreamReader_7")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_DOMXMLStreamReader_7()) ;
     }
 
     /**
@@ -626,9 +621,7 @@
         }
         else
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.DOMXMLStreamReader_2") ;
-            final String message = MessageFormat.format(pattern, new Object[] {child.getClass().getName()}) ;
-            throw new XMLStreamException(message) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_DOMXMLStreamReader_2(child.getClass().getName())) ;
         }
     }
     

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/SAAJXMLStreamReader.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/SAAJXMLStreamReader.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/SAAJXMLStreamReader.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -99,7 +99,7 @@
         // just returns start, end, characters, CData
         if ((currentNode == headerElement) && (type == END_ELEMENT))
         {
-            throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.DOMXMLStreamReader_1")) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_DOMXMLStreamReader_1()) ;
         }
         else if (type == START_ELEMENT)
         {
@@ -150,9 +150,7 @@
         }
         else
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.DOMXMLStreamReader_3") ;
-            final String message = MessageFormat.format(pattern, new Object[] {new Integer(type)}) ;
-            throw new XMLStreamException(message) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_DOMXMLStreamReader_3(Integer.toString(type))) ;
         }
         return type ;
     }
@@ -167,9 +165,7 @@
         final int nextType = next() ;
         if ((nextType != START_ELEMENT) && (nextType != END_ELEMENT))
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.DOMXMLStreamReader_4") ;
-            final String message = MessageFormat.format(pattern, new Object[] {new Integer(nextType)}) ;
-            throw new XMLStreamException(message) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_DOMXMLStreamReader_4(Integer.toString(nextType))) ;
         }
         return nextType ;
     }
@@ -253,7 +249,7 @@
     {
         if ((type != this.type) || (hasName() && !(testEquals(namespaceURI, getNamespaceURI()) && testEquals(localName, getLocalName()))))
         {
-            throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.DOMXMLStreamReader_5")) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_DOMXMLStreamReader_5()) ;
         }
     }
 
@@ -497,7 +493,7 @@
     public int getTextCharacters(final int sourceStart, final char[] target, final int targetStart, final int length)
             throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.DOMXMLStreamReader_6")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_DOMXMLStreamReader_6()) ;
     }
 
     /**
@@ -529,7 +525,7 @@
     public String getElementText()
         throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.DOMXMLStreamReader_7")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_DOMXMLStreamReader_7()) ;
     }
 
     /**
@@ -676,9 +672,7 @@
         }
         else
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.DOMXMLStreamReader_2") ;
-            final String message = MessageFormat.format(pattern, new Object[] {child.getClass().getName()}) ;
-            throw new XMLStreamException(message) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_DOMXMLStreamReader_2(child.getClass().getName())) ;
         }
     }
     

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/SAAJXMLStreamWriter.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/SAAJXMLStreamWriter.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/adapters/SAAJXMLStreamWriter.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -254,7 +254,7 @@
     public void writeCData(final String cdata)
         throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.adapters.SAAJXMLStreamWriter_1")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_adapters_SAAJXMLStreamWriter_1()) ;
     }
     
     /**

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/base/handlers/LoggingFaultHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/base/handlers/LoggingFaultHandler.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/base/handlers/LoggingFaultHandler.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -77,11 +77,8 @@
             faultDetails = soapFaultType + ":" + subcode ;
         }
         
-        if (WSCLogger.logger.isDebugEnabled())
-        {
-            WSCLogger.arjLoggerI18N.warn("com.arjuna.webservices.base.handlers.LoggingFaultHandler_1",
-                new Object[] {serviceName, faultDetails}) ;
-        }
+        WSCLogger.i18NLogger.warn_webservices_base_handlers_LoggingFaultHandler_1(serviceName, faultDetails);
+
         return null ;
     }
 }

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/Soap11Details.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/Soap11Details.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/Soap11Details.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -297,10 +297,8 @@
                 return soapFault ;
             }
         }
-        
-        final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.soap.Soap11Details_1") ;
-        final String message = MessageFormat.format(pattern, new Object[] {streamReader.getName()}) ;
-        throw new XMLStreamException(message) ;
+
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_soap_Soap11Details_1(streamReader.getName())) ;
     }
 
     /**

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/Soap12Details.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/Soap12Details.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/Soap12Details.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -321,23 +321,17 @@
                         new AnyElement(streamReader) ;
                         if (!StreamHelper.checkParentFinished(streamReader))
                         {
-                            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.soap.Soap12Details_1") ;
-                            final String message = MessageFormat.format(pattern, new Object[] {streamReader.getName()}) ;
-                            throw new XMLStreamException(message) ;
+                            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_soap_Soap12Details_1(streamReader.getName())) ;
                         }
                     }
                     if (!StreamHelper.checkParentFinished(streamReader))
                     {
-                        final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.soap.Soap12Details_1") ;
-                        final String message = MessageFormat.format(pattern, new Object[] {streamReader.getName()}) ;
-                        throw new XMLStreamException(message) ;
+                        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_soap_Soap12Details_1(streamReader.getName())) ;
                     }
                 }
                 if (!StreamHelper.checkParentFinished(streamReader))
                 {
-                    final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.soap.Soap12Details_1") ;
-                    final String message = MessageFormat.format(pattern, new Object[] {streamReader.getName()}) ;
-                    throw new XMLStreamException(message) ;
+                    throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_soap_Soap12Details_1(streamReader.getName())) ;
                 }
             }
             
@@ -348,9 +342,7 @@
             soapFault.setReason(reasonElement.getText()) ;
             if (!StreamHelper.checkParentFinished(streamReader))
             {
-                final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.soap.Soap12Details_1") ;
-                final String message = MessageFormat.format(pattern, new Object[] {streamReader.getName()}) ;
-                throw new XMLStreamException(message) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_soap_Soap12Details_1(streamReader.getName())) ;
             }
             if (StreamHelper.checkParentFinished(streamReader))
             {
@@ -387,9 +379,7 @@
                     return soapFault ;
                 }
             }
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.soap.Soap12Details_1") ;
-            final String message = MessageFormat.format(pattern, new Object[] {streamReader.getName()}) ;
-            throw new XMLStreamException(message) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_soap_Soap12Details_1(streamReader.getName())) ;
     }
 
     /**

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/SoapNotUnderstoodType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/SoapNotUnderstoodType.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/SoapNotUnderstoodType.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -80,7 +80,7 @@
         final QName elementName)
         throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.soap.SoapNotUnderstoodType_1")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_soap_SoapNotUnderstoodType_1()) ;
     }
     
     /**

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/SoapParser.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/SoapParser.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/soap/SoapParser.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -94,8 +94,7 @@
         if (!(SoapConstants.SOAP_BODY_NAME.equals(streamReader.getLocalName()) &&
             soapDetails.getNamespaceURI().equals(streamReader.getNamespaceURI())))
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.soap.SoapParser_1") ;
-            final String message = MessageFormat.format(pattern, new Object[] {streamReader.getName()}) ;
+            final String message = WSCLogger.i18NLogger.get_webservices_soap_SoapParser_1(streamReader.getName());
             throw new SoapFault10(SoapFaultType.FAULT_SENDER, message) ;
         }
         
@@ -107,8 +106,7 @@
         {
             if (!bodyName.equals(soapDetails.getFaultName()))
             {
-                final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.soap.SoapParser_2") ;
-                final String message = MessageFormat.format(pattern, new Object[] {streamReader.getName()}) ;
+                final String message = WSCLogger.i18NLogger.get_webservices_soap_SoapParser_2(streamReader.getName());
                 throw new SoapFault10(SoapFaultType.FAULT_SENDER, message) ;
             }
             bodyHandler = soapService.getFaultHandler() ;
@@ -262,8 +260,7 @@
         if ((mustUnderstand != null) && ("1".equals(mustUnderstand) || "true".equalsIgnoreCase(mustUnderstand)))
         {
             final QName headerName = streamReader.getName() ;
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.soap.SoapParser_3") ;
-            final String message = MessageFormat.format(pattern, new Object[] {streamReader.getName()}) ;
+            final String message = WSCLogger.i18NLogger.get_webservices_soap_SoapParser_3(streamReader.getName());
             final SoapFault10 soapFault = new SoapFault10(SoapFaultType.FAULT_MUST_UNDERSTAND, message) ;
             soapFault.setHeaderElements(soapDetails.getMustUnderstandHeaders(headerName)) ;
             throw soapFault ;

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/stax/ParsingSupport.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/stax/ParsingSupport.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/stax/ParsingSupport.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -95,9 +95,7 @@
                 case XMLStreamConstants.START_DOCUMENT:
                 case XMLStreamConstants.END_DOCUMENT:
                 case XMLStreamConstants.NAMESPACE:
-                    final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.stax.ParsingSupport_1") ;
-                    final String message = MessageFormat.format(pattern, new Object[] {new Integer(type)}) ;
-                    throw new XMLStreamException(message) ;
+                    throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_stax_ParsingSupport_1(Integer.toString(type))) ;
             }
         }
         while(!finished) ;

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/stax/TextElement.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/stax/TextElement.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/stax/TextElement.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -89,7 +89,7 @@
         final QName elementName)
         throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.stax.TextElement_1")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_stax_TextElement_1()) ;
     }
     
     /**

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/transport/http/HttpClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/transport/http/HttpClient.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/transport/http/HttpClient.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -76,7 +76,7 @@
         final SoapMessage response = invokeRequest(request, url) ;
         if (response == null)
         {
-            throw new SoapFault10(SoapFaultType.FAULT_SENDER, WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.transport.http.HttpClient_1")) ;
+            throw new SoapFault10(SoapFaultType.FAULT_SENDER, WSCLogger.i18NLogger.get_webservices_transport_http_HttpClient_1()) ;
         }
         return response ;
     }
@@ -115,7 +115,7 @@
         }
         catch (final MalformedURLException murle)
         {
-            throw new SoapFault10(SoapFaultType.FAULT_SENDER, WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.transport.http.HttpClient_2")) ;
+            throw new SoapFault10(SoapFaultType.FAULT_SENDER, WSCLogger.i18NLogger.get_webservices_transport_http_HttpClient_2()) ;
         }
         
         final boolean threadLogEnabled = SoapMessageLogging.isThreadLogEnabled() ;
@@ -137,7 +137,7 @@
         }
         catch (final ClassCastException cce)
         {
-            throw new SoapFault10(SoapFaultType.FAULT_SENDER, WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.transport.http.HttpClient_3")) ;
+            throw new SoapFault10(SoapFaultType.FAULT_SENDER, WSCLogger.i18NLogger.get_webservices_transport_http_HttpClient_3()) ;
         }
         
         httpURLConnection.setDoOutput(true) ;
@@ -198,8 +198,7 @@
             (responseCode != HttpURLConnection.HTTP_ACCEPTED) &&
             (responseCode != HttpURLConnection.HTTP_INTERNAL_ERROR))
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.transport.http.HttpClient_4") ;
-            final String message = MessageFormat.format(pattern, new Object[] {new Integer(responseCode)}) ;
+            final String message = WSCLogger.i18NLogger.get_webservices_transport_http_HttpClient_4(Integer.toString(responseCode));
             throw new SoapFault10(SoapFaultType.FAULT_SENDER, message) ;
         }
         

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/util/StreamHelper.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/util/StreamHelper.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/util/StreamHelper.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -20,7 +20,6 @@
  */
 package com.arjuna.webservices.util;
 
-import java.text.MessageFormat;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
@@ -304,14 +303,12 @@
             streamReader.nextTag() ;
             if (streamReader.isEndElement())
             {
-                final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.util.StreamHelper_1") ;
-                final String message = MessageFormat.format(pattern, new Object[] {streamReader.getName()}) ;
-                throw new XMLStreamException(message) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_util_StreamHelper_1(streamReader.getName())) ;
             }
         }
         else
         {
-            throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.util.StreamHelper_2")) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_util_StreamHelper_2()) ;
         }
     }
 
@@ -331,7 +328,7 @@
             }
             else
             {
-                throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.util.StreamHelper_2")) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_util_StreamHelper_2()) ;
             }
         }
     }
@@ -361,9 +358,7 @@
         final QName elementName = streamReader.getName() ;
         if (!expected.equals(elementName))
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.util.StreamHelper_3") ;
-            final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-            throw new XMLStreamException(message) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_util_StreamHelper_3(elementName)) ;
         }
     }
 

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr/AddressingContext.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr/AddressingContext.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr/AddressingContext.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -20,7 +20,6 @@
  */
 package com.arjuna.webservices.wsaddr;
 
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -235,7 +234,7 @@
     {
        if (!isValid())
        {
-           throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr.AddressingContext_1")) ;
+           throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wsaddr_AddressingContext_1()) ;
        }
        
        StreamHelper.writeElement(out, AddressingConstants.WSA_ELEMENT_TO_QNAME, to) ;
@@ -312,16 +311,12 @@
             }
             else
             {
-                final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr.AddressingContext_2") ;
-                final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-                throw new XMLStreamException(message) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wsaddr_AddressingContext_2(elementName)) ;
             }
         }
         else
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr.AddressingContext_2") ;
-            final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-            throw new XMLStreamException(message) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wsaddr_AddressingContext_2(elementName)) ;
         }
     }
     

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr/AttributedQNameType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr/AttributedQNameType.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr/AttributedQNameType.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -109,7 +109,7 @@
     {
         if (value == null)
         {
-            throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr.AttributedQNameType_1")) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wsaddr_AttributedQNameType_1()) ;
         }
         
         StreamHelper.writeQualifiedName(out, value) ;

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr/EndpointReferenceType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr/EndpointReferenceType.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr/EndpointReferenceType.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -256,9 +256,7 @@
             }
             else
             {
-                final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr.EndpointReferenceType_1") ;
-                final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-                throw new XMLStreamException(message) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wsaddr_EndpointReferenceType_1(elementName)) ;
             }
         }
         else

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/AddressingContext.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/AddressingContext.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/AddressingContext.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -339,16 +339,12 @@
             }
             else
             {
-                final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr2005.AddressingContext_2") ;
-                final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-                throw new XMLStreamException(message) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wsaddr2005_AddressingContext_2(elementName)) ;
             }
         }
         else
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr2005.AddressingContext_2") ;
-            final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-            throw new XMLStreamException(message) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wsaddr2005_AddressingContext_2(elementName)) ;
         }
     }
     

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/AttributedAnyType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/AttributedAnyType.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/AttributedAnyType.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -110,9 +110,7 @@
     {
         if (any != null)
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr2005.AttributedAnyType_1") ;
-            final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-            throw new XMLStreamException(message) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wsaddr2005_AttributedAnyType_1(elementName)) ;
         }
         final AnyElement anyElement = new AnyElement(in) ;
         setAny(new NamedElement(elementName, anyElement)) ;

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/AttributedQNameType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/AttributedQNameType.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/AttributedQNameType.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -111,7 +111,7 @@
     {
         if (value == null)
         {
-            throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr2005.AttributedQNameType_1")) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wsaddr2005_AttributedQNameType_1()) ;
         }
         
         StreamHelper.writeQualifiedName(out, value) ;

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/EndpointReferenceType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/EndpointReferenceType.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/EndpointReferenceType.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -196,9 +196,7 @@
             }
             else
             {
-                final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr2005.EndpointReferenceType_1") ;
-                final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-                throw new XMLStreamException(message) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wsaddr2005_EndpointReferenceType_1(elementName)) ;
             }
         }
         else

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/ProblemActionType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/ProblemActionType.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/ProblemActionType.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -162,9 +162,7 @@
             }
             else
             {
-                final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr2005.ProblemActionType_1") ;
-                final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-                throw new XMLStreamException(message) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wsaddr2005_ProblemActionType_1(elementName)) ;
             }
         }
         else

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/client/WSAddr2005Client.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/client/WSAddr2005Client.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/client/WSAddr2005Client.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -21,7 +21,6 @@
 package com.arjuna.webservices.wsaddr2005.client;
 
 import java.io.IOException;
-import java.text.MessageFormat;
 
 import com.arjuna.webservices.MessageContext;
 import com.arjuna.webservices.SoapBody;
@@ -77,7 +76,7 @@
         {
             if (!replyTo.isValid())
             {
-                throw new IOException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr2005.client.WSAddr2005Client_4")) ;
+                throw new IOException(WSCLogger.i18NLogger.get_webservices_wsaddr2005_client_WSAddr2005Client_4()) ;
             }
             final AttributedURIType address = replyTo.getAddress() ;
             if (!AddressingConstants.WSA_ADDRESS_ANONYMOUS.equals(address.getValue()))
@@ -92,7 +91,7 @@
         {
             return ((SoapBodyMessage)response).getSoapBody() ;
         }
-        throw new IOException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr2005.client.WSAddr2005Client_5")) ;
+        throw new IOException(WSCLogger.i18NLogger.get_webservices_wsaddr2005_client_WSAddr2005Client_5()) ;
     }
     
     /**
@@ -154,11 +153,11 @@
         final AttributedURIType to = addressingContext.getTo() ;
         if (to == null)
         {
-            throw new IOException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr2005.client.WSAddr2005Client_1")) ;
+            throw new IOException(WSCLogger.i18NLogger.get_webservices_wsaddr2005_client_WSAddr2005Client_1()) ;
         }
         if (!to.isValid())
         {
-            throw new IOException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr2005.client.WSAddr2005Client_2")) ;
+            throw new IOException(WSCLogger.i18NLogger.get_webservices_wsaddr2005_client_WSAddr2005Client_2()) ;
         }
         return to.getValue() ;
     }
@@ -190,9 +189,7 @@
         
         if (client == null)
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsaddr2005.client.WSAddr2005Client_3") ;
-            final String message = MessageFormat.format(pattern, new Object[] {scheme}) ;
-            throw new IOException(message) ;
+            throw new IOException(WSCLogger.i18NLogger.get_webservices_wsaddr2005_client_WSAddr2005Client_3(scheme)) ;
         }
         
         return client ;

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/handlers/AddressingInterceptorHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/handlers/AddressingInterceptorHandler.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsaddr2005/handlers/AddressingInterceptorHandler.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -121,7 +121,7 @@
                         }
                         catch (final SoapFault soapFault)
                         {
-                            WSCLogger.arjLoggerI18N.error("com.arjuna.webservices.wsaddr2005.handlers.AddressingInterceptorHandler_3", soapFault) ;
+                            WSCLogger.i18NLogger.error_webservices_wsaddr2005_handlers_AddressingInterceptorHandler_3(soapFault.toString());
                         }
                     }
                 }) ;

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsarj/ArjunaContext.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsarj/ArjunaContext.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsarj/ArjunaContext.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -20,8 +20,6 @@
  */
 package com.arjuna.webservices.wsarj;
 
-import java.text.MessageFormat;
-
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -96,7 +94,7 @@
     {
        if (!isValid())
        {
-           throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsarj.ArjunaContext_1")) ;
+           throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wsarj_ArjunaContext_1()) ;
        }
        
        StreamHelper.writeElement(out, ArjunaConstants.WSARJ_ELEMENT_INSTANCE_IDENTIFIER_QNAME, instanceIdentifier) ;
@@ -123,16 +121,12 @@
             }
             else
             {
-                final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsarj.ArjunaContext_2") ;
-                final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-                throw new XMLStreamException(message) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wsarj_ArjunaContext_2(elementName)) ;
             }
         }
         else
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsarj.ArjunaContext_2") ;
-            final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-            throw new XMLStreamException(message) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wsarj_ArjunaContext_2(elementName)) ;
         }
     }
     

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsarj/InstanceIdentifier.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsarj/InstanceIdentifier.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wsarj/InstanceIdentifier.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -78,7 +78,7 @@
         final QName elementName)
         throws XMLStreamException
     {
-        throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wsarj.InstanceIdentifier_1")) ;
+        throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wsarj_InstanceIdentifier_1()) ;
     }
     
     /**

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/AttributedUnsignedIntType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/AttributedUnsignedIntType.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/AttributedUnsignedIntType.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -96,9 +96,7 @@
         }
         catch (final NumberFormatException nfe)
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wscoor.AttributedUnsignedIntType_1") ;
-            final String message = MessageFormat.format(pattern, new Object[] {value}) ;
-            throw new XMLStreamException(message) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wscoor_AttributedUnsignedIntType_1(value)) ;
         }
     }
     

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/CoordinationContextType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/CoordinationContextType.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/CoordinationContextType.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -20,8 +20,6 @@
  */
 package com.arjuna.webservices.wscoor;
 
-import java.text.MessageFormat;
-
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -180,7 +178,7 @@
     {
        if (!isValid())
        {
-           throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wscoor.CoordinationContextType_1")) ;
+           throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wscoor_CoordinationContextType_1()) ;
        }
        
        StreamHelper.writeElement(out, CoordinationConstants.WSCOOR_ELEMENT_IDENTIFIER_QNAME, identifier) ;
@@ -226,9 +224,7 @@
             }
             else
             {
-                final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wscoor.CoordinationContextType_2") ;
-                final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-                throw new XMLStreamException(message) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wscoor_CoordinationContextType_2(elementName)) ;
             }
         }
         else

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/CreateCoordinationContextResponseType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/CreateCoordinationContextResponseType.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/CreateCoordinationContextResponseType.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -20,8 +20,6 @@
  */
 package com.arjuna.webservices.wscoor;
 
-import java.text.MessageFormat;
-
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -98,7 +96,7 @@
     {
        if (!isValid())
        {
-           throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wscoor.CreateCoordinationContextResponseType_1")) ;
+           throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wscoor_CreateCoordinationContextResponseType_1()) ;
        }
        
        StreamHelper.writeElement(out, CoordinationConstants.WSCOOR_ELEMENT_COORDINATION_CONTEXT_QNAME, coordinationContext) ;
@@ -125,9 +123,7 @@
             }
             else
             {
-                final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wscoor.CreateCoordinationContextResponseType_2") ;
-                final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-                throw new XMLStreamException(message) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wscoor_CreateCoordinationContextResponseType_2(elementName)) ;
             }
         }
         else

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/CreateCoordinationContextType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/CreateCoordinationContextType.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/CreateCoordinationContextType.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -20,8 +20,6 @@
  */
 package com.arjuna.webservices.wscoor;
 
-import java.text.MessageFormat;
-
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -155,7 +153,7 @@
     {
        if (!isValid())
        {
-           throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wscoor.CreateCoordinationContextType_1")) ;
+           throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wscoor_CreateCoordinationContextType_1()) ;
        }
        
        if (expires != null)
@@ -198,9 +196,7 @@
             }
             else
             {
-                final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wscoor.CreateCoordinationContextType_2") ;
-                final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-                throw new XMLStreamException(message) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wscoor_CreateCoordinationContextType_2(elementName)) ;
             }
         }
         else

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/RegisterResponseType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/RegisterResponseType.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/RegisterResponseType.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -20,8 +20,6 @@
  */
 package com.arjuna.webservices.wscoor;
 
-import java.text.MessageFormat;
-
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -99,7 +97,7 @@
     {
        if (!isValid())
        {
-           throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wscoor.RegisterResponseType_1")) ;
+           throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wscoor_RegisterResponseType_1()) ;
        }
        
        StreamHelper.writeElement(out, CoordinationConstants.WSCOOR_ELEMENT_COORDINATOR_PROTOCOL_SERVICE_QNAME, coordinatorProtocolService) ;
@@ -126,9 +124,7 @@
             }
             else
             {
-                final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wscoor.RegisterResponseType_2") ;
-                final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-                throw new XMLStreamException(message) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wscoor_RegisterResponseType_2(elementName)) ;
             }
         }
         else

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/RegisterType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/RegisterType.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/webservices/wscoor/RegisterType.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -20,8 +20,6 @@
  */
 package com.arjuna.webservices.wscoor;
 
-import java.text.MessageFormat;
-
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -123,7 +121,7 @@
     {
        if (!isValid())
        {
-           throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wscoor.RegisterType_1")) ;
+           throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wscoor_RegisterType_1()) ;
        }
        
        StreamHelper.writeElement(out, CoordinationConstants.WSCOOR_ELEMENT_PROTOCOL_IDENTIFIER_QNAME, protocolIdentifier) ;
@@ -155,9 +153,7 @@
             }
             else
             {
-                final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.wscoor.RegisterType_2") ;
-                final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-                throw new XMLStreamException(message) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_wscoor_RegisterType_2(elementName)) ;
             }
         }
         else

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/ActivationCoordinator.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/ActivationCoordinator.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/ActivationCoordinator.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -83,11 +83,11 @@
         
         if (callback.hasFailed())
         {
-            throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc.ActivationCoordinator_1")) ;
+            throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, WSCLogger.i18NLogger.get_ActivationCoordinator_1()) ;
         }
         else if (!callback.hasTriggered())
         {
-            throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc.ActivationCoordinator_2")) ;
+            throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, WSCLogger.i18NLogger.get_ActivationCoordinator_2()) ;
         }
         
         final CreateCoordinationContextResponseType response = callback.getCreateCoordinationContextResponse() ;

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/RegistrationCoordinator.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/RegistrationCoordinator.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/RegistrationCoordinator.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -88,11 +88,11 @@
         
         if (callback.hasFailed())
         {
-            throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc.RegistrationCoordinator_1")) ;
+            throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, WSCLogger.i18NLogger.get_RegistrationCoordinator_1()) ;
         }
         else if (!callback.hasTriggered())
         {
-            throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc.RegistrationCoordinator_2")) ;
+            throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, WSCLogger.i18NLogger.get_RegistrationCoordinator_2()) ;
         }
         
         final RegisterResponseType response = callback.getRegisterResponse() ;

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/messaging/ActivationCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/messaging/ActivationCoordinatorProcessorImpl.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/messaging/ActivationCoordinatorProcessorImpl.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -34,7 +34,6 @@
 import com.arjuna.wsc.ContextFactory;
 import com.arjuna.wsc.ContextFactoryMapper;
 import com.arjuna.wsc.InvalidCreateParametersException;
-import com.arjuna.wsc.messaging.MessageId;
 
 /**
  * The Activation Coordinator processor.
@@ -75,7 +74,7 @@
                 {
                     final AddressingContext faultAddressingContext = AddressingContext.createFaultContext(addressingContext, MessageId.getMessageId()) ;
                     final SoapFault soapFault = new SoapFault10(SoapFaultType.FAULT_SENDER, CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PARAMETERS_QNAME,
-                        WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc.messaging.ActivationCoordinatorProcessorImpl_1")) ;
+                            WSCLogger.i18NLogger.get_messaging_ActivationCoordinatorProcessorImpl_1()) ;
                     ActivationRequesterClient.getClient().sendSoapFault(faultAddressingContext, soapFault) ;
                     return ;
                 }
@@ -100,7 +99,7 @@
                 }
                 final AddressingContext faultAddressingContext = AddressingContext.createFaultContext(addressingContext, MessageId.getMessageId()) ;
                 final SoapFault soapFault = new SoapFault10(SoapFaultType.FAULT_SENDER, CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PARAMETERS_QNAME,
-                    WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc.messaging.ActivationCoordinatorProcessorImpl_1")) ;
+                        WSCLogger.i18NLogger.get_messaging_ActivationCoordinatorProcessorImpl_1()) ;
                 ActivationRequesterClient.getClient().sendSoapFault(faultAddressingContext, soapFault) ;
             }
         }

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/messaging/RegistrationCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/messaging/RegistrationCoordinatorProcessorImpl.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/messaging/RegistrationCoordinatorProcessorImpl.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -38,7 +38,6 @@
 import com.arjuna.wsc.NoActivityException;
 import com.arjuna.wsc.Registrar;
 import com.arjuna.wsc.RegistrarMapper;
-import com.arjuna.wsc.messaging.MessageId;
 
 
 /**
@@ -84,7 +83,7 @@
                 {
                     final AddressingContext faultAddressingContext = AddressingContext.createFaultContext(addressingContext, MessageId.getMessageId()) ;
                     final SoapFault soapFault = new SoapFault10(SoapFaultType.FAULT_SENDER, CoordinationConstants.WSCOOR_ERROR_CODE_ALREADY_REGISTERED_QNAME,
-                        WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc.messaging.RegistrationCoordinatorProcessorImpl_1")) ;
+                            WSCLogger.i18NLogger.get_messaging_RegistrationCoordinatorProcessorImpl_1()) ;
                     RegistrationRequesterClient.getClient().sendSoapFault(faultAddressingContext, soapFault) ;
                     return ;
                 }
@@ -92,7 +91,7 @@
                 {
                     final AddressingContext faultAddressingContext = AddressingContext.createFaultContext(addressingContext, MessageId.getMessageId()) ;
                     final SoapFault soapFault = new SoapFault10(SoapFaultType.FAULT_SENDER, CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PROTOCOL_QNAME,
-                        WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc.messaging.RegistrationCoordinatorProcessorImpl_2")) ;
+                            WSCLogger.i18NLogger.get_messaging_RegistrationCoordinatorProcessorImpl_2()) ;
                     RegistrationRequesterClient.getClient().sendSoapFault(faultAddressingContext, soapFault) ;
                     return ;
                 }
@@ -100,7 +99,7 @@
                 {
                     final AddressingContext faultAddressingContext = AddressingContext.createFaultContext(addressingContext, MessageId.getMessageId()) ;
                     final SoapFault soapFault = new SoapFault10(SoapFaultType.FAULT_SENDER, CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_STATE_QNAME,
-                        WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc.messaging.RegistrationCoordinatorProcessorImpl_3")) ;
+                            WSCLogger.i18NLogger.get_messaging_RegistrationCoordinatorProcessorImpl_3()) ;
                     RegistrationRequesterClient.getClient().sendSoapFault(faultAddressingContext, soapFault) ;
                     return ;
                 }
@@ -108,7 +107,7 @@
                 {
                     final AddressingContext faultAddressingContext = AddressingContext.createFaultContext(addressingContext, MessageId.getMessageId()) ;
                     final SoapFault soapFault = new SoapFault10(SoapFaultType.FAULT_SENDER, CoordinationConstants.WSCOOR_ERROR_CODE_NO_ACTIVITY_QNAME,
-                        WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc.messaging.RegistrationCoordinatorProcessorImpl_4")) ;
+                            WSCLogger.i18NLogger.get_messaging_RegistrationCoordinatorProcessorImpl_4()) ;
                     RegistrationRequesterClient.getClient().sendSoapFault(faultAddressingContext, soapFault) ;
                     return ;
                 }
@@ -133,7 +132,7 @@
                 }
                 final AddressingContext faultAddressingContext = AddressingContext.createFaultContext(addressingContext, MessageId.getMessageId()) ;
                 final SoapFault soapFault = new SoapFault10(SoapFaultType.FAULT_SENDER, CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PROTOCOL_QNAME,
-                    WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc.messaging.RegistrationCoordinatorProcessorImpl_2")) ;
+                        WSCLogger.i18NLogger.get_messaging_RegistrationCoordinatorProcessorImpl_2()) ;
                 RegistrationRequesterClient.getClient().sendSoapFault(faultAddressingContext, soapFault) ;
             }
         }

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/util/StreamHelper.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/util/StreamHelper.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/util/StreamHelper.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -287,14 +287,12 @@
             streamReader.nextTag() ;
             if (streamReader.isEndElement())
             {
-                final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.util.StreamHelper_1") ;
-                final String message = MessageFormat.format(pattern, new Object[] {streamReader.getName()}) ;
-                throw new XMLStreamException(message) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_util_StreamHelper_1(streamReader.getName())) ;
             }
         }
         else
         {
-            throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.util.StreamHelper_2")) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_util_StreamHelper_2()) ;
         }
     }
 
@@ -314,7 +312,7 @@
             }
             else
             {
-                throw new XMLStreamException(WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.util.StreamHelper_2")) ;
+                throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_util_StreamHelper_2()) ;
             }
         }
     }
@@ -344,9 +342,7 @@
         final QName elementName = streamReader.getName() ;
         if (!expected.equals(elementName))
         {
-            final String pattern = WSCLogger.arjLoggerI18N.getString("com.arjuna.webservices.util.StreamHelper_3") ;
-            final String message = MessageFormat.format(pattern, new Object[] {elementName}) ;
-            throw new XMLStreamException(message) ;
+            throw new XMLStreamException(WSCLogger.i18NLogger.get_webservices_util_StreamHelper_3(elementName)) ;
         }
     }
 

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -78,7 +78,7 @@
                 {
 	                SOAPFactory factory = SOAPFactory.newInstance();
                     SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PARAMETERS_QNAME);
-                    soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PARAMETERS_QNAME).addTextNode(WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc11.messaging.ActivationCoordinatorProcessorImpl_1"));
+                    soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PARAMETERS_QNAME).addTextNode(WSCLogger.i18NLogger.get_wsc11_messaging_ActivationCoordinatorProcessorImpl_1());
 	                throw new SOAPFaultException(soapFault);
                 }
                 catch (final Throwable th)
@@ -102,7 +102,7 @@
 
                 SOAPFactory factory = SOAPFactory.newInstance();
                 SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PARAMETERS_QNAME) ;
-                soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PARAMETERS_QNAME).addTextNode(WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc11.messaging.ActivationCoordinatorProcessorImpl_1"));
+                soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PARAMETERS_QNAME).addTextNode(WSCLogger.i18NLogger.get_wsc11_messaging_ActivationCoordinatorProcessorImpl_1());
                 throw new SOAPFaultException(soapFault);
             }
         }

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -84,28 +84,28 @@
                 {
                     SOAPFactory factory = SOAPFactory.newInstance();
                     SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME);
-                    soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME).addTextNode(WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc11.messaging.RegistrationCoordinatorProcessorImpl_1"));
+                    soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME).addTextNode(WSCLogger.i18NLogger.get_wsc11_messaging_RegistrationCoordinatorProcessorImpl_1());
                     throw new SOAPFaultException(soapFault);
                 }
                 catch (final InvalidProtocolException invalidProtocolException)
                 {
                     SOAPFactory factory = SOAPFactory.newInstance();
                     SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PROTOCOL_QNAME);
-                    soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PARAMETERS_QNAME).addTextNode(WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc11.messaging.RegistrationCoordinatorProcessorImpl_2"));
+                    soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PARAMETERS_QNAME).addTextNode(WSCLogger.i18NLogger.get_wsc11_messaging_RegistrationCoordinatorProcessorImpl_2());
                     throw new SOAPFaultException(soapFault);
                 }
                 catch (final InvalidStateException InvalidStateException)
                 {
                     SOAPFactory factory = SOAPFactory.newInstance();
                     SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_STATE_QNAME);
-                    soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_STATE_QNAME).addTextNode(WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc11.messaging.RegistrationCoordinatorProcessorImpl_3"));
+                    soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_STATE_QNAME).addTextNode(WSCLogger.i18NLogger.get_wsc11_messaging_RegistrationCoordinatorProcessorImpl_3());
                     throw new SOAPFaultException(soapFault);
                 }
                 catch (final NoActivityException noActivityException)
                 {
                     SOAPFactory factory = SOAPFactory.newInstance();
                     SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME);
-                    soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME).addTextNode(WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc11.messaging.RegistrationCoordinatorProcessorImpl_4"));
+                    soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME).addTextNode(WSCLogger.i18NLogger.get_wsc11_messaging_RegistrationCoordinatorProcessorImpl_4());
                     throw new SOAPFaultException(soapFault);
                 }
                 catch (final Throwable th)
@@ -128,7 +128,7 @@
                 }
                 SOAPFactory factory = SOAPFactory.newInstance();
                 SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PROTOCOL_QNAME);
-                WSCLogger.arjLoggerI18N.getString("com.arjuna.wsc11.messaging.RegistrationCoordinatorProcessorImpl_2") ;
+                soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PARAMETERS_QNAME).addTextNode(WSCLogger.i18NLogger.get_wsc11_messaging_RegistrationCoordinatorProcessorImpl_2());
                 throw new SOAPFaultException(soapFault);
             }
         }

Modified: labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/context/ContextManager.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/context/ContextManager.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/context/ContextManager.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -52,11 +52,6 @@
 	_manager = ActivityManagerFactory.activityManager();
     }
 
-    /**
-     * @message com.arjuna.mw.wsas.context.ContextManager_1 [com.arjuna.mw.wsas.context.ContextManager_1] - allHighLevelServices threw: 
-     * @message com.arjuna.mw.wsas.context.ContextManager_2 [com.arjuna.mw.wsas.context.ContextManager_2] - assembling contexts and received: 
-     */
-
     public final Context[] contexts ()
     {
 	Context[] ctxs = null;
@@ -68,8 +63,7 @@
 	}
 	catch (Exception ex)
 	{
-	    wsasLogger.arjLoggerI18N.warn("com.arjuna.mw.wsas.context.ContextManager_1",
-					  new Object[]{ex});
+        wsasLogger.i18NLogger.warn_context_ContextManager_1(ex);
 	}
 	
 	if (services != null)
@@ -94,8 +88,7 @@
 	    }
 	    catch (Exception ex)
 	    {
-		wsasLogger.arjLoggerI18N.warn("com.arjuna.mw.wsas.context.ContextManager_2",
-					      new Object[]{ex});
+            wsasLogger.i18NLogger.warn_context_ContextManager_2(ex);
 		
 		ctxs = null;
 	    }

Modified: labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasI18NLogger.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasI18NLogger.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -39,93 +39,80 @@
         Allocate new messages by following instructions at the bottom of the file.
      */
 
-    @Message(id = 41001, value = "allHighLevelServices threw:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_context_ContextManager_1();
+    @Message(id = 41001, value = "allHighLevelServices threw exception", format = MESSAGE_FORMAT)
+    @LogMessage(level = WARN)
+	public void warn_context_ContextManager_1(Throwable arg0);
 
-	@Message(id = 41002, value = "assembling contexts and received:", format = MESSAGE_FORMAT)
+	@Message(id = 41002, value = "assembling contexts and received exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_context_ContextManager_2();
+	public void warn_context_ContextManager_2(Throwable arg0);
 
-	@Message(id = 41003, value = "not found.", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_utils_Configuration_1();
+//	@Message(id = 41003, value = "not found.", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_utils_Configuration_1();
 
 	@Message(id = 41004, value = "Failed to create doc", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_utils_Configuration_2();
+	public String get_utils_Configuration_2();
 
-	@Message(id = 41005, value = "Activity.start caught:", format = MESSAGE_FORMAT)
+	@Message(id = 41005, value = "Activity.start caught exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_UserActivityImple_1();
+	public void warn_UserActivityImple_1(Throwable arg0);
 
 	@Message(id = 41006, value = "currentActivity.end threw:", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_UserActivityImple_2();
+	public void warn_UserActivityImple_2(Throwable arg0);
 
-	@Message(id = 41007, value = "Activity.completed caught:", format = MESSAGE_FORMAT)
+	@Message(id = 41007, value = "Activity.completed caught exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_UserActivityImple_3();
+	public void warn_UserActivityImple_3(Throwable arg0);
 
 	@Message(id = 41008, value = "Activity.suspended caught:", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_UserActivityImple_4();
+	public void warn_UserActivityImple_4(Throwable arg0);
 
-	@Message(id = 41009, value = "Activity.resumed caught:", format = MESSAGE_FORMAT)
+	@Message(id = 41009, value = "Activity.resumed caught exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_UserActivityImple_5();
+	public void warn_UserActivityImple_5(Throwable arg0);
 
 	@Message(id = 41010, value = "Unknown activity implementation!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_UserActivityImple_51();
+	public String get_UserActivityImple_51();
 
 	@Message(id = 41011, value = "State incompatible to start activity:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_activity_ActivityImple_1();
+	public String get_activity_ActivityImple_1();
 
 	@Message(id = 41012, value = "Cannot remove child activity from parent as parent's status is:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_activity_ActivityImple_10();
+	public String get_activity_ActivityImple_10();
 
 	@Message(id = 41013, value = "Activity cannot complete as it has active children:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_activity_ActivityImple_2();
+	public String get_activity_ActivityImple_2();
 
 	@Message(id = 41014, value = "Cannot complete activity in status:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_activity_ActivityImple_3();
+	public String get_activity_ActivityImple_3();
 
 	@Message(id = 41015, value = "Cannot set completion status on activity as the status is incompatible:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_activity_ActivityImple_4();
+	public String get_activity_ActivityImple_4();
 
 	@Message(id = 41016, value = "Cannot change completion status, value is incompatible:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_activity_ActivityImple_5();
+	public String get_activity_ActivityImple_5();
 
 	@Message(id = 41017, value = "Cannot enlist null child!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_activity_ActivityImple_6();
+	public String get_activity_ActivityImple_6();
 
 	@Message(id = 41018, value = "Cannot enlist child activity with parent as parent's status is:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_activity_ActivityImple_7();
+	public String get_activity_ActivityImple_7();
 
 	@Message(id = 41019, value = "Cannot remove null child!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_activity_ActivityImple_8();
+	public String get_activity_ActivityImple_8();
 
 	@Message(id = 41020, value = "The following child activity is unknown to the parent:", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_activity_ActivityImple_9();
+	public String get_activity_ActivityImple_9();
 
 	@Message(id = 41021, value = "ActivityReaper: could not terminate.", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
 	public void warn_activity_ActivityReaper_1();
 
 	@Message(id = 41022, value = "HLS not found!", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_activity_HLSManager_1();
+	public String get_activity_HLSManager_1();
 
     /*
         Allocate new messages directly above this notice.

Added: labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasI18NLoggerImpl.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasI18NLoggerImpl.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates,
+ * and individual contributors as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2010,
+ * @author JBoss, by Red Hat.
+ */
+package com.arjuna.mw.wsas.logging;
+
+import org.jboss.logging.Logger;
+import static org.jboss.logging.Logger.Level.*;
+
+/**
+ * i18n log messages for the wsas module.
+ * This class is autogenerated. Don't mess with it.
+ *
+ * @author Jonathan Halliday (jonathan.halliday at redhat.com) 2010-06
+ */
+public class wsasI18NLoggerImpl implements wsasI18NLogger {
+
+	private final Logger logger;
+
+	wsasI18NLoggerImpl(Logger logger) {
+		this.logger = logger;
+	}
+
+	public void warn_context_ContextManager_1(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-41001 allHighLevelServices threw exception", (Object)null);
+	}
+
+	public void warn_context_ContextManager_2(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-41002 assembling contexts and received exception", (Object)null);
+	}
+
+	public String get_utils_Configuration_2() {
+		return "ARJUNA-41004 Failed to create doc";
+	}
+
+	public void warn_UserActivityImple_1(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-41005 Activity.start caught exception", (Object)null);
+	}
+
+	public void warn_UserActivityImple_2(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-41006 currentActivity.end threw:", (Object)null);
+	}
+
+	public void warn_UserActivityImple_3(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-41007 Activity.completed caught exception", (Object)null);
+	}
+
+	public void warn_UserActivityImple_4(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-41008 Activity.suspended caught:", (Object)null);
+	}
+
+	public void warn_UserActivityImple_5(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-41009 Activity.resumed caught exception", (Object)null);
+	}
+
+	public String get_UserActivityImple_51() {
+		return "ARJUNA-41010 Unknown activity implementation!";
+	}
+
+	public String get_activity_ActivityImple_1() {
+		return "ARJUNA-41011 State incompatible to start activity:";
+	}
+
+	public String get_activity_ActivityImple_10() {
+		return "ARJUNA-41012 Cannot remove child activity from parent as parent's status is:";
+	}
+
+	public String get_activity_ActivityImple_2() {
+		return "ARJUNA-41013 Activity cannot complete as it has active children:";
+	}
+
+	public String get_activity_ActivityImple_3() {
+		return "ARJUNA-41014 Cannot complete activity in status:";
+	}
+
+	public String get_activity_ActivityImple_4() {
+		return "ARJUNA-41015 Cannot set completion status on activity as the status is incompatible:";
+	}
+
+	public String get_activity_ActivityImple_5() {
+		return "ARJUNA-41016 Cannot change completion status, value is incompatible:";
+	}
+
+	public String get_activity_ActivityImple_6() {
+		return "ARJUNA-41017 Cannot enlist null child!";
+	}
+
+	public String get_activity_ActivityImple_7() {
+		return "ARJUNA-41018 Cannot enlist child activity with parent as parent's status is:";
+	}
+
+	public String get_activity_ActivityImple_8() {
+		return "ARJUNA-41019 Cannot remove null child!";
+	}
+
+	public String get_activity_ActivityImple_9() {
+		return "ARJUNA-41020 The following child activity is unknown to the parent:";
+	}
+
+	public void warn_activity_ActivityReaper_1() {
+		logger.logv(WARN, "ARJUNA-41021 ActivityReaper: could not terminate.", (Object)null);
+	}
+
+	public String get_activity_HLSManager_1() {
+		return "ARJUNA-41022 HLS not found!";
+	}
+}

Modified: labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasLogger.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasLogger.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasLogger.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -32,18 +32,20 @@
 package com.arjuna.mw.wsas.logging;
 
 import com.arjuna.common.util.logging.*;
+import org.jboss.logging.Logger;
 
 public class wsasLogger
 {
 
     public static LogNoi18n      arjLogger;
     public static wsasI18NLogger i18NLogger;
-    public static Logi18n        arjLoggerI18N;
+    //public static Logi18n        arjLoggerI18N;
 
     public static void initialize(LogNoi18n noi18n, Logi18n i18n)
     {
         arjLogger = noi18n;
-        arjLoggerI18N = i18n;
+        //arjLoggerI18N = i18n;
+        i18NLogger = new wsasI18NLoggerImpl(Logger.getLogger("com.arjuna.mw.wsas"));
     }
 
     static

Modified: labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/utils/Configuration.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/utils/Configuration.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/utils/Configuration.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -48,10 +48,6 @@
     public static final String PROPERTIES = "properties";
     public static final String PROPERTY = "property";
 
-    /**
-     * @message com.arjuna.mw.wsas.utils.Configuration_1 [com.arjuna.mw.wsas.utils.Configuration_1] -  not found.
-     */
-
     public static final void initialise (String fileName) throws Exception
     {
 	/*
@@ -70,10 +66,6 @@
 	    initialise(url);
     }
 
-    /**
-     * @message com.arjuna.mw.wsas.utils.Configuration_2 [com.arjuna.mw.wsas.utils.Configuration_2] -  Failed to create doc 
-     */
-
     public static final void initialise (URL url) throws Exception
     {
 	DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -82,7 +74,7 @@
 	    
 	if (doc == null)
 	{
-	    throw new FileNotFoundException(wsasLogger.arjLoggerI18N.getString("com.arjuna.mw.wsas.utils.Configuration_2")+" "+url);
+	    throw new FileNotFoundException(wsasLogger.i18NLogger.get_utils_Configuration_2() + " "+url);
 	}
 	
 	org.w3c.dom.NodeList children = getProperties(doc.getDocumentElement());

Modified: labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/UserActivityImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/UserActivityImple.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/UserActivityImple.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -114,7 +114,6 @@
      * invalid within the current working environment.
      * @exception SystemException Thrown in any other situation.
      *
-     * @message com.arjuna.mwlabs.wsas.UserActivityImple_1 [com.arjuna.mwlabs.wsas.UserActivityImple_1] - Activity.start caught: 
      */
 
     public void start (int timeout) throws WrongStateException, InvalidTimeoutException, SystemException
@@ -151,8 +150,7 @@
 		    }
 		    catch (Exception e)
 		    {
-			wsasLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wsas.UserActivityImple_1",
-						      new Object[]{e});
+                wsasLogger.i18NLogger.warn_UserActivityImple_1(ex);
 		    }
 
 		    throw ex;
@@ -183,8 +181,6 @@
      *
      * @see com.arjuna.mw.wsas.Outcome
      *
-     * @message com.arjuna.mwlabs.wsas.UserActivityImple_2 [com.arjuna.mwlabs.wsas.UserActivityImple_2] - currentActivity.end threw: 
-     * @message com.arjuna.mwlabs.wsas.UserActivityImple_3 [com.arjuna.mwlabs.wsas.UserActivityImple_3] - Activity.completed caught: 
      */
 
     public Outcome end () throws InvalidActivityException, WrongStateException, ProtocolViolationException, SystemException, NoActivityException, SystemException, NoPermissionException, ActiveChildException
@@ -207,8 +203,7 @@
 	}
 	catch (Exception ex)
 	{
-	    wsasLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wsas.UserActivityImple_1",
-					  new Object[]{ex});
+        wsasLogger.i18NLogger.warn_UserActivityImple_1(ex);
 	}
 
 	HLS[] hls = HLSManager.allHighLevelServices();
@@ -223,8 +218,7 @@
 		}
 		catch (SystemException ex)
 		{
-		    wsasLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wsas.UserActivityImple_3",
-						  new Object[]{ex});
+            wsasLogger.i18NLogger.warn_UserActivityImple_3(ex);
 		}
 	    }
 	}
@@ -280,8 +274,7 @@
 	}
 	catch (Exception ex)
 	{
-	    wsasLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wsas.UserActivityImple_2",
-					  new Object[]{ex});
+        wsasLogger.i18NLogger.warn_UserActivityImple_2(ex);
 	}
 
 	HLS[] hls = HLSManager.allHighLevelServices();
@@ -296,8 +289,7 @@
 		}
 		catch (SystemException ex)
 		{
-		    wsasLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wsas.UserActivityImple_3",
-						  new Object[]{ex});
+            wsasLogger.i18NLogger.warn_UserActivityImple_3(ex);
 		}
 	    }
 	}
@@ -456,7 +448,6 @@
      * @return the token representing the current context, if any, or null
      * otherwise.
      *
-     * @message com.arjuna.mwlabs.wsas.UserActivityImple_4 [com.arjuna.mwlabs.wsas.UserActivityImple_4] - Activity.suspended caught: 
      */
 
     public ActivityHierarchy suspend () throws SystemException
@@ -473,8 +464,7 @@
 		}
 		catch (SystemException ex)
 		{
-		    wsasLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wsas.UserActivityImple_4",
-						  new Object[]{ex});
+            wsasLogger.i18NLogger.warn_UserActivityImple_4(ex);
 		}
 	    }
 	}
@@ -501,8 +491,6 @@
      * is invalid in this context.
      * @exception SystemException Thrown if any other error occurs.
      *
-     * @message com.arjuna.mwlabs.wsas.UserActivityImple_5 [com.arjuna.mwlabs.wsas.UserActivityImple_5] - Activity.resumed caught: 
-     * @message com.arjuna.mwlabs.wsas.UserActivityImple_51 [com.arjuna.mwlabs.wsas.UserActivityImple_51] - Unknown activity implementation!
      */
 
     public void resume (ActivityHierarchy tx) throws InvalidActivityException, SystemException
@@ -532,7 +520,7 @@
 		}
 	    }
 	    else
-		throw new InvalidActivityException(wsasLogger.arjLoggerI18N.getString("com.arjuna.mwlabs.wsas.UserActivityImple_51"));
+		throw new InvalidActivityException(wsasLogger.i18NLogger.get_UserActivityImple_51());
 	}
 
 	HLS[] hls = HLSManager.allHighLevelServices();
@@ -547,8 +535,7 @@
 		}
 		catch (SystemException ex)
 		{
-		    wsasLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wsas.UserActivityImple_5",
-						  new Object[]{ex});
+            wsasLogger.i18NLogger.warn_UserActivityImple_5(ex);
 		}
 	    }
 	}

Modified: labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ActivityImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ActivityImple.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ActivityImple.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -143,9 +143,6 @@
 	 * @exception SystemException
 	 *                Thrown in any other situation.
 	 *
-	 * @message com.arjuna.mwlabs.wsas.activity.ActivityImple_1
-	 *          [com.arjuna.mwlabs.wsas.activity.ActivityImple_1] - State
-	 *          incompatible to start activity:
 	 */
 
 	public void start (int timeout) throws WrongStateException,
@@ -184,8 +181,8 @@
 			}
 			else
 				throw new WrongStateException(
-						wsasLogger.arjLoggerI18N.getString("com.arjuna.mwlabs.wsas.activity.ActivityImple_1")
-								+ " " + this + " " + _status);
+                        wsasLogger.i18NLogger.get_activity_ActivityImple_1()
+                                + " " + this + " " + _status);
 		}
 	}
 
@@ -246,12 +243,6 @@
 	 *
 	 * @see com.arjuna.mw.wsas.Outcome
 	 *
-	 * @message com.arjuna.mwlabs.wsas.activity.ActivityImple_2
-	 *          [com.arjuna.mwlabs.wsas.activity.ActivityImple_2] - Activity
-	 *          cannot complete as it has active children:
-	 * @message com.arjuna.mwlabs.wsas.activity.ActivityImple_3
-	 *          [com.arjuna.mwlabs.wsas.activity.ActivityImple_3] - Cannot
-	 *          complete activity in status:
 	 */
 
 	// ActivityFailedException rather than an Outcome status?
@@ -278,8 +269,8 @@
 					 */
 
 					throw new InvalidActivityException(
-							wsasLogger.arjLoggerI18N.getString("com.arjuna.mwlabs.wsas.activity.ActivityImple_2")
-									+ " " + this);
+                            wsasLogger.i18NLogger.get_activity_ActivityImple_2()
+                                    + " " + this);
 				}
 
 				Outcome current = null;
@@ -357,8 +348,8 @@
 					// we can't have terminated yet!
 
 					throw new WrongStateException(
-							wsasLogger.arjLoggerI18N.getString("com.arjuna.mwlabs.wsas.activity.ActivityImple_3")
-									+ " " + _status);
+                            wsasLogger.i18NLogger.get_activity_ActivityImple_3()
+                                    + " " + _status);
 				}
 			}
 		}
@@ -382,9 +373,6 @@
 	 * @exception SystemException
 	 *                Thrown if any other error occurs.
 	 *
-	 * @message com.arjuna.mwlabs.wsas.activity.ActivityImple_4
-	 *          [com.arjuna.mwlabs.wsas.activity.ActivityImple_4] - Cannot set
-	 *          completion status on activity as the status is incompatible:
 	 */
 
 	public void setCompletionStatus (CompletionStatus endStatus)
@@ -400,8 +388,8 @@
 			}
 			else
 				throw new WrongStateException(
-						wsasLogger.arjLoggerI18N.getString("com.arjuna.mwlabs.wsas.activity.ActivityImple_4")
-								+ " " + this + " " + _status);
+                        wsasLogger.i18NLogger.get_activity_ActivityImple_4()
+                                + " " + this + " " + _status);
 		}
 	}
 
@@ -558,9 +546,6 @@
 	 *                Thrown if the specified status is incompatible with that
 	 *                currently possessed by this activity.
 	 *
-	 * @message com.arjuna.mwlabs.wsas.activity.ActivityImple_5
-	 *          [com.arjuna.mwlabs.wsas.activity.ActivityImple_5] - Cannot
-	 *          change completion status, value is incompatible:
 	 */
 
 	public final void completionValid (CompletionStatus cs)
@@ -570,8 +555,8 @@
 		{
 			if (_completionStatus.equals(FailureOnly.instance()))
 				throw new WrongStateException(
-						wsasLogger.arjLoggerI18N.getString("com.arjuna.mwlabs.wsas.activity.ActivityImple_5")
-								+ " " + _completionStatus + " " + cs);
+                        wsasLogger.i18NLogger.get_activity_ActivityImple_5()
+                                + " " + _completionStatus + " " + cs);
 		}
 	}
 
@@ -594,12 +579,6 @@
 	 * @exception SystemException
 	 *                Thrown if some other error occurs.
 	 *
-	 * @message com.arjuna.mwlabs.wsas.activity.ActivityImple_6
-	 *          [com.arjuna.mwlabs.wsas.activity.ActivityImple_6] - Cannot
-	 *          enlist null child!
-	 * @message com.arjuna.mwlabs.wsas.activity.ActivityImple_7
-	 *          [com.arjuna.mwlabs.wsas.activity.ActivityImple_7] - Cannot
-	 *          enlist child activity with parent as parent's status is:
 	 */
 
 	final void addChild (ActivityImple child) throws WrongStateException,
@@ -607,7 +586,7 @@
 	{
 		if (child == null)
 			throw new InvalidActivityException(
-					wsasLogger.arjLoggerI18N.getString("com.arjuna.mwlabs.wsas.activity.ActivityImple_6"));
+                    wsasLogger.i18NLogger.get_activity_ActivityImple_6());
 
 		synchronized (this)
 		{
@@ -617,8 +596,8 @@
 			}
 			else
 				throw new WrongStateException(
-						wsasLogger.arjLoggerI18N.getString("com.arjuna.mwlabs.wsas.activity.ActivityImple_7")
-								+ " " + _status);
+                        wsasLogger.i18NLogger.get_activity_ActivityImple_7()
+                                + " " + _status);
 		}
 	}
 
@@ -636,15 +615,6 @@
 	 * @exception SystemException
 	 *                Thrown if some other error occurs.
 	 *
-	 * @message com.arjuna.mwlabs.wsas.activity.ActivityImple_8
-	 *          [com.arjuna.mwlabs.wsas.activity.ActivityImple_8] - Cannot
-	 *          remove null child!
-	 * @message com.arjuna.mwlabs.wsas.activity.ActivityImple_9
-	 *          [com.arjuna.mwlabs.wsas.activity.ActivityImple_9] - The
-	 *          following child activity is unknown to the parent:
-	 * @message com.arjuna.mwlabs.wsas.activity.ActivityImple_10
-	 *          [com.arjuna.mwlabs.wsas.activity.ActivityImple_10] - Cannot
-	 *          remove child activity from parent as parent's status is:
 	 */
 
 	final void removeChild (ActivityImple child) throws WrongStateException,
@@ -652,7 +622,7 @@
 	{
 		if (child == null)
 			throw new InvalidActivityException(
-					wsasLogger.arjLoggerI18N.getString("com.arjuna.mwlabs.wsas.activity.ActivityImple_8"));
+                    wsasLogger.i18NLogger.get_activity_ActivityImple_8());
 
 		synchronized (this)
 		{
@@ -660,13 +630,13 @@
 			{
 				if (_children.get(child.getGlobalId()) == null)
 					throw new InvalidActivityException(
-							wsasLogger.arjLoggerI18N.getString("com.arjuna.mwlabs.wsas.activity.ActivityImple_9")
-									+ child);
+                            wsasLogger.i18NLogger.get_activity_ActivityImple_9()
+                                    + child);
 			}
 			else
 				throw new WrongStateException(
-						wsasLogger.arjLoggerI18N.getString("com.arjuna.mwlabs.wsas.activity.ActivityImple_10")
-								+ _status);
+                        wsasLogger.i18NLogger.get_activity_ActivityImple_10()
+                                + _status);
 		}
 	}
 

Modified: labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ActivityReaper.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ActivityReaper.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ActivityReaper.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -85,7 +85,6 @@
      *
      * Timeout is given in millisecon>ds.
      *
-     * @message com.arjuna.mwlabs.wsas.activity.ActivityReaper_1 [com.arjuna.mwlabs.wsas.activity.ActivityReaper_1] - ActivityReaper: could not terminate.
      */
 
     public final boolean check (long timeout)
@@ -164,7 +163,7 @@
 
 		    if (error)
 		    {
-			wsasLogger.arjLoggerI18N.warn("com.arjuna.mwlabs.wsas.activity.ActivityReaper_1");
+                wsasLogger.i18NLogger.warn_activity_ActivityReaper_1();
 		    }
 		}
 	    }

Modified: labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/HLSManager.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/HLSManager.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/HLSManager.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -71,10 +71,6 @@
     }
     }
 
-    /**
-     * @message com.arjuna.mwlabs.wsas.activity.HLSManager_1 [com.arjuna.mwlabs.wsas.activity.HLSManager_1] - HLS not found!
-     */
-
     public static final void removeHLS (HLS service) throws InvalidHLSException, SystemException
     {
 	if (service == null)
@@ -93,7 +89,7 @@
                 }
             }
             if (!found) {
-                throw new InvalidHLSException(wsasLogger.arjLoggerI18N.getString("com.arjuna.mwlabs.wsas.activity.HLSManager_1"));
+                throw new InvalidHLSException(wsasLogger.i18NLogger.get_activity_HLSManager_1());
             } else {
                 _hls.remove(elem);
             }

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/XTSLogger.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/XTSLogger.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/XTSLogger.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -13,13 +13,14 @@
     public static BasicLogger logger;
     public static xtsrecoveryI18NLogger i18NLogger;
 
-    public static Logi18n arjLoggerI18N;
+    //public static Logi18n arjLoggerI18N;
 
     public static void initialize(LogNoi18n noi18n, Logi18n i18n)
     {
         arjLogger = noi18n;
-        arjLoggerI18N = i18n;
+        //arjLoggerI18N = i18n;
         logger = Logger.getLogger("com.arjuna.wsrecovery");
+        i18NLogger = new xtsrecoveryI18NLoggerImpl(Logger.getLogger("com.arjuna.wsrecovery"));
     }
 
     static

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/xtsrecoveryI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/xtsrecoveryI18NLogger.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/xtsrecoveryI18NLogger.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -20,6 +20,7 @@
  */
 package org.jboss.jbossts.xts.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.*;
@@ -39,129 +40,129 @@
         Allocate new messages by following instructions at the bottom of the file.
      */
 
-	@Message(id = 46001, value = "RecoveryATCoordinator.replayPhase2: Unexpected status: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_coordinator_at_RecoveryATCoordinator_2(String arg0);
+//	@Message(id = 46001, value = "RecoveryATCoordinator.replayPhase2: Unexpected status: {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_coordinator_at_RecoveryATCoordinator_2(String arg0);
 
 	@Message(id = 46002, value = "RecoveryATCoordinator.replayPhase2 transaction {0} not activated, unable to replay phase 2 commit", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_at_RecoveryATCoordinator_4(String arg0);
+	public void warn_coordinator_at_RecoveryATCoordinator_4(Uid arg0);
 
-	@Message(id = 46003, value = "RecoverySubordinateATCoordinator.replayPhase2: Unexpected status: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_coordinator_at_RecoverySubordinateATCoordinator_2(String arg0);
+//	@Message(id = 46003, value = "RecoverySubordinateATCoordinator.replayPhase2: Unexpected status: {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_coordinator_at_RecoverySubordinateATCoordinator_2(String arg0);
 
 	@Message(id = 46004, value = "RecoverySubordinateATCoordinator.replayPhase2 transaction {0} not activated, unable to replay phase 2 commit", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_at_RecoverySubordinateATCoordinator_4(String arg0);
+	public void warn_coordinator_at_RecoverySubordinateATCoordinator_4(Uid arg0);
 
-	@Message(id = 46005, value = "RecoverBASubordinateCoordinator.replayPhase2: Unexpected status: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_coordinator_ba_RecoverBASubordinateCoordinator_2(String arg0);
+//	@Message(id = 46005, value = "RecoverBASubordinateCoordinator.replayPhase2: Unexpected status: {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_coordinator_ba_RecoverBASubordinateCoordinator_2(String arg0);
 
 	@Message(id = 46006, value = "RecoverBASubordinateCoordinator.replayPhase2 transaction {0} not activated, unable to replay phase 2 commit", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_ba_RecoverBASubordinateCoordinator_4(String arg0);
+	public void warn_coordinator_ba_RecoverBASubordinateCoordinator_4(Uid arg0);
 
-	@Message(id = 46007, value = "RecoveryBACoordinator.replayPhase2: Unexpected status: {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_coordinator_ba_RecoveryBACoordinator_2(String arg0);
+//	@Message(id = 46007, value = "RecoveryBACoordinator.replayPhase2: Unexpected status: {0}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_coordinator_ba_RecoveryBACoordinator_2(String arg0);
 
 	@Message(id = 46008, value = "RecoveryBACoordinator.replayPhase2 transaction {0} not activated, unable to replay phase 2 commit", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_ba_RecoveryBACoordinator_4(String arg0);
+	public void warn_coordinator_ba_RecoveryBACoordinator_4(Uid arg0);
 
-	@Message(id = 46009, value = "RecoverBASubordinateCoordinator.replayPhase2 recovering {0} ActionStatus is {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_coordinator_ba_RecoverySubordinateBACoordinator_1(String arg0, String arg1);
+//	@Message(id = 46009, value = "RecoverBASubordinateCoordinator.replayPhase2 recovering {0} ActionStatus is {1}", format = MESSAGE_FORMAT)
+//	@LogMessage(level = WARN)
+//	public void warn_coordinator_ba_RecoverySubordinateBACoordinator_1(String arg0, String arg1);
 
-	@Message(id = 46010, value = "RecoveryManagerStatusModule: Object store exception: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 46010, value = "RecoveryManagerStatusModule: Object store exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_at_ATCoordinatorRecoveryModule_1(String arg0);
+	public void warn_coordinator_at_ATCoordinatorRecoveryModule_1(Throwable arg0);
 
-	@Message(id = 46011, value = "failed to recover Transaction {0} {1}", format = MESSAGE_FORMAT)
+	@Message(id = 46011, value = "failed to recover Transaction {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_at_ATCoordinatorRecoveryModule_2(String arg0, String arg1);
+	public void warn_coordinator_at_ATCoordinatorRecoveryModule_2(Uid arg0, Throwable arg1);
 
-	@Message(id = 46012, value = "failed to access transaction store {0} {1}", format = MESSAGE_FORMAT)
+	@Message(id = 46012, value = "failed to access transaction store {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_at_ATCoordinatorRecoveryModule_3(String arg0, String arg1);
+	public void warn_coordinator_at_ATCoordinatorRecoveryModule_3(Uid arg0, Throwable arg1);
 
-	@Message(id = 46013, value = "RecoveryManagerStatusModule: Object store exception: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 46013, value = "RecoveryManagerStatusModule: Object store exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_at_SubordinateATCoordinatorRecoveryModule_1(String arg0);
+	public void warn_coordinator_at_SubordinateATCoordinatorRecoveryModule_1(Throwable arg0);
 
-	@Message(id = 46014, value = "failed to recover Transaction {0} {1}", format = MESSAGE_FORMAT)
+	@Message(id = 46014, value = "failed to recover Transaction {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_at_SubordinateATCoordinatorRecoveryModule_2(String arg0, String arg1);
+	public void warn_coordinator_at_SubordinateATCoordinatorRecoveryModule_2(Uid arg0, Throwable arg1);
 
-	@Message(id = 46015, value = "failed to access transaction store {0} {1}", format = MESSAGE_FORMAT)
+	@Message(id = 46015, value = "failed to access transaction store {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_at_SubordinateATCoordinatorRecoveryModule_3(String arg0, String arg1);
+	public void warn_coordinator_at_SubordinateATCoordinatorRecoveryModule_3(Uid arg0, Throwable arg1);
 
-	@Message(id = 46016, value = "RecoveryManagerStatusModule: Object store exception: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 46016, value = "RecoveryManagerStatusModule: Object store exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_ba_BACoordinatorRecoveryModule_1(String arg0);
+	public void warn_coordinator_ba_BACoordinatorRecoveryModule_1(Throwable arg0);
 
-	@Message(id = 46017, value = "failed to recover Transaction {0} {1}", format = MESSAGE_FORMAT)
+	@Message(id = 46017, value = "failed to recover Transaction {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_ba_BACoordinatorRecoveryModule_2(String arg0, String arg1);
+	public void warn_coordinator_ba_BACoordinatorRecoveryModule_2(Uid arg0, Throwable arg1);
 
-	@Message(id = 46018, value = "failed to access transaction store {0} {1}", format = MESSAGE_FORMAT)
+	@Message(id = 46018, value = "failed to access transaction store {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_ba_BACoordinatorRecoveryModule_3(String arg0, String arg1);
+	public void warn_coordinator_ba_BACoordinatorRecoveryModule_3(Uid arg0, Throwable arg1);
 
-	@Message(id = 46019, value = "failed to recover Transaction {0} {1}", format = MESSAGE_FORMAT)
+	@Message(id = 46019, value = "failed to recover Transaction {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_ba_SubordinateBACoordinatorRecoveryModule_2(String arg0, String arg1);
+	public void warn_coordinator_ba_SubordinateBACoordinatorRecoveryModule_2(Uid arg0, Throwable arg1);
 
-	@Message(id = 46020, value = "failed to access transaction store {0} {1}", format = MESSAGE_FORMAT)
+	@Message(id = 46020, value = "failed to access transaction store {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_ba_SubordinateBACoordinatorRecoveryModule_3(String arg0, String arg1);
+	public void warn_coordinator_ba_SubordinateBACoordinatorRecoveryModule_3(Uid arg0, Throwable arg1);
 
-	@Message(id = 46021, value = "RecoveryManagerStatusModule: Object store exception: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 46021, value = "RecoveryManagerStatusModule: Object store exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_coordinator_ba_SubordinateCoordinatorRecoveryModule_1(String arg0);
+	public void warn_coordinator_ba_SubordinateCoordinatorRecoveryModule_1(Throwable arg0);
 
-	@Message(id = 46022, value = "RecoveryManagerStatusModule: Object store exception: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 46022, value = "RecoveryManagerStatusModule: Object store exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_participant_at_ATParticipantRecoveryModule_1(String arg0);
+	public void warn_participant_at_ATParticipantRecoveryModule_1(Throwable arg0);
 
 	@Message(id = 46023, value = "failed to access transaction store {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_participant_at_ATParticipantRecoveryModule_3(String arg0);
+	public void warn_participant_at_ATParticipantRecoveryModule_3(Uid arg0, Throwable arg1);
 
 	@Message(id = 46024, value = "unable to load recovery record implementation class {0} for WS-AT participant recovery record {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_participant_at_ATParticipantRecoveryModule_4(String arg0, String arg1);
+	@LogMessage(level = ERROR)
+	public void error_participant_at_ATParticipantRecoveryModule_4(String arg0, Uid arg1, Throwable arg2);
 
 	@Message(id = 46025, value = "unable to instantiate recovery record implementation class {0} for WS-AT participant recovery record {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_participant_at_ATParticipantRecoveryModule_5(String arg0, String arg1);
+	@LogMessage(level = ERROR)
+	public void error_participant_at_ATParticipantRecoveryModule_5(String arg0, Uid arg1, Throwable arg2);
 
 	@Message(id = 46026, value = "unable to unpack recovery record data for WS-AT participant recovery record {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_participant_at_ATParticipantRecoveryModule_6(String arg0);
+	@LogMessage(level = ERROR)
+	public void error_participant_at_ATParticipantRecoveryModule_6(Uid arg0, Throwable arg1);
 
 	@Message(id = 46027, value = "missing recovery record data for WS-AT participant recovery record {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_participant_at_ATParticipantRecoveryModule_7(String arg0);
+	@LogMessage(level = ERROR)
+	public void error_participant_at_ATParticipantRecoveryModule_7(Uid arg0);
 
 	@Message(id = 46028, value = "unable to read recovery record data for WS-AT participant recovery record {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_participant_at_ATParticipantRecoveryModule_8(String arg0);
+	@LogMessage(level = ERROR)
+	public void error_participant_at_ATParticipantRecoveryModule_8(Uid arg0, Throwable arg1);
 
 	@Message(id = 46029, value = "exception writing recovery record for WS-AT participant {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_participant_at_XTSATRecoveryModule_1(String arg0);
+	public void warn_participant_at_XTSATRecoveryModule_1(String arg0, Throwable arg1);
 
 	@Message(id = 46030, value = "exception removing recovery record {0} for WS-AT participant {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_participant_at_XTSATRecoveryModule_2(String arg0, String arg1);
+	public void warn_participant_at_XTSATRecoveryModule_2(Uid arg0, String arg1, Throwable arg2);
 
 	@Message(id = 46031, value = "exception reactivating recovered WS-AT participant {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_participant_at_XTSATRecoveryModule_3(String arg0);
+	public void warn_participant_at_XTSATRecoveryModule_3(String arg0, Throwable arg1);
 
 	@Message(id = 46032, value = "no XTS application recovery module found to help reactivate recovered WS-AT participant {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
@@ -169,47 +170,47 @@
 
 	@Message(id = 46033, value = "Compensating orphaned subordinate WS-AT transcation {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_participant_at_XTSATRecoveryModule_5(String arg0);
+	public void warn_participant_at_XTSATRecoveryModule_5(Uid arg0);
 
-	@Message(id = 46034, value = "RecoveryManagerStatusModule: Object store exception: {0}", format = MESSAGE_FORMAT)
+	@Message(id = 46034, value = "RecoveryManagerStatusModule: Object store exception", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_participant_ba_BAParticipantRecoveryModule_1(String arg0);
+	public void warn_participant_ba_BAParticipantRecoveryModule_1(Throwable arg0);
 
 	@Message(id = 46035, value = "failed to access transaction store {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_participant_ba_BAParticipantRecoveryModule_3(String arg0);
+	public void warn_participant_ba_BAParticipantRecoveryModule_3(Uid arg0, Throwable arg1);
 
 	@Message(id = 46036, value = "unable to load recovery record implementation class {0} for WS-BA participant recovery record {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_participant_ba_BAParticipantRecoveryModule_4(String arg0, String arg1);
+	@LogMessage(level = ERROR)
+	public void error_participant_ba_BAParticipantRecoveryModule_4(String arg0, Uid arg1, Throwable arg2);
 
 	@Message(id = 46037, value = "unable to instantiate recovery record implementation class {0} for WS-BA participant recovery record {1}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_participant_ba_BAParticipantRecoveryModule_5(String arg0, String arg1);
+	@LogMessage(level = ERROR)
+	public void error_participant_ba_BAParticipantRecoveryModule_5(String arg0, Uid arg1, Throwable arg2);
 
 	@Message(id = 46038, value = "unable to unpack recovery record data for WS-BA participant recovery record {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_participant_ba_BAParticipantRecoveryModule_6(String arg0);
+	public void warn_participant_ba_BAParticipantRecoveryModule_6(Uid arg0, Throwable arg1);
 
 	@Message(id = 46039, value = "missing recovery record data for WS-BA participant recovery record {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_participant_ba_BAParticipantRecoveryModule_7(String arg0);
+	@LogMessage(level = ERROR)
+	public void error_participant_ba_BAParticipantRecoveryModule_7(Uid arg0);
 
 	@Message(id = 46040, value = "unable to read recovery record data for WS-BA participant recovery record {0}", format = MESSAGE_FORMAT)
-	@LogMessage(level = WARN)
-	public void warn_participant_ba_BAParticipantRecoveryModule_8(String arg0);
+	@LogMessage(level = ERROR)
+	public void error_participant_ba_BAParticipantRecoveryModule_8(Uid arg0, Throwable arg1);
 
 	@Message(id = 46041, value = "exception writing recovery record for WS-BA participant {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_participant_ba_XTSBARecoveryModule_1(String arg0);
+	public void warn_participant_ba_XTSBARecoveryModule_1(String arg0, Throwable arg1);
 
 	@Message(id = 46042, value = "exception removing recovery record {0} for WS-BA participant {1}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_participant_ba_XTSBARecoveryModule_2(String arg0, String arg1);
+	public void warn_participant_ba_XTSBARecoveryModule_2(Uid arg0, String arg1, Throwable arg2);
 
 	@Message(id = 46043, value = "exception reactivating recovered WS-BA participant {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_participant_ba_XTSBARecoveryModule_3(String arg0);
+	public void warn_participant_ba_XTSBARecoveryModule_3(String arg0, Throwable arg1);
 
 	@Message(id = 46044, value = "no XTS application recovery module found to help reactivate recovered WS-BA participant {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
@@ -217,7 +218,7 @@
 
 	@Message(id = 46045, value = "Compensating orphaned subordinate WS-BA transcation {0}", format = MESSAGE_FORMAT)
 	@LogMessage(level = WARN)
-	public void warn_participant_ba_XTSBARecoveryModule_5(String arg0);
+	public void warn_participant_ba_XTSBARecoveryModule_5(Uid arg0);
 
     /*
         Allocate new messages directly above this notice.

Added: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/xtsrecoveryI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/xtsrecoveryI18NLoggerImpl.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/xtsrecoveryI18NLoggerImpl.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -0,0 +1,200 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates,
+ * and individual contributors as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2010,
+ * @author JBoss, by Red Hat.
+ */
+package org.jboss.jbossts.xts.logging;
+
+import org.jboss.logging.Logger;
+import static org.jboss.logging.Logger.Level.*;
+import com.arjuna.ats.arjuna.common.Uid;
+
+/**
+ * i18n log messages for the xtsrecovery module.
+ * This class is autogenerated. Don't mess with it.
+ *
+ * @author Jonathan Halliday (jonathan.halliday at redhat.com) 2010-06
+ */
+public class xtsrecoveryI18NLoggerImpl implements xtsrecoveryI18NLogger {
+
+	private final Logger logger;
+
+	xtsrecoveryI18NLoggerImpl(Logger logger) {
+		this.logger = logger;
+	}
+
+	public void warn_coordinator_at_RecoveryATCoordinator_4(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-46002 RecoveryATCoordinator.replayPhase2 transaction {0} not activated, unable to replay phase 2 commit", arg0);
+	}
+
+	public void warn_coordinator_at_RecoverySubordinateATCoordinator_4(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-46004 RecoverySubordinateATCoordinator.replayPhase2 transaction {0} not activated, unable to replay phase 2 commit", arg0);
+	}
+
+	public void warn_coordinator_ba_RecoverBASubordinateCoordinator_4(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-46006 RecoverBASubordinateCoordinator.replayPhase2 transaction {0} not activated, unable to replay phase 2 commit", arg0);
+	}
+
+	public void warn_coordinator_ba_RecoveryBACoordinator_4(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-46008 RecoveryBACoordinator.replayPhase2 transaction {0} not activated, unable to replay phase 2 commit", arg0);
+	}
+
+	public void warn_coordinator_at_ATCoordinatorRecoveryModule_1(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-46010 RecoveryManagerStatusModule: Object store exception", (Object)null);
+	}
+
+	public void warn_coordinator_at_ATCoordinatorRecoveryModule_2(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-46011 failed to recover Transaction {0}", arg0);
+	}
+
+	public void warn_coordinator_at_ATCoordinatorRecoveryModule_3(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-46012 failed to access transaction store {0}", arg0);
+	}
+
+	public void warn_coordinator_at_SubordinateATCoordinatorRecoveryModule_1(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-46013 RecoveryManagerStatusModule: Object store exception", (Object)null);
+	}
+
+	public void warn_coordinator_at_SubordinateATCoordinatorRecoveryModule_2(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-46014 failed to recover Transaction {0}", arg0);
+	}
+
+	public void warn_coordinator_at_SubordinateATCoordinatorRecoveryModule_3(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-46015 failed to access transaction store {0}", arg0);
+	}
+
+	public void warn_coordinator_ba_BACoordinatorRecoveryModule_1(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-46016 RecoveryManagerStatusModule: Object store exception", (Object)null);
+	}
+
+	public void warn_coordinator_ba_BACoordinatorRecoveryModule_2(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-46017 failed to recover Transaction {0}", arg0);
+	}
+
+	public void warn_coordinator_ba_BACoordinatorRecoveryModule_3(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-46018 failed to access transaction store {0}", arg0);
+	}
+
+	public void warn_coordinator_ba_SubordinateBACoordinatorRecoveryModule_2(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-46019 failed to recover Transaction {0}", arg0);
+	}
+
+	public void warn_coordinator_ba_SubordinateBACoordinatorRecoveryModule_3(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-46020 failed to access transaction store {0}", arg0);
+	}
+
+	public void warn_coordinator_ba_SubordinateCoordinatorRecoveryModule_1(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-46021 RecoveryManagerStatusModule: Object store exception", (Object)null);
+	}
+
+	public void warn_participant_at_ATParticipantRecoveryModule_1(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-46022 RecoveryManagerStatusModule: Object store exception", (Object)null);
+	}
+
+	public void warn_participant_at_ATParticipantRecoveryModule_3(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-46023 failed to access transaction store {0}", arg0);
+	}
+
+	public void error_participant_at_ATParticipantRecoveryModule_4(String arg0, Uid arg1, Throwable arg2) {
+		logger.logv(ERROR, arg2, "ARJUNA-46024 unable to load recovery record implementation class {0} for WS-AT participant recovery record {1}", arg0, arg1);
+	}
+
+	public void error_participant_at_ATParticipantRecoveryModule_5(String arg0, Uid arg1, Throwable arg2) {
+		logger.logv(ERROR, arg2, "ARJUNA-46025 unable to instantiate recovery record implementation class {0} for WS-AT participant recovery record {1}", arg0, arg1);
+	}
+
+	public void error_participant_at_ATParticipantRecoveryModule_6(Uid arg0, Throwable arg1) {
+		logger.logv(ERROR, arg1, "ARJUNA-46026 unable to unpack recovery record data for WS-AT participant recovery record {0}", arg0);
+	}
+
+	public void error_participant_at_ATParticipantRecoveryModule_7(Uid arg0) {
+		logger.logv(ERROR, "ARJUNA-46027 missing recovery record data for WS-AT participant recovery record {0}", arg0);
+	}
+
+	public void error_participant_at_ATParticipantRecoveryModule_8(Uid arg0, Throwable arg1) {
+		logger.logv(ERROR, arg1, "ARJUNA-46028 unable to read recovery record data for WS-AT participant recovery record {0}", arg0);
+	}
+
+	public void warn_participant_at_XTSATRecoveryModule_1(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-46029 exception writing recovery record for WS-AT participant {0}", arg0);
+	}
+
+	public void warn_participant_at_XTSATRecoveryModule_2(Uid arg0, String arg1, Throwable arg2) {
+		logger.logv(WARN, arg2, "ARJUNA-46030 exception removing recovery record {0} for WS-AT participant {1}", arg0, arg1);
+	}
+
+	public void warn_participant_at_XTSATRecoveryModule_3(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-46031 exception reactivating recovered WS-AT participant {0}", arg0);
+	}
+
+	public void warn_participant_at_XTSATRecoveryModule_4(String arg0) {
+		logger.logv(WARN, "ARJUNA-46032 no XTS application recovery module found to help reactivate recovered WS-AT participant {0}", arg0);
+	}
+
+	public void warn_participant_at_XTSATRecoveryModule_5(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-46033 Compensating orphaned subordinate WS-AT transcation {0}", arg0);
+	}
+
+	public void warn_participant_ba_BAParticipantRecoveryModule_1(Throwable arg0) {
+		logger.logv(WARN, arg0, "ARJUNA-46034 RecoveryManagerStatusModule: Object store exception", (Object)null);
+	}
+
+	public void warn_participant_ba_BAParticipantRecoveryModule_3(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-46035 failed to access transaction store {0}", arg0);
+	}
+
+	public void error_participant_ba_BAParticipantRecoveryModule_4(String arg0, Uid arg1, Throwable arg2) {
+		logger.logv(ERROR, arg2, "ARJUNA-46036 unable to load recovery record implementation class {0} for WS-BA participant recovery record {1}", arg0, arg1);
+	}
+
+	public void error_participant_ba_BAParticipantRecoveryModule_5(String arg0, Uid arg1, Throwable arg2) {
+		logger.logv(ERROR, arg2, "ARJUNA-46037 unable to instantiate recovery record implementation class {0} for WS-BA participant recovery record {1}", arg0, arg1);
+	}
+
+	public void warn_participant_ba_BAParticipantRecoveryModule_6(Uid arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-46038 unable to unpack recovery record data for WS-BA participant recovery record {0}", arg0);
+	}
+
+	public void error_participant_ba_BAParticipantRecoveryModule_7(Uid arg0) {
+		logger.logv(ERROR, "ARJUNA-46039 missing recovery record data for WS-BA participant recovery record {0}", arg0);
+	}
+
+	public void error_participant_ba_BAParticipantRecoveryModule_8(Uid arg0, Throwable arg1) {
+		logger.logv(ERROR, arg1, "ARJUNA-46040 unable to read recovery record data for WS-BA participant recovery record {0}", arg0);
+	}
+
+	public void warn_participant_ba_XTSBARecoveryModule_1(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-46041 exception writing recovery record for WS-BA participant {0}", arg0);
+	}
+
+	public void warn_participant_ba_XTSBARecoveryModule_2(Uid arg0, String arg1, Throwable arg2) {
+		logger.logv(WARN, arg2, "ARJUNA-46042 exception removing recovery record {0} for WS-BA participant {1}", arg0, arg1);
+	}
+
+	public void warn_participant_ba_XTSBARecoveryModule_3(String arg0, Throwable arg1) {
+		logger.logv(WARN, arg1, "ARJUNA-46043 exception reactivating recovered WS-BA participant {0}", arg0);
+	}
+
+	public void warn_participant_ba_XTSBARecoveryModule_4(String arg0) {
+		logger.logv(WARN, "ARJUNA-46044 no XTS application recovery module found to help reactivate recovered WS-BA participant {0}", arg0);
+	}
+
+	public void warn_participant_ba_XTSBARecoveryModule_5(Uid arg0) {
+		logger.logv(WARN, "ARJUNA-46045 Compensating orphaned subordinate WS-BA transcation {0}", arg0);
+	}
+}

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/ATCoordinatorRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/ATCoordinatorRecoveryModule.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/ATCoordinatorRecoveryModule.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -46,9 +46,6 @@
  *
  * $Id$
  *
- * @message org.jboss.transactions.xts.recovery.coordinator.at.ATCoordinatorRecoveryModule_1 [org.jboss.transactions.xts.recovery.coordinator.at.ATCoordinatorRecoveryModule_1] - RecoveryManagerStatusModule: Object store exception: {0}
- * @message org.jboss.transactions.xts.recovery.coordinator.at.ATCoordinatorRecoveryModule_2 [org.jboss.transactions.xts.recovery.coordinator.at.ATCoordinatorRecoveryModule_2] - failed to recover Transaction {0} {1}
- * @message org.jboss.transactions.xts.recovery.coordinator.at.ATCoordinatorRecoveryModule_3 [org.jboss.transactions.xts.recovery.coordinator.at.ATCoordinatorRecoveryModule_3] - failed to access transaction store {0} {1}
  */
 public class ATCoordinatorRecoveryModule implements RecoveryModule
 {
@@ -105,11 +102,7 @@
         }
         catch ( ObjectStoreException ex )
         {
-            if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.coordinator.at.ATCoordinatorRecoveryModule_1",
-                        new Object[]{ex});
-            }
+            XTSLogger.i18NLogger.warn_coordinator_at_ATCoordinatorRecoveryModule_1(ex);
         }
 
         if ( ACCoordinators )
@@ -184,11 +177,7 @@
             }
             catch ( Exception ex )
             {
-                if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.coordinator.at.ATCoordinatorRecoveryModule_2",
-                            new Object[]{recoverUid.toString(), ex});
-                }
+                XTSLogger.i18NLogger.warn_coordinator_at_ATCoordinatorRecoveryModule_2(recoverUid, ex);
             }
         }
     }
@@ -284,11 +273,7 @@
             }
             catch ( ObjectStoreException ex )
             {
-                if (XTSLogger.arjLogger.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.coordinator.at.ATCoordinatorRecoveryModule_3",
-                            new Object[]{currentUid.toString(), ex});
-                }
+                XTSLogger.i18NLogger.warn_coordinator_at_ATCoordinatorRecoveryModule_3(currentUid, ex);
             }
         }
 

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoveryATCoordinator.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoveryATCoordinator.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoveryATCoordinator.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -11,11 +11,7 @@
  * This class is a plug-in module for the recovery manager.
  * It is responsible for recovering failed WSAT ACCoordinator transactions.
  *
- * @message_ org.jboss.jbossts.xts.recovery.coordinator.at.RecoveryATCoordinator_1 [org.jboss.jbossts.xts.recovery.coordinator.at.RecoveryATCoordinator_1] - RecoveryATCoordinator.replayPhase2 recovering {0} ActionStatus is {1}
- * @message org.jboss.jbossts.xts.recovery.coordinator.at.RecoveryATCoordinator_2 [org.jboss.jbossts.xts.recovery.coordinator.at.RecoveryATCoordinator_2] - RecoveryATCoordinator.replayPhase2: Unexpected status: {0}
- * @message_ org.jboss.jbossts.xts.recovery.coordinator.at.RecoveryATCoordinator_3 [org.jboss.jbossts.xts.recovery.coordinator.at.RecoveryATCoordinator_3] - RecoveryATCoordinator.replayPhase2( {0} )  finished
- * @message org.jboss.jbossts.xts.recovery.coordinator.at.RecoveryATCoordinator_4 [org.jboss.jbossts.xts.recovery.coordinator.at.RecoveryATCoordinator_4] - RecoveryATCoordinator.replayPhase2 transaction {0} not activated, unable to replay phase 2 commit
-*/
+ */
 public class RecoveryATCoordinator extends ATCoordinator {
 
    /**
@@ -79,7 +75,7 @@
        }
        else
        {
-	   XTSLogger.arjLoggerI18N.warn("org.jboss.jbossts.xts.recovery.coordinator.at.RecoveryATCoordinator_4", new Object[]{get_uid()});
+           XTSLogger.i18NLogger.warn_coordinator_at_RecoveryATCoordinator_4(get_uid());
        }
    }
 

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoverySubordinateATCoordinator.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoverySubordinateATCoordinator.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoverySubordinateATCoordinator.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -11,11 +11,7 @@
  * This class is a plug-in module for the recovery manager.
  * It is responsible for recovering failed WSAT ACCoordinator transactions.
  *
- * @message_ org.jboss.jbossts.xts.recovery.coordinator.at.RecoverySubordinateATCoordinator_1 [org.jboss.jbossts.xts.recovery.coordinator.at.RecoverySubordinateATCoordinator_1] - RecoverySubordinateATCoordinator.replayPhase2 recovering {0} ActionStatus is {1}
- * @message org.jboss.jbossts.xts.recovery.coordinator.at.RecoverySubordinateATCoordinator_2 [org.jboss.jbossts.xts.recovery.coordinator.at.RecoverySubordinateATCoordinator_2] - RecoverySubordinateATCoordinator.replayPhase2: Unexpected status: {0}
- * @message_ org.jboss.jbossts.xts.recovery.coordinator.at.RecoverySubordinateATCoordinator_3 [org.jboss.jbossts.xts.recovery.coordinator.at.RecoverySubordinateATCoordinator_3] - RecoverySubordinateATCoordinator.replayPhase2( {0} )  finished
- * @message org.jboss.jbossts.xts.recovery.coordinator.at.RecoverySubordinateATCoordinator_4 [org.jboss.jbossts.xts.recovery.coordinator.at.RecoverySubordinateATCoordinator_4] - RecoverySubordinateATCoordinator.replayPhase2 transaction {0} not activated, unable to replay phase 2 commit
-*/
+ */
 public class RecoverySubordinateATCoordinator extends SubordinateATCoordinator {
 
    /**
@@ -102,7 +98,7 @@
        }
        else
        {
-	   XTSLogger.arjLoggerI18N.warn("org.jboss.jbossts.xts.recovery.coordinator.at.RecoverySubordinateATCoordinator_4", new Object[]{get_uid()});
+           XTSLogger.i18NLogger.warn_coordinator_at_RecoverySubordinateATCoordinator_4(get_uid());
        }
    }
 

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/SubordinateATCoordinatorRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/SubordinateATCoordinatorRecoveryModule.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/SubordinateATCoordinatorRecoveryModule.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -46,9 +46,6 @@
  *
  * $Id$
  *
- * @message org.jboss.transactions.xts.recovery.coordinator.at.SubordinateATCoordinatorRecoveryModule_1 [org.jboss.transactions.xts.recovery.coordinator.at.SubordinateATCoordinatorRecoveryModule_1] - RecoveryManagerStatusModule: Object store exception: {0}
- * @message org.jboss.transactions.xts.recovery.coordinator.at.SubordinateATCoordinatorRecoveryModule_2 [org.jboss.transactions.xts.recovery.coordinator.at.SubordinateATCoordinatorRecoveryModule_2] - failed to recover Transaction {0} {1}
- * @message org.jboss.transactions.xts.recovery.coordinator.at.SubordinateATCoordinatorRecoveryModule_3 [org.jboss.transactions.xts.recovery.coordinator.at.SubordinateATCoordinatorRecoveryModule_3] - failed to access transaction store {0} {1}
  */
 public class SubordinateATCoordinatorRecoveryModule implements RecoveryModule
 {
@@ -105,11 +102,7 @@
         }
         catch ( ObjectStoreException ex )
         {
-            if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.coordinator.at.SubordinateATCoordinatorRecoveryModule_1",
-                        new Object[]{ex});
-            }
+            XTSLogger.i18NLogger.warn_coordinator_at_SubordinateATCoordinatorRecoveryModule_1(ex);
         }
 
         if ( SubordinateCoordinators )
@@ -188,11 +181,7 @@
             }
             catch ( Exception ex )
             {
-                if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.coordinator.at.SubordinateATCoordinatorRecoveryModule_2",
-                            new Object[]{recoverUid.toString(), ex});
-                }
+                XTSLogger.i18NLogger.warn_coordinator_at_SubordinateATCoordinatorRecoveryModule_2(recoverUid, ex);
             }
         }
     }
@@ -287,11 +276,7 @@
             }
             catch ( ObjectStoreException ex )
             {
-                if (XTSLogger.arjLogger.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.coordinator.at.SubordinateATCoordinatorRecoveryModule_3",
-                            new Object[]{currentUid.toString(), ex});
-                }
+                XTSLogger.i18NLogger.warn_coordinator_at_SubordinateATCoordinatorRecoveryModule_3(currentUid, ex);
             }
         }
 

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/BACoordinatorRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/BACoordinatorRecoveryModule.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/BACoordinatorRecoveryModule.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -46,9 +46,6 @@
  *
  * $Id$
  *
- * @message org.jboss.transactions.xts.recovery.coordinator.ba.BACoordinatorRecoveryModule_1 [org.jboss.transactions.xts.recovery.coordinator.ba.BACoordinatorRecoveryModule_1] - RecoveryManagerStatusModule: Object store exception: {0}
- * @message org.jboss.transactions.xts.recovery.coordinator.ba.BACoordinatorRecoveryModule_2 [org.jboss.transactions.xts.recovery.coordinator.ba.BACoordinatorRecoveryModule_2] - failed to recover Transaction {0} {1}
- * @message org.jboss.transactions.xts.recovery.coordinator.ba.BACoordinatorRecoveryModule_3 [org.jboss.transactions.xts.recovery.coordinator.ba.BACoordinatorRecoveryModule_3] - failed to access transaction store {0} {1}
  */
 public class BACoordinatorRecoveryModule implements RecoveryModule
 {
@@ -105,11 +102,7 @@
         }
         catch ( ObjectStoreException ex )
         {
-            if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.coordinator.ba.BACoordinatorRecoveryModule_1",
-                        new Object[]{ex});
-            }
+            XTSLogger.i18NLogger.warn_coordinator_ba_BACoordinatorRecoveryModule_1(ex);
         }
 
         if ( ACCoordinators )
@@ -184,11 +177,7 @@
             }
             catch ( Exception ex )
             {
-                if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.coordinator.ba.BACoordinatorRecoveryModule_2",
-                            new Object[]{recoverUid.toString(), ex});
-                }
+                XTSLogger.i18NLogger.warn_coordinator_ba_BACoordinatorRecoveryModule_2(recoverUid, ex);
             }
         }
     }
@@ -283,11 +272,7 @@
             }
             catch ( ObjectStoreException ex )
             {
-                if (XTSLogger.arjLogger.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.coordinator.ba.BACoordinatorRecoveryModule_3",
-                            new Object[]{currentUid.toString(), ex});
-                }
+                XTSLogger.i18NLogger.warn_coordinator_ba_BACoordinatorRecoveryModule_3(currentUid, ex);
             }
         }
 

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/RecoveryBACoordinator.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/RecoveryBACoordinator.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/RecoveryBACoordinator.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -14,11 +14,7 @@
  * This class is a plug-in module for the recovery manager.
  * It is responsible for recovering failed WSBA ACCoordinator transactions.
  *
- * @message_ org.jboss.jbossts.xts.recovery.coordinator.ba.RecoveryBACoordinator_1 [org.jboss.jbossts.xts.recovery.coordinator.ba.RecoveryBACoordinator_1] - RecoveryBACoordinator.replayPhase2 recovering {0} ActionStatus is {1}
- * @message org.jboss.jbossts.xts.recovery.coordinator.ba.RecoveryBACoordinator_2 [org.jboss.jbossts.xts.recovery.coordinator.ba.RecoveryBACoordinator_2] - RecoveryBACoordinator.replayPhase2: Unexpected status: {0}
- * @message_ org.jboss.jbossts.xts.recovery.coordinator.ba.RecoveryBACoordinator_3 [org.jboss.jbossts.xts.recovery.coordinator.ba.RecoveryBACoordinator_3] - RecoveryBACoordinator.replayPhase2( {0} )  finished
- * @message org.jboss.jbossts.xts.recovery.coordinator.ba.RecoveryBACoordinator_4 [org.jboss.jbossts.xts.recovery.coordinator.ba.RecoveryBACoordinator_4] - RecoveryBACoordinator.replayPhase2 transaction {0} not activated, unable to replay phase 2 commit
-*/
+ */
 public class RecoveryBACoordinator extends BACoordinator {
 
    /**
@@ -106,7 +102,7 @@
        }
        else
        {
-	   XTSLogger.arjLoggerI18N.warn("org.jboss.jbossts.xts.recovery.coordinator.ba.RecoveryBACoordinator_4", new Object[]{get_uid()});
+           XTSLogger.i18NLogger.warn_coordinator_ba_RecoveryBACoordinator_4(get_uid());
        }
    }
 

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/RecoverySubordinateBACoordinator.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/RecoverySubordinateBACoordinator.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/RecoverySubordinateBACoordinator.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -12,11 +12,7 @@
  * This class is a plug-in module for the recovery manager.
  * It is responsible for recovering failed WSBA ACCoordinator transactions.
  *
- * @message org.jboss.jbossts.xts.recovery.coordinator.ba.RecoverySubordinateBACoordinator_1 [org.jboss.jbossts.xts.recovery.coordinator.ba.RecoverBASubordinateCoordinator_1] - RecoverBASubordinateCoordinator.replayPhase2 recovering {0} ActionStatus is {1}
- * @message org.jboss.jbossts.xts.recovery.coordinator.ba.RecoverBASubordinateCoordinator_2 [org.jboss.jbossts.xts.recovery.coordinator.ba.RecoverBASubordinateCoordinator_2] - RecoverBASubordinateCoordinator.replayPhase2: Unexpected status: {0}
- * @message_ org.jboss.jbossts.xts.recovery.coordinator.ba.RecoverBASubordinateCoordinator_3 [org.jboss.jbossts.xts.recovery.coordinator.ba.RecoverBASubordinateCoordinator_3] - RecoverBASubordinateCoordinator.replayPhase2( {0} )  finished
- * @message org.jboss.jbossts.xts.recovery.coordinator.ba.RecoverBASubordinateCoordinator_4 [org.jboss.jbossts.xts.recovery.coordinator.ba.RecoverBASubordinateCoordinator_4] - RecoverBASubordinateCoordinator.replayPhase2 transaction {0} not activated, unable to replay phase 2 commit
-*/
+ */
 public class RecoverySubordinateBACoordinator extends SubordinateBACoordinator {
 
    /**
@@ -67,7 +63,7 @@
        final int status = status();
 
        if (XTSLogger.logger.isDebugEnabled()) {
-           XTSLogger.arjLoggerI18N.debug("org.jboss.jbossts.xts.recovery.coordinator.ba.RecoverBASubordinateCoordinator_1", new Object[]{get_uid(), ActionStatus.stringForm(status)});
+           XTSLogger.logger.debugv("RecoverBASubordinateCoordinator.replayPhase2 recovering {0} ActionStatus is {1}", new Object[]{get_uid(), ActionStatus.stringForm(status)});
        }
 
        if ( _activated )
@@ -104,7 +100,7 @@
        }
        else
        {
-	   XTSLogger.arjLoggerI18N.warn("org.jboss.jbossts.xts.recovery.coordinator.ba.RecoverBASubordinateCoordinator_4", new Object[]{get_uid()});
+           XTSLogger.i18NLogger.warn_coordinator_ba_RecoverBASubordinateCoordinator_4(get_uid());
        }
    }
 

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/SubordinateBACoordinatorRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/SubordinateBACoordinatorRecoveryModule.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/SubordinateBACoordinatorRecoveryModule.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -46,9 +46,6 @@
  *
  * $Id$
  *
- * @message org.jboss.transactions.xts.recovery.coordinator.ba.SubordinateCoordinatorRecoveryModule_1 [org.jboss.transactions.xts.recovery.coordinator.ba.SubordinateBACoordinatorRecoveryModule_1] - RecoveryManagerStatusModule: Object store exception: {0}
- * @message org.jboss.transactions.xts.recovery.coordinator.ba.SubordinateBACoordinatorRecoveryModule_2 [org.jboss.transactions.xts.recovery.coordinator.ba.SubordinateBACoordinatorRecoveryModule_2] - failed to recover Transaction {0} {1}
- * @message org.jboss.transactions.xts.recovery.coordinator.ba.SubordinateBACoordinatorRecoveryModule_3 [org.jboss.transactions.xts.recovery.coordinator.ba.SubordinateBACoordinatorRecoveryModule_3] - failed to access transaction store {0} {1}
  */
 public class SubordinateBACoordinatorRecoveryModule implements RecoveryModule
 {
@@ -105,11 +102,7 @@
         }
         catch ( ObjectStoreException ex )
         {
-            if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.coordinator.ba.SubordinateBACoordinatorRecoveryModule_1",
-                        new Object[]{ex});
-            }
+            XTSLogger.i18NLogger.warn_coordinator_ba_SubordinateCoordinatorRecoveryModule_1(ex);
         }
 
         if ( SubordinateCoordinators )
@@ -188,11 +181,7 @@
             }
             catch ( Exception ex )
             {
-                if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.coordinator.ba.SubordinateBACoordinatorRecoveryModule_2",
-                            new Object[]{recoverUid.toString(), ex});
-                }
+                XTSLogger.i18NLogger.warn_coordinator_ba_SubordinateBACoordinatorRecoveryModule_2(recoverUid, ex);
             }
         }
     }
@@ -287,11 +276,7 @@
             }
             catch ( ObjectStoreException ex )
             {
-                if (XTSLogger.arjLogger.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.coordinator.ba.SubordinateBACoordinatorRecoveryModule_3",
-                            new Object[]{currentUid.toString(), ex});
-                }
+                XTSLogger.i18NLogger.warn_coordinator_ba_SubordinateBACoordinatorRecoveryModule_3(currentUid, ex);
             }
         }
 

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/ATParticipantRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/ATParticipantRecoveryModule.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/ATParticipantRecoveryModule.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -36,8 +36,6 @@
 import java.util.HashMap;
 import java.io.IOException;
 
-import org.jboss.jbossts.xts.recovery.participant.at.ATParticipantRecoveryRecord;
-
 /**
  * This class is a plug-in module for the recovery manager.
  * It is responsible for recovering XTS AT participants.
@@ -45,13 +43,6 @@
  *
  * $Id$
  *
- * @message org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_1 [org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_1] - RecoveryManagerStatusModule: Object store exception: {0}
- * @message org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_3 [org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_3] - failed to access transaction store {0}
- * @message org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_4 [org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_4] - unable to load recovery record implementation class {0} for WS-AT participant recovery record {1}
- * @message org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_5 [org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_5] - unable to instantiate recovery record implementation class {0} for WS-AT participant recovery record {1}
- * @message org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_6 [org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_6] - unable to unpack recovery record data for WS-AT participant recovery record {0}
- * @message org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_7 [org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_7] - missing recovery record data for WS-AT participant recovery record {0}
- * @message org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_8 [org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_8] - unable to read recovery record data for WS-AT participant recovery record {0}
  */
 
 public class ATParticipantRecoveryModule implements RecoveryModule
@@ -121,11 +112,7 @@
         }
         catch ( ObjectStoreException ex )
         {
-            if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_1",
-                        ex);
-            }
+            XTSLogger.i18NLogger.warn_participant_at_ATParticipantRecoveryModule_1(ex);
         }
 
         if ( ATParticipants )
@@ -180,50 +167,26 @@
                             // oh boy, not supposed to happen -- n.b. either the user deployed 1.0
                             // last time and 1.1 this time or vice versa or something is rotten in
                             // the state of Danmark
-                            if (XTSLogger.arjLoggerI18N.isErrorEnabled())
-                            {
-                                XTSLogger.arjLoggerI18N.error("org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_4",
-                                        new Object[]{participantRecordClazzName, recoverUid.toString()}, cnfe);
-                            }
+                            XTSLogger.i18NLogger.error_participant_at_ATParticipantRecoveryModule_4(participantRecordClazzName, recoverUid, cnfe);
                         } catch (InstantiationException ie) {
                             // this is also worrying, log an error
-                            if (XTSLogger.arjLoggerI18N.isErrorEnabled())
-                            {
-                                XTSLogger.arjLoggerI18N.error("org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_5",
-                                        new Object[]{participantRecordClazzName, recoverUid.toString()}, ie);
-                            }
+                            XTSLogger.i18NLogger.error_participant_at_ATParticipantRecoveryModule_5(participantRecordClazzName, recoverUid, ie);
                         } catch (IllegalAccessException iae) {
                             // this is another configuration problem, log an error
-                            if (XTSLogger.arjLoggerI18N.isErrorEnabled())
-                            {
-                                XTSLogger.arjLoggerI18N.error("org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_5",
-                                        new Object[]{participantRecordClazzName, recoverUid.toString()}, iae);
-                            }
+                            XTSLogger.i18NLogger.error_participant_at_ATParticipantRecoveryModule_5(participantRecordClazzName, recoverUid, iae);
                         }
                     } catch (IOException ioe) {
                         // hmm, record corrupted? log this as a warning
-                        if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                        {
-                            XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_6",
-                                    new Object[]{recoverUid.toString()}, ioe);
-                        }
+                        XTSLogger.i18NLogger.error_participant_at_ATParticipantRecoveryModule_6(recoverUid, ioe);
                     }
                 } else {
                     // hmm, it ought not to be able to disappear unless the recovery manager knows about it
                     // this is an error!
-                    if (XTSLogger.arjLoggerI18N.isErrorEnabled())
-                    {
-                        XTSLogger.arjLoggerI18N.error("org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_7",
-                                new Object[]{recoverUid.toString()});
-                    }
+                    XTSLogger.i18NLogger.error_participant_at_ATParticipantRecoveryModule_7(recoverUid);
                 }
             } catch (ObjectStoreException ose) {
                 // if the object store is not working this is serious
-                if (XTSLogger.arjLoggerI18N.isErrorEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.error("org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_8",
-                            new Object[]{recoverUid.toString()}, ose);
-                }
+                XTSLogger.i18NLogger.error_participant_at_ATParticipantRecoveryModule_8(recoverUid, ose);
             }
         }
     }
@@ -285,11 +248,7 @@
             }
             catch ( ObjectStoreException ex )
             {
-                if (XTSLogger.arjLogger.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.at.ATParticipantRecoveryModule_3",
-                            new Object[]{currentUid.toString()}, ex);
-                }
+                XTSLogger.i18NLogger.warn_participant_at_ATParticipantRecoveryModule_3(currentUid, ex);
             }
         }
         }

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManagerImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManagerImple.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManagerImple.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -15,11 +15,6 @@
 /**
  * A class which manages the table of recovered participant records.
  *
- * @message org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_1 [org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_1] exception writing recovery record for WS-AT participant {0}
- * @message org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_2 [org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_2] exception removing recovery record {0} for WS-AT participant {1}
- * @message org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_3 [org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_3] exception reactivating recovered WS-AT participant {0}
- * @message org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_4 [org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_4] no XTS application recovery module found to help reactivate recovered WS-AT participant {0}
- * @message org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_5 [org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_5] Compensating orphaned subordinate WS-AT transcation {0}
  */
 public class XTSATRecoveryManagerImple extends XTSATRecoveryManager {
     /**
@@ -80,11 +75,7 @@
         try {
             oos.packString(participantRecoveryRecord.getClass().getCanonicalName());
         } catch (IOException ioe) {
-            if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_1",
-                        new Object[] {participantRecoveryRecord.getId()}, ioe);
-            }
+            XTSLogger.i18NLogger.warn_participant_at_XTSATRecoveryModule_1(participantRecoveryRecord.getId(), ioe);
             return false;
         }
 
@@ -97,11 +88,7 @@
                 uidMap.put(participantRecoveryRecord.getId(), uid);
                 return true;
             } catch (ObjectStoreException ose) {
-                if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_1",
-                            new Object[] {participantRecoveryRecord.getId()}, ose);
-                }
+                XTSLogger.i18NLogger.warn_participant_at_XTSATRecoveryModule_1(participantRecoveryRecord.getId(), ose);
             }
         }
 
@@ -123,12 +110,7 @@
                 uidMap.remove(id);
                 return true;
             } catch (ObjectStoreException ose) {
-                if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_2",
-                            new Object[] {uid, id},
-                            ose);
-                }
+                XTSLogger.i18NLogger.warn_participant_at_XTSATRecoveryModule_2(uid, id, ose);
             }
         }
 
@@ -239,23 +221,14 @@
                         // but leave the participant in the table for next time in case the helper has merely
                         // suffered a transient failure
                         found = true;
-                        if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                        {
-                            XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_3",
-                                    new Object[] {participantRecoveryRecord.getId()},
-                                    e);
-                        }
+                        XTSLogger.i18NLogger.warn_participant_at_XTSATRecoveryModule_3(participantRecoveryRecord.getId(), e);
                     }
                 }
 
                 if (!found) {
                     // we failed to find a helper to convert a participant record so log a warning
                     // but leave it in the table for next time
-                    if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                    {
-                        XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_4",
-                                new Object[] {participantRecoveryRecord.getId()});
-                    }
+                    XTSLogger.i18NLogger.warn_participant_at_XTSATRecoveryModule_4(participantRecoveryRecord.getId());
                 }
             }
         }
@@ -280,11 +253,7 @@
         SubordinateATCoordinator[] coordinators = SubordinateATCoordinator.listRecoveredCoordinators();
         for (SubordinateATCoordinator coordinator : coordinators) {
             if (coordinator.getSubordinateType() == SubordinateATCoordinator.SUBORDINATE_TX_TYPE_AT_AT && coordinator.isOrphaned()) {
-                if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.at.XTSATRecoveryModule_5",
-                            new Object[] {coordinator.get_uid().stringForm()});
-                }
+                XTSLogger.i18NLogger.warn_participant_at_XTSATRecoveryModule_5(coordinator.get_uid());
                 coordinator.rollback();
             }
         }

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/ba/BAParticipantRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/ba/BAParticipantRecoveryModule.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/ba/BAParticipantRecoveryModule.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -43,13 +43,6 @@
  *
  * $Id$
  *
- * @message org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_1 [org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_1] - RecoveryManagerStatusModule: Object store exception: {0}
- * @message org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_3 [org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_3] - failed to access transaction store {0}
- * @message org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_4 [org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_4] - unable to load recovery record implementation class {0} for WS-BA participant recovery record {1}
- * @message org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_5 [org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_5] - unable to instantiate recovery record implementation class {0} for WS-BA participant recovery record {1}
- * @message org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_6 [org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_6] - unable to unpack recovery record data for WS-BA participant recovery record {0}
- * @message org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_7 [org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_7] - missing recovery record data for WS-BA participant recovery record {0}
- * @message org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_8 [org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_8] - unable to read recovery record data for WS-BA participant recovery record {0}
  */
 
 public class BAParticipantRecoveryModule implements RecoveryModule
@@ -119,11 +112,7 @@
         }
         catch ( ObjectStoreException ex )
         {
-            if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_1",
-                        ex);
-            }
+            XTSLogger.i18NLogger.warn_participant_ba_BAParticipantRecoveryModule_1(ex);
         }
 
         if ( BAParticipants )
@@ -178,50 +167,26 @@
                             // oh boy, not supposed to happen -- n.b. either the user deployed 1.0
                             // last time and 1.1 this time or vice versa or something is rotten in
                             // the state of Danmark
-                            if (XTSLogger.arjLoggerI18N.isErrorEnabled())
-                            {
-                                XTSLogger.arjLoggerI18N.error("org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_4",
-                                        new Object[]{participantRecordClazzName, recoverUid.toString()}, cnfe);
-                            }
+                            XTSLogger.i18NLogger.error_participant_ba_BAParticipantRecoveryModule_4(participantRecordClazzName, recoverUid, cnfe);
                         } catch (InstantiationException ie) {
                             // this is also worrying, log an error
-                            if (XTSLogger.arjLoggerI18N.isErrorEnabled())
-                            {
-                                XTSLogger.arjLoggerI18N.error("org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_5",
-                                        new Object[]{participantRecordClazzName, recoverUid.toString()}, ie);
-                            }
+                            XTSLogger.i18NLogger.error_participant_ba_BAParticipantRecoveryModule_5(participantRecordClazzName, recoverUid, ie);
                         } catch (IllegalAccessException iae) {
                             // this is another configuration problem, log an error
-                            if (XTSLogger.arjLoggerI18N.isErrorEnabled())
-                            {
-                                XTSLogger.arjLoggerI18N.error("org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_5",
-                                        new Object[]{participantRecordClazzName, recoverUid.toString()}, iae);
-                            }
+                            XTSLogger.i18NLogger.error_participant_ba_BAParticipantRecoveryModule_5(participantRecordClazzName, recoverUid, iae);
                         }
                     } catch (IOException ioe) {
                         // hmm, record corrupted? log this as a warning
-                        if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                        {
-                            XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_6",
-                                    new Object[]{recoverUid.toString()}, ioe);
-                        }
+                        XTSLogger.i18NLogger.warn_participant_ba_BAParticipantRecoveryModule_6(recoverUid, ioe);
                     }
                 } else {
                     // hmm, it ought not to be able to disappear unless the recovery manager knows about it
                     // this is an error!
-                    if (XTSLogger.arjLoggerI18N.isErrorEnabled())
-                    {
-                        XTSLogger.arjLoggerI18N.error("org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_7",
-                                new Object[]{recoverUid.toString()});
-                    }
+                    XTSLogger.i18NLogger.error_participant_ba_BAParticipantRecoveryModule_7(recoverUid);
                 }
             } catch (ObjectStoreException ose) {
                 // if the object store is not working this is serious
-                if (XTSLogger.arjLoggerI18N.isErrorEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.error("org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_8",
-                            new Object[]{recoverUid.toString()}, ose);
-                }
+                XTSLogger.i18NLogger.error_participant_ba_BAParticipantRecoveryModule_8(recoverUid, ose);
             }
         }
     }
@@ -283,11 +248,7 @@
             }
             catch ( ObjectStoreException ex )
             {
-                if (XTSLogger.arjLogger.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.ba.BAParticipantRecoveryModule_3",
-                            new Object[]{currentUid.toString()}, ex);
-                }
+                XTSLogger.i18NLogger.warn_participant_ba_BAParticipantRecoveryModule_3(currentUid, ex);
             }
         }
         }

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/ba/XTSBARecoveryManagerImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/ba/XTSBARecoveryManagerImple.java	2010-06-29 09:23:56 UTC (rev 33681)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/ba/XTSBARecoveryManagerImple.java	2010-06-29 09:40:24 UTC (rev 33682)
@@ -14,11 +14,6 @@
 /**
  * A class which manages the table of recovered participant records.
  *
- * @message org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_1 [org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_1] exception writing recovery record for WS-BA participant {0}
- * @message org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_2 [org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_2] exception removing recovery record {0} for WS-BA participant {1}
- * @message org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_3 [org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_3] exception reactivating recovered WS-BA participant {0}
- * @message org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_4 [org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_4] no XTS application recovery module found to help reactivate recovered WS-BA participant {0}
- * @message org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_5 [org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_5] Compensating orphaned subordinate WS-BA transcation {0}
  */
 public class XTSBARecoveryManagerImple extends XTSBARecoveryManager {
     /**
@@ -75,11 +70,7 @@
         try {
             oos.packString(participantRecoveryRecord.getClass().getCanonicalName());
         } catch (IOException ioe) {
-            if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-            {
-                XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_1",
-                        new Object[] {participantRecoveryRecord.getId()}, ioe);
-            }
+            XTSLogger.i18NLogger.warn_participant_ba_XTSBARecoveryModule_1(participantRecoveryRecord.getId(), ioe);
             return false;
         }
 
@@ -92,11 +83,7 @@
                 uidMap.put(participantRecoveryRecord.getId(), uid);
                 return true;
             } catch (ObjectStoreException ose) {
-                if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_1",
-                            new Object[] {participantRecoveryRecord.getId()}, ose);
-                }
+                XTSLogger.i18NLogger.warn_participant_ba_XTSBARecoveryModule_1(participantRecoveryRecord.getId(), ose);
             }
         }
 
@@ -118,12 +105,7 @@
                 uidMap.remove(id);
                 return true;
             } catch (ObjectStoreException ose) {
-                if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_2",
-                            new Object[] {uid, id},
-                            ose);
-                }
+                XTSLogger.i18NLogger.warn_participant_ba_XTSBARecoveryModule_2(uid, id, ose);
             }
         }
 
@@ -234,23 +216,14 @@
                         // but leave the participant in the table for next time in case the helper has merely
                         // suffered a transient failure
                         found = true;
-                        if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                        {
-                            XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_3",
-                                    new Object[] {participantRecoveryRecord.getId()},
-                                    e);
-                        }
+                        XTSLogger.i18NLogger.warn_participant_ba_XTSBARecoveryModule_3(participantRecoveryRecord.getId(), e);
                     }
                 }
 
                 if (!found) {
                     // we failed to find a helper to convert a participant record so log a warning
                     // but leave it in the table for next time
-                    if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                    {
-                        XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_4",
-                                new Object[] {participantRecoveryRecord.getId()});
-                    }
+                    XTSLogger.i18NLogger.warn_participant_ba_XTSBARecoveryModule_4(participantRecoveryRecord.getId());
                 }
             }
         }
@@ -275,11 +248,7 @@
         SubordinateBACoordinator[] coordinators = SubordinateBACoordinator.listRecoveredCoordinators();
         for (SubordinateBACoordinator coordinator : coordinators) {
             if (coordinator.isOrphaned()) {
-                if (XTSLogger.arjLoggerI18N.isWarnEnabled())
-                {
-                    XTSLogger.arjLoggerI18N.warn("org.jboss.transactions.xts.recovery.participant.ba.XTSBARecoveryModule_5",
-                            new Object[] {coordinator.get_uid().stringForm()});
-                }
+                XTSLogger.i18NLogger.warn_participant_ba_XTSBARecoveryModule_5(coordinator.get_uid());
                 coordinator.cancel();
             }
         }



More information about the jboss-svn-commits mailing list