[jboss-svn-commits] JBL Code SVN: r33511 - in labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats: arjuna/coordinator and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 15 11:54:47 EDT 2010
Author: jhalliday
Date: 2010-06-15 11:54:44 -0400 (Tue, 15 Jun 2010)
New Revision: 33511
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordList.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/ActionBean.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/OSEntryBean.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/ObjStoreBrowser.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/util/JMXServer.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/PersistenceRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperThread.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperWorkerThread.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/AtomicActionRecoveryModule.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Listener.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java
Log:
Remove i18n of debug level logging. JBTM-750
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -75,9 +75,6 @@
* @message com.arjuna.ats.arjuna.StateManager_4
* [com.arjuna.ats.arjuna.StateManager_4] - StateManager::deactivate -
* save_state error
- * @message com.arjuna.ats.arjuna.StateManager_5
- * [com.arjuna.ats.arjuna.StateManager_5] - StateManager::destroy for
- * object-id {0}
* @message com.arjuna.ats.arjuna.StateManager_6
* [com.arjuna.ats.arjuna.StateManager_6] - StateManager.destroy -
* failed to add abstract record to transaction {0}; check transaction status.
@@ -574,9 +571,8 @@
public synchronized boolean destroy ()
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.StateManager_5", new Object[]
- {objectUid});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("StateManager::destroy for object-id "+objectUid);
}
boolean result = false;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -625,10 +625,6 @@
/**
* Creates a 'blank' abstract record. This is used during crash recovery
* when recreating the prepared list of a server atomic action.
- *
- * @message com.arjuna.ats.arjuna.coordinator.AbstractRecord_1
- * [com.arjuna.ats.arjuna.coordinator.AbstractRecord_1] -
- * AbstractRecord::AbstractRecord () - crash recovery constructor
*/
public AbstractRecord ()
@@ -640,8 +636,8 @@
uidOfObject = new Uid(Uid.nullUid());
typeOfObject = null;
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.AbstractRecord_1");
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("AbstractRecord::AbstractRecord () - crash recovery constructor");
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -74,75 +74,12 @@
* @message com.arjuna.ats.arjuna.coordinator.BasicAction_5a
* [com.arjuna.ats.arjuna.coordinator.BasicAction_5a] - Deactivate of
* atomic action with id {0} and type {1} unexpectedly failed, could not save state.
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_6
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_6] -
- * BasicAction::addChildThread () action {0} adding {1}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_7
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_7] -
- * BasicAction::addChildThread () action {0} adding {1} result = {2}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_8
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_8] -
- * BasicAction::removeChildThread () action {0} removing {1}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_9
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_9] - \
- * BasicAction::removeChildThread () action {0} removing {1} result =
- * {2}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_10
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_10] -
- * BasicAction::addAction () action {0} adding {1}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_11
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_11] -
- * BasicAction::addChildAction () action {0} adding {1} result = {2}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_12
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_12] -
- * BasicAction::removeChildAction () action {0} removing {1}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_13
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_13] -
- * BasicAction::removeChildAction () action {0} removing {1} result =
- * {2}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_14
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_14] -
- * BasicAction::save_state - next record to pack is a \n {0} record
- * ({1}) should save it? = {2}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_15
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_15] - Packing a {0}
- * record
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_16
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_16] - Packing a
- * NONE_RECORD
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_17
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_17] - HeuristicList -
- * packing a {0} record
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_18
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_18] - HeuristicList -
- * packing a NONE_RECORD
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_19
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_19] - Packing action
- * status of {0}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_20
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_20] - Unpacked a {0}
- * record
* @message com.arjuna.ats.arjuna.coordinator.BasicAction_21
* [com.arjuna.ats.arjuna.coordinator.BasicAction_21] -
* BasicAction.restore_state - could not recover {0}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_22
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_22] - HeuristicList -
- * Unpacked heuristic list size of {0}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_23
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_23] - HeuristicList -
- * Unpacked a {0} record
* @message com.arjuna.ats.arjuna.coordinator.BasicAction_24
* [com.arjuna.ats.arjuna.coordinator.BasicAction_24] -
* BasicAction.restore_state - error unpacking action status.
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_25
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_25] - Restored action
- * status of {0} {1}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_26
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_26] - Restored action
- * type {0} {1}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_27
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_27] - Restored
- * heuristic decision of {0} {1}
* @message com.arjuna.ats.arjuna.coordinator.BasicAction_28
* [com.arjuna.ats.arjuna.coordinator.BasicAction_28] -
* BasicAction.destroy called on {0}
@@ -215,9 +152,6 @@
* @message com.arjuna.ats.arjuna.coordinator.BasicAction_50
* [com.arjuna.ats.arjuna.coordinator.BasicAction_50] - Prepare phase
* of action {0} received heuristic decision: {1}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_51
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_51] -
- * BasicAction.doCommit for {0} received {1} from {2}
* @message com.arjuna.ats.arjuna.coordinator.BasicAction_52
* [com.arjuna.ats.arjuna.coordinator.BasicAction_52] - Top-level abort
* of action {0} received heuristic decision: {1}
@@ -252,9 +186,6 @@
* @message com.arjuna.ats.arjuna.coordinator.BasicAction_62
* [com.arjuna.ats.arjuna.coordinator.BasicAction_62] - \tNow aborting
* self: {0}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_63
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_63] -
- * BasicAction::removeAllChildThreads () action {0} removing {1}
* @message com.arjuna.ats.arjuna.coordinator.BasicAction_64
* [com.arjuna.ats.arjuna.coordinator.BasicAction_64] -
* BasicAction.updateState - Could not create ObjectState for
@@ -262,12 +193,6 @@
* @message com.arjuna.ats.arjuna.coordinator.BasicAction_65
* [com.arjuna.ats.arjuna.coordinator.BasicAction_65] - BasicAction.End -
* Could not write failed list
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_66
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_66] - Action {0} with
- * parent status {1}
- * @message com.arjuna.ats.arjuna.coordinator.BasicAction_67
- * [com.arjuna.ats.arjuna.coordinator.BasicAction_67] - Running Top
- * Level Action {0} from within nested action ({1})
* @message com.arjuna.ats.arjuna.coordinator.BasicAction_68
* [com.arjuna.ats.arjuna.coordinator.BasicAction_68] - (Internal)
* BasicAction.merge - record rejected
@@ -844,9 +769,8 @@
public final boolean addChildThread (Thread t)
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_6", new Object[]
- {get_uid(), t});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("BasicAction::addChildThread () action "+get_uid()+" adding "+t);
}
if (t == null)
@@ -872,9 +796,8 @@
criticalEnd();
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_7", new Object[]
- {get_uid(), t, new Boolean(result)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("BasicAction::addChildThread () action "+get_uid()+" adding "+t+" result = "+result);
}
return result;
@@ -905,9 +828,8 @@
public final boolean removeChildThread (String threadId)
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_8", new Object[]
- {get_uid(), threadId});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("BasicAction::removeChildThread () action "+get_uid()+" removing "+threadId);
}
if (threadId == null)
@@ -928,14 +850,9 @@
criticalEnd();
- if (tsLogger.arjLoggerI18N.isDebugEnabled())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
- if (result)
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_9", new Object[]
- {get_uid(), threadId, "true"});
- else
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_9", new Object[]
- {get_uid(), threadId, "false"});
+ tsLogger.arjLogger.debug("BasicAction::removeChildThread () action "+get_uid()+" removing "+threadId+" result = "+result);
}
return result;
@@ -950,9 +867,8 @@
public final boolean addChildAction (BasicAction act)
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_10", new Object[]
- {get_uid(), ((act != null) ? act.get_uid() : Uid.nullUid())});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("BasicAction::addAction () action "+get_uid()+" adding "+((act != null) ? act.get_uid() : Uid.nullUid()));
}
if (act == null)
@@ -981,14 +897,9 @@
criticalEnd();
- if (tsLogger.arjLoggerI18N.isDebugEnabled())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
- if (result)
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_11", new Object[]
- {get_uid(), act.get_uid(), "true"});
- else
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_11", new Object[]
- {get_uid(), act.get_uid(), "false"});
+ tsLogger.arjLogger.debug("BasicAction::addChildAction () action "+get_uid()+" adding "+act.get_uid()+" result = "+result);
}
return result;
@@ -1101,14 +1012,10 @@
* which type of record to create when restoring.
*/
- if (tsLogger.arjLoggerI18N.isDebugEnabled())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
- if (temp.doSave())
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_14", new Object[]
- {Integer.toString(temp.typeIs()), temp.type(), "true"});
- else
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_14", new Object[]
- {Integer.toString(temp.typeIs()), temp.type(), "false"});
+ tsLogger.arjLogger.debug("BasicAction::save_state - next record to pack is a "+temp.typeIs()
+ +" record "+temp.type()+" should save it? = "+temp.doSave());
}
if (temp.doSave())
@@ -1117,9 +1024,8 @@
try
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_15", new Object[]
- {Integer.toString(temp.typeIs())});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Packing a "+temp.typeIs()+" record");
}
os.packInt(temp.typeIs());
@@ -1149,8 +1055,8 @@
{
try
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_16");
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Packing a NONE_RECORD");
}
os.packInt(RecordType.NONE_RECORD);
@@ -1191,9 +1097,8 @@
try
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_17", new Object[]
- {Integer.toString(temp.typeIs())});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("HeuristicList - packing a "+temp.typeIs()+" record");
}
os.packInt(temp.typeIs());
@@ -1218,8 +1123,8 @@
{
try
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_18");
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("HeuristicList - packing a NONE_RECORD");
}
os.packInt(RecordType.NONE_RECORD);
@@ -1236,9 +1141,8 @@
{
try
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_19", new Object[]
- {ActionStatus.stringForm(actionStatus)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Packing action status of "+ActionStatus.stringForm(actionStatus));
}
os.packInt(actionStatus);
@@ -1263,9 +1167,8 @@
public final boolean removeChildAction (BasicAction act)
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_12", new Object[]
- {get_uid(), ((act != null) ? act.get_uid() : Uid.nullUid())});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("BasicAction::removeChildAction () action "+get_uid()+" removing "+((act != null) ? act.get_uid() : Uid.nullUid()));
}
if (act == null)
@@ -1286,14 +1189,9 @@
criticalEnd();
- if (tsLogger.arjLoggerI18N.isDebugEnabled())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
- if (result)
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_13", new Object[]
- {get_uid(), act.get_uid(), "true"});
- else
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_13", new Object[]
- {get_uid(), act.get_uid(), "false"});
+ tsLogger.arjLogger.debug("BasicAction::removeChildAction () action "+get_uid()+" removing "+act.get_uid()+" result = "+result);
}
return result;
@@ -1376,9 +1274,8 @@
{
record_type = os.unpackInt();
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_20", new Object[]
- {Integer.toString(record_type)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Unpacked a "+record_type+" record");
}
}
catch (IOException e)
@@ -1409,9 +1306,8 @@
{
record_type = os.unpackInt();
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_20", new Object[]
- {Integer.toString(record_type)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Unpacked a "+record_type+" record");
}
}
catch (IOException e)
@@ -1431,9 +1327,8 @@
{
hSize = os.unpackInt();
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_22", new Object[]
- {Integer.toString(hSize)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("HeuristicList - Unpacked heuristic list size of "+hSize);
}
}
catch (IOException e)
@@ -1448,9 +1343,8 @@
{
record_type = os.unpackInt();
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_23", new Object[]
- {Integer.toString(record_type)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("HeuristicList - Unpacked a "+record_type+" record");
}
}
catch (IOException e)
@@ -1468,9 +1362,8 @@
record_type = os.unpackInt();
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_23", new Object[]
- {Integer.toString(record_type)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("HeuristicList - Unpacked a "+record_type+" record");
}
}
catch (IOException e)
@@ -1506,16 +1399,16 @@
if (res)
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_25", new Object[]
- {ActionStatus.stringForm(tempActionStatus), Integer.toString(tempActionStatus)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Restored action status of "+ActionStatus.stringForm(tempActionStatus)+
+ " "+Integer.toString(tempActionStatus));
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_26", new Object[]
- {((tempActionType == ActionType.NESTED) ? "Nested"
- : "Top-level"), Integer.toString(tempActionType)});
+ tsLogger.arjLogger.debug("Restored action type "+
+ ((tempActionType == ActionType.NESTED) ? "Nested" : "Top-level")+
+ " "+Integer.toString(tempActionType));
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_27", new Object[]
- {TwoPhaseOutcome.stringForm(tempHeuristicDecision), Integer.toString(tempHeuristicDecision)});
+ tsLogger.arjLogger.debug(" Restored heuristic decision of "+
+ TwoPhaseOutcome.stringForm(tempHeuristicDecision)+" "+Integer.toString(tempHeuristicDecision));
}
actionStatus = tempActionStatus;
@@ -3217,9 +3110,9 @@
}
else
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_51", new Object[]
- {get_uid(), TwoPhaseOutcome.stringForm(ok), RecordType.typeToClass(recordBeingHandled.typeIs())});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("BasicAction.doCommit for "+get_uid()+" received "+
+ TwoPhaseOutcome.stringForm(ok)+" from "+RecordType.typeToClass(recordBeingHandled.typeIs()));
}
if ((reportHeuristics)
@@ -3816,9 +3709,8 @@
{
t = (Thread) iter.nextElement();
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_63", new Object[]
- {get_uid(), t});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("BasicAction::removeAllChildThreads () action "+get_uid()+" removing "+t);
}
if (t != currentThread)
@@ -3845,9 +3737,8 @@
if (parent != null) /* ie not top_level */
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_66", new Object[]
- {get_uid(), Integer.toString(parent.actionStatus)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Action "+get_uid()+" with parent status "+parent.actionStatus);
}
currentHierarchy = new ActionHierarchy(parent.getHierarchy());
@@ -3875,9 +3766,9 @@
* nested top-level actions are used for.
*/
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.BasicAction_67", new Object[]
- {get_uid(), parent.get_uid()});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Running Top Level Action "+get_uid()+" from within " +
+ "nested action ("+parent.get_uid()+")");
}
}
break;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordList.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordList.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordList.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -52,25 +52,6 @@
* @author Mark Little (mark at arjuna.com)
* @version $Id: RecordList.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.0.
- * @message com.arjuna.ats.arjuna.coordinator.RecordList_1
- * [com.arjuna.ats.arjuna.coordinator.RecordList_1] -
- * RecordList::insert({0}) : merging {1} and {2} for {3}
- * @message com.arjuna.ats.arjuna.coordinator.RecordList_2
- * [com.arjuna.ats.arjuna.coordinator.RecordList_2] -
- * RecordList::insert({0}) : replacing {1} and {2} for {3}
- * @message com.arjuna.ats.arjuna.coordinator.RecordList_3
- * [com.arjuna.ats.arjuna.coordinator.RecordList_3] -
- * RecordList::insert({0}) : adding extra record of type {1} before {2}
- * for {3}
- * @message com.arjuna.ats.arjuna.coordinator.RecordList_4
- * [com.arjuna.ats.arjuna.coordinator.RecordList_4] -
- * RecordList::insert({0}) : inserting {1} for {2} before {3}
- * @message com.arjuna.ats.arjuna.coordinator.RecordList_5
- * [com.arjuna.ats.arjuna.coordinator.RecordList_5] -
- * RecordList::insert({0}) : appending {1} for {2}
- * @message com.arjuna.ats.arjuna.coordinator.RecordList_6
- * [com.arjuna.ats.arjuna.coordinator.RecordList_6] -
- * RecordList::insert({0}) : inserting {1} for {2} before {3} for {4}
*/
public class RecordList
@@ -354,10 +335,9 @@
{
if (newRecord.shouldMerge(current))
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.RecordList_1", new Object[]
- {this, newRecord.type(), current.type(),
- newRecord.order()});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("RecordList::insert("+this+") : merging "+newRecord.type()+
+ " and "+current.type()+" for "+newRecord.order());
}
newRecord.merge(current);
@@ -369,11 +349,9 @@
{
if (newRecord.shouldReplace(current))
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.RecordList_2", new Object[]
- {this, current.type(),
- newRecord.type(),
- newRecord.order()});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("RecordList::insert("+this+") : replacing "+current.type()+
+ " and "+newRecord.type()+" for "+newRecord.order());
}
replace(newRecord, current);
@@ -384,11 +362,9 @@
{
if (newRecord.shouldAdd(current))
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.RecordList_3", new Object[]
- {this, newRecord.type(),
- current.type(),
- newRecord.order()});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("RecordList::insert("+this+") : adding extra record of type "+
+ newRecord.type()+" before "+current.type()+" for "+newRecord.order());
}
insertBefore(newRecord, current);
@@ -406,11 +382,9 @@
}
else if (newRecord.lessThan(current))
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.RecordList_4", new Object[]
- {this, newRecord.type(),
- newRecord.order(),
- current.type()});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("RecordList::insert("+this+") : inserting "+
+ newRecord.type()+" for "+newRecord.order()+" before "+current.type());
}
insertBefore(newRecord, current);
@@ -426,19 +400,17 @@
if (current == null)
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.RecordList_5", new Object[]
- {this, newRecord.type(), newRecord.order()});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("RecordList::insert("+this+") : appending "+newRecord.type()+" for "+newRecord.order());
}
putRear(newRecord);
}
else
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.RecordList_6", new Object[]
- {this, newRecord.type(), newRecord.order(),
- current.type(), current.order()});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("RecordList::insert("+this+") : inserting "+newRecord.type()+" for "+newRecord.order()+
+ " before "+current.type()+" for "+current.order());
}
insertBefore(newRecord, current);
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -55,18 +55,6 @@
* @message com.arjuna.ats.arjuna.coordinator.TransactionReaper_1
* [com.arjuna.ats.arjuna.coordinator.TransactionReaper_1] -
* TransactionReaper - attempting to insert an element that is already present.
- * @message com.arjuna.ats.arjuna.coordinator.TransactionReaper_2
- * [com.arjuna.ats.arjuna.coordinator.TransactionReaper_2] -
- * TransactionReaper::check - comparing {0}
- * @message com.arjuna.ats.arjuna.coordinator.TransactionReaper_3
- * [com.arjuna.ats.arjuna.coordinator.TransactionReaper_3] -
- * TransactionReaper::getTimeout for {0} returning {1}
- * @message com.arjuna.ats.arjuna.coordinator.TransactionReaper_17
- * [com.arjuna.ats.arjuna.coordinator.TransactionReaper_17] -
- * TransactionReaper::getRemainingTimeoutMillis for {0} returning {1}
- * @message com.arjuna.ats.arjuna.coordinator.TransactionReaper_4
- * [com.arjuna.ats.arjuna.coordinator.TransactionReaper_4] -
- * TransactionReaper::check interrupting cancel in progress for {0}
* @message com.arjuna.ats.arjuna.coordinator.TransactionReaper_5
* [com.arjuna.ats.arjuna.coordinator.TransactionReaper_5] -
* TransactionReaper::check worker zombie count {0} exceeds specified limit
@@ -177,8 +165,8 @@
final long now = System.currentTimeMillis();
final long next = nextDynamicCheckTime.get();
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.TransactionReaper_2", new Object[]{Long.toString(next)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("TransactionReaper::check - comparing "+Long.toString(next));
}
if (now < next) {
@@ -271,8 +259,8 @@
// log that we interrupted cancel()
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.TransactionReaper_4", new Object[]{reaperElement._control.get_uid()});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("TransactionReaper::check interrupting cancel in progress for "+reaperElement._control.get_uid());
}
}
break;
@@ -739,9 +727,8 @@
timeout = reaperElement.getAbsoluteTimeout() - System.currentTimeMillis();
}
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.TransactionReaper_17", new Object[]
- {control, timeout});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("TransactionReaper::getRemainingTimeoutMillis for "+control+" returning "+timeout);
}
return timeout;
@@ -771,8 +758,7 @@
int timeout = (reaperElement == null ? 0 : reaperElement._timeout);
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.coordinator.TransactionReaper_3", new Object[]
- {control, timeout});
+ tsLogger.arjLogger.debug("TransactionReaper::getTimeout for "+control+" returning "+timeout);
return timeout;
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -39,9 +39,7 @@
import com.arjuna.ats.internal.arjuna.recovery.AtomicActionExpiryScanner;
/**
- * @message com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_1 [com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_1] - RecoverAtomicAction.replayPhase2 recovering {0} ActionStatus is {1}
* @message com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_2 [com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_2] - RecoverAtomicAction.replayPhase2: Unexpected status: {0}
- * @message com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_3 [com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_3] - RecoverAtomicAction.replayPhase2( {0} ) finished
* @message com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_4 [com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_4] - RecoverAtomicAction: transaction {0} not activated, unable to replay phase 2 commit. Check state has not already been completed.
* @message com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_5 [com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_5] - RecoverAtomicAction - tried to move failed activation log {0}
*/
@@ -64,8 +62,8 @@
*/
public void replayPhase2()
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_1", new Object[]{get_uid(), ActionStatus.stringForm(_theStatus)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("RecoverAtomicAction.replayPhase2 recovering "+get_uid()+" ActionStatus is "+ActionStatus.stringForm(_theStatus));
}
if ( _activated )
@@ -95,8 +93,8 @@
}
}
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.recovery.RecoverAtomicAction_3", new Object[]{get_uid()});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("RecoverAtomicAction.replayPhase2( "+get_uid()+" ) finished");
}
}
else
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -48,8 +48,6 @@
/**
* @message com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_1 [com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_1] - Exception when accessing data store {0}
* @message com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_2 [com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_2] - Object store exception {0}
- * @message com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_3 [com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_3] - found process uid {0}
- * @message com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_4 [com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_4] - added TransactionStatusConnector to table for process uid {0}
*/
public class TransactionStatusConnectionManager
@@ -225,8 +223,8 @@
{
Uid newUid = new Uid (theUid) ;
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_3", new Object[]{newUid});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("found process uid "+newUid);
}
tsmiVector.addElement(newUid) ;
}
@@ -262,8 +260,8 @@
_tscTable.put ( process_id, tsc ) ;
}
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager_4", new Object[]{process_id});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("added TransactionStatusConnector to table for process uid "+process_id);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/ActionBean.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/ActionBean.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/ActionBean.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -48,8 +48,8 @@
Constructor<ActionBeanWrapperInterface> constructor = cl.getConstructor(ActionBean.class, UidWrapper.class);
ra = constructor.newInstance(this, w);
} catch (Exception e) { // ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException
- if (tsLogger.arjLoggerI18N.isDebugEnabled())
- tsLogger.arjLoggerI18N.debug("Error constructing " + JMXServer.AJT_WRAPPER_TYPE + ": " + e);
+ if (tsLogger.arjLogger.isDebugEnabled())
+ tsLogger.arjLogger.debug("Error constructing " + JMXServer.AJT_WRAPPER_TYPE + ": " + e);
ra = new AtomicActionWrapper(w);
}
} else {
@@ -133,8 +133,8 @@
lw = (LogRecordWrapper) p;
lw.init(this, rec, listType);
} else {
- if (tsLogger.arjLoggerI18N.isDebugEnabled())
- tsLogger.arjLoggerI18N.debug("participant record is not a LogRecordWrapper");
+ if (tsLogger.arjLogger.isDebugEnabled())
+ tsLogger.arjLogger.debug("participant record is not a LogRecordWrapper");
lw = createParticipant(rec, listType);
}
} else {
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/OSEntryBean.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/OSEntryBean.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/OSEntryBean.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -20,14 +20,14 @@
}
public void register(String name) {
- if (tsLogger.arjLoggerI18N.isDebugEnabled())
- tsLogger.arjLoggerI18N.debug("Registering: " + name);
+ if (tsLogger.arjLogger.isDebugEnabled())
+ tsLogger.arjLogger.debug("Registering: " + name);
JMXServer.getAgent().registerMBean(name, this);
}
public void unregister(String name) {
- if (tsLogger.arjLoggerI18N.isDebugEnabled())
- tsLogger.arjLoggerI18N.debug("Unregistering: " + name);
+ if (tsLogger.arjLogger.isDebugEnabled())
+ tsLogger.arjLogger.debug("Unregistering: " + name);
JMXServer.getAgent().unregisterMBean(name);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/ObjStoreBrowser.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/ObjStoreBrowser.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/ObjStoreBrowser.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -107,8 +107,8 @@
*/
public void setTypes(Map<String, String> types) {
for (Map.Entry<String, String> entry : types.entrySet()) {
- if (tsLogger.arjLoggerI18N.isDebugEnabled())
- tsLogger.arjLoggerI18N.debug("ObjStoreBrowser: adding type handler " + entry.getKey() + "," + entry.getValue());
+ if (tsLogger.arjLogger.isDebugEnabled())
+ tsLogger.arjLogger.debug("ObjStoreBrowser: adding type handler " + entry.getKey() + "," + entry.getValue());
typeHandlers.put(entry.getKey(), entry.getValue());
}
}
@@ -117,8 +117,8 @@
if (logDir != null)
arjPropertyManager.getObjectStoreEnvironmentBean().setObjectStoreDir(logDir);
- if (tsLogger.arjLoggerI18N.isDebugEnabled())
- tsLogger.arjLoggerI18N.debug("ObjectStoreDir: " + arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreDir());
+ if (tsLogger.arjLogger.isDebugEnabled())
+ tsLogger.arjLogger.debug("ObjectStoreDir: " + arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreDir());
allUids = new HashMap<String, List<UidWrapper>> ();
typeHandlers = loadProperties(OS_BEAN_PROPFILE);
@@ -196,8 +196,8 @@
} while (tname.length() != 0);
}
} catch (ObjectStoreException e2) {
- if (tsLogger.arjLoggerI18N.isDebugEnabled())
- tsLogger.arjLoggerI18N.debug(e2.toString());
+ if (tsLogger.arjLogger.isDebugEnabled())
+ tsLogger.arjLogger.debug(e2.toString());
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/util/JMXServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/util/JMXServer.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/util/JMXServer.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -72,8 +72,8 @@
constructor.newInstance();
isJTS = true;
} catch (Exception e) { // ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException
- if (tsLogger.arjLoggerI18N.isDebugEnabled())
- tsLogger.arjLoggerI18N.debug("JTS not available: " + e);
+ if (tsLogger.arjLogger.isDebugEnabled())
+ tsLogger.arjLogger.debug("JTS not available: " + e);
}
@@ -115,12 +115,12 @@
try {
if (tsLogger.arjLoggerI18N.isInfoEnabled())
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_1",
+ tsLogger.arjLoggerI18N.info("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_1",
new Object[] { name });
oi = getServer().registerMBean(bean, new ObjectName(name));
} catch (InstanceAlreadyExistsException e) {
if (tsLogger.arjLoggerI18N.isInfoEnabled())
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_2",
+ tsLogger.arjLoggerI18N.info("com.arjuna.ats.arjuna.tools.osb.util.JMXServer.m_2",
new Object[] { name });
} catch (javax.management.JMException e) {
if (tsLogger.arjLoggerI18N.isWarnEnabled())
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -54,24 +54,9 @@
* @author Mark Little (mark at arjuna.com)
* @version $Id: FileLock.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.0.
- * @message com.arjuna.ats.arjuna.utils.FileLock_1
- * [com.arjuna.ats.arjuna.utils.FileLock_1] - FileLock.lock called for
- * {0}
- * @message com.arjuna.ats.arjuna.utils.FileLock_2
- * [com.arjuna.ats.arjuna.utils.FileLock_2] - FileLock.unlock called
- * for {0}
- * @message com.arjuna.ats.arjuna.utils.FileLock_3
- * [com.arjuna.ats.arjuna.utils.FileLock_3] - FileLock.createFile
- * called for {0}
* @message com.arjuna.ats.arjuna.utils.FileLock_4
* [com.arjuna.ats.arjuna.utils.FileLock_4] - An error occurred while
* creating file {0}
- * @message com.arjuna.ats.arjuna.utils.FileLock_5
- * [com.arjuna.ats.arjuna.utils.FileLock_5] - FileLock.lockFile called
- * for {0}
- * @message com.arjuna.ats.arjuna.utils.FileLock_6
- * [com.arjuna.ats.arjuna.utils.FileLock_6] - FileLock.unlockFile
- * called for {0}
*/
public class FileLock
@@ -125,9 +110,8 @@
public synchronized boolean lock (int lmode, boolean create)
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.utils.FileLock_1", new Object[]
- {_lockFile});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("FileLock.lock called for "+_lockFile);
}
boolean created = false;
@@ -222,9 +206,8 @@
public synchronized boolean unlock ()
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.utils.FileLock_2", new Object[]
- {_lockFile});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("FileLock.unlock called "+_lockFile);
}
if (!_lockFile.exists())
@@ -306,9 +289,8 @@
private final boolean createFile ()
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.utils.FileLock_3", new Object[]
- {_lockFile});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("FileLock.createFile "+_lockFile);
}
byte b[] = new byte[1];
@@ -340,9 +322,8 @@
private final boolean lockFile ()
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.utils.FileLock_5", new Object[]
- {_lockFile});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("FileLock.lockFile called "+_lockFile);
}
for (int i = 0; i < _retry; i++)
@@ -375,9 +356,8 @@
private final boolean unlockFile ()
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.utils.FileLock_6", new Object[]
- {_lockFile});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("FileLock.unlockFile called for "+_lockFile);
}
return _lockFileLock.delete();
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/PersistenceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/PersistenceRecord.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/PersistenceRecord.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -57,10 +57,6 @@
* @since JTS 1.0.
*
*
- * @message com.arjuna.ats.arjuna.PersistenceRecord_1
- * [com.arjuna.ats.arjuna.PersistenceRecord_1]
- * PersistenceRecord::topLevelCommit() : About to commit state, uid =
- * {0}, ObjType = {1}
* @message com.arjuna.ats.arjuna.PersistenceRecord_2
* [com.arjuna.ats.arjuna.PersistenceRecord_2]
* PersistenceRecord::topLevelCommit - commit_state call failed for {0}
@@ -82,22 +78,12 @@
* @message com.arjuna.ats.arjuna.PersistenceRecord_8
* [com.arjuna.ats.arjuna.PersistenceRecord_8]
* PersistenceRecord.topLevelPrepare - setup error!
- * @message com.arjuna.ats.arjuna.PersistenceRecord_9
- * [com.arjuna.ats.arjuna.PersistenceRecord_9]
- * PersistenceRecord::restore_state: Just unpacked object store type =
- * {0}
* @message com.arjuna.ats.arjuna.PersistenceRecord_10
* [com.arjuna.ats.arjuna.PersistenceRecord_10]
* PersistenceRecord::restore_state: Failed to unpack object store type
* @message com.arjuna.ats.arjuna.PersistenceRecord_11
* [com.arjuna.ats.arjuna.PersistenceRecord_11]
* PersistenceRecord::save_state - type of store is unknown
- * @message com.arjuna.ats.arjuna.PersistenceRecord_12
- * [com.arjuna.ats.arjuna.PersistenceRecord_12]
- * PersistenceRecord::save_state: Packed object store type = {0}
- * @message com.arjuna.ats.arjuna.PersistenceRecord_13
- * [com.arjuna.ats.arjuna.PersistenceRecord_13]
- * PersistenceRecord::save_state: Packed object store root
* @message com.arjuna.ats.arjuna.PersistenceRecord_14
* [com.arjuna.ats.arjuna.PersistenceRecord_14]
* PersistenceRecord::save_state - packing top level state failed
@@ -107,9 +93,6 @@
* @message com.arjuna.ats.arjuna.PersistenceRecord_16
* [com.arjuna.ats.arjuna.PersistenceRecord_16]
* PersistenceRecord::save_state - no object store defined for object
- * @message com.arjuna.ats.arjuna.PersistenceRecord_17
- * [com.arjuna.ats.arjuna.PersistenceRecord_17]
- * PersistenceRecord::PersistenceRecord() - crash recovery constructor
* @message com.arjuna.ats.arjuna.PersistenceRecord_18
* [com.arjuna.ats.arjuna.PersistenceRecord_18]
* PersistenceRecord::topLevelAbort() - Expecting state but found none!
@@ -221,15 +204,10 @@
public int topLevelCommit ()
{
if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PersistenceRecord::topLevelCommit() for "
- + order());
+ tsLogger.arjLogger.debug("PersistenceRecord::topLevelCommit() : About to commit state, "+
+ "uid = "+order()+", ObjType = "+getTypeOfObject());
}
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.PersistenceRecord_1", new Object[]
- {order(), getTypeOfObject()});
- }
-
if (tsLogger.arjLogger.isDebugEnabled())
{
if (store != null) {
@@ -438,9 +416,8 @@
{
objStoreType = os.unpackInt();
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.PersistenceRecord_9", new Object[]
- {Integer.toString(objStoreType)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug(" PersistenceRecord::restore_state: Just unpacked object store type = "+Integer.toString(objStoreType));
}
if (ObjectStoreType.valid(objStoreType))
@@ -505,15 +482,14 @@
{
os.packInt(store.typeIs());
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.PersistenceRecord_12", new Object[]
- {Integer.toString(store.typeIs())});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("PersistenceRecord::save_state: Packed object store type = "+Integer.toString(store.typeIs()));
}
store.pack(os);
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.PersistenceRecord_13");
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("PersistenceRecord::save_state: Packed object store root");
}
os.packBoolean(shadowMade);
@@ -585,8 +561,8 @@
{
super();
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.arjuna.PersistenceRecord_17");
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("PersistenceRecord::PersistenceRecord() - crash recovery constructor");
}
shadowMade = false;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperThread.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperThread.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperThread.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -54,10 +54,6 @@
sleepPeriod = reaperObject.checkingPeriod();
_shutdown = false;
}
-
- /**
- * @message com.arjuna.ats.internal.arjuna.coordinator.ReaperThread_1 [com.arjuna.ats.internal.arjuna.coordinator.ReaperThread_1] - Thread {0} sleeping for {1}
- */
public void run ()
{
@@ -87,9 +83,8 @@
{
try
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.coordinator.ReaperThread_1", new Object[]{Thread.currentThread(),
- Long.toString(sleepPeriod)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Thread "+Thread.currentThread()+" sleeping for "+Long.toString(sleepPeriod));
}
reaperObject.wait(sleepPeriod);
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperWorkerThread.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperWorkerThread.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperWorkerThread.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -42,11 +42,6 @@
_shutdown = false;
}
- /**
- * @message com.arjuna.ats.internal.arjuna.coordinator.ReaperWorkerThread_1 [com.arjuna.ats.internal.arjuna.coordinator.ReaperWorkThread_1] - Thread {0} waiting for cancelled TXs
- * @message com.arjuna.ats.internal.arjuna.coordinator.ReaperWorkerThread_2 [com.arjuna.ats.internal.arjuna.coordinator.ReaperWorkThread_2] - Thread {0} performing cancellations
- */
-
public void run ()
{
if (tsLogger.arjLogger.isDebugEnabled()) {
@@ -58,8 +53,8 @@
// wait for the reaper thread to queue some TXs for
// this thread to cancel
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.coordinator.ReaperWorkerThread_1", new Object[]{Thread.currentThread()});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Thread "+Thread.currentThread()+" waiting for cancelled TXs");
}
_theReaper.waitForCancellations();
@@ -71,8 +66,8 @@
// get the reaper to cancel any TXs queued for cancellation.
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.coordinator.ReaperWorkerThread_2", new Object[]{Thread.currentThread()});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Thread "+Thread.currentThread()+" performing cancellations");
}
_theReaper.doCancellations();
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -63,9 +63,6 @@
* @return current state of object. Assumes that genPathName allocates
* enough extra space to allow extra chars to be added. Action
* stores only store committed objects
- * @message com.arjuna.ats.internal.arjuna.objectstore.ActionStore_1
- * [com.arjuna.ats.internal.arjuna.objectstore.ActionStore_1] -
- * ActionStore.currentState({0}, {1}) - returning {2}
*/
public int currentState (Uid objUid, String tName)
@@ -83,9 +80,9 @@
path = null;
}
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.objectstore.ActionStore_1", new Object[]
- {objUid, tName, StateStatus.stateStatusString(theState)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("ActionStore.currentState("+objUid+", "+tName+") - returning "+
+ StateStatus.stateStatusString(theState));
}
return theState;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -123,9 +123,6 @@
* @message com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_21
* [com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_21] -
* ShadowingStore.renameFromTo - failed to lock: {0}
- * @message com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_22
- * [com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_22] -
- * ShadowingStore.currentState({0}, {1}) - returning {2}
* @message com.arjuna.ats.internal.arjuna.objectstore.notypenameuid No typename
* for object:
*/
@@ -187,10 +184,9 @@
}
}
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore_22", new Object[]
- {objUid, tName,
- StateStatus.stateStatusString(theState)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("ShadowingStore.currentState("+objUid+", "+tName+") - returning "+
+ StateStatus.stateStatusString(theState));
}
return theState;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/AtomicActionRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/AtomicActionRecoveryModule.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/AtomicActionRecoveryModule.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -56,8 +56,6 @@
* @message com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_1 [com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_1] - RecoveryManagerStatusModule: Object store exception: {0}
* @message com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_2 [com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_2] - failed to recover Transaction {0} {1}
* @message com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_3 [com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_3] - failed to access transaction store {0} {1}
- * @message com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_4 [com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_4] - AtomicActionRecoveryModule first pass
- * @message com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_5 [com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_5] - AtomicActionRecoveryModule second pass
*/
public class AtomicActionRecoveryModule implements RecoveryModule
@@ -89,8 +87,8 @@
try
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_4");
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("AtomicActionRecoveryModule first pass");
}
AtomicActions = _transactionStore.allObjUids( _transactionType, aa_uids );
@@ -113,8 +111,8 @@
public void periodicWorkSecondPass()
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_5");
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("AtomicActionRecoveryModule second pass");
}
processTransactionsStatus() ;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -52,14 +52,8 @@
* Singleton, instantiated in the RecoveryManager.
* <P>
*
- * @message com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_1 [com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_1] - Expiry scan interval set to {0} seconds
- * @message com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_2 [com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_2] - Expiry scan zero - not scanning
- * @message com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_3 [com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_3] - No Expiry scanners loaded - not scanning
- * @message com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_4 [com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_4] - ExpiredEntryMonitor - constructed
* @message com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_5 [com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_5] - ExpiredEntryMonitor - no scans on first iteration
- * @message com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_6 [com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_6] - Loading expiry scanner {0}
* @message com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_7 [com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_7] - Attempt to load expiry scanner with null class name!
- * @message com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_8 [com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_8] - Loading expiry scanner {0}
* @message com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_9 [com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_9] - Expiry scanner {0} does not conform to ExpiryScanner interface
* @message com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_10 [com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_10] - Loading expiry scanner: could not find class {0}
* @message com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_11 [com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_11] - {0} has inappropriate value ({1})
@@ -90,8 +84,8 @@
{
// no scanning wanted
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_2");
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Expiry scan zero - not scanning");
}
return false;
@@ -101,8 +95,8 @@
{
// nothing to do
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_3");
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("No Expiry scanners loaded - not scanning");
}
return false;
@@ -138,8 +132,8 @@
private ExpiredEntryMonitor(boolean skipFirst)
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_4");
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("ExpiredEntryMonitor - constructed");
}
_skipNext = skipFirst;
_stop = false;
@@ -235,8 +229,8 @@
_scanIntervalSeconds = recoveryPropertyManager.getRecoveryEnvironmentBean().getExpiryScanInterval() * 60 * 60;
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_1", new Object[]{Integer.toString(_scanIntervalSeconds)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Expiry scan interval set to "+Integer.toString(_scanIntervalSeconds)+" seconds");
}
if (_scanIntervalSeconds != 0)
@@ -266,8 +260,8 @@
private static void loadScanner( String className )
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_6", new Object[]{className});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Loading expiry scanner "+className);
}
if (className == null)
@@ -293,8 +287,8 @@
}
else
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_8", new Object[]{className});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Loading expiry scanner "+className);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -53,17 +53,14 @@
{
/**
- * @message com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_1 [com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_1] - ExpiredTransactionStatusManagerScanner created, with expiry time of {0} seconds
- * @message com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_2 [com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_2] - ExpiredTransactionStatusManagerScanner - scanning to remove items from before {0}
* @message com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_3 [com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_3] - Removing old transaction status manager item {0}
- * @message com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_4 [com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_4] - Expiry scan interval set to {0} seconds
* @message com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_5 [com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_5] - {0} has inappropriate value ({1})
*/
public ExpiredTransactionStatusManagerScanner()
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_1", new Object[]{Integer.toString(_expiryTime)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("ExpiredTransactionStatusManagerScanner created, with expiry time of "+Integer.toString(_expiryTime)+" seconds");
}
_objectStore = TransactionStatusManagerItem.getStore() ;
@@ -78,8 +75,8 @@
// calculate the time before which items will be removed
Date oldestSurviving = new Date( new Date().getTime() - _expiryTime * 1000 ) ;
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_2", new Object[]{_timeFormat.format(oldestSurviving)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("ExpiredTransactionStatusManagerScanner - scanning to remove items from before "+_timeFormat.format(oldestSurviving));
}
try
@@ -173,8 +170,8 @@
{
_expiryTime = recoveryPropertyManager.getRecoveryEnvironmentBean().getTransactionStatusManagerExpiryTime() * 60 * 60;
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_4", new Object[]{Integer.toString(_expiryTime)});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Expiry scan interval set to "+Integer.toString(_expiryTime)+" seconds");
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Listener.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Listener.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Listener.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -111,8 +111,6 @@
/**
* Loops waiting for connection requests from client,
* creates a new Connection object for each connection.
- *
- * @message com.arjuna.ats.internal.arjuna.recovery.Listener_2 [com.arjuna.ats.internal.arjuna.recovery.Listener_2] Listener - IOException
*/
public void run()
@@ -158,8 +156,8 @@
}
catch ( final IOException ex )
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled())
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.Listener_2"+" "+ex);
+ if (tsLogger.arjLogger.isDebugEnabled())
+ tsLogger.arjLogger.debug("Listener - IOException"+" "+ex);
}
catch (final Exception ex)
{
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java 2010-06-15 14:02:34 UTC (rev 33510)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java 2010-06-15 15:54:44 UTC (rev 33511)
@@ -68,8 +68,6 @@
* @message com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_11 [com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_11] - Invalid host specified {0}
* @message com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_12 [com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_12] - Could not create recovery listener
* @message com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_13 [com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_13] - Recovery manager listening on endpoint {0}:{1}
- * @message com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_14 [com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_14] - Periodic recovery first pass at {0}
- * @message com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_15 [com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_15] - Periodic recovery second pass at {0}
*/
public class PeriodicRecovery extends Thread
@@ -743,8 +741,8 @@
{
// n.b. we only get here if status is SCANNING
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_14", new Object[]{_theTimestamper.format(new Date())});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Periodic recovery first pass at "+_theTimestamper.format(new Date()));
}
// n.b. this works on a copy of the modules list so it is not affected by
@@ -798,8 +796,8 @@
// move on to phase 2
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_15", new Object[]{_theTimestamper.format(new Date())});
+ if (tsLogger.arjLogger.isDebugEnabled()) {
+ tsLogger.arjLogger.debug("Periodic recovery second pass at "+_theTimestamper.format(new Date()));
}
modules = copyOfModules.elements();
More information about the jboss-svn-commits
mailing list