[jboss-svn-commits] JBL Code SVN: r33706 - in labs/jbosstm/trunk: ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator and 37 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jun 30 10:56:07 EDT 2010
Author: jhalliday
Date: 2010-06-30 10:56:04 -0400 (Wed, 30 Jun 2010)
New Revision: 33706
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/ActionHierarchy.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/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/logging/tsLogger.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/state/InputObjectState.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputObjectState.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/LogWriteStateManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/ActivationRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverActivationRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/DisposeRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/PersistenceRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/RecoveryRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/BasicMutex.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/ClassloadingUtility.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperElement.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/CacheStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileLockingStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedActionStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCActionStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/NullActionStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowNoFileLockStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/VolatileStore.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
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecActivatorLoader.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecoveryManagerImple.java
labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxLogger.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockManager.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockRecord.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/LockRecord.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/lockstore/BasicLockStore.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/lockstore/BasicPersistentLockStore.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/RecoveredTransactionalObject.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/Lock.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojLogger.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcLogger.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaLogger.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/jtaxLogger.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/ServerSynchronization.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsLogger.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/opLogger.java
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/WSCLogger.java
labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/logging/WSTLogger.java
labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasLogger.java
labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mw/wscf/logging/wscfLogger.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wstx/logging/wstxLogger.java
labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/XTSLogger.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/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/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/ba/BAParticipantRecoveryModule.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxLogger.java
labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/LogFactory.java
Log:
Convert non-i18n (i.e. debug) logging from CLF to jboss-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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -138,8 +138,8 @@
public void finalize () throws Throwable
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager.finalize() for object-id " + get_uid()
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager.finalize() for object-id " + get_uid()
+ " type " + type());
}
@@ -194,8 +194,8 @@
public synchronized boolean activate (String rootName)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager::activate( "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager::activate( "
+ ((rootName != null) ? rootName : "null")
+ ") for object-id " + objectUid);
}
@@ -408,8 +408,8 @@
public synchronized boolean deactivate (String rootName, boolean commit)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager::deactivate("
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager::deactivate("
+ ((rootName != null) ? rootName : "null") + ", "
+ commit + ") for object-id " + objectUid);
}
@@ -511,8 +511,8 @@
public synchronized boolean destroy ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager::destroy for object-id "+objectUid);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager::destroy for object-id "+objectUid);
}
boolean result = false;
@@ -605,8 +605,8 @@
public final String getStoreRoot ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager::getStoreRoot ()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager::getStoreRoot ()");
}
return storeRoot;
@@ -619,8 +619,8 @@
public ObjectStore getStore ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager::getStore ()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager::getStore ()");
}
if (objectStore == null)
@@ -668,8 +668,8 @@
long birthDate = System.currentTimeMillis();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager.packHeader for object-id " + get_uid()
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager.packHeader for object-id " + get_uid()
+ " birth-date " + birthDate);
}
@@ -728,8 +728,8 @@
long birthDate = os.unpackLong();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager.unpackHeader for object-id " + get_uid()
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager.unpackHeader for object-id " + get_uid()
+ " birth-date " + birthDate);
}
@@ -755,8 +755,8 @@
protected void terminate ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager::terminate() for object-id " + get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager::terminate() for object-id " + get_uid());
}
cleanup(true);
@@ -808,8 +808,8 @@
objectUid = objUid;
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager::StateManager( " + get_uid() + " )");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager::StateManager( " + get_uid() + " )");
}
}
@@ -849,8 +849,8 @@
objectUid = new Uid();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager::StateManager( " + ot + ", " + om + " )");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager::StateManager( " + ot + ", " + om + " )");
}
}
@@ -867,8 +867,8 @@
protected synchronized boolean modified ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager::modified() for object-id " + get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager::modified() for object-id " + get_uid());
}
BasicAction action = BasicAction.Current();
@@ -961,8 +961,8 @@
protected final synchronized void persist ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager::persist() for object-id " + get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager::persist() for object-id " + get_uid());
}
if (currentStatus == ObjectStatus.ACTIVE)
@@ -984,8 +984,8 @@
protected final synchronized void cleanup (boolean fromTerminate)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager::cleanup() for object-id " + get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager::cleanup() for object-id " + get_uid());
}
if (myType == ObjectType.NEITHER)
@@ -1124,8 +1124,8 @@
protected synchronized void setupStore (String rootName,
String objectStoreType)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager::setupStore ( "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager::setupStore ( "
+ ((rootName != null) ? rootName : "null") + " )");
}
@@ -1260,8 +1260,8 @@
protected final synchronized boolean forgetAction (BasicAction action,
boolean committed, int recordType)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager::forgetAction("
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager::forgetAction("
+ ((action != null) ? action.get_uid() : Uid
.nullUid()) + ")" + " for object-id "
+ objectUid);
@@ -1311,8 +1311,8 @@
protected final synchronized boolean rememberAction (BasicAction action,
int recordType, int state)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager::rememberAction("
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager::rememberAction("
+ ((action != null) ? action.get_uid() : Uid
.nullUid()) + ")" + " for object-id "
+ objectUid);
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -586,8 +586,8 @@
uidOfObject = storeUid;
typeOfObject = objType;
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("AbstractRecord::AbstractRecord ("
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("AbstractRecord::AbstractRecord ("
+ storeUid + ", " + otype + ")");
}
}
@@ -607,8 +607,8 @@
uidOfObject = storeUid;
typeOfObject = null;
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("AbstractRecord::AbstractRecord ("
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("AbstractRecord::AbstractRecord ("
+ storeUid + ")");
}
}
@@ -627,8 +627,8 @@
uidOfObject = new Uid(Uid.nullUid());
typeOfObject = null;
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("AbstractRecord::AbstractRecord () - crash recovery constructor");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("AbstractRecord::AbstractRecord () - crash recovery constructor");
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/ActionHierarchy.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/ActionHierarchy.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/ActionHierarchy.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -61,8 +61,8 @@
public ActionHierarchy (int depth)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActionHierarchy::ActionHierarchy(" + depth + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActionHierarchy::ActionHierarchy(" + depth + ")");
}
hierarchy = null;
@@ -206,8 +206,8 @@
public final boolean add (Uid actionId, int at)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActionHierarchy::add(" + actionId + ", " + at + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActionHierarchy::add(" + actionId + ", " + at + ")");
}
boolean result = true;
@@ -362,8 +362,8 @@
public final int findCommonPrefix (ActionHierarchy oldHierarchy)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActionHierarchy::findCommonPrefix()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActionHierarchy::findCommonPrefix()");
}
int common = 0;
@@ -375,8 +375,8 @@
common++;
}
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActionHierarchy::::findCommonPrefix(): prefix is " + common);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActionHierarchy::::findCommonPrefix(): prefix is " + common);
}
return common;
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -40,13 +40,11 @@
import com.arjuna.ats.arjuna.utils.ThreadUtil;
import com.arjuna.ats.arjuna.utils.Utility;
import com.arjuna.ats.internal.arjuna.Header;
-import com.arjuna.ats.internal.arjuna.coordinator.CheckedActionFactoryImple;
import com.arjuna.ats.internal.arjuna.thread.*;
import java.util.*;
import java.io.IOException;
-import com.arjuna.ats.arjuna.exceptions.FatalError;
import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
/**
@@ -65,8 +63,8 @@
{
super(ObjectType.NEITHER);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::BasicAction()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::BasicAction()");
}
pendingList = null;
@@ -101,8 +99,8 @@
{
super(objUid, ObjectType.NEITHER);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::BasicAction("
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::BasicAction("
+ objUid + ")");
}
@@ -141,8 +139,8 @@
public void finalize ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::finalize()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::finalize()");
}
if ((actionStatus == ActionStatus.RUNNING)
@@ -237,8 +235,8 @@
public final boolean preventCommit ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::preventCommit( " + this + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::preventCommit( " + this + ")");
}
boolean res = false;
@@ -457,8 +455,8 @@
public boolean activate (String root)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::activate() for action-id "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::activate() for action-id "
+ get_uid());
}
@@ -495,8 +493,7 @@
}
catch (ObjectStoreException e)
{
- if (tsLogger.arjLogger.isWarnEnabled())
- tsLogger.arjLogger.warn(e);
+ tsLogger.logger.warn(e);
return false;
}
@@ -515,8 +512,8 @@
public boolean deactivate ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::deactivate() for action-id "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::deactivate() for action-id "
+ get_uid());
}
@@ -551,8 +548,7 @@
}
catch (ObjectStoreException e)
{
- if (tsLogger.arjLogger.isWarnEnabled())
- tsLogger.arjLogger.warn(e);
+ tsLogger.logger.warn(e);
deactivated = false;
}
@@ -583,8 +579,8 @@
public final boolean addChildThread (Thread t)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::addChildThread () action "+get_uid()+" adding "+t);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::addChildThread () action "+get_uid()+" adding "+t);
}
if (t == null)
@@ -610,8 +606,8 @@
criticalEnd();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::addChildThread () action "+get_uid()+" adding "+t+" result = "+result);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::addChildThread () action "+get_uid()+" adding "+t+" result = "+result);
}
return result;
@@ -642,8 +638,8 @@
public final boolean removeChildThread (String threadId)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::removeChildThread () action "+get_uid()+" removing "+threadId);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::removeChildThread () action "+get_uid()+" removing "+threadId);
}
if (threadId == null)
@@ -664,9 +660,9 @@
criticalEnd();
- if (tsLogger.arjLogger.isDebugEnabled())
+ if (tsLogger.logger.isDebugEnabled())
{
- tsLogger.arjLogger.debug("BasicAction::removeChildThread () action "+get_uid()+" removing "+threadId+" result = "+result);
+ tsLogger.logger.debug("BasicAction::removeChildThread () action "+get_uid()+" removing "+threadId+" result = "+result);
}
return result;
@@ -681,8 +677,8 @@
public final boolean addChildAction (BasicAction act)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::addAction () action "+get_uid()+" adding "+((act != null) ? act.get_uid() : Uid.nullUid()));
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::addAction () action "+get_uid()+" adding "+((act != null) ? act.get_uid() : Uid.nullUid()));
}
if (act == null)
@@ -711,9 +707,9 @@
criticalEnd();
- if (tsLogger.arjLogger.isDebugEnabled())
+ if (tsLogger.logger.isDebugEnabled())
{
- tsLogger.arjLogger.debug("BasicAction::addChildAction () action "+get_uid()+" adding "+act.get_uid()+" result = "+result);
+ tsLogger.logger.debug("BasicAction::addChildAction () action "+get_uid()+" adding "+act.get_uid()+" result = "+result);
}
return result;
@@ -763,8 +759,8 @@
public boolean save_state (OutputObjectState os, int ot)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::save_state ()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::save_state ()");
}
try
@@ -826,9 +822,9 @@
* which type of record to create when restoring.
*/
- if (tsLogger.arjLogger.isDebugEnabled())
+ if (tsLogger.logger.isDebugEnabled())
{
- tsLogger.arjLogger.debug("BasicAction::save_state - next record to pack is a "+temp.typeIs()
+ tsLogger.logger.debug("BasicAction::save_state - next record to pack is a "+temp.typeIs()
+" record "+temp.type()+" should save it? = "+temp.doSave());
}
@@ -838,8 +834,8 @@
try
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Packing a "+temp.typeIs()+" record");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Packing a "+temp.typeIs()+" record");
}
os.packInt(temp.typeIs());
@@ -869,8 +865,8 @@
{
try
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Packing a NONE_RECORD");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Packing a NONE_RECORD");
}
os.packInt(RecordType.NONE_RECORD);
@@ -911,8 +907,8 @@
try
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("HeuristicList - packing a "+temp.typeIs()+" record");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("HeuristicList - packing a "+temp.typeIs()+" record");
}
os.packInt(temp.typeIs());
@@ -937,8 +933,8 @@
{
try
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("HeuristicList - packing a NONE_RECORD");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("HeuristicList - packing a NONE_RECORD");
}
os.packInt(RecordType.NONE_RECORD);
@@ -955,8 +951,8 @@
{
try
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Packing action status of "+ActionStatus.stringForm(actionStatus));
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Packing action status of "+ActionStatus.stringForm(actionStatus));
}
os.packInt(actionStatus);
@@ -981,8 +977,8 @@
public final boolean removeChildAction (BasicAction act)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::removeChildAction () action "+get_uid()+" removing "+((act != null) ? act.get_uid() : Uid.nullUid()));
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::removeChildAction () action "+get_uid()+" removing "+((act != null) ? act.get_uid() : Uid.nullUid()));
}
if (act == null)
@@ -1003,9 +999,9 @@
criticalEnd();
- if (tsLogger.arjLogger.isDebugEnabled())
+ if (tsLogger.logger.isDebugEnabled())
{
- tsLogger.arjLogger.debug("BasicAction::removeChildAction () action "+get_uid()+" removing "+act.get_uid()+" result = "+result);
+ tsLogger.logger.debug("BasicAction::removeChildAction () action "+get_uid()+" removing "+act.get_uid()+" result = "+result);
}
return result;
@@ -1055,8 +1051,8 @@
public boolean restore_state (InputObjectState os, int ot)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::restore_state ()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::restore_state ()");
}
createPreparedLists();
@@ -1088,8 +1084,8 @@
{
record_type = os.unpackInt();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Unpacked a "+record_type+" record");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Unpacked a "+record_type+" record");
}
}
catch (IOException e)
@@ -1115,8 +1111,8 @@
{
record_type = os.unpackInt();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Unpacked a "+record_type+" record");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Unpacked a "+record_type+" record");
}
}
catch (IOException e)
@@ -1136,8 +1132,8 @@
{
hSize = os.unpackInt();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("HeuristicList - Unpacked heuristic list size of "+hSize);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("HeuristicList - Unpacked heuristic list size of "+hSize);
}
}
catch (IOException e)
@@ -1152,8 +1148,8 @@
{
record_type = os.unpackInt();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("HeuristicList - Unpacked a "+record_type+" record");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("HeuristicList - Unpacked a "+record_type+" record");
}
}
catch (IOException e)
@@ -1171,8 +1167,8 @@
record_type = os.unpackInt();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("HeuristicList - Unpacked a "+record_type+" record");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("HeuristicList - Unpacked a "+record_type+" record");
}
}
catch (IOException e)
@@ -1204,15 +1200,15 @@
if (res)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Restored action status of "+ActionStatus.stringForm(tempActionStatus)+
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Restored action status of "+ActionStatus.stringForm(tempActionStatus)+
" "+Integer.toString(tempActionStatus));
- tsLogger.arjLogger.debug("Restored action type "+
+ tsLogger.logger.debug("Restored action type "+
((tempActionType == ActionType.NESTED) ? "Nested" : "Top-level")+
" "+Integer.toString(tempActionType));
- tsLogger.arjLogger.debug(" Restored heuristic decision of "+
+ tsLogger.logger.debug(" Restored heuristic decision of "+
TwoPhaseOutcome.stringForm(tempHeuristicDecision)+" "+Integer.toString(tempHeuristicDecision));
}
@@ -1336,8 +1332,8 @@
protected synchronized int Begin (BasicAction parentAct)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::Begin() for action-id "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::Begin() for action-id "
+ get_uid());
}
@@ -1413,8 +1409,8 @@
protected synchronized int End (boolean reportHeuristics)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::End() for action-id "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::End() for action-id "
+ get_uid());
}
@@ -1564,8 +1560,8 @@
protected synchronized int Abort ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::Abort() for action-id "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::Abort() for action-id "
+ get_uid());
}
@@ -1729,8 +1725,8 @@
protected final synchronized void phase2Cleanup ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::phase2Cleanup() for action-id "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::phase2Cleanup() for action-id "
+ get_uid());
}
@@ -1768,8 +1764,8 @@
protected synchronized final void phase2Commit (boolean reportHeuristics)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::phase2Commit() for action-id "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::phase2Commit() for action-id "
+ get_uid());
}
@@ -1878,8 +1874,8 @@
protected synchronized final void phase2Abort (boolean reportHeuristics)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::phase2Abort() for action-id "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::phase2Abort() for action-id "
+ get_uid());
}
@@ -1943,8 +1939,8 @@
protected synchronized final int prepare (boolean reportHeuristics)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::prepare () for action-id "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::prepare () for action-id "
+ get_uid());
}
@@ -2046,10 +2042,7 @@
}
catch (Exception e)
{
- if (tsLogger.arjLogger.isWarnEnabled())
- {
- tsLogger.arjLogger.warn(e);
- }
+ tsLogger.logger.warn(e);
p = TwoPhaseOutcome.PREPARE_NOTOK;
}
@@ -2260,8 +2253,8 @@
protected void onePhaseCommit (boolean reportHeuristics)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::onePhaseCommit() for action-id "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::onePhaseCommit() for action-id "
+ get_uid());
}
@@ -2778,8 +2771,8 @@
protected int doCommit (boolean reportHeuristics, AbstractRecord record)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::doCommit ("
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::doCommit ("
+ record + ")");
}
@@ -2814,8 +2807,8 @@
}
else
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction.doCommit for "+get_uid()+" received "+
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction.doCommit for "+get_uid()+" received "+
TwoPhaseOutcome.stringForm(ok)+" from "+RecordType.typeToClass(recordBeingHandled.typeIs()));
}
@@ -2898,8 +2891,8 @@
protected int doAbort (boolean reportHeuristics, AbstractRecord record)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::doAbort ("
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::doAbort ("
+ record + ")");
}
@@ -3103,8 +3096,8 @@
protected void updateState ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::updateState() for action-id "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::updateState() for action-id "
+ get_uid());
}
@@ -3161,7 +3154,7 @@
}
catch (ObjectStoreException e)
{
- tsLogger.arjLogger.warn(e);
+ tsLogger.logger.warn(e);
}
}
}
@@ -3366,8 +3359,8 @@
{
t = (Thread) iter.nextElement();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::removeAllChildThreads () action "+get_uid()+" removing "+t);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::removeAllChildThreads () action "+get_uid()+" removing "+t);
}
if (t != currentThread)
@@ -3385,8 +3378,8 @@
private final void actionInitialise (BasicAction parent)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::actionInitialise() for action-id "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::actionInitialise() for action-id "
+ get_uid());
}
@@ -3394,8 +3387,8 @@
if (parent != null) /* ie not top_level */
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Action "+get_uid()+" with parent status "+parent.actionStatus);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Action "+get_uid()+" with parent status "+parent.actionStatus);
}
currentHierarchy = new ActionHierarchy(parent.getHierarchy());
@@ -3423,8 +3416,8 @@
* nested top-level actions are used for.
*/
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Running Top Level Action "+get_uid()+" from within " +
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Running Top Level Action "+get_uid()+" from within " +
"nested action ("+parent.get_uid()+")");
}
}
@@ -3442,8 +3435,8 @@
private final void doForget (RecordList list_toprocess)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::doForget ("
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::doForget ("
+ list_toprocess + ")");
}
@@ -3508,8 +3501,8 @@
private final void doCleanup (RecordList list_toprocess)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("BasicAction::doCleanup ("
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("BasicAction::doCleanup ("
+ list_toprocess + ")");
}
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordList.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -335,8 +335,8 @@
{
if (newRecord.shouldMerge(current))
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecordList::insert("+this+") : merging "+newRecord.type()+
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecordList::insert("+this+") : merging "+newRecord.type()+
" and "+current.type()+" for "+newRecord.order());
}
@@ -349,8 +349,8 @@
{
if (newRecord.shouldReplace(current))
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecordList::insert("+this+") : replacing "+current.type()+
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecordList::insert("+this+") : replacing "+current.type()+
" and "+newRecord.type()+" for "+newRecord.order());
}
@@ -362,8 +362,8 @@
{
if (newRecord.shouldAdd(current))
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecordList::insert("+this+") : adding extra record of type "+
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecordList::insert("+this+") : adding extra record of type "+
newRecord.type()+" before "+current.type()+" for "+newRecord.order());
}
@@ -382,8 +382,8 @@
}
else if (newRecord.lessThan(current))
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecordList::insert("+this+") : inserting "+
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecordList::insert("+this+") : inserting "+
newRecord.type()+" for "+newRecord.order()+" before "+current.type());
}
@@ -400,16 +400,16 @@
if (current == null)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecordList::insert("+this+") : appending "+newRecord.type()+" for "+newRecord.order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecordList::insert("+this+") : appending "+newRecord.type()+" for "+newRecord.order());
}
putRear(newRecord);
}
else
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecordList::insert("+this+") : inserting "+newRecord.type()+" for "+newRecord.order()+
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecordList::insert("+this+") : inserting "+newRecord.type()+" for "+newRecord.order()+
" before "+current.type()+" for "+current.order());
}
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -64,8 +64,8 @@
private TransactionReaper(long checkPeriod)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("TransactionReaper::TransactionReaper ( " + checkPeriod
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("TransactionReaper::TransactionReaper ( " + checkPeriod
+ " )");
}
@@ -108,8 +108,8 @@
public final void check()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("TransactionReaper::check ()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("TransactionReaper::check ()");
}
do {
@@ -119,8 +119,8 @@
final long now = System.currentTimeMillis();
final long next = nextDynamicCheckTime.get();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("TransactionReaper::check - comparing " + Long.toString(next));
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("TransactionReaper::check - comparing " + Long.toString(next));
}
if (now < next) {
@@ -161,8 +161,8 @@
reinsertElement(reaperElement, _cancelWaitPeriod);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Reaper scheduling TX for cancellation " + reaperElement._control.get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Reaper scheduling TX for cancellation " + reaperElement._control.get_uid());
}
// insert into cancellation queue for a worker
@@ -190,8 +190,8 @@
reinsertElement(reaperElement, _cancelWaitPeriod);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Reaper deferring interrupt for TX scheduled for cancel " + reaperElement._control.get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Reaper deferring interrupt for TX scheduled for cancel " + reaperElement._control.get_uid());
}
}
break;
@@ -210,8 +210,8 @@
// log that we interrupted cancel()
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("TransactionReaper::check interrupting cancel in progress for " + reaperElement._control.get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("TransactionReaper::check interrupting cancel in progress for " + reaperElement._control.get_uid());
}
}
break;
@@ -228,8 +228,8 @@
synchronized(this) {
_zombieCount++;
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Reaper " + Thread.currentThread() + " got a zombie " + reaperElement._worker + " (zombie count now " + _zombieCount + ") cancelling " + reaperElement._control.get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Reaper " + Thread.currentThread() + " got a zombie " + reaperElement._worker + " (zombie count now " + _zombieCount + ") cancelling " + reaperElement._control.get_uid());
}
if (_zombieCount == _zombieMax) {
@@ -340,8 +340,8 @@
// ok, current status must be SCHEDULE_CANCEL.
// progress state to CANCEL and call cancel()
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Reaper Worker " + Thread.currentThread() + " attempting to cancel " + e._control.get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Reaper Worker " + Thread.currentThread() + " attempting to cancel " + e._control.get_uid());
}
boolean cancelled = false;
@@ -503,8 +503,8 @@
*/
public final void insert(Reapable control, int timeout)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("TransactionReaper::insert ( " + control + ", " + timeout
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("TransactionReaper::insert ( " + control + ", " + timeout
+ " )");
}
@@ -556,8 +556,8 @@
// takes an Object because OTSManager.destroyControl(Control|ControlImple) uses PseudoControlWrapper not Reapable
public final void remove(Object control)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("TransactionReaper::remove ( " + control + " )");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("TransactionReaper::remove ( " + control + " )");
}
if (control == null)
@@ -600,8 +600,8 @@
// arg is an Object because ArjunaTransactionImple.propagationContext does not have a Reapable
if ((_timeouts.isEmpty()) || (control == null)) {
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("TransactionReaper::getRemainingTimeout for " + control
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("TransactionReaper::getRemainingTimeout for " + control
+ " returning 0");
}
@@ -618,8 +618,8 @@
timeout = reaperElement.getAbsoluteTimeout() - System.currentTimeMillis();
}
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("TransactionReaper::getRemainingTimeoutMillis for "+control+" returning "+timeout);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("TransactionReaper::getRemainingTimeoutMillis for "+control+" returning "+timeout);
}
return timeout;
@@ -637,8 +637,8 @@
public final int getTimeout(Object control)
{
if ((_timeouts.isEmpty()) || (control == null)) {
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("TransactionReaper::getTimeout for " + control
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("TransactionReaper::getTimeout for " + control
+ " returning 0");
}
@@ -649,7 +649,7 @@
int timeout = (reaperElement == null ? 0 : reaperElement._timeout);
- tsLogger.arjLogger.debug("TransactionReaper::getTimeout for "+control+" returning "+timeout);
+ tsLogger.logger.debug("TransactionReaper::getTimeout for "+control+" returning "+timeout);
return timeout;
}
@@ -799,8 +799,8 @@
{
if (TransactionReaper._theReaper == null)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("TransactionReaper::instantiate()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("TransactionReaper::instantiate()");
}
// default to dynamic mode
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/tsLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/tsLogger.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/tsLogger.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -31,22 +31,10 @@
package com.arjuna.ats.arjuna.logging;
-import com.arjuna.common.util.logging.*;
import org.jboss.logging.Logger;
public class tsLogger
{
- public static LogNoi18n arjLogger;
- public static arjunaI18NLogger i18NLogger;
-
- public static void initialize(LogNoi18n noi18n)
- {
- arjLogger = noi18n;
- i18NLogger = new arjunaI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.arjuna"));
- }
-
- static
- {
- LogFactory.initializeModuleLogger(tsLogger.class, "com.arjuna.ats.arjuna");
- }
-}
+ public static final Logger logger = Logger.getLogger("com.arjuna.ats.arjuna");
+ public static final arjunaI18NLogger i18NLogger = new arjunaI18NLoggerImpl(logger);
+}
\ No newline at end of file
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -56,8 +56,8 @@
*/
public void replayPhase2()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecoverAtomicAction.replayPhase2 recovering "+get_uid()+" ActionStatus is "+ActionStatus.stringForm(_theStatus));
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecoverAtomicAction.replayPhase2 recovering "+get_uid()+" ActionStatus is "+ActionStatus.stringForm(_theStatus));
}
if ( _activated )
@@ -82,8 +82,8 @@
tsLogger.i18NLogger.warn_recovery_RecoverAtomicAction_2(ActionStatus.stringForm(_theStatus));
}
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecoverAtomicAction.replayPhase2( "+get_uid()+" ) finished");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -210,8 +210,8 @@
{
Uid newUid = new Uid (theUid) ;
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("found process uid "+newUid);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("found process uid "+newUid);
}
tsmiVector.addElement(newUid) ;
}
@@ -247,8 +247,8 @@
_tscTable.put ( process_id, tsc ) ;
}
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("added TransactionStatusConnector to table for process uid "+process_id);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("added TransactionStatusConnector to table for process uid "+process_id);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/InputObjectState.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/InputObjectState.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/InputObjectState.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -56,8 +56,8 @@
public InputObjectState ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("InputObjectState::InputObjectState()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("InputObjectState::InputObjectState()");
}
bufferUid = new Uid(Uid.nullUid());
@@ -69,8 +69,8 @@
{
super(copyFrom);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("InputObjectState::InputObjectState(" + copyFrom + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("InputObjectState::InputObjectState(" + copyFrom + ")");
}
try
@@ -90,8 +90,8 @@
{
super(copyFrom.buffer());
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("InputObjectState::InputObjectState(" + copyFrom + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("InputObjectState::InputObjectState(" + copyFrom + ")");
}
try
@@ -111,8 +111,8 @@
{
super(buff); // implicitly copies the array contents.
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("InputObjectState::InputObjectState(" + newUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("InputObjectState::InputObjectState(" + newUid + ", " + tName + ")");
}
bufferUid = new Uid(newUid);
@@ -183,8 +183,8 @@
public synchronized void copy (InputObjectState objstate)
{
- if (tsLogger.arjLogger.isDebugEnabled())
- tsLogger.arjLogger.debug("InputObjectState::copy for " + bufferUid);
+ if (tsLogger.logger.isDebugEnabled())
+ tsLogger.logger.debug("InputObjectState::copy for " + bufferUid);
super.copy(objstate);
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputObjectState.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputObjectState.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputObjectState.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -56,8 +56,8 @@
public OutputObjectState ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("OutputObjectState::OutputObjectState()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("OutputObjectState::OutputObjectState()");
}
bufferUid = new Uid();
@@ -75,8 +75,8 @@
super(copyFrom);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("OutputObjectState::OutputObjectState(" + copyFrom + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("OutputObjectState::OutputObjectState(" + copyFrom + ")");
}
try
@@ -96,8 +96,8 @@
{
super(copyFrom.buffer());
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("OutputObjectState::OutputObjectState(" + copyFrom + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("OutputObjectState::OutputObjectState(" + copyFrom + ")");
}
try
@@ -115,8 +115,8 @@
public OutputObjectState (Uid newUid, String tName)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("OutputObjectState::OutputObjectState(" + newUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("OutputObjectState::OutputObjectState(" + newUid + ", " + tName + ")");
}
bufferUid = new Uid(newUid);
@@ -129,8 +129,8 @@
{
super(buffer);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("OutputObjectState::OutputObjectState(" + newUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("OutputObjectState::OutputObjectState(" + newUid + ", " + tName + ")");
}
bufferUid = new Uid(newUid);
@@ -191,8 +191,8 @@
public synchronized void copy (OutputObjectState objstate)
{
- if (tsLogger.arjLogger.isDebugEnabled())
- tsLogger.arjLogger.debug("OutputObjectState::copy for " + bufferUid);
+ if (tsLogger.logger.isDebugEnabled())
+ tsLogger.logger.debug("OutputObjectState::copy for " + bufferUid);
super.copy(objstate);
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/ActionBean.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -41,8 +41,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.arjLogger.isDebugEnabled())
- tsLogger.arjLogger.debug("Error constructing " + JMXServer.AJT_WRAPPER_TYPE + ": " + e);
+ if (tsLogger.logger.isDebugEnabled())
+ tsLogger.logger.debug("Error constructing " + JMXServer.AJT_WRAPPER_TYPE + ": " + e);
ra = new AtomicActionWrapper(w);
}
} else {
@@ -126,8 +126,8 @@
lw = (LogRecordWrapper) p;
lw.init(this, rec, listType);
} else {
- if (tsLogger.arjLogger.isDebugEnabled())
- tsLogger.arjLogger.debug("participant record is not a LogRecordWrapper");
+ if (tsLogger.logger.isDebugEnabled())
+ tsLogger.logger.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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/OSEntryBean.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -20,14 +20,14 @@
}
public void register(String name) {
- if (tsLogger.arjLogger.isDebugEnabled())
- tsLogger.arjLogger.debug("Registering: " + name);
+ if (tsLogger.logger.isDebugEnabled())
+ tsLogger.logger.debug("Registering: " + name);
JMXServer.getAgent().registerMBean(name, this);
}
public void unregister(String name) {
- if (tsLogger.arjLogger.isDebugEnabled())
- tsLogger.arjLogger.debug("Unregistering: " + name);
+ if (tsLogger.logger.isDebugEnabled())
+ tsLogger.logger.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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/ObjStoreBrowser.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -107,8 +107,8 @@
*/
public void setTypes(Map<String, String> types) {
for (Map.Entry<String, String> entry : types.entrySet()) {
- if (tsLogger.arjLogger.isDebugEnabled())
- tsLogger.arjLogger.debug("ObjStoreBrowser: adding type handler " + entry.getKey() + "," + entry.getValue());
+ if (tsLogger.logger.isDebugEnabled())
+ tsLogger.logger.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.arjLogger.isDebugEnabled())
- tsLogger.arjLogger.debug("ObjectStoreDir: " + arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreDir());
+ if (tsLogger.logger.isDebugEnabled())
+ tsLogger.logger.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.arjLogger.isDebugEnabled())
- tsLogger.arjLogger.debug(e2.toString());
+ if (tsLogger.logger.isDebugEnabled())
+ tsLogger.logger.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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/util/JMXServer.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -59,8 +59,8 @@
constructor.newInstance();
isJTS = true;
} catch (Exception e) { // ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException
- if (tsLogger.arjLogger.isDebugEnabled())
- tsLogger.arjLogger.debug("JTS not available: " + e);
+ if (tsLogger.logger.isDebugEnabled())
+ tsLogger.logger.debug("JTS not available: " + e);
}
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -81,8 +81,8 @@
public FileLock(File name, long timeout, long retry)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileLock ( " + name
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileLock ( " + name
+ ", " + timeout + ", " + retry + " )");
}
@@ -107,8 +107,8 @@
public synchronized boolean lock (int lmode, boolean create)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileLock.lock called for "+_lockFile);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileLock.lock called for "+_lockFile);
}
boolean created = false;
@@ -203,8 +203,8 @@
public synchronized boolean unlock ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileLock.unlock called "+_lockFile);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileLock.unlock called "+_lockFile);
}
if (!_lockFile.exists())
@@ -286,8 +286,8 @@
private final boolean createFile ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileLock.createFile "+_lockFile);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileLock.createFile "+_lockFile);
}
byte b[] = new byte[1];
@@ -313,8 +313,8 @@
private final boolean lockFile ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileLock.lockFile called "+_lockFile);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileLock.lockFile called "+_lockFile);
}
for (int i = 0; i < _retry; i++)
@@ -347,8 +347,8 @@
private final boolean unlockFile ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileLock.unlockFile called for "+_lockFile);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileLock.unlockFile called for "+_lockFile);
}
return _lockFileLock.delete();
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/LogWriteStateManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/LogWriteStateManager.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/LogWriteStateManager.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -94,8 +94,8 @@
protected synchronized boolean modified ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("StateManager::modified() for object-id " + get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("StateManager::modified() for object-id " + get_uid());
}
if ((super.objectType() == ObjectType.RECOVERABLE) && (super.objectModel == ObjectModel.SINGLE))
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/ActivationRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/ActivationRecord.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/ActivationRecord.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -55,8 +55,8 @@
actionHandle = action;
state = st;
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActivationRecord::ActivationRecord(" + state + ", "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActivationRecord::ActivationRecord(" + state + ", "
+ sm.get_uid() + ")");
}
}
@@ -83,8 +83,8 @@
public int nestedAbort ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActivationRecord::nestedAbort() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActivationRecord::nestedAbort() for " + order());
}
int outcome = TwoPhaseOutcome.FINISH_ERROR;
@@ -105,8 +105,8 @@
public int nestedCommit ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActivationRecord::nestedCommit() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActivationRecord::nestedCommit() for " + order());
}
return TwoPhaseOutcome.FINISH_OK;
@@ -114,8 +114,8 @@
public int nestedPrepare ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActivationRecord::nestedPrepare() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActivationRecord::nestedPrepare() for " + order());
}
if ((objectAddr != null) && (actionHandle != null))
@@ -140,8 +140,8 @@
public int topLevelAbort ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActivationRecord::topLevelAbort() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActivationRecord::topLevelAbort() for " + order());
}
return nestedAbort(); /* i.e., same as nested case */
@@ -154,8 +154,8 @@
public int topLevelCommit ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActivationRecord::topLevelCommit() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActivationRecord::topLevelCommit() for " + order());
}
if ((objectAddr != null) && (actionHandle != null))
@@ -169,8 +169,8 @@
public int topLevelPrepare ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActivationRecord::topLevelPrepare() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActivationRecord::topLevelPrepare() for " + order());
}
if (objectAddr == null)
@@ -253,8 +253,8 @@
actionHandle = null;
state = ObjectStatus.PASSIVE;
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActivationRecord::ActivationRecord()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActivationRecord::ActivationRecord()");
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverActivationRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverActivationRecord.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverActivationRecord.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -49,8 +49,8 @@
{
super(ObjectStatus.PASSIVE, sm, null);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CadaverActivationRecord::CadaverActivationRecord(" + sm.get_uid() + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CadaverActivationRecord::CadaverActivationRecord(" + sm.get_uid() + ")");
}
}
@@ -65,8 +65,8 @@
public int nestedAbort ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CadaverActivationRecord::nestedAbort() for " + get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CadaverActivationRecord::nestedAbort() for " + get_uid());
}
super.nestedAbort();
@@ -76,8 +76,8 @@
public int nestedCommit ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CadaverActivationRecord::nestedCommit() for " + get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CadaverActivationRecord::nestedCommit() for " + get_uid());
}
return TwoPhaseOutcome.FINISH_OK;
@@ -85,8 +85,8 @@
public int nestedPrepare ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CadaverActivationRecord::nestedPrepare() for " + get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CadaverActivationRecord::nestedPrepare() for " + get_uid());
}
super.nestedPrepare();
@@ -96,8 +96,8 @@
public int topLevelAbort ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CadaverActivationRecord::topLevelAbort() for " + get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CadaverActivationRecord::topLevelAbort() for " + get_uid());
}
super.topLevelAbort();
@@ -107,8 +107,8 @@
public int topLevelCommit ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CadaverActivationRecord::topLevelCommit() for " + get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CadaverActivationRecord::topLevelCommit() for " + get_uid());
}
super.topLevelCommit();
@@ -118,8 +118,8 @@
public int topLevelPrepare ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CadaverActivationRecord::topLevelPrepare() for " + get_uid());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CadaverActivationRecord::topLevelPrepare() for " + get_uid());
}
// make sure SM instance forgets about action
@@ -155,8 +155,8 @@
{
super();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CadaverActivationRecord::CadaverActivationRecord ()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CadaverActivationRecord::CadaverActivationRecord ()");
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverRecord.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverRecord.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -92,8 +92,8 @@
// ObjectStore.reference(store);
}
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CadaverRecord::CadaverRecord(" + os + ", " + sm.get_uid() + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CadaverRecord::CadaverRecord(" + os + ", " + sm.get_uid() + ")");
}
}
@@ -128,8 +128,8 @@
public int nestedAbort ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CadaverRecord::nestedAbort() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CadaverRecord::nestedAbort() for " + order());
}
if (oldState != null)
@@ -161,8 +161,8 @@
public int nestedPrepare ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CadaverRecord::nestedPrepare() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CadaverRecord::nestedPrepare() for " + order());
}
if (newStateIsValid)
@@ -177,8 +177,8 @@
public int topLevelAbort ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CadaverRecord::topLevelAbort() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CadaverRecord::topLevelAbort() for " + order());
}
newStateIsValid = false;
@@ -201,8 +201,8 @@
public int topLevelCommit ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CadaverRecord::topLevelCommit() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CadaverRecord::topLevelCommit() for " + order());
}
boolean res = true;
@@ -236,8 +236,8 @@
public int topLevelPrepare ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CadaverRecord::topLevelPrepare() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CadaverRecord::topLevelPrepare() for " + order());
}
int tlpOk = TwoPhaseOutcome.PREPARE_NOTOK;
@@ -399,8 +399,8 @@
oType = RecordType.NONE_RECORD;
store = null;
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CadaverRecord::CadaverRecord ()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CadaverRecord::CadaverRecord ()");
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/DisposeRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/DisposeRecord.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/DisposeRecord.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -71,8 +71,8 @@
typeName = null;
}
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("DisposeRecord::DisposeRecord(" + objStore + ", " + objectUid + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("DisposeRecord::DisposeRecord(" + objStore + ", " + objectUid + ")");
}
}
@@ -88,8 +88,8 @@
public int nestedAbort ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("DisposeRecord::nestedAbort() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("DisposeRecord::nestedAbort() for " + order());
}
return TwoPhaseOutcome.FINISH_OK;
@@ -97,8 +97,8 @@
public int nestedCommit ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("DisposeRecord::nestedCommit() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("DisposeRecord::nestedCommit() for " + order());
}
return TwoPhaseOutcome.FINISH_OK;
@@ -106,8 +106,8 @@
public int nestedPrepare ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("DisposeRecord::nestedPrepare() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("DisposeRecord::nestedPrepare() for " + order());
}
if ((store != null) && (objectUid.notEquals(Uid.nullUid())))
@@ -118,8 +118,8 @@
public int topLevelAbort ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("DisposeRecord::topLevelAbort() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("DisposeRecord::topLevelAbort() for " + order());
}
return TwoPhaseOutcome.FINISH_OK;
@@ -131,8 +131,8 @@
public int topLevelCommit ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("DisposeRecord::topLevelCommit() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("DisposeRecord::topLevelCommit() for " + order());
}
if ((store != null) && (objectUid.notEquals(Uid.nullUid())))
@@ -162,8 +162,8 @@
public int topLevelPrepare ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("DisposeRecord::topLevelPrepare() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("DisposeRecord::topLevelPrepare() for " + order());
}
if ((store != null) && (objectUid.notEquals(Uid.nullUid())))
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -64,8 +64,8 @@
{
super(ONE_PHASE_RESOURCE_UID);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("LastResourceRecord()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("LastResourceRecord()");
}
_lro = opr;
@@ -83,8 +83,8 @@
public int nestedAbort ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("LastResourceRecord::nestedAbort() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("LastResourceRecord::nestedAbort() for " + order());
}
return TwoPhaseOutcome.FINISH_OK;
@@ -92,8 +92,8 @@
public int nestedCommit ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("LastResourceRecord::nestedCommit() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("LastResourceRecord::nestedCommit() for " + order());
}
return TwoPhaseOutcome.FINISH_ERROR;
@@ -105,8 +105,8 @@
public int nestedPrepare ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("LastResourceRecord::nestedPrepare() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("LastResourceRecord::nestedPrepare() for " + order());
}
return TwoPhaseOutcome.PREPARE_NOTOK;
@@ -114,8 +114,8 @@
public int topLevelAbort ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("LastResourceRecord::topLevelAbort() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("LastResourceRecord::topLevelAbort() for " + order());
}
if (_lro != null)
@@ -130,8 +130,8 @@
public int topLevelCommit ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("LastResourceRecord::topLevelCommit() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("LastResourceRecord::topLevelCommit() for " + order());
}
return TwoPhaseOutcome.FINISH_OK;
@@ -139,8 +139,8 @@
public int topLevelPrepare ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("LastResourceRecord::topLevelPrepare() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("LastResourceRecord::topLevelPrepare() for " + order());
}
if (_lro == null)
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/PersistenceRecord.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -68,8 +68,8 @@
{
super(os, sm);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PersistenceRecord::PersistenceRecord("
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PersistenceRecord::PersistenceRecord("
+ os + ", " + sm.get_uid() + ")");
}
@@ -95,8 +95,8 @@
public int topLevelAbort ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PersistenceRecord::topLevelAbort() for "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PersistenceRecord::topLevelAbort() for "
+ order());
}
@@ -144,19 +144,19 @@
public int topLevelCommit ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PersistenceRecord::topLevelCommit() : About to commit state, "+
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PersistenceRecord::topLevelCommit() : About to commit state, "+
"uid = "+order()+", ObjType = "+getTypeOfObject());
}
- if (tsLogger.arjLogger.isDebugEnabled())
+ if (tsLogger.logger.isDebugEnabled())
{
if (store != null) {
- tsLogger.arjLogger.debug(", store = "
+ tsLogger.logger.debug(", store = "
+ store + "(" + store.typeIs() + ")");
}
else {
- tsLogger.arjLogger.debug("");
+ tsLogger.logger.debug("");
}
}
@@ -219,8 +219,8 @@
public int topLevelPrepare ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PersistenceRecord::topLevelPrepare() for "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PersistenceRecord::topLevelPrepare() for "
+ order());
}
@@ -305,8 +305,8 @@
public int topLevelCleanup ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PersistenceRecord::topLevelCleanup() for "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PersistenceRecord::topLevelCleanup() for "
+ order());
}
@@ -324,8 +324,8 @@
public boolean restore_state (InputObjectState os, int ot)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PersistenceRecord::restore_state() for "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PersistenceRecord::restore_state() for "
+ order());
}
@@ -338,8 +338,8 @@
{
objStoreType = os.unpackInt();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug(" PersistenceRecord::restore_state: Just unpacked object store type = "+Integer.toString(objStoreType));
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug(" PersistenceRecord::restore_state: Just unpacked object store type = "+Integer.toString(objStoreType));
}
if (ObjectStoreType.valid(objStoreType))
@@ -378,8 +378,8 @@
public boolean save_state (OutputObjectState os, int ot)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PersistenceRecord::save_state() for "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PersistenceRecord::save_state() for "
+ order());
}
@@ -398,14 +398,14 @@
{
os.packInt(store.typeIs());
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PersistenceRecord::save_state: Packed object store type = "+Integer.toString(store.typeIs()));
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PersistenceRecord::save_state: Packed object store type = "+Integer.toString(store.typeIs()));
}
store.pack(os);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PersistenceRecord::save_state: Packed object store root");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PersistenceRecord::save_state: Packed object store root");
}
os.packBoolean(shadowMade);
@@ -469,8 +469,8 @@
{
super();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PersistenceRecord::PersistenceRecord() - crash recovery constructor");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PersistenceRecord::PersistenceRecord() - crash recovery constructor");
}
shadowMade = false;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/RecoveryRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/RecoveryRecord.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/RecoveryRecord.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -51,8 +51,8 @@
{
super(sm.get_uid(), sm.type(), ObjectType.ANDPERSISTENT);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecoveryRecord::RecoveryRecord(" + os + ", "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecoveryRecord::RecoveryRecord(" + os + ", "
+ sm.get_uid() + ")");
}
@@ -63,8 +63,8 @@
public void finalize () throws Throwable
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecoveryRecord.finalize() for " + order() + " type "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecoveryRecord.finalize() for " + order() + " type "
+ type());
}
super.finalize();
@@ -96,8 +96,8 @@
public int nestedAbort ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecoveryRecord::nestedAbort() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecoveryRecord::nestedAbort() for " + order());
}
/*
@@ -137,8 +137,8 @@
public int nestedCommit ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecoveryRecord::nestedCommit() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecoveryRecord::nestedCommit() for " + order());
}
return TwoPhaseOutcome.FINISH_OK;
@@ -146,8 +146,8 @@
public int nestedPrepare ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecoveryRecord::nestedPrepare() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecoveryRecord::nestedPrepare() for " + order());
}
forgetAction(true);
@@ -162,8 +162,8 @@
public int topLevelAbort ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecoveryRecord::topLevelAbort() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecoveryRecord::topLevelAbort() for " + order());
}
return nestedAbort(); /* i.e., same as nested case */
@@ -177,8 +177,8 @@
public int topLevelCommit ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecoveryRecord::topLevelCommit() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecoveryRecord::topLevelCommit() for " + order());
}
forgetAction(true);
@@ -193,8 +193,8 @@
public int topLevelPrepare ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecoveryRecord::topLevelPrepare() for " + order());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecoveryRecord::topLevelPrepare() for " + order());
}
return TwoPhaseOutcome.PREPARE_READONLY;
@@ -281,8 +281,8 @@
{
super();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RecoveryRecord::RecoveryRecord()"
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RecoveryRecord::RecoveryRecord()"
+ " - crash recovery constructor");
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/BasicMutex.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/BasicMutex.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/BasicMutex.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -67,8 +67,8 @@
public int lock ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Mutex::lock()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Mutex::lock()");
}
synchronized (_lock)
@@ -117,8 +117,8 @@
public int unlock ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Mutex::unlock()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Mutex::unlock()");
}
synchronized (_lock)
@@ -163,8 +163,8 @@
public int tryLock ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Mutex::tryLock()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Mutex::tryLock()");
}
synchronized (_lock)
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/ClassloadingUtility.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/ClassloadingUtility.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/ClassloadingUtility.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -49,8 +49,8 @@
*/
public static <T> T loadAndInstantiateClass(Class<T> iface, String className)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Loading class " + className);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Loading class " + className);
}
if (className == null) {
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperElement.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperElement.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperElement.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -47,8 +47,8 @@
public ReaperElement(Reapable control, int timeout)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ReaperElement::ReaperElement ( " + control + ", "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ReaperElement::ReaperElement ( " + control + ", "
+ timeout + " )");
}
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperThread.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -57,8 +57,8 @@
public void run ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ReaperThread.run ()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ReaperThread.run ()");
}
for (;;)
@@ -83,8 +83,8 @@
{
try
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Thread "+Thread.currentThread()+" sleeping for "+Long.toString(sleepPeriod));
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Thread "+Thread.currentThread()+" sleeping for "+Long.toString(sleepPeriod));
}
reaperObject.wait(sleepPeriod);
@@ -99,8 +99,8 @@
}
}
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ReaperThread.run ()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ReaperThread.run ()");
}
reaperObject.check();
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperWorkerThread.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -44,8 +44,8 @@
public void run ()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ReaperWorkerThread.run ()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ReaperWorkerThread.run ()");
}
for (;;)
@@ -53,8 +53,8 @@
// wait for the reaper thread to queue some TXs for
// this thread to cancel
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Thread "+Thread.currentThread()+" waiting for cancelled TXs");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Thread "+Thread.currentThread()+" waiting for cancelled TXs");
}
_theReaper.waitForCancellations();
@@ -66,8 +66,8 @@
// get the reaper to cancel any TXs queued for cancellation.
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Thread "+Thread.currentThread()+" performing cancellations");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -81,8 +81,8 @@
path = null;
}
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActionStore.currentState("+objUid+", "+tName+") - returning "+
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActionStore.currentState("+objUid+", "+tName+") - returning "+
StateStatus.stateStatusString(theState));
}
@@ -98,8 +98,8 @@
public boolean commit_state (Uid objUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActionStore.commit_state(" + objUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActionStore.commit_state(" + objUid + ", " + tName + ")");
}
boolean result = false;
@@ -117,8 +117,8 @@
public boolean hide_state (Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActionStore.hide_state(" + u + ", " + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActionStore.hide_state(" + u + ", " + tn + ")");
}
return false;
@@ -126,8 +126,8 @@
public boolean reveal_state (Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActionStore.reveal_state(" + u + ", " + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActionStore.reveal_state(" + u + ", " + tn + ")");
}
return false;
@@ -136,8 +136,8 @@
public InputObjectState read_committed (Uid storeUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActionStore.read_committed(" + storeUid + ", " + tName
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActionStore.read_committed(" + storeUid + ", " + tName
+ ")");
}
@@ -147,8 +147,8 @@
public InputObjectState read_uncommitted (Uid u, String tn)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActionStore.read_uncommitted(" + u + ", " + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActionStore.read_uncommitted(" + u + ", " + tn + ")");
}
return null;
@@ -157,8 +157,8 @@
public boolean remove_committed (Uid storeUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActionStore.remove_committed(" + storeUid + ", " + tName
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActionStore.remove_committed(" + storeUid + ", " + tName
+ ")");
}
@@ -168,8 +168,8 @@
public boolean remove_uncommitted (Uid u, String tn)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActionStore.remove_uncommitted(" + u + ", " + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActionStore.remove_uncommitted(" + u + ", " + tn + ")");
}
return false;
@@ -178,8 +178,8 @@
public boolean write_committed (Uid storeUid, String tName,
OutputObjectState state) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActionStore.write_committed(" + storeUid + ", " + tName
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActionStore.write_committed(" + storeUid + ", " + tName
+ ")");
}
@@ -189,8 +189,8 @@
public boolean write_uncommitted (Uid u, String tn, OutputObjectState s)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ActionStore.write_uncommitted(" + u + ", " + tn + ", " + s
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ActionStore.write_uncommitted(" + u + ", " + tn + ", " + s
+ ")");
}
@@ -211,7 +211,7 @@
setupStore(locationOfStore);
}
catch (ObjectStoreException e) {
- tsLogger.arjLogger.warn(e);
+ tsLogger.logger.warn(e);
super.makeInvalid();
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/CacheStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/CacheStore.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/CacheStore.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -170,8 +170,8 @@
{
super(locationOfStore, shareStatus);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CacheStore.CacheStore(" + locationOfStore + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CacheStore.CacheStore(" + locationOfStore + ")");
}
/*
@@ -191,8 +191,8 @@
{
super(shareStatus);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("CacheStore.CacheStore( " + shareStatus + " )");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("CacheStore.CacheStore( " + shareStatus + " )");
}
this.syncWrites = false;
@@ -283,8 +283,8 @@
* that the thread isn't actively doing work.
*/
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShutdownThread.run () - terminating");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShutdownThread.run () - terminating");
}
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileLockingStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileLockingStore.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileLockingStore.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -65,8 +65,8 @@
{
super(locationOfStore, ss);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileLockingStore.FileLockingStore(" + locationOfStore
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileLockingStore.FileLockingStore(" + locationOfStore
+ ")");
}
}
@@ -77,8 +77,8 @@
protected synchronized boolean lock (File fd, int lmode, boolean create)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileLockingStore.lock(" + fd + ", " + FileLock.modeString(lmode) + ", " + create + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileLockingStore.lock(" + fd + ", " + FileLock.modeString(lmode) + ", " + create + ")");
}
FileLock fileLock = new FileLock(fd);
@@ -88,8 +88,8 @@
protected synchronized boolean unlock (File fd)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileLockingStore.unlock(" + fd + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileLockingStore.unlock(" + fd + ")");
}
FileLock fileLock = new FileLock(fd);
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -83,8 +83,8 @@
{
super(ss);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileSystemStore.FileSystemStore(" + locationOfStore + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileSystemStore.FileSystemStore(" + locationOfStore + ")");
}
fullStoreName = null;
@@ -99,7 +99,7 @@
{
isValid = false;
- tsLogger.arjLogger.warn(e);
+ tsLogger.logger.warn(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
}
@@ -117,8 +117,8 @@
public InputObjectState read_committed (Uid storeUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileSystemStore.read_committed(" + storeUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileSystemStore.read_committed(" + storeUid + ", " + tName + ")");
}
return read_state(storeUid, tName, StateType.OS_ORIGINAL);
@@ -126,8 +126,8 @@
public InputObjectState read_uncommitted (Uid storeUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileSystemStore.read_uncommitted(" + storeUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileSystemStore.read_uncommitted(" + storeUid + ", " + tName + ")");
}
return read_state(storeUid, tName, StateType.OS_SHADOW);
@@ -135,8 +135,8 @@
public boolean remove_committed (Uid storeUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileSystemStore.remove_committed(" + storeUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileSystemStore.remove_committed(" + storeUid + ", " + tName + ")");
}
return remove_state(storeUid, tName, StateType.OS_ORIGINAL);
@@ -144,8 +144,8 @@
public boolean remove_uncommitted (Uid storeUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileSystemStore.remove_uncommitted(" + storeUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileSystemStore.remove_uncommitted(" + storeUid + ", " + tName + ")");
}
return remove_state(storeUid, tName, StateType.OS_SHADOW);
@@ -153,8 +153,8 @@
public boolean write_committed (Uid storeUid, String tName, OutputObjectState state) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileSystemStore.write_committed(" + storeUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileSystemStore.write_committed(" + storeUid + ", " + tName + ")");
}
return write_state(storeUid, tName, state, StateType.OS_ORIGINAL);
@@ -162,8 +162,8 @@
public boolean write_uncommitted (Uid storeUid, String tName, OutputObjectState state) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileSystemStore.write_uncommitted(" + storeUid + ", " + tName + ", " + state + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileSystemStore.write_uncommitted(" + storeUid + ", " + tName + ", " + state + ")");
}
return write_state(storeUid, tName, state, StateType.OS_SHADOW);
@@ -191,8 +191,8 @@
public boolean allObjUids (String tName, InputObjectState state, int match) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileSystemStore.allObjUids(" + tName + ", " + state + ", " + match + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileSystemStore.allObjUids(" + tName + ", " + state + ", " + match + ")");
}
String directory = null;
@@ -273,8 +273,8 @@
public boolean allTypes (InputObjectState foundTypes) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileSystemStore.allTypes(" + foundTypes + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileSystemStore.allTypes(" + foundTypes + ")");
}
boolean result = true;
@@ -408,8 +408,8 @@
protected boolean closeAndUnlock (File fd, FileInputStream ifile, FileOutputStream ofile)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileSystemStore.closeAndUnlock(" + fd + ", " + ifile + ", " + ofile + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileSystemStore.closeAndUnlock(" + fd + ", " + ifile + ", " + ofile + ")");
}
boolean closedOk = unlock(fd);
@@ -431,8 +431,8 @@
protected File openAndLock (String fname, int lmode, boolean create) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileSystemStore.openAndLock(" + fname + ", " + FileLock.modeString(lmode) + ", " + create + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileSystemStore.openAndLock(" + fname + ", " + FileLock.modeString(lmode) + ", " + create + ")");
}
// File fd = (File) FdCache(fname);
@@ -567,8 +567,8 @@
protected boolean allTypes (OutputObjectState foundTypes, String root) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileSystemStore.allTypes(" + foundTypes + ", " + root + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileSystemStore.allTypes(" + foundTypes + ", " + root + ")");
}
boolean result = true;
@@ -622,8 +622,8 @@
protected String genPathName (Uid objUid,
String tName, int ostype) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileSystemStore.genPathName(" + objUid + ", " + tName + ", " + ostype + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileSystemStore.genPathName(" + objUid + ", " + tName + ", " + ostype + ")");
}
String storeName = locateStore(getStoreName());
@@ -672,8 +672,8 @@
protected synchronized boolean setupStore (String localOSRoot) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileSystemStore.setupStore(" + localOSRoot + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileSystemStore.setupStore(" + localOSRoot + ")");
}
isValid = true;
@@ -726,8 +726,8 @@
protected synchronized final boolean createHierarchy (String path) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("FileSystemStore.createHierarchy(" + path + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("FileSystemStore.createHierarchy(" + path + ")");
}
if ((path != null) && (path.length() > 0))
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedActionStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedActionStore.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedActionStore.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -32,7 +32,6 @@
package com.arjuna.ats.internal.arjuna.objectstore;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.ats.arjuna.objectstore.ObjectStore;
import com.arjuna.ats.arjuna.objectstore.ObjectStoreType;
import com.arjuna.ats.arjuna.objectstore.StateType;
@@ -76,8 +75,8 @@
{
super(shareStatus);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("HashedStore.HashedActionStore( " + shareStatus + " )");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("HashedStore.HashedActionStore( " + shareStatus + " )");
}
try
@@ -95,8 +94,8 @@
{
this(locationOfStore, StateType.OS_SHARED);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("HashedStore.HashedActionStore(" + locationOfStore + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("HashedStore.HashedActionStore(" + locationOfStore + ")");
}
try
@@ -105,7 +104,7 @@
}
catch (ObjectStoreException e)
{
- tsLogger.arjLogger.warn(e);
+ tsLogger.logger.warn(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
}
@@ -115,8 +114,8 @@
{
super(shareStatus);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("HashedStore.HashedActionStore(" + locationOfStore + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("HashedStore.HashedActionStore(" + locationOfStore + ")");
}
try
@@ -125,7 +124,7 @@
}
catch (ObjectStoreException e)
{
- tsLogger.arjLogger.warn(e);
+ tsLogger.logger.warn(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(),
e);
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -32,7 +32,6 @@
package com.arjuna.ats.internal.arjuna.objectstore;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.ats.arjuna.objectstore.ObjectStore;
import com.arjuna.ats.arjuna.objectstore.ObjectStoreType;
import com.arjuna.ats.arjuna.objectstore.StateStatus;
import com.arjuna.ats.arjuna.objectstore.StateType;
@@ -83,8 +82,8 @@
public boolean allObjUids (String tName, InputObjectState state, int match) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("HashedStore.allObjUids(" + tName + ", " + state + ", " + match + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("HashedStore.allObjUids(" + tName + ", " + state + ", " + match + ")");
}
/*
@@ -194,8 +193,8 @@
{
super(shareStatus);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("HashedStore.HashedStore( " + shareStatus + " )");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("HashedStore.HashedStore( " + shareStatus + " )");
}
try
@@ -204,7 +203,7 @@
}
catch (ObjectStoreException e)
{
- tsLogger.arjLogger.warn(e);
+ tsLogger.logger.warn(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString());
}
@@ -219,8 +218,8 @@
{
super(shareStatus);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("HashedStore.HashedStore(" + locationOfStore + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("HashedStore.HashedStore(" + locationOfStore + ")");
}
try
@@ -229,7 +228,7 @@
}
catch (ObjectStoreException e)
{
- tsLogger.arjLogger.warn(e);
+ tsLogger.logger.warn(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString());
}
@@ -274,8 +273,8 @@
protected String genPathName (Uid objUid, String tName, int otype) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("HashedStore.genPathName(" + objUid + ", " + tName + ", " + StateType.stateTypeString(otype) + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("HashedStore.genPathName(" + objUid + ", " + tName + ", " + StateType.stateTypeString(otype) + ")");
}
String storeName = locateStore(getStoreName());
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCActionStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCActionStore.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCActionStore.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -62,8 +62,8 @@
public synchronized boolean commit_state (Uid objUid,
String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCActionStore.commit_state(" + objUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCActionStore.commit_state(" + objUid + ", " + tName + ")");
}
boolean result = false;
@@ -81,8 +81,8 @@
public boolean hide_state (Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCActionStore.hide_state(" + u + ", " + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCActionStore.hide_state(" + u + ", " + tn + ")");
}
return false;
@@ -90,8 +90,8 @@
public boolean reveal_state (Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCActionStore.reveal_state(" + u + ", " + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCActionStore.reveal_state(" + u + ", " + tn + ")");
}
return false;
@@ -99,8 +99,8 @@
public InputObjectState read_committed (Uid storeUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCActionStore.read_committed(" + storeUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCActionStore.read_committed(" + storeUid + ", " + tName + ")");
}
return super.read_committed(storeUid, tName);
@@ -108,8 +108,8 @@
public InputObjectState read_uncommitted (Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCActionStore.read_uncommitted(" + u + ", " + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCActionStore.read_uncommitted(" + u + ", " + tn + ")");
}
return null;
@@ -117,8 +117,8 @@
public boolean remove_committed (Uid storeUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCActionStore.remove_committed(" + storeUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCActionStore.remove_committed(" + storeUid + ", " + tName + ")");
}
return super.remove_committed(storeUid, tName);
@@ -126,8 +126,8 @@
public boolean remove_uncommitted (Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCActionStore.remove_uncommitted(" + u + ", " + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCActionStore.remove_uncommitted(" + u + ", " + tn + ")");
}
return false;
@@ -135,8 +135,8 @@
public boolean write_committed (Uid storeUid, String tName, OutputObjectState state) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCActionStore.write_committed(" + storeUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCActionStore.write_committed(" + storeUid + ", " + tName + ")");
}
return super.write_committed(storeUid, tName, state);
@@ -144,8 +144,8 @@
public boolean write_uncommitted (Uid u, String tn, OutputObjectState s) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCActionStore.write_uncommitted(" + u + ", " + tn + ", " + s + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCActionStore.write_uncommitted(" + u + ", " + tn + ", " + s + ")");
}
return false;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -78,8 +78,8 @@
public boolean commit_state(Uid objUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCStore.commit_state(" + objUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCStore.commit_state(" + objUid + ", " + tName + ")");
}
/* Bail out if the object store is not set up */
@@ -93,8 +93,8 @@
public boolean hide_state(Uid objUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShadowingStore.hide_state(" + objUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShadowingStore.hide_state(" + objUid + ", " + tName + ")");
}
/* Bail out if the object store is not set up */
@@ -108,8 +108,8 @@
public boolean reveal_state(Uid objUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShadowingStore.reveal_state(" + objUid + ", " + tName
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShadowingStore.reveal_state(" + objUid + ", " + tName
+ ")");
}
@@ -141,8 +141,8 @@
public InputObjectState read_committed(Uid storeUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCStore.read_committed(" + storeUid + ", "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCStore.read_committed(" + storeUid + ", "
+ tName + ")");
}
@@ -152,8 +152,8 @@
public InputObjectState read_uncommitted(Uid storeUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCStore.read_uncommitted(" + storeUid + ", " + tName
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCStore.read_uncommitted(" + storeUid + ", " + tName
+ ")");
}
@@ -163,8 +163,8 @@
public boolean remove_committed(Uid storeUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCStore.remove_committed(" + storeUid + ", " + tName
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCStore.remove_committed(" + storeUid + ", " + tName
+ ")");
}
@@ -174,8 +174,8 @@
public boolean remove_uncommitted(Uid storeUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCStore.remove_uncommitted(" + storeUid + ", " + tName
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCStore.remove_uncommitted(" + storeUid + ", " + tName
+ ")");
}
@@ -185,8 +185,8 @@
public boolean write_committed(Uid storeUid, String tName,
OutputObjectState state) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCStore.write_committed(" + storeUid + ", " + tName
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCStore.write_committed(" + storeUid + ", " + tName
+ ")");
}
@@ -196,8 +196,8 @@
public boolean write_uncommitted(Uid storeUid, String tName,
OutputObjectState state) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCStore.write_uncommitted(" + storeUid + ", " + tName
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCStore.write_uncommitted(" + storeUid + ", " + tName
+ ", " + state + ")");
}
@@ -217,8 +217,8 @@
public boolean allObjUids(String tName, InputObjectState state, int match)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCStore.allObjUids(" + tName + ", " + state + ", "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCStore.allObjUids(" + tName + ", " + state + ", "
+ match + ")");
}
@@ -231,8 +231,8 @@
public boolean allTypes(InputObjectState foundTypes)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCStore.allTypes(" + foundTypes + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCStore.allTypes(" + foundTypes + ")");
}
if (storeValid())
@@ -269,8 +269,8 @@
protected boolean remove_state(Uid objUid, String name, int ft)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("JDBCStore.remove_state("
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("JDBCStore.remove_state("
+ objUid + ", " + name + ", "
+ StateType.stateTypeString(ft) + ")");
}
@@ -293,8 +293,8 @@
protected JDBCStore()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug(getClass().getName() + "()");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug(getClass().getName() + "()");
}
try
@@ -309,8 +309,8 @@
protected JDBCStore(String tableName)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug(getClass().getName() + "(" + tableName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug(getClass().getName() + "(" + tableName + ")");
}
try
@@ -558,7 +558,7 @@
}
catch (Exception e)
{
- tsLogger.arjLogger.warn(e);
+ tsLogger.logger.warn(e);
throw e;
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -500,8 +500,8 @@
public boolean hide_state(Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("LogStore.hide_state(" + u + ", " + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("LogStore.hide_state(" + u + ", " + tn + ")");
}
return false;
@@ -509,8 +509,8 @@
public boolean reveal_state(Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("LogStore.reveal_state(" + u + ", " + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("LogStore.reveal_state(" + u + ", " + tn + ")");
}
return false;
@@ -519,8 +519,8 @@
public InputObjectState read_uncommitted(Uid u, String tn)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("LogStore.read_uncommitted(" + u + ", " + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("LogStore.read_uncommitted(" + u + ", " + tn + ")");
}
return null;
@@ -529,8 +529,8 @@
public boolean remove_uncommitted(Uid u, String tn)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("LogStore.remove_uncommitted(" + u + ", " + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("LogStore.remove_uncommitted(" + u + ", " + tn + ")");
}
return false;
@@ -539,8 +539,8 @@
public boolean write_committed(Uid storeUid, String tName,
OutputObjectState state) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("LogStore.write_committed(" + storeUid + ", "
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("LogStore.write_committed(" + storeUid + ", "
+ tName + ")");
}
@@ -559,8 +559,8 @@
public boolean write_uncommitted(Uid u, String tn, OutputObjectState s)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("LogStore.write_uncommitted(" + u + ", " + tn + ", " + s
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("LogStore.write_uncommitted(" + u + ", " + tn + ", " + s
+ ")");
}
@@ -680,7 +680,7 @@
setupStore(locationOfStore);
}
catch (ObjectStoreException e) {
- tsLogger.arjLogger.warn(e);
+ tsLogger.logger.warn(e);
super.makeInvalid();
@@ -702,7 +702,7 @@
setupStore(arjPropertyManager.getObjectStoreEnvironmentBean().getLocalOSRoot());
}
catch (ObjectStoreException e) {
- tsLogger.arjLogger.warn(e);
+ tsLogger.logger.warn(e);
super.makeInvalid();
@@ -746,8 +746,8 @@
protected boolean unlockAndClose(File fd, RandomAccessFile rf)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("RandomAccessFile.unlockAndClose(" + fd + ", " + rf + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("RandomAccessFile.unlockAndClose(" + fd + ", " + rf + ")");
}
boolean closedOk = unlock(fd);
@@ -777,8 +777,8 @@
protected boolean write_state(Uid objUid, String tName,
OutputObjectState state, int ft) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShadowingStore.write_state(" + objUid + ", " + tName
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShadowingStore.write_state(" + objUid + ", " + tName
+ ", " + StateType.stateTypeString(ft) + ")");
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/NullActionStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/NullActionStore.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/NullActionStore.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -139,7 +139,7 @@
setupStore(arjPropertyManager.getObjectStoreEnvironmentBean().getLocalOSRoot());
}
catch (ObjectStoreException e) {
- tsLogger.arjLogger.warn(e);
+ tsLogger.logger.warn(e);
super.makeInvalid();
@@ -157,7 +157,7 @@
setupStore(locationOfStore);
}
catch (ObjectStoreException e) {
- tsLogger.arjLogger.warn(e);
+ tsLogger.logger.warn(e);
super.makeInvalid();
@@ -184,7 +184,7 @@
super.setupStore(location);
}
catch (ObjectStoreException e) {
- tsLogger.arjLogger.warn(e);
+ tsLogger.logger.warn(e);
super.makeInvalid();
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowNoFileLockStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowNoFileLockStore.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowNoFileLockStore.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -65,8 +65,8 @@
{
super(locationOfStore, shareStatus);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShadowNoFileLockStore.ShadowNoFileLockStore("
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShadowNoFileLockStore.ShadowNoFileLockStore("
+ locationOfStore + ")");
}
}
@@ -78,8 +78,8 @@
public ShadowNoFileLockStore(int shareStatus)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShadowNoFileLockStore.ShadowNoFileLockStore(" + shareStatus + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShadowNoFileLockStore.ShadowNoFileLockStore(" + shareStatus + ")");
}
}
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -116,8 +116,8 @@
}
}
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShadowingStore.currentState("+objUid+", "+tName+") - returning "+
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShadowingStore.currentState("+objUid+", "+tName+") - returning "+
StateStatus.stateStatusString(theState));
}
@@ -133,8 +133,8 @@
public boolean commit_state (Uid objUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShadowingStore.commit_state(" + objUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShadowingStore.commit_state(" + objUid + ", " + tName + ")");
}
boolean result = false;
@@ -210,8 +210,8 @@
public boolean hide_state (Uid objUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShadowingStore.hide_state(" + objUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShadowingStore.hide_state(" + objUid + ", " + tName + ")");
}
boolean hiddenOk = true;
@@ -286,8 +286,8 @@
public boolean reveal_state (Uid objUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShadowingStore.reveal_state(" + objUid + ", " + tName + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShadowingStore.reveal_state(" + objUid + ", " + tName + ")");
}
boolean revealedOk = true;
@@ -368,8 +368,8 @@
protected String genPathName (Uid objUid, String tName, int ft)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShadowingStore.genPathName(" + objUid + ", " + tName + ", " + StateType.stateTypeString(ft) + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShadowingStore.genPathName(" + objUid + ", " + tName + ", " + StateType.stateTypeString(ft) + ")");
}
String fname = super.genPathName(objUid, tName, ft);
@@ -396,8 +396,8 @@
protected InputObjectState read_state (Uid objUid, String tName, int ft)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShadowingStore.read_state(" + objUid + ", " + tName + ", " + StateType.stateTypeString(ft) + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShadowingStore.read_state(" + objUid + ", " + tName + ", " + StateType.stateTypeString(ft) + ")");
}
if (!storeValid()) {
@@ -486,8 +486,8 @@
protected boolean remove_state (Uid objUid, String name, int ft)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShadowingStore.remove_state(" + objUid + ", " + name + ", " + StateType.stateTypeString(ft) + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShadowingStore.remove_state(" + objUid + ", " + name + ", " + StateType.stateTypeString(ft) + ")");
}
boolean removeOk = true;
@@ -571,8 +571,8 @@
protected boolean write_state (Uid objUid, String tName,
OutputObjectState state, int ft) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShadowingStore.write_state(" + objUid + ", " + tName + ", " + StateType.stateTypeString(ft) + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShadowingStore.write_state(" + objUid + ", " + tName + ", " + StateType.stateTypeString(ft) + ")");
}
if (!storeValid())
@@ -665,8 +665,8 @@
{
super(shareStatus);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShadowingStore.ShadowingStore(" + locationOfStore + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShadowingStore.ShadowingStore(" + locationOfStore + ")");
}
try
@@ -675,7 +675,7 @@
}
catch (ObjectStoreException e)
{
- tsLogger.arjLogger.fatal(e);
+ tsLogger.logger.fatal(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(),
e);
@@ -691,8 +691,8 @@
{
super(shareStatus);
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ShadowingStore.ShadowingStore( " + shareStatus + " )");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ShadowingStore.ShadowingStore( " + shareStatus + " )");
}
try
@@ -702,7 +702,7 @@
}
catch (ObjectStoreException e)
{
- tsLogger.arjLogger.fatal(e);
+ tsLogger.logger.fatal(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(),
e);
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/VolatileStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/VolatileStore.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/VolatileStore.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -91,8 +91,8 @@
public int currentState(Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("VolatileStore.currentState(Uid=" + u + ", typeName=" + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("VolatileStore.currentState(Uid=" + u + ", typeName=" + tn + ")");
}
return getState(u);
@@ -160,8 +160,8 @@
public InputObjectState read_committed(Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("VolatileStore.read_committed(Uid=" + u + ", typeName=" + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("VolatileStore.read_committed(Uid=" + u + ", typeName=" + tn + ")");
}
return read(u, tn, StateStatus.OS_COMMITTED);
@@ -191,8 +191,8 @@
public boolean remove_committed(Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("VolatileStore.remove_committed(Uid=" + u + ", typeName=" + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("VolatileStore.remove_committed(Uid=" + u + ", typeName=" + tn + ")");
}
return remove(u, tn, StateStatus.OS_COMMITTED);
@@ -224,8 +224,8 @@
public boolean write_committed(Uid u, String tn, OutputObjectState buff) throws ObjectStoreException
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("VolatileStore.write_committed(Uid=" + u + ", typeName=" + tn + ")");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("VolatileStore.write_committed(Uid=" + u + ", typeName=" + tn + ")");
}
return write(u, tn, buff, StateStatus.OS_COMMITTED);
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/AtomicActionRecoveryModule.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -58,8 +58,8 @@
{
public AtomicActionRecoveryModule()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("AtomicActionRecoveryModule created");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("AtomicActionRecoveryModule created");
}
if (_transactionStore == null)
@@ -83,8 +83,8 @@
try
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("AtomicActionRecoveryModule first pass");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("AtomicActionRecoveryModule first pass");
}
AtomicActions = _transactionStore.allObjUids( _transactionType, aa_uids );
@@ -102,8 +102,8 @@
public void periodicWorkSecondPass()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("AtomicActionRecoveryModule second pass");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("AtomicActionRecoveryModule second pass");
}
processTransactionsStatus() ;
@@ -111,8 +111,8 @@
protected AtomicActionRecoveryModule (String type)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("AtomicActionRecoveryModule created");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("AtomicActionRecoveryModule created");
}
if (_transactionStore == null)
@@ -136,8 +136,8 @@
String Status = ActionStatus.stringForm( theStatus ) ;
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("transaction type is " + _transactionType + " uid is " +
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("transaction type is " + _transactionType + " uid is " +
recoverUid.toString() + "\n ActionStatus is " + Status +
" in flight is " + inFlight);
}
@@ -197,8 +197,8 @@
{
Vector uidVector = new Vector() ;
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("processing " + _transactionType
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("processing " + _transactionType
+ " transactions");
}
@@ -220,8 +220,8 @@
{
Uid newUid = new Uid( theUid ) ;
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("found transaction " + newUid);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("found transaction " + newUid);
}
uidVector.addElement( newUid ) ;
@@ -253,10 +253,7 @@
}
catch ( ObjectStoreException ex )
{
- if (tsLogger.arjLogger.isWarnEnabled())
- {
- tsLogger.i18NLogger.warn_recovery_AtomicActionRecoveryModule_3(currentUid, ex);
- }
+ tsLogger.i18NLogger.warn_recovery_AtomicActionRecoveryModule_3(currentUid, ex);
}
}
}
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -77,8 +77,8 @@
{
// no scanning wanted
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Expiry scan zero - not scanning");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Expiry scan zero - not scanning");
}
return false;
@@ -88,8 +88,8 @@
{
// nothing to do
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("No Expiry scanners loaded - not scanning");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("No Expiry scanners loaded - not scanning");
}
return false;
@@ -125,8 +125,8 @@
private ExpiredEntryMonitor(boolean skipFirst)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ExpiredEntryMonitor - constructed");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ExpiredEntryMonitor - constructed");
}
_skipNext = skipFirst;
_stop = false;
@@ -170,8 +170,8 @@
m.scan();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug(" ");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug(" ");
// bit of space if detailing
}
}
@@ -215,8 +215,8 @@
_scanIntervalSeconds = recoveryPropertyManager.getRecoveryEnvironmentBean().getExpiryScanInterval() * 60 * 60;
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Expiry scan interval set to "+Integer.toString(_scanIntervalSeconds)+" seconds");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Expiry scan interval set to "+Integer.toString(_scanIntervalSeconds)+" seconds");
}
if (_scanIntervalSeconds != 0)
@@ -246,8 +246,8 @@
private static void loadScanner( String className )
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Loading expiry scanner "+className);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Loading expiry scanner "+className);
}
if (className == null) {
@@ -271,8 +271,8 @@
}
else
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Loading expiry scanner "+className);
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -53,8 +53,8 @@
{
public ExpiredTransactionStatusManagerScanner()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ExpiredTransactionStatusManagerScanner created, with expiry time of "+Integer.toString(_expiryTime)+" seconds");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ExpiredTransactionStatusManagerScanner created, with expiry time of "+Integer.toString(_expiryTime)+" seconds");
}
_objectStore = TransactionStatusManagerItem.getStore() ;
@@ -69,8 +69,8 @@
// calculate the time before which items will be removed
Date oldestSurviving = new Date( new Date().getTime() - _expiryTime * 1000 ) ;
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("ExpiredTransactionStatusManagerScanner - scanning to remove items from before "+_timeFormat.format(oldestSurviving));
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("ExpiredTransactionStatusManagerScanner - scanning to remove items from before "+_timeFormat.format(oldestSurviving));
}
try
@@ -158,8 +158,8 @@
{
_expiryTime = recoveryPropertyManager.getRecoveryEnvironmentBean().getTransactionStatusManagerExpiryTime() * 60 * 60;
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Expiry scan interval set to "+Integer.toString(_expiryTime)+" seconds");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Listener.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -130,8 +130,8 @@
Connection new_conn = new Connection( conn, _listener_service, callback );
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Connected to " + conn.getInetAddress().getHostAddress() +
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Connected to " + conn.getInetAddress().getHostAddress() +
" on port " + conn.getPort() + " on listener port " +
conn.getLocalPort() + " for service " +
_listener_service.getClass().getName());
@@ -147,15 +147,15 @@
catch (final SocketException ex)
{
// we get this if the socket is closed under a call to shutdown
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Recovery listener existing " +
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Recovery listener existing " +
_listener_service.getClass().getName());
}
}
catch ( final IOException ex )
{
- if (tsLogger.arjLogger.isDebugEnabled())
- tsLogger.arjLogger.debug("Listener - IOException"+" "+ex);
+ if (tsLogger.logger.isDebugEnabled())
+ tsLogger.logger.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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -139,16 +139,16 @@
if (threaded)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: starting background scanner thread");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: starting background scanner thread");
}
start();
}
if(useListener && _listener != null)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: starting listener worker thread");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: starting listener worker thread");
}
_listener.start();
}
@@ -171,8 +171,8 @@
synchronized (_stateLock) {
if (getMode() != Mode.TERMINATED) {
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: Mode <== TERMINATED");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: Mode <== TERMINATED");
}
setMode(Mode.TERMINATED);
_stateLock.notifyAll();
@@ -183,16 +183,16 @@
// changes to TERMINATED
while (getStatus() == Status.SCANNING) {
try {
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: shutdown waiting for scan to end");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: shutdown waiting for scan to end");
}
_stateLock.wait();
} catch(InterruptedException ie) {
// just ignore and retest condition
}
}
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: shutdown scan wait complete");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: shutdown scan wait complete");
}
}
}
@@ -224,8 +224,8 @@
// only switch and kick everyone if we are currently ENABLED
if (getMode() == Mode.ENABLED) {
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: Mode <== SUSPENDED");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: Mode <== SUSPENDED");
}
setMode(Mode.SUSPENDED);
_stateLock.notifyAll();
@@ -234,15 +234,15 @@
// synchronous, so we keep waiting until the currently active scan stops
while (getStatus() == Status.SCANNING) {
try {
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: suspendScan waiting for scan to end");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: suspendScan waiting for scan to end");
}
_stateLock.wait();
} catch(InterruptedException ie) {
// just ignore and retest condition
}
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: suspendScan scan wait compelete");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: suspendScan scan wait compelete");
}
}
}
@@ -260,8 +260,8 @@
synchronized (_stateLock)
{
if (getMode() == Mode.SUSPENDED) {
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: Mode <== ENABLED");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: Mode <== ENABLED");
}
setMode(Mode.ENABLED);
_stateLock.notifyAll();
@@ -304,16 +304,16 @@
synchronized(_stateLock) {
if (getStatus() == Status.SCANNING) {
// need to wait for some other scan to finish
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: background thread waiting on other scan");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: background thread waiting on other scan");
}
doScanningWait();
// we don't wait around if a worker scan request has just come in
if (getMode() == Mode.ENABLED && !_workerScanRequested) {
// the last guy just finished scanning so we ought to wait a bit rather than just
// pile straight in to do some work
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: background thread backing off");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: background thread backing off");
}
doPeriodicWait();
// if we got told to stop then do so
@@ -324,8 +324,8 @@
switch (getMode()) {
case ENABLED:
// ok grab our chance to be the scanning thread
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: background thread Status <== SCANNING");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: background thread Status <== SCANNING");
}
setStatus(Status.SCANNING);
// must kick any other waiting threads
@@ -334,8 +334,8 @@
break;
case SUSPENDED:
// we need to wait while we are suspended
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: background thread wait while SUSPENDED");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: background thread wait while SUSPENDED");
}
doSuspendedWait();
// we come out of here with the lock and either ENABLED or TERMINATED
@@ -365,14 +365,14 @@
}
// we are in state SCANNING so actually do the scan
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: background thread scanning");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: background thread scanning");
}
doWorkInternal();
// clear the SCANNING state now we have done
synchronized(_stateLock) {
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: background thread Status <== INACTIVE");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: background thread Status <== INACTIVE");
}
setStatus(Status.INACTIVE);
// must kick any other waiting threads
@@ -386,8 +386,8 @@
if (getMode() == Mode.ENABLED && !_workerScanRequested) {
// we managed a full scan and scanning is still enabled
// so wait a bit before the next attempt
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: background thread backing off");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: background thread backing off");
}
doPeriodicWait();
}
@@ -404,8 +404,8 @@
}
}
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: background thread exiting");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: background thread exiting");
}
}
@@ -423,8 +423,8 @@
synchronized(_stateLock) {
if (getMode() == Mode.SUSPENDED) {
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: ad hoc thread wait while SUSPENDED");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: ad hoc thread wait while SUSPENDED");
}
doSuspendedWait();
}
@@ -432,8 +432,8 @@
// no longer SUSPENDED -- retest in case we got TERMINATED
if (getMode() == Mode.TERMINATED) {
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: ad hoc thread scan TERMINATED");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: ad hoc thread scan TERMINATED");
}
} else {
@@ -441,8 +441,8 @@
if (getStatus() == Status.SCANNING) {
// just wait for the other scan to finish
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: ad hoc thread waiting on other scan");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: ad hoc thread waiting on other scan");
}
doScanningWait();
} else {
@@ -451,8 +451,8 @@
setStatus(Status.SCANNING);
// must kick any other waiting threads
_stateLock.notifyAll();
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: ad hoc thread Status <== SCANNING");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: ad hoc thread Status <== SCANNING");
}
workToDo = true;
}
@@ -476,15 +476,15 @@
// ok to start work -- we cannot be stopped now by a mode change to SUSPEND or TERMINATE
// until we get through phase 1 and maybe phase 2 if we are lucky
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: ad hoc thread scanning");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: ad hoc thread scanning");
}
doWorkInternal();
// clear the scan for some other thread to have a go
synchronized(_stateLock) {
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: ad hoc thread Status <== INACTIVE");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: ad hoc thread Status <== INACTIVE");
}
setStatus(Status.INACTIVE);
// must kick any other waiting threads
@@ -510,8 +510,8 @@
_workerScanRequested = true;
// wake up the periodic recovery thread if no scan is in progress
if (getStatus() != Status.SCANNING) {
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: listener worker interrupts background thread");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: listener worker interrupts background thread");
}
_stateLock.notifyAll();
}
@@ -528,8 +528,8 @@
public final void addModule (RecoveryModule module)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: adding module " + module.getClass().getName());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: adding module " + module.getClass().getName());
}
_recoveryModules.add(module);
}
@@ -541,8 +541,8 @@
*/
public final void removeModule (RecoveryModule module, boolean waitOnScan)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: removing module " + module.getClass().getName());
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: removing module " + module.getClass().getName());
}
if (waitOnScan) {
@@ -565,8 +565,8 @@
public final void removeAllModules (boolean waitOnScan)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: removing all modules.");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: removing all modules.");
}
if (waitOnScan) {
@@ -719,8 +719,8 @@
{
// n.b. we only get here if status is SCANNING
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Periodic recovery first pass at "+_theTimestamper.format(new Date()));
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.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
@@ -745,8 +745,8 @@
restoreClassLoader(cl);
}
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug(" ");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug(" ");
}
}
@@ -765,8 +765,8 @@
// n.b. if we give up here the caller is responsible for clearing the active scan
if (getMode() == Mode.TERMINATED) {
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: scan TERMINATED at phase 1");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: scan TERMINATED at phase 1");
}
return;
}
@@ -774,8 +774,8 @@
// move on to phase 2
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Periodic recovery second pass at "+_theTimestamper.format(new Date()));
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Periodic recovery second pass at "+_theTimestamper.format(new Date()));
}
modules = copyOfModules.elements();
@@ -791,8 +791,8 @@
restoreClassLoader(cl);
}
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug(" ");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug(" ");
}
}
@@ -808,8 +808,8 @@
private void notifyWorker()
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery: scan thread signals listener worker");
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery: scan thread signals listener worker");
}
if(_workerService != null)
{
@@ -872,8 +872,8 @@
*/
private void loadModule (String className)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Loading recovery module " +
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Loading recovery module " +
className);
}
@@ -922,15 +922,15 @@
_recoveryPeriod = recoveryPropertyManager.getRecoveryEnvironmentBean().getPeriodicRecoveryPeriod();
- if (_recoveryPeriod != _defaultRecoveryPeriod && tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("com.arjuna.ats.arjuna.recovery.PeriodicRecovery" +
+ if (_recoveryPeriod != _defaultRecoveryPeriod && tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("com.arjuna.ats.arjuna.recovery.PeriodicRecovery" +
": Recovery period set to " + _recoveryPeriod + " seconds");
}
_backoffPeriod = recoveryPropertyManager.getRecoveryEnvironmentBean().getRecoveryBackoffPeriod();
- if (_backoffPeriod != _defaultBackoffPeriod && tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("PeriodicRecovery" +
+ if (_backoffPeriod != _defaultBackoffPeriod && tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("PeriodicRecovery" +
": Backoff period set to " + _backoffPeriod + " seconds");
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecActivatorLoader.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecActivatorLoader.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecActivatorLoader.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -83,8 +83,8 @@
private static void loadActivator (String className)
{
- if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("Loading recovery activator " +
+ if (tsLogger.logger.isDebugEnabled()) {
+ tsLogger.logger.debug("Loading recovery activator " +
className);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecoveryManagerImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecoveryManagerImple.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecoveryManagerImple.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -112,7 +112,7 @@
try
{
- if (tsLogger.arjLogger.isInfoEnabled())
+ if (tsLogger.logger.isInfoEnabled())
{
if(useListener)
{
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxLogger.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxLogger.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -31,22 +31,10 @@
package com.arjuna.ats.tsmx.logging;
-import com.arjuna.common.util.logging.*;
import org.jboss.logging.Logger;
public class tsmxLogger
{
- public static LogNoi18n logger;
- public static tsmxI18NLogger i18nLogger;
-
- public static void initialize(LogNoi18n noi18n)
- {
- logger = noi18n;
- i18nLogger = new tsmxI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.tsmx"));
- }
-
- static
- {
- LogFactory.initializeModuleLogger(tsmxLogger.class, "com.arjuna.ats.tsmx");
- }
+ public static final Logger logger = Logger.getLogger("com.arjuna.ats.tsmx");
+ public static final tsmxI18NLogger i18nLogger = new tsmxI18NLoggerImpl(logger);
}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockManager.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockManager.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -59,8 +59,8 @@
objectTypeName = new String(tName);
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("CadaverLockManager::CadaverLockManager(" + objUid + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("CadaverLockManager::CadaverLockManager(" + objUid + ")");
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockRecord.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockRecord.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -74,9 +74,9 @@
else
doRelease = true;
- if (txojLogger.aitLogger.isDebugEnabled())
+ if (txojLogger.logger.isDebugEnabled())
{
- txojLogger.aitLogger.debug("CadaverLockRecord::CadaverLockRecord("+store+
+ txojLogger.logger.debug("CadaverLockRecord::CadaverLockRecord("+store+
", "+((lm != null) ? lm.get_uid() : Uid.nullUid())+")");
}
}
@@ -99,9 +99,9 @@
public int nestedAbort ()
{
- if (txojLogger.aitLogger.isDebugEnabled())
+ if (txojLogger.logger.isDebugEnabled())
{
- txojLogger.aitLogger.debug("CadaverLockRecord::nestedAbort() for "+order());
+ txojLogger.logger.debug("CadaverLockRecord::nestedAbort() for "+order());
}
if (doRelease)
@@ -121,9 +121,9 @@
public int nestedCommit ()
{
- if (txojLogger.aitLogger.isDebugEnabled())
+ if (txojLogger.logger.isDebugEnabled())
{
- txojLogger.aitLogger.debug("CadaverLockRecord::nestedCommit() for "+order());
+ txojLogger.logger.debug("CadaverLockRecord::nestedCommit() for "+order());
}
if (doRelease)
@@ -149,9 +149,9 @@
public int topLevelAbort ()
{
- if (txojLogger.aitLogger.isDebugEnabled())
+ if (txojLogger.logger.isDebugEnabled())
{
- txojLogger.aitLogger.debug("CadaverLockRecord::topLevelAbort() for "+order());
+ txojLogger.logger.debug("CadaverLockRecord::topLevelAbort() for "+order());
}
if (doRelease)
@@ -171,9 +171,9 @@
public int topLevelCommit ()
{
- if (txojLogger.aitLogger.isDebugEnabled())
+ if (txojLogger.logger.isDebugEnabled())
{
- txojLogger.aitLogger.debug("CadaverLockRecord::topLevelCommit() for "+order());
+ txojLogger.logger.debug("CadaverLockRecord::topLevelCommit() for "+order());
}
if (doRelease)
@@ -229,9 +229,9 @@
objectTypeName = null;
doRelease = false;
- if (txojLogger.aitLogger.isDebugEnabled())
+ if (txojLogger.logger.isDebugEnabled())
{
- txojLogger.aitLogger.debug("CadaverLockRecord::CadaverLockRecord ()");
+ txojLogger.logger.debug("CadaverLockRecord::CadaverLockRecord ()");
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/LockRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/LockRecord.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/LockRecord.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -54,9 +54,9 @@
{
super(lm.get_uid(), lm.type(), ObjectType.ANDPERSISTENT);
- if (txojLogger.aitLogger.isDebugEnabled())
+ if (txojLogger.logger.isDebugEnabled())
{
- txojLogger.aitLogger.debug("LockRecord::LockRecord("+lm.get_uid()+", "
+ txojLogger.logger.debug("LockRecord::LockRecord("+lm.get_uid()+", "
+(readOnly ? "PREPARE_READONLY" : "WRITEABLE")+")");
}
@@ -84,9 +84,9 @@
public int nestedAbort ()
{
- if (txojLogger.aitLogger.isDebugEnabled())
+ if (txojLogger.logger.isDebugEnabled())
{
- txojLogger.aitLogger.debug("LockRecord::nestedAbort() for "+order());
+ txojLogger.logger.debug("LockRecord::nestedAbort() for "+order());
}
/* default constructor problem. */
@@ -115,9 +115,9 @@
public int nestedCommit ()
{
- if (txojLogger.aitLogger.isDebugEnabled())
+ if (txojLogger.logger.isDebugEnabled())
{
- txojLogger.aitLogger.debug("LockRecord::nestedCommit() for "+order());
+ txojLogger.logger.debug("LockRecord::nestedCommit() for "+order());
}
/* default constructor problem. */
@@ -143,9 +143,9 @@
public int nestedPrepare ()
{
- if (txojLogger.aitLogger.isDebugEnabled())
+ if (txojLogger.logger.isDebugEnabled())
{
- txojLogger.aitLogger.debug("LockRecord::nestedPrepare() for "+order());
+ txojLogger.logger.debug("LockRecord::nestedPrepare() for "+order());
}
return TwoPhaseOutcome.PREPARE_OK;
@@ -153,9 +153,9 @@
public int topLevelAbort ()
{
- if (txojLogger.aitLogger.isDebugEnabled())
+ if (txojLogger.logger.isDebugEnabled())
{
- txojLogger.aitLogger.debug("LockRecord::topLevelAbort() for "+order());
+ txojLogger.logger.debug("LockRecord::topLevelAbort() for "+order());
}
return nestedAbort();
@@ -163,9 +163,9 @@
public int topLevelCommit ()
{
- if (txojLogger.aitLogger.isDebugEnabled())
+ if (txojLogger.logger.isDebugEnabled())
{
- txojLogger.aitLogger.debug("LockRecord::topLevelCommit() for "+order());
+ txojLogger.logger.debug("LockRecord::topLevelCommit() for "+order());
}
/* default constructor problem. */
@@ -194,9 +194,9 @@
public int topLevelPrepare ()
{
- if (txojLogger.aitLogger.isDebugEnabled())
+ if (txojLogger.logger.isDebugEnabled())
{
- txojLogger.aitLogger.debug("LockRecord::topLevelPrepare() for "+order());
+ txojLogger.logger.debug("LockRecord::topLevelPrepare() for "+order());
}
if (readOnly)
@@ -298,9 +298,9 @@
{
super();
- if (txojLogger.aitLogger.isDebugEnabled())
+ if (txojLogger.logger.isDebugEnabled())
{
- txojLogger.aitLogger.debug("LockRecord::LockRecord()");
+ txojLogger.logger.debug("LockRecord::LockRecord()");
}
actionHandle = null;
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/lockstore/BasicLockStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/lockstore/BasicLockStore.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/lockstore/BasicLockStore.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -58,16 +58,16 @@
public BasicLockStore(String key)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("BasicLockStore.BasicLockStore(" + key + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("BasicLockStore.BasicLockStore(" + key + ")");
}
}
public InputObjectState read_state (Uid u, String tName)
throws LockStoreException
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("BasicLockStore.read_state(" + u + ", " + tName + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("BasicLockStore.read_state(" + u + ", " + tName + ")");
}
return segmentStore.read_state(u, tName);
@@ -75,8 +75,8 @@
public boolean remove_state (Uid u, String tName)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("BasicLockStore.remove_state(" + u + ", " + tName + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("BasicLockStore.remove_state(" + u + ", " + tName + ")");
}
return segmentStore.remove_state(u, tName);
@@ -84,8 +84,8 @@
public boolean write_committed (Uid u, String tName, OutputObjectState state)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("BasicLockStore.write_committed(" + u + ", " + tName + ", "
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("BasicLockStore.write_committed(" + u + ", " + tName + ", "
+ state + ")");
}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/lockstore/BasicPersistentLockStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/lockstore/BasicPersistentLockStore.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/lockstore/BasicPersistentLockStore.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -63,8 +63,8 @@
public BasicPersistentLockStore(String key)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("BasicPersistentLockStore.BasicPersistentLockStore(" + key + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("BasicPersistentLockStore.BasicPersistentLockStore(" + key + ")");
}
lockStoreLocation = txojPropertyManager.getTxojEnvironmentBean()
@@ -84,8 +84,8 @@
public InputObjectState read_state (Uid u, String tName)
throws LockStoreException
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("BasicPersistentLockStore.read_state(" + u + ", " + tName + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("BasicPersistentLockStore.read_state(" + u + ", " + tName + ")");
}
try
@@ -100,8 +100,8 @@
public boolean remove_state (Uid u, String tName)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("BasicPersistentLockStore.remove_state(" + u + ", " + tName + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("BasicPersistentLockStore.remove_state(" + u + ", " + tName + ")");
}
try
@@ -116,8 +116,8 @@
public boolean write_committed (Uid u, String tName, OutputObjectState state)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("BasicPersistentLockStore.write_committed(" + u + ", " + tName + ", " + state + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("BasicPersistentLockStore.write_committed(" + u + ", " + tName + ", " + state + ")");
}
try
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/RecoveredTransactionalObject.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/RecoveredTransactionalObject.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/RecoveredTransactionalObject.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -38,8 +38,6 @@
import com.arjuna.ats.txoj.logging.txojLogger;
-import com.arjuna.common.util.logging.*;
-
import com.arjuna.ats.arjuna.objectstore.*;
import com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager;
@@ -83,8 +81,8 @@
_objectStore = objectStore;
_transactionStatusConnectionMgr = new TransactionStatusConnectionManager();
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("RecoveredTransactionalObject created for "+_ourUid);
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("RecoveredTransactionalObject created for "+_ourUid);
}
}
@@ -98,15 +96,15 @@
* is, so leave that to the cache.
*/
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("TO held by transaction "+_owningTransactionUid);
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("TO held by transaction "+_owningTransactionUid);
}
int tranStatus = _transactionStatusConnectionMgr
.getTransactionStatus(_owningTransactionUid);
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("RecoveredTransactionalObject - transaction status "+ActionStatus.stringForm(tranStatus));
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("RecoveredTransactionalObject - transaction status "+ActionStatus.stringForm(tranStatus));
}
boolean inactive = false;
@@ -114,9 +112,9 @@
if (tranStatus == ActionStatus.INVALID) // should be
// ActionStatus.NO_ACTION
{
- if (txojLogger.aitLogger.isDebugEnabled())
+ if (txojLogger.logger.isDebugEnabled())
{
- txojLogger.aitLogger.debug("transaction Status from original application "+Integer.toString(tranStatus)+" and inactive: "+inactive);
+ txojLogger.logger.debug("transaction Status from original application "+Integer.toString(tranStatus)+" and inactive: "+inactive);
}
inactive = true;
@@ -138,8 +136,8 @@
}
else
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("RecoveredTransactionalObject.replayPhase2 - cannot find/no holding transaction");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("RecoveredTransactionalObject.replayPhase2 - cannot find/no holding transaction");
}
}
}
@@ -183,8 +181,8 @@
_originalProcessUid = hdr.getProcessId();
_owningTransactionUid = hdr.getTxId();
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("RecoveredTransactionalObject::findHoldingTransaction - uid is "+_owningTransactionUid);
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("RecoveredTransactionalObject::findHoldingTransaction - uid is "+_owningTransactionUid);
}
return _owningTransactionUid.notEquals(Uid.nullUid());
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -64,8 +64,8 @@
@SuppressWarnings("unchecked")
public TORecoveryModule()
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("TORecoveryModule created");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("TORecoveryModule created");
}
/*
@@ -141,8 +141,8 @@
_uncommittedTOTable.put(newUid,newTypeString);
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("TO currently uncommitted "+newUid+" is a "+newTypeString);
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("TO currently uncommitted "+newUid+" is a "+newTypeString);
}
}
}
@@ -191,15 +191,15 @@
}
else
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Object ("+objUid+", "+objType+") is no longer uncommitted.");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Object ("+objUid+", "+objType+") is no longer uncommitted.");
}
}
}
catch (ObjectStoreException ose)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Object ("+objUid+", "+objType+") no longer exists.");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Object ("+objUid+", "+objType+") no longer exists.");
}
}
}
@@ -211,15 +211,15 @@
protected void initialise ()
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("TORecoveryModule.initialise()");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("TORecoveryModule.initialise()");
}
}
private final void recoverObject (Uid objUid, String objType)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("TORecoveryModule.recoverObject(" + objUid + ", "
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("TORecoveryModule.recoverObject(" + objUid + ", "
+ objType + ")");
}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/Lock.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/Lock.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/Lock.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -82,8 +82,8 @@
{
super(ObjectType.NEITHER);
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Lock::Lock(" + lm
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Lock::Lock(" + lm
+ ")");
}
@@ -133,8 +133,8 @@
{
super(storeUid, ObjectType.NEITHER);
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Lock::Lock("
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Lock::Lock("
+ storeUid + ")");
}
@@ -150,8 +150,8 @@
public void finalize () throws Throwable
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Lock.finalize()");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Lock.finalize()");
}
super.terminate();
@@ -173,8 +173,8 @@
public final int getLockMode ()
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Lock::getLockMode()");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Lock::getLockMode()");
}
return lMode;
@@ -186,8 +186,8 @@
public final Uid getCurrentOwner ()
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Lock::getCurrentOwner()");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Lock::getCurrentOwner()");
}
return owners.getDeepestActionUid();
@@ -199,8 +199,8 @@
public final ActionHierarchy getAllOwners ()
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Lock::getAllOwners()");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Lock::getAllOwners()");
}
return owners;
@@ -212,8 +212,8 @@
public final int getCurrentStatus ()
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Lock::getCurrentStatus()");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Lock::getCurrentStatus()");
}
return currentStatus;
@@ -226,8 +226,8 @@
public final void changeHierarchy (ActionHierarchy newOwner)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Lock::getCurrentOwner()");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Lock::getCurrentOwner()");
}
owners.copy(newOwner);
@@ -242,8 +242,8 @@
public final void propagate ()
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Lock::propagate()");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Lock::propagate()");
}
owners.forgetDeepest();
@@ -262,8 +262,8 @@
public boolean modifiesObject ()
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Lock::modifiesObject()");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Lock::modifiesObject()");
}
return ((lMode == LockMode.WRITE) ? true : false);
@@ -280,8 +280,8 @@
public boolean conflictsWith (Lock otherLock)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Lock::conflictsWith(" + otherLock + ")\n" + "\tLock 1:\n"
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Lock::conflictsWith(" + otherLock + ")\n" + "\tLock 1:\n"
+ this + "\n" + "\tLock 2:\n" + otherLock);
}
@@ -322,8 +322,8 @@
public boolean equals (Lock otherLock)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Lock::equals("
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Lock::equals("
+ otherLock + ")\n" + "\tLock 1:\n" + this + "\n"
+ "\tLock 2:\n" + otherLock);
}
@@ -379,8 +379,8 @@
public boolean restore_state (InputObjectState os, int ot)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Lock::restore_state(" + os + ", " + ot + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Lock::restore_state(" + os + ", " + ot + ")");
}
ActionHierarchy ah = new ActionHierarchy(0);
@@ -408,8 +408,8 @@
public boolean save_state (OutputObjectState os, int ot)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("Lock::save_state("
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("Lock::save_state("
+ os + ", " + ot + ")");
}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -108,8 +108,8 @@
public void finalize () throws Throwable
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager.finalize()");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager.finalize()");
}
boolean doSignal = false;
@@ -145,8 +145,8 @@
public final boolean propagate (Uid from, Uid to)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::propagate(" + from + ", " + to + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::propagate(" + from + ", " + to + ")");
}
boolean result = false;
@@ -245,8 +245,8 @@
public final boolean releaseAll (Uid actionUid)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::releaseAll(" + actionUid + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::releaseAll(" + actionUid + ")");
}
return doRelease(actionUid, true);
@@ -259,8 +259,8 @@
public final boolean releaselock (Uid lockUid)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::releaseLock(" + lockUid + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::releaseLock(" + lockUid + ")");
}
return doRelease(lockUid, false);
@@ -303,8 +303,8 @@
public final int setlock (Lock toSet, int retry, int sleepTime)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::setlock(" + toSet + ", " + retry + ", "
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::setlock(" + toSet + ", " + retry + ", "
+ sleepTime + ")");
}
@@ -569,8 +569,8 @@
{
super(storeUid, ot, om);
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::LockManager(" + storeUid + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::LockManager(" + storeUid + ")");
}
systemKey = null;
@@ -604,8 +604,8 @@
{
super(ot, om);
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::LockManager(" + ot + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::LockManager(" + ot + ")");
}
systemKey = null;
@@ -626,8 +626,8 @@
protected void terminate ()
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::terminate() for object-id " + get_uid());
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::terminate() for object-id " + get_uid());
}
cleanUp();
@@ -637,8 +637,8 @@
private final void cleanUp ()
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::cleanUp() for object-id " + get_uid());
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::cleanUp() for object-id " + get_uid());
}
if (hasBeenLocked)
@@ -706,8 +706,8 @@
private final boolean doRelease (Uid u, boolean all)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::doRelease(" + u + ", " + all + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::doRelease(" + u + ", " + all + ")");
}
Lock previous = null;
@@ -811,8 +811,8 @@
{
if (!deleted)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug(" *** CANNOT locate locks ***");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug(" *** CANNOT locate locks ***");
}
}
@@ -852,8 +852,8 @@
private final void freeState ()
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::freeState()");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::freeState()");
}
if (mutex != null)
@@ -897,8 +897,8 @@
private final boolean initialise ()
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::initialise()");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::initialise()");
}
boolean result = false;
@@ -953,8 +953,8 @@
private final boolean isAncestorOf (Lock heldLock)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::isAncestorOf(" + heldLock.getCurrentOwner()
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::isAncestorOf(" + heldLock.getCurrentOwner()
+ ")");
}
@@ -978,8 +978,8 @@
private final boolean loadState ()
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::loadState()");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::loadState()");
}
if (super.objectModel == ObjectModel.SINGLE)
@@ -1031,8 +1031,8 @@
boolean cleanLoad = true;
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::loadState() loading " + count
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::loadState() loading " + count
+ " lock(s)");
}
@@ -1089,8 +1089,7 @@
}
catch (LockStoreException e)
{
- if (txojLogger.aitLogger.isWarnEnabled())
- txojLogger.aitLogger.warn(e);
+ txojLogger.logger.warn(e);
}
}
@@ -1106,8 +1105,8 @@
private final int lockConflict (Lock otherLock)
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::lockConflict(" + otherLock.get_uid() + ")");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::lockConflict(" + otherLock.get_uid() + ")");
}
boolean matching = false;
@@ -1145,8 +1144,8 @@
private final boolean unloadState ()
{
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::unloadState()");
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::unloadState()");
}
/*
@@ -1170,8 +1169,8 @@
/* destroy old state from lock store */
- if (txojLogger.aitLogger.isDebugEnabled()) {
- txojLogger.aitLogger.debug("LockManager::unloadState() unloading " + lockCount
+ if (txojLogger.logger.isDebugEnabled()) {
+ txojLogger.logger.debug("LockManager::unloadState() unloading " + lockCount
+ " lock(s)");
}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojLogger.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojLogger.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -21,22 +21,10 @@
package com.arjuna.ats.txoj.logging;
-import com.arjuna.common.util.logging.*;
import org.jboss.logging.Logger;
public class txojLogger
{
- public static LogNoi18n aitLogger;
- public static txojI18NLogger i18NLogger;
-
- public static void initialize(LogNoi18n noi18n)
- {
- aitLogger = noi18n;
- i18NLogger = new txojI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.txoj"));
- }
-
- static
- {
- LogFactory.initializeModuleLogger(txojLogger.class, "com.arjuna.ats.txoj");
- }
+ public static final Logger logger = Logger.getLogger("com.arjuna.ats.txoj");
+ public static final txojI18NLogger i18NLogger = new txojI18NLoggerImpl(logger);
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcLogger.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcLogger.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -31,22 +31,10 @@
package com.arjuna.ats.jdbc.logging;
-import com.arjuna.common.util.logging.*;
import org.jboss.logging.Logger;
public class jdbcLogger
{
- public static LogNoi18n logger;
- public static jdbcI18NLogger i18NLogger;
-
- public static void initialize(LogNoi18n noi18n)
- {
- logger = noi18n;
- i18NLogger = new jdbcI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.jdbc"));
- }
-
- static
- {
- LogFactory.initializeModuleLogger(jdbcLogger.class, "com.arjuna.ats.jdbc");
- }
+ public static final Logger logger = Logger.getLogger("com.arjuna.ats.jdbc");
+ public static final jdbcI18NLogger i18NLogger = new jdbcI18NLoggerImpl(logger);
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaLogger.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaLogger.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -31,22 +31,10 @@
package com.arjuna.ats.jta.logging;
-import com.arjuna.common.util.logging.*;
import org.jboss.logging.Logger;
public class jtaLogger
{
- public static LogNoi18n logger;
- public static jtaI18NLogger i18NLogger;
-
- public static void initialize(LogNoi18n noi18n)
- {
- logger = noi18n;
- i18NLogger = new jtaI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.jta"));
- }
-
- static
- {
- LogFactory.initializeModuleLogger(jtaLogger.class, "com.arjuna.ats.jta");
- }
+ public static final Logger logger = Logger.getLogger("com.arjuna.ats.jta");
+ public static final jtaI18NLogger i18NLogger = new jtaI18NLoggerImpl(logger);
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/jtaxLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/jtaxLogger.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/jtaxLogger.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -20,8 +20,6 @@
*/
package com.arjuna.ats.internal.jta.utils;
-import com.arjuna.common.util.logging.LogFactory;
-import com.arjuna.common.util.logging.LogNoi18n;
import org.jboss.logging.Logger;
/**
@@ -29,17 +27,6 @@
*/
public class jtaxLogger
{
- public static LogNoi18n logger;
- public static jtaxI18NLogger i18NLogger;
-
- public static void initialize(LogNoi18n noi18n)
- {
- logger = noi18n;
- i18NLogger = new jtaxI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.jtax"));
- }
-
- static
- {
- LogFactory.initializeModuleLogger(jtaxLogger.class, "com.arjuna.ats.jtax");
- }
+ public static final Logger logger = Logger.getLogger("com.arjuna.ats.jtax");
+ public static final jtaxI18NLogger i18NLogger = new jtaxI18NLoggerImpl(logger);
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -557,9 +557,7 @@
}
catch (IOException e)
{
- if (jtsLogger.logger.isWarnEnabled()) {
- jtsLogger.i18NLogger.warn_orbspecific_interposition_coordinator_generror("ServerTransaction.save_state", e);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_coordinator_generror("ServerTransaction.save_state", e);
}
return false;
@@ -581,9 +579,7 @@
}
catch (Exception e)
{
- if (jtsLogger.logger.isWarnEnabled()) {
- jtsLogger.i18NLogger.warn_orbspecific_interposition_coordinator_generror("ServerTransaction.restore_state", e);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_coordinator_generror("ServerTransaction.restore_state", e);
return false;
}
@@ -595,9 +591,7 @@
}
catch (IOException ex)
{
- if (jtsLogger.logger.isWarnEnabled()) {
- jtsLogger.i18NLogger.warn_orbspecific_interposition_coordinator_generror("ServerTransaction.restore_state", ex);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_coordinator_generror("ServerTransaction.restore_state", ex);
}
return false;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/ServerSynchronization.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/ServerSynchronization.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/ServerSynchronization.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -70,9 +70,7 @@
}
catch (Exception e)
{
- if (jtsLogger.logger.isWarnEnabled()) {
- jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_destroyfailed();
- }
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_destroyfailed();
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsLogger.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsLogger.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -31,22 +31,10 @@
package com.arjuna.ats.jts.logging;
-import com.arjuna.common.util.logging.*;
import org.jboss.logging.Logger;
public class jtsLogger
{
- public static LogNoi18n logger;
- public static jtsI18NLogger i18NLogger;
-
- public static void initialize(LogNoi18n noi18n)
- {
- logger = noi18n;
- i18NLogger = new jtsI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.jts"));
- }
-
- static
- {
- LogFactory.initializeModuleLogger(jtsLogger.class, "com.arjuna.ats.jts");
- }
+ public static final Logger logger = Logger.getLogger("com.arjuna.ats.jts");
+ public static final jtsI18NLogger i18NLogger = new jtsI18NLoggerImpl(logger);
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/opLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/opLogger.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/opLogger.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -21,22 +21,10 @@
package com.arjuna.orbportability.logging;
-import com.arjuna.common.util.logging.*;
import org.jboss.logging.Logger;
public class opLogger
{
- public static LogNoi18n logger;
- public static orbportabilityI18NLogger i18NLogger;
-
- public static void initialize(LogNoi18n noi18n)
- {
- logger = noi18n;
- i18NLogger =new orbportabilityI18NLoggerImpl(Logger.getLogger("com.arjuna.orbportability"));
- }
-
- static
- {
- LogFactory.initializeModuleLogger(opLogger.class, "com.arjuna.orbportability");
- }
+ public static final Logger logger = Logger.getLogger("com.arjuna.orbportability");
+ public static final orbportabilityI18NLogger i18NLogger = new orbportabilityI18NLoggerImpl(logger);
}
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/WSCLogger.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -31,9 +31,6 @@
package com.arjuna.webservices.logging;
-import com.arjuna.common.util.logging.LogFactory;
-import com.arjuna.common.util.logging.LogNoi18n;
-import org.jboss.logging.BasicLogger;
import org.jboss.logging.Logger;
/**
@@ -41,21 +38,6 @@
*/
public class WSCLogger
{
-
- public static LogNoi18n arjLogger;
-
- public static BasicLogger logger;
- public static wscI18NLogger i18NLogger;
-
- public static void initialize(LogNoi18n noi18n)
- {
- arjLogger = noi18n;
- logger = Logger.getLogger("com.arjuna.wsc");
- i18NLogger = new wscI18NLoggerImpl(Logger.getLogger("com.arjuna.wsc"));
- }
-
- static
- {
- LogFactory.initializeModuleLogger(WSCLogger.class, "com.arjuna.wsc");
- }
+ public static final Logger logger = Logger.getLogger("com.arjuna.wsc");
+ public static final wscI18NLogger i18NLogger = new wscI18NLoggerImpl(logger);
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/logging/WSTLogger.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/logging/WSTLogger.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/logging/WSTLogger.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -31,28 +31,10 @@
package com.arjuna.webservices.logging;
-import com.arjuna.common.util.logging.LogFactory;
-import com.arjuna.common.util.logging.LogNoi18n;
-import org.jboss.logging.BasicLogger;
import org.jboss.logging.Logger;
public class WSTLogger
{
- public static LogNoi18n arjLogger;
-
- public static BasicLogger logger;
- public static wstI18NLogger i18NLogger;
-
-
- public static void initialize(LogNoi18n noi18n)
- {
- arjLogger = noi18n;
- //arjLoggerI18N = i18n logger = Logger.getLogger("com.arjuna.wst");
- i18NLogger = new wstI18NLoggerImpl((Logger)logger);
- }
-
- static
- {
- LogFactory.initializeModuleLogger(WSTLogger.class, "com.arjuna.wst");
- }
+ public static final Logger logger = Logger.getLogger("com.arjuna.wst");
+ public static final wstI18NLogger i18NLogger = new wstI18NLoggerImpl(logger);
}
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasLogger.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -31,23 +31,10 @@
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 void initialize(LogNoi18n noi18n)
- {
- arjLogger = noi18n;
- i18NLogger = new wsasI18NLoggerImpl(Logger.getLogger("com.arjuna.mw.wsas"));
- }
-
- static
- {
- LogFactory.initializeModuleLogger(wsasLogger.class, "com.arjuna.mw.wsas");
- }
+ public static final Logger logger = Logger.getLogger("com.arjuna.mw.wsas");
+ public static final wsasI18NLogger i18NLogger = new wsasI18NLoggerImpl(logger);
}
Modified: labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mw/wscf/logging/wscfLogger.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mw/wscf/logging/wscfLogger.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mw/wscf/logging/wscfLogger.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -31,22 +31,10 @@
package com.arjuna.mw.wscf.logging;
-import com.arjuna.common.util.logging.*;
import org.jboss.logging.Logger;
public class wscfLogger
{
- public static LogNoi18n arjLogger;
- public static wscfI18NLogger i18NLogger;
-
- public static void initialize(LogNoi18n noi18n)
- {
- arjLogger = noi18n;
- i18NLogger = new wscfI18NLoggerImpl(Logger.getLogger("com.arjuna.ws.wscf"));
- }
-
- static
- {
- LogFactory.initializeModuleLogger(wscfLogger.class, "com.arjuna.mw.wscf");
- }
+ public static final Logger logger = Logger.getLogger("com.arjuna.ws.wscf");
+ public static final wscfI18NLogger i18NLogger = new wscfI18NLoggerImpl(logger);
}
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wstx/logging/wstxLogger.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wstx/logging/wstxLogger.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wstx/logging/wstxLogger.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -31,24 +31,11 @@
package com.arjuna.mw.wstx.logging;
-import com.arjuna.common.util.logging.*;
import org.jboss.logging.Logger;
public class wstxLogger
{
-
- public static LogNoi18n arjLogger;
- public static wstxI18NLogger i18NLogger;
-
- public static void initialize(LogNoi18n noi18n)
- {
- arjLogger = noi18n;
- i18NLogger = new wstxI18NLoggerImpl(Logger.getLogger("com.arjuna.mw.wstx"));
- }
-
- static
- {
- LogFactory.initializeModuleLogger(wstxLogger.class, "com.arjuna.mw.wstx");
- }
+ public static final Logger logger = Logger.getLogger("com.arjuna.mw.wstx");
+ public static final wstxI18NLogger i18NLogger = new wstxI18NLoggerImpl(logger);
}
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/XTSLogger.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -1,26 +1,9 @@
package org.jboss.jbossts.xts.logging;
-import com.arjuna.common.util.logging.LogFactory;
-import com.arjuna.common.util.logging.LogNoi18n;
-import org.jboss.logging.BasicLogger;
import org.jboss.logging.Logger;
public class XTSLogger
{
- public static LogNoi18n arjLogger;
-
- public static BasicLogger logger;
- public static xtsrecoveryI18NLogger i18NLogger;
-
- public static void initialize(LogNoi18n noi18n)
- {
- arjLogger = noi18n;
- logger = Logger.getLogger("com.arjuna.wsrecovery");
- i18NLogger = new xtsrecoveryI18NLoggerImpl(Logger.getLogger("com.arjuna.wsrecovery"));
- }
-
- static
- {
- LogFactory.initializeModuleLogger(XTSLogger.class, "com.arjuna.wsrecovery");
- }
+ public static final Logger logger = Logger.getLogger("com.arjuna.wsrecovery");
+ public static final xtsrecoveryI18NLogger i18NLogger = new xtsrecoveryI18NLoggerImpl(logger);
}
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/ATCoordinatorRecoveryModule.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -51,8 +51,8 @@
{
public ATCoordinatorRecoveryModule()
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("ATCoordinatorRecoveryModule created - default");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("ATCoordinatorRecoveryModule created - default");
}
if (_transactionStore == null)
@@ -93,8 +93,8 @@
try
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("StatusModule: first pass ");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("StatusModule: first pass ");
}
ACCoordinators = _transactionStore.allObjUids( _transactionType, acc_uids );
@@ -113,8 +113,8 @@
public void periodicWorkSecondPass()
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("ATCoordinatorRecoveryModule: Second pass ");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("ATCoordinatorRecoveryModule: Second pass ");
}
if (_transactionUidVector != null) {
@@ -127,8 +127,8 @@
protected ATCoordinatorRecoveryModule(String type)
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("ATCoordinatorRecoveryModule created " + type);
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("ATCoordinatorRecoveryModule created " + type);
}
if (_transactionStore == null)
@@ -156,8 +156,8 @@
String Status = ActionStatus.stringForm( theStatus ) ;
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("transaction type is " + _transactionType + " uid is " +
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("transaction type is " + _transactionType + " uid is " +
recoverUid.toString() + "\n ActionStatus is " + Status +
" in flight is " + inFlight);
}
@@ -165,7 +165,7 @@
if ( ! inFlight )
{
try {
- XTSLogger.arjLogger.debug("jjh doing revovery here for " + recoverUid);
+ XTSLogger.logger.debug("jjh doing revovery here for " + recoverUid);
// TODO jjh
RecoveryATCoordinator rcvACCoordinator =
new RecoveryATCoordinator(recoverUid);
@@ -222,8 +222,8 @@
{
Vector uidVector = new Vector() ;
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("processing " + _transactionType
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("processing " + _transactionType
+ " transactions");
}
@@ -245,8 +245,8 @@
{
break;
}
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("found transaction " + theUid);
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("found transaction " + theUid);
}
uidVector.addElement( theUid ) ;
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/SubordinateATCoordinatorRecoveryModule.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -51,8 +51,8 @@
{
public SubordinateATCoordinatorRecoveryModule()
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("SubordinateATCoordinatorRecoveryModule created - default");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("SubordinateATCoordinatorRecoveryModule created - default");
}
if (_transactionStore == null)
@@ -93,8 +93,8 @@
try
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("StatusModule: first pass ");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("StatusModule: first pass ");
}
SubordinateCoordinators = _transactionStore.allObjUids( _transactionType, acc_uids );
@@ -113,8 +113,8 @@
public void periodicWorkSecondPass()
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("SubordinateATCoordinatorRecoveryModule: Second pass ");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("SubordinateATCoordinatorRecoveryModule: Second pass ");
}
if (_transactionUidVector != null) {
@@ -127,8 +127,8 @@
protected SubordinateATCoordinatorRecoveryModule(String type)
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("SubordinateATCoordinatorRecoveryModule created " + type);
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("SubordinateATCoordinatorRecoveryModule created " + type);
}
if (_transactionStore == null)
@@ -165,8 +165,8 @@
String Status = ActionStatus.stringForm( theStatus ) ;
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("transaction type is " + _transactionType + " uid is " +
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("transaction type is " + _transactionType + " uid is " +
recoverUid.toString() + "\n ActionStatus is " + Status +
" in flight is " + inFlight);
}
@@ -174,7 +174,7 @@
if ( ! inFlight )
{
try {
- XTSLogger.arjLogger.debug("jjh doing revovery here for " + recoverUid);
+ XTSLogger.logger.debug("jjh doing revovery here for " + recoverUid);
RecoverySubordinateATCoordinator rcvSubordinateCoordinator =
new RecoverySubordinateATCoordinator(recoverUid);
rcvSubordinateCoordinator.replayPhase2();
@@ -226,8 +226,8 @@
{
Vector uidVector = new Vector() ;
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("processing " + _transactionType
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("processing " + _transactionType
+ " transactions");
}
@@ -248,8 +248,8 @@
{
break;
}
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("found transaction " + theUid);
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("found transaction " + theUid);
}
uidVector.addElement( theUid ) ;
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/BACoordinatorRecoveryModule.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -51,8 +51,8 @@
{
public BACoordinatorRecoveryModule()
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("BACoordinatorRecoveryModule created - default");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("BACoordinatorRecoveryModule created - default");
}
if (_transactionStore == null)
@@ -93,8 +93,8 @@
try
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("BACoordinatorRecoveryModule: first pass");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("BACoordinatorRecoveryModule: first pass");
}
ACCoordinators = _transactionStore.allObjUids( _transactionType, acc_uids );
@@ -113,8 +113,8 @@
public void periodicWorkSecondPass()
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("BACoordinatorRecoveryModule: Second pass");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("BACoordinatorRecoveryModule: Second pass");
}
if (_transactionUidVector != null) {
@@ -127,8 +127,8 @@
protected BACoordinatorRecoveryModule(String type)
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("BACoordinatorRecoveryModule created " + type);
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("BACoordinatorRecoveryModule created " + type);
}
if (_transactionStore == null)
@@ -156,8 +156,8 @@
String Status = ActionStatus.stringForm( theStatus ) ;
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("transaction type is " + _transactionType + " uid is " +
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("transaction type is " + _transactionType + " uid is " +
recoverUid.toString() + "\n ActionStatus is " + Status +
" in flight is " + inFlight);
}
@@ -165,7 +165,7 @@
if ( ! inFlight )
{
try {
- XTSLogger.arjLogger.debug("jjh doing revovery here for " + recoverUid);
+ XTSLogger.logger.debug("jjh doing revovery here for " + recoverUid);
// TODO jjh
RecoveryBACoordinator rcvACCoordinator =
new RecoveryBACoordinator(recoverUid);
@@ -222,8 +222,8 @@
{
Vector uidVector = new Vector() ;
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("processing " + _transactionType
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("processing " + _transactionType
+ " transactions");
}
@@ -244,8 +244,8 @@
{
break;
}
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("found transaction " + theUid);
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("found transaction " + theUid);
}
uidVector.addElement( theUid ) ;
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/SubordinateBACoordinatorRecoveryModule.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -51,8 +51,8 @@
{
public SubordinateBACoordinatorRecoveryModule()
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("SubordinateBACoordinatorRecoveryModule created - default");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("SubordinateBACoordinatorRecoveryModule created - default");
}
if (_transactionStore == null)
@@ -93,8 +93,8 @@
try
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("StatusModule: first pass ");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("StatusModule: first pass ");
}
SubordinateCoordinators = _transactionStore.allObjUids( _transactionType, acc_uids );
@@ -113,8 +113,8 @@
public void periodicWorkSecondPass()
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("SubordinateBACoordinatorRecoveryModule: Second pass ");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("SubordinateBACoordinatorRecoveryModule: Second pass ");
}
if (_transactionUidVector != null) {
@@ -127,8 +127,8 @@
protected SubordinateBACoordinatorRecoveryModule(String type)
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("SubordinateBACoordinatorRecoveryModule created " + type);
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("SubordinateBACoordinatorRecoveryModule created " + type);
}
if (_transactionStore == null)
@@ -165,8 +165,8 @@
String Status = ActionStatus.stringForm( theStatus ) ;
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("transaction type is " + _transactionType + " uid is " +
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("transaction type is " + _transactionType + " uid is " +
recoverUid.toString() + "\n ActionStatus is " + Status +
" in flight is " + inFlight);
}
@@ -174,7 +174,7 @@
if ( ! inFlight )
{
try {
- XTSLogger.arjLogger.debug("jjh doing revovery here for " + recoverUid);
+ XTSLogger.logger.debug("jjh doing revovery here for " + recoverUid);
RecoverySubordinateBACoordinator rcvSubordinateCoordinator =
new RecoverySubordinateBACoordinator(recoverUid);
rcvSubordinateCoordinator.replayPhase2();
@@ -226,8 +226,8 @@
{
Vector uidVector = new Vector() ;
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("processing " + _transactionType
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("processing " + _transactionType
+ " transactions");
}
@@ -248,8 +248,8 @@
{
break;
}
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("found transaction " + theUid);
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("found transaction " + theUid);
}
uidVector.addElement( theUid ) ;
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/ATParticipantRecoveryModule.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -49,8 +49,8 @@
{
public ATParticipantRecoveryModule()
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("ATParticipantRecoveryModule created - default");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("ATParticipantRecoveryModule created - default");
}
if (_objectStore == null)
@@ -103,8 +103,8 @@
try
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("ATParticipantRecoveryModule: first pass");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("ATParticipantRecoveryModule: first pass");
}
ATParticipants = _objectStore.allObjUids(_participantType, acc_uids );
@@ -123,8 +123,8 @@
public void periodicWorkSecondPass()
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("ATParticipantRecoveryModule: Second pass");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("ATParticipantRecoveryModule: Second pass");
}
processParticipantsStatus() ;
@@ -134,8 +134,8 @@
{
// Retrieve the participant from its original process.
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("participant type is " + _participantType + " uid is " +
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("participant type is " + _participantType + " uid is " +
recoverUid.toString());
}
@@ -195,8 +195,8 @@
{
Vector uidVector = new Vector() ;
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("processing " + _participantType
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("processing " + _participantType
+ " WS-AT participants");
}
@@ -219,8 +219,8 @@
break;
}
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("found WS-AT participant " + theUid);
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("found WS-AT participant " + theUid);
}
uidVector.addElement( theUid ) ;
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-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/ba/BAParticipantRecoveryModule.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -49,8 +49,8 @@
{
public BAParticipantRecoveryModule()
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("BAParticipantRecoveryModule created - default");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("BAParticipantRecoveryModule created - default");
}
if (_objectStore == null)
@@ -103,8 +103,8 @@
try
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("BAParticipantRecoveryModule: first pass");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("BAParticipantRecoveryModule: first pass");
}
BAParticipants = _objectStore.allObjUids(_participantType, acc_uids );
@@ -123,8 +123,8 @@
public void periodicWorkSecondPass()
{
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("BAParticipantRecoveryModule: Second pass");
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("BAParticipantRecoveryModule: Second pass");
}
processParticipantsStatus() ;
@@ -134,8 +134,8 @@
{
// Retrieve the participant from its original process.
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("participant type is " + _participantType + " uid is " +
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("participant type is " + _participantType + " uid is " +
recoverUid.toString());
}
@@ -195,8 +195,8 @@
{
Vector uidVector = new Vector() ;
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("processing " + _participantType
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("processing " + _participantType
+ " WS-BA participants");
}
@@ -219,8 +219,8 @@
break;
}
- if (XTSLogger.arjLogger.isDebugEnabled()) {
- XTSLogger.arjLogger.debug("found WS-BA participant " + theUid);
+ if (XTSLogger.logger.isDebugEnabled()) {
+ XTSLogger.logger.debug("found WS-BA participant " + theUid);
}
uidVector.addElement( theUid ) ;
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxLogger.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxLogger.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxLogger.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -31,23 +31,10 @@
package com.arjuna.ats.jbossatx.logging;
-import com.arjuna.common.util.logging.*;
import org.jboss.logging.Logger;
public class jbossatxLogger
{
- public static LogNoi18n logger;
-
- public static jbossatxI18NLogger i18NLogger;
-
- public static void initialize(LogNoi18n noi18n)
- {
- logger = noi18n;
- i18NLogger = new jbossatxI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.jbossatx"));
- }
-
- static
- {
- LogFactory.initializeModuleLogger(jbossatxLogger.class, "com.arjuna.ats.jbossatx");
- }
+ public static final Logger logger = Logger.getLogger("com.arjuna.ats.jbossatx");
+ public static final jbossatxI18NLogger i18NLogger = new jbossatxI18NLoggerImpl(logger);
}
Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/LogFactory.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/LogFactory.java 2010-06-30 13:53:40 UTC (rev 33705)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/LogFactory.java 2010-06-30 14:56:04 UTC (rev 33706)
@@ -73,19 +73,7 @@
*/
private static boolean m_isInitialized = false;
- public static void initializeModuleLogger(Class moduleLogger, String name) {
- LogNoi18n logger = getLogNoi18n(name);
-
- try {
- Method initializer = moduleLogger.getMethod("initialize", new Class[] {LogNoi18n.class});
- initializer.invoke(null, new Object[] {logger});
- } catch(Exception e) {
- throw new RuntimeException("An unexpected exception occurred while initializing the logger: " + e.getMessage(), e);
- }
- }
-
-
/**
* Convenience method to return a named logger, without the application
* having to care about factories.
More information about the jboss-svn-commits
mailing list