[jboss-svn-commits] JBL Code SVN: r33596 - in labs/jbosstm/trunk: ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/drivers and 13 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 22 11:16:04 EDT 2010
Author: jhalliday
Date: 2010-06-22 11:16:03 -0400 (Tue, 22 Jun 2010)
New Revision: 33596
Modified:
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionManager.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/DirectRecoverableConnection.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/IndirectRecoverableConnection.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/drivers/jndi.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/drivers/modifiers/jndi.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/BasicXARecovery.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcI18NLogger.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcI18NLoggerImpl.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcLogger.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/JTATransactionLogXAResourceOrphanFilter.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/NodeNameXAResourceOrphanFilter.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/SynchronizationImple.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAOnePhaseResource.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionSynchronizationRegistryImple.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/SubordinationManager.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TxWorkManager.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/TransactionManager.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/UserTransaction.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLogger.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLoggerImpl.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaLogger.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JNDIManager.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/XAHelper.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XidImple.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java
Log:
Convert i18n logging in ArjunaJTA modules from CLF to jboss-logging. JBTM-750
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -41,8 +41,6 @@
import com.arjuna.ats.jta.xa.XAModifier;
import com.arjuna.ats.jta.xa.RecoverableXAConnection;
-import com.arjuna.common.util.logging.*;
-
import javax.transaction.*;
import javax.transaction.xa.*;
import javax.sql.*;
@@ -225,9 +223,6 @@
*/
/**
* Not allowed if within a transaction.
- *
- * @message com.arjuna.ats.internal.jdbc.autocommit AutoCommit is not
- * allowed by the transaction service.
*/
public void setAutoCommit(boolean autoCommit) throws SQLException
@@ -235,8 +230,7 @@
if (transactionRunning())
{
if (autoCommit)
- throw new SQLException(jdbcLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jdbc.autocommit"));
+ throw new SQLException(jdbcLogger.i18NLogger.get_autocommit());
}
else
{
@@ -249,11 +243,6 @@
return getConnection().getAutoCommit();
}
- /**
- * @message com.arjuna.ats.internal.jdbc.commiterror Commit not allowed by
- * transaction service.
- */
-
public void commit() throws SQLException
{
/*
@@ -263,24 +252,17 @@
if (transactionRunning())
{
- throw new SQLException(jdbcLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jdbc.commiterror"));
+ throw new SQLException(jdbcLogger.i18NLogger.get_commiterror());
}
else
getConnection().commit();
}
- /**
- * @message com.arjuna.ats.internal.jdbc.aborterror Rollback not allowed by
- * transaction service.
- */
-
public void rollback() throws SQLException
{
if (transactionRunning())
{
- throw new SQLException(jdbcLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jdbc.aborterror"));
+ throw new SQLException(jdbcLogger.i18NLogger.get_aborterror());
}
else
getConnection().rollback();
@@ -289,20 +271,6 @@
/*
* This needs to be reworked in light of experience and requirements.
*/
-
- /**
- * @message com.arjuna.ats.internal.jdbc.delisterror Delist of resource
- * failed.
- * @message com.arjuna.ats.internal.jdbc.closeerror An error occurred during
- * close:
- * @message com.arjuna.ats.internal.jdbc.closingconnection Connection will be closed now.
- * Indications are that this db does not allow multiple
- * connections in the same transaction {0}
- * @message com.arjuna.ats.internal.jdbc.closingconnectionnull No modifier information found for db.
- * Connection will be closed immediately {0}
- * @message com.arjuna.ats.internal.jdbc.closeerrorinvalidtx Invalid transaction during close {0}
- */
-
public void close() throws SQLException
{
try
@@ -342,21 +310,13 @@
if (!tx.delistResource(xares, XAResource.TMSUCCESS))
throw new SQLException(
- jdbcLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jdbc.delisterror"));
-
+ jdbcLogger.i18NLogger.get_delisterror());
+
getModifier();
if (_theModifier == null)
{
- if (jdbcLogger.loggerI18N.isInfoEnabled())
- {
- jdbcLogger.loggerI18N
- .info(
- "com.arjuna.ats.internal.jdbc.closingconnectionnull",
- new Object[]
- { _theConnection });
- }
+ jdbcLogger.i18NLogger.info_closingconnectionnull(_theConnection.toString());
// no indication about connections, so assume close immediately
@@ -375,16 +335,9 @@
* We can't close the connection until the transaction has
* terminated, so register a Synchronization here.
*/
-
- if (jdbcLogger.loggerI18N.isWarnEnabled())
- {
- jdbcLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jdbc.closingconnection",
- new Object[]
- { _theConnection });
- }
-
+
+ jdbcLogger.i18NLogger.warn_closingconnection(_theConnection.toString());
+
delayClose = true;
}
}
@@ -397,7 +350,7 @@
}
}
else
- throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.closeerrorinvalidtx") + tx);
+ throw new SQLException(jdbcLogger.i18NLogger.get_closeerrorinvalidtx(tx.toString()));
}
if (!delayClose) // close now
@@ -421,9 +374,7 @@
}
catch (Exception e1)
{
- SQLException sqlException = new SQLException(jdbcLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jdbc.closeerror")
- + e1);
+ SQLException sqlException = new SQLException(jdbcLogger.i18NLogger.get_closeerror());
sqlException.initCause(e1);
throw sqlException;
}
@@ -452,9 +403,6 @@
/**
* Can only set readonly before we use the connection in a given
* transaction!
- *
- * @message com.arjuna.ats.internal.jdbc.setreadonly Cannot set readonly
- * when within a transaction!
*/
public void setReadOnly(boolean ro) throws SQLException
@@ -464,8 +412,7 @@
getConnection().setReadOnly(ro);
}
else
- throw new SQLException(jdbcLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jdbc.setreadonly"));
+ throw new SQLException(jdbcLogger.i18NLogger.get_setreadonly());
}
public boolean isReadOnly() throws SQLException
@@ -491,10 +438,6 @@
return getConnection().getCatalog();
}
- /**
- * @message com.arjuna.ats.internal.jdbc.stateerror State must be:
- */
-
public void setTransactionIsolation(int iso) throws SQLException
{
checkTransaction();
@@ -556,14 +499,11 @@
return getConnection().getHoldability();
}
- /**
- * @message com.arjuna.ats.internal.jdbc.setsavepointerror setSavepoint not allowed inside distributed tx.
- */
public Savepoint setSavepoint() throws SQLException
{
if (transactionRunning())
{
- throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.setsavepointerror"));
+ throw new SQLException(jdbcLogger.i18NLogger.get_setsavepointerror());
}
else
{
@@ -575,7 +515,7 @@
{
if (transactionRunning())
{
- throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.setsavepointerror"));
+ throw new SQLException(jdbcLogger.i18NLogger.get_setsavepointerror());
}
else
{
@@ -587,14 +527,11 @@
// It does not explicitly disallow calling rollback(savepoint) or releaseSavepoint(savepoint)
// but allowing them does not make a whole lot of sense, so we don't:
- /**
- * @message com.arjuna.ats.internal.jdbc.rollbacksavepointerror rollback(Savepoint) not allowed inside distributed tx.
- */
public void rollback(Savepoint savepoint) throws SQLException
{
if (transactionRunning())
{
- throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.rollbacksavepointerror"));
+ throw new SQLException(jdbcLogger.i18NLogger.get_rollbacksavepointerror());
}
else
{
@@ -602,14 +539,11 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jdbc.releasesavepointerror rollback(Savepoint) not allowed inside distributed tx.
- */
public void releaseSavepoint(Savepoint savepoint) throws SQLException
{
if (transactionRunning())
{
- throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.releasesavepointerror"));
+ throw new SQLException(jdbcLogger.i18NLogger.get_releasesavepointerror());
}
else
{
@@ -723,15 +657,6 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jdbc.isolationlevelfailget {0} - failed
- * to set isolation level: {1}
- * @message com.arjuna.ats.internal.jdbc.isolationlevelfailset {0} - failed
- * to set isolation level: {1}
- * @message com.arjuna.ats.internal.jdbc.conniniterror JDBC2 connection
- * initialisation problem
- */
-
final java.sql.Connection getConnection() throws SQLException
{
if (_theConnection != null && !_theConnection.isClosed())
@@ -759,19 +684,9 @@
}
catch (Exception e)
{
- if (jdbcLogger.loggerI18N.isWarnEnabled())
- {
- jdbcLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jdbc.isolationlevelfailset",
- new Object[]
- { "ConnectionImple.getConnection", e });
- }
+ jdbcLogger.i18NLogger.warn_isolationlevelfailset("ConnectionImple.getConnection", e);
- SQLException sqlException = new SQLException(
- jdbcLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jdbc.conniniterror")
- + ":" + e);
+ SQLException sqlException = new SQLException(jdbcLogger.i18NLogger.get_conniniterror());
sqlException.initCause(e);
throw sqlException;
}
@@ -819,14 +734,6 @@
* and not do a registration at all. This would require the connection
* object to be informed whenever a transaction completes so that it could
* flush its cache of XAResources though.
- *
- * @message com.arjuna.ats.internal.jdbc.rollbackerror {0} - could not mark
- * transaction rollback
- * @message com.arjuna.ats.internal.jdbc.enlistfailed enlist of resource
- * failed
- * @message com.arjuna.ats.internal.jdbc.alreadyassociated Connection is
- * already associated with a different transaction! Obtain a new
- * connection for this transaction.
*/
protected final synchronized void registerDatabase() throws SQLException
@@ -855,9 +762,7 @@
*/
if (!_recoveryConnection.setTransaction(tx))
- throw new SQLException(
- jdbcLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jdbc.alreadyassociated"));
+ throw new SQLException( jdbcLogger.i18NLogger.get_alreadyassociated() );
Object[] params;
@@ -890,14 +795,7 @@
}
catch (Exception e)
{
- if (jdbcLogger.loggerI18N.isWarnEnabled())
- {
- jdbcLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jdbc.rollbackerror",
- new Object[]
- { "ConnectionImple.registerDatabase" });
- }
+ jdbcLogger.i18NLogger.warn_rollbackerror("ConnectionImple.registerDatabase");
SQLException sqlException = new SQLException(e.toString());
sqlException.initCause(e);
@@ -906,8 +804,7 @@
throw new SQLException(
"ConnectionImple.registerDatabase - "
- + jdbcLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jdbc.enlistfailed"));
+ + jdbcLogger.i18NLogger.get_enlistfailed());
}
params = null;
@@ -940,17 +837,6 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jdbc.alreadyassociatedcheck Checking
- * transaction and found that this connection is already associated
- * with a different transaction! Obtain a new connection for this
- * transaction.
- * @message com.arjuna.ats.internal.jdbc.infoerror Could not get transaction
- * information.
- * @message com.arjuna.ats.internal.jdbc.inactivetransaction Transaction is
- * not active on the thread!
- */
-
protected final void checkTransaction() throws SQLException
{
if (jdbcLogger.logger.isDebugEnabled()) {
@@ -967,8 +853,7 @@
return;
if (tx.getStatus() != Status.STATUS_ACTIVE)
- throw new SQLException(jdbcLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jdbc.inactivetransaction"));
+ throw new SQLException(jdbcLogger.i18NLogger.get_inactivetransaction());
/*
* Now check that we are not already associated with a transaction.
@@ -976,8 +861,7 @@
if (!_recoveryConnection.validTransaction(tx))
throw new SQLException(
- jdbcLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jdbc.alreadyassociatedcheck"));
+ jdbcLogger.i18NLogger.get_alreadyassociatedcheck());
}
catch (SQLException ex)
{
@@ -985,18 +869,12 @@
}
catch (Exception e3)
{
- SQLException sqlException = new SQLException(jdbcLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jdbc.infoerror"));
+ SQLException sqlException = new SQLException(jdbcLogger.i18NLogger.get_infoerror());
sqlException.initCause(e3);
throw sqlException;
}
}
- /**
- * @message com.arjuna.ats.internal.jdbc.getmoderror Failed to get modifier
- * for driver:
- */
-
private final void getModifier()
{
if (_theModifier == null)
@@ -1016,11 +894,7 @@
}
catch (Exception ex)
{
- if (jdbcLogger.loggerI18N.isWarnEnabled())
- {
- jdbcLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jdbc.getmoderror", ex);
- }
+ jdbcLogger.i18NLogger.warn_getmoderror(ex);
}
}
}
@@ -1035,11 +909,6 @@
private static int _currentIsolationLevel = defaultIsolationLevel;
- /**
- * @message com.arjuna.ats.internal.jdbc.isolationerror Unknown isolation
- * level {0}. Will use default of TRANSACTION_SERIALIZABLE.
- */
-
static
{
_currentIsolationLevel = jdbcPropertyManager.getJDBCEnvironmentBean().getIsolationLevel();
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionManager.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionManager.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -53,10 +53,6 @@
/*
* Connections are pooled for the duration of a transaction.
*/
-
- /**
- * @message com.arjuna.ats.internal.jdbc.nojdbcimple Can't load ConnectionImple class {0}
- */
public static synchronized Connection create (String dbUrl, Properties info) throws SQLException
{
String user = info.getProperty(TransactionalDriver.userName);
@@ -136,12 +132,7 @@
}
catch(Exception e)
{
- if (jdbcLogger.loggerI18N.isErrorEnabled())
- {
- jdbcLogger.loggerI18N.error("com.arjuna.ats.internal.jdbc.nojdbcimple", new Object[] {connectionImpleClassName}, e);
- }
- SQLException sqlException = new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.nojdbcimple",
- new Object[] {connectionImpleClassName})+" "+e.toString());
+ SQLException sqlException = new SQLException(jdbcLogger.i18NLogger.get_nojdbcimple(connectionImpleClassName));
sqlException.initCause(e);
throw sqlException;
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/DirectRecoverableConnection.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/DirectRecoverableConnection.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/DirectRecoverableConnection.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -33,20 +33,12 @@
import com.arjuna.ats.jdbc.logging.*;
-import com.arjuna.ats.internal.jdbc.drivers.modifiers.ModifierFactory;
import com.arjuna.ats.internal.jdbc.drivers.modifiers.ConnectionModifier;
-import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.state.*;
-import com.arjuna.ats.jta.*;
import com.arjuna.ats.jta.xa.RecoverableXAConnection;
-import com.arjuna.ats.jta.xa.XAModifier;
-import com.arjuna.ats.jta.exceptions.NotImplementedException;
-import com.arjuna.common.util.logging.*;
-
-import java.util.*;
import java.sql.*;
import javax.sql.*;
import javax.transaction.*;
@@ -105,10 +97,6 @@
_theModifier = null;
}
- /**
- * @message com.arjuna.ats.internal.jdbc.drcdest Caught exception
- */
-
public void finalize ()
{
try
@@ -121,11 +109,7 @@
}
catch (SQLException e)
{
- if (jdbcLogger.loggerI18N.isWarnEnabled())
- {
- jdbcLogger.loggerI18N.warn("com.arjuna.ats.internal.jdbc.drcdest",
- new Object[] {e});
- }
+ jdbcLogger.i18NLogger.warn_drcdest(e);
}
}
@@ -227,10 +211,6 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jdbc.drcclose Caught exception
- */
-
public final void close ()
{
reset();
@@ -344,10 +324,6 @@
_dbName = _theModifier.initialise(_dbName);
}
- /**
- * @message com.arjuna.ats.internal.jdbc.dynamicerror No dynamic class specified!
- */
-
private final void createConnection () throws SQLException
{
if (jdbcLogger.logger.isDebugEnabled()) {
@@ -356,7 +332,7 @@
if ((_dynamic == null) || (_dynamic.equals("")))
{
- throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.dynamicerror"));
+ throw new SQLException(jdbcLogger.i18NLogger.get_dynamicerror());
}
else
{
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/IndirectRecoverableConnection.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/IndirectRecoverableConnection.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/IndirectRecoverableConnection.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -40,8 +40,6 @@
import com.arjuna.ats.jta.xa.RecoverableXAConnection;
-import com.arjuna.common.util.logging.*;
-
import java.util.*;
import java.sql.*;
import javax.sql.*;
@@ -110,10 +108,6 @@
createDataSource();
}
- /**
- * @message com.arjuna.ats.internal.jdbc.ircdest Caught exception
- */
-
public void finalize ()
{
try
@@ -126,11 +120,7 @@
}
catch (SQLException e)
{
- if (jdbcLogger.loggerI18N.isWarnEnabled())
- {
- jdbcLogger.loggerI18N.warn("com.arjuna.ats.internal.jdbc.drcdest",
- new Object[] {e});
- }
+ jdbcLogger.i18NLogger.warn_drcdest(e);
}
}
@@ -200,10 +190,6 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jdbc.idrcclose Caught exception
- */
-
public final void close ()
{
reset();
@@ -347,11 +333,7 @@
if (_theModifier != null)
_dbName = _theModifier.initialise(_dbName);
}
-
- /**
- * @message com.arjuna.ats.internal.jdbc.jndierror Could not resolve JNDI XADataSource
- */
-
+
private final void createDataSource () throws SQLException
{
try
@@ -364,7 +346,7 @@
}
if (_theDataSource == null) {
- throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.jndierror"));
+ throw new SQLException(jdbcLogger.i18NLogger.get_jndierror());
}
}
catch (SQLException ex)
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/drivers/jndi.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/drivers/jndi.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/drivers/jndi.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -31,13 +31,6 @@
package com.arjuna.ats.internal.jdbc.drivers;
-import java.sql.SQLException;
-
-/**
- * @message com.arjuna.ats.internal.jdbc.drivers.invaliddb database not for
- * @message com.arjuna.ats.internal.jdbc.drivers.exception caught exception:
- */
-
public class jndi
{
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/drivers/modifiers/jndi.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/drivers/modifiers/jndi.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/drivers/modifiers/jndi.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -104,11 +104,7 @@
}
catch (SQLException e)
{
- if (jdbcLogger.loggerI18N.isWarnEnabled())
- {
- jdbcLogger.loggerI18N.warn("com.arjuna.ats.internal.jdbc.isolationlevelfailset",
- new Object[] {"ConnectionImple.getConnection", e});
- }
+ jdbcLogger.i18NLogger.warn_isolationlevelfailset("ConnectionImple.getConnection", e);
throw e;
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/BasicXARecovery.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/BasicXARecovery.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/BasicXARecovery.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -105,9 +105,6 @@
* The recovery module will have chopped off this class name already. The
* parameter should specify a property file from which the url, user name,
* password, etc. can be read.
- *
- * @message com.arjuna.ats.internal.jdbc.recovery.basic.initexp An exception
- * occurred during initialisation.
*/
public boolean initialise (String parameter) throws SQLException
@@ -133,12 +130,7 @@
}
catch (NumberFormatException e)
{
- if (jdbcLogger.loggerI18N.isWarnEnabled())
- {
- jdbcLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jdbc.recovery.basic.initexp",
- new Object[] { e });
- }
+ jdbcLogger.i18NLogger.warn_recovery_basic_initexp(e);
return false;
}
@@ -150,12 +142,7 @@
}
catch (Exception e)
{
- if (jdbcLogger.loggerI18N.isWarnEnabled())
- {
- jdbcLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jdbc.recovery.basic.initexp",
- new Object[] { e });
- }
+ jdbcLogger.i18NLogger.warn_recovery_basic_initexp(e);
return false;
}
@@ -167,11 +154,6 @@
return true;
}
- /**
- * @message com.arjuna.ats.internal.jdbc.recovery.basic.xarec {0} could not find
- * information for connection!
- */
-
public synchronized XAResource getXAResource () throws SQLException
{
JDBC2RecoveryConnection conn = null;
@@ -184,12 +166,7 @@
if (conn == null)
{
- if (jdbcLogger.loggerI18N.isWarnEnabled())
- {
- jdbcLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jdbc.recovery.basic.xarec",
- new Object[] { "BasicXARecovery.getConnection -" });
- }
+ jdbcLogger.i18NLogger.warn_recovery_basic_xarec("BasicXARecovery.getConnection -");
}
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -37,7 +37,7 @@
import javax.naming.InitialContext;
import javax.sql.*;
import javax.transaction.xa.*;
-import com.arjuna.common.util.logging.*;
+
import com.arjuna.common.util.propertyservice.PropertiesFactory;
import com.arjuna.ats.jdbc.logging.jdbcLogger;
@@ -80,9 +80,6 @@
* The recovery module will have chopped off this class name already. The
* parameter should specify a property file from which the jndi name, user name,
* password can be read.
- *
- * @message com.arjuna.ats.internal.jdbc.recovery.xa.initexp An exception
- * occurred during initialisation.
*/
public boolean initialise(String parameter)
@@ -104,10 +101,7 @@
}
catch (Exception e)
{
- if (jdbcLogger.loggerI18N.isWarnEnabled())
- {
- jdbcLogger.loggerI18N.warn("com.arjuna.ats.internal.jdbc.recovery.xa.initexp", new Object[] { e }, e);
- }
+ jdbcLogger.i18NLogger.warn_recovery_xa_initexp(e);
return false;
}
@@ -115,11 +109,6 @@
return true;
}
- /**
- * @message com.arjuna.ats.internal.jdbc.recovery.xa.xarec {0} could not find
- * information for connection!
- */
-
public synchronized XAResource getXAResource()
throws SQLException
{
@@ -153,9 +142,6 @@
/**
* Lookup the XADataSource in JNDI. We got the relevant information from the
* property file provided at input to this instance.
- *
- * @message com.arjuna.ats.internal.jdbc.xa.recjndierror Could not resolve JNDI
- * XADataSource
*/
private final void createDataSource()
@@ -169,7 +155,7 @@
_dataSource = (XADataSource) context.lookup(_dbName);
if (_dataSource == null)
- throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.xa.recjndierror"));
+ throw new SQLException(jdbcLogger.i18NLogger.get_xa_recjndierror());
}
}
catch (SQLException ex)
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcI18NLogger.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcI18NLogger.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -40,152 +40,132 @@
*/
@Message(id = 17001, value = "Rollback not allowed by transaction service.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_aborterror();
+ public String get_aborterror();
@Message(id = 17002, value = "Connection is already associated with a different transaction! Obtain a new connection for this transaction.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_alreadyassociated();
+ public String get_alreadyassociated();
@Message(id = 17003, value = "Checking transaction and found that this connection is already associated with a different transaction! Obtain a new connection for this transaction.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_alreadyassociatedcheck();
+ public String get_alreadyassociatedcheck();
@Message(id = 17004, value = "AutoCommit is not allowed by the transaction service.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_autocommit();
+ public String get_autocommit();
@Message(id = 17005, value = "An error occurred during close:", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_closeerror();
+ public String get_closeerror();
@Message(id = 17006, value = "Invalid transaction during close {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_closeerrorinvalidtx(String arg0);
+ public String get_closeerrorinvalidtx(String arg0);
@Message(id = 17007, value = "Connection will be closed now. Indications are that this db does not allow multiple connections in the same transaction {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_closingconnection(String arg0);
+ public void warn_closingconnection(String arg0);
@Message(id = 17008, value = "No modifier information found for db. Connection will be closed immediately {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_closingconnectionnull(String arg0);
+ @LogMessage(level = INFO)
+ public void info_closingconnectionnull(String arg0);
@Message(id = 17009, value = "Commit not allowed by transaction service.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_commiterror();
+ public String get_commiterror();
@Message(id = 17010, value = "JDBC2 connection initialisation problem", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_conniniterror();
+ public String get_conniniterror();
@Message(id = 17011, value = "Delist of resource failed.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_delisterror();
+ public String get_delisterror();
- @Message(id = 17012, value = "Caught exception", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_drcclose();
+// @Message(id = 17012, value = "Caught exception", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_drcclose();
@Message(id = 17013, value = "Caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_drcdest();
+ public void warn_drcdest(Throwable arg0);
- @Message(id = 17014, value = "caught exception:", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_drivers_exception();
+// @Message(id = 17014, value = "caught exception:", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_drivers_exception();
- @Message(id = 17015, value = "database not for", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_drivers_invaliddb();
+// @Message(id = 17015, value = "database not for", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_drivers_invaliddb();
@Message(id = 17016, value = "No dynamic class specified!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_dynamicerror();
+ public String get_dynamicerror();
@Message(id = 17017, value = "enlist of resource failed", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_enlistfailed();
+ public String get_enlistfailed();
@Message(id = 17018, value = "Failed to get modifier for driver:", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_getmoderror();
+ public void warn_getmoderror(Throwable arg0);
- @Message(id = 17019, value = "Caught exception", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_idrcclose();
+// @Message(id = 17019, value = "Caught exception", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_idrcclose();
@Message(id = 17020, value = "Transaction is not active on the thread!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_inactivetransaction();
+ public String get_inactivetransaction();
@Message(id = 17021, value = "Could not get transaction information.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_infoerror();
+ public String get_infoerror();
- @Message(id = 17022, value = "Caught exception", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_ircdest();
+// @Message(id = 17022, value = "Caught exception", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_ircdest();
- @Message(id = 17023, value = "{0} - failed to set isolation level: {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_isolationlevelfailget(String arg0, String arg1);
+// @Message(id = 17023, value = "{0} - failed to set isolation level: {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_isolationlevelfailget(String arg0, String arg1);
- @Message(id = 17024, value = "{0} - failed to set isolation level: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 17024, value = "{0} - failed to set isolation level", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_isolationlevelfailset(String arg0, String arg1);
+ public void warn_isolationlevelfailset(String arg0, Throwable arg1);
@Message(id = 17025, value = "Could not resolve JNDI XADataSource", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_jndierror();
+ public String get_jndierror();
@Message(id = 17026, value = "Can't load ConnectionImple class {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_nojdbcimple(String arg0);
+ public String get_nojdbcimple(String arg0);
@Message(id = 17027, value = "An exception occurred during initialisation.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_basic_initexp();
+ public void warn_recovery_basic_initexp(Throwable arg0);
@Message(id = 17028, value = "{0} could not find information for connection!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_basic_xarec(String arg0);
+ public void warn_recovery_basic_xarec(String arg0);
@Message(id = 17029, value = "An exception occurred during initialisation.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_xa_initexp();
+ public void warn_recovery_xa_initexp(Throwable arg0);
- @Message(id = 17030, value = "{0} could not find information for connection!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_xa_xarec(String arg0);
+// @Message(id = 17030, value = "{0} could not find information for connection!", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_xa_xarec(String arg0);
@Message(id = 17031, value = "rollback(Savepoint) not allowed inside distributed tx.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_releasesavepointerror();
+ public String get_releasesavepointerror();
@Message(id = 17032, value = "{0} - could not mark transaction rollback", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_rollbackerror(String arg0);
+ public void warn_rollbackerror(String arg0);
@Message(id = 17033, value = "rollback(Savepoint) not allowed inside distributed tx.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_rollbacksavepointerror();
+ public String get_rollbacksavepointerror();
@Message(id = 17034, value = "Cannot set readonly when within a transaction!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_setreadonly();
+ public String get_setreadonly();
@Message(id = 17035, value = "setSavepoint not allowed inside distributed tx.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_setsavepointerror();
+ public String get_setsavepointerror();
- @Message(id = 17036, value = "State must be:", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_stateerror();
+// @Message(id = 17036, value = "State must be:", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_stateerror();
@Message(id = 17037, value = "Could not resolve JNDI XADataSource", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_xa_recjndierror();
+ public String get_xa_recjndierror();
/*
Allocate new messages directly above this notice.
@@ -195,5 +175,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/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcI18NLoggerImpl.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcI18NLoggerImpl.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -20,8 +20,12 @@
*/
package com.arjuna.ats.jdbc.logging;
-import com.arjuna.common.util.logging.Logi18n;
+import org.jboss.logging.Logger;
+import java.text.MessageFormat;
+
+import static org.jboss.logging.Logger.Level.*;
+
/**
* i18n log messages for the jdbc module.
* This class is autogenerated. Don't mess with it.
@@ -30,232 +34,125 @@
*/
public class jdbcI18NLoggerImpl implements jdbcI18NLogger {
- private final Logi18n logi18n;
+ private final Logger logger;
- jdbcI18NLoggerImpl(Logi18n logi18n) {
- this.logi18n = logi18n;
+ jdbcI18NLoggerImpl(Logger logger) {
+ this.logger = logger;
}
- public void log_aborterror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.aborterror");
- }
+ public String get_aborterror() {
+ return "ARJUNA-17001 Rollback not allowed by transaction service.";
}
- public void log_alreadyassociated() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.alreadyassociated");
- }
+ public String get_alreadyassociated() {
+ return "ARJUNA-17002 Connection is already associated with a different transaction! Obtain a new connection for this transaction.";
}
- public void log_alreadyassociatedcheck() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.alreadyassociatedcheck");
- }
+ public String get_alreadyassociatedcheck() {
+ return "ARJUNA-17003 Checking transaction and found that this connection is already associated with a different transaction! Obtain a new connection for this transaction.";
}
- public void log_autocommit() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.autocommit");
- }
+ public String get_autocommit() {
+ return "ARJUNA-17004 AutoCommit is not allowed by the transaction service.";
}
- public void log_closeerror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.closeerror");
- }
+ public String get_closeerror() {
+ return "ARJUNA-17005 An error occurred during close:";
}
- public void log_closeerrorinvalidtx(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.closeerrorinvalidtx", new Object[] {arg0});
- }
+ public String get_closeerrorinvalidtx(String arg0) {
+ return MessageFormat.format("ARJUNA-17006 Invalid transaction during close {0}", arg0);
}
- public void log_closingconnection(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.closingconnection", new Object[] {arg0});
- }
+ public void warn_closingconnection(String arg0) {
+ logger.logv(WARN, "ARJUNA-17007 Connection will be closed now. Indications are that this db does not allow multiple connections in the same transaction {0}", arg0);
}
- public void log_closingconnectionnull(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.closingconnectionnull", new Object[] {arg0});
- }
+ public void info_closingconnectionnull(String arg0) {
+ logger.logv(INFO, "ARJUNA-17008 No modifier information found for db. Connection will be closed immediately {0}", arg0);
}
- public void log_commiterror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.commiterror");
- }
+ public String get_commiterror() {
+ return "ARJUNA-17009 Commit not allowed by transaction service.";
}
- public void log_conniniterror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.conniniterror");
- }
+ public String get_conniniterror() {
+ return "ARJUNA-17010 JDBC2 connection initialisation problem";
}
- public void log_delisterror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.delisterror");
- }
+ public String get_delisterror() {
+ return "ARJUNA-17011 Delist of resource failed.";
}
- public void log_drcclose() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.drcclose");
- }
+ public void warn_drcdest(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-17013 Caught exception", (Object)null);
}
- public void log_drcdest() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.drcdest");
- }
+ public String get_dynamicerror() {
+ return "ARJUNA-17016 No dynamic class specified!";
}
- public void log_drivers_exception() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.drivers.exception");
- }
+ public String get_enlistfailed() {
+ return "ARJUNA-17017 enlist of resource failed";
}
- public void log_drivers_invaliddb() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.drivers.invaliddb");
- }
+ public void warn_getmoderror(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-17018 Failed to get modifier for driver:", (Object)null);
}
- public void log_dynamicerror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.dynamicerror");
- }
+ public String get_inactivetransaction() {
+ return "ARJUNA-17020 Transaction is not active on the thread!";
}
- public void log_enlistfailed() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.enlistfailed");
- }
+ public String get_infoerror() {
+ return "ARJUNA-17021 Could not get transaction information.";
}
- public void log_getmoderror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.getmoderror");
- }
+ public void warn_isolationlevelfailset(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-17024 {0} - failed to set isolation level", arg0);
}
- public void log_idrcclose() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.idrcclose");
- }
+ public String get_jndierror() {
+ return "ARJUNA-17025 Could not resolve JNDI XADataSource";
}
- public void log_inactivetransaction() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.inactivetransaction");
- }
+ public String get_nojdbcimple(String arg0) {
+ return MessageFormat.format("ARJUNA-17026 Can't load ConnectionImple class {0}", arg0);
}
- public void log_infoerror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.infoerror");
- }
+ public void warn_recovery_basic_initexp(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-17027 An exception occurred during initialisation.", (Object)null);
}
- public void log_ircdest() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.ircdest");
- }
+ public void warn_recovery_basic_xarec(String arg0) {
+ logger.logv(WARN, "ARJUNA-17028 {0} could not find information for connection!", arg0);
}
- public void log_isolationlevelfailget(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.isolationlevelfailget", new Object[] {arg0, arg1});
- }
+ public void warn_recovery_xa_initexp(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-17029 An exception occurred during initialisation.", (Object)null);
}
- public void log_isolationlevelfailset(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.isolationlevelfailset", new Object[] {arg0, arg1});
- }
+ public String get_releasesavepointerror() {
+ return "ARJUNA-17031 rollback(Savepoint) not allowed inside distributed tx.";
}
- public void log_jndierror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.jndierror");
- }
+ public void warn_rollbackerror(String arg0) {
+ logger.logv(WARN, "ARJUNA-17032 {0} - could not mark transaction rollback", arg0);
}
- public void log_nojdbcimple(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.nojdbcimple", new Object[] {arg0});
- }
+ public String get_rollbacksavepointerror() {
+ return "ARJUNA-17033 rollback(Savepoint) not allowed inside distributed tx.";
}
- public void log_recovery_basic_initexp() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.recovery.basic.initexp");
- }
+ public String get_setreadonly() {
+ return "ARJUNA-17034 Cannot set readonly when within a transaction!";
}
- public void log_recovery_basic_xarec(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.recovery.basic.xarec", new Object[] {arg0});
- }
+ public String get_setsavepointerror() {
+ return "ARJUNA-17035 setSavepoint not allowed inside distributed tx.";
}
- public void log_recovery_xa_initexp() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.recovery.xa.initexp");
- }
+ public String get_xa_recjndierror() {
+ return "ARJUNA-17037 Could not resolve JNDI XADataSource";
}
-
- public void log_recovery_xa_xarec(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.recovery.xa.xarec", new Object[] {arg0});
- }
- }
-
- public void log_releasesavepointerror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.releasesavepointerror");
- }
- }
-
- public void log_rollbackerror(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.rollbackerror", new Object[] {arg0});
- }
- }
-
- public void log_rollbacksavepointerror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.rollbacksavepointerror");
- }
- }
-
- public void log_setreadonly() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.setreadonly");
- }
- }
-
- public void log_setsavepointerror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.setsavepointerror");
- }
- }
-
- public void log_stateerror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.stateerror");
- }
- }
-
- public void log_xa_recjndierror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jdbc.xa.recjndierror");
- }
- }
-
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcLogger.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcLogger.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -32,18 +32,17 @@
package com.arjuna.ats.jdbc.logging;
import com.arjuna.common.util.logging.*;
+import org.jboss.logging.Logger;
public class jdbcLogger
{
public static LogNoi18n logger;
- public static Logi18n loggerI18N;
public static jdbcI18NLogger i18NLogger;
public static void initialize(LogNoi18n noi18n, Logi18n i18n)
{
logger = noi18n;
- loggerI18N = i18n;
- i18NLogger = new jdbcI18NLoggerImpl(i18n);
+ i18NLogger = new jdbcI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.jdbc"));
}
static
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/JTATransactionLogXAResourceOrphanFilter.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/JTATransactionLogXAResourceOrphanFilter.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/JTATransactionLogXAResourceOrphanFilter.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -28,6 +28,7 @@
import com.arjuna.ats.internal.jta.transaction.arjunacore.AtomicAction;
import com.arjuna.ats.jta.logging.jtaLogger;
import com.arjuna.ats.jta.recovery.XAResourceOrphanFilter;
+import com.arjuna.ats.jta.utils.XAHelper;
import com.arjuna.ats.jta.xa.XATxConverter;
import com.arjuna.ats.jta.xa.XidImple;
@@ -66,9 +67,6 @@
*
* @return <code>boolean</code>true if there is a log file,
* <code>false</code> if there isn't.
- *
- * @message com.arjuna.ats.internal.jta.recovery.notaxid {0} not an Arjuna
- * XID
*/
private boolean transactionLog(Xid xid)
{
@@ -114,13 +112,7 @@
}
else
{
- if (jtaLogger.logger.isInfoEnabled())
- {
- jtaLogger.loggerI18N.info(
- "com.arjuna.ats.internal.jta.recovery.notaxid",
- new Object[]
- { xid });
- }
+ jtaLogger.i18NLogger.info_recovery_notaxid(XAHelper.xidToString(xid));
}
return false;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/NodeNameXAResourceOrphanFilter.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/NodeNameXAResourceOrphanFilter.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/NodeNameXAResourceOrphanFilter.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -80,15 +80,7 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jta.recovery.noxanodes No XA recovery
- * nodes specified. May not recover orphans.
- */
private void doWarning() {
- if (jtaLogger.loggerI18N.isInfoEnabled())
- {
- jtaLogger.loggerI18N
- .info("com.arjuna.ats.internal.jta.recovery.noxanodes");
- }
+ jtaLogger.i18NLogger.info_recovery_noxanodes();
}
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -40,7 +40,6 @@
import com.arjuna.ats.internal.arjuna.common.UidHelper;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.AtomicAction;
import com.arjuna.ats.jta.logging.jtaLogger;
import com.arjuna.ats.jta.common.jtaPropertyManager;
@@ -100,28 +99,9 @@
}
-
- /**
- * @message com.arjuna.ats.internal.jta.recovery.xafirstpass {0} - first
- * pass
- * @message com.arjuna.ats.internal.jta.recovery.alluids could not get all
- * object Uids.
- * @message com.arjuna.ats.internal.jta.recovery.objstoreerror {0}
- * @message com.arjuna.ats.internal.jta.recovery.periodicfirstpass {0}
- * exception
- * @message com.arjuna.ats.internal.jta.recovery.info.firstpass {0} - first
- * pass
- */
-
public void periodicWorkFirstPass()
{
- if (jtaLogger.loggerI18N.isInfoEnabled())
- {
- jtaLogger.loggerI18N.info(
- "com.arjuna.ats.internal.jta.recovery.info.firstpass",
- new Object[]
- { _logName });
- }
+ jtaLogger.i18NLogger.info_recovery_firstpass(_logName);
_uids = new InputObjectState();
@@ -133,56 +113,24 @@
{
if (!_objStore.allObjUids(_recoveryManagerClass.type(), _uids))
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn("com.arjuna.ats.internal.jta.recovery.alluids");
- }
+ jtaLogger.i18NLogger.warn_recovery_alluids();
}
}
catch (ObjectStoreException e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.recovery.objstoreerror",
- e);
- }
+ jtaLogger.i18NLogger.warn_recovery_objstoreerror(e);
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.recovery.periodicfirstpass",
- new Object[]
- { _logName
- + ".periodicWorkFirstPass exception " },
- e);
- }
+ jtaLogger.i18NLogger.warn_recovery_periodicfirstpass(_logName+".periodicWorkFirstPass", e);
}
}
- /**
- * @message com.arjuna.ats.internal.jta.recovery.periodicsecondpass {0}
- * exception
- * @message com.arjuna.ats.internal.jta.recovery.info.secondpass {0} -
- * second pass
- */
-
public void periodicWorkSecondPass()
{
if (jtaLogger.logger.isInfoEnabled())
{
- if (jtaLogger.loggerI18N.isInfoEnabled())
- {
- jtaLogger.loggerI18N.info(
- "com.arjuna.ats.internal.jta.recovery.info.secondpass",
- new Object[]
- { _logName });
- }
+ jtaLogger.i18NLogger.info_recovery_secondpass(_logName);
}
try
@@ -210,16 +158,7 @@
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.recovery.periodicsecondpass",
- new Object[]
- { _logName
- + ".periodicWorkSecondPass exception " },
- e);
- }
+ jtaLogger.i18NLogger.warn_recovery_periodicsecondpass(_logName+".periodicWorkSecondPass", e);
}
clearAllFailures();
@@ -261,16 +200,6 @@
return null;
}
- /**
- * @message com.arjuna.ats.internal.jta.recovery.constfail {0}
- * @message com.arjuna.ats.internal.jta.recovery.classloadfail {0} - could
- * not get class name for {1}
- * @message com.arjuna.ats.internal.jta.recovery.general Caught exception:
- * {0} for {1}
- * @message com.arjuna.ats.internal.jta.recovery.info.loading {0} loading
- * {1}
- */
-
protected XARecoveryModule(String recoveryClass, String logName)
{
_logName = logName;
@@ -284,12 +213,7 @@
}
catch (Exception ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.recovery.constfail", ex);
- }
-
+ jtaLogger.i18NLogger.warn_recovery_constfail(ex);
_recoveryManagerClass = null;
}
@@ -297,20 +221,6 @@
_xaResourceOrphanFilters = jtaPropertyManager.getJTAEnvironmentBean().getXaResourceOrphanFilters();
}
- /**
- * @message com.arjuna.ats.internal.jta.recovery.recoveryfailed JTA failed
- * to recovery {0}; got status {1}
- * @message com.arjuna.ats.internal.jta.recovery.recoverydelayed JTA
- * recovery delayed for {0}; got status {1} so waiting for
- * coordinator driven recovery
- * @message com.arjuna.ats.internal.jta.recovery.recoveryerror Recovery
- * threw:
- * @message com.arjuna.ats.internal.jta.recovery.cannotadd Cannot add
- * resource to table: no XID value available.
- * @message com.arjuna.ats.internal.jta.recovery.unexpectedrecoveryerror
- * Unexpceted recovery error:
- */
-
private final boolean transactionInitiatedRecovery()
{
Uid theUid = null;
@@ -359,33 +269,11 @@
problem = false;
- if (jtaLogger.loggerI18N
- .isInfoEnabled())
- {
- jtaLogger.loggerI18N
- .info(
- "com.arjuna.ats.internal.jta.recovery.recoverydelayed",
- new Object[]
- {
- theUid,
- new Integer(
- recoveryStatus) });
- }
+ jtaLogger.i18NLogger.info_recovery_recoverydelayed(theUid, Integer.toString(recoveryStatus));
}
else
{
- if (jtaLogger.loggerI18N
- .isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.recovery.recoveryfailed",
- new Object[]
- {
- theUid,
- new Integer(
- recoveryStatus) });
- }
+ jtaLogger.i18NLogger.warn_recovery_recoveryfailed(theUid, Integer.toString(recoveryStatus));
}
}
else
@@ -422,13 +310,7 @@
{
problem = true;
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.recovery.recoveryerror",
- e);
- }
+ jtaLogger.i18NLogger.warn_recovery_recoveryerror(e);
}
if (problem && (record != null))
@@ -444,11 +326,7 @@
if (record.getXid() == null)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn("com.arjuna.ats.internal.jta.recovery.cannotadd");
- }
+ jtaLogger.i18NLogger.warn_recovery_cannotadd();
}
else
{
@@ -464,13 +342,7 @@
}
catch (Throwable e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.recovery.unexpectedrecoveryerror",
- e);
- }
+ jtaLogger.i18NLogger.warn_recovery_unexpectedrecoveryerror(e);
}
}
@@ -498,8 +370,6 @@
* Note we cannot use the method that works with Transactions and
* TransactionalObjects, of checking with original process that created the
* transaction, because we don't know which process it was.
- *
- * @message com.arjuna.ats.internal.jta.recovery.getxaresource Caught:
*/
private final boolean resourceInitiatedRecovery()
@@ -529,25 +399,13 @@
}
catch (Exception exp)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.recovery.getxaresource",
- exp);
- }
+ jtaLogger.i18NLogger.warn_recovery_getxaresource(exp);
}
}
}
catch (Exception ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.recovery.getxaresource",
- ex);
- }
+ jtaLogger.i18NLogger.warn_recovery_getxaresource(ex);
}
}
}
@@ -576,21 +434,14 @@
}
catch (Exception ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn("com.arjuna.ats.internal.jta.recovery.getxaresource", ex);
- }
+ jtaLogger.i18NLogger.warn_recovery_getxaresource(ex);
}
}
}
}
catch (Exception ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.recovery.getxaresource", ex);
- }
+ jtaLogger.i18NLogger.warn_recovery_getxaresource(ex);
}
}
}
@@ -599,25 +450,6 @@
}
- /**
- * @message com.arjuna.ats.internal.jta.recovery.xarecovery1 {0} got XA
- * exception {1}, {2}
- * @message com.arjuna.ats.internal.jta.recovery.xarecovery2 {0} got
- * exception {1}
- * @message com.arjuna.ats.internal.jta.recovery.failedtorecover {0} -
- * failed to recover XAResource.
- * @message com.arjuna.ats.internal.jta.recovery.forgetfailed {0} - forget
- * threw: {1}
- * @message com.arjuna.ats.internal.jta.recovery.generalrecoveryerror {0} -
- * caught {1}
- * @message com.arjuna.ats.internal.jta.recovery.info.rollingback Rolling
- * back {0}
- * @message com.arjuna.ats.internal.jta.recovery.info.rollingbackignore Ignoring
- * Xid {0} and leaving for transaction recovery to drive.
- * @message com.arjuna.ats.internal.jta.recovery.info.notrollback Told not
- * to rollback {0}
- */
-
private final boolean xaRecovery(XAResource xares)
{
if (jtaLogger.logger.isDebugEnabled()) {
@@ -640,14 +472,7 @@
}
catch (XAException e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.recovery.xarecovery1",
- new Object[]
- { _logName + ".xaRecovery ", e,
- XAHelper.printXAErrorCode(e) });
- }
+ jtaLogger.i18NLogger.warn_recovery_xarecovery1(_logName+".xaRecovery", XAHelper.printXAErrorCode(e), e);
try
{
@@ -761,18 +586,7 @@
if (recoveryStatus != XARecoveryResource.RECOVERED_OK)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.recovery.failedtorecover",
- new Object[]
- {
- _logName
- + ".xaRecovery ",
- new Integer(
- recoveryStatus) });
- }
+ jtaLogger.i18NLogger.warn_recovery_failedtorecover(_logName+".xaRecovery", Integer.toString(recoveryStatus));
}
removeFailure(record.getXid(), record.get_uid());
@@ -786,15 +600,7 @@
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.recovery.forgetfailed",
- new Object[]
- { _logName + ".xaRecovery",
- e });
- }
+ jtaLogger.i18NLogger.warn_recovery_forgetfailed(_logName+".xaRecovery", e);
}
}
@@ -804,14 +610,7 @@
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.recovery.generalrecoveryerror",
- new Object[]
- { _logName + ".xaRecovery", e }, e);
- }
+ jtaLogger.i18NLogger.warn_recovery_generalrecoveryerror(_logName + ".xaRecovery", e);
}
try
@@ -821,14 +620,7 @@
}
catch (XAException e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.recovery.xarecovery1",
- new Object[]
- { _logName + ".xaRecovery", e,
- XAHelper.printXAErrorCode(e) });
- }
+ jtaLogger.i18NLogger.warn_recovery_xarecovery1(_logName+".xaRecovery", XAHelper.printXAErrorCode(e), e);
}
return true;
@@ -868,12 +660,7 @@
{
if(votingOutcome == XAResourceOrphanFilter.Vote.ROLLBACK)
{
- if (jtaLogger.loggerI18N.isInfoEnabled())
- {
- jtaLogger.loggerI18N
- .info("com.arjuna.ats.internal.jta.recovery.info.rollingback",
- new Object[] { XAHelper.xidToString(xid) });
- }
+ jtaLogger.i18NLogger.info_recovery_rollingback(XAHelper.xidToString(xid));
xares.rollback(xid);
}
@@ -900,13 +687,7 @@
}
catch (Exception e2)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.recovery.xarecovery2",
- new Object[] { _logName + ".xaRecovery ", e2 });
- }
+ jtaLogger.i18NLogger.warn_recovery_xarecovery2(_logName+".xaRecovery", e2);
}
return false;
}
@@ -1004,11 +785,6 @@
failureItem.addElement(uid);
}
- /**
- * @message com.arjuna.ats.internal.jta.recovery.removefailed {0} - could
- * not remove record for {1}
- */
-
/* remove record uid from failure list */
private void removeFailure(Xid xid, Uid uid)
{
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/SynchronizationImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/SynchronizationImple.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/SynchronizationImple.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -104,9 +104,6 @@
return false;
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.SynchronizationImple SynchronizationImple.afterCompletion - failed for {0} with exception {1}
- */
public boolean afterCompletion (int status)
{
if (jtaLogger.logger.isDebugEnabled()) {
@@ -125,8 +122,7 @@
}
catch (Exception e)
{
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.arjunacore.SynchronizationImple",
- new Object[] { _theSynch, e }, e);
+ jtaLogger.i18NLogger.warn_resources_arjunacore_SynchronizationImple(_theSynch.toString(), e);
return false; // should not cause any affect!
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAOnePhaseResource.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAOnePhaseResource.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAOnePhaseResource.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -47,11 +47,10 @@
import com.arjuna.ats.arjuna.state.InputObjectState;
import com.arjuna.ats.arjuna.state.OutputObjectState;
import com.arjuna.ats.jta.logging.jtaLogger;
+import com.arjuna.ats.jta.utils.XAHelper;
import com.arjuna.ats.jta.xa.RecoverableXAConnection;
import com.arjuna.ats.jta.xa.XidImple;
-
-
/**
* One Phase resource wrapper for XAResources.
* @author Kevin Conner (Kevin.Conner at arjuna.com)
@@ -179,9 +178,6 @@
/**
* Commit the one phase resource.
* @return TwoPhaseOutcome.FINISH_OK or TwoPhaseOutcome.FINISH_ERROR
- *
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.rollbackexception
- * XAOnePhaseResource.rollback for {0} failed with exception {1}
*/
public int rollback()
{
@@ -192,11 +188,7 @@
}
catch (final XAException xae)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.rollbackexception",
- new Object[] {xid, xae.getMessage()}, xae);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_XAOnePhaseResource_rollbackexception(XAHelper.xidToString(xid), xae);
}
catch (final Throwable ex)
{
@@ -211,9 +203,6 @@
/**
* Pack the state of the resource.
* @param os The object output state.
- *
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.pack
- * XAOnePhaseResource.pack failed to serialise resource {0}
*/
public void pack(final OutputObjectState os)
throws IOException
@@ -241,11 +230,7 @@
}
catch (final IOException ioe)
{
- final String message = jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.pack", new Object[] {ioe}) ;
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.pack", new Object[] {ioe});
- }
+ final String message = jtaLogger.i18NLogger.get_resources_arjunacore_XAOnePhaseResource_pack();
IOException ioException = new IOException(message);
ioException.initCause(ioe);
throw ioException;
@@ -257,12 +242,6 @@
/**
* Unpack the state of the resource.
* @param is The object input state.
- *
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.unpack
- * failed to deserialise resource {0}
- *
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.unpackType
- * Unknown recovery type {0}
*/
public void unpack(final InputObjectState is)
throws IOException
@@ -329,14 +308,8 @@
}
break ;
default:
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.unpackType",
- new Object[] {new Integer(recoveryType)});
- }
- final String message = jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.unpackType",
- new Object[] {new Integer(recoveryType)}) ;
- throw new IOException(message) ;
+ final String message = jtaLogger.i18NLogger.get_resources_arjunacore_XAOnePhaseResource_unpackType(Integer.toString(recoveryType));
+ throw new IOException(message);
}
}
@@ -347,11 +320,7 @@
*/
private static IOException generateUnpackError(final Exception ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.unpack", new Object[] {ex}, ex);
- }
- final String message = jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.unpack", new Object[] {ex}) ;
- return new IOException(message) ;
+ final String message = jtaLogger.i18NLogger.get_resources_arjunacore_XAOnePhaseResource_unpack();
+ return new IOException(message, ex) ;
}
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -42,8 +42,6 @@
import com.arjuna.ats.jta.resources.StartXAResource;
import com.arjuna.ats.jta.resources.EndXAResource;
-import com.arjuna.common.util.logging.*;
-
import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple;
import com.arjuna.ats.internal.jta.xa.TxInfo;
import com.arjuna.ats.internal.jta.resources.XAResourceErrorHandler;
@@ -73,19 +71,6 @@
* @author Mark Little (mark_little at hp.com)
* @version $Id: XAResourceRecord.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.2.4.
- *
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.noresource
- * [com.arjuna.ats.internal.jta.resources.arjunacore.noresource]
- * No XAResource to recover {0}
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.assumecomplete
- * [com.arjuna.ats.internal.jta.resources.arjunacore.assumecomplete]
- * Being told to assume complete on Xid {0}
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.savestateerror
- * [com.arjuna.ats.internal.jta.resources.arjunacore.savestateerror]
- * An error occurred during save_state for XAResource {0} and transaction {1}
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.restorestateerror
- * [com.arjuna.ats.internal.jta.resources.arjunacore.restorestateerror]
- * An error occurred during restore_state for XAResource {0} and transaction {1}
*/
public class XAResourceRecord extends AbstractRecord
@@ -168,22 +153,9 @@
return _theXAResource;
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.setvalue
- * [com.arjuna.ats.internal.jta.resources.arjunacore.setvalue] {0}
- * called illegally.
- */
-
public void setValue(Object o)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.setvalue",
- new Object[]
- { "XAResourceRecord::set_value()" });
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_setvalue("XAResourceRecord::set_value()");
}
public int nestedAbort()
@@ -205,15 +177,6 @@
return TwoPhaseOutcome.PREPARE_OK; // do nothing
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.preparenulltx
- * [com.arjuna.ats.internal.jta.resources.arjunacore.preparenulltx]
- * {0} - null transaction!
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.preparefailed
- * [com.arjuna.ats.internal.jta.resources.arjunacore.preparefailed]
- * prepare on {0} ({1}) failed with exception {2}
- */
-
public int topLevelPrepare()
{
if (jtaLogger.logger.isDebugEnabled()) {
@@ -222,14 +185,7 @@
if (!_valid || (_theXAResource == null) || (_tranID == null))
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.preparenulltx",
- new Object[]
- { "XAResourceRecord.prepare" });
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_preparenulltx("XAResourceRecord.prepare");
removeConnection();
@@ -260,12 +216,8 @@
}
catch (XAException e1)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.preparefailed",
- new Object[] { _tranID, _theXAResource, XAHelper.printXAErrorCode(e1) }, e1);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_preparefailed(XAHelper.xidToString(_tranID),
+ _theXAResource.toString(), XAHelper.printXAErrorCode(e1), e1);
/*
* XA_RB*, XAER_RMERR, XAER_RMFAIL, XAER_NOTA, XAER_INVAL, or
@@ -297,12 +249,8 @@
}
catch (Exception e2)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.preparefailed",
- new Object[] { _tranID, _theXAResource, e2.toString() }, e2);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_preparefailed(XAHelper.xidToString(_tranID),
+ _theXAResource.toString(), "-", e2);
if (_rollbackOptimization) // won't have rollback called on it
removeConnection();
@@ -311,15 +259,6 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.rollbacknulltx
- * [com.arjuna.ats.internal.jta.resources.arjunacore.rollbacknulltx]
- * {0} - null transaction!
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.rollbackerror
- * [com.arjuna.ats.internal.jta.resources.arjunacore.rollbackerror]
- * attempted rollback of {0} ({1}) failed with exception {2}
- */
-
public int topLevelAbort()
{
if (jtaLogger.logger.isDebugEnabled()) {
@@ -341,14 +280,7 @@
if (_tranID == null)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.rollbacknulltx",
- new Object[]
- { "XAResourceRecord.rollback" });
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_rollbacknulltx("XAResourceRecord.rollback");
return TwoPhaseOutcome.FINISH_ERROR;
}
@@ -384,12 +316,8 @@
}
else
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.rollbackerror",
- new Object[] { _tranID, _theXAResource, XAHelper.printXAErrorCode(e1) }, e1);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_rollbackerror(XAHelper.xidToString(_tranID),
+ _theXAResource.toString(), XAHelper.printXAErrorCode(e1), e1);
removeConnection();
@@ -398,12 +326,7 @@
}
catch(RuntimeException e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.rollbackerror",
- new Object[] { _tranID, _theXAResource, e.toString() }, e);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_rollbackerror(XAHelper.xidToString(_tranID), _theXAResource.toString(), "-", e);
throw e;
}
@@ -420,12 +343,8 @@
}
else
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.rollbackerror",
- new Object[] { _tranID, _theXAResource, XAHelper.printXAErrorCode(e1) }, e1);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_rollbackerror(XAHelper.xidToString(_tranID),
+ _theXAResource.toString(), XAHelper.printXAErrorCode(e1), e1);
switch (e1.errorCode)
{
@@ -458,12 +377,8 @@
}
catch (Exception e2)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.rollbackerror",
- new Object[] { _tranID, _theXAResource, e2.toString() }, e2);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_rollbackerror(XAHelper.xidToString(_tranID),
+ _theXAResource.toString(), "-", e2);
return TwoPhaseOutcome.FINISH_ERROR;
}
@@ -475,23 +390,12 @@
}
else
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.noresource",
- new Object[] {_tranID});
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_noresource(XAHelper.xidToString(_tranID));
if (XAResourceRecord._assumedComplete)
{
- if (jtaLogger.loggerI18N.isInfoEnabled())
- {
- jtaLogger.loggerI18N
- .info(
- "com.arjuna.ats.internal.jta.resources.arjunacore.assumecomplete",
- new Object[] {_tranID});
- }
+ jtaLogger.i18NLogger.info_resources_arjunacore_assumecomplete(XAHelper.xidToString(_tranID));
+
return TwoPhaseOutcome.FINISH_OK;
}
@@ -503,14 +407,6 @@
return TwoPhaseOutcome.FINISH_OK;
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.commitnulltx
- * [com.arjuna.ats.internal.jta.resources.arjunacore.commitnulltx]
- * {0} - null transaction!
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.commitxaerror
- * [com.arjuna.ats.internal.jta.resources.arjunacore.commitxaerror]
- * commit on {0} ({1}) failed with exception {2}
- */
public int topLevelCommit()
{
if (jtaLogger.logger.isDebugEnabled()) {
@@ -522,14 +418,7 @@
if (_tranID == null)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.commitnulltx",
- new Object[]
- { "XAResourceRecord.commit" });
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_commitnulltx("XAResourceRecord.commit");
return TwoPhaseOutcome.FINISH_ERROR;
}
@@ -560,12 +449,8 @@
}
else
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.commitxaerror",
- new Object[] { _tranID, _theXAResource, XAHelper.printXAErrorCode(e1) }, e1);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_commitxaerror(XAHelper.xidToString(_tranID),
+ _theXAResource.toString(), XAHelper.printXAErrorCode(e1), e1);
/*
* XA_HEURHAZ, XA_HEURCOM, XA_HEURRB, XA_HEURMIX,
@@ -618,12 +503,8 @@
}
catch (Exception e2)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.commitxaerror",
- new Object[] { _tranID, _theXAResource, e2.toString() }, e2);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_commitxaerror(XAHelper.xidToString(_tranID),
+ _theXAResource.toString(), "-", e2);
return TwoPhaseOutcome.FINISH_ERROR;
}
@@ -634,23 +515,11 @@
}
else
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.noresource",
- new Object[] {_tranID});
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_noresource(XAHelper.xidToString(_tranID));
if (XAResourceRecord._assumedComplete)
{
- if (jtaLogger.loggerI18N.isInfoEnabled())
- {
- jtaLogger.loggerI18N
- .info(
- "com.arjuna.ats.internal.jta.resources.arjunacore.assumecomplete",
- new Object[] {_tranID});
- }
+ jtaLogger.i18NLogger.info_resources_arjunacore_assumecomplete(XAHelper.xidToString(_tranID));
return TwoPhaseOutcome.FINISH_OK;
}
@@ -682,14 +551,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.arjunacore.opcnulltx
- * [com.arjuna.ats.internal.jta.resources.arjunacore.opcnulltx] {0} -
- * null transaction!
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.opcerror
- * [com.arjuna.ats.internal.jta.resources.arjunacore.opcerror]
- * onePhaseCommit on {0} ({1}) failed with exception {2}
- *
*/
public int topLevelOnePhaseCommit()
@@ -702,14 +563,7 @@
if (_tranID == null)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.opcnulltx",
- new Object[]
- { "XAResourceRecord.1pc" });
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_opcnulltx("XAResourceRecord.1pc");
return TwoPhaseOutcome.ONE_PHASE_ERROR; // rolled back!!
}
@@ -773,12 +627,8 @@
case XAException.XAER_RMFAIL:
default:
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.opcerror",
- new Object[] { _tranID, _theXAResource, XAHelper.printXAErrorCode(e1) }, e1);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_opcerror(XAHelper.xidToString(_tranID),
+ _theXAResource.toString(), XAHelper.printXAErrorCode(e1), e1);
removeConnection();
@@ -788,12 +638,8 @@
}
catch(RuntimeException e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.opcerror",
- new Object[] { _tranID, _theXAResource, e.toString() }, e);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_opcerror(XAHelper.xidToString(_tranID),
+ _theXAResource.toString(), "-", e);
throw e;
}
@@ -815,12 +661,8 @@
}
catch (XAException e1)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.opcerror",
- new Object[] { _tranID, _theXAResource, XAHelper.printXAErrorCode(e1) }, e1);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_opcerror(XAHelper.xidToString(_tranID),
+ _theXAResource.toString(), XAHelper.printXAErrorCode(e1), e1);
/*
* XA_HEURHAZ, XA_HEURCOM, XA_HEURRB, XA_HEURMIX,
@@ -864,12 +706,8 @@
}
catch (Exception e2)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.opcerror",
- new Object[] { _tranID, _theXAResource, e2.toString() }, e2);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_opcerror(XAHelper.xidToString(_tranID),
+ _theXAResource.toString(), "-", e2);
return TwoPhaseOutcome.FINISH_ERROR;
}
@@ -944,12 +782,6 @@
return XARecoveryResource.WAITING_FOR_RECOVERY;
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.savestate
- * [com.arjuna.ats.internal.jta.resources.arjunacore.savestate]
- * Could not serialize a Serializable XAResource!
- */
-
public boolean save_state(OutputObjectState os, int t)
{
boolean res = false;
@@ -990,11 +822,7 @@
}
catch (NotSerializableException ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn("com.arjuna.ats.internal.jta.resources.arjunacore.savestate");
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_savestate();
return false;
}
@@ -1018,14 +846,7 @@
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.savestateerror",
- new Object[]
- { _theXAResource, _tranID }, e);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_savestateerror(_theXAResource.toString(), XAHelper.xidToString(_tranID), e);
res = false;
}
@@ -1036,16 +857,6 @@
return res;
}
- /**
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.restorestate
- * [com.arjuna.ats.internal.jta.resources.arjunacore.restorestate]
- * Exception on attempting to restore XAResource
- * @message com.arjuna.ats.internal.jta.resources.arjunacore.norecoveryxa
- * [com.arjuna.ats.internal.jta.resources.arjunacore.norecoveryxa]
- * Could not find new XAResource to use for recovering
- * non-serializable XAResource {0}
- */
-
public boolean restore_state(InputObjectState os, int t)
{
boolean res = false;
@@ -1084,13 +895,7 @@
{
// not serializable in the first place!
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.restorestate",
- ex);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_restorestate(ex);
return false;
}
@@ -1105,11 +910,7 @@
if (_theXAResource == null)
{
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.norecoveryxa",
- new Object[]
- { _tranID });
+ jtaLogger.i18NLogger.warn_resources_arjunacore_norecoveryxa(XAHelper.xidToString(_tranID));
/*
* Don't prevent tx from activating because there may be
@@ -1142,14 +943,7 @@
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.resources.arjunacore.restorestateerror",
- new Object[]
- { _theXAResource, _tranID }, e);
- }
+ jtaLogger.i18NLogger.warn_resources_arjunacore_restorestateerror(_theXAResource.toString(), XAHelper.xidToString(_tranID), e);
res = false;
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -41,12 +41,6 @@
import java.lang.IllegalStateException;
-/**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.notx
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.notx] no
- * transaction!
- */
-
public class BaseTransaction
{
@@ -105,10 +99,6 @@
* other resources, this is then the same as having simply been forced to
* rollback the transaction during phase 1. The OTS interfaces do not allow
* a differentiation.
- *
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.cmfailunknownstatus
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.cmfailunknownstatus]
- * commit failed with status:
*/
public void commit() throws javax.transaction.RollbackException,
@@ -126,18 +116,11 @@
if (theTransaction == null)
throw new IllegalStateException(
"BaseTransaction.commit - "
- + jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.notx"));
+ + jtaLogger.i18NLogger.get_transaction_arjunacore_notx());
theTransaction.commitAndDisassociate();
}
- /**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.abfailunknownstatus
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.abfailunknownstatus]
- * rollback failed with status:
- */
-
public void rollback() throws java.lang.IllegalStateException,
java.lang.SecurityException, javax.transaction.SystemException
{
@@ -150,21 +133,11 @@
if (theTransaction == null)
throw new IllegalStateException(
"BaseTransaction.rollback - "
- + jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.notx"));
+ + jtaLogger.i18NLogger.get_transaction_arjunacore_notx());
theTransaction.rollbackAndDisassociate();
}
- /**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.nosuchtx
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.nosuchtx] No
- * such transaction!
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.rbofail
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.rbofail]
- * Could not mark transaction as rollback only.
- */
-
public void setRollbackOnly() throws java.lang.IllegalStateException,
javax.transaction.SystemException
{
@@ -176,8 +149,7 @@
if (theTransaction == null)
throw new IllegalStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.nosuchtx"));
+ jtaLogger.i18NLogger.get_transaction_arjunacore_nosuchtx());
theTransaction.setRollbackOnly();
}
@@ -270,10 +242,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.arjunacore.alreadyassociated
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.alreadyassociated]
- * thread is already associated with a transaction!
*/
final void checkTransactionState() throws IllegalStateException,
@@ -292,7 +260,7 @@
{
throw new IllegalStateException(
"BaseTransaction.checkTransactionState - "
- + jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.alreadyassociated"));
+ + jtaLogger.i18NLogger.get_transaction_arjunacore_alreadyassociated());
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -51,8 +51,6 @@
import com.arjuna.ats.arjuna.coordinator.*;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.common.util.logging.*;
-
import javax.transaction.xa.*;
import java.util.*;
@@ -68,28 +66,6 @@
* Is given an AtomicAction, but uses the TwoPhaseCoordinator aspects of it to
* ensure that the thread association continues.
*/
-
-/**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.inactive
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.inactive] The
- * transaction is not active!
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.nullres
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.nullres]
- * Resource paramater is null!
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.illresstate
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.illresstate]
- * illegal resource state
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.notatomicaction
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.notatomicaction]
- * Current transaction is not an AtomicAction!
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.lastResourceOptimisationInterface
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.lastResourceOptimisationInterface] -
- * failed to load Last Resource Optimisation Interface
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.invalidstate
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.invalidstate] The
- * transaction is in an invalid state!
- */
-
public class TransactionImple implements javax.transaction.Transaction,
com.arjuna.ats.jta.transaction.Transaction
{
@@ -177,10 +153,6 @@
* HeuristicRollback from a resource, and can successfully rollback the
* other resources, this is then the same as having simply been forced to
* rollback the transaction during phase 1.
- *
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.commitwhenaborted
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.commitwhenaborted]
- * Could not commit transaction.
*/
public void commit() throws javax.transaction.RollbackException,
@@ -201,9 +173,7 @@
case ActionStatus.ABORT_ONLY:
break;
default:
- throw new IllegalStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ throw new IllegalStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_inactive() );
}
/*
@@ -232,8 +202,7 @@
case ActionStatus.H_ROLLBACK:
case ActionStatus.ABORTED:
RollbackException rollbackException = new RollbackException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.commitwhenaborted"));
+ jtaLogger.i18NLogger.get_transaction_arjunacore_commitwhenaborted() );
if (_theTransaction.getDeferredThrowable() != null)
{
rollbackException.initCause(_theTransaction
@@ -241,30 +210,13 @@
}
throw rollbackException;
default:
- throw new IllegalStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.invalidstate"));
+ throw new IllegalStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_invalidstate() );
}
}
else
- throw new IllegalStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ throw new IllegalStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_inactive() );
}
- /**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.rollbackstatus
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.rollbackstatus]
- * Transaction rollback status is:
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.endsuspendfailed1
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.endsuspendfailed1]
- * Ending suspended RMs failed when rolling back the transaction!
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.endsuspendfailed2
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.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
{
@@ -280,9 +232,7 @@
case ActionStatus.ABORT_ONLY:
break;
default:
- throw new IllegalStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ throw new IllegalStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_inactive() );
}
/*
@@ -295,11 +245,7 @@
if (endSuspendedFailed)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn("com.arjuna.ats.internal.jta.transaction.arjunacore.endsuspendfailed1");
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_endsuspendfailed1();
}
int outcome = _theTransaction.cancel(); // use cancel of
@@ -314,21 +260,15 @@
case ActionStatus.ABORTING: // in case of async rollback
break;
default:
- throw new IllegalStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.rollbackstatus")
+ throw new IllegalStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_rollbackstatus()
+ ActionStatus.stringForm(outcome));
}
if (endSuspendedFailed)
- throw new IllegalStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.endsuspendfailed2"));
+ throw new IllegalStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_endsuspendfailed2() );
}
else
- throw new IllegalStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ throw new IllegalStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_inactive() );
}
public void setRollbackOnly() throws java.lang.IllegalStateException,
@@ -353,13 +293,9 @@
break;
case Status.STATUS_PREPARING:
case Status.STATUS_PREPARED:
- throw new InvalidTerminationStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.invalidstate"));
+ throw new InvalidTerminationStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_invalidstate() );
default:
- throw new InactiveTransactionException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ throw new InactiveTransactionException( jtaLogger.i18NLogger.get_transaction_arjunacore_inactive() );
}
}
else
@@ -372,9 +308,7 @@
}
}
else
- throw new IllegalStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ throw new IllegalStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_inactive() );
}
public int getStatus() throws javax.transaction.SystemException
@@ -393,15 +327,6 @@
return status;
}
- /**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.nullparam
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.nullparam]
- * null synchronization parameter!
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.syncsnotallowed
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.syncsnotallowed]
- * Synchronizations are not allowed! Transaction status is
- */
-
public void registerSynchronization(javax.transaction.Synchronization sync)
throws javax.transaction.RollbackException,
java.lang.IllegalStateException, javax.transaction.SystemException
@@ -413,9 +338,7 @@
if (sync == null)
{
throw new javax.transaction.SystemException(
- "TransactionImple.registerSynchronization - "
- + jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.nullparam"));
+ "TransactionImple.registerSynchronization - " + jtaLogger.i18NLogger.get_transaction_arjunacore_nullparam() );
}
registerSynchronizationImple(new SynchronizationImple(sync, false));
@@ -423,12 +346,6 @@
// package-private method also for use by
// TransactionSynchronizationRegistryImple
- /**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.syncwhenaborted
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.syncwhenaborted]
- * Can't register synchronization because the transaction is in
- * aborted state
- */
void registerSynchronizationImple(SynchronizationImple synchronizationImple)
throws javax.transaction.RollbackException,
java.lang.IllegalStateException, javax.transaction.SystemException
@@ -443,24 +360,17 @@
{
case ActionStatus.ABORT_ONLY:
case ActionStatus.ABORTED:
- throw new javax.transaction.RollbackException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.syncwhenaborted"));
+ throw new javax.transaction.RollbackException( jtaLogger.i18NLogger.get_transaction_arjunacore_syncwhenaborted() );
case ActionStatus.CREATED:
- throw new IllegalStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ throw new IllegalStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_inactive() );
default:
throw new IllegalStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.syncsnotallowed")+ActionStatus.stringForm(status));
+ jtaLogger.i18NLogger.get_transaction_arjunacore_syncsnotallowed() + ActionStatus.stringForm(status));
}
}
}
else
- throw new IllegalStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ throw new IllegalStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_inactive() );
}
/**
@@ -480,26 +390,6 @@
return enlistResource(xaRes, null);
}
- /**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.enlisterror
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.enlisterror]
- * {0} - caught: {1}
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.timeouterror[com.arjuna.ats.internal.jta.transaction.arjunacore.timeouterror]
- * {0} setTransactionTimeout on XAResource threw: {1}
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.enliststarterror
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.enliststarterror]
- * {0} - XAResource.start returned: {1} for {2}
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.couldnotregister
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.couldnotregister]
- * could not register transaction
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.xastart
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.xastart] {0} -
- * caught: {1} for {2}
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.elistwhenmarkedrollback
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.elistwhenmarkedrollback]
- * Can't enlist the resource because the transaction is marked for
- * rollback
- */
public boolean enlistResource(XAResource xaRes, Object[] params)
throws RollbackException, IllegalStateException,
javax.transaction.SystemException
@@ -510,9 +400,7 @@
if (xaRes == null)
throw new javax.transaction.SystemException(
- "TransactionImple.enlistResource - "
- + jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.nullres"));
+ "TransactionImple.enlistResource - " + jtaLogger.i18NLogger.get_transaction_arjunacore_nullres() );
int status = getStatus();
@@ -520,15 +408,11 @@
{
case javax.transaction.Status.STATUS_MARKED_ROLLBACK:
throw new RollbackException(
- "TransactionImple.enlistResource - "
- + jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.invalidstate"));
+ "TransactionImple.enlistResource - " + jtaLogger.i18NLogger.get_transaction_arjunacore_invalidstate() );
case javax.transaction.Status.STATUS_ACTIVE:
break;
default:
- throw new IllegalStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ throw new IllegalStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_inactive() );
}
XAModifier theModifier = null;
@@ -635,9 +519,7 @@
// block
throw new IllegalStateException(
- "TransactionImple.enlistResource - "
- + jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.illresstate")
+ "TransactionImple.enlistResource - " + jtaLogger.i18NLogger.get_transaction_arjunacore_illresstate()
+ ":" + info.getState());
}
}
@@ -652,15 +534,8 @@
if (info != null)
info.setState(TxInfo.FAILED);
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.transaction.arjunacore.enlisterror",
- new Object[]
- { "TransactionImple.enlistResource",
- XAHelper.printXAErrorCode(exp) });
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_enlisterror("TransactionImple.enlistResource",
+ XAHelper.printXAErrorCode(exp));
return false;
}
@@ -730,18 +605,7 @@
}
catch (XAException te)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.transaction.arjunacore.timeouterror",
- new Object[]
- {
- "TransactionImple.enlistResource",
- XAHelper
- .printXAErrorCode(te),
- xid });
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_timeouterror("TransactionImple.enlistResource",XAHelper.xidToString(xid), XAHelper.printXAErrorCode(te), te);
}
}
}
@@ -798,18 +662,8 @@
* only.
*/
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.transaction.arjunacore.enliststarterror",
- new Object[]
- {
- "TransactionImple.enlistResource",
- XAHelper
- .printXAErrorCode(e),
- xid });
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_enliststarterror("TransactionImple.enlistResource",
+ XAHelper.xidToString(xid), XAHelper.printXAErrorCode(e), e);
markRollbackOnly();
@@ -818,25 +672,14 @@
if (retry < 0)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.transaction.arjunacore.enliststarterror",
- new Object[]
- {
- "TransactionImple.enlistResource",
- XAHelper
- .printXAErrorCode(e),
- xid });
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_enliststarterror("TransactionImple.enlistResource",
+ XAHelper.xidToString(xid), XAHelper.printXAErrorCode(e), e);
markRollbackOnly();
throw new javax.transaction.SystemException(
"TransactionImple.enlistResource - XAResource.start "
- + jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.couldnotregister")
+ + jtaLogger.i18NLogger.get_transaction_arjunacore_couldnotregister()
+ ": " + xid);
}
}
@@ -866,17 +709,8 @@
}
catch (XAException ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.transaction.arjunacore.xastart",
- new Object[]
- {
- "TransactionImple.enlistResource - xa_start ",
- XAHelper.printXAErrorCode(ex),
- xid });
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_xastart("TransactionImple.enlistResource - xa_start ",
+ XAHelper.xidToString(xid), XAHelper.printXAErrorCode(ex), ex);
markRollbackOnly();
@@ -942,21 +776,6 @@
* sense otherwise!
*/
- /**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.unknownresource
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.unknownresource]
- * {0} - unknown resource
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.delistresource
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.delistresource]
- * {0} - caught exception during delist : {1}
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.delistgeneral
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.delistgeneral]
- * {0} caught exception {1}
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.ressuspended
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.ressuspended]
- * resource already suspended.
- */
-
public boolean delistResource(XAResource xaRes, int flags)
throws IllegalStateException, javax.transaction.SystemException
{
@@ -966,9 +785,7 @@
if (xaRes == null)
throw new javax.transaction.SystemException(
- "TransactionImple.delistResource - "
- + jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.nullres"));
+ "TransactionImple.delistResource - " + jtaLogger.i18NLogger.get_transaction_arjunacore_nullres() );
int status = getStatus();
@@ -979,9 +796,7 @@
case javax.transaction.Status.STATUS_MARKED_ROLLBACK:
break;
default:
- throw new IllegalStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ throw new IllegalStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_inactive() );
}
TxInfo info = null;
@@ -998,14 +813,7 @@
if (info == null)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.transaction.arjunacore.unknownresource",
- new Object[]
- { "TransactionImple.delistResource" });
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_unknownresource("TransactionImple.delistResource");
return false;
}
@@ -1093,9 +901,7 @@
// block
throw new IllegalStateException(
- "TransactionImple.delistResource - "
- + jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.ressuspended"));
+ "TransactionImple.delistResource - " + jtaLogger.i18NLogger.get_transaction_arjunacore_ressuspended() );
}
else
{
@@ -1114,9 +920,8 @@
{
if (!optimizedRollback)
throw new IllegalStateException(
- "TransactionImple.delistResource - "
- + jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.illresstate")
+ "TransactionImple.delistResource - " +
+ jtaLogger.i18NLogger.get_transaction_arjunacore_illresstate()
+ ":" + info.getState());
}
}
@@ -1141,28 +946,13 @@
markRollbackOnly();
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.transaction.arjunacore.delistresource",
- new Object[]
- { "TransactionImple.delistResource",
- XAHelper.printXAErrorCode(exp) });
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_delistresource("TransactionImple.delistResource", XAHelper.printXAErrorCode(exp), exp);
return false;
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.transaction.arjunacore.delistgeneral",
- new Object[]
- { "TransactionImple.delistResource", e });
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_delistgeneral("TransactionImple.delistResource", e);
/*
* Some exception occurred and we probably could not delist the
@@ -1299,11 +1089,7 @@
}
catch (ClassCastException ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn("com.arjuna.ats.internal.jta.transaction.arjunacore.notatomicaction");
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_notatomicaction();
}
if (_theTransaction != null)
@@ -1351,8 +1137,7 @@
case ActionStatus.ABORTED:
case ActionStatus.ABORTING:
_theTransaction.abort(); // assure thread disassociation
- throw new javax.transaction.RollbackException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ throw new javax.transaction.RollbackException( jtaLogger.i18NLogger.get_transaction_arjunacore_inactive() );
case ActionStatus.COMMITTED:
case ActionStatus.COMMITTING: // in case of async commit
@@ -1372,7 +1157,7 @@
case ActionStatus.H_ROLLBACK:
case ActionStatus.ABORTED:
case ActionStatus.ABORTING:
- RollbackException rollbackException = new RollbackException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.commitwhenaborted"));
+ RollbackException rollbackException = new RollbackException( jtaLogger.i18NLogger.get_transaction_arjunacore_commitwhenaborted() );
if(_rollbackOnlyCallerStacktrace != null) {
// we rolled back beacuse the user explicitly told us not to commit. Attach the trace of who did that for debug:
rollbackException.initCause(_rollbackOnlyCallerStacktrace);
@@ -1383,13 +1168,11 @@
}
throw rollbackException;
default:
- throw new InvalidTerminationStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.invalidstate"));
+ throw new InvalidTerminationStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_invalidstate() );
}
}
else
- throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ throw new IllegalStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_inactive() );
}
finally
{
@@ -1442,15 +1225,13 @@
statusIsValid = true;
break;
default:
- throw new InactiveTransactionException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.rollbackstatus")
+ throw new InactiveTransactionException( jtaLogger.i18NLogger.get_transaction_arjunacore_rollbackstatus()
+ ActionStatus.stringForm(outcome));
}
}
if(_theTransaction == null || !statusIsValid) {
- throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ throw new IllegalStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_inactive() );
}
}
finally
@@ -1462,10 +1243,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.arjunacore.xaenderror
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.xaenderror]
- * Could not call end on a suspended resource!
*/
protected boolean endSuspendedRMs()
@@ -1512,11 +1289,7 @@
}
catch (XAException ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn("com.arjuna.ats.internal.jta.transaction.arjunacore.xaenderror");
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_xaenderror(ex);
result = false;
}
@@ -1557,11 +1330,7 @@
}
catch (XAException ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn("com.arjuna.ats.internal.jta.transaction.arjunacore.xaenderror");
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_xaenderror(ex);
result = false;
}
@@ -1580,12 +1349,6 @@
* Oracle 8.1.6 it causes their JDBC driver to crash!
*/
- /**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.threadexception
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.threadexception]
- * Caught the following error: {0}
- */
-
private final boolean threadIsActive(XAResource xaRes)
{
Thread t = Thread.currentThread();
@@ -1630,14 +1393,7 @@
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.transaction.arjunacore.threadexception",
- new Object[]
- { e });
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_threadexception(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
}
@@ -1648,13 +1404,6 @@
/**
* isNewRM returns an existing TxInfo for the same RM, if present. Null
* otherwise.
- *
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.newtmerror
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.newtmerror]
- * {0} caught XAException: {0}
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.isnewrm
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.isnewrm]
- * Caught unexpected exception: {0}
*/
private final TxInfo isNewRM(XAResource xaRes)
@@ -1696,28 +1445,15 @@
}
catch (XAException ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.transaction.arjunacore.newtmerror",
- new Object[]
- { "TransactionImple.isNewRM",
- XAHelper.printXAErrorCode(ex) });
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_newtmerror("TransactionImple.isNewRM",
+ XAHelper.printXAErrorCode(ex), ex);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(ex.toString(), ex);
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.transaction.arjunacore.newtmerror",
- new Object[]
- { e });
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_newtmerror("TransactionImple.isNewRM",
+ "-", e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
}
@@ -1756,12 +1492,6 @@
* the application, so a failure here will only be masked.
*/
- /**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.markrollback
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.markrollback]
- * {0} - could not mark {0} as rollback only
- */
-
private final void markRollbackOnly()
{
try
@@ -1770,15 +1500,8 @@
}
catch (Exception ex)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.transaction.arjunacore.markrollback",
- new Object[]
- { "TransactionImple.markRollbackOnly",
- _theTransaction });
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_markrollback("TransactionImple.markRollbackOnly",
+ _theTransaction.toString());
}
}
@@ -1862,15 +1585,7 @@
}
catch (final Throwable th)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jta.transaction.arjunacore.lastResourceOptimisationInterface",
- new Object[]
- { lastResourceOptimisationInterfaceName },
- th);
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_lastResourceOptimisationInterface(lastResourceOptimisationInterfaceName, th);
}
}
LAST_RESOURCE_OPTIMISATION_INTERFACE = lastResourceOptimisationInterface;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionSynchronizationRegistryImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionSynchronizationRegistryImple.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionSynchronizationRegistryImple.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -47,11 +47,6 @@
private static final long serialVersionUID = 1L;
// Return an opaque object to represent the transaction bound to the current thread at the time this method is called.
- /**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception]
- * The transaction implementation threw a SystemException
- */
public Object getTransactionKey()
{
if (jtaLogger.logger.isDebugEnabled()) {
@@ -66,7 +61,7 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
+ throw new RuntimeException(jtaLogger.i18NLogger.get_transaction_arjunacore_systemexception(), e);
}
if (transactionImple == null) {
@@ -109,11 +104,6 @@
}
// Register a Synchronization instance with special ordering semantics.
- /**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.syncrollbackexception
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.syncrollbackexception]
- * The transaction implementation threw a RollbackException
- */
public void registerInterposedSynchronization(Synchronization synchronization)
{
if (jtaLogger.logger.isDebugEnabled()) {
@@ -128,11 +118,11 @@
}
catch (RollbackException e)
{
- throw new com.arjuna.ats.jta.exceptions.RollbackException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.syncrollbackexception"), e);
+ throw new com.arjuna.ats.jta.exceptions.RollbackException(jtaLogger.i18NLogger.get_transaction_arjunacore_syncrollbackexception(), e);
}
catch (SystemException e)
{
- throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
+ throw new RuntimeException(jtaLogger.i18NLogger.get_transaction_arjunacore_systemexception(), e);
}
}
@@ -150,7 +140,7 @@
}
catch(SystemException e)
{
- throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
+ throw new RuntimeException(jtaLogger.i18NLogger.get_transaction_arjunacore_systemexception(), e);
}
}
@@ -176,7 +166,7 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
+ throw new RuntimeException(jtaLogger.i18NLogger.get_transaction_arjunacore_systemexception(), e);
}
}
@@ -199,7 +189,7 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
+ throw new RuntimeException(jtaLogger.i18NLogger.get_transaction_arjunacore_systemexception(), e);
}
}
@@ -213,7 +203,7 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
+ throw new RuntimeException(jtaLogger.i18NLogger.get_transaction_arjunacore_systemexception(), e);
}
if(transactionImple == null)
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/SubordinationManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/SubordinationManager.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/SubordinationManager.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -80,9 +80,6 @@
SubordinationManager.txType = txType;
}
- /**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.jca.SubordinationManager.importerfailure Failed to create instance of TransactionImporter
- */
private static void initTransactionImporter()
{
if(txType == null) {
@@ -105,14 +102,11 @@
}
catch(Exception e)
{
- jtaLogger.loggerI18N.error("com.arjuna.ats.internal.jta.transaction.arjunacore.jca.SubordinationManager.importerfailure", e);
+ jtaLogger.i18NLogger.error_transaction_arjunacore_jca_SubordinationManager_importerfailure(e);
}
}
}
- /**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.jca.SubordinationManager.terminatorfailure Failed to create instance of XATerminator
- */
private static void initXATerminator()
{
if(txType == null) {
@@ -137,7 +131,7 @@
}
catch(Exception e)
{
- jtaLogger.loggerI18N.error("com.arjuna.ats.internal.jta.transaction.arjunacore.jca.SubordinationManager.terminatorfailure", e);
+ jtaLogger.i18NLogger.error_transaction_arjunacore_jca_SubordinationManager_terminatorfailure(e);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TxWorkManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TxWorkManager.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TxWorkManager.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -59,9 +59,6 @@
*
* @throws WorkCompletedException thrown if there is already work
* associated with the transaction.
- *
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.jca.busy [message
- * com.arjuna.ats.internal.jta.transaction.arjunacore.jca.busy] Work already active!
*/
public static void addWork (Work work, Transaction tx) throws WorkCompletedException
@@ -86,7 +83,7 @@
_transactions.put(tx, workers);
}
else
- throw new WorkCompletedException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.jca.busy"), WorkException.TX_CONCURRENT_WORK_DISALLOWED);
+ throw new WorkCompletedException(jtaLogger.i18NLogger.get_transaction_arjunacore_jca_busy(), WorkException.TX_CONCURRENT_WORK_DISALLOWED);
}
synchronized (workers)
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -34,8 +34,6 @@
import com.arjuna.ats.arjuna.coordinator.ActionStatus;
import com.arjuna.ats.arjuna.coordinator.TwoPhaseOutcome;
-import com.arjuna.common.util.logging.*;
-
import com.arjuna.ats.internal.jta.transaction.arjunacore.AtomicAction;
import com.arjuna.ats.jta.exceptions.InvalidTerminationStateException;
import com.arjuna.ats.jta.exceptions.UnexpectedConditionException;
@@ -47,12 +45,6 @@
// https://jira.jboss.org/jira/browse/JBTM-384
-/**
- * @message com.arjuna.ats.internal.jta.transaction.arjunacore.subordinate.invalidstate
- * [com.arjuna.ats.internal.jta.transaction.arjunacore.subordinate.invalidstate]
- * Not allowed to terminate subordinate transaction directly.
- */
-
public class TransactionImple extends
com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple
{
@@ -110,8 +102,7 @@
java.lang.SecurityException, javax.transaction.SystemException,
java.lang.IllegalStateException
{
- throw new IllegalStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.subordinate.invalidstate"));
+ throw new IllegalStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_subordinate_invalidstate() );
}
/**
@@ -122,8 +113,7 @@
public void rollback () throws java.lang.IllegalStateException,
java.lang.SecurityException, javax.transaction.SystemException
{
- throw new InvalidTerminationStateException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.subordinate.invalidstate"));
+ throw new InvalidTerminationStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_subordinate_invalidstate() );
}
// Should probably return XA status codes, c.f., XAResource.prepare
@@ -211,10 +201,7 @@
if (!endSuspendedRMs())
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.endsuspendfailed1");
- }
+ jtaLogger.i18NLogger.warn_transaction_arjunacore_endsuspendfailed1();
}
int res = subAct.doRollback();
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/TransactionManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/TransactionManager.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/TransactionManager.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -43,9 +43,6 @@
* @param ctx The JNDI initial context to lookup the Transaction Manager reference from.
* @return The transaction manager bound to the appropriate JNDI context. Returns null
* if the transaction manager cannot be found.
- *
- * @message com.arjuna.ats.jta.TransactionManager.jndifailure Failed to lookup transaction manager in JNDI context
- * @message com.arjuna.ats.jta.TransactionManager.generalfailure Failed to create instance of TransactionManager
*/
public static javax.transaction.TransactionManager transactionManager (InitialContext ctx)
{
@@ -57,10 +54,7 @@
}
catch (Exception e)
{
- if ( jtaLogger.loggerI18N.isWarnEnabled() )
- {
- jtaLogger.loggerI18N.warn("com.arjuna.ats.jta.TransactionManager.jndifailure", e);
- }
+ jtaLogger.i18NLogger.warn_TransactionManager_jndifailure(e);
}
return transactionManager;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/UserTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/UserTransaction.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/UserTransaction.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -43,11 +43,6 @@
* Retrieve a reference to the user transaction.
*
* @return The user transaction bound to the appropriate JNDI context
- *
- * @message com.arjuna.ats.jta.UserTransaction.jndifailure Failed to lookup
- * user transaction in JNDI context
- * @message com.arjuna.ats.jta.UserTransaction.generalfailure Failed to
- * create instance of UserTransaction
*/
public static synchronized javax.transaction.UserTransaction userTransaction (InitialContext ctx)
@@ -60,10 +55,7 @@
}
catch (Exception e)
{
- if (jtaLogger.loggerI18N.isWarnEnabled())
- {
- jtaLogger.loggerI18N.warn("com.arjuna.ats.jta.UserTransaction.jndifailure", e);
- }
+ jtaLogger.i18NLogger.warn_UserTransaction_jndifailure(e);
}
return userTransaction;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLogger.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLogger.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -20,6 +20,7 @@
*/
package com.arjuna.ats.jta.logging;
+import com.arjuna.ats.arjuna.common.Uid;
import org.jboss.logging.*;
import static org.jboss.logging.Logger.Level.*;
import static org.jboss.logging.Message.Format.*;
@@ -41,407 +42,380 @@
@Message(id = 16001, value = "could not get all object Uids.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_alluids();
+ public void warn_recovery_alluids();
@Message(id = 16002, value = "Cannot add resource to table: no XID value available.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_cannotadd();
+ public void warn_recovery_cannotadd();
- @Message(id = 16003, value = "{0} - could not get class name for {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_classloadfail(String arg0, String arg1);
+// @Message(id = 16003, value = "{0} - could not get class name for {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_classloadfail(String arg0, String arg1);
- @Message(id = 16004, value = "{0}", format = MESSAGE_FORMAT)
+ @Message(id = 16004, value = "XARecoveryModule setup failed", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_constfail(String arg0);
+ public void warn_recovery_constfail(Throwable arg0);
- @Message(id = 16005, value = "{0} - failed to recover XAResource.", format = MESSAGE_FORMAT)
+ @Message(id = 16005, value = "{0} - failed to recover XAResource. status is ${1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_failedtorecover(String arg0);
+ public void warn_recovery_failedtorecover(String arg0, String arg1);
- @Message(id = 16006, value = "{0} - forget threw: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 16006, value = "{0} - forget threw exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_forgetfailed(String arg0, String arg1);
+ public void warn_recovery_forgetfailed(String arg0, Throwable arg1);
- @Message(id = 16007, value = "Caught exception: {0} for {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_general(String arg0, String arg1);
+// @Message(id = 16007, value = "Caught exception: {0} for {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_general(String arg0, String arg1);
- @Message(id = 16008, value = "{0} - caught {1}", format = MESSAGE_FORMAT)
+ @Message(id = 16008, value = "{0} - caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_generalrecoveryerror(String arg0, String arg1);
+ public void warn_recovery_generalrecoveryerror(String arg0, Throwable arg1);
@Message(id = 16009, value = "Caught:", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_getxaresource();
+ public void warn_recovery_getxaresource(Throwable arg0);
@Message(id = 16010, value = "{0} - first pass", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_info_firstpass(String arg0);
+ @LogMessage(level = INFO)
+ public void info_recovery_firstpass(String arg0);
- @Message(id = 16011, value = "{0} loading {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_info_loading(String arg0, String arg1);
+// @Message(id = 16011, value = "{0} loading {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_info_loading(String arg0, String arg1);
- @Message(id = 16012, value = "Told not to rollback {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_info_notrollback(String arg0);
+// @Message(id = 16012, value = "Told not to rollback {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_info_notrollback(String arg0);
@Message(id = 16013, value = "Rolling back {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_info_rollingback(String arg0);
+ @LogMessage(level = INFO)
+ public void info_recovery_rollingback(String arg0);
- @Message(id = 16014, value = "Ignoring Xid {0} and leaving for transaction recovery to drive.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_info_rollingbackignore(String arg0);
+// @Message(id = 16014, value = "Ignoring Xid {0} and leaving for transaction recovery to drive.", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_info_rollingbackignore(String arg0);
@Message(id = 16015, value = "{0} - second pass", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_info_secondpass(String arg0);
+ @LogMessage(level = INFO)
+ public void info_recovery_secondpass(String arg0);
@Message(id = 16016, value = "{0} not an Arjuna XID", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_notaxid(String arg0);
+ @LogMessage(level = INFO)
+ public void info_recovery_notaxid(String arg0);
@Message(id = 16017, value = "No XA recovery nodes specified. May not recover orphans.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_noxanodes();
+ @LogMessage(level = INFO)
+ public void info_recovery_noxanodes();
- @Message(id = 16018, value = "{0}", format = MESSAGE_FORMAT)
+ @Message(id = 16018, value = "XARecoveryModule periodicWork failed", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_objstoreerror(String arg0);
+ public void warn_recovery_objstoreerror(Throwable arg0);
@Message(id = 16019, value = "{0} exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_periodicfirstpass(String arg0);
+ public void warn_recovery_periodicfirstpass(String arg0, Throwable arg1);
@Message(id = 16020, value = "{0} exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_periodicsecondpass(String arg0);
+ public void warn_recovery_periodicsecondpass(String arg0, Throwable arg1);
@Message(id = 16021, value = "JTA recovery delayed for {0}; got status {1} so waiting for coordinator driven recovery", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_recoverydelayed(String arg0, String arg1);
+ @LogMessage(level = INFO)
+ public void info_recovery_recoverydelayed(Uid arg0, String arg1);
@Message(id = 16022, value = "Recovery threw:", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_recoveryerror();
+ public void warn_recovery_recoveryerror(Throwable arg0);
@Message(id = 16023, value = "JTA failed to recovery {0}; got status {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_recoveryfailed(String arg0, String arg1);
+ public void warn_recovery_recoveryfailed(Uid arg0, String arg1);
- @Message(id = 16024, value = "{0} - could not remove record for {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_removefailed(String arg0, String arg1);
+// @Message(id = 16024, value = "{0} - could not remove record for {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_removefailed(String arg0, String arg1);
- @Message(id = 16025, value = "Unexpceted recovery error:", format = MESSAGE_FORMAT)
+ @Message(id = 16025, value = "Unexpected recovery error", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_unexpectedrecoveryerror();
+ public void warn_recovery_unexpectedrecoveryerror(Throwable arg0);
- @Message(id = 16026, value = "{0} - first pass", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_xafirstpass(String arg0);
+// @Message(id = 16026, value = "{0} - first pass", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_xafirstpass(String arg0);
- @Message(id = 16027, value = "{0} got XA exception {1}, {2}", format = MESSAGE_FORMAT)
+ @Message(id = 16027, value = "{0} got XA exception {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_xarecovery1(String arg0, String arg1, String arg2);
+ public void warn_recovery_xarecovery1(String arg0, String arg1, Throwable arg2);
- @Message(id = 16028, value = "{0} got exception {1}", format = MESSAGE_FORMAT)
+ @Message(id = 16028, value = "{0} got exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_xarecovery2(String arg0, String arg1);
+ public void warn_recovery_xarecovery2(String arg0, Throwable arg1);
- @Message(id = 16029, value = "SynchronizationImple.afterCompletion - failed for {0} with exception {1}", format = MESSAGE_FORMAT)
+ @Message(id = 16029, value = "SynchronizationImple.afterCompletion - failed for {0} with exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_SynchronizationImple(String arg0, String arg1);
+ public void warn_resources_arjunacore_SynchronizationImple(String arg0, Throwable arg1);
- @Message(id = 16030, value = "XAOnePhaseResource.pack failed to serialise resource {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_resources_arjunacore_XAOnePhaseResource_pack(String arg0);
+ @Message(id = 16030, value = "XAOnePhaseResource.pack failed to serialise resource", format = MESSAGE_FORMAT)
+ public String get_resources_arjunacore_XAOnePhaseResource_pack();
- @Message(id = 16031, value = "XAOnePhaseResource.rollback for {0} failed with exception {1}", format = MESSAGE_FORMAT)
+ @Message(id = 16031, value = "XAOnePhaseResource.rollback for {0} failed with exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_XAOnePhaseResource_rollbackexception(String arg0, String arg1);
+ public void warn_resources_arjunacore_XAOnePhaseResource_rollbackexception(String arg0, Throwable arg1);
- @Message(id = 16032, value = "failed to deserialise resource {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_resources_arjunacore_XAOnePhaseResource_unpack(String arg0);
+ @Message(id = 16032, value = "failed to deserialise resource", format = MESSAGE_FORMAT)
+ public String get_resources_arjunacore_XAOnePhaseResource_unpack();
@Message(id = 16033, value = "Unknown recovery type {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_resources_arjunacore_XAOnePhaseResource_unpackType(String arg0);
+ public String get_resources_arjunacore_XAOnePhaseResource_unpackType(String arg0);
@Message(id = 16034, value = "Being told to assume complete on Xid {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_resources_arjunacore_assumecomplete(String arg0);
+ @LogMessage(level = INFO)
+ public void info_resources_arjunacore_assumecomplete(String arg0);
@Message(id = 16035, value = "{0} - null transaction!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_commitnulltx(String arg0);
+ public void warn_resources_arjunacore_commitnulltx(String arg0);
- @Message(id = 16036, value = "commit on {0} ({1}) failed with exception {2}", format = MESSAGE_FORMAT)
+ @Message(id = 16036, value = "commit on {0} ({1}) failed with exception ${2}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_commitxaerror(String arg0, String arg1, String arg2);
+ public void warn_resources_arjunacore_commitxaerror(String arg0, String arg1, String arg2, Throwable arg3);
@Message(id = 16037, value = "Could not find new XAResource to use for recovering non-serializable XAResource {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_norecoveryxa(String arg0);
+ public void warn_resources_arjunacore_norecoveryxa(String arg0);
@Message(id = 16038, value = "No XAResource to recover {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_noresource(String arg0);
+ public void warn_resources_arjunacore_noresource(String arg0);
@Message(id = 16039, value = "onePhaseCommit on {0} ({1}) failed with exception {2}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_opcerror(String arg0, String arg1, String arg2);
+ public void warn_resources_arjunacore_opcerror(String arg0, String arg1, String arg2, Throwable arg3);
@Message(id = 16040, value = "{0} - null transaction!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_opcnulltx(String arg0);
+ public void warn_resources_arjunacore_opcnulltx(String arg0);
@Message(id = 16041, value = "prepare on {0} ({1}) failed with exception {2}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_preparefailed(String arg0, String arg1, String arg2);
+ public void warn_resources_arjunacore_preparefailed(String arg0, String arg1, String arg2, Throwable arg3);
@Message(id = 16042, value = "{0} - null transaction!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_preparenulltx(String arg0);
+ public void warn_resources_arjunacore_preparenulltx(String arg0);
@Message(id = 16043, value = "Exception on attempting to restore XAResource", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_restorestate();
+ public void warn_resources_arjunacore_restorestate(Throwable arg0);
@Message(id = 16044, value = "An error occurred during restore_state for XAResource {0} and transaction {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_restorestateerror(String arg0, String arg1);
+ public void warn_resources_arjunacore_restorestateerror(String arg0, String arg1, Throwable arg2);
- @Message(id = 16045, value = "attempted rollback of {0} ({1}) failed with exception {2}", format = MESSAGE_FORMAT)
+ @Message(id = 16045, value = "attempted rollback of {0} ({1}) failed with exception code {2}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_rollbackerror(String arg0, String arg1, String arg2);
+ public void warn_resources_arjunacore_rollbackerror(String arg0, String arg1, String arg2, Throwable arg3);
@Message(id = 16046, value = "{0} - null transaction!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_rollbacknulltx(String arg0);
+ public void warn_resources_arjunacore_rollbacknulltx(String arg0);
@Message(id = 16047, value = "Could not serialize a Serializable XAResource!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_savestate();
+ public void warn_resources_arjunacore_savestate();
@Message(id = 16048, value = "An error occurred during save_state for XAResource {0} and transaction {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_savestateerror(String arg0, String arg1);
+ public void warn_resources_arjunacore_savestateerror(String arg0, String arg1, Throwable arg2);
@Message(id = 16049, value = "{0} called illegally.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_arjunacore_setvalue(String arg0);
+ public void warn_resources_arjunacore_setvalue(String arg0);
- @Message(id = 16050, value = "rollback failed with status:", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_abfailunknownstatus();
+// @Message(id = 16050, value = "rollback failed with status:", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_transaction_arjunacore_abfailunknownstatus();
@Message(id = 16051, value = "thread is already associated with a transaction!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_alreadyassociated();
+ public String get_transaction_arjunacore_alreadyassociated();
- @Message(id = 16052, value = "commit failed with status:", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_cmfailunknownstatus();
+// @Message(id = 16052, value = "commit failed with status:", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_transaction_arjunacore_cmfailunknownstatus();
@Message(id = 16053, value = "Could not commit transaction.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_commitwhenaborted();
+ public String get_transaction_arjunacore_commitwhenaborted();
@Message(id = 16054, value = "could not register transaction", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_couldnotregister();
+ public String get_transaction_arjunacore_couldnotregister();
- @Message(id = 16055, value = "{0} caught exception {1}", format = MESSAGE_FORMAT)
+ @Message(id = 16055, value = "{0} caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_transaction_arjunacore_delistgeneral(String arg0, String arg1);
+ public void warn_transaction_arjunacore_delistgeneral(String arg0, Throwable arg1);
@Message(id = 16056, value = "{0} - caught exception during delist : {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_transaction_arjunacore_delistresource(String arg0, String arg1);
+ public void warn_transaction_arjunacore_delistresource(String arg0, String arg1, Throwable arg2);
- @Message(id = 16057, value = "Can't enlist the resource because the transaction is marked for rollback", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_elistwhenmarkedrollback();
+// @Message(id = 16057, value = "Can't enlist the resource because the transaction is marked for rollback", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_transaction_arjunacore_elistwhenmarkedrollback();
@Message(id = 16058, value = "Ending suspended RMs failed when rolling back the transaction!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_transaction_arjunacore_endsuspendfailed1();
+ public void warn_transaction_arjunacore_endsuspendfailed1();
@Message(id = 16059, value = "Ending suspended RMs failed when rolling back the transaction, but transaction rolled back.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_endsuspendfailed2();
+ public String get_transaction_arjunacore_endsuspendfailed2();
@Message(id = 16060, value = "{0} - caught: {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_transaction_arjunacore_enlisterror(String arg0, String arg1);
+ public void warn_transaction_arjunacore_enlisterror(String arg0, String arg1);
- @Message(id = 16061, value = "{0} - XAResource.start returned: {1} for {2}", format = MESSAGE_FORMAT)
+ @Message(id = 16061, value = "{0} - XAResource.start returned: {2} for {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_transaction_arjunacore_enliststarterror(String arg0, String arg1, String arg2);
+ public void warn_transaction_arjunacore_enliststarterror(String arg0, String arg1, String arg2, Throwable arg3);
@Message(id = 16062, value = "illegal resource state", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_illresstate();
+ public String get_transaction_arjunacore_illresstate();
@Message(id = 16063, value = "The transaction is not active!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_inactive();
+ public String get_transaction_arjunacore_inactive();
@Message(id = 16064, value = "The transaction is in an invalid state!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_invalidstate();
+ public String get_transaction_arjunacore_invalidstate();
- @Message(id = 16065, value = "Caught unexpected exception: {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_isnewrm(String arg0);
+// @Message(id = 16065, value = "Caught unexpected exception: {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_transaction_arjunacore_isnewrm(String arg0);
@Message(id = 16066, value = "Failed to create instance of TransactionImporter", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_jca_SubordinationManager_importerfailure();
+ @LogMessage(level = ERROR)
+ public void error_transaction_arjunacore_jca_SubordinationManager_importerfailure(Throwable arg0);
@Message(id = 16067, value = "Failed to create instance of XATerminator", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_jca_SubordinationManager_terminatorfailure();
+ @LogMessage(level = ERROR)
+ public void error_transaction_arjunacore_jca_SubordinationManager_terminatorfailure(Throwable arg0);
@Message(id = 16068, value = "Work already active!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_jca_busy();
+ public String get_transaction_arjunacore_jca_busy();
- @Message(id = 16069, value = "failed to load Last Resource Optimisation Interface", format = MESSAGE_FORMAT)
+ @Message(id = 16069, value = "failed to load Last Resource Optimisation Interface {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_transaction_arjunacore_lastResourceOptimisationInterface();
+ public void warn_transaction_arjunacore_lastResourceOptimisationInterface(String arg0, Throwable arg1);
@Message(id = 16070, value = "{0} - could not mark {0} as rollback only", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_transaction_arjunacore_markrollback(String arg0, String arg1);
+ public void warn_transaction_arjunacore_markrollback(String arg0, String arg1);
@Message(id = 16071, value = "{0} caught XAException: {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_transaction_arjunacore_newtmerror(String arg0, String arg1);
+ public void warn_transaction_arjunacore_newtmerror(String arg0, String arg1, Throwable arg2);
@Message(id = 16072, value = "No such transaction!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_nosuchtx();
+ public String get_transaction_arjunacore_nosuchtx();
@Message(id = 16073, value = "Current transaction is not an AtomicAction!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_transaction_arjunacore_notatomicaction();
+ public void warn_transaction_arjunacore_notatomicaction();
@Message(id = 16074, value = "no transaction!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_notx();
+ public String get_transaction_arjunacore_notx();
@Message(id = 16075, value = "null synchronization parameter!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_nullparam();
+ public String get_transaction_arjunacore_nullparam();
@Message(id = 16076, value = "Resource paramater is null!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_nullres();
+ public String get_transaction_arjunacore_nullres();
- @Message(id = 16077, value = "Could not mark transaction as rollback only.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_rbofail();
+// @Message(id = 16077, value = "Could not mark transaction as rollback only.", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_transaction_arjunacore_rbofail();
@Message(id = 16078, value = "resource already suspended.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_ressuspended();
+ public String get_transaction_arjunacore_ressuspended();
@Message(id = 16079, value = "Transaction rollback status is:", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_rollbackstatus();
+ public String get_transaction_arjunacore_rollbackstatus();
@Message(id = 16080, value = "Not allowed to terminate subordinate transaction directly.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_subordinate_invalidstate();
+ public String get_transaction_arjunacore_subordinate_invalidstate();
@Message(id = 16081, value = "The transaction implementation threw a RollbackException", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_syncrollbackexception();
+ public String get_transaction_arjunacore_syncrollbackexception();
@Message(id = 16082, value = "Synchronizations are not allowed! Transaction status is", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_syncsnotallowed();
+ public String get_transaction_arjunacore_syncsnotallowed();
@Message(id = 16083, value = "Can't register synchronization because the transaction is in aborted state", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_syncwhenaborted();
+ public String get_transaction_arjunacore_syncwhenaborted();
@Message(id = 16084, value = "The transaction implementation threw a SystemException", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_transaction_arjunacore_systemexception();
+ public String get_transaction_arjunacore_systemexception();
- @Message(id = 16085, value = "Caught the following error: {0}", format = MESSAGE_FORMAT)
+ @Message(id = 16085, value = "Caught the following error", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_transaction_arjunacore_threadexception(String arg0);
+ public void warn_transaction_arjunacore_threadexception(Throwable arg0);
- @Message(id = 16086, value = "{0} setTransactionTimeout on XAResource threw: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 16086, value = "{0} setTransactionTimeout on XAResource {1} threw: {2}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_transaction_arjunacore_timeouterror(String arg0, String arg1);
+ public void warn_transaction_arjunacore_timeouterror(String arg0, String arg1, String arg2, Throwable arg3);
@Message(id = 16087, value = "{0} - unknown resource", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_transaction_arjunacore_unknownresource(String arg0);
+ public void warn_transaction_arjunacore_unknownresource(String arg0);
@Message(id = 16088, value = "Could not call end on a suspended resource!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_transaction_arjunacore_xaenderror();
+ public void warn_transaction_arjunacore_xaenderror(Throwable arg0);
- @Message(id = 16089, value = "{0} - caught: {1} for {2}", format = MESSAGE_FORMAT)
+ @Message(id = 16089, value = "{0} - caught: {2} for {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_transaction_arjunacore_xastart(String arg0, String arg1, String arg2);
+ public void warn_transaction_arjunacore_xastart(String arg0, String arg1, String arg2, Throwable arg3);
- @Message(id = 16090, value = "Failed to create instance of TransactionManager", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_TransactionManager_generalfailure();
+// @Message(id = 16090, value = "Failed to create instance of TransactionManager", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_TransactionManager_generalfailure();
@Message(id = 16091, value = "Failed to lookup transaction manager in JNDI context", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_TransactionManager_jndifailure();
+ public void warn_TransactionManager_jndifailure(Throwable arg0);
- @Message(id = 16092, value = "Failed to create instance of UserTransaction", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_UserTransaction_generalfailure();
+// @Message(id = 16092, value = "Failed to create instance of UserTransaction", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_UserTransaction_generalfailure();
@Message(id = 16093, value = "Failed to lookup user transaction in JNDI context", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_UserTransaction_jndifailure();
+ public void warn_UserTransaction_jndifailure(Throwable arg0);
- @Message(id = 16094, value = "Failed to bind the JTA implementations with the appropriate JNDI contexts: {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_utils_JNDIManager_jndibindfailure(String arg0);
+// @Message(id = 16094, value = "Failed to bind the JTA implementations with the appropriate JNDI contexts: {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_utils_JNDIManager_jndibindfailure(String arg0);
- @Message(id = 16095, value = "Failed to bind the JTA transaction manager implementation with the approprite JNDI context: {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_utils_JNDIManager_tmjndibindfailure(String arg0);
+// @Message(id = 16095, value = "Failed to bind the JTA transaction manager implementation with the approprite JNDI context: {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_utils_JNDIManager_tmjndibindfailure(String arg0);
@Message(id = 16096, value = "Unable to instantiate TransactionSynchronizationRegistry implementation class!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_utils_JNDIManager_tsr1();
+ public String get_utils_JNDIManager_tsr1();
- @Message(id = 16097, value = "Failed to bind the JTA user transaction implementation with the appropriate JNDI context: {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_utils_JNDIManager_utjndibindfailure(String arg0);
+// @Message(id = 16097, value = "Failed to bind the JTA user transaction implementation with the appropriate JNDI context: {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_utils_JNDIManager_utjndibindfailure(String arg0);
@Message(id = 16098, value = "Null exception!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_utils_nullexception();
+ public String get_utils_nullexception();
@Message(id = 16099, value = "Unknown error code:", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_utils_unknownerrorcode();
+ public String get_utils_unknownerrorcode();
@Message(id = 16100, value = "Xid unset", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_xa_xidunset();
+ public String get_xa_xidunset();
@Message(id = 16101, value = "Could not pack XidImple.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_xid_packerror();
+ public String get_xid_packerror();
/*
Allocate new messages directly above this notice.
@@ -451,5 +425,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>_
+ */
+}
\ No newline at end of file
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLoggerImpl.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLoggerImpl.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -20,8 +20,13 @@
*/
package com.arjuna.ats.jta.logging;
-import com.arjuna.common.util.logging.Logi18n;
+import com.arjuna.ats.arjuna.common.Uid;
+import org.jboss.logging.Logger;
+import java.text.MessageFormat;
+
+import static org.jboss.logging.Logger.Level.*;
+
/**
* i18n log messages for the jta module.
* This class is autogenerated. Don't mess with it.
@@ -30,616 +35,346 @@
*/
public class jtaI18NLoggerImpl implements jtaI18NLogger {
- private final Logi18n logi18n;
+ private final Logger logger;
- jtaI18NLoggerImpl(Logi18n logi18n) {
- this.logi18n = logi18n;
+ jtaI18NLoggerImpl(Logger logger) {
+ this.logger = logger;
}
- public void log_recovery_alluids() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.alluids");
- }
+ public void warn_recovery_alluids() {
+ logger.logv(WARN, "ARJUNA-16001 could not get all object Uids.", (Object)null);
}
- public void log_recovery_cannotadd() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.cannotadd");
- }
+ public void warn_recovery_cannotadd() {
+ logger.logv(WARN, "ARJUNA-16002 Cannot add resource to table: no XID value available.", (Object)null);
}
- public void log_recovery_classloadfail(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.classloadfail", new Object[] {arg0, arg1});
- }
+ public void warn_recovery_constfail(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-16004 XARecoveryModule setup failed", (Object)null);
}
- public void log_recovery_constfail(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.constfail", new Object[] {arg0});
- }
+ public void warn_recovery_failedtorecover(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-16005 {0} - failed to recover XAResource. status is ${1}", arg0, arg1);
}
- public void log_recovery_failedtorecover(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.failedtorecover", new Object[] {arg0});
- }
+ public void warn_recovery_forgetfailed(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-16006 {0} - forget threw exception", arg0);
}
- public void log_recovery_forgetfailed(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.forgetfailed", new Object[] {arg0, arg1});
- }
+ public void warn_recovery_generalrecoveryerror(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-16008 {0} - caught exception", arg0);
}
- public void log_recovery_general(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.general", new Object[] {arg0, arg1});
- }
+ public void warn_recovery_getxaresource(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-16009 Caught:", (Object)null);
}
- public void log_recovery_generalrecoveryerror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.generalrecoveryerror", new Object[] {arg0, arg1});
- }
+ public void info_recovery_firstpass(String arg0) {
+ logger.logv(INFO, "ARJUNA-16010 {0} - first pass", arg0);
}
- public void log_recovery_getxaresource() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.getxaresource");
- }
+ public void info_recovery_rollingback(String arg0) {
+ logger.logv(INFO, "ARJUNA-16013 Rolling back {0}", arg0);
}
- public void log_recovery_info_firstpass(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.info.firstpass", new Object[] {arg0});
- }
+ public void info_recovery_secondpass(String arg0) {
+ logger.logv(INFO, "ARJUNA-16015 {0} - second pass", arg0);
}
- public void log_recovery_info_loading(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.info.loading", new Object[] {arg0, arg1});
- }
+ public void info_recovery_notaxid(String arg0) {
+ logger.logv(INFO, "ARJUNA-16016 {0} not an Arjuna XID", arg0);
}
- public void log_recovery_info_notrollback(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.info.notrollback", new Object[] {arg0});
- }
+ public void info_recovery_noxanodes() {
+ logger.logv(INFO, "ARJUNA-16017 No XA recovery nodes specified. May not recover orphans.", (Object)null);
}
- public void log_recovery_info_rollingback(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.info.rollingback", new Object[] {arg0});
- }
+ public void warn_recovery_objstoreerror(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-16018 XARecoveryModule periodicWork failed", (Object)null);
}
- public void log_recovery_info_rollingbackignore(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.info.rollingbackignore", new Object[] {arg0});
- }
+ public void warn_recovery_periodicfirstpass(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-16019 {0} exception", arg0);
}
- public void log_recovery_info_secondpass(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.info.secondpass", new Object[] {arg0});
- }
+ public void warn_recovery_periodicsecondpass(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-16020 {0} exception", arg0);
}
- public void log_recovery_notaxid(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.notaxid", new Object[] {arg0});
- }
+ public void info_recovery_recoverydelayed(Uid arg0, String arg1) {
+ logger.logv(INFO, "ARJUNA-16021 JTA recovery delayed for {0}; got status {1} so waiting for coordinator driven recovery", arg0, arg1);
}
- public void log_recovery_noxanodes() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.noxanodes");
- }
+ public void warn_recovery_recoveryerror(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-16022 Recovery threw:", (Object)null);
}
- public void log_recovery_objstoreerror(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.objstoreerror", new Object[] {arg0});
- }
+ public void warn_recovery_recoveryfailed(Uid arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-16023 JTA failed to recovery {0}; got status {1}", arg0, arg1);
}
- public void log_recovery_periodicfirstpass(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.periodicfirstpass", new Object[] {arg0});
- }
+ public void warn_recovery_unexpectedrecoveryerror(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-16025 Unexpected recovery error", (Object)null);
}
- public void log_recovery_periodicsecondpass(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.periodicsecondpass", new Object[] {arg0});
- }
+ public void warn_recovery_xarecovery1(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-16027 {0} got XA exception {1}", arg0, arg1);
}
- public void log_recovery_recoverydelayed(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.recoverydelayed", new Object[] {arg0, arg1});
- }
+ public void warn_recovery_xarecovery2(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-16028 {0} got exception", arg0);
}
- public void log_recovery_recoveryerror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.recoveryerror");
- }
+ public void warn_resources_arjunacore_SynchronizationImple(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-16029 SynchronizationImple.afterCompletion - failed for {0} with exception", arg0);
}
- public void log_recovery_recoveryfailed(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.recoveryfailed", new Object[] {arg0, arg1});
- }
+ public String get_resources_arjunacore_XAOnePhaseResource_pack() {
+ return "ARJUNA-16030 XAOnePhaseResource.pack failed to serialise resource";
}
- public void log_recovery_removefailed(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.removefailed", new Object[] {arg0, arg1});
- }
+ public void warn_resources_arjunacore_XAOnePhaseResource_rollbackexception(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-16031 XAOnePhaseResource.rollback for {0} failed with exception", arg0);
}
- public void log_recovery_unexpectedrecoveryerror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.unexpectedrecoveryerror");
- }
+ public String get_resources_arjunacore_XAOnePhaseResource_unpack() {
+ return "ARJUNA-16032 failed to deserialise resource";
}
- public void log_recovery_xafirstpass(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.xafirstpass", new Object[] {arg0});
- }
+ public String get_resources_arjunacore_XAOnePhaseResource_unpackType(String arg0) {
+ return MessageFormat.format("ARJUNA-16033 Unknown recovery type {0}", arg0);
}
- public void log_recovery_xarecovery1(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.xarecovery1", new Object[] {arg0, arg1, arg2});
- }
+ public void info_resources_arjunacore_assumecomplete(String arg0) {
+ logger.logv(INFO, "ARJUNA-16034 Being told to assume complete on Xid {0}", arg0);
}
- public void log_recovery_xarecovery2(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.recovery.xarecovery2", new Object[] {arg0, arg1});
- }
+ public void warn_resources_arjunacore_commitnulltx(String arg0) {
+ logger.logv(WARN, "ARJUNA-16035 {0} - null transaction!", arg0);
}
- public void log_resources_arjunacore_SynchronizationImple(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.SynchronizationImple", new Object[] {arg0, arg1});
- }
+ public void warn_resources_arjunacore_commitxaerror(String arg0, String arg1, String arg2, Throwable arg3) {
+ logger.logv(WARN, arg3, "ARJUNA-16036 commit on {0} ({1}) failed with exception ${2}", arg0, arg1, arg2);
}
- public void log_resources_arjunacore_XAOnePhaseResource_pack(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.pack", new Object[] {arg0});
- }
+ public void warn_resources_arjunacore_norecoveryxa(String arg0) {
+ logger.logv(WARN, "ARJUNA-16037 Could not find new XAResource to use for recovering non-serializable XAResource {0}", arg0);
}
- public void log_resources_arjunacore_XAOnePhaseResource_rollbackexception(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.rollbackexception", new Object[] {arg0, arg1});
- }
+ public void warn_resources_arjunacore_noresource(String arg0) {
+ logger.logv(WARN, "ARJUNA-16038 No XAResource to recover {0}", arg0);
}
- public void log_resources_arjunacore_XAOnePhaseResource_unpack(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.unpack", new Object[] {arg0});
- }
+ public void warn_resources_arjunacore_opcerror(String arg0, String arg1, String arg2, Throwable arg3) {
+ logger.logv(WARN, arg3, "ARJUNA-16039 onePhaseCommit on {0} ({1}) failed with exception {2}", arg0, arg1, arg2);
}
- public void log_resources_arjunacore_XAOnePhaseResource_unpackType(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.unpackType", new Object[] {arg0});
- }
+ public void warn_resources_arjunacore_opcnulltx(String arg0) {
+ logger.logv(WARN, "ARJUNA-16040 {0} - null transaction!", arg0);
}
- public void log_resources_arjunacore_assumecomplete(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.assumecomplete", new Object[] {arg0});
- }
+ public void warn_resources_arjunacore_preparefailed(String arg0, String arg1, String arg2, Throwable arg3) {
+ logger.logv(WARN, arg3, "ARJUNA-16041 prepare on {0} ({1}) failed with exception {2}", arg0, arg1, arg2);
}
- public void log_resources_arjunacore_commitnulltx(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.commitnulltx", new Object[] {arg0});
- }
+ public void warn_resources_arjunacore_preparenulltx(String arg0) {
+ logger.logv(WARN, "ARJUNA-16042 {0} - null transaction!", arg0);
}
- public void log_resources_arjunacore_commitxaerror(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.commitxaerror", new Object[] {arg0, arg1, arg2});
- }
+ public void warn_resources_arjunacore_restorestate(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-16043 Exception on attempting to restore XAResource", (Object)null);
}
- public void log_resources_arjunacore_norecoveryxa(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.norecoveryxa", new Object[] {arg0});
- }
+ public void warn_resources_arjunacore_restorestateerror(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-16044 An error occurred during restore_state for XAResource {0} and transaction {1}", arg0, arg1);
}
- public void log_resources_arjunacore_noresource(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.noresource", new Object[] {arg0});
- }
+ public void warn_resources_arjunacore_rollbackerror(String arg0, String arg1, String arg2, Throwable arg3) {
+ logger.logv(WARN, arg3, "ARJUNA-16045 attempted rollback of {0} ({1}) failed with exception code {2}", arg0, arg1, arg2);
}
- public void log_resources_arjunacore_opcerror(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.opcerror", new Object[] {arg0, arg1, arg2});
- }
+ public void warn_resources_arjunacore_rollbacknulltx(String arg0) {
+ logger.logv(WARN, "ARJUNA-16046 {0} - null transaction!", arg0);
}
- public void log_resources_arjunacore_opcnulltx(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.opcnulltx", new Object[] {arg0});
- }
+ public void warn_resources_arjunacore_savestate() {
+ logger.logv(WARN, "ARJUNA-16047 Could not serialize a Serializable XAResource!", (Object)null);
}
- public void log_resources_arjunacore_preparefailed(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.preparefailed", new Object[] {arg0, arg1, arg2});
- }
+ public void warn_resources_arjunacore_savestateerror(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-16048 An error occurred during save_state for XAResource {0} and transaction {1}", arg0, arg1);
}
- public void log_resources_arjunacore_preparenulltx(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.preparenulltx", new Object[] {arg0});
- }
+ public void warn_resources_arjunacore_setvalue(String arg0) {
+ logger.logv(WARN, "ARJUNA-16049 {0} called illegally.", arg0);
}
- public void log_resources_arjunacore_restorestate() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.restorestate");
- }
+ public String get_transaction_arjunacore_alreadyassociated() {
+ return "ARJUNA-16051 thread is already associated with a transaction!";
}
- public void log_resources_arjunacore_restorestateerror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.restorestateerror", new Object[] {arg0, arg1});
- }
+ public String get_transaction_arjunacore_commitwhenaborted() {
+ return "ARJUNA-16053 Could not commit transaction.";
}
- public void log_resources_arjunacore_rollbackerror(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.rollbackerror", new Object[] {arg0, arg1, arg2});
- }
+ public String get_transaction_arjunacore_couldnotregister() {
+ return "ARJUNA-16054 could not register transaction";
}
- public void log_resources_arjunacore_rollbacknulltx(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.rollbacknulltx", new Object[] {arg0});
- }
+ public void warn_transaction_arjunacore_delistgeneral(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-16055 {0} caught exception", arg0);
}
- public void log_resources_arjunacore_savestate() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.savestate");
- }
+ public void warn_transaction_arjunacore_delistresource(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-16056 {0} - caught exception during delist : {1}", arg0, arg1);
}
- public void log_resources_arjunacore_savestateerror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.savestateerror", new Object[] {arg0, arg1});
- }
+ public void warn_transaction_arjunacore_endsuspendfailed1() {
+ logger.logv(WARN, "ARJUNA-16058 Ending suspended RMs failed when rolling back the transaction!", (Object)null);
}
- public void log_resources_arjunacore_setvalue(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.resources.arjunacore.setvalue", new Object[] {arg0});
- }
+ public String get_transaction_arjunacore_endsuspendfailed2() {
+ return "ARJUNA-16059 Ending suspended RMs failed when rolling back the transaction, but transaction rolled back.";
}
- public void log_transaction_arjunacore_abfailunknownstatus() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.abfailunknownstatus");
- }
+ public void warn_transaction_arjunacore_enlisterror(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-16060 {0} - caught: {1}", arg0, arg1);
}
- public void log_transaction_arjunacore_alreadyassociated() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.alreadyassociated");
- }
+ public void warn_transaction_arjunacore_enliststarterror(String arg0, String arg1, String arg2, Throwable arg3) {
+ logger.logv(WARN, arg3, "ARJUNA-16061 {0} - XAResource.start returned: {2} for {1}", arg0, arg1, arg2);
}
- public void log_transaction_arjunacore_cmfailunknownstatus() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.cmfailunknownstatus");
- }
+ public String get_transaction_arjunacore_illresstate() {
+ return "ARJUNA-16062 illegal resource state";
}
- public void log_transaction_arjunacore_commitwhenaborted() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.commitwhenaborted");
- }
+ public String get_transaction_arjunacore_inactive() {
+ return "ARJUNA-16063 The transaction is not active!";
}
- public void log_transaction_arjunacore_couldnotregister() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.couldnotregister");
- }
+ public String get_transaction_arjunacore_invalidstate() {
+ return "ARJUNA-16064 The transaction is in an invalid state!";
}
- public void log_transaction_arjunacore_delistgeneral(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.delistgeneral", new Object[] {arg0, arg1});
- }
+ public void error_transaction_arjunacore_jca_SubordinationManager_importerfailure(Throwable arg0) {
+ logger.logv(ERROR, arg0, "ARJUNA-16066 Failed to create instance of TransactionImporter", (Object)null);
}
- public void log_transaction_arjunacore_delistresource(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.delistresource", new Object[] {arg0, arg1});
- }
+ public void error_transaction_arjunacore_jca_SubordinationManager_terminatorfailure(Throwable arg0) {
+ logger.logv(ERROR, arg0, "ARJUNA-16067 Failed to create instance of XATerminator", (Object)null);
}
- public void log_transaction_arjunacore_elistwhenmarkedrollback() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.elistwhenmarkedrollback");
- }
+ public String get_transaction_arjunacore_jca_busy() {
+ return "ARJUNA-16068 Work already active!";
}
- public void log_transaction_arjunacore_endsuspendfailed1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.endsuspendfailed1");
- }
+ public void warn_transaction_arjunacore_lastResourceOptimisationInterface(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-16069 failed to load Last Resource Optimisation Interface {0}", arg0);
}
- public void log_transaction_arjunacore_endsuspendfailed2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.endsuspendfailed2");
- }
+ public void warn_transaction_arjunacore_markrollback(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-16070 {0} - could not mark {0} as rollback only", arg0, arg1);
}
- public void log_transaction_arjunacore_enlisterror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.enlisterror", new Object[] {arg0, arg1});
- }
+ public void warn_transaction_arjunacore_newtmerror(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-16071 {0} caught XAException: {0}", arg0, arg1);
}
- public void log_transaction_arjunacore_enliststarterror(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.enliststarterror", new Object[] {arg0, arg1, arg2});
- }
+ public String get_transaction_arjunacore_nosuchtx() {
+ return "ARJUNA-16072 No such transaction!";
}
- public void log_transaction_arjunacore_illresstate() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.illresstate");
- }
+ public void warn_transaction_arjunacore_notatomicaction() {
+ logger.logv(WARN, "ARJUNA-16073 Current transaction is not an AtomicAction!", (Object)null);
}
- public void log_transaction_arjunacore_inactive() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive");
- }
+ public String get_transaction_arjunacore_notx() {
+ return "ARJUNA-16074 no transaction!";
}
- public void log_transaction_arjunacore_invalidstate() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.invalidstate");
- }
+ public String get_transaction_arjunacore_nullparam() {
+ return "ARJUNA-16075 null synchronization parameter!";
}
- public void log_transaction_arjunacore_isnewrm(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.isnewrm", new Object[] {arg0});
- }
+ public String get_transaction_arjunacore_nullres() {
+ return "ARJUNA-16076 Resource paramater is null!";
}
- public void log_transaction_arjunacore_jca_SubordinationManager_importerfailure() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.jca.SubordinationManager.importerfailure");
- }
+ public String get_transaction_arjunacore_ressuspended() {
+ return "ARJUNA-16078 resource already suspended.";
}
- public void log_transaction_arjunacore_jca_SubordinationManager_terminatorfailure() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.jca.SubordinationManager.terminatorfailure");
- }
+ public String get_transaction_arjunacore_rollbackstatus() {
+ return "ARJUNA-16079 Transaction rollback status is:";
}
- public void log_transaction_arjunacore_jca_busy() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.jca.busy");
- }
+ public String get_transaction_arjunacore_subordinate_invalidstate() {
+ return "ARJUNA-16080 Not allowed to terminate subordinate transaction directly.";
}
- public void log_transaction_arjunacore_lastResourceOptimisationInterface() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.lastResourceOptimisationInterface");
- }
+ public String get_transaction_arjunacore_syncrollbackexception() {
+ return "ARJUNA-16081 The transaction implementation threw a RollbackException";
}
- public void log_transaction_arjunacore_markrollback(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.markrollback", new Object[] {arg0, arg1});
- }
+ public String get_transaction_arjunacore_syncsnotallowed() {
+ return "ARJUNA-16082 Synchronizations are not allowed! Transaction status is";
}
- public void log_transaction_arjunacore_newtmerror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.newtmerror", new Object[] {arg0, arg1});
- }
+ public String get_transaction_arjunacore_syncwhenaborted() {
+ return "ARJUNA-16083 Can't register synchronization because the transaction is in aborted state";
}
- public void log_transaction_arjunacore_nosuchtx() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.nosuchtx");
- }
+ public String get_transaction_arjunacore_systemexception() {
+ return "ARJUNA-16084 The transaction implementation threw a SystemException";
}
- public void log_transaction_arjunacore_notatomicaction() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.notatomicaction");
- }
+ public void warn_transaction_arjunacore_threadexception(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-16085 Caught the following error", (Object)null);
}
- public void log_transaction_arjunacore_notx() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.notx");
- }
+ public void warn_transaction_arjunacore_timeouterror(String arg0, String arg1, String arg2, Throwable arg3) {
+ logger.logv(WARN, arg3, "ARJUNA-16086 {0} setTransactionTimeout on XAResource {1} threw: {2}", arg0, arg1, arg2);
}
- public void log_transaction_arjunacore_nullparam() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.nullparam");
- }
+ public void warn_transaction_arjunacore_unknownresource(String arg0) {
+ logger.logv(WARN, "ARJUNA-16087 {0} - unknown resource", arg0);
}
- public void log_transaction_arjunacore_nullres() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.nullres");
- }
+ public void warn_transaction_arjunacore_xaenderror(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-16088 Could not call end on a suspended resource!", (Object)null);
}
- public void log_transaction_arjunacore_rbofail() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.rbofail");
- }
+ public void warn_transaction_arjunacore_xastart(String arg0, String arg1, String arg2, Throwable arg3) {
+ logger.logv(WARN, arg3, "ARJUNA-16089 {0} - caught: {2} for {1}", arg0, arg1, arg2);
}
- public void log_transaction_arjunacore_ressuspended() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.ressuspended");
- }
+ public void warn_TransactionManager_jndifailure(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-16091 Failed to lookup transaction manager in JNDI context", (Object)null);
}
- public void log_transaction_arjunacore_rollbackstatus() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.rollbackstatus");
- }
+ public void warn_UserTransaction_jndifailure(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-16093 Failed to lookup user transaction in JNDI context", (Object)null);
}
- public void log_transaction_arjunacore_subordinate_invalidstate() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.subordinate.invalidstate");
- }
+ public String get_utils_JNDIManager_tsr1() {
+ return "ARJUNA-16096 Unable to instantiate TransactionSynchronizationRegistry implementation class!";
}
- public void log_transaction_arjunacore_syncrollbackexception() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.syncrollbackexception");
- }
+ public String get_utils_nullexception() {
+ return "ARJUNA-16098 Null exception!";
}
- public void log_transaction_arjunacore_syncsnotallowed() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.syncsnotallowed");
- }
+ public String get_utils_unknownerrorcode() {
+ return "ARJUNA-16099 Unknown error code:";
}
- public void log_transaction_arjunacore_syncwhenaborted() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.syncwhenaborted");
- }
+ public String get_xa_xidunset() {
+ return "ARJUNA-16100 Xid unset";
}
- public void log_transaction_arjunacore_systemexception() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception");
- }
+ public String get_xid_packerror() {
+ return "ARJUNA-16101 Could not pack XidImple.";
}
- public void log_transaction_arjunacore_threadexception(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.threadexception", new Object[] {arg0});
- }
- }
-
- public void log_transaction_arjunacore_timeouterror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.timeouterror[com.arjuna.ats.internal.jta.transaction.arjunacore.timeouterror]", new Object[] {arg0, arg1});
- }
- }
-
- public void log_transaction_arjunacore_unknownresource(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.unknownresource", new Object[] {arg0});
- }
- }
-
- public void log_transaction_arjunacore_xaenderror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.xaenderror");
- }
- }
-
- public void log_transaction_arjunacore_xastart(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.xastart", new Object[] {arg0, arg1, arg2});
- }
- }
-
- public void log_TransactionManager_generalfailure() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jta.TransactionManager.generalfailure");
- }
- }
-
- public void log_TransactionManager_jndifailure() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jta.TransactionManager.jndifailure");
- }
- }
-
- public void log_UserTransaction_generalfailure() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jta.UserTransaction.generalfailure");
- }
- }
-
- public void log_UserTransaction_jndifailure() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jta.UserTransaction.jndifailure");
- }
- }
-
- public void log_utils_JNDIManager_jndibindfailure(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jta.utils.JNDIManager.jndibindfailure", new Object[] {arg0});
- }
- }
-
- public void log_utils_JNDIManager_tmjndibindfailure(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jta.utils.JNDIManager.tmjndibindfailure", new Object[] {arg0});
- }
- }
-
- public void log_utils_JNDIManager_tsr1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jta.utils.JNDIManager.tsr1");
- }
- }
-
- public void log_utils_JNDIManager_utjndibindfailure(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jta.utils.JNDIManager.utjndibindfailure", new Object[] {arg0});
- }
- }
-
- public void log_utils_nullexception() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jta.utils.nullexception");
- }
- }
-
- public void log_utils_unknownerrorcode() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jta.utils.unknownerrorcode");
- }
- }
-
- public void log_xa_xidunset() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jta.xa.xidunset");
- }
- }
-
- public void log_xid_packerror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jta.xid.packerror");
- }
- }
-
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaLogger.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaLogger.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -32,18 +32,17 @@
package com.arjuna.ats.jta.logging;
import com.arjuna.common.util.logging.*;
+import org.jboss.logging.Logger;
public class jtaLogger
{
public static LogNoi18n logger;
- public static Logi18n loggerI18N;
public static jtaI18NLogger i18NLogger;
public static void initialize(LogNoi18n noi18n, Logi18n i18n)
{
logger = noi18n;
- loggerI18N = i18n;
- i18NLogger = new jtaI18NLoggerImpl(i18n);
+ i18NLogger = new jtaI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.jta"));
}
static
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JNDIManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JNDIManager.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JNDIManager.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -43,9 +43,6 @@
{
/**
* Bind the underlying JTA implementations to the appropriate JNDI contexts.
- * @message com.arjuna.ats.jta.utils.JNDIManager.jndibindfailure Failed to bind the JTA implementations with the appropriate JNDI contexts: {0}
- * @message com.arjuna.ats.jta.utils.JNDIManager.tmjndibindfailure Failed to bind the JTA transaction manager implementation with the approprite JNDI context: {0}
- * @message com.arjuna.ats.jta.utils.JNDIManager.utjndibindfailure Failed to bind the JTA user transaction implementation with the appropriate JNDI context: {0}
* @throws javax.naming.NamingException
*/
public static void bindJTAImplementations(InitialContext ctx) throws javax.naming.NamingException
@@ -161,8 +158,6 @@
* JNDI context.
* @param initialContext
* @throws javax.naming.NamingException
- *
- * @message com.arjuna.ats.jta.utils.JNDIManager.tsr1 [message com.arjuna.ats.jta.utils.JNDIManager] Unable to instantiate TransactionSynchronizationRegistry implementation class!
*/
public static void bindJTATransactionSynchronizationRegistryImplementation(InitialContext initialContext) throws javax.naming.NamingException
{
@@ -172,7 +167,7 @@
try {
tsr = Class.forName(tsrImplementation).newInstance();
} catch(Exception e) {
- NamingException namingException = new ConfigurationException(jtaLogger.loggerI18N.getString("com.arjuna.ats.jta.utils.JNDIManager.tsr1"));
+ NamingException namingException = new ConfigurationException(jtaLogger.i18NLogger.get_utils_JNDIManager_tsr1());
namingException.setRootCause(e);
throw namingException;
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/XAHelper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/XAHelper.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/XAHelper.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -45,16 +45,13 @@
/**
* Print a human-readable version of the XAException.
- *
- * @message com.arjuna.ats.jta.utils.nullexception Null exception!
- * @message com.arjuna.ats.jta.utils.unknownerrorcode Unknown error code:
*/
public static String printXAErrorCode (XAException e)
{
if (e == null)
{
- return jtaLogger.loggerI18N.getString("com.arjuna.ats.jta.utils.nullexception");
+ return jtaLogger.i18NLogger.get_utils_nullexception();
}
else
{
@@ -107,7 +104,7 @@
case XAException.XAER_ASYNC:
return "XAException.XAER_ASYNC";
default:
- return jtaLogger.loggerI18N.getString("com.arjuna.ats.jta.utils.unknownerrorcode")
+ return jtaLogger.i18NLogger.get_utils_unknownerrorcode()
+ e.errorCode;
}
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XidImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XidImple.java 2010-06-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XidImple.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -319,10 +319,6 @@
return result;
}
- /**
- * @message com.arjuna.ats.jta.xid.packerror Could not pack XidImple.
- */
-
public static final void pack (OutputObjectState os, Xid xid)
throws IOException
{
@@ -333,8 +329,7 @@
os.packBoolean(true);
if (!x.packInto(os))
- throw new IOException(
- jtaLogger.loggerI18N.getString("com.arjuna.ats.jta.xid.packerror"));
+ throw new IOException( jtaLogger.i18NLogger.get_xid_packerror() );
}
else
{
@@ -382,16 +377,12 @@
}
}
- /**
- * @message com.arjuna.ats.jta.xa.xidunset Xid unset
- */
-
public String toString ()
{
if (_theXid != null)
return _theXid.toString();
else
- return jtaLogger.loggerI18N.getString("com.arjuna.ats.jta.xa.xidunset");
+ return jtaLogger.i18NLogger.get_xa_xidunset();
}
/**
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-22 13:52:18 UTC (rev 33595)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java 2010-06-22 15:16:03 UTC (rev 33596)
@@ -435,13 +435,9 @@
break;
case Status.STATUS_PREPARING:
case Status.STATUS_PREPARED:
- throw new InvalidTerminationStateException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.invalidstate"));
+ throw new InvalidTerminationStateException( jtaLogger.i18NLogger.get_transaction_arjunacore_invalidstate() );
default:
- throw new InactiveTransactionException(
- jtaLogger.loggerI18N
- .getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ throw new InactiveTransactionException( jtaLogger.i18NLogger.get_transaction_arjunacore_inactive() );
}
}
catch (org.omg.CORBA.SystemException e4)
More information about the jboss-svn-commits
mailing list