[jboss-svn-commits] JBL Code SVN: r37480 - in labs/jbosstm/branches/JBOSSTS_4_15_0_Final: XTS/WSCF/classes/com/arjuna/mw/wscf/logging and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 26 06:17:56 EDT 2011
Author: jhalliday
Date: 2011-09-26 06:17:56 -0400 (Mon, 26 Sep 2011)
New Revision: 37480
Modified:
labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLogger.java
labs/jbosstm/branches/JBOSSTS_4_15_0_Final/XTS/WSCF/classes/com/arjuna/mw/wscf/logging/wscfI18NLogger.java
labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeI18NLogger.java
Log:
Fix i18n logging bugs. JBTM-904
Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLogger.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLogger.java 2011-09-26 08:56:40 UTC (rev 37479)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLogger.java 2011-09-26 10:17:56 UTC (rev 37480)
@@ -305,11 +305,11 @@
@LogMessage(level = WARN)
public void warn_transaction_arjunacore_lastResourceOptimisationInterface(String arg0);
- @Message(id = 16070, value = "{0} - could not mark {0} as rollback only", format = MESSAGE_FORMAT)
+ @Message(id = 16070, value = "{0} - could not mark {1} as rollback only", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
public void warn_transaction_arjunacore_markrollback(String arg0, String arg1);
- @Message(id = 16071, value = "{0} caught XAException: {0}", format = MESSAGE_FORMAT)
+ @Message(id = 16071, value = "{0} caught XAException: {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
public void warn_transaction_arjunacore_newtmerror(String arg0, String arg1, @Cause() Throwable arg2);
Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/XTS/WSCF/classes/com/arjuna/mw/wscf/logging/wscfI18NLogger.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/XTS/WSCF/classes/com/arjuna/mw/wscf/logging/wscfI18NLogger.java 2011-09-26 08:56:40 UTC (rev 37479)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/XTS/WSCF/classes/com/arjuna/mw/wscf/logging/wscfI18NLogger.java 2011-09-26 10:17:56 UTC (rev 37480)
@@ -275,7 +275,7 @@
@Message(id = 44064, value = "Unable to load protocol implementation class {0} caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = ERROR)
- public void error_protocols_ProtocolManager_3(String arg0, Throwable arg1);
+ public void error_protocols_ProtocolManager_3(String arg0, @Cause() Throwable arg1);
@Message(id = 44065, value = "Installed implementation class {0} for protocol type {1}", format = MESSAGE_FORMAT)
@LogMessage(level = INFO)
@@ -283,7 +283,7 @@
@Message(id = 44066, value = "Unable to instantiate protocol implementation class {0} caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = ERROR)
- public void error_protocols_ProtocolManager_5(String arg0, Throwable arg1);
+ public void error_protocols_ProtocolManager_5(String arg0, @Cause() Throwable arg1);
/*
Allocate new messages directly above this notice.
Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeI18NLogger.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeI18NLogger.java 2011-09-26 08:56:40 UTC (rev 37479)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeI18NLogger.java 2011-09-26 10:17:56 UTC (rev 37480)
@@ -21,10 +21,7 @@
package org.jboss.jbossts.txbridge.utils;
import com.arjuna.ats.arjuna.common.Uid;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
-
+import org.jboss.logging.*;
import static org.jboss.logging.Logger.Level.*;
import static org.jboss.logging.Message.Format.*;
@@ -45,23 +42,23 @@
@Message(id = 33001, value = "Unable to get subordinate transaction id", format = MESSAGE_FORMAT)
@LogMessage(level = ERROR)
- public void error_ibdp_nosub(Throwable arg0);
+ public void error_ibdp_nosub(@Cause() Throwable arg0);
@Message(id = 33002, value = "Unable to recover subordinate transaction id {0}", format = MESSAGE_FORMAT)
@LogMessage(level = ERROR)
- public void error_ibdp_norecovery(Uid arg0, Throwable arg1);
+ public void error_ibdp_norecovery(Uid arg0, @Cause() Throwable arg1);
@Message(id = 33003, value = "prepare on Xid={0} returning Aborted", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void warn_ibdp_aborted(String arg0, Throwable arg1);
+ public void warn_ibdp_aborted(String arg0, @Cause() Throwable arg1);
@Message(id = 33004, value = "commit on Xid={0} failed", format = MESSAGE_FORMAT)
@LogMessage(level = ERROR)
- public void error_ibdp_commitfailed(String arg0, Throwable arg1);
+ public void error_ibdp_commitfailed(String arg0, @Cause() Throwable arg1);
@Message(id = 33005, value = "rollback on Xid={0} failed", format = MESSAGE_FORMAT)
@LogMessage(level = ERROR)
- public void error_ibdp_rollbackfailed(String arg0, Throwable arg1);
+ public void error_ibdp_rollbackfailed(String arg0, @Cause() Throwable arg1);
@Message(id = 33006, value = "InboundBridgeRecoveryManager starting", format = MESSAGE_FORMAT)
@@ -74,24 +71,24 @@
@Message(id = 33008, value = "problem rolling back orphaned subordinate tx {0}", format = MESSAGE_FORMAT)
@LogMessage(level = ERROR)
- public void error_ibrm_rollbackerr(String arg0, Throwable arg1);
+ public void error_ibrm_rollbackerr(String arg0, @Cause() Throwable arg1);
@Message(id = 33009, value = "Problem whilst scanning for in-doubt subordinate transactions", format = MESSAGE_FORMAT)
@LogMessage(level = ERROR)
- public void error_ibrm_scanerr(Throwable arg0);
+ public void error_ibrm_scanerr(@Cause() Throwable arg0);
@Message(id = 33010, value = "prepare on Xid={0} failed, setting RollbackOnly", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void warn_ibvp_preparefailed(String arg0, Throwable arg1);
+ public void warn_ibvp_preparefailed(String arg0, @Cause() Throwable arg1);
@Message(id = 33011, value = "setRollbackOnly failed", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void warn_ibvp_setrollbackfailed(Throwable arg0);
+ public void warn_ibvp_setrollbackfailed(@Cause() Throwable arg0);
@Message(id = 33012, value = "stop failed for Xid {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void warn_ibvp_stopfailed(String arg0, Throwable arg1);
+ public void warn_ibvp_stopfailed(String arg0, @Cause() Throwable arg1);
@@ -111,11 +108,11 @@
@Message(id = 33016, value = "Unable to recover subordinate transaction id={0},", format = MESSAGE_FORMAT)
@LogMessage(level = ERROR)
- public void error_obxar_unabletorecover(String arg0, Throwable arg1);
+ public void error_obxar_unabletorecover(String arg0, @Cause() Throwable arg1);
@Message(id = 33017, value = "Unable to enlist BridgeXAResource or register BridgeSynchronization", format = MESSAGE_FORMAT)
@LogMessage(level = ERROR)
- public void error_obm_unabletoenlist(Throwable arg0);
+ public void error_obm_unabletoenlist(@Cause() Throwable arg0);
/*
Allocate new messages directly above this notice.
More information about the jboss-svn-commits
mailing list