[jboss-svn-commits] JBL Code SVN: r30957 - in labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta: resources/jts/orbspecific and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jan 6 12:11:50 EST 2010
Author: jhalliday
Date: 2010-01-06 12:11:50 -0500 (Wed, 06 Jan 2010)
New Revision: 30957
Added:
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/jtaxLogger.java
Removed:
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/LoggerSetup.java
Modified:
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/recovery/jts/XARecoveryResourceImple.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/LastResourceRecord.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/SynchronizationImple.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/AtomicTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/BaseTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionManagerImple.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionSynchronizationRegistryImple.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/TxWorkManager.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/jca/TransactionImple.java
Log:
Add jtax module logger. JBTM-674
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/recovery/jts/XARecoveryResourceImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/recovery/jts/XARecoveryResourceImple.java 2010-01-06 14:59:02 UTC (rev 30956)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/recovery/jts/XARecoveryResourceImple.java 2010-01-06 17:11:50 UTC (rev 30957)
@@ -31,7 +31,7 @@
package com.arjuna.ats.internal.jta.recovery.jts;
-import com.arjuna.ats.jta.logging.jtaLogger;
+import com.arjuna.ats.internal.jta.utils.jtaxLogger;
import com.arjuna.ats.jta.recovery.XARecoveryResource;
import com.arjuna.ats.arjuna.common.*;
@@ -40,7 +40,6 @@
import com.arjuna.common.util.logging.*;
-import java.util.*;
import javax.transaction.xa.*;
/*
@@ -108,9 +107,9 @@
{
if (ex.errorCode == XAException.XAER_NOTA)
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.arjuna.logging.FacilityCode.FAC_CRASH_RECOVERY, "XARecoveryResourceImple.notAProblem - no error with XAER_NOTA on "
+ (commit ? " commit" : " rollback"));
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/LastResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/LastResourceRecord.java 2010-01-06 14:59:02 UTC (rev 30956)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/LastResourceRecord.java 2010-01-06 17:11:50 UTC (rev 30957)
@@ -46,7 +46,7 @@
import com.arjuna.ats.arjuna.common.arjPropertyManager;
import com.arjuna.ats.arjuna.coordinator.RecordType;
import com.arjuna.ats.internal.jta.transaction.jts.TransactionImple;
-import com.arjuna.ats.jta.logging.jtaLogger;
+import com.arjuna.ats.internal.jta.utils.jtaxLogger;
/**
* XAResourceRecord implementing the Last Resource Commit Optimisation.
@@ -155,11 +155,11 @@
{
if(ALLOW_MULTIPLE_LAST_RESOURCES)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
if (!_disableMLRWarning || (_disableMLRWarning && !_issuedWarning))
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.multipleWarning",
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.multipleWarning",
new Object[] { record });
_issuedWarning = true;
}
@@ -169,9 +169,9 @@
}
else
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn(
+ jtaxLogger.loggerI18N.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.disallow",
new Object[] { record });
}
@@ -195,14 +195,14 @@
ALLOW_MULTIPLE_LAST_RESOURCES = arjPropertyManager.getCoreEnvironmentBean().isAllowMultipleLastResources();
if (ALLOW_MULTIPLE_LAST_RESOURCES
- && jtaLogger.loggerI18N.isWarnEnabled())
+ && jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.startupWarning");
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.startupWarning");
}
if (arjPropertyManager.getCoreEnvironmentBean().isDisableMultipleLastResourcesWarning())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.disableWarning");
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.disableWarning");
_disableMLRWarning = true;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/SynchronizationImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/SynchronizationImple.java 2010-01-06 14:59:02 UTC (rev 30956)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/SynchronizationImple.java 2010-01-06 17:11:50 UTC (rev 30957)
@@ -31,6 +31,7 @@
package com.arjuna.ats.internal.jta.resources.jts.orbspecific;
+import com.arjuna.ats.internal.jta.utils.jtaxLogger;
import com.arjuna.ats.jta.common.*;
import com.arjuna.ats.jta.xa.*;
import com.arjuna.ats.jta.utils.XAHelper;
@@ -105,9 +106,9 @@
public void before_completion () throws org.omg.CORBA.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "SynchronizationImple.before_completion");
}
@@ -128,9 +129,9 @@
public void after_completion (org.omg.CosTransactions.Status status) throws org.omg.CORBA.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "SynchronizationImple.after_completion");
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2010-01-06 14:59:02 UTC (rev 30956)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2010-01-06 17:11:50 UTC (rev 30957)
@@ -57,6 +57,7 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.common.util.logging.*;
+import com.arjuna.ats.internal.jta.utils.jtaxLogger;
import org.omg.CosTransactions.*;
@@ -115,9 +116,9 @@
public XAResourceRecord(TransactionImple tx, XAResource res, Xid xid,
Object[] params)
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.CONSTRUCTORS,
+ jtaxLogger.logger.debug(DebugLevel.CONSTRUCTORS,
VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"XAResourceRecord.XAResourceRecord ( " + xid + " )");
@@ -208,9 +209,9 @@
public org.omg.CosTransactions.Vote prepare() throws HeuristicMixed,
HeuristicHazard, org.omg.CORBA.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"XAResourceRecord.prepare for " + _tranID);
@@ -225,9 +226,9 @@
if (_tranID == null)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.nulltransaction",
new Object[]
@@ -282,9 +283,9 @@
}
catch (XAException e1)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.preparefailed",
new Object[]
@@ -322,9 +323,9 @@
}
catch (Exception e2)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.preparefailed",
new Object[]
@@ -341,9 +342,9 @@
public void rollback() throws org.omg.CORBA.SystemException,
HeuristicCommit, HeuristicMixed, HeuristicHazard
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"XAResourceRecord.rollback for " + _tranID);
@@ -364,9 +365,9 @@
if (_tranID == null)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.nulltransaction",
new Object[]
@@ -427,9 +428,9 @@
}
else
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.xaerror",
new Object[]
@@ -480,9 +481,9 @@
catch (Exception e2)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.generror",
new Object[]
@@ -506,9 +507,9 @@
public void commit() throws org.omg.CORBA.SystemException, NotPrepared,
HeuristicRollback, HeuristicMixed, HeuristicHazard
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"XAResourceRecord.commit for " + _tranID);
@@ -516,9 +517,9 @@
if (_tranID == null)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.nulltransaction",
new Object[]
@@ -568,9 +569,9 @@
{
_committed = false;
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.xaerror",
new Object[]
@@ -639,9 +640,9 @@
{
_committed = false;
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.generror",
new Object[]
@@ -759,9 +760,9 @@
public void commit_one_phase() throws HeuristicHazard,
org.omg.CORBA.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"XAResourceRecord.commit_one_phase for " + _tranID);
@@ -769,9 +770,9 @@
if (_tranID == null)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.nulltransaction",
new Object[]
@@ -921,9 +922,9 @@
}
catch (Exception e2)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.coperror",
new Object[] {e2}, e2);
@@ -943,9 +944,9 @@
public void forget() throws org.omg.CORBA.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"XAResourceRecord.forget for " + _tranID);
@@ -1018,9 +1019,9 @@
}
catch (NotSerializableException ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.saveState");
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.saveState");
}
return false;
@@ -1110,9 +1111,9 @@
_theXAResource = (XAResource) o.readObject();
o.close();
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger
+ jtaxLogger.logger
.debug(
DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
@@ -1124,9 +1125,9 @@
{
// not serializable in the first place!
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.restoreerror1",
new Object[]
@@ -1150,16 +1151,16 @@
if (_theXAResource == null)
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.norecoveryxa",
new Object[]
{ _tranID });
}
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"XAResourceRecord.restore_state - XAResource got from "
@@ -1191,9 +1192,9 @@
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.restoreerror2",
new Object[]
@@ -1264,9 +1265,9 @@
protected int recover()
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PROTECTED,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"XAResourceRecord.recover");
@@ -1293,9 +1294,9 @@
}
catch (NotPrepared ex1)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.notprepared",
new Object[]
@@ -1316,9 +1317,9 @@
* Unknown error, so better to do nothing at this stage.
*/
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.unexpected",
new Object[]
@@ -1328,9 +1329,9 @@
return XARecoveryResource.FAILED_TO_RECOVER;
}
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PROTECTED,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"XAResourceRecord.recover got status: "
@@ -1406,9 +1407,9 @@
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.createstate");
}
@@ -1453,9 +1454,9 @@
}
else
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.updatestate");
}
@@ -1478,9 +1479,9 @@
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.loadstateread",
e);
@@ -1558,9 +1559,9 @@
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.remconn",
e);
@@ -1580,9 +1581,9 @@
private final int doRecovery(boolean commit)
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PRIVATE,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"XAResourceRecord.doRecovery ( " + commit + " )");
@@ -1594,16 +1595,16 @@
{
try
{
- if (jtaLogger.logger.isInfoEnabled())
+ if (jtaxLogger.logger.isInfoEnabled())
{
if (commit)
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.info(
"com.arjuna.ats.internal.jta.recovery.jts.orbspecific.commit",
new Object[]
{ _tranID });
else
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.info(
"com.arjuna.ats.internal.jta.recovery.jts.orbspecific.rollback",
new Object[]
@@ -1621,9 +1622,9 @@
}
catch (Exception e2)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N
+ jtaxLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.recfailed",
new Object[]
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/AtomicTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/AtomicTransaction.java 2010-01-06 14:59:02 UTC (rev 30956)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/AtomicTransaction.java 2010-01-06 17:11:50 UTC (rev 30957)
@@ -31,6 +31,7 @@
package com.arjuna.ats.internal.jta.transaction.jts;
+import com.arjuna.ats.internal.jta.utils.jtaxLogger;
import com.arjuna.ats.internal.jts.ControlWrapper;
import com.arjuna.ats.internal.jts.orbspecific.ControlImple;
import com.arjuna.ats.internal.jta.utils.jts.XidUtils;
@@ -80,8 +81,8 @@
/*
* public synchronized void begin () throws SubtransactionsUnavailable,
- * SystemException { if (jtaLogger.loggerI18N.isWarnEnabled()) {
- * jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.atomictxnobegin"); }
+ * SystemException { if (jtaxLogger.loggerI18N.isWarnEnabled()) {
+ * jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.atomictxnobegin"); }
*
* throw new INVALID_TRANSACTION(ExceptionCodes.ALREADY_BEGUN,
* CompletionStatus.COMPLETED_NO); }
@@ -95,9 +96,9 @@
throws NoTransaction, HeuristicMixed, HeuristicHazard,
WrongTransaction, SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS, "AtomicTransaction::end ( "
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS, "AtomicTransaction::end ( "
+ report_heuristics + " ) for " + _theAction);
}
@@ -157,9 +158,9 @@
public synchronized void abort () throws NoTransaction, WrongTransaction,
SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS, "AtomicTransaction::abort for "
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS, "AtomicTransaction::abort for "
+ _theAction);
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/BaseTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/BaseTransaction.java 2010-01-06 14:59:02 UTC (rev 30956)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/BaseTransaction.java 2010-01-06 17:11:50 UTC (rev 30957)
@@ -31,6 +31,7 @@
package com.arjuna.ats.internal.jta.transaction.jts;
+import com.arjuna.ats.internal.jta.utils.jtaxLogger;
import com.arjuna.ats.jta.common.jtaPropertyManager;
import com.arjuna.ats.jta.logging.*;
@@ -78,9 +79,9 @@
public void begin () throws javax.transaction.NotSupportedException,
javax.transaction.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "BaseTransaction.begin");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "BaseTransaction.begin");
}
/*
@@ -142,9 +143,9 @@
java.lang.SecurityException, java.lang.IllegalStateException,
javax.transaction.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "BaseTransaction.commit");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "BaseTransaction.commit");
}
TransactionImple theTransaction = TransactionImple.getTransaction();
@@ -159,7 +160,7 @@
throw new IllegalStateException(
"BaseTransaction.commit - "
- + jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notxe")
+ + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notxe")
+ ex, ex);
}
@@ -169,9 +170,9 @@
public void rollback () throws java.lang.IllegalStateException,
java.lang.SecurityException, javax.transaction.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "BaseTransaction.rollback");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "BaseTransaction.rollback");
}
TransactionImple theTransaction = TransactionImple.getTransaction();
@@ -191,9 +192,9 @@
public void setRollbackOnly () throws java.lang.IllegalStateException,
javax.transaction.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "BaseTransaction.setRollbackOnly");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "BaseTransaction.setRollbackOnly");
}
TransactionImple theTransaction = TransactionImple.getTransaction();
@@ -205,15 +206,15 @@
catch (NullPointerException ex)
{
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.nosuchtx"), ex);
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.nosuchtx"), ex);
}
}
public int getStatus () throws javax.transaction.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "BaseTransaction.getStatus");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "BaseTransaction.getStatus");
}
TransactionImple theTransaction = TransactionImple.getTransaction();
@@ -299,7 +300,7 @@
{
throw new IllegalStateException(
"BaseTransaction.checkTransactionState - "
- + jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.alreadyassociated"));
+ + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.alreadyassociated"));
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java 2010-01-06 14:59:02 UTC (rev 30956)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java 2010-01-06 17:11:50 UTC (rev 30957)
@@ -166,7 +166,7 @@
* now.
*/
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.syncproblem", ex);
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.syncproblem", ex);
}
}
@@ -176,9 +176,9 @@
public boolean equals (Object obj)
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.OPERATORS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.equals");
+ jtaxLogger.logger.debug(DebugLevel.OPERATORS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.equals");
}
if (obj == null)
@@ -239,9 +239,9 @@
java.lang.SecurityException, javax.transaction.SystemException,
java.lang.IllegalStateException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.commit");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.commit");
}
if (_theTransaction != null)
@@ -261,13 +261,13 @@
catch (org.omg.CosTransactions.WrongTransaction wt)
{
InactiveTransactionException inactiveTransactionException = new InactiveTransactionException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.wrongstatetx"));
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.wrongstatetx"));
inactiveTransactionException.initCause(wt);
throw inactiveTransactionException;
}
catch (org.omg.CosTransactions.NoTransaction e1)
{
- IllegalStateException illegalStateException = new IllegalStateException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"));
+ IllegalStateException illegalStateException = new IllegalStateException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"));
illegalStateException.initCause(e1);
throw illegalStateException;
}
@@ -296,7 +296,7 @@
catch (INVALID_TRANSACTION e6)
{
InactiveTransactionException inactiveTransactionException = new InactiveTransactionException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.invalidtx2"));
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.invalidtx2"));
inactiveTransactionException.initCause(e6);
throw inactiveTransactionException;
}
@@ -313,7 +313,7 @@
}
else
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
}
/**
@@ -329,9 +329,9 @@
public void rollback () throws java.lang.IllegalStateException,
java.lang.SecurityException, javax.transaction.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.rollback");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.rollback");
}
if (_theTransaction != null)
@@ -346,9 +346,9 @@
if (endSuspendedFailed)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.endsuspendfailed1");
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.endsuspendfailed1");
}
}
@@ -359,7 +359,7 @@
catch (org.omg.CosTransactions.WrongTransaction e1)
{
InactiveTransactionException inactiveTransactionException =new InactiveTransactionException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.wrongstatetx"));
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.wrongstatetx"));
inactiveTransactionException.initCause(e1);
throw inactiveTransactionException;
}
@@ -370,14 +370,14 @@
catch (INVALID_TRANSACTION e3)
{
InactiveTransactionException inactiveTransactionException = new InactiveTransactionException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.invalidtx2"));
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.invalidtx2"));
inactiveTransactionException.initCause(e3);
throw inactiveTransactionException;
}
catch (NoTransaction e4)
{
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"), e4);
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"), e4);
}
catch (org.omg.CORBA.SystemException e5)
{
@@ -392,19 +392,19 @@
if (endSuspendedFailed)
throw new InvalidTerminationStateException (
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.endsuspendfailed2"));
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.endsuspendfailed2"));
}
else
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
}
public void setRollbackOnly () throws java.lang.IllegalStateException,
javax.transaction.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.setRollbackOnly");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.setRollbackOnly");
}
if (_theTransaction != null)
@@ -415,13 +415,13 @@
// keep a record of why we are rolling back i.e. who called us first, it's a useful debug aid.
if (_rollbackOnlyCallerStacktrace == null)
{
- _rollbackOnlyCallerStacktrace = new Throwable(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"));
+ _rollbackOnlyCallerStacktrace = new Throwable(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"));
}
}
catch (org.omg.CosTransactions.NoTransaction e3)
{
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"), e3);
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"), e3);
}
catch (final INVALID_TRANSACTION ex)
{
@@ -450,14 +450,14 @@
}
else
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
}
public int getStatus () throws javax.transaction.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.getStatus");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.getStatus");
}
int status = javax.transaction.Status.STATUS_NO_TRANSACTION;
@@ -488,15 +488,15 @@
throws javax.transaction.RollbackException,
java.lang.IllegalStateException, javax.transaction.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.registerSynchronization");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.registerSynchronization");
}
if (sync == null)
throw new javax.transaction.SystemException(
"TransactionImple.registerSynchronization - "
- + jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.nullparam"));
+ + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.nullparam"));
registerSynchronizationImple(new ManagedSynchronizationImple(sync));
}
@@ -523,17 +523,17 @@
catch (org.omg.CosTransactions.Inactive e3)
{
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"), e3);
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"), e3);
}
catch (org.omg.CosTransactions.SynchronizationUnavailable e4)
{
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.syncerror"), e4);
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.syncerror"), e4);
}
catch (INVALID_TRANSACTION e5)
{
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.invalidtx2"), e5);
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.invalidtx2"), e5);
}
catch (org.omg.CORBA.SystemException e6)
{
@@ -544,7 +544,7 @@
}
else
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
}
@@ -570,16 +570,16 @@
throws RollbackException, IllegalStateException,
javax.transaction.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.enlistResource ( "
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.enlistResource ( "
+ xaRes + " )");
}
if (xaRes == null)
throw new javax.transaction.SystemException(
"TransactionImple.enlistResource - "
- + jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.nullparam"));
+ + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.nullparam"));
int status = getStatus();
@@ -587,12 +587,12 @@
{
case javax.transaction.Status.STATUS_MARKED_ROLLBACK:
throw new RollbackException("TransactionImple.enlistResource - "
- + jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.markedrollback"));
+ + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.markedrollback"));
case javax.transaction.Status.STATUS_ACTIVE:
break;
default:
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
}
XAModifier theModifier = null;
@@ -690,7 +690,7 @@
// block
throw new IllegalStateException(
"TransactionImple.enlistResource - "
- + jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.illegalstate")
+ + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.illegalstate")
+ info.getState());
}
}
@@ -705,9 +705,9 @@
if (info != null)
info.setState(TxInfo.FAILED);
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaerror", new Object[]
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaerror", new Object[]
{ "TransactionImple.enlistResource", XAHelper.printXAErrorCode(exp) });
}
@@ -779,9 +779,9 @@
}
catch (XAException te)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.timeouterror", new Object[]
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.timeouterror", new Object[]
{ "TransactionImple.enlistResource", XAHelper.printXAErrorCode(te), xid });
}
}
@@ -847,9 +847,9 @@
* rollback only.
*/
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.starterror", new Object[]
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.starterror", new Object[]
{ "TransactionImple.enlistResource - XAResource.start", XAHelper.printXAErrorCode(e), xid });
}
@@ -860,9 +860,9 @@
if (retry < 0)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.starterror", new Object[]
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.starterror", new Object[]
{ "TransactionImple.enlistResource - XAResource.start", XAHelper.printXAErrorCode(e), xid });
}
@@ -894,9 +894,9 @@
}
catch (XAException ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaerror", new Object[]
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaerror", new Object[]
{ "TransactionImple.enlistResource - xa_start: ", XAHelper.printXAErrorCode(ex) });
}
@@ -977,16 +977,16 @@
public boolean delistResource (XAResource xaRes, int flags)
throws IllegalStateException, javax.transaction.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.delistResource ( "
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.delistResource ( "
+ xaRes + " )");
}
if (xaRes == null)
throw new javax.transaction.SystemException(
"TransactionImple.delistResource - "
- + jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.nullparam"));
+ + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.nullparam"));
int status = getStatus();
@@ -998,7 +998,7 @@
break;
default:
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
}
TxInfo info = null;
@@ -1015,9 +1015,9 @@
if (info == null)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.unknownres", new Object[]
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.unknownres", new Object[]
{ "TransactionImple.delistResource" });
}
@@ -1108,7 +1108,7 @@
throw new IllegalStateException(
"TransactionImple.delistResource - "
- + jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.ressusp"));
+ + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.ressusp"));
}
else
{
@@ -1127,7 +1127,7 @@
if (!optimizedRollback)
throw new IllegalStateException(
"TransactionImple.delistResource - "
- + jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.illegalstate")
+ + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.illegalstate")
+ info.getState());
}
@@ -1151,9 +1151,9 @@
markRollbackOnly();
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaerror", new Object[]
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaerror", new Object[]
{ "TransactionImple.delistResource", XAHelper.printXAErrorCode(exp) });
}
@@ -1161,9 +1161,9 @@
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.delistfailed", new Object[]
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.delistfailed", new Object[]
{ e });
}
@@ -1270,9 +1270,9 @@
}
catch (ClassCastException ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.nottximple");
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.nottximple");
}
}
}
@@ -1369,7 +1369,7 @@
* hit for now.
*/
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.syncproblem", ex);
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.syncproblem", ex);
}
_xaTransactionTimeoutEnabled = getXATransactionTimeoutEnabled() ;
}
@@ -1381,9 +1381,9 @@
java.lang.SecurityException, javax.transaction.SystemException,
java.lang.IllegalStateException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.commitAndDisassociate");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.commitAndDisassociate");
}
if (_theTransaction != null)
@@ -1395,12 +1395,12 @@
catch (org.omg.CosTransactions.WrongTransaction wt)
{
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.wrongstatetx"), wt);
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.wrongstatetx"), wt);
}
catch (org.omg.CosTransactions.NoTransaction e1)
{
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"), e1);
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"), e1);
}
catch (org.omg.CosTransactions.HeuristicMixed e2)
{
@@ -1435,7 +1435,7 @@
*/
//throw new IllegalStateException(
- // jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.invalidtx2"));
+ // jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.invalidtx2"));
}
catch (org.omg.CORBA.SystemException e7)
{
@@ -1450,16 +1450,16 @@
}
else
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
}
protected void rollbackAndDisassociate ()
throws java.lang.IllegalStateException,
java.lang.SecurityException, javax.transaction.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.rollbackAndDisassociate");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.rollbackAndDisassociate");
}
if (_theTransaction != null)
@@ -1471,7 +1471,7 @@
catch (org.omg.CosTransactions.WrongTransaction e1)
{
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.wrongstatetx"), e1);
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.wrongstatetx"), e1);
}
catch (org.omg.CORBA.NO_PERMISSION e2)
{
@@ -1480,12 +1480,12 @@
catch (INVALID_TRANSACTION e3)
{
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.invalidtx2"), e3);
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.invalidtx2"), e3);
}
catch (NoTransaction e4)
{
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"), e4);
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"), e4);
}
catch (org.omg.CORBA.SystemException e5)
{
@@ -1500,7 +1500,7 @@
}
else
throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
}
/**
@@ -1579,9 +1579,9 @@
}
catch (XAException ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaenderror");
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaenderror");
}
result = false;
@@ -1619,9 +1619,9 @@
}
catch (XAException ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaenderror");
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaenderror");
}
result = false;
@@ -1689,9 +1689,9 @@
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.threaderror", e);
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.threaderror", e);
}
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
@@ -1748,9 +1748,9 @@
}
catch (XAException ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaerror", new Object[]
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaerror", new Object[]
{ "TransactionImple.isNewRM", XAHelper.printXAErrorCode(ex) });
}
@@ -1758,9 +1758,9 @@
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.rmerror", e);
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.rmerror", e);
}
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
@@ -1837,9 +1837,9 @@
}
catch (Exception ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.rollbackerror", new Object[]
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.rollbackerror", new Object[]
{ "TransactionImple.markRollbackOnly -", ex }, ex);
}
}
@@ -1904,9 +1904,9 @@
}
catch (final Throwable th)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.lastResourceOptimisationInterface",
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.lastResourceOptimisationInterface",
new Object[] {lastResourceOptimisationInterfaceName}, th);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionManagerImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionManagerImple.java 2010-01-06 14:59:02 UTC (rev 30956)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionManagerImple.java 2010-01-06 17:11:50 UTC (rev 30957)
@@ -31,6 +31,7 @@
package com.arjuna.ats.internal.jta.transaction.jts;
+import com.arjuna.ats.internal.jta.utils.jtaxLogger;
import org.omg.CosTransactions.*;
import com.arjuna.ats.jta.logging.*;
@@ -40,7 +41,6 @@
import com.arjuna.ats.internal.jts.ControlWrapper;
import com.arjuna.ats.internal.jts.OTSImpleManager;
-import com.arjuna.ats.internal.jta.utils.LoggerSetup;
import javax.transaction.*;
@@ -91,9 +91,9 @@
public Transaction suspend () throws javax.transaction.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionManagerImple.suspend");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionManagerImple.suspend");
}
try
@@ -119,9 +119,9 @@
public void resume (Transaction which) throws InvalidTransactionException,
java.lang.IllegalStateException, javax.transaction.SystemException
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionManagerImple.resume");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionManagerImple.resume");
}
super.checkTransactionState();
@@ -178,9 +178,4 @@
{
return this;
}
-
- static
- {
- LoggerSetup.setup();
- }
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionSynchronizationRegistryImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionSynchronizationRegistryImple.java 2010-01-06 14:59:02 UTC (rev 30956)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionSynchronizationRegistryImple.java 2010-01-06 17:11:50 UTC (rev 30957)
@@ -22,7 +22,7 @@
*/
package com.arjuna.ats.internal.jta.transaction.jts;
-import com.arjuna.ats.jta.logging.jtaLogger;
+import com.arjuna.ats.internal.jta.utils.jtaxLogger;
import com.arjuna.ats.internal.jta.resources.jts.orbspecific.JTAInterposedSynchronizationImple;
import com.arjuna.common.util.logging.DebugLevel;
import com.arjuna.common.util.logging.VisibilityLevel;
@@ -56,9 +56,9 @@
*/
public Object getTransactionKey()
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"TransactionSynchronizationRegistryImple.getTransactionKey");
@@ -72,7 +72,7 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
+ throw new RuntimeException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
}
if (transactionImple == null) {
@@ -85,9 +85,9 @@
// Add or replace an object in the Map of resources being managed for the transaction bound to the current thread at the time this method is called.
public void putResource(Object key, Object value)
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"TransactionSynchronizationRegistryImple.putResource");
@@ -105,9 +105,9 @@
// Get an object from the Map of resources being managed for the transaction bound to the current thread at the time this method is called.
public Object getResource(Object key)
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"TransactionSynchronizationRegistryImple.getResource");
@@ -130,9 +130,9 @@
*/
public void registerInterposedSynchronization(Synchronization synchronization)
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"TransactionSynchronizationRegistryImple.registerInterposedSynchronization");
@@ -146,20 +146,20 @@
}
catch (RollbackException e)
{
- throw new com.arjuna.ats.jta.exceptions.RollbackException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.syncrollbackexception"), e);
+ throw new com.arjuna.ats.jta.exceptions.RollbackException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.syncrollbackexception"), e);
}
catch (SystemException e)
{
- throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
+ throw new RuntimeException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
}
}
// Return the status of the transaction bound to the current thread at the time this method is called.
public int getTransactionStatus()
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"TransactionSynchronizationRegistryImple.getTransactionStatus");
@@ -172,7 +172,7 @@
}
catch(SystemException e)
{
- throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
+ throw new RuntimeException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
}
}
@@ -180,9 +180,9 @@
// Set the rollbackOnly status of the transaction bound to the current thread at the time this method is called.
public void setRollbackOnly()
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"TransactionSynchronizationRegistryImple.setRollbackOnly");
@@ -202,16 +202,16 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
+ throw new RuntimeException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
}
}
// Get the rollbackOnly status of the transaction bound to the current thread at the time this method is called.
public boolean getRollbackOnly()
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS,
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"TransactionSynchronizationRegistryImple.getRollbackOnly");
@@ -229,7 +229,7 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
+ throw new RuntimeException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
}
}
@@ -243,7 +243,7 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
+ throw new RuntimeException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
}
if(transactionImple == null)
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/TxWorkManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/TxWorkManager.java 2010-01-06 14:59:02 UTC (rev 30956)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/TxWorkManager.java 2010-01-06 17:11:50 UTC (rev 30957)
@@ -42,6 +42,7 @@
import com.arjuna.ats.internal.jta.transaction.jts.subordinate.jca.TransactionImple;
+import com.arjuna.ats.internal.jta.utils.jtaxLogger;
import com.arjuna.ats.jta.logging.*;
public class TxWorkManager
@@ -82,7 +83,7 @@
_transactions.put(tx, workers);
}
else
- throw new WorkCompletedException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.jca.busy"), WorkException.TX_CONCURRENT_WORK_DISALLOWED);
+ throw new WorkCompletedException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.jca.busy"), WorkException.TX_CONCURRENT_WORK_DISALLOWED);
}
synchronized (workers)
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java 2010-01-06 14:59:02 UTC (rev 30956)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java 2010-01-06 17:11:50 UTC (rev 30957)
@@ -34,6 +34,7 @@
import com.arjuna.ats.arjuna.coordinator.ActionStatus;
import com.arjuna.ats.arjuna.coordinator.TwoPhaseOutcome;
+import com.arjuna.ats.internal.jta.utils.jtaxLogger;
import com.arjuna.common.util.logging.*;
import com.arjuna.ats.internal.jta.transaction.jts.AtomicTransaction;
@@ -77,9 +78,9 @@
public boolean equals (Object obj)
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.equals");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.equals");
}
if (obj == null)
@@ -109,7 +110,7 @@
{
/*
* throw new IllegalStateException(
- * jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.subordinate.invalidstate"));
+ * jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.subordinate.invalidstate"));
*/
throw new InvalidTerminationStateException();
@@ -125,7 +126,7 @@
{
/*
* throw new IllegalStateException(
- * jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.subordinate.invalidstate"));
+ * jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.subordinate.invalidstate"));
*/
throw new InvalidTerminationStateException();
@@ -256,9 +257,9 @@
if (!endSuspendedRMs())
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
+ if (jtaxLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.endsuspendfailed1");
+ jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.endsuspendfailed1");
}
}
@@ -416,7 +417,7 @@
{
/*
* throw new IllegalStateException(
- * jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.subordinate.invalidstate"));
+ * jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.subordinate.invalidstate"));
*/
throw new InactiveTransactionException();
@@ -428,7 +429,7 @@
{
/*
* throw new IllegalStateException(
- * jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.subordinate.invalidstate"));
+ * jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.subordinate.invalidstate"));
*/
throw new InactiveTransactionException();
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/jca/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/jca/TransactionImple.java 2010-01-06 14:59:02 UTC (rev 30956)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/jca/TransactionImple.java 2010-01-06 17:11:50 UTC (rev 30957)
@@ -31,6 +31,7 @@
package com.arjuna.ats.internal.jta.transaction.jts.subordinate.jca;
+import com.arjuna.ats.internal.jta.utils.jtaxLogger;
import com.arjuna.common.util.logging.*;
import com.arjuna.ats.arjuna.common.Uid;
@@ -86,9 +87,9 @@
public boolean equals (Object obj)
{
- if (jtaLogger.logger.isDebugEnabled())
+ if (jtaxLogger.logger.isDebugEnabled())
{
- jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.equals");
+ jtaxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA, "TransactionImple.equals");
}
if (obj == null)
Deleted: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/LoggerSetup.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/LoggerSetup.java 2010-01-06 14:59:02 UTC (rev 30956)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/LoggerSetup.java 2010-01-06 17:11:50 UTC (rev 30957)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
- *
- * Arjuna Technologies Ltd.
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: LoggerSetup.java 2342 2006-03-30 13:06:17Z $
- */
-package com.arjuna.ats.internal.jta.utils;
-
-import com.arjuna.ats.jta.logging.jtaLogger;
-
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-public class LoggerSetup
-{
- private static boolean _initialised = false;
-
- public final static void setup()
- {
- if ( !_initialised )
- {
- String language = System.getProperty("language","en");
- String country = System.getProperty("country","US");
-
- jtaLogger.loggerI18N.addResourceBundle("jtax_msg_"+language+"_"+country);
-
- _initialised = true;
- }
- }
-}
Added: 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 (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/jtaxLogger.java 2010-01-06 17:11:50 UTC (rev 30957)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates,
+ * and individual contributors as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2010,
+ * @author JBoss, by Red Hat.
+ */
+package com.arjuna.ats.internal.jta.utils;
+
+import com.arjuna.common.util.logging.LogFactory;
+import com.arjuna.common.util.logging.LogNoi18n;
+import com.arjuna.common.util.logging.Logi18n;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+/**
+ * @author Jonathan Halliday (jonathan.halliday at redhat.com), 2010-01
+ */
+public class jtaxLogger
+{
+
+ public static LogNoi18n logger;
+ public static Logi18n loggerI18N;
+
+ private static ResourceBundle logMesg;
+
+ private static String _language;
+ private static String _country;
+ private static Locale _currentLocale;
+
+ static
+ {
+ logger = LogFactory.getLogNoi18n("com.arjuna.ats.jtax.logging.logger");
+
+ _language = System.getProperty("language","en");
+ _country = System.getProperty("country","US");
+
+ _currentLocale = new Locale(_language, _country);
+
+ try
+ {
+ logMesg = ResourceBundle.getBundle("jtax_msg", _currentLocale);
+ }
+ catch (Throwable ex)
+ {
+ logMesg = null;
+ }
+
+ if (logMesg == null)
+ {
+ _currentLocale = new Locale("en", "US");
+
+ logMesg = ResourceBundle.getBundle("jtax_msg", _currentLocale);
+ }
+
+ try
+ {
+ loggerI18N = LogFactory.getLogi18n("com.arjuna.ats.jtax.logging.loggerI18N", "jtax_msg_"+_language+"_"+_country);
+ }
+ catch (Throwable ex)
+ {
+ loggerI18N = null;
+ }
+
+ if (loggerI18N == null)
+ loggerI18N = LogFactory.getLogi18n("com.arjuna.ats.jtax.logging.loggerI18N", "jtax_msg_en_US");
+ }
+}
More information about the jboss-svn-commits
mailing list