[jboss-svn-commits] JBL Code SVN: r33604 - in labs/jbosstm/trunk/ArjunaJTS: jtax/classes/com/arjuna/ats/internal/jta/transaction/jts and 11 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jun 23 08:37:27 EDT 2010
Author: jhalliday
Date: 2010-06-23 08:37:26 -0400 (Wed, 23 Jun 2010)
New Revision: 33604
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/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/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/SubordinateAtomicTransaction.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/utils/jtaxI18NLogger.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/jtaxI18NLoggerImpl.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/jtaxLogger.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ChildOA.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORB.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/RootOA.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/Services.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/event/EventManager.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/jacorb/oa/implementations/jacorb_2_0.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/javaidl/oa/implementations/javaidl_1_4.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/utils/InitLoader.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/opLogger.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLogger.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLoggerImpl.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java
Log:
Convert i18n logging from CLF to jboss-logging in orbportability and jtax modules. JBTM-750
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-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/LastResourceRecord.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -130,51 +130,23 @@
return false;
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.multipleWarning
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.multipleWarning]
- * Multiple last resources have been added to the current transaction.
- * This is transactionally unsafe and should not be relied upon.
- * Current resource is {0}
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.disallow
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.disallow]
- * Adding multiple last resources is disallowed. Current resource is
- * {0}
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.startupWarning
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.startupWarning]
- * You have chosen to enable multiple last resources in the transaction
- * manager. This is transactionally unsafe and should not be relied
- * upon.
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.disableWarning
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.disableWarning]
- * You have chosen to disable the Multiple Last Resources warning. You will see it only once.
- */
public boolean shouldAdd(OTSAbstractRecord record) throws SystemException
{
if( record.type_id() == type_id() )
{
if(ALLOW_MULTIPLE_LAST_RESOURCES)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
+ if (!_disableMLRWarning || (_disableMLRWarning && !_issuedWarning))
{
- if (!_disableMLRWarning || (_disableMLRWarning && !_issuedWarning))
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.multipleWarning",
- new Object[] { record });
- _issuedWarning = true;
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_lastResource_multipleWarning(record.toString());
+ _issuedWarning = true;
}
return true;
}
else
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.disallow",
- new Object[] { record });
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_lastResource_disallow(record.toString());
return false;
}
@@ -194,15 +166,14 @@
{
ALLOW_MULTIPLE_LAST_RESOURCES = arjPropertyManager.getCoreEnvironmentBean().isAllowMultipleLastResources();
- if (ALLOW_MULTIPLE_LAST_RESOURCES
- && jtaxLogger.loggerI18N.isWarnEnabled())
+ if (ALLOW_MULTIPLE_LAST_RESOURCES)
{
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.startupWarning");
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_lastResource_startupWarning();
}
if (arjPropertyManager.getCoreEnvironmentBean().isDisableMultipleLastResourcesWarning())
{
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.disableWarning");
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_lastResource_disableWarning();
_disableMLRWarning = true;
}
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-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -37,7 +37,6 @@
import com.arjuna.ats.jta.xa.*;
import com.arjuna.ats.jta.utils.XAHelper;
-import com.arjuna.ats.jta.logging.*;
import com.arjuna.ats.jta.resources.StartXAResource;
import com.arjuna.ats.jta.resources.EndXAResource;
@@ -56,7 +55,6 @@
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.*;
@@ -77,21 +75,6 @@
import org.omg.CORBA.UNKNOWN;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
-/**
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.nulltransaction
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.nulltransaction]
- * {0} - null or invalid transaction!
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.xaerror
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.xaerror] {0}
- * caused an XA error: {1} from resource {2} in transaction {3}
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.loadstateread
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.loadstateread]
- * Reading state caught: {1}
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.generror
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.generror] {0}
- * caused an error from resource {1} in transaction {2}
- */
-
public class XAResourceRecord extends com.arjuna.ArjunaOTS.OTSAbstractRecordPOA
{
@@ -107,10 +90,6 @@
* then recovery is out of our control.
*
* Could also use it to pass other information, such as the readonly flag.
- *
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.consterror
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.consterror]
- * {0} caught exception during construction: {1}
*/
public XAResourceRecord(TransactionImple tx, XAResource res, Xid xid,
@@ -196,11 +175,6 @@
return _tranID;
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.preparefailed
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.preparefailed]
- * XAResource prepare failed on resource {0} for transaction {1} with: {2}
- */
public org.omg.CosTransactions.Vote prepare() throws HeuristicMixed,
HeuristicHazard, org.omg.CORBA.SystemException
@@ -211,14 +185,7 @@
if (!_valid || (_theXAResource == null) || (_tranID == null))
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.nulltransaction",
- new Object[]
- { "XAResourceRecord.prepare" });
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_nulltransaction("XAResourceRecord.prepare");
removeConnection();
@@ -268,15 +235,8 @@
}
catch (XAException e1)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.preparefailed",
- new Object[]
- { _theXAResource, _tranID, XAHelper
- .printXAErrorCode(e1) });
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_preparefailed(_theXAResource.toString(),
+ XAHelper.xidToString(_tranID), XAHelper.printXAErrorCode(e1), e1);
/*
* XA_RB*, XAER_RMERR, XAER_RMFAIL, XAER_NOTA, XAER_INVAL, or
@@ -308,14 +268,8 @@
}
catch (Exception e2)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.preparefailed",
- new Object[]
- { _theXAResource, _tranID, e2 });
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_preparefailed(_theXAResource.toString(),
+ XAHelper.xidToString(_tranID), "-", e2);
if (_rollbackOptimization) // won't have rollback called on it
removeConnection();
@@ -343,14 +297,7 @@
if (!_valid || (_tranID == null))
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.nulltransaction",
- new Object[]
- { "XAResourceRecord.rollback" });
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_nulltransaction("XAResourceRecord.rollback");
}
else
{
@@ -406,17 +353,8 @@
}
else
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.xaerror",
- new Object[]
- {
- "XAResourceRecord.rollback",
- XAHelper
- .printXAErrorCode(e1), _theXAResource, _tranID });
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_xaerror("XAResourceRecord.rollback",
+ XAHelper.printXAErrorCode(e1), _theXAResource.toString(), XAHelper.xidToString(_tranID), e1);
switch (e1.errorCode)
{
@@ -458,17 +396,9 @@
}
catch (Exception e2)
{
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_generror("XAResourceRecord.rollback",
+ _theXAResource.toString(), XAHelper.xidToString(_tranID), e2);
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.generror",
- new Object[]
- {
- "XAResourceRecord.rollback",
- _theXAResource, _tranID }, e2);
- }
throw new UNKNOWN();
}
finally
@@ -491,14 +421,7 @@
if (_tranID == null)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.nulltransaction",
- new Object[]
- { "XAResourceRecord.commit" });
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_nulltransaction("XAResourceRecord.commit");
}
else
{
@@ -543,17 +466,8 @@
{
_committed = false;
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.xaerror",
- new Object[]
- {
- "XAResourceRecord.commit",
- XAHelper
- .printXAErrorCode(e1), _theXAResource, _tranID });
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_xaerror("XAResourceRecord.commit",
+ XAHelper.printXAErrorCode(e1), _theXAResource.toString(), XAHelper.xidToString(_tranID), e1);
/*
* XA_HEURHAZ, XA_HEURCOM, XA_HEURRB, XA_HEURMIX,
@@ -611,16 +525,8 @@
{
_committed = false;
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.generror",
- new Object[]
- {
- "XAResourceRecord.commit",
- _theXAResource, _tranID }, e2);
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_generror("XAResourceRecord.commit",
+ _theXAResource.toString(), XAHelper.xidToString(_tranID), e2);
throw new UNKNOWN();
}
@@ -721,11 +627,6 @@
* outcome is whatever we want. Therefore, we do not need to save any
* additional recoverable state, such as a reference to the transaction
* coordinator, since it will not have an intentions list anyway.
- *
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.coperror
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.coperror]
- * Caught the following error while trying to single phase complete
- * resource {0}
*/
public void commit_one_phase() throws HeuristicHazard,
@@ -737,14 +638,7 @@
if (_tranID == null)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.nulltransaction",
- new Object[]
- { "XAResourceRecord.commit_one_phase" });
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_nulltransaction("XAResourceRecord.commit_one_phase");
throw new TRANSACTION_ROLLEDBACK();
}
@@ -888,13 +782,7 @@
}
catch (Exception e2)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.coperror",
- new Object[] {e2}, e2);
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_coperror(e2);
throw new UNKNOWN();
}
@@ -937,12 +825,6 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.saveState
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.saveState]
- * Could not serialize a serializable XAResource!
- */
-
public boolean saveState(OutputObjectState os)
{
boolean res = false;
@@ -983,10 +865,7 @@
}
catch (NotSerializableException ex)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.saveState");
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_saveState();
return false;
}
@@ -1032,19 +911,6 @@
return res;
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.restoreerror1
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.restoreerror1]
- * Exception on attempting to resource XAResource: {0}
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.restoreerror2
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.restoreerror2]
- * Unexpected exception on attempting to resource XAResource: {0}
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.norecoveryxa
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.norecoveryxa]
- * Could not find new XAResource to use for recovering
- * non-serializable XAResource {0}
- */
-
public boolean restoreState(InputObjectState os)
{
boolean res = false;
@@ -1083,14 +949,7 @@
{
// not serializable in the first place!
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.restoreerror1",
- new Object[]
- { ex });
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_restoreerror1(ex);
return false;
}
@@ -1109,11 +968,7 @@
if (_theXAResource == null)
{
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.norecoveryxa",
- new Object[]
- { _tranID });
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_norecoveryxa(XAHelper.xidToString(_tranID));
}
if (jtaxLogger.logger.isDebugEnabled()) {
@@ -1146,14 +1001,7 @@
}
catch (Exception e)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.restoreerror2",
- new Object[]
- { e }, e);
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_restoreerror2(e);
res = false;
}
@@ -1213,15 +1061,6 @@
_theXAResource = res;
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.notprepared
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.notprepared]
- * {0} caught NotPrepared exception during recovery phase!
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.unexpected
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.unexpected]
- * {0} caught unexpected exception: {1} during recovery phase!
- */
-
protected int recover()
{
if (jtaxLogger.logger.isDebugEnabled()) {
@@ -1249,14 +1088,7 @@
}
catch (NotPrepared ex1)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.notprepared",
- new Object[]
- { "XAResourceRecord" });
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_notprepared("XAResourceRecord");
return XARecoveryResource.TRANSACTION_NOT_PREPARED;
}
@@ -1272,14 +1104,7 @@
* Unknown error, so better to do nothing at this stage.
*/
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.unexpected",
- new Object[]
- { "XAResourceRecord", e }, e);
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_unexpected("XAResourceRecord", e);
return XARecoveryResource.FAILED_TO_RECOVER;
}
@@ -1334,12 +1159,6 @@
_objStore = TxControl.getStore();
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.createstate
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.createstate]
- * Committing of resource state failed.
- */
-
private final boolean createState()
{
setObjectStore();
@@ -1358,11 +1177,7 @@
}
catch (Exception e)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.createstate");
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_createstate();
_valid = false;
}
@@ -1376,12 +1191,6 @@
return _valid;
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.updatestate
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.updatestate]
- * Updating of resource state failed.
- */
-
private final boolean updateState(int h)
{
setObjectStore();
@@ -1405,11 +1214,7 @@
}
else
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.updatestate");
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_updatestate();
_valid = false;
}
@@ -1430,13 +1235,7 @@
}
catch (Exception e)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.loadstateread",
- e);
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_loadstateread(e);
os = null;
}
@@ -1477,12 +1276,6 @@
return _valid;
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.remconn
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.remconn]
- * Attempted shutdown of resource failed with:
- */
-
private final void removeConnection()
{
/*
@@ -1510,26 +1303,10 @@
}
catch (Exception e)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.remconn",
- e);
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_remconn(e);
}
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.recfailed
- * [com.arjuna.ats.internal.jta.resources.jts.orbspecific.recfailed]
- * Recovery of resource failed when trying to call {0} got: {1}
- * @message com.arjuna.ats.internal.jta.recovery.jts.orbspecific.commit XA
- * recovery committing {0}
- * @message com.arjuna.ats.internal.jta.recovery.jts.orbspecific.rollback XA
- * recovery rolling back {0}
- */
-
private final int doRecovery(boolean commit)
{
if (jtaxLogger.logger.isDebugEnabled()) {
@@ -1542,41 +1319,20 @@
{
try
{
- if (jtaxLogger.logger.isInfoEnabled())
- {
- if (commit)
- jtaxLogger.loggerI18N
- .info(
- "com.arjuna.ats.internal.jta.recovery.jts.orbspecific.commit",
- new Object[]
- { _tranID });
- else
- jtaxLogger.loggerI18N
- .info(
- "com.arjuna.ats.internal.jta.recovery.jts.orbspecific.rollback",
- new Object[]
- { _tranID });
- }
-
- if (commit)
+ if (commit) {
+ jtaxLogger.i18NLogger.info_jtax_recovery_jts_orbspecific_commit(XAHelper.xidToString(_tranID));
commit();
- else
+ } else {
+ jtaxLogger.i18NLogger.info_jtax_recovery_jts_orbspecific_rollback(XAHelper.xidToString(_tranID));
rollback();
-
+ }
// if those succeed, they will have removed any persistent state
result = XARecoveryResource.RECOVERED_OK;
}
catch (Exception e2)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.jts.orbspecific.recfailed",
- new Object[]
- { ((commit) ? "commit" : "rollback"), e2 }, e2);
- }
+ jtaxLogger.i18NLogger.warn_jtax_resources_jts_orbspecific_recfailed(((commit) ? "commit" : "rollback"), e2);
}
}
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-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/AtomicTransaction.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -71,12 +71,6 @@
super(tx);
}
- /**
- * @message com.arjuna.ats.internal.jta.transaction.jts.atomictxnobegin
- * [com.arjuna.ats.internal.jta.transaction.jts.atomictxnobegin]
- * Cannot call begin on imported AtomicTransaction instance.
- */
-
/*
* public synchronized void begin () throws SubtransactionsUnavailable,
* SystemException { if (jtaxLogger.loggerI18N.isWarnEnabled()) {
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-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/BaseTransaction.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -40,8 +40,6 @@
import com.arjuna.ats.internal.jts.OTSImpleManager;
-import com.arjuna.common.util.logging.*;
-
import javax.transaction.NotSupportedException;
import java.lang.IllegalStateException;
import java.lang.NullPointerException;
@@ -52,18 +50,6 @@
* @author Mark Little (mark_little at hp.com)
* @version $Id: BaseTransaction.java 2342 2006-03-30 13:06:17Z $
* @since JTS 2.1.
- *
- * @message com.arjuna.ats.internal.jta.transaction.jts.notx
- * [com.arjuna.ats.internal.jta.transaction.jts.notx] - no transaction!
- * @message com.arjuna.ats.internal.jta.transaction.jts.invalidtx
- * [com.arjuna.ats.internal.jta.transaction.jts.invalidtx] - invalid
- * transaction!
- * @message com.arjuna.ats.internal.jta.transaction.jts.notxe
- * [com.arjuna.ats.internal.jta.transaction.jts.notxe] - no
- * transaction! Caught:
- * @message com.arjuna.ats.internal.jta.transaction.jts.nosuchtx
- * [com.arjuna.ats.internal.jta.transaction.jts.nosuchtx] No such
- * transaction!
*/
public class BaseTransaction
@@ -150,8 +136,8 @@
ex.printStackTrace();
throw new IllegalStateException(
- "BaseTransaction.commit - "
- + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notxe")
+ "BaseTransaction.commit - "
+ + jtaxLogger.i18NLogger.get_jtax_transaction_jts_notxe()
+ ex, ex);
}
@@ -195,7 +181,7 @@
catch (NullPointerException ex)
{
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.nosuchtx"), ex);
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_nosuchtx(), ex);
}
}
@@ -259,11 +245,6 @@
/**
* Called when we want to make sure this thread does not already have a
* transaction associated with it.
- *
- * @message com.arjuna.ats.internal.jta.transaction.jts.alreadyassociated
- * [com.arjuna.ats.internal.jta.transaction.jts.alreadyassociated]
- * thread is already associated with a transaction and
- * subtransaction support is not enabled!
*/
final void checkTransactionState () throws IllegalStateException,
@@ -287,8 +268,8 @@
&& (!jtaPropertyManager.getJTAEnvironmentBean().isSupportSubtransactions()))
{
throw new IllegalStateException(
- "BaseTransaction.checkTransactionState - "
- + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.alreadyassociated"));
+ "BaseTransaction.checkTransactionState - "
+ + jtaxLogger.i18NLogger.get_jtax_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-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -60,8 +60,6 @@
import com.arjuna.ats.internal.jts.OTSImpleManager;
import com.arjuna.ats.internal.jts.ControlWrapper;
-import com.arjuna.common.util.logging.*;
-
import javax.transaction.xa.*;
import com.arjuna.ats.arjuna.common.*;
@@ -88,36 +86,6 @@
* @author Mark Little (mark_little at hp.com)
* @version $Id: TransactionImple.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.2.4.
- *
- * @message com.arjuna.ats.internal.jta.transaction.jts.xaerror
- * [com.arjuna.ats.internal.jta.transaction.jts.xaerror] {0} caught XA
- * exception: {1}
- * @message com.arjuna.ats.internal.jta.transaction.jts.inactivetx
- * [com.arjuna.ats.internal.jta.transaction.jts.inactivetx] Transaction
- * is not active.
- * @message com.arjuna.ats.internal.jta.transaction.jts.invalidtx2
- * [com.arjuna.ats.internal.jta.transaction.jts.invalidtx2] Invalid
- * transaction.
- * @message com.arjuna.ats.internal.jta.transaction.jts.nox
- * [com.arjuna.ats.internal.jta.transaction.jts.notx] No such
- * transaction.
- * @message com.arjuna.ats.internal.jta.transaction.jts.wrongstatetx
- * [com.arjuna.ats.internal.jta.transaction.jts.wrongstatetx] The
- * current transaction does not match this transaction!
- * @message com.arjuna.ats.internal.jta.transaction.jts.nullparam
- * [com.arjuna.ats.internal.jta.transaction.jts.nullparam] paramater is
- * null!
- * @message com.arjuna.ats.internal.jta.transaction.jts.illegalstate
- * [com.arjuna.ats.internal.jta.transaction.jts.illegalstate] - illegal
- * resource state:
- * @message com.arjuna.ats.internal.jta.transaction.jts.syncproblem
- * [com.arjuna.ats.internal.jta.transaction.jts.syncproble] - cleanup
- * synchronization failed to register:
- * @message com.arjuna.ats.internal.jta.transaction.jts.lastResourceOptimisationInterface
- * [com.arjuna.ats.internal.jta.transaction.jts.lastResourceOptimisationInterface] - failed
- * to load Last Resource Optimisation Interface
- * @message com.arjuna.ats.internal.jta.transaction.jts.setrollback
- * [com.arjuna.ats.internal.jta.transaction.jts.setrollback] - setRollbackOnly called from:
*/
public class TransactionImple implements javax.transaction.Transaction,
@@ -165,7 +133,7 @@
* now.
*/
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.syncproblem", ex);
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_syncproblem(ex);
}
}
@@ -261,13 +229,13 @@
catch (org.omg.CosTransactions.WrongTransaction wt)
{
InactiveTransactionException inactiveTransactionException = new InactiveTransactionException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.wrongstatetx"));
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_wrongstatetx());
inactiveTransactionException.initCause(wt);
throw inactiveTransactionException;
}
catch (org.omg.CosTransactions.NoTransaction e1)
{
- IllegalStateException illegalStateException = new IllegalStateException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"));
+ IllegalStateException illegalStateException = new IllegalStateException(jtaxLogger.i18NLogger.get_jtax_transaction_jts_notx());
illegalStateException.initCause(e1);
throw illegalStateException;
}
@@ -296,7 +264,7 @@
catch (INVALID_TRANSACTION e6)
{
InactiveTransactionException inactiveTransactionException = new InactiveTransactionException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.invalidtx2"));
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_invalidtx2());
inactiveTransactionException.initCause(e6);
throw inactiveTransactionException;
}
@@ -313,19 +281,9 @@
}
else
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_inactivetx());
}
- /**
- * @message com.arjuna.ats.internal.jta.transaction.jts.endsuspendfailed1
- * [com.arjuna.ats.internal.jta.transaction.jts.endsuspendfailed1]
- * Ending suspended RMs failed when rolling back the transaction!
- * @message com.arjuna.ats.internal.jta.transaction.jts.endsuspendfailed2
- * [com.arjuna.ats.internal.jta.transaction.jts.endsuspendfailed2]
- * Ending suspended RMs failed when rolling back the transaction,
- * but transaction rolled back.
- */
-
public void rollback () throws java.lang.IllegalStateException,
java.lang.SecurityException, javax.transaction.SystemException
{
@@ -352,10 +310,7 @@
if (endSuspendedFailed)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.endsuspendfailed1");
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_endsuspendfailed1();
}
_theTransaction.abort();
@@ -363,7 +318,7 @@
catch (org.omg.CosTransactions.WrongTransaction e1)
{
InactiveTransactionException inactiveTransactionException =new InactiveTransactionException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.wrongstatetx"));
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_wrongstatetx());
inactiveTransactionException.initCause(e1);
throw inactiveTransactionException;
}
@@ -374,14 +329,14 @@
catch (INVALID_TRANSACTION e3)
{
InactiveTransactionException inactiveTransactionException = new InactiveTransactionException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.invalidtx2"));
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_invalidtx2());
inactiveTransactionException.initCause(e3);
throw inactiveTransactionException;
}
catch (NoTransaction e4)
{
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"), e4);
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_notx(), e4);
}
catch (org.omg.CORBA.SystemException e5)
{
@@ -395,12 +350,12 @@
}
if (endSuspendedFailed)
- throw new InvalidTerminationStateException (
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.endsuspendfailed2"));
+ throw new InvalidTerminationStateException(
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_endsuspendfailed2());
}
else
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_inactivetx());
}
public void setRollbackOnly () throws java.lang.IllegalStateException,
@@ -418,13 +373,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(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"));
+ _rollbackOnlyCallerStacktrace = new Throwable(jtaxLogger.i18NLogger.get_jtax_transaction_jts_notx());
}
}
catch (org.omg.CosTransactions.NoTransaction e3)
{
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"), e3);
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_notx(), e3);
}
catch (final INVALID_TRANSACTION ex)
{
@@ -449,7 +404,7 @@
}
else
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_inactivetx());
}
public int getStatus () throws javax.transaction.SystemException
@@ -477,11 +432,6 @@
return status;
}
- /**
- * @message com.arjuna.ats.internal.jta.transaction.jts.syncerror
- * [com.arjuna.ats.internal.jta.transaction.jts.syncerror]
- * Synchronizations are not allowed!
- */
public void registerSynchronization (javax.transaction.Synchronization sync)
throws javax.transaction.RollbackException,
java.lang.IllegalStateException, javax.transaction.SystemException
@@ -492,8 +442,8 @@
if (sync == null)
throw new javax.transaction.SystemException(
- "TransactionImple.registerSynchronization - "
- + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.nullparam"));
+ "TransactionImple.registerSynchronization - "
+ + jtaxLogger.i18NLogger.get_jtax_transaction_jts_nullparam());
registerSynchronizationImple(new ManagedSynchronizationImple(sync));
}
@@ -520,17 +470,17 @@
catch (org.omg.CosTransactions.Inactive e3)
{
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"), e3);
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_inactivetx(), e3);
}
catch (org.omg.CosTransactions.SynchronizationUnavailable e4)
{
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.syncerror"), e4);
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_syncerror(), e4);
}
catch (INVALID_TRANSACTION e5)
{
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.invalidtx2"), e5);
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_invalidtx2(), e5);
}
catch (org.omg.CORBA.SystemException e6)
{
@@ -541,7 +491,7 @@
}
else
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_inactivetx());
}
@@ -551,18 +501,6 @@
return enlistResource(xaRes, null);
}
- /**
- * @message com.arjuna.ats.internal.jta.transaction.jts.starterror
- * [com.arjuna.ats.internal.jta.transaction.jts.starterror] {0}
- * returned XA error {1} for transaction {2}
- * @message com.arjuna.ats.internal.jta.transaction.jts.regerror
- * [com.arjuna.ats.internal.jta.transaction.jts.regerror] {0} could
- * not register transaction: {1}
- * @message com.arjuna.ats.internal.jta.transaction.jts.markedrollback
- * [com.arjuna.ats.internal.jta.transaction.jts.markedrollback] Could not
- * enlist resource because the transaction is marked for rollback.
- */
-
public boolean enlistResource (XAResource xaRes, Object[] params)
throws RollbackException, IllegalStateException,
javax.transaction.SystemException
@@ -574,8 +512,8 @@
if (xaRes == null)
throw new javax.transaction.SystemException(
- "TransactionImple.enlistResource - "
- + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.nullparam"));
+ "TransactionImple.enlistResource - "
+ + jtaxLogger.i18NLogger.get_jtax_transaction_jts_nullparam());
int status = getStatus();
@@ -583,12 +521,12 @@
{
case javax.transaction.Status.STATUS_MARKED_ROLLBACK:
throw new RollbackException("TransactionImple.enlistResource - "
- + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.markedrollback"));
+ + jtaxLogger.i18NLogger.get_jtax_transaction_jts_markedrollback());
case javax.transaction.Status.STATUS_ACTIVE:
break;
default:
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_inactivetx());
}
XAModifier theModifier = null;
@@ -685,8 +623,8 @@
// Note: this exception will be caught by our catch
// block
throw new IllegalStateException(
- "TransactionImple.enlistResource - "
- + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.illegalstate")
+ "TransactionImple.enlistResource - "
+ + jtaxLogger.i18NLogger.get_jtax_transaction_jts_illegalstate()
+ info.getState());
}
}
@@ -701,11 +639,8 @@
if (info != null)
info.setState(TxInfo.FAILED);
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaerror", new Object[]
- { "TransactionImple.enlistResource", XAHelper.printXAErrorCode(exp) });
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_xaerror( "TransactionImple.enlistResource",
+ XAHelper.printXAErrorCode(exp), exp);
return false;
}
@@ -775,11 +710,8 @@
}
catch (XAException te)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.timeouterror", new Object[]
- { "TransactionImple.enlistResource", XAHelper.printXAErrorCode(te), xid });
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_timeouterror("TransactionImple.enlistResource",
+ XAHelper.printXAErrorCode(te), XAHelper.xidToString(xid), te);
}
}
}
@@ -843,11 +775,8 @@
* rollback only.
*/
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.starterror", new Object[]
- { "TransactionImple.enlistResource - XAResource.start", XAHelper.printXAErrorCode(e), xid });
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_starterror("TransactionImple.enlistResource - XAResource.start",
+ XAHelper.printXAErrorCode(e), XAHelper.xidToString(xid), e);
markRollbackOnly();
@@ -856,11 +785,8 @@
if (retry < 0)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.starterror", new Object[]
- { "TransactionImple.enlistResource - XAResource.start", XAHelper.printXAErrorCode(e), xid });
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_starterror("TransactionImple.enlistResource - XAResource.start",
+ XAHelper.printXAErrorCode(e), XAHelper.xidToString(xid), e);
markRollbackOnly();
@@ -890,11 +816,7 @@
}
catch (XAException ex)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaerror", new Object[]
- { "TransactionImple.enlistResource - xa_start: ", XAHelper.printXAErrorCode(ex) });
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_xaerror("TransactionImple.enlistResource - xa_start: ", XAHelper.printXAErrorCode(ex), ex);
markRollbackOnly();
@@ -958,18 +880,6 @@
* sense otherwise!
*/
- /**
- * @message com.arjuna.ats.internal.jta.transaction.jts.unknownres
- * [com.arjuna.ats.internal.jta.transaction.jts.unknownres] {0}
- * attempt to delist unknown resource!
- * @message com.arjuna.ats.internal.jta.transaction.jts.delistfailed
- * [com.arjuna.ats.internal.jta.transaction.jts.delistfailed]
- * Delist of resource failed with: {0}
- * @message com.arjuna.ats.internal.jta.transaction.jts.ressusp resource
- * [com.arjuna.ats.internal.jta.transaction.jts.ressusp resource]
- * is already suspended!
- */
-
public boolean delistResource (XAResource xaRes, int flags)
throws IllegalStateException, javax.transaction.SystemException
{
@@ -980,8 +890,8 @@
if (xaRes == null)
throw new javax.transaction.SystemException(
- "TransactionImple.delistResource - "
- + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.nullparam"));
+ "TransactionImple.delistResource - "
+ + jtaxLogger.i18NLogger.get_jtax_transaction_jts_nullparam());
int status = getStatus();
@@ -993,7 +903,7 @@
break;
default:
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_inactivetx());
}
TxInfo info = null;
@@ -1010,11 +920,7 @@
if (info == null)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.unknownres", new Object[]
- { "TransactionImple.delistResource" });
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_unknownres("TransactionImple.delistResource");
return false;
}
@@ -1102,8 +1008,8 @@
// block
throw new IllegalStateException(
- "TransactionImple.delistResource - "
- + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.ressusp"));
+ "TransactionImple.delistResource - "
+ + jtaxLogger.i18NLogger.get_jtax_transaction_jts_ressusp());
}
else
{
@@ -1121,8 +1027,8 @@
default:
if (!optimizedRollback)
throw new IllegalStateException(
- "TransactionImple.delistResource - "
- + jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.illegalstate")
+ "TransactionImple.delistResource - "
+ + jtaxLogger.i18NLogger.get_jtax_transaction_jts_illegalstate()
+ info.getState());
}
@@ -1146,21 +1052,13 @@
markRollbackOnly();
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaerror", new Object[]
- { "TransactionImple.delistResource", XAHelper.printXAErrorCode(exp) });
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_xaerror("TransactionImple.delistResource", XAHelper.printXAErrorCode(exp), exp);
return false;
}
catch (Exception e)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.delistfailed", new Object[]
- { e });
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_delistfailed(e);
/*
* Some exception occurred and we probably could not delist the
@@ -1221,10 +1119,6 @@
/**
* Creates if does not exist and adds to our internal mapping table.
- *
- * @message com.arjuna.ats.internal.jta.transaction.jts.nottximple
- * [com.arjuna.ats.internal.jta.transaction.jts.nottximple] Current
- * transaction is not a TransactionImple
*/
static final TransactionImple getTransaction ()
@@ -1265,10 +1159,7 @@
}
catch (ClassCastException ex)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.nottximple");
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_nottximple();
}
}
}
@@ -1364,7 +1255,7 @@
* hit for now.
*/
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.syncproblem", ex);
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_syncproblem(ex);
}
_xaTransactionTimeoutEnabled = getXATransactionTimeoutEnabled() ;
}
@@ -1389,12 +1280,12 @@
catch (org.omg.CosTransactions.WrongTransaction wt)
{
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.wrongstatetx"), wt);
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_wrongstatetx(), wt);
}
catch (org.omg.CosTransactions.NoTransaction e1)
{
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"), e1);
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_notx(), e1);
}
catch (org.omg.CosTransactions.HeuristicMixed e2)
{
@@ -1448,7 +1339,7 @@
}
else
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_inactivetx());
}
protected void rollbackAndDisassociate ()
@@ -1468,7 +1359,7 @@
catch (org.omg.CosTransactions.WrongTransaction e1)
{
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.wrongstatetx"), e1);
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_wrongstatetx(), e1);
}
catch (org.omg.CORBA.NO_PERMISSION e2)
{
@@ -1477,12 +1368,12 @@
catch (INVALID_TRANSACTION e3)
{
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.invalidtx2"), e3);
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_invalidtx2(), e3);
}
catch (NoTransaction e4)
{
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.notx"), e4);
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_notx(), e4);
}
catch (org.omg.CORBA.SystemException e5)
{
@@ -1497,7 +1388,7 @@
}
else
throw new IllegalStateException(
- jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.inactivetx"));
+ jtaxLogger.i18NLogger.get_jtax_transaction_jts_inactivetx());
}
/**
@@ -1530,10 +1421,6 @@
/**
* If there are any suspended RMs then we should call end on them before the
* transaction is terminated.
- *
- * @message com.arjuna.ats.internal.jta.transaction.jts.xaenderror
- * [com.arjuna.ats.internal.jta.transaction.jts.xaenderror]
- * Could not call end on a suspended resource!
*/
protected boolean endSuspendedRMs ()
@@ -1576,10 +1463,7 @@
}
catch (XAException ex)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaenderror");
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_xaenderror();
result = false;
}
@@ -1616,10 +1500,7 @@
}
catch (XAException ex)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaenderror");
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_xaenderror();
result = false;
}
@@ -1636,10 +1517,6 @@
* don't use this copy. For some databases it would actually be ok for us to
* use the resource (at least to do an xa_start equivalent on it), but for
* Oracle 8.1.6 it causes their JDBC driver to crash!
- *
- * @message com.arjuna.ats.internal.jta.transaction.jts.threaderror
- * [com.arjuna.ats.internal.jta.transaction.jts.threaderror] Active
- * thread error:
*/
private final boolean threadIsActive (XAResource xaRes)
@@ -1686,10 +1563,7 @@
}
catch (Exception e)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.threaderror", e);
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_threaderror(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
}
@@ -1700,10 +1574,6 @@
/**
* isNewRM returns an existing TxInfo for the same RM, if present. Null
* otherwise.
- *
- * @message com.arjuna.ats.internal.jta.transaction.jts.rmerror
- * [com.arjuna.ats.internal.jta.transaction.jts.rmerror] An error
- * occurred while checking if this is a new resource manager:
*/
private final TxInfo isNewRM (XAResource xaRes)
@@ -1745,20 +1615,13 @@
}
catch (XAException ex)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaerror", new Object[]
- { "TransactionImple.isNewRM", XAHelper.printXAErrorCode(ex) });
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_xaerror("TransactionImple.isNewRM", XAHelper.printXAErrorCode(ex), ex);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(ex.toString(), ex);
}
catch (Exception e)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.rmerror", e);
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_rmerror(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
}
@@ -1804,10 +1667,6 @@
* and issues a warning. We use this in places wherew we need to force the
* outcome of the transaction but already have an exception to throw back to
* the application, so a failure here will only be masked.
- *
- * @message com.arjuna.ats.internal.jta.transaction.jts.rollbackerror
- * [com.arjuna.ats.internal.jta.transaction.jts.rollbackerror] {0}
- * could not mark the transaction as rollback only: {1}
*/
private final void markRollbackOnly ()
@@ -1834,11 +1693,7 @@
}
catch (Exception ex)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.rollbackerror", new Object[]
- { "TransactionImple.markRollbackOnly -", ex }, ex);
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_rollbackerror("TransactionImple.markRollbackOnly -", ex);
}
}
@@ -1901,11 +1756,7 @@
}
catch (final Throwable th)
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.lastResourceOptimisationInterface",
- new Object[] {lastResourceOptimisationInterfaceName}, th);
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_lastResourceOptimisationInterface(lastResourceOptimisationInterfaceName, th);
}
}
LAST_RESOURCE_OPTIMISATION_INTERFACE = lastResourceOptimisationInterface ;
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-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionSynchronizationRegistryImple.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -49,11 +49,6 @@
private static final long serialVersionUID = 1L;
- /**
- * @message com.arjuna.ats.internal.jta.transaction.jts.systemexception
- * [com.arjuna.ats.internal.jta.transaction.jts.systemexception]
- * The transaction implementation threw a SystemException
- */
public Object getTransactionKey()
{
if (jtaxLogger.logger.isDebugEnabled()) {
@@ -68,7 +63,7 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
+ throw new RuntimeException(jtaxLogger.i18NLogger.get_jtax_transaction_jts_systemexception(), e);
}
if (transactionImple == null) {
@@ -111,11 +106,6 @@
}
// Register a Synchronization instance with special ordering semantics.
- /**
- * @message com.arjuna.ats.internal.jta.transaction.jts.syncrollbackexception
- * [ccom.arjuna.ats.internal.jta.transaction.jts.syncrollbackexception]
- * The transaction implementation threw a RollbackException
- */
public void registerInterposedSynchronization(Synchronization synchronization)
{
if (jtaxLogger.logger.isDebugEnabled()) {
@@ -130,11 +120,11 @@
}
catch (RollbackException e)
{
- throw new com.arjuna.ats.jta.exceptions.RollbackException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.syncrollbackexception"), e);
+ throw new com.arjuna.ats.jta.exceptions.RollbackException(jtaxLogger.i18NLogger.get_jtax_transaction_jts_syncrollbackexception(), e);
}
catch (SystemException e)
{
- throw new RuntimeException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
+ throw new RuntimeException(jtaxLogger.i18NLogger.get_jtax_transaction_jts_systemexception(), e);
}
}
@@ -152,7 +142,7 @@
}
catch(SystemException e)
{
- throw new RuntimeException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
+ throw new RuntimeException(jtaxLogger.i18NLogger.get_jtax_transaction_jts_systemexception(), e);
}
}
@@ -178,7 +168,7 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
+ throw new RuntimeException(jtaxLogger.i18NLogger.get_jtax_transaction_jts_systemexception(), e);
}
}
@@ -201,7 +191,7 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
+ throw new RuntimeException(jtaxLogger.i18NLogger.get_jtax_transaction_jts_systemexception(), e);
}
}
@@ -215,7 +205,7 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.systemexception"), e);
+ throw new RuntimeException(jtaxLogger.i18NLogger.get_jtax_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-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/TxWorkManager.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -41,7 +41,6 @@
import javax.transaction.Transaction;
import com.arjuna.ats.internal.jta.utils.jtaxLogger;
-import com.arjuna.ats.jta.logging.*;
public class TxWorkManager
{
@@ -61,9 +60,6 @@
*
* @throws WorkCompletedException thrown if there is already work
* associated with the transaction.
- *
- * @message com.arjuna.ats.internal.jta.transaction.jts.jca.busy [message
- * com.arjuna.ats.internal.jta.transaction.jts.jca.busy] Work already active!
*/
public static void addWork (Work work, Transaction tx) throws WorkCompletedException
@@ -81,7 +77,7 @@
_transactions.put(tx, workers);
}
else
- throw new WorkCompletedException(jtaxLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.jts.jca.busy"), WorkException.TX_CONCURRENT_WORK_DISALLOWED);
+ throw new WorkCompletedException(jtaxLogger.i18NLogger.get_jtax_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/SubordinateAtomicTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/SubordinateAtomicTransaction.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/SubordinateAtomicTransaction.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -60,12 +60,6 @@
}
/**
- * @message com.arjuna.ats.internal.jta.transaction.jts.atomictxnobegin
- * [com.arjuna.ats.internal.jta.transaction.jts.atomictxnobegin]
- * Cannot call begin on imported AtomicTransaction instance.
- */
-
- /**
* Does not change thread-to-tx association as base class commit does.
*/
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-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -50,12 +50,6 @@
import javax.transaction.SystemException;
import javax.transaction.RollbackException;
-/**
- * @message com.arjuna.ats.internal.jta.transaction.jts.subordinate.invalidstate
- * [com.arjuna.ats.internal.jta.transaction.jts.subordinate.invalidstate]
- * Not allowed to terminate subordinate transaction directly.
- */
-
public class TransactionImple extends
com.arjuna.ats.internal.jta.transaction.jts.TransactionImple
{
@@ -255,10 +249,7 @@
if (!endSuspendedRMs())
{
- if (jtaxLogger.loggerI18N.isWarnEnabled())
- {
- jtaxLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.endsuspendfailed1");
- }
+ jtaxLogger.i18NLogger.warn_jtax_transaction_jts_endsuspendfailed1();
}
int res = subAct.doRollback();
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/jtaxI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/jtaxI18NLogger.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/jtaxI18NLogger.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -40,229 +40,217 @@
*/
@Message(id = 24001, value = "XA recovery committing {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_recovery_jts_orbspecific_commit(String arg0);
+ @LogMessage(level = INFO)
+ public void info_jtax_recovery_jts_orbspecific_commit(String arg0);
@Message(id = 24002, value = "XA recovery rolling back {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_recovery_jts_orbspecific_rollback(String arg0);
+ @LogMessage(level = INFO)
+ public void info_jtax_recovery_jts_orbspecific_rollback(String arg0);
- @Message(id = 24003, value = "{0} caught exception during construction: {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_consterror(String arg0, String arg1);
+// @Message(id = 24003, value = "{0} caught exception during construction: {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_jtax_resources_jts_orbspecific_consterror(String arg0, String arg1);
- @Message(id = 24004, value = "Caught the following error while trying to single phase complete resource {0}", format = MESSAGE_FORMAT)
+ @Message(id = 24004, value = "Caught the following error while trying to single phase complete resource", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_coperror(String arg0);
+ public void warn_jtax_resources_jts_orbspecific_coperror(Throwable arg0);
@Message(id = 24005, value = "Committing of resource state failed.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_createstate();
+ public void warn_jtax_resources_jts_orbspecific_createstate();
@Message(id = 24006, value = "{0} caused an error from resource {1} in transaction {2}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_generror(String arg0, String arg1, String arg2);
+ public void warn_jtax_resources_jts_orbspecific_generror(String arg0, String arg1, String arg2, Throwable arg3);
@Message(id = 24007, value = "You have chosen to disable the Multiple Last Resources warning. You will see it only once.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_lastResource_disableWarning();
+ public void warn_jtax_resources_jts_orbspecific_lastResource_disableWarning();
@Message(id = 24008, value = "Adding multiple last resources is disallowed. Current resource is {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_lastResource_disallow(String arg0);
+ public void warn_jtax_resources_jts_orbspecific_lastResource_disallow(String arg0);
@Message(id = 24009, value = "Multiple last resources have been added to the current transaction. This is transactionally unsafe and should not be relied upon. Current resource is {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_lastResource_multipleWarning(String arg0);
+ public void warn_jtax_resources_jts_orbspecific_lastResource_multipleWarning(String arg0);
@Message(id = 24010, value = "You have chosen to enable multiple last resources in the transaction manager. This is transactionally unsafe and should not be relied upon.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_lastResource_startupWarning();
+ public void warn_jtax_resources_jts_orbspecific_lastResource_startupWarning();
- @Message(id = 24011, value = "Reading state caught: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 24011, value = "Reading state caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_loadstateread(String arg0);
+ public void warn_jtax_resources_jts_orbspecific_loadstateread(Throwable arg0);
@Message(id = 24012, value = "Could not find new XAResource to use for recovering non-serializable XAResource {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_norecoveryxa(String arg0);
+ public void warn_jtax_resources_jts_orbspecific_norecoveryxa(String arg0);
@Message(id = 24013, value = "{0} caught NotPrepared exception during recovery phase!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_notprepared(String arg0);
+ public void warn_jtax_resources_jts_orbspecific_notprepared(String arg0);
@Message(id = 24014, value = "{0} - null or invalid transaction!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_nulltransaction(String arg0);
+ public void warn_jtax_resources_jts_orbspecific_nulltransaction(String arg0);
@Message(id = 24015, value = "XAResource prepare failed on resource {0} for transaction {1} with: {2}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_preparefailed(String arg0, String arg1, String arg2);
+ public void warn_jtax_resources_jts_orbspecific_preparefailed(String arg0, String arg1, String arg2, Throwable arg3);
- @Message(id = 24016, value = "Recovery of resource failed when trying to call {0} got: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 24016, value = "Recovery of resource failed when trying to call {0} got exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_recfailed(String arg0, String arg1);
+ public void warn_jtax_resources_jts_orbspecific_recfailed(String arg0, Throwable arg1);
- @Message(id = 24017, value = "Attempted shutdown of resource failed with:", format = MESSAGE_FORMAT)
+ @Message(id = 24017, value = "Attempted shutdown of resource failed with exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_remconn();
+ public void warn_jtax_resources_jts_orbspecific_remconn(Throwable arg0);
- @Message(id = 24018, value = "Exception on attempting to resource XAResource: {0}", format = MESSAGE_FORMAT)
+ @Message(id = 24018, value = "Exception on attempting to resource XAResource", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_restoreerror1(String arg0);
+ public void warn_jtax_resources_jts_orbspecific_restoreerror1(Throwable arg0);
- @Message(id = 24019, value = "Unexpected exception on attempting to resource XAResource: {0}", format = MESSAGE_FORMAT)
+ @Message(id = 24019, value = "Unexpected exception on attempting to resource XAResource", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_restoreerror2(String arg0);
+ public void warn_jtax_resources_jts_orbspecific_restoreerror2(Throwable arg0);
@Message(id = 24020, value = "Could not serialize a serializable XAResource!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_saveState();
+ public void warn_jtax_resources_jts_orbspecific_saveState();
- @Message(id = 24021, value = "{0} caught unexpected exception: {1} during recovery phase!", format = MESSAGE_FORMAT)
+ @Message(id = 24021, value = "{0} caught unexpected exception during recovery phase!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_unexpected(String arg0, String arg1);
+ public void warn_jtax_resources_jts_orbspecific_unexpected(String arg0, Throwable arg1);
@Message(id = 24022, value = "Updating of resource state failed.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_updatestate();
+ public void warn_jtax_resources_jts_orbspecific_updatestate();
@Message(id = 24023, value = "{0} caused an XA error: {1} from resource {2} in transaction {3}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_xaerror(String arg0, String arg1, String arg2, String arg3);
+ public void warn_jtax_resources_jts_orbspecific_xaerror(String arg0, String arg1, String arg2, String arg3, Throwable arg4);
@Message(id = 24024, value = "thread is already associated with a transaction and subtransaction support is not enabled!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_alreadyassociated();
+ public String get_jtax_transaction_jts_alreadyassociated();
- @Message(id = 24025, value = "Delist of resource failed with: {0}", format = MESSAGE_FORMAT)
+ @Message(id = 24025, value = "Delist of resource failed with exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_delistfailed(String arg0);
+ public void warn_jtax_transaction_jts_delistfailed(Throwable arg0);
@Message(id = 24026, value = "Ending suspended RMs failed when rolling back the transaction!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_endsuspendfailed1();
+ public void warn_jtax_transaction_jts_endsuspendfailed1();
@Message(id = 24027, value = "Ending suspended RMs failed when rolling back the transaction, but transaction rolled back.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_endsuspendfailed2();
+ public String get_jtax_transaction_jts_endsuspendfailed2();
@Message(id = 24028, value = "illegal resource state:", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_illegalstate();
+ public String get_jtax_transaction_jts_illegalstate();
@Message(id = 24029, value = "Transaction is not active.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_inactivetx();
+ public String get_jtax_transaction_jts_inactivetx();
- @Message(id = 24030, value = "invalid transaction!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_invalidtx();
+// @Message(id = 24030, value = "invalid transaction!", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_jtax_transaction_jts_invalidtx();
@Message(id = 24031, value = "Invalid transaction.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_invalidtx2();
+ public String get_jtax_transaction_jts_invalidtx2();
@Message(id = 24032, value = "Work already active!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_jca_busy();
+ public String get_jtax_transaction_jts_jca_busy();
- @Message(id = 24033, value = "failed to load Last Resource Optimisation Interface", format = MESSAGE_FORMAT)
+ @Message(id = 24033, value = "failed to load Last Resource Optimisation Interface {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_lastResourceOptimisationInterface();
+ public void warn_jtax_transaction_jts_lastResourceOptimisationInterface(String arg0, Throwable arg1);
@Message(id = 24034, value = "Could not enlist resource because the transaction is marked for rollback.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_markedrollback();
+ public String get_jtax_transaction_jts_markedrollback();
@Message(id = 24035, value = "No such transaction!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_nosuchtx();
+ public String get_jtax_transaction_jts_nosuchtx();
@Message(id = 24036, value = "Current transaction is not a TransactionImple", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_nottximple();
+ public void warn_jtax_transaction_jts_nottximple();
@Message(id = 24037, value = "no transaction!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_notx();
+ public String get_jtax_transaction_jts_notx();
@Message(id = 24038, value = "no transaction! Caught:", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_notxe();
+ public String get_jtax_transaction_jts_notxe();
- @Message(id = 24039, value = "No such transaction.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_nox();
+// @Message(id = 24039, value = "No such transaction.", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_jtax_transaction_jts_nox();
@Message(id = 24040, value = "paramater is null!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_nullparam();
+ public String get_jtax_transaction_jts_nullparam();
- @Message(id = 24041, value = "{0} could not register transaction: {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_regerror(String arg0, String arg1);
+// @Message(id = 24041, value = "{0} could not register transaction: {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_jtax_transaction_jts_regerror(String arg0, String arg1);
@Message(id = 24042, value = "is already suspended!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_ressusp();
+ public String get_jtax_transaction_jts_ressusp();
@Message(id = 24043, value = "An error occurred while checking if this is a new resource manager:", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_rmerror();
+ public void warn_jtax_transaction_jts_rmerror(Throwable arg0);
- @Message(id = 24044, value = "{0} could not mark the transaction as rollback only: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 24044, value = "{0} could not mark the transaction as rollback only", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_rollbackerror(String arg0, String arg1);
+ public void warn_jtax_transaction_jts_rollbackerror(String arg0, Throwable arg1);
- @Message(id = 24045, value = "setRollbackOnly called from:", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_setrollback();
+// @Message(id = 24045, value = "setRollbackOnly called from:", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_jtax_transaction_jts_setrollback();
@Message(id = 24046, value = "{0} returned XA error {1} for transaction {2}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_starterror(String arg0, String arg1, String arg2);
+ public void warn_jtax_transaction_jts_starterror(String arg0, String arg1, String arg2, Throwable arg3);
- @Message(id = 24047, value = "Not allowed to terminate subordinate transaction directly.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_subordinate_invalidstate();
+// @Message(id = 24047, value = "Not allowed to terminate subordinate transaction directly.", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_jtax_transaction_jts_subordinate_invalidstate();
@Message(id = 24048, value = "Synchronizations are not allowed!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_syncerror();
+ public String get_jtax_transaction_jts_syncerror();
@Message(id = 24049, value = "cleanup synchronization failed to register:", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_syncproblem();
+ public void warn_jtax_transaction_jts_syncproblem(Throwable arg0);
@Message(id = 24050, value = "The transaction implementation threw a RollbackException", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_syncrollbackexception();
+ public String get_jtax_transaction_jts_syncrollbackexception();
@Message(id = 24051, value = "The transaction implementation threw a SystemException", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_systemexception();
+ public String get_jtax_transaction_jts_systemexception();
@Message(id = 24052, value = "Active thread error:", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_threaderror();
+ public void warn_jtax_transaction_jts_threaderror(Throwable arg0);
@Message(id = 24053, value = "{0} attempt to delist unknown resource!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_unknownres(String arg0);
+ public void warn_jtax_transaction_jts_unknownres(String arg0);
@Message(id = 24054, value = "The current transaction does not match this transaction!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_wrongstatetx();
+ public String get_jtax_transaction_jts_wrongstatetx();
@Message(id = 24055, value = "Could not call end on a suspended resource!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_xaenderror();
+ public void warn_jtax_transaction_jts_xaenderror();
@Message(id = 24056, value = "{0} caught XA exception: {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_jta_transaction_jts_xaerror(String arg0, String arg1);
+ public void warn_jtax_transaction_jts_xaerror(String arg0, String arg1, Throwable arg2);
+ @Message(id = 24057, value = "{0} setTransactionTimeout on XAResource {2} threw: {1}", format = MESSAGE_FORMAT)
+ @LogMessage(level = WARN)
+ public void warn_jtax_transaction_jts_timeouterror(String arg0, String arg1, String arg2, Throwable arg3);
+
/*
Allocate new messages directly above this notice.
- id: use the next id number in sequence. Don't reuse ids.
@@ -271,5 +259,7 @@
- value: default (English) version of the log message.
- level: according to severity semantics defined at http://docspace.corp.redhat.com/docs/DOC-30217
Debug and trace don't get i18n. Everything else MUST be i18n.
- */
+ By convention methods with String return type have prefix get_,
+ all others are log methods and have prefix <level>_
+ */
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/jtaxI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/jtaxI18NLoggerImpl.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/jtaxI18NLoggerImpl.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -20,8 +20,10 @@
*/
package com.arjuna.ats.internal.jta.utils;
-import com.arjuna.common.util.logging.Logi18n;
+import org.jboss.logging.Logger;
+import static org.jboss.logging.Logger.Level.*;
+
/**
* i18n log messages for the jtax module.
* This class is autogenerated. Don't mess with it.
@@ -30,346 +32,213 @@
*/
public class jtaxI18NLoggerImpl implements jtaxI18NLogger {
- private final Logi18n logi18n;
+ private final Logger logger;
- jtaxI18NLoggerImpl(Logi18n logi18n) {
- this.logi18n = logi18n;
- }
+ jtaxI18NLoggerImpl(Logger logger) {
+ this.logger = logger;
+ }
- public void log_com_arjuna_ats_internal_jta_recovery_jts_orbspecific_commit(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.jts.orbspecific.commit", new Object[] {arg0});
- }
- }
+ public void info_jtax_recovery_jts_orbspecific_commit(String arg0) {
+ logger.logv(INFO, "ARJUNA-24001 XA recovery committing {0}", arg0);
+ }
- public void log_com_arjuna_ats_internal_jta_recovery_jts_orbspecific_rollback(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.jts.orbspecific.rollback", new Object[] {arg0});
- }
- }
+ public void info_jtax_recovery_jts_orbspecific_rollback(String arg0) {
+ logger.logv(INFO, "ARJUNA-24002 XA recovery rolling back {0}", arg0);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_consterror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.consterror", new Object[] {arg0, arg1});
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_coperror(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-24004 Caught the following error while trying to single phase complete resource", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_coperror(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.coperror", new Object[] {arg0});
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_createstate() {
+ logger.logv(WARN, "ARJUNA-24005 Committing of resource state failed.", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_createstate() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.createstate");
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_generror(String arg0, String arg1, String arg2, Throwable arg3) {
+ logger.logv(WARN, arg3, "ARJUNA-24006 {0} caused an error from resource {1} in transaction {2}", arg0, arg1, arg2);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_generror(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.generror", new Object[] {arg0, arg1, arg2});
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_lastResource_disableWarning() {
+ logger.logv(WARN, "ARJUNA-24007 You have chosen to disable the Multiple Last Resources warning. You will see it only once.", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_lastResource_disableWarning() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.disableWarning");
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_lastResource_disallow(String arg0) {
+ logger.logv(WARN, "ARJUNA-24008 Adding multiple last resources is disallowed. Current resource is {0}", arg0);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_lastResource_disallow(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.disallow", new Object[] {arg0});
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_lastResource_multipleWarning(String arg0) {
+ logger.logv(WARN, "ARJUNA-24009 Multiple last resources have been added to the current transaction. This is transactionally unsafe and should not be relied upon. Current resource is {0}", arg0);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_lastResource_multipleWarning(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.multipleWarning", new Object[] {arg0});
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_lastResource_startupWarning() {
+ logger.logv(WARN, "ARJUNA-24010 You have chosen to enable multiple last resources in the transaction manager. This is transactionally unsafe and should not be relied upon.", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_lastResource_startupWarning() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.lastResource.startupWarning");
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_loadstateread(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-24011 Reading state caught exception", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_loadstateread(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.loadstateread", new Object[] {arg0});
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_norecoveryxa(String arg0) {
+ logger.logv(WARN, "ARJUNA-24012 Could not find new XAResource to use for recovering non-serializable XAResource {0}", arg0);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_norecoveryxa(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.norecoveryxa", new Object[] {arg0});
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_notprepared(String arg0) {
+ logger.logv(WARN, "ARJUNA-24013 {0} caught NotPrepared exception during recovery phase!", arg0);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_notprepared(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.notprepared", new Object[] {arg0});
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_nulltransaction(String arg0) {
+ logger.logv(WARN, "ARJUNA-24014 {0} - null or invalid transaction!", arg0);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_nulltransaction(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.nulltransaction", new Object[] {arg0});
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_preparefailed(String arg0, String arg1, String arg2, Throwable arg3) {
+ logger.logv(WARN, arg3, "ARJUNA-24015 XAResource prepare failed on resource {0} for transaction {1} with: {2}", arg0, arg1, arg2);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_preparefailed(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.preparefailed", new Object[] {arg0, arg1, arg2});
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_recfailed(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-24016 Recovery of resource failed when trying to call {0} got exception", arg0);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_recfailed(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.recfailed", new Object[] {arg0, arg1});
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_remconn(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-24017 Attempted shutdown of resource failed with exception", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_remconn() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.remconn");
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_restoreerror1(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-24018 Exception on attempting to resource XAResource", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_restoreerror1(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.restoreerror1", new Object[] {arg0});
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_restoreerror2(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-24019 Unexpected exception on attempting to resource XAResource", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_restoreerror2(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.restoreerror2", new Object[] {arg0});
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_saveState() {
+ logger.logv(WARN, "ARJUNA-24020 Could not serialize a serializable XAResource!", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_saveState() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.saveState");
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_unexpected(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-24021 {0} caught unexpected exception during recovery phase!", arg0);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_unexpected(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.unexpected", new Object[] {arg0, arg1});
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_updatestate() {
+ logger.logv(WARN, "ARJUNA-24022 Updating of resource state failed.", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_updatestate() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.updatestate");
- }
- }
+ public void warn_jtax_resources_jts_orbspecific_xaerror(String arg0, String arg1, String arg2, String arg3, Throwable arg4) {
+ logger.logv(WARN, arg4, "ARJUNA-24023 {0} caused an XA error: {1} from resource {2} in transaction {3}", arg0, arg1, arg2, arg3);
+ }
- public void log_com_arjuna_ats_internal_jta_resources_jts_orbspecific_xaerror(String arg0, String arg1, String arg2, String arg3) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.jts.orbspecific.xaerror", new Object[] {arg0, arg1, arg2, arg3});
- }
- }
+ public String get_jtax_transaction_jts_alreadyassociated() {
+ return "ARJUNA-24024 thread is already associated with a transaction and subtransaction support is not enabled!";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_alreadyassociated() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.alreadyassociated");
- }
- }
+ public void warn_jtax_transaction_jts_delistfailed(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-24025 Delist of resource failed with exception", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_delistfailed(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.delistfailed", new Object[] {arg0});
- }
- }
+ public void warn_jtax_transaction_jts_endsuspendfailed1() {
+ logger.logv(WARN, "ARJUNA-24026 Ending suspended RMs failed when rolling back the transaction!", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_endsuspendfailed1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.endsuspendfailed1");
- }
- }
+ public String get_jtax_transaction_jts_endsuspendfailed2() {
+ return "ARJUNA-24027 Ending suspended RMs failed when rolling back the transaction, but transaction rolled back.";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_endsuspendfailed2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.endsuspendfailed2");
- }
- }
+ public String get_jtax_transaction_jts_illegalstate() {
+ return "ARJUNA-24028 illegal resource state:";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_illegalstate() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.illegalstate");
- }
- }
+ public String get_jtax_transaction_jts_inactivetx() {
+ return "ARJUNA-24029 Transaction is not active.";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_inactivetx() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.inactivetx");
- }
- }
+ public String get_jtax_transaction_jts_invalidtx2() {
+ return "ARJUNA-24031 Invalid transaction.";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_invalidtx() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.invalidtx");
- }
- }
+ public String get_jtax_transaction_jts_jca_busy() {
+ return "ARJUNA-24032 Work already active!";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_invalidtx2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.invalidtx2");
- }
- }
+ public void warn_jtax_transaction_jts_lastResourceOptimisationInterface(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-24033 failed to load Last Resource Optimisation Interface {0}", arg0);
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_jca_busy() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.jca.busy");
- }
- }
+ public String get_jtax_transaction_jts_markedrollback() {
+ return "ARJUNA-24034 Could not enlist resource because the transaction is marked for rollback.";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_lastResourceOptimisationInterface() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.lastResourceOptimisationInterface");
- }
- }
+ public String get_jtax_transaction_jts_nosuchtx() {
+ return "ARJUNA-24035 No such transaction!";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_markedrollback() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.markedrollback");
- }
- }
+ public void warn_jtax_transaction_jts_nottximple() {
+ logger.logv(WARN, "ARJUNA-24036 Current transaction is not a TransactionImple", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_nosuchtx() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.nosuchtx");
- }
- }
+ public String get_jtax_transaction_jts_notx() {
+ return "ARJUNA-24037 no transaction!";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_nottximple() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.nottximple");
- }
- }
+ public String get_jtax_transaction_jts_notxe() {
+ return "ARJUNA-24038 no transaction! Caught:";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_notx() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.notx");
- }
- }
+ public String get_jtax_transaction_jts_nullparam() {
+ return "ARJUNA-24040 paramater is null!";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_notxe() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.notxe");
- }
- }
+ public String get_jtax_transaction_jts_ressusp() {
+ return "ARJUNA-24042 is already suspended!";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_nox() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.nox");
- }
- }
+ public void warn_jtax_transaction_jts_rmerror(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-24043 An error occurred while checking if this is a new resource manager:", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_nullparam() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.nullparam");
- }
- }
+ public void warn_jtax_transaction_jts_rollbackerror(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-24044 {0} could not mark the transaction as rollback only", arg0);
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_regerror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.regerror", new Object[] {arg0, arg1});
- }
- }
+ public void warn_jtax_transaction_jts_starterror(String arg0, String arg1, String arg2, Throwable arg3) {
+ logger.logv(WARN, arg3, "ARJUNA-24046 {0} returned XA error {1} for transaction {2}", arg0, arg1, arg2);
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_ressusp() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.ressusp");
- }
- }
+ public String get_jtax_transaction_jts_syncerror() {
+ return "ARJUNA-24048 Synchronizations are not allowed!";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_rmerror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.rmerror");
- }
- }
+ public void warn_jtax_transaction_jts_syncproblem(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-24049 cleanup synchronization failed to register:", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_rollbackerror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.rollbackerror", new Object[] {arg0, arg1});
- }
- }
+ public String get_jtax_transaction_jts_syncrollbackexception() {
+ return "ARJUNA-24050 The transaction implementation threw a RollbackException";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_setrollback() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.setrollback");
- }
- }
+ public String get_jtax_transaction_jts_systemexception() {
+ return "ARJUNA-24051 The transaction implementation threw a SystemException";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_starterror(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.starterror", new Object[] {arg0, arg1, arg2});
- }
- }
+ public void warn_jtax_transaction_jts_threaderror(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-24052 Active thread error:", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_subordinate_invalidstate() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.subordinate.invalidstate");
- }
- }
+ public void warn_jtax_transaction_jts_unknownres(String arg0) {
+ logger.logv(WARN, "ARJUNA-24053 {0} attempt to delist unknown resource!", arg0);
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_syncerror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.syncerror");
- }
- }
+ public String get_jtax_transaction_jts_wrongstatetx() {
+ return "ARJUNA-24054 The current transaction does not match this transaction!";
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_syncproblem() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.syncproblem");
- }
- }
+ public void warn_jtax_transaction_jts_xaenderror() {
+ logger.logv(WARN, "ARJUNA-24055 Could not call end on a suspended resource!", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_syncrollbackexception() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.syncrollbackexception");
- }
- }
+ public void warn_jtax_transaction_jts_xaerror(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-24056 {0} caught XA exception: {1}", arg0, arg1);
+ }
- public void log_com_arjuna_ats_internal_jta_transaction_jts_systemexception() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.systemexception");
- }
+ public void warn_jtax_transaction_jts_timeouterror(String arg0, String arg1, String arg2, Throwable arg3) {
+ logger.logv(WARN, arg3, "ARJUNA-24057 {0} setTransactionTimeout on XAResource {2} threw: {1}", arg0, arg1, arg2);
}
-
- public void log_com_arjuna_ats_internal_jta_transaction_jts_threaderror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.threaderror");
- }
- }
-
- public void log_com_arjuna_ats_internal_jta_transaction_jts_unknownres(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.unknownres", new Object[] {arg0});
- }
- }
-
- public void log_com_arjuna_ats_internal_jta_transaction_jts_wrongstatetx() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.wrongstatetx");
- }
- }
-
- public void log_com_arjuna_ats_internal_jta_transaction_jts_xaenderror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.xaenderror");
- }
- }
-
- public void log_com_arjuna_ats_internal_jta_transaction_jts_xaerror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.jts.xaerror", new Object[] {arg0, arg1});
- }
- }
-
}
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-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/utils/jtaxLogger.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -23,6 +23,7 @@
import com.arjuna.common.util.logging.LogFactory;
import com.arjuna.common.util.logging.LogNoi18n;
import com.arjuna.common.util.logging.Logi18n;
+import org.jboss.logging.Logger;
/**
* @author Jonathan Halliday (jonathan.halliday at redhat.com), 2010-01
@@ -30,14 +31,12 @@
public class jtaxLogger
{
public static LogNoi18n logger;
- public static Logi18n loggerI18N;
public static jtaxI18NLogger i18NLogger;
public static void initialize(LogNoi18n noi18n, Logi18n i18n)
{
logger = noi18n;
- loggerI18N = i18n;
- i18NLogger = new jtaxI18NLoggerImpl(i18n);
+ i18NLogger = new jtaxI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.jtax"));
}
static
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ChildOA.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ChildOA.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ChildOA.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -107,10 +107,7 @@
}
catch (Exception e)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn("com.arjuna.orbportability.OA.exceptioncaughtforobj", new Object[] { "objectIsReady", obj, e.toString() });
- }
+ opLogger.i18NLogger.warn_OA_exceptioncaughtforobj("objectIsReady", obj.toString(), e);
return false;
}
@@ -137,10 +134,7 @@
if (invalidPOA)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.OA.invalidpoa" , new Object[] { "objectIsReady", "rootPOA"});
- }
+ opLogger.i18NLogger.warn_OA_invalidpoa("objectIsReady", "rootPOA");
result = false;
}
@@ -149,10 +143,7 @@
}
catch (Exception e)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn ( "com.arjuna.orbportability.OA.exceptioncaughtforobj", new Object[] { "objectIsReady", obj, e.toString() });
- }
+ opLogger.i18NLogger.warn_OA_exceptioncaughtforobj("objectIsReady", obj.toString(), e);
result = false;
}
@@ -180,20 +171,14 @@
if (invalidPOA)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.OA.invalidpoa" , new Object[] { "objectIsReady", "childPOA" });
- }
+ opLogger.i18NLogger.warn_OA_invalidpoa("objectIsReady", "childPOA");
result = false;
}
}
catch (Exception e)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.OA.caughtexception" , new Object[] { "objectIsReady", e.toString() });
- }
+ opLogger.i18NLogger.warn_OA_caughtexception("objectIsReady", e);
result = false;
}
@@ -219,10 +204,7 @@
if (invalidPOA)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.OA.invalidpoa" , new Object[] { "shutdownObject", "childPOA" });
- }
+ opLogger.i18NLogger.warn_OA_invalidpoa("shutdownObject", "childPOA");
result = false;
}
@@ -236,10 +218,7 @@
}
catch (Exception e)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.OA.caughtexception" , new Object[] { "shutdownObject", e.toString() });
- }
+ opLogger.i18NLogger.warn_OA_caughtexception("shutdownObject", e);
result = false;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -172,13 +172,6 @@
postInit = null;
}
- /**
- * @message com.arjuna.orbportability.OA.caughtexception {0} caught: {1} whilst initialising Object Adapter.
- * @message com.arjuna.orbportability.OA.uninitialsedorb OA.initPOA called
- * without initialised ORB.
- * @message com.arjuna.orbportability.OA.initialize {0} caught org.omg.CORBA.INITIALIZE whilst initialising Object Adapter. Check another ORB/service is not active on same port.
- */
-
public synchronized void initPOA (String[] args) throws InvalidName,
SystemException
{
@@ -200,24 +193,14 @@
}
catch (final org.omg.CORBA.INITIALIZE ex)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn(
- "com.arjuna.orbportability.OA.initialize");
- }
+ opLogger.i18NLogger.warn_OA_initialize();
throw ex;
}
catch (final Exception e)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn(
- "com.arjuna.orbportability.OA.caughtexception",
- new Object[]
- { "OA.initPOA", e.toString() });
- }
-
+ opLogger.i18NLogger.warn_OA_caughtexception("OA.initPOA", e);
+
throw new FatalError("OA.initPOA: "+e.toString());
}
@@ -227,24 +210,11 @@
}
else
{
- if (opLogger.loggerI18N.isFatalEnabled())
- {
- opLogger.loggerI18N
- .fatal("com.arjuna.orbportability.OA.uninitialsedorb");
- }
-
- throw new FatalError(
- opLogger.loggerI18N
- .getString("com.arjuna.orbportability.OA.uninitialsedorb"));
+ throw new FatalError( opLogger.i18NLogger.get_OA_uninitialsedorb() );
}
}
}
- /**
- * @message com.arjuna.orbportability.OA.oanotinitialised OA.createPOA -
- * createPOA called without OA being initialised
- */
-
public synchronized ChildOA createPOA (String adapterName, Policy[] policies)
throws AdapterAlreadyExists, InvalidPolicy, AdapterInactive
{
@@ -255,11 +225,7 @@
if (!_oa.initialised())
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N
- .warn("com.arjuna.orbportability.OA.oanotinitialised");
- }
+ opLogger.i18NLogger.warn_OA_oanotinitialised();
throw new AdapterInactive();
}
@@ -379,16 +345,10 @@
/**
* Register the object with the ORB.
- *
- * @message com.arjuna.orbportability.OA.exceptioncaughtforobj {0}:
- * exception caught for {1} : {2}
*/
public abstract boolean objectIsReady (Servant obj, byte[] id)
throws SystemException;
- /**
- * @message com.arjuna.orbportability.OA.invalidpoa {0} - invalid POA: {1}
- */
public abstract boolean objectIsReady (Servant obj) throws SystemException;
/**
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORB.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORB.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORB.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -55,8 +55,6 @@
* @author Mark Little (mark at arjuna.com), Richard Begg (richard.begg at arjuna.com)
* @version $Id: ORB.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.0.
- *
- * @message com.arjuna.orbportability.ORB.caughtexception {0} caught exception: {1}
*/
public class ORB
@@ -157,9 +155,6 @@
/**
* Initialise the ORB.
- *
- * @message com.arjuna.orbportability.ORB.invalidorbconfig The ORB configuration specified in {0} is invalid: {1}
- * @message com.arjuna.orbportability.ORB.cannotfinddefaultorbconfig Cannot find default ORB configuration file {0} in the classpath
*/
public synchronized void initORB (String[] s, Properties p) throws SystemException
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -156,10 +156,6 @@
private static ORBData _theData = null;
private static SimpleXMLParser _xml = null;
- /**
- * @message com.arjuna.orbportability.ORBInfo.unsupportedorb ORBInfo ORB specific class creation failed - unable to find supported ORB
- * @message com.arjuna.orbportability.ORBInfo.creationfailed ORBInfo ORB specific class creation failed with {0}
- */
private static final String _versionPackage = "com.arjuna.orbportability.internal.orbspecific.versions";
static
@@ -182,12 +178,9 @@
}
catch (ClassNotFoundException joe)
{
- if (opLogger.loggerI18N.isFatalEnabled())
- {
- opLogger.loggerI18N.fatal( "com.arjuna.orbportability.ORBInfo.unsupportedorb", joe);
- }
+ opLogger.i18NLogger.fatal_ORBInfo_unsupportedorb(joe);
- throw new ExceptionInInitializerError( opLogger.loggerI18N.getString("com.arjuna.orbportability.ORBInfo.unsupportedorb"));
+ throw new ExceptionInInitializerError( joe );
}
}
@@ -202,15 +195,9 @@
catch (Exception e)
{
- if (opLogger.loggerI18N.isFatalEnabled())
- {
- opLogger.loggerI18N.fatal( "com.arjuna.orbportability.ORBInfo.creationfailed",
- new Object[] { e } );
- }
+ opLogger.i18NLogger.fatal_ORBInfo_creationfailed(e);
- throw new ExceptionInInitializerError(
- MessageFormat.format(opLogger.loggerI18N.getString("com.arjuna.orbportability.ORBInfo.creationfailed"),
- new Object[] { e } ));
+ throw new ExceptionInInitializerError( e );
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/RootOA.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/RootOA.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/RootOA.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -139,10 +139,7 @@
}
catch (Exception e)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn("com.arjuna.orbportability.OA.exceptioncaughtforobj", new Object[] { "objectIsReady", obj, e.toString() });
- }
+ opLogger.i18NLogger.warn_OA_exceptioncaughtforobj("objectIsReady", obj.toString(), e);
return false;
}
@@ -171,10 +168,7 @@
if (invalidPOA)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.OA.invalidpoa" , new Object[] { "objectIsReady", "rootPOA" });
- }
+ opLogger.i18NLogger.warn_OA_invalidpoa("objectIsReady", "rootPOA");
result = false;
}
@@ -185,10 +179,7 @@
}
catch (Exception e)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn ( "com.arjuna.orbportability.OA.exceptioncaughtforobj", new Object[] { "objectIsReady", obj, e.toString() });
- }
+ opLogger.i18NLogger.warn_OA_exceptioncaughtforobj("objectIsReady", obj.toString(), e);
result = false;
}
@@ -217,20 +208,14 @@
if (invalidPOA)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.OA.invalidpoa" , new Object[] { "objectIsReady", "rootPOA" });
- }
+ opLogger.i18NLogger.warn_OA_invalidpoa("objectIsReady", "rootPOA");
result = false;
}
}
catch (Exception e)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.OA.caughtexception" , new Object[] { "objectIsReady", e.toString() });
- }
+ opLogger.i18NLogger.warn_OA_caughtexception("objectIsReady", e);
result = false;
}
@@ -257,10 +242,7 @@
if (invalidPOA)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.OA.invalidpoa" , new Object[] { "shutdownObject", "rootPOA" });
- }
+ opLogger.i18NLogger.warn_OA_invalidpoa("shutdownObject", "rootPOA");
result = false;
}
@@ -274,10 +256,7 @@
}
catch (Exception e)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.OA.caughtexception" , new Object[] { "shutdownObject", e.toString() });
- }
+ opLogger.i18NLogger.warn_OA_caughtexception("shutdownObject", e);
result = false;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/Services.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/Services.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/Services.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -116,13 +116,6 @@
}
}
- /**
- * @message com.arjuna.orbportability.Services.resolvereffailed Services.getService - resolve_initial_references on {0} failed: {1}
- * @message com.arjuna.orbportability.Services.openfailure {0} - could not open config file: {1}
- * @message com.arjuna.orbportability.Services.unexpectedexception {0} - caught unexpected exception: {1}
- * @message com.arjuna.orbportability.Services.servicenotfound Services.getService - could not find service: {0} in configuration file: {1}
- * @message com.arjuna.orbportability.Services.unsupportedoption Services.getService - {0} option not supported by ORB.
- */
public org.omg.CORBA.Object getService (String serviceName,
Object[] params,
int mechanism) throws org.omg.CORBA.ORBPackage.InvalidName, IOException, SystemException
@@ -147,11 +140,12 @@
}
catch (Exception e)
{
- if (opLogger.loggerI18N.isDebugEnabled())
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.Services.resolvereffailed", new Object[] { serviceName, e } );
- }
+ if (opLogger.logger.isDebugEnabled())
+ {
+ opLogger.logger.debug("Services.getService - resolve_initial_references on "+serviceName+" failed: "+e.toString());
+ }
+
throw new InvalidName();
}
}
@@ -196,10 +190,10 @@
}
catch (FileNotFoundException e)
{
- if ( opLogger.loggerI18N.isDebugEnabled() )
- {
- opLogger.loggerI18N.debug( "com.arjuna.orbportability.Services.openfailure", new Object[] { "Services.getService", configFile } );
- }
+ if ( opLogger.logger.isDebugEnabled() )
+ {
+ opLogger.logger.debug("Services.getService could not open config file "+configFile);
+ }
throw new InvalidName();
}
@@ -234,11 +228,7 @@
}
catch (Exception e)
{
- if ( opLogger.loggerI18N.isWarnEnabled() )
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.Services.unexpectedexception",
- new Object[] { "Services.getService", e } );
- }
+ opLogger.i18NLogger.warn_Services_unexpectedexception("Services.getService", e);
input.close();
throw new UNKNOWN();
@@ -246,11 +236,7 @@
if (ior == null)
{
- if ( opLogger.loggerI18N.isWarnEnabled() )
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.Services.servicenotfound",
- new Object[] { serviceName, configFile } );
- }
+ opLogger.i18NLogger.warn_Services_servicenotfound(serviceName, configFile);
throw new InvalidName();
}
@@ -303,11 +289,7 @@
break;
case NAMED_CONNECT:
{
- if ( opLogger.loggerI18N.isWarnEnabled() )
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.Services.unsupportedoption",
- new Object[] { "NAMED_CONNECT" } );
- }
+ opLogger.i18NLogger.warn_Services_unsupportedoption("NAMED_CONNECT");
throw new BAD_PARAM();
}
@@ -343,9 +325,6 @@
}
}
- /**
- * @message com.arjuna.orbportability.Services.optionnotsupported {0} - {1} option not supported by ORB.
- */
public void registerService (org.omg.CORBA.Object objRef,
String serviceName, Object[] params,
int mechanism) throws org.omg.CORBA.ORBPackage.InvalidName, IOException, SystemException
@@ -404,11 +383,10 @@
}
catch (FileNotFoundException e)
{
- if ( opLogger.loggerI18N.isDebugEnabled() )
- {
- opLogger.loggerI18N.debug( "com.arjuna.orbportability.Services.openfailure",
- new Object[] { "Services.registerService", configFile } );
- }
+ if ( opLogger.logger.isDebugEnabled() )
+ {
+ opLogger.logger.debug("Services.registerService could not open config file "+configFile);
+ }
currFile = null;
input = null;
@@ -507,11 +485,7 @@
break;
case NAMED_CONNECT:
{
- if ( opLogger.loggerI18N.isWarnEnabled() )
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.Services.optionnotsupported",
- new Object[] { "Services.registerService", "NAMED_CONNECT" } );
- }
+ opLogger.i18NLogger.warn_Services_optionnotsupported("Services.registerService", "NAMED_CONNECT");
throw new BAD_PARAM();
}
@@ -528,8 +502,6 @@
*
* getService/setService for INITIAL_REFERENCES could default to
* config file if not supported. Transparently.
- *
- * @message com.arjuna.orbportability.Services.suspectentry {0} Suspect entry in configuration file: {1}
*/
public final String[] listInitialServices () throws IOException, SystemException
@@ -580,11 +552,7 @@
}
else
{
- if ( opLogger.loggerI18N.isWarnEnabled() )
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.Services.suspectentry",
- new Object[] { "Services.listInitialServices", line } );
- }
+ opLogger.i18NLogger.warn_Services_suspectentry("Services.listInitialServices", line);
}
}
}
@@ -691,16 +659,12 @@
/**
* @return the default bind mechanism. TODO
- * @message com.arjuna.orbportability.common.Configuration.bindDefault.invalidbind {0} - invalid bind mechanism in properties file
*/
private static synchronized final int bindDefault ()
{
if (_bindMethod == -1)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn("com.arjuna.orbportability.common.Configuration.bindDefault.invalidbind", new Object[] { "com.arjuna.orbportability.common.Configuration.bindDefault()" } );
- }
+ opLogger.i18NLogger.warn_common_Configuration_bindDefault_invalidbind("com.arjuna.orbportability.common.Configuration.bindDefault()");
}
return _bindMethod;
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/event/EventManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/event/EventManager.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/event/EventManager.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -64,7 +64,6 @@
/**
* The object has been connected to the ORB.
- * @message com.arjuna.orbportability.event.EventManager.forhandlethrewexception {0} - for: {1} threw: {2}
*/
public void connected (org.omg.CORBA.Object obj)
@@ -81,12 +80,8 @@
}
catch (Throwable ex)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.event.EventManager.forhandlethrewexception",
- new java.lang.Object[] { "com.arjuna.orbportability.event.EventManager.connected()",
- h.name(), ex } );
- }
+ opLogger.i18NLogger.warn_event_EventManager_forhandlethrewexception(
+ "com.arjuna.orbportability.event.EventManager.connected()", h.name(), ex);
}
}
}
@@ -109,12 +104,8 @@
}
catch (Throwable ex)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.event.EventManager.forhandlethrewexception",
- new java.lang.Object[] { "com.arjuna.orbportability.event.EventManager.disconnected(Object)",
- h.name(), ex } );
- }
+ opLogger.i18NLogger.warn_event_EventManager_forhandlethrewexception(
+ "com.arjuna.orbportability.event.EventManager.disconnected(Object)", h.name(), ex);
}
}
}
@@ -161,10 +152,6 @@
return _theManager;
}
- /**
- * @message com.arjuna.orbportability.event.EventManager.caughtexceptionfor {0} - caught exception: {1} for {2}
- * @message com.arjuna.orbportability.event.EventManager.novalue {0} - no value for: {1}
- */
protected EventManager ()
{
_handlers = new Hashtable();
@@ -181,11 +168,7 @@
}
catch (Exception ex)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.event.EventManager.caughtexceptionfor",
- new java.lang.Object[] { "EventManager", ex, handlerName } );
- }
+ opLogger.i18NLogger.warn_event_EventManager_caughtexceptionfor("EventManager", handlerName, ex);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/jacorb/oa/implementations/jacorb_2_0.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/jacorb/oa/implementations/jacorb_2_0.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/jacorb/oa/implementations/jacorb_2_0.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -41,26 +41,13 @@
public class jacorb_2_0 extends POABase
{
-
- /**
- * @message
- * com.arjuna.orbportability.internal.orbspecific.jacorb.oa.implementations
- * .jacorb_2_0.norootoa {0} called without root POA.
- */
public void createPOA (String adapterName, Policy[] policies)
throws AdapterAlreadyExists, InvalidPolicy, AdapterInactive,
SystemException
{
if (_poa == null)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N
- .warn(
- "com.arjuna.orbportability.internal.orbspecific.jacorb.oa.implementations.jacorb_2_0.norootoa",
- new Object[]
- { "jacorb_2_0.createPOA" });
- }
+ opLogger.i18NLogger.warn_internal_orbspecific_oa_implementations("jacorb_2_0.createPOA");
throw new AdapterInactive();
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/javaidl/oa/implementations/javaidl_1_4.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/javaidl/oa/implementations/javaidl_1_4.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/javaidl/oa/implementations/javaidl_1_4.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -49,11 +49,7 @@
{
if (_poa == null)
{
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn("com.arjuna.orbportability.internal.orbspecific.javaidl.oa.implementations.javaidl_1_4.norootoa",
- new Object[]{"javaidl_1_4.createPOA"});
- }
+ opLogger.i18NLogger.warn_internal_orbspecific_oa_implementations("javaidl_1_4.createPOA");
throw new AdapterInactive();
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/utils/InitLoader.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/utils/InitLoader.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/utils/InitLoader.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -71,21 +71,11 @@
}
}
- /**
- * @message com.arjuna.orbportability.internal.utils.InitLoader.initfailed {0} - attempt to initialise {1} with null class name!
- * @message com.arjuna.orbportability.internal.utils.InitLoader.couldnotfindclass {0} - could not find class {1}
- * @message com.arjuna.orbportability.internal.utils.InitLoader.loading Loading {0} class - {1}
- * @message com.arjuna.orbportability.internal.utils.InitLoader.exception Exception {0} whilst loading {1}
- */
private void createInstance (String attrName, String className)
{
if (className == null)
{
- if ( opLogger.loggerI18N.isWarnEnabled() )
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.internal.utils.InitLoader.initfailed",
- new Object[] { initName, attrName } );
- }
+ opLogger.i18NLogger.warn_internal_utils_InitLoader_initfailed(initName, attrName);
return;
}
@@ -93,11 +83,7 @@
{
try
{
- if ( opLogger.loggerI18N.isInfoEnabled() )
- {
- opLogger.loggerI18N.info( "com.arjuna.orbportability.internal.utils.InitLoader.loading",
- new Object[] { initName, className } );
- }
+ opLogger.i18NLogger.warn_internal_utils_InitLoader_loading(initName, className);
Class c = Thread.currentThread().getContextClassLoader().loadClass(className);
@@ -114,28 +100,18 @@
}
catch (IllegalAccessException e1)
{
- if ( opLogger.loggerI18N.isWarnEnabled() )
- {
- opLogger.loggerI18N.warn("com.arjuna.orbportability.internal.utils.InitLoader.exception", new Object[] {e1.toString(), initName}, e1);
- }
+ opLogger.i18NLogger.warn_internal_utils_InitLoader_exception(initName, e1);
}
catch (InstantiationException e2)
{
- if ( opLogger.loggerI18N.isWarnEnabled() )
- {
- opLogger.loggerI18N.warn("com.arjuna.orbportability.internal.utils.InitLoader.exception", new Object[] {e2.toString(), initName}, e2);
- }
+ opLogger.i18NLogger.warn_internal_utils_InitLoader_exception(initName, e2);
}
c = null;
}
catch (ClassNotFoundException e)
{
- if ( opLogger.loggerI18N.isWarnEnabled() )
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.internal.utils.InitLoader.couldnotfindclass",
- new Object[] { initName, className } );
- }
+ opLogger.i18NLogger.warn_internal_utils_InitLoader_couldnotfindclass(initName, className);
}
}
}
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-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/opLogger.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -22,18 +22,17 @@
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 Logi18n loggerI18N;
public static orbportabilityI18NLogger i18NLogger;
public static void initialize(LogNoi18n noi18n, Logi18n i18n)
{
logger = noi18n;
- loggerI18N = i18n;
- i18NLogger = new orbportabilityI18NLoggerImpl(i18n);
+ i18NLogger =new orbportabilityI18NLoggerImpl(Logger.getLogger("com.arjuna.orbportability"));
}
static
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLogger.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLogger.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -21,6 +21,7 @@
package com.arjuna.orbportability.logging;
import org.jboss.logging.*;
+
import static org.jboss.logging.Logger.Level.*;
import static org.jboss.logging.Message.Format.*;
@@ -39,129 +40,127 @@
Allocate new messages by following instructions at the bottom of the file.
*/
- @Message(id = 21001, value = "{0} caught: {1} whilst initialising Object Adapter.", format = MESSAGE_FORMAT)
+ @Message(id = 21001, value = "{0} caught exception whilst initialising Object Adapter.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_OA_caughtexception(String arg0, String arg1);
+ public void warn_OA_caughtexception(String arg0, Throwable arg1);
- @Message(id = 21002, value = "{0}: exception caught for {1} : {2}", format = MESSAGE_FORMAT)
+ @Message(id = 21002, value = "{0}: exception caught for {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_OA_exceptioncaughtforobj(String arg0, String arg1, String arg2);
+ public void warn_OA_exceptioncaughtforobj(String arg0, String arg1, Throwable arg2);
- @Message(id = 21003, value = "{0} caught org.omg.CORBA.INITIALIZE whilst initialising Object Adapter. Check another ORB/service is not active on same port.", format = MESSAGE_FORMAT)
+ @Message(id = 21003, value = "caught org.omg.CORBA.INITIALIZE whilst initialising Object Adapter. Check another ORB/service is not active on same port.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_OA_initialize(String arg0);
+ public void warn_OA_initialize();
@Message(id = 21004, value = "{0} - invalid POA: {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_OA_invalidpoa(String arg0, String arg1);
+ public void warn_OA_invalidpoa(String arg0, String arg1);
@Message(id = 21005, value = "OA.createPOA - createPOA called without OA being initialised", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_OA_oanotinitialised();
+ public void warn_OA_oanotinitialised();
@Message(id = 21006, value = "OA.initPOA called without initialised ORB.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_OA_uninitialsedorb();
+ public String get_OA_uninitialsedorb();
- @Message(id = 21007, value = "Cannot find default ORB configuration file {0} in the classpath", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_ORB_cannotfinddefaultorbconfig(String arg0);
+// @Message(id = 21007, value = "Cannot find default ORB configuration file {0} in the classpath", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_ORB_cannotfinddefaultorbconfig(String arg0);
- @Message(id = 21008, value = "{0} caught exception: {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_ORB_caughtexception(String arg0, String arg1);
+// @Message(id = 21008, value = "{0} caught exception: {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_ORB_caughtexception(String arg0, String arg1);
- @Message(id = 21009, value = "The ORB configuration specified in {0} is invalid: {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_ORB_invalidorbconfig(String arg0, String arg1);
+// @Message(id = 21009, value = "The ORB configuration specified in {0} is invalid: {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_ORB_invalidorbconfig(String arg0, String arg1);
- @Message(id = 21010, value = "ORBInfo ORB specific class creation failed with {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_ORBInfo_creationfailed(String arg0);
+ @Message(id = 21010, value = "ORBInfo ORB specific class creation failed with exception", format = MESSAGE_FORMAT)
+ @LogMessage(level = FATAL)
+ public void fatal_ORBInfo_creationfailed(Throwable arg0);
@Message(id = 21011, value = "ORBInfo ORB specific class creation failed - unable to find supported ORB", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_ORBInfo_unsupportedorb();
+ @LogMessage(level = FATAL)
+ public void fatal_ORBInfo_unsupportedorb(Throwable arg0);
- @Message(id = 21012, value = "{0} - could not open config file: {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_Services_openfailure(String arg0, String arg1);
+// @Message(id = 21012, value = "{0} - could not open config file: {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_Services_openfailure(String arg0, String arg1);
@Message(id = 21013, value = "{0} - {1} option not supported by ORB.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_Services_optionnotsupported(String arg0, String arg1);
+ public void warn_Services_optionnotsupported(String arg0, String arg1);
- @Message(id = 21014, value = "Services.getService - resolve_initial_references on {0} failed: {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_Services_resolvereffailed(String arg0, String arg1);
+// @Message(id = 21014, value = "Services.getService - resolve_initial_references on {0} failed: {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_Services_resolvereffailed(String arg0, String arg1);
@Message(id = 21015, value = "Services.getService - could not find service: {0} in configuration file: {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_Services_servicenotfound(String arg0, String arg1);
+ public void warn_Services_servicenotfound(String arg0, String arg1);
@Message(id = 21016, value = "{0} Suspect entry in configuration file: {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_Services_suspectentry(String arg0, String arg1);
+ public void warn_Services_suspectentry(String arg0, String arg1);
- @Message(id = 21017, value = "{0} - caught unexpected exception: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 21017, value = "{0} - caught unexpected exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_Services_unexpectedexception(String arg0, String arg1);
+ public void warn_Services_unexpectedexception(String arg0, Throwable arg1);
@Message(id = 21018, value = "Services.getService - {0} option not supported by ORB.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_Services_unsupportedoption(String arg0);
+ public void warn_Services_unsupportedoption(String arg0);
@Message(id = 21019, value = "{0} - invalid bind mechanism in properties file", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_common_Configuration_bindDefault_invalidbind(String arg0);
+ public void warn_common_Configuration_bindDefault_invalidbind(String arg0);
- @Message(id = 21020, value = "{0} - caught exception: {1} for {2}", format = MESSAGE_FORMAT)
+ @Message(id = 21020, value = "{0} - caught exception for {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_event_EventManager_caughtexceptionfor(String arg0, String arg1, String arg2);
+ public void warn_event_EventManager_caughtexceptionfor(String arg0, String arg1, Throwable arg2);
- @Message(id = 21021, value = "{0} - for: {1} threw: {2}", format = MESSAGE_FORMAT)
+ @Message(id = 21021, value = "{0} - for: {1} threw exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_event_EventManager_forhandlethrewexception(String arg0, String arg1, String arg2);
+ public void warn_event_EventManager_forhandlethrewexception(String arg0, String arg1, Throwable arg2);
- @Message(id = 21022, value = "{0} - no value for: {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_event_EventManager_novalue(String arg0, String arg1);
+// @Message(id = 21022, value = "{0} - no value for: {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_event_EventManager_novalue(String arg0, String arg1);
- @Message(id = 21023, value = ".jacorb_2_0.norootoa {0} called without root POA.", format = MESSAGE_FORMAT)
+ @Message(id = 21023, value = "{0} called without root POA.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_internal_orbspecific_jacorb_oa_implementations(String arg0);
+ public void warn_internal_orbspecific_oa_implementations(String arg0);
@Message(id = 21024, value = "{0} - could not find class {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_internal_utils_InitLoader_couldnotfindclass(String arg0, String arg1);
+ public void warn_internal_utils_InitLoader_couldnotfindclass(String arg0, String arg1);
- @Message(id = 21025, value = "Exception {0} whilst loading {1}", format = MESSAGE_FORMAT)
+ @Message(id = 21025, value = "Exception whilst loading {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_internal_utils_InitLoader_exception(String arg0, String arg1);
+ public void warn_internal_utils_InitLoader_exception(String arg0, Throwable arg1);
@Message(id = 21026, value = "{0} - attempt to initialise {1} with null class name!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_internal_utils_InitLoader_initfailed(String arg0, String arg1);
+ public void warn_internal_utils_InitLoader_initfailed(String arg0, String arg1);
@Message(id = 21027, value = "Loading {0} class - {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_internal_utils_InitLoader_loading(String arg0, String arg1);
+ public void warn_internal_utils_InitLoader_loading(String arg0, String arg1);
- @Message(id = 21028, value = "OA ORB specific class creation failed with: {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_oa_core_OA_caughtexception(String arg0);
+// @Message(id = 21028, value = "OA ORB specific class creation failed with: {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_oa_core_OA_caughtexception(String arg0);
- @Message(id = 21029, value = "OA ORB specific class creation failed - unable to find supported ORB", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_oa_core_OA_nosupportedorb();
+// @Message(id = 21029, value = "OA ORB specific class creation failed - unable to find supported ORB", format = MESSAGE_FORMAT)
+// public String get_oa_core_OA_nosupportedorb();
- @Message(id = 21030, value = "ORB specific class creation failed with: {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orb_core_ORB_caughtexception(String arg0);
+// @Message(id = 21030, value = "ORB specific class creation failed with: {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_orb_core_ORB_caughtexception(String arg0);
- @Message(id = 21031, value = "ORB specific class creation failed - unable to find supported ORB", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orb_core_ORB_unsupportedorb();
+// @Message(id = 21031, value = "ORB specific class creation failed - unable to find supported ORB", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_orb_core_ORB_unsupportedorb();
/*
Allocate new messages directly above this notice.
@@ -171,5 +170,7 @@
- value: default (English) version of the log message.
- level: according to severity semantics defined at http://docspace.corp.redhat.com/docs/DOC-30217
Debug and trace don't get i18n. Everything else MUST be i18n.
- */
+ By convention methods with String return type have prefix get_,
+ all others are log methods and have prefix <level>_
+ */
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLoggerImpl.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLoggerImpl.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -20,8 +20,9 @@
*/
package com.arjuna.orbportability.logging;
-import com.arjuna.common.util.logging.Logi18n;
+import org.jboss.logging.Logger;
+import static org.jboss.logging.Logger.Level.*;
/**
* i18n log messages for the orbportability module.
* This class is autogenerated. Don't mess with it.
@@ -30,196 +31,93 @@
*/
public class orbportabilityI18NLoggerImpl implements orbportabilityI18NLogger {
- private final Logi18n logi18n;
+ private final Logger logger;
- orbportabilityI18NLoggerImpl(Logi18n logi18n) {
- this.logi18n = logi18n;
+ orbportabilityI18NLoggerImpl(Logger logger) {
+ this.logger = logger;
}
- public void log_OA_caughtexception(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.OA.caughtexception", new Object[] {arg0, arg1});
- }
+ public void warn_OA_caughtexception(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-21001 {0} caught exception whilst initialising Object Adapter.", arg0);
}
- public void log_OA_exceptioncaughtforobj(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.OA.exceptioncaughtforobj", new Object[] {arg0, arg1, arg2});
- }
+ public void warn_OA_exceptioncaughtforobj(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-21002 {0}: exception caught for {1}", arg0, arg1);
}
- public void log_OA_initialize(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.OA.initialize", new Object[] {arg0});
- }
+ public void warn_OA_initialize() {
+ logger.logv(WARN, "ARJUNA-21003 caught org.omg.CORBA.INITIALIZE whilst initialising Object Adapter. Check another ORB/service is not active on same port.", (Object)null);
}
- public void log_OA_invalidpoa(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.OA.invalidpoa", new Object[] {arg0, arg1});
- }
+ public void warn_OA_invalidpoa(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-21004 {0} - invalid POA: {1}", arg0, arg1);
}
- public void log_OA_oanotinitialised() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.OA.oanotinitialised");
- }
+ public void warn_OA_oanotinitialised() {
+ logger.logv(WARN, "ARJUNA-21005 OA.createPOA - createPOA called without OA being initialised", (Object)null);
}
- public void log_OA_uninitialsedorb() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.OA.uninitialsedorb");
- }
+ public String get_OA_uninitialsedorb() {
+ return "ARJUNA-21006 OA.initPOA called without initialised ORB.";
}
- public void log_ORB_cannotfinddefaultorbconfig(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.ORB.cannotfinddefaultorbconfig", new Object[] {arg0});
- }
+ public void fatal_ORBInfo_creationfailed(Throwable arg0) {
+ logger.logv(FATAL, arg0, "ARJUNA-21010 ORBInfo ORB specific class creation failed with exception", (Object)null);
}
- public void log_ORB_caughtexception(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.ORB.caughtexception", new Object[] {arg0, arg1});
- }
+ public void fatal_ORBInfo_unsupportedorb(Throwable arg0) {
+ logger.logv(FATAL, arg0, "ARJUNA-21011 ORBInfo ORB specific class creation failed - unable to find supported ORB", (Object)null);
}
- public void log_ORB_invalidorbconfig(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.ORB.invalidorbconfig", new Object[] {arg0, arg1});
- }
+ public void warn_Services_optionnotsupported(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-21013 {0} - {1} option not supported by ORB.", arg0, arg1);
}
- public void log_ORBInfo_creationfailed(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.ORBInfo.creationfailed", new Object[] {arg0});
- }
+ public void warn_Services_servicenotfound(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-21015 Services.getService - could not find service: {0} in configuration file: {1}", arg0, arg1);
}
- public void log_ORBInfo_unsupportedorb() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.ORBInfo.unsupportedorb");
- }
+ public void warn_Services_suspectentry(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-21016 {0} Suspect entry in configuration file: {1}", arg0, arg1);
}
- public void log_Services_openfailure(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.Services.openfailure", new Object[] {arg0, arg1});
- }
+ public void warn_Services_unexpectedexception(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-21017 {0} - caught unexpected exception", arg0);
}
- public void log_Services_optionnotsupported(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.Services.optionnotsupported", new Object[] {arg0, arg1});
- }
+ public void warn_Services_unsupportedoption(String arg0) {
+ logger.logv(WARN, "ARJUNA-21018 Services.getService - {0} option not supported by ORB.", arg0);
}
- public void log_Services_resolvereffailed(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.Services.resolvereffailed", new Object[] {arg0, arg1});
- }
+ public void warn_common_Configuration_bindDefault_invalidbind(String arg0) {
+ logger.logv(WARN, "ARJUNA-21019 {0} - invalid bind mechanism in properties file", arg0);
}
- public void log_Services_servicenotfound(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.Services.servicenotfound", new Object[] {arg0, arg1});
- }
+ public void warn_event_EventManager_caughtexceptionfor(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-21020 {0} - caught exception for {1}", arg0, arg1);
}
- public void log_Services_suspectentry(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.Services.suspectentry", new Object[] {arg0, arg1});
- }
+ public void warn_event_EventManager_forhandlethrewexception(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-21021 {0} - for: {1} threw exception", arg0, arg1);
}
- public void log_Services_unexpectedexception(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.Services.unexpectedexception", new Object[] {arg0, arg1});
- }
+ public void warn_internal_orbspecific_oa_implementations(String arg0) {
+ logger.logv(WARN, "ARJUNA-21023 {0} called without root POA.", arg0);
}
- public void log_Services_unsupportedoption(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.Services.unsupportedoption", new Object[] {arg0});
- }
+ public void warn_internal_utils_InitLoader_couldnotfindclass(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-21024 {0} - could not find class {1}", arg0, arg1);
}
- public void log_common_Configuration_bindDefault_invalidbind(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.common.Configuration.bindDefault.invalidbind", new Object[] {arg0});
- }
+ public void warn_internal_utils_InitLoader_exception(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-21025 Exception whilst loading {1}", arg0);
}
- public void log_event_EventManager_caughtexceptionfor(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.event.EventManager.caughtexceptionfor", new Object[] {arg0, arg1, arg2});
- }
+ public void warn_internal_utils_InitLoader_initfailed(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-21026 {0} - attempt to initialise {1} with null class name!", arg0, arg1);
}
- public void log_event_EventManager_forhandlethrewexception(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.event.EventManager.forhandlethrewexception", new Object[] {arg0, arg1, arg2});
- }
+ public void warn_internal_utils_InitLoader_loading(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-21027 Loading {0} class - {1}", arg0, arg1);
}
-
- public void log_event_EventManager_novalue(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.event.EventManager.novalue", new Object[] {arg0, arg1});
- }
- }
-
- public void log_internal_orbspecific_jacorb_oa_implementations(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.internal.orbspecific.jacorb.oa.implementations", new Object[] {arg0});
- }
- }
-
- public void log_internal_utils_InitLoader_couldnotfindclass(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.internal.utils.InitLoader.couldnotfindclass", new Object[] {arg0, arg1});
- }
- }
-
- public void log_internal_utils_InitLoader_exception(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.internal.utils.InitLoader.exception", new Object[] {arg0, arg1});
- }
- }
-
- public void log_internal_utils_InitLoader_initfailed(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.internal.utils.InitLoader.initfailed", new Object[] {arg0, arg1});
- }
- }
-
- public void log_internal_utils_InitLoader_loading(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.internal.utils.InitLoader.loading", new Object[] {arg0, arg1});
- }
- }
-
- public void log_oa_core_OA_caughtexception(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.oa.core.OA.caughtexception", new Object[] {arg0});
- }
- }
-
- public void log_oa_core_OA_nosupportedorb() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.oa.core.OA.nosupportedorb");
- }
- }
-
- public void log_orb_core_ORB_caughtexception(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.orb.core.ORB.caughtexception", new Object[] {arg0});
- }
- }
-
- public void log_orb_core_ORB_unsupportedorb() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.orbportability.orb.core.ORB.unsupportedorb");
- }
- }
-
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -125,12 +125,6 @@
_theOA.run(_theORB);
}
- /**
- * @message com.arjuna.orbportability.oa.core.OA.nosupportedorb OA ORB
- * specific class creation failed - unable to find supported ORB
- * @message com.arjuna.orbportability.oa.core.OA.caughtexception OA ORB
- * specific class creation failed with: {0}
- */
@SuppressWarnings("unchecked")
private final void initialise ()
{
@@ -158,16 +152,7 @@
}
catch (ClassNotFoundException je)
{
- if (opLogger.loggerI18N.isFatalEnabled())
- {
- opLogger.loggerI18N
- .fatal(
- "com.arjuna.orbportability.oa.core.OA.nosupportedorb",
- je);
- }
- throw new ExceptionInInitializerError(
- opLogger.loggerI18N
- .getString("com.arjuna.orbportability.oa.core.OA.nosupportedorb"));
+ throw new ExceptionInInitializerError(je);
}
}
}
@@ -185,17 +170,7 @@
}
catch (Exception e)
{
- if (opLogger.loggerI18N.isFatalEnabled())
- {
- opLogger.loggerI18N.fatal(
- "com.arjuna.orbportability.oa.core.OA.caughtexception",
- new Object[]
- { e }, e);
- }
-
- throw new ExceptionInInitializerError(
- opLogger.loggerI18N
- .getString("com.arjuna.orbportability.oa.core.OA.caughtexception"));
+ throw new ExceptionInInitializerError( e );
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java 2010-06-23 12:14:38 UTC (rev 33603)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java 2010-06-23 12:37:26 UTC (rev 33604)
@@ -98,10 +98,6 @@
_theORB.orb(o);
}
- /**
- * @message com.arjuna.orbportability.orb.core.ORB.unsupportedorb ORB specific class creation failed - unable to find supported ORB
- * @message com.arjuna.orbportability.orb.core.ORB.caughtexception ORB specific class creation failed with: {0}
- */
private final void initialise ()
{
/*
@@ -130,14 +126,7 @@
}
catch (ClassNotFoundException je)
{
- // je.printStackTrace();
-
- if (opLogger.loggerI18N.isFatalEnabled())
- {
- opLogger.loggerI18N.fatal( "com.arjuna.orbportability.orb.core.ORB.unsupportedorb", je );
- }
-
- throw new ExceptionInInitializerError(opLogger.loggerI18N.getString("com.arjuna.orbportability.orb.core.ORB.unsupportedorb"));
+ throw new ExceptionInInitializerError(je);
}
}
}
@@ -154,13 +143,7 @@
}
catch (Exception e)
{
- if (opLogger.loggerI18N.isFatalEnabled())
- {
- opLogger.loggerI18N.fatal( "com.arjuna.orbportability.orb.core.ORB.caughtexception",
- new Object[] { e }, e );
- }
-
- throw new ExceptionInInitializerError( opLogger.loggerI18N.getString("com.arjuna.orbportability.orb.core.ORB.caughtexception") );
+ throw new ExceptionInInitializerError( e );
}
}
More information about the jboss-svn-commits
mailing list