[jboss-svn-commits] JBL Code SVN: r33590 - in labs/jbosstm/trunk/ArjunaCore: tsmx/classes/com/arjuna/ats/tsmx and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 22 05:18:57 EDT 2010
Author: jhalliday
Date: 2010-06-22 05:18:56 -0400 (Tue, 22 Jun 2010)
New Revision: 33590
Modified:
labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/toolsframework/ToolsClassLoader.java
labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/TransactionServiceMX.java
labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxI18NLogger.java
labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxI18NLoggerImpl.java
labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxLogger.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/LockFriend.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockRecord.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/LockRecord.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/RecoveredTransactionalObject.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojI18NLogger.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojI18NLoggerImpl.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojLogger.java
Log:
Convert ArjunaCore txoj and tsmx i18n logging from CLF to jboss-logging. JBTM-750
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/toolsframework/ToolsClassLoader.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/toolsframework/ToolsClassLoader.java 2010-06-22 04:54:25 UTC (rev 33589)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/toolsframework/ToolsClassLoader.java 2010-06-22 09:18:56 UTC (rev 33590)
@@ -142,7 +142,6 @@
}
/**
- * @message com.arjuna.ats.tools.toolsframework.ToolsClassLoader.invalidjar Error reading tool jar: {0}
* @param toolsDirectory
*/
private void processDir(String toolsDirectory)
@@ -164,11 +163,7 @@
}
catch (IOException e)
{
- if ( tsmxLogger.loggerI18N.isErrorEnabled() )
- tsmxLogger.loggerI18N.error("com.arjuna.ats.tools.toolsframework.ToolsClassLoader.invalidjar", new Object[] {e.getMessage()});
-
- if ( tsmxLogger.loggerI18N.isDebugEnabled())
- tsmxLogger.loggerI18N.debug("com.arjuna.ats.tools.toolsframework.ToolsClassLoader.invalidjar", e);
+ tsmxLogger.i18nLogger.error_toolsClassLoader_invalidjar(e);
}
}
@@ -187,7 +182,6 @@
}
/**
- * @message com.arjuna.ats.tools.toolsframework.ToolsClassLoader.invalidurl The URL is invalid: {0}
* @param toolsLibDirectory
*/
private boolean setClassLoader(Collection<URL> urls, String toolsLibDirectory)
@@ -229,12 +223,8 @@
}
catch (MalformedURLException e)
{
- if ( tsmxLogger.loggerI18N.isErrorEnabled() )
- tsmxLogger.loggerI18N.error("com.arjuna.ats.tools.toolsframework.ToolsClassLoader.invalidurl", new Object[] { toolsLibDirectory } );
+ tsmxLogger.i18nLogger.error_toolsClassLoader_invalidurl(toolsLibDirectory, e);
- if ( tsmxLogger.loggerI18N.isDebugEnabled())
- tsmxLogger.loggerI18N.debug("com.arjuna.ats.tools.toolsframework.ToolsClassLoader.invalidurl", e);
-
return false;
}
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/TransactionServiceMX.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/TransactionServiceMX.java 2010-06-22 04:54:25 UTC (rev 33589)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/TransactionServiceMX.java 2010-06-22 09:18:56 UTC (rev 33590)
@@ -34,7 +34,6 @@
import com.arjuna.ats.tsmx.agent.exceptions.AgentNotFoundException;
import com.arjuna.ats.tsmx.logging.*;
-import com.arjuna.common.util.logging.*;
import com.arjuna.common.util.ConfigurationInfo;
import javax.management.MBeanServer;
@@ -176,9 +175,6 @@
/**
* Register all MBeans which are defined in the properties
* which are prefixed with <code>MBEAN_PROPERTY_PREFIX</code>
- *
- * @message com.arjuna.ats.tsmx.TransactionServiceMX.mbeanalreadyregistered MBean {0} already registered
- * @message com.arjuna.ats.tsmx.TransactionServiceMX.failedtoregistermbean Failed to register MBean {0} : {1}
*/
private boolean registerMBeans()
{
@@ -218,25 +214,11 @@
}
catch (javax.management.InstanceAlreadyExistsException e)
{
- if (tsmxLogger.logger.isWarnEnabled())
- {
- tsmxLogger.loggerI18N.warn("com.arjuna.ats.tsmx.TransactionServiceMX.mbeanalreadyregistered", new Object[] { mbeanObjectName } );
- }
+ tsmxLogger.i18nLogger.warn_TransactionServiceMX_mbeanalreadyregistered(mbeanObjectName);
}
- catch (javax.management.MBeanException e)
- {
- if (tsmxLogger.logger.isErrorEnabled())
- {
- tsmxLogger.loggerI18N.error("com.arjuna.ats.tsmx.TransactionServiceMX.failedtoregistermbean", new Object[] { mbeanObjectName, e.getTargetException().toString() } );
- }
- success = false;
- }
catch (Exception e)
{
- if (tsmxLogger.logger.isErrorEnabled())
- {
- tsmxLogger.loggerI18N.error("com.arjuna.ats.tsmx.TransactionServiceMX.failedtoregistermbean", new Object[] { mbeanObjectName, e.toString() } );
- }
+ tsmxLogger.i18nLogger.error_TransactionServiceMX_failedtoregistermbean(mbeanObjectName, e);
success = false;
}
@@ -251,8 +233,6 @@
* Thie method unregisters all the mbeans registered.
*
* @return True if all beans were unregistered successfully.
- *
- * @message com.arjuna.ats.tsmx.TransactionServiceMX.failedtounregistermbean Failed to unregister MBean {0} : {1}
*/
public boolean unregisterMBeans()
{
@@ -269,10 +249,7 @@
}
catch (Exception e)
{
- if (tsmxLogger.logger.isErrorEnabled())
- {
- tsmxLogger.loggerI18N.error("com.arjuna.ats.tsmx.TransactionServiceMX.failedtounregistermbean", new Object[] { name, e.toString() } );
- }
+ tsmxLogger.i18nLogger.error_TransactionServiceMX_failedtounregistermbean(name, e);
success = false;
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxI18NLogger.java 2010-06-22 04:54:25 UTC (rev 33589)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxI18NLogger.java 2010-06-22 09:18:56 UTC (rev 33590)
@@ -39,18 +39,26 @@
Allocate new messages by following instructions at the bottom of the file.
*/
- @Message(id = 30001, value = "Failed to register MBean {0} : {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_TransactionServiceMX_failedtoregistermbean(String arg0, String arg1);
+ @Message(id = 30001, value = "Failed to register MBean {0}", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_TransactionServiceMX_failedtoregistermbean(String arg0, Throwable arg1);
- @Message(id = 30002, value = "Failed to unregister MBean {0} : {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_TransactionServiceMX_failedtounregistermbean(String arg0, String arg1);
+ @Message(id = 30002, value = "Failed to unregister MBean {0}", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_TransactionServiceMX_failedtounregistermbean(String arg0, Throwable arg1);
@Message(id = 30003, value = "MBean {0} already registered", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_TransactionServiceMX_mbeanalreadyregistered(String arg0);
+ public void warn_TransactionServiceMX_mbeanalreadyregistered(String arg0);
+ @Message(id = 30004, value = "Error reading tool jar", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_toolsClassLoader_invalidjar(Throwable arg0);
+
+ @Message(id = 30005, value = "The URL is invalid {0}", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_toolsClassLoader_invalidurl(String arg0, Throwable arg1);
+
/*
Allocate new messages directly above this notice.
- id: use the next id number in sequence. Don't reuse ids.
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxI18NLoggerImpl.java 2010-06-22 04:54:25 UTC (rev 33589)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxI18NLoggerImpl.java 2010-06-22 09:18:56 UTC (rev 33590)
@@ -20,8 +20,11 @@
*/
package com.arjuna.ats.tsmx.logging;
-import com.arjuna.common.util.logging.Logi18n;
+import org.jboss.logging.Logger;
+import static org.jboss.logging.Logger.Level.ERROR;
+import static org.jboss.logging.Logger.Level.WARN;
+
/**
* i18n log messages for the tsmx module.
* This class is autogenerated. Don't mess with it.
@@ -30,28 +33,30 @@
*/
public class tsmxI18NLoggerImpl implements tsmxI18NLogger {
- private final Logi18n logi18n;
+ private final Logger logger;
- tsmxI18NLoggerImpl(Logi18n logi18n) {
- this.logi18n = logi18n;
+ tsmxI18NLoggerImpl(Logger logger) {
+ this.logger = logger;
}
- public void log_TransactionServiceMX_failedtoregistermbean(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.tsmx.TransactionServiceMX.failedtoregistermbean", new Object[] {arg0, arg1});
- }
+ public void error_TransactionServiceMX_failedtoregistermbean(String arg0, Throwable arg1) {
+ logger.logv(ERROR, arg1, "ARJUNA-30001 Failed to register MBean {0}", arg0);
}
- public void log_TransactionServiceMX_failedtounregistermbean(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.tsmx.TransactionServiceMX.failedtounregistermbean", new Object[] {arg0, arg1});
- }
+ public void error_TransactionServiceMX_failedtounregistermbean(String arg0, Throwable arg1) {
+ logger.logv(ERROR, arg1, "ARJUNA-30002 Failed to unregister MBean {0}", arg0);
}
- public void log_TransactionServiceMX_mbeanalreadyregistered(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.tsmx.TransactionServiceMX.mbeanalreadyregistered", new Object[] {arg0});
- }
+ public void warn_TransactionServiceMX_mbeanalreadyregistered(String arg0) {
+ logger.logv(WARN, "ARJUNA-30003 MBean {0} already registered", arg0);
}
+ public void error_toolsClassLoader_invalidjar(Throwable arg0) {
+ logger.logv(ERROR, arg0, "ARJUNA-30004 Error reading tool jar", (Object)null);
+ }
+
+ public void error_toolsClassLoader_invalidurl(String arg0, Throwable arg1) {
+ logger.logv(ERROR, arg1, "ARJUNA-30005 The URL is invalid {0}", arg0);
+ }
+
}
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxLogger.java 2010-06-22 04:54:25 UTC (rev 33589)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxLogger.java 2010-06-22 09:18:56 UTC (rev 33590)
@@ -32,18 +32,17 @@
package com.arjuna.ats.tsmx.logging;
import com.arjuna.common.util.logging.*;
+import org.jboss.logging.Logger;
public class tsmxLogger
{
public static LogNoi18n logger;
- public static Logi18n loggerI18N;
public static tsmxI18NLogger i18nLogger;
public static void initialize(LogNoi18n noi18n, Logi18n i18n)
{
logger = noi18n;
- loggerI18N = i18n;
- i18nLogger = new tsmxI18NLoggerImpl(i18n);
+ i18nLogger = new tsmxI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.tsmx"));
}
static
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/LockFriend.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/LockFriend.java 2010-06-22 04:54:25 UTC (rev 33589)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/LockFriend.java 2010-06-22 09:18:56 UTC (rev 33590)
@@ -42,13 +42,6 @@
* @author marklittle
*/
-/**
- * @message com.arjuna.ats.internal.txoj.lmf1
- * [com.arjuna.ats.internal.txoj.lmf1] - LockManagerFriend.getLink
- * @message com.arjuna.ats.internal.txoj.lmf2
- * [com.arjuna.ats.internal.txoj.lmf2] - LockManagerFriend.setLink
- */
-
public class LockFriend
{
public static final Lock getLink (Lock inst)
@@ -65,11 +58,7 @@
}
catch (final Throwable ex)
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N
- .warn("com.arjuna.ats.internal.txoj.lmf1", ex);
- }
+ txojLogger.i18NLogger.warn_lmf1(ex);
return null;
}
@@ -87,11 +76,7 @@
}
catch (final Throwable ex)
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N
- .warn("com.arjuna.ats.internal.txoj.lmf2", ex);
- }
+ txojLogger.i18NLogger.warn_lmf2(ex);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockRecord.java 2010-06-22 04:54:25 UTC (rev 33589)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockRecord.java 2010-06-22 09:18:56 UTC (rev 33590)
@@ -44,13 +44,6 @@
import com.arjuna.ats.arjuna.exceptions.FatalError;
-/**
- * @message com.arjuna.ats.txoj.CadaverLockRecord_1 [com.arjuna.ats.txoj.CadaverLockRecord_1] - CadaverLockRecord::nestedAbort - no Current!
- * @message com.arjuna.ats.txoj.CadaverLockRecord_2 [com.arjuna.ats.txoj.CadaverLockRecord_2] - CadaverLockRecord::nestedCommit - no Current!
- * @message com.arjuna.ats.txoj.CadaverLockRecord_3 [com.arjuna.ats.txoj.CadaverLockRecord_3] - CadaverLockRecord::topLevelAbort - no Current!
- * @message com.arjuna.ats.txoj.CadaverLockRecord_4 [com.arjuna.ats.txoj.CadaverLockRecord_4] - CadaverLockRecord::topLevelCommit - no Current!
- */
-
/*
*
* Cadaver Lock Record Class Implementation
@@ -116,13 +109,8 @@
CadaverLockManager manager = new CadaverLockManager(order(), objectTypeName);
if (super.actionHandle == null)
- {
- if (txojLogger.aitLoggerI18N.isFatalEnabled())
- {
- txojLogger.aitLoggerI18N.fatal("CadaverLockRecord_1");
- }
-
- throw new FatalError(txojLogger.aitLoggerI18N.getString("com.arjuna.ats.txoj.CadaverLockRecord_1"));
+ {
+ throw new FatalError(txojLogger.i18NLogger.get_CadaverLockRecord_1());
}
return (manager.releaseAll(super.actionHandle.get_uid()) ? TwoPhaseOutcome.FINISH_OK : TwoPhaseOutcome.FINISH_ERROR);
@@ -148,12 +136,7 @@
if (super.actionHandle == null)
{
- if (txojLogger.aitLoggerI18N.isFatalEnabled())
- {
- txojLogger.aitLoggerI18N.fatal("com.arjuna.ats.txoj.CadaverLockRecord_2");
- }
-
- throw new FatalError(txojLogger.aitLoggerI18N.getString("com.arjuna.ats.txoj.CadaverLockRecord_2"));
+ throw new FatalError(txojLogger.i18NLogger.get_CadaverLockRecord_2());
}
CadaverLockManager manager = new CadaverLockManager(order(), objectTypeName);
@@ -175,12 +158,7 @@
{
if (super.actionHandle == null)
{
- if (txojLogger.aitLoggerI18N.isFatalEnabled())
- {
- txojLogger.aitLoggerI18N.fatal("com.arjuna.ats.txoj.CadaverLockRecord_3");
- }
-
- throw new FatalError(txojLogger.aitLoggerI18N.getString("com.arjuna.ats.txoj.CadaverLockRecord_3"));
+ throw new FatalError(txojLogger.i18NLogger.get_CadaverLockRecord_3());
}
CadaverLockManager manager = new CadaverLockManager(order(), objectTypeName);
@@ -202,12 +180,7 @@
{
if (super.actionHandle == null)
{
- if (txojLogger.aitLoggerI18N.isFatalEnabled())
- {
- txojLogger.aitLoggerI18N.fatal("com.arjuna.ats.txoj.CadaverLockRecord_4");
- }
-
- throw new FatalError(txojLogger.aitLoggerI18N.getString("com.arjuna.ats.txoj.CadaverLockRecord_4"));
+ throw new FatalError(txojLogger.i18NLogger.get_CadaverLockRecord_4());
}
CadaverLockManager manager = new CadaverLockManager(order(), objectTypeName);
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/LockRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/LockRecord.java 2010-06-22 04:54:25 UTC (rev 33589)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/LockRecord.java 2010-06-22 09:18:56 UTC (rev 33590)
@@ -42,16 +42,6 @@
import com.arjuna.ats.arjuna.coordinator.*;
import java.io.*;
-/**
- * @message com.arjuna.ats.txoj.LockRecord_1 [com.arjuna.ats.txoj.LockRecord_1] - LockRecord::set_value() called illegally
- * @message com.arjuna.ats.txoj.LockRecord_2 [com.arjuna.ats.txoj.LockRecord_2] - LockRecord - release failed for action {0}
- * @message com.arjuna.ats.txoj.LockRecord_3 [com.arjuna.ats.txoj.LockRecord_3] - LockRecord::nestedAbort - no current action
- * @message com.arjuna.ats.txoj.LockRecord_4 [com.arjuna.ats.txoj.LockRecord_4] - LockRecord::nestedCommit - no current action
- * @message com.arjuna.ats.txoj.LockRecord_5 [com.arjuna.ats.txoj.LockRecord_5] - LockRecord - release failed for action {0}
- * @message com.arjuna.ats.txoj.LockRecord_6 [com.arjuna.ats.txoj.LockRecord_6] - LockRecord::topLevelCommit - no current action
- * @message com.arjuna.ats.txoj.LockRecord_7 [com.arjuna.ats.txoj.LockRecord_7] - Invocation of LockRecord::restore_state for {0} inappropriate - ignored for {1}
- */
-
public class LockRecord extends AbstractRecord
{
@@ -89,8 +79,7 @@
public void setValue (Object o)
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- txojLogger.aitLoggerI18N.warn("com.arjuna.ats.txoj.LockRecord_1");
+ txojLogger.i18NLogger.warn_LockRecord_1();
}
public int nestedAbort ()
@@ -113,18 +102,13 @@
if (!managerAddress.releaseAll(toRelease))
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N.warn("com.arjuna.ats.txoj.LockRecord_2",
- new Object[]{toRelease});
- }
+ txojLogger.i18NLogger.warn_LockRecord_2(toRelease);
- return TwoPhaseOutcome.FINISH_ERROR;
+ return TwoPhaseOutcome.FINISH_ERROR;
}
}
else
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- txojLogger.aitLoggerI18N.warn("com.arjuna.ats.txoj.LockRecord_3");
+ txojLogger.i18NLogger.warn_LockRecord_3();
return TwoPhaseOutcome.FINISH_OK;
}
@@ -151,8 +135,7 @@
}
else
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- txojLogger.aitLoggerI18N.warn("com.arjuna.ats.txoj.LockRecord_4");
+ txojLogger.i18NLogger.warn_LockRecord_4();
}
return TwoPhaseOutcome.FINISH_ERROR;
@@ -194,19 +177,14 @@
{
if (!managerAddress.releaseAll(actionHandle.get_uid()))
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N.warn("com.arjuna.ats.txoj.LockRecord_5",
- new Object[]{actionHandle.get_uid()});
- }
+ txojLogger.i18NLogger.warn_LockRecord_5(actionHandle.get_uid());
- return TwoPhaseOutcome.FINISH_ERROR;
+ return TwoPhaseOutcome.FINISH_ERROR;
}
}
else
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- txojLogger.aitLoggerI18N.warn("com.arjuna.ats.txoj.LockRecord_6");
+ txojLogger.i18NLogger.warn_LockRecord_6();
return TwoPhaseOutcome.FINISH_ERROR;
}
@@ -254,13 +232,8 @@
public boolean restore_state (InputObjectState o, int t)
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N.warn("com.arjuna.ats.txoj.LockRecord_7",
- new Object[]{type(), order()});
- }
-
- return false;
+ txojLogger.i18NLogger.warn_LockRecord_7(type(), order());
+ return false;
}
public boolean save_state (OutputObjectState o, int t)
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/RecoveredTransactionalObject.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/RecoveredTransactionalObject.java 2010-06-22 04:54:25 UTC (rev 33589)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/RecoveredTransactionalObject.java 2010-06-22 09:18:56 UTC (rev 33590)
@@ -66,46 +66,6 @@
* @author Peter Furniss (peter.furniss at arjuna.com), Mark Little
* (mark_little at hp.com)
* @version $Id: RecoveredTransactionalObject.java 2342 2006-03-30 13:06:17Z $
- * @message com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_1
- * [com.arjuna.ats.internal.txoj.recovery.
- * RecoveredTransactionalObject_1] - RecoveredTransactionalObject
- * created for {0}
- * @message com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_2
- * [com.arjuna.ats.internal.txoj.recovery.
- * RecoveredTransactionalObject_2] - TO held by transaction {0}
- * @message com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_3
- * [com.arjuna.ats.internal.txoj.recovery.
- * RecoveredTransactionalObject_3] - transaction status {0}
- * @message com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_4
- * [com.arjuna.ats.internal.txoj.recovery.
- * RecoveredTransactionalObject_4] - transaction Status from original
- * application {0} and inactive: {1}
- * @message com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_5
- * [com.arjuna.ats.internal.txoj.recovery.
- * RecoveredTransactionalObject_5] -
- * RecoveredTransactionalObject.replayPhase2 - cannot find/no holding
- * transaction
- * @message com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_6
- * [com.arjuna.ats.internal.txoj.recovery.
- * RecoveredTransactionalObject_6] - RecoveredTransactionalObject tried
- * to access object store {0}
- * @message com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_7
- * [com.arjuna.ats.internal.txoj.recovery.
- * RecoveredTransactionalObject_7] -
- * RecoveredTransactionalObject::findHoldingTransaction - uid is {0}
- * @message com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_8
- * [com.arjuna.ats.internal.txoj.recovery.
- * RecoveredTransactionalObject_8] -
- * RecoveredTransactionalObject::findHoldingTransaction - exception {0}
- * @message com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_9
- * [com.arjuna.ats.internal.txoj.recovery.
- * RecoveredTransactionalObject_9] - Object store exception on removing
- * uncommitted state: {0} {1}
- * @message
- * com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_10
- * [com.arjuna.ats.internal.txoj.recovery.
- * RecoveredTransactionalObject_10] - Object store exception on
- * committing {0} {1}
*/
/*
@@ -123,9 +83,8 @@
_objectStore = objectStore;
_transactionStatusConnectionMgr = new TransactionStatusConnectionManager();
- if (txojLogger.aitLoggerI18N.isDebugEnabled()) {
- txojLogger.aitLoggerI18N.debug("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_1", new Object[]
- {_ourUid});
+ if (txojLogger.aitLogger.isDebugEnabled()) {
+ txojLogger.aitLogger.debug("RecoveredTransactionalObject created for "+_ourUid);
}
}
@@ -139,17 +98,15 @@
* is, so leave that to the cache.
*/
- if (txojLogger.aitLoggerI18N.isDebugEnabled()) {
- txojLogger.aitLoggerI18N.debug("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_2", new Object[]
- {_owningTransactionUid});
+ if (txojLogger.aitLogger.isDebugEnabled()) {
+ txojLogger.aitLogger.debug("TO held by transaction "+_owningTransactionUid);
}
int tranStatus = _transactionStatusConnectionMgr
.getTransactionStatus(_owningTransactionUid);
- if (txojLogger.aitLoggerI18N.isDebugEnabled()) {
- txojLogger.aitLoggerI18N.debug("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_3", new Object[]
- {ActionStatus.stringForm(tranStatus)});
+ if (txojLogger.aitLogger.isDebugEnabled()) {
+ txojLogger.aitLogger.debug("RecoveredTransactionalObject - transaction status "+ActionStatus.stringForm(tranStatus));
}
boolean inactive = false;
@@ -157,14 +114,9 @@
if (tranStatus == ActionStatus.INVALID) // should be
// ActionStatus.NO_ACTION
{
- if (txojLogger.aitLoggerI18N.isDebugEnabled())
+ if (txojLogger.aitLogger.isDebugEnabled())
{
- if (inactive)
- txojLogger.aitLoggerI18N.debug("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_4", new Object[]
- {Integer.toString(tranStatus), "true"});
- else
- txojLogger.aitLoggerI18N.debug("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_4", new Object[]
- {Integer.toString(tranStatus), "false"});
+ txojLogger.aitLogger.debug("transaction Status from original application "+Integer.toString(tranStatus)+" and inactive: "+inactive);
}
inactive = true;
@@ -186,8 +138,8 @@
}
else
{
- if (txojLogger.aitLoggerI18N.isDebugEnabled()) {
- txojLogger.aitLoggerI18N.debug("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_5");
+ if (txojLogger.aitLogger.isDebugEnabled()) {
+ txojLogger.aitLogger.debug("RecoveredTransactionalObject.replayPhase2 - cannot find/no holding transaction");
}
}
}
@@ -209,10 +161,7 @@
}
catch (ObjectStoreException e)
{
- if (txojLogger.aitLoggerI18N.isDebugEnabled()) {
- txojLogger.aitLoggerI18N.debug("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_6", new Object[]
- {e});
- }
+ txojLogger.i18NLogger.warn_recovery_RecoveredTransactionalObject_6(e);
return false; // probably
}
@@ -234,19 +183,15 @@
_originalProcessUid = hdr.getProcessId();
_owningTransactionUid = hdr.getTxId();
- if (txojLogger.aitLoggerI18N.isDebugEnabled()) {
- txojLogger.aitLoggerI18N.debug("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_7", new Object[]
- {_owningTransactionUid});
+ if (txojLogger.aitLogger.isDebugEnabled()) {
+ txojLogger.aitLogger.debug("RecoveredTransactionalObject::findHoldingTransaction - uid is "+_owningTransactionUid);
}
return _owningTransactionUid.notEquals(Uid.nullUid());
}
catch (Exception e)
{
- if (txojLogger.aitLoggerI18N.isDebugEnabled()) {
- txojLogger.aitLoggerI18N.debug("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_8", new Object[]
- {e});
- }
+ txojLogger.i18NLogger.warn_recovery_RecoveredTransactionalObject_8(e);
}
return false;
@@ -260,14 +205,7 @@
}
catch (ObjectStoreException e)
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N
- .warn(
- "com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_9",
- new Object[]
- { _ourUid, e });
- }
+ txojLogger.i18NLogger.warn_recovery_RecoveredTransactionalObject_9(_ourUid, e);
}
}
@@ -279,14 +217,7 @@
}
catch (ObjectStoreException e)
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N
- .warn(
- "com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_10",
- new Object[]
- { _ourUid, e });
- }
+ txojLogger.i18NLogger.warn_recovery_RecoveredTransactionalObject_10(_ourUid, e);
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java 2010-06-22 04:54:25 UTC (rev 33589)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java 2010-06-22 09:18:56 UTC (rev 33590)
@@ -36,12 +36,9 @@
import com.arjuna.ats.txoj.logging.txojLogger;
-import com.arjuna.ats.arjuna.logging.tsLogger;
import com.arjuna.ats.arjuna.objectstore.*;
import com.arjuna.ats.arjuna.recovery.RecoveryModule;
-import com.arjuna.common.util.logging.*;
-
import java.util.*;
import com.arjuna.ats.arjuna.exceptions.FatalError;
@@ -54,35 +51,6 @@
* This class is a plug-in module for the recovery manager. This class is
* responsible for the recovery of Transactional Objects (aka AIT objects),
* i.e., objects that derive from LockManager and StateManager.
- *
- * @message com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_1
- * [com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_1] -
- * TORecoveryModule created
- * @message com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_2
- * [com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_2] -
- * TORecoveryModule created with {0}
- * @message com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_3
- * [com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_3] -
- * TORecoveryModule - first pass
- * @message com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_4
- * [com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_4] - TO
- * currently uncommitted {0} is a {1}
- * @message com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_5
- * [com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_5] -
- * TORecoveryModule: searching for TOs:
- * @message com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_6
- * [com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_6] -
- * TORecoveryModule - second pass
- * @message com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_7
- * [com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_7] -
- * TORecoveryModule.periodicWork(): Object ({0}, {1}) is no longer
- * uncommitted.
- * @message com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_8
- * [com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_8] -
- * TORecoveryModule.periodicWork(): Object ({0}, {1}) no longer exists.
- * @message com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_osproblem
- * [com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_osproblem] -
- * TORecoveryModule - could not create ObjectStore instance!
*/
public class TORecoveryModule implements RecoveryModule
@@ -96,8 +64,8 @@
@SuppressWarnings("unchecked")
public TORecoveryModule()
{
- if (txojLogger.aitLoggerI18N.isDebugEnabled()) {
- txojLogger.aitLoggerI18N.debug("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_1");
+ if (txojLogger.aitLogger.isDebugEnabled()) {
+ txojLogger.aitLogger.debug("TORecoveryModule created");
}
/*
@@ -112,18 +80,13 @@
}
catch (final Throwable ex)
{
- throw new FatalError(txojLogger.aitLoggerI18N
- .getString("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_osproblem"), ex);
+ throw new FatalError(txojLogger.i18NLogger.get_recovery_TORecoveryModule_osproblem(), ex);
}
}
public void periodicWorkFirstPass ()
{
- if (txojLogger.aitLoggerI18N.isInfoEnabled())
- {
- txojLogger.aitLoggerI18N
- .info("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_3");
- }
+ txojLogger.i18NLogger.info_recovery_TORecoveryModule_3();
// Build a hashtable of uncommitted transactional objects
_uncommittedTOTable = new Hashtable();
@@ -178,11 +141,8 @@
_uncommittedTOTable.put(newUid,newTypeString);
- if (txojLogger.aitLoggerI18N
- .isDebugEnabled()) {
- txojLogger.aitLoggerI18N.debug("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_4", new Object[]
- {newUid,
- newTypeString});
+ if (txojLogger.aitLogger.isDebugEnabled()) {
+ txojLogger.aitLogger.debug("TO currently uncommitted "+newUid+" is a "+newTypeString);
}
}
}
@@ -201,36 +161,20 @@
}
catch (Exception e)
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N
- .warn(
- "com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_5",
- e);
- }
+ txojLogger.i18NLogger.warn_recovery_TORecoveryModule_5(e);
}
}
}
catch (Exception e)
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N
- .warn(
- "com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_5",
- e);
- }
+ txojLogger.i18NLogger.warn_recovery_TORecoveryModule_5(e);
}
}
public void periodicWorkSecondPass ()
{
- if (txojLogger.aitLoggerI18N.isInfoEnabled())
- {
- txojLogger.aitLoggerI18N
- .info("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_6");
- }
+ txojLogger.i18NLogger.info_recovery_TORecoveryModule_6();
Enumeration uncommittedObjects = _uncommittedTOTable.keys();
@@ -247,17 +191,15 @@
}
else
{
- if (txojLogger.aitLoggerI18N.isDebugEnabled()) {
- txojLogger.aitLoggerI18N.debug("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_7", new Object[]
- {objUid, objType});
+ if (txojLogger.aitLogger.isDebugEnabled()) {
+ txojLogger.aitLogger.debug("Object ("+objUid+", "+objType+") is no longer uncommitted.");
}
}
}
catch (ObjectStoreException ose)
{
- if (txojLogger.aitLoggerI18N.isDebugEnabled()) {
- txojLogger.aitLoggerI18N.debug("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_8", new Object[]
- {objUid, objType});
+ if (txojLogger.aitLogger.isDebugEnabled()) {
+ txojLogger.aitLogger.debug("Object ("+objUid+", "+objType+") no longer exists.");
}
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java 2010-06-22 04:54:25 UTC (rev 33589)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java 2010-06-22 09:18:56 UTC (rev 33590)
@@ -64,41 +64,6 @@
* @version $Id: LockManager.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.0.
* @see com.arjuna.ats.arjuna.StateManager
- * @message com.arjuna.ats.txoj.LockManager_1 [com.arjuna.ats.txoj.LockManager_1]
- * - LockManager: lock propagation failed
- * @message com.arjuna.ats.txoj.LockManager_2
- * [com.arjuna.ats.txoj.LockManager_2] - LockManager::setlock() no
- * lock!
- * @message com.arjuna.ats.txoj.LockManager_3
- * [com.arjuna.ats.txoj.LockManager_3] - LockManager::setlock() cannot
- * find action hierarchy
- * @message com.arjuna.ats.txoj.LockManager_4
- * [com.arjuna.ats.txoj.LockManager_4] - LockManager::setlock() cannot
- * load existing lock states
- * @message com.arjuna.ats.txoj.LockManager_5
- * [com.arjuna.ats.txoj.LockManager_5] - LockManager::setlock() cannot
- * activate object
- * @message com.arjuna.ats.txoj.LockManager_6
- * [com.arjuna.ats.txoj.LockManager_6] - LockManager::setlock() cannot
- * save new lock states
- * @message com.arjuna.ats.txoj.LockManager_7
- * [com.arjuna.ats.txoj.LockManager_7] - Lockmanager::releaselock()
- * could not load old lock states
- * @message com.arjuna.ats.txoj.LockManager_8
- * [com.arjuna.ats.txoj.LockManager_8] - Lockmanager::releaselock()
- * could not unload new lock states
- * @message com.arjuna.ats.txoj.LockManager_10
- * [com.arjuna.ats.txoj.LockManager_10] - LockManager::unloadState()
- * failed to remove empty lock state for object {0} of type {1}
- * @message com.arjuna.ats.txoj.LockManager_11
- * [com.arjuna.ats.txoj.LockManager_11] - LockManager.unloadState -
- * could not save lock state: {0}
- * @message com.arjuna.ats.txoj.LockManager_12
- * [com.arjuna.ats.txoj.LockManager_12] - LockManager::unloadState()
- * failed to write new state for object {0} of type {1}
- * @message com.arjuna.ats.txoj.LockManager_13
- * [com.arjuna.ats.txoj.LockManager_13] - LockManager::unloadState()
- * failed to pack up new state for object {0} of type {1}
*/
public class LockManager extends StateManager
@@ -261,11 +226,7 @@
if (!result)
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N
- .warn("com.arjuna.ats.txoj.LockManager_1");
- }
+ txojLogger.i18NLogger.warn_LockManager_1();
synchronized (locksHeldLockObject)
{
@@ -355,11 +316,7 @@
if (toSet == null)
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N
- .warn("com.arjuna.ats.txoj.LockManager_2");
- }
+ txojLogger.i18NLogger.warn_LockManager_2();
return LockResult.REFUSED;
}
@@ -374,11 +331,7 @@
toSet.changeHierarchy(ah);
else
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N
- .warn("com.arjuna.ats.txoj.LockManager_3");
- }
+ txojLogger.i18NLogger.warn_LockManager_3();
toSet = null;
@@ -406,11 +359,7 @@
}
else
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N
- .warn("com.arjuna.ats.txoj.LockManager_4");
- }
+ txojLogger.i18NLogger.warn_LockManager_4();
}
if (conflict != ConflictType.CONFLICT)
@@ -463,13 +412,8 @@
else
{
/* activate failed - refuse request */
-
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N
- .warn("com.arjuna.ats.txoj.LockManager_5");
- }
-
+ txojLogger.i18NLogger.warn_LockManager_5();
+
returnStatus = LockResult.REFUSED;
}
}
@@ -486,12 +430,8 @@
{
if (!unloadState())
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N
- .warn("com.arjuna.ats.txoj.LockManager_6");
- }
-
+ txojLogger.i18NLogger.warn_LockManager_6();
+
returnStatus = LockResult.REFUSED;
}
}
@@ -862,9 +802,7 @@
// if (!stateLoaded)
if (!loaded)
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- txojLogger.aitLoggerI18N
- .warn("com.arjuna.ats.txoj.LockManager_7");
+ txojLogger.i18NLogger.warn_LockManager_7();
/*
* No need to freeState since we will have done that by now.
*/
@@ -886,9 +824,7 @@
{
if (!unloadState())
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- txojLogger.aitLoggerI18N
- .warn("com.arjuna.ats.txoj.LockManager_8");
+ txojLogger.i18NLogger.warn_LockManager_8();
}
else
releasedOK = true;
@@ -1247,13 +1183,7 @@
}
else
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N.warn(
- "com.arjuna.ats.txoj.LockManager_10",
- new Object[]
- { u, otype });
- }
+ txojLogger.i18NLogger.warn_LockManager_10(u, otype);
}
}
else
@@ -1272,13 +1202,7 @@
if (!current.save_state(S, ObjectType.ANDPERSISTENT))
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N.warn(
- "com.arjuna.ats.txoj.LockManager_11",
- new Object[]
- { current });
- }
+ txojLogger.i18NLogger.warn_LockManager_11(current.toString());
unloadOk = false;
}
@@ -1297,13 +1221,7 @@
}
else
{
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N.warn(
- "com.arjuna.ats.txoj.LockManager_12",
- new Object[]
- { u, otype });
- }
+ txojLogger.i18NLogger.warn_LockManager_12(u, otype);
}
}
}
@@ -1311,13 +1229,7 @@
{
unloadOk = false;
- if (txojLogger.aitLoggerI18N.isWarnEnabled())
- {
- txojLogger.aitLoggerI18N.warn(
- "com.arjuna.ats.txoj.LockManager_13",
- new Object[]
- { u, otype });
- }
+ txojLogger.i18NLogger.warn_LockManager_13(u, otype);
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojI18NLogger.java 2010-06-22 04:54:25 UTC (rev 33589)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojI18NLogger.java 2010-06-22 09:18:56 UTC (rev 33590)
@@ -20,6 +20,7 @@
*/
package com.arjuna.ats.txoj.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,179 +42,174 @@
@Message(id = 15001, value = "LockManagerFriend.getLink", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_lmf1();
+ public void warn_lmf1(Throwable arg0);
@Message(id = 15002, value = "LockManagerFriend.setLink", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_lmf2();
+ public void warn_lmf2(Throwable arg0);
- @Message(id = 15003, value = "RecoveredTransactionalObject created for {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_RecoveredTransactionalObject_1(String arg0);
+// @Message(id = 15003, value = "RecoveredTransactionalObject created for {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_RecoveredTransactionalObject_1(String arg0);
- @Message(id = 15004, value = "Object store exception on committing {0} {1}", format = MESSAGE_FORMAT)
+ @Message(id = 15004, value = "Object store exception on committing {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_RecoveredTransactionalObject_10(String arg0, String arg1);
+ public void warn_recovery_RecoveredTransactionalObject_10(Uid arg0, Throwable arg1);
- @Message(id = 15005, value = "TO held by transaction {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_RecoveredTransactionalObject_2(String arg0);
+// @Message(id = 15005, value = "TO held by transaction {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_RecoveredTransactionalObject_2(String arg0);
- @Message(id = 15006, value = "transaction status {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_RecoveredTransactionalObject_3(String arg0);
+// @Message(id = 15006, value = "transaction status {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_RecoveredTransactionalObject_3(String arg0);
- @Message(id = 15007, value = "transaction Status from original application {0} and inactive: {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_RecoveredTransactionalObject_4(String arg0, String arg1);
+// @Message(id = 15007, value = "transaction Status from original application {0} and inactive: {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_RecoveredTransactionalObject_4(String arg0, String arg1);
- @Message(id = 15008, value = "RecoveredTransactionalObject.replayPhase2 - cannot find/no holding transaction", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_RecoveredTransactionalObject_5();
+// @Message(id = 15008, value = "RecoveredTransactionalObject.replayPhase2 - cannot find/no holding transaction", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_RecoveredTransactionalObject_5();
- @Message(id = 15009, value = "RecoveredTransactionalObject tried to access object store {0}", format = MESSAGE_FORMAT)
+ @Message(id = 15009, value = "RecoveredTransactionalObject tried to access object store", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_RecoveredTransactionalObject_6(String arg0);
+ public void warn_recovery_RecoveredTransactionalObject_6(Throwable arg0);
- @Message(id = 15010, value = "RecoveredTransactionalObject::findHoldingTransaction - uid is {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_RecoveredTransactionalObject_7(String arg0);
+// @Message(id = 15010, value = "RecoveredTransactionalObject::findHoldingTransaction - uid is {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_RecoveredTransactionalObject_7(String arg0);
- @Message(id = 15011, value = "RecoveredTransactionalObject::findHoldingTransaction - exception {0}", format = MESSAGE_FORMAT)
+ @Message(id = 15011, value = "RecoveredTransactionalObject::findHoldingTransaction - exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_RecoveredTransactionalObject_8(String arg0);
+ public void warn_recovery_RecoveredTransactionalObject_8(Throwable arg0);
- @Message(id = 15012, value = "Object store exception on removing uncommitted state: {0} {1}", format = MESSAGE_FORMAT)
+ @Message(id = 15012, value = "Object store exception on removing uncommitted state: {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_RecoveredTransactionalObject_9(String arg0, String arg1);
+ public void warn_recovery_RecoveredTransactionalObject_9(Uid arg0, Throwable arg1);
- @Message(id = 15013, value = "TORecoveryModule created", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_TORecoveryModule_1();
+// @Message(id = 15013, value = "TORecoveryModule created", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_TORecoveryModule_1();
- @Message(id = 15014, value = "TORecoveryModule created with {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_TORecoveryModule_2(String arg0);
+// @Message(id = 15014, value = "TORecoveryModule created with {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_TORecoveryModule_2(String arg0);
@Message(id = 15015, value = "TORecoveryModule - first pass", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_TORecoveryModule_3();
+ @LogMessage(level = INFO)
+ public void info_recovery_TORecoveryModule_3();
- @Message(id = 15016, value = "TO currently uncommitted {0} is a {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_TORecoveryModule_4(String arg0, String arg1);
+// @Message(id = 15016, value = "TO currently uncommitted {0} is a {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_TORecoveryModule_4(String arg0, String arg1);
@Message(id = 15017, value = "TORecoveryModule: searching for TOs:", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_TORecoveryModule_5();
+ public void warn_recovery_TORecoveryModule_5(Throwable arg0);
@Message(id = 15018, value = "TORecoveryModule - second pass", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_TORecoveryModule_6();
+ @LogMessage(level = INFO)
+ public void info_recovery_TORecoveryModule_6();
- @Message(id = 15019, value = "TORecoveryModule.periodicWork(): Object ({0}, {1}) is no longer uncommitted.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_TORecoveryModule_7(String arg0, String arg1);
+// @Message(id = 15019, value = "TORecoveryModule.periodicWork(): Object ({0}, {1}) is no longer uncommitted.", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_TORecoveryModule_7(String arg0, String arg1);
- @Message(id = 15020, value = "TORecoveryModule.periodicWork(): Object ({0}, {1}) no longer exists.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_TORecoveryModule_8(String arg0, String arg1);
+// @Message(id = 15020, value = "TORecoveryModule.periodicWork(): Object ({0}, {1}) no longer exists.", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_TORecoveryModule_8(String arg0, String arg1);
@Message(id = 15021, value = "TORecoveryModule - could not create ObjectStore instance!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_TORecoveryModule_osproblem();
+ public String get_recovery_TORecoveryModule_osproblem();
@Message(id = 15022, value = "CadaverLockRecord::nestedAbort - no Current!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_CadaverLockRecord_1();
+ public String get_CadaverLockRecord_1();
@Message(id = 15023, value = "CadaverLockRecord::nestedCommit - no Current!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_CadaverLockRecord_2();
+ public String get_CadaverLockRecord_2();
@Message(id = 15024, value = "CadaverLockRecord::topLevelAbort - no Current!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_CadaverLockRecord_3();
+ public String get_CadaverLockRecord_3();
@Message(id = 15025, value = "CadaverLockRecord::topLevelCommit - no Current!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_CadaverLockRecord_4();
+ public String get_CadaverLockRecord_4();
@Message(id = 15026, value = "LockManager: lock propagation failed", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockManager_1();
+ public void warn_LockManager_1();
@Message(id = 15027, value = "LockManager::unloadState() failed to remove empty lock state for object {0} of type {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockManager_10(String arg0, String arg1);
+ public void warn_LockManager_10(Uid arg0, String arg1);
@Message(id = 15028, value = "LockManager.unloadState - could not save lock state: {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockManager_11(String arg0);
+ public void warn_LockManager_11(String arg0);
@Message(id = 15029, value = "LockManager::unloadState() failed to write new state for object {0} of type {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockManager_12(String arg0, String arg1);
+ public void warn_LockManager_12(Uid arg0, String arg1);
@Message(id = 15030, value = "LockManager::unloadState() failed to pack up new state for object {0} of type {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockManager_13(String arg0, String arg1);
+ public void warn_LockManager_13(Uid arg0, String arg1);
@Message(id = 15031, value = "LockManager::setlock() no lock!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockManager_2();
+ public void warn_LockManager_2();
@Message(id = 15032, value = "LockManager::setlock() cannot find action hierarchy", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockManager_3();
+ public void warn_LockManager_3();
@Message(id = 15033, value = "LockManager::setlock() cannot load existing lock states", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockManager_4();
+ public void warn_LockManager_4();
@Message(id = 15034, value = "LockManager::setlock() cannot activate object", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockManager_5();
+ public void warn_LockManager_5();
@Message(id = 15035, value = "LockManager::setlock() cannot save new lock states", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockManager_6();
+ public void warn_LockManager_6();
@Message(id = 15036, value = "Lockmanager::releaselock() could not load old lock states", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockManager_7();
+ public void warn_LockManager_7();
@Message(id = 15037, value = "Lockmanager::releaselock() could not unload new lock states", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockManager_8();
+ public void warn_LockManager_8();
@Message(id = 15038, value = "LockRecord::set_value() called illegally", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockRecord_1();
+ public void warn_LockRecord_1();
@Message(id = 15039, value = "LockRecord - release failed for action {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockRecord_2(String arg0);
+ public void warn_LockRecord_2(Uid arg0);
@Message(id = 15040, value = "LockRecord::nestedAbort - no current action", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockRecord_3();
+ public void warn_LockRecord_3();
@Message(id = 15041, value = "LockRecord::nestedCommit - no current action", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockRecord_4();
+ public void warn_LockRecord_4();
@Message(id = 15042, value = "LockRecord - release failed for action {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockRecord_5(String arg0);
+ public void warn_LockRecord_5(Uid arg0);
@Message(id = 15043, value = "LockRecord::topLevelCommit - no current action", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockRecord_6();
+ public void warn_LockRecord_6();
@Message(id = 15044, value = "Invocation of LockRecord::restore_state for {0} inappropriate - ignored for {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_LockRecord_7(String arg0, String arg1);
+ public void warn_LockRecord_7(String arg0, Uid arg1);
/*
Allocate new messages directly above this notice.
@@ -223,5 +219,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/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojI18NLoggerImpl.java 2010-06-22 04:54:25 UTC (rev 33589)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojI18NLoggerImpl.java 2010-06-22 09:18:56 UTC (rev 33590)
@@ -20,8 +20,12 @@
*/
package com.arjuna.ats.txoj.logging;
-import com.arjuna.common.util.logging.Logi18n;
+import com.arjuna.ats.arjuna.common.Uid;
+import org.jboss.logging.Logger;
+import static org.jboss.logging.Logger.Level.INFO;
+import static org.jboss.logging.Logger.Level.WARN;
+
/**
* i18n log messages for the txoj module.
* This class is autogenerated. Don't mess with it.
@@ -30,274 +34,141 @@
*/
public class txojI18NLoggerImpl implements txojI18NLogger {
- private final Logi18n logi18n;
+ private final Logger logger;
- txojI18NLoggerImpl(Logi18n logi18n) {
- this.logi18n = logi18n;
+ txojI18NLoggerImpl(Logger logger) {
+ this.logger = logger;
}
- public void log_lmf1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.lmf1");
- }
+ public void warn_lmf1(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-15001 LockManagerFriend.getLink", (Object)null);
}
- public void log_lmf2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.lmf2");
- }
+ public void warn_lmf2(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-15002 LockManagerFriend.setLink", (Object)null);
}
- public void log_recovery_RecoveredTransactionalObject_1(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_1", new Object[] {arg0});
- }
+ public void warn_recovery_RecoveredTransactionalObject_10(Uid arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-15004 Object store exception on committing {0}", arg0);
}
- public void log_recovery_RecoveredTransactionalObject_10(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_10", new Object[] {arg0, arg1});
- }
+ public void warn_recovery_RecoveredTransactionalObject_6(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-15009 RecoveredTransactionalObject tried to access object store", (Object)null);
}
- public void log_recovery_RecoveredTransactionalObject_2(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_2", new Object[] {arg0});
- }
+ public void warn_recovery_RecoveredTransactionalObject_8(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-15011 RecoveredTransactionalObject::findHoldingTransaction - exception", (Object)null);
}
- public void log_recovery_RecoveredTransactionalObject_3(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_3", new Object[] {arg0});
- }
+ public void warn_recovery_RecoveredTransactionalObject_9(Uid arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-15012 Object store exception on removing uncommitted state: {0}", arg0);
}
- public void log_recovery_RecoveredTransactionalObject_4(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_4", new Object[] {arg0, arg1});
- }
+ public void info_recovery_TORecoveryModule_3() {
+ logger.logv(INFO, "ARJUNA-15015 TORecoveryModule - first pass", (Object)null);
}
- public void log_recovery_RecoveredTransactionalObject_5() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_5");
- }
+ public void warn_recovery_TORecoveryModule_5(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-15017 TORecoveryModule: searching for TOs:", (Object)null);
}
- public void log_recovery_RecoveredTransactionalObject_6(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_6", new Object[] {arg0});
- }
+ public void info_recovery_TORecoveryModule_6() {
+ logger.logv(INFO, "ARJUNA-15018 TORecoveryModule - second pass", (Object)null);
}
- public void log_recovery_RecoveredTransactionalObject_7(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_7", new Object[] {arg0});
- }
+ public String get_recovery_TORecoveryModule_osproblem() {
+ return "ARJUNA-15021 TORecoveryModule - could not create ObjectStore instance!";
}
- public void log_recovery_RecoveredTransactionalObject_8(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_8", new Object[] {arg0});
- }
+ public String get_CadaverLockRecord_1() {
+ return "ARJUNA-15022 CadaverLockRecord::nestedAbort - no Current!";
}
- public void log_recovery_RecoveredTransactionalObject_9(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.RecoveredTransactionalObject_9", new Object[] {arg0, arg1});
- }
+ public String get_CadaverLockRecord_2() {
+ return "ARJUNA-15023 CadaverLockRecord::nestedCommit - no Current!";
}
- public void log_recovery_TORecoveryModule_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_1");
- }
+ public String get_CadaverLockRecord_3() {
+ return "ARJUNA-15024 CadaverLockRecord::topLevelAbort - no Current!";
}
- public void log_recovery_TORecoveryModule_2(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_2", new Object[] {arg0});
- }
+ public String get_CadaverLockRecord_4() {
+ return "ARJUNA-15025 CadaverLockRecord::topLevelCommit - no Current!";
}
- public void log_recovery_TORecoveryModule_3() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_3");
- }
+ public void warn_LockManager_1() {
+ logger.logv(WARN, "ARJUNA-15026 LockManager: lock propagation failed", (Object)null);
}
- public void log_recovery_TORecoveryModule_4(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_4", new Object[] {arg0, arg1});
- }
+ public void warn_LockManager_10(Uid arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-15027 LockManager::unloadState() failed to remove empty lock state for object {0} of type {1}", arg0, arg1);
}
- public void log_recovery_TORecoveryModule_5() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_5");
- }
+ public void warn_LockManager_11(String arg0) {
+ logger.logv(WARN, "ARJUNA-15028 LockManager.unloadState - could not save lock state: {0}", arg0);
}
- public void log_recovery_TORecoveryModule_6() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_6");
- }
+ public void warn_LockManager_12(Uid arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-15029 LockManager::unloadState() failed to write new state for object {0} of type {1}", arg0, arg1);
}
- public void log_recovery_TORecoveryModule_7(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_7", new Object[] {arg0, arg1});
- }
+ public void warn_LockManager_13(Uid arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-15030 LockManager::unloadState() failed to pack up new state for object {0} of type {1}", arg0, arg1);
}
- public void log_recovery_TORecoveryModule_8(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_8", new Object[] {arg0, arg1});
- }
+ public void warn_LockManager_2() {
+ logger.logv(WARN, "ARJUNA-15031 LockManager::setlock() no lock!", (Object)null);
}
- public void log_recovery_TORecoveryModule_osproblem() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_osproblem");
- }
+ public void warn_LockManager_3() {
+ logger.logv(WARN, "ARJUNA-15032 LockManager::setlock() cannot find action hierarchy", (Object)null);
}
- public void log_CadaverLockRecord_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.CadaverLockRecord_1");
- }
+ public void warn_LockManager_4() {
+ logger.logv(WARN, "ARJUNA-15033 LockManager::setlock() cannot load existing lock states", (Object)null);
}
- public void log_CadaverLockRecord_2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.CadaverLockRecord_2");
- }
+ public void warn_LockManager_5() {
+ logger.logv(WARN, "ARJUNA-15034 LockManager::setlock() cannot activate object", (Object)null);
}
- public void log_CadaverLockRecord_3() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.CadaverLockRecord_3");
- }
+ public void warn_LockManager_6() {
+ logger.logv(WARN, "ARJUNA-15035 LockManager::setlock() cannot save new lock states", (Object)null);
}
- public void log_CadaverLockRecord_4() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.CadaverLockRecord_4");
- }
+ public void warn_LockManager_7() {
+ logger.logv(WARN, "ARJUNA-15036 Lockmanager::releaselock() could not load old lock states", (Object)null);
}
- public void log_LockManager_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockManager_1");
- }
+ public void warn_LockManager_8() {
+ logger.logv(WARN, "ARJUNA-15037 Lockmanager::releaselock() could not unload new lock states", (Object)null);
}
- public void log_LockManager_10(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockManager_10", new Object[] {arg0, arg1});
- }
+ public void warn_LockRecord_1() {
+ logger.logv(WARN, "ARJUNA-15038 LockRecord::set_value() called illegally", (Object)null);
}
- public void log_LockManager_11(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockManager_11", new Object[] {arg0});
- }
+ public void warn_LockRecord_2(Uid arg0) {
+ logger.logv(WARN, "ARJUNA-15039 LockRecord - release failed for action {0}", arg0);
}
- public void log_LockManager_12(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockManager_12", new Object[] {arg0, arg1});
- }
+ public void warn_LockRecord_3() {
+ logger.logv(WARN, "ARJUNA-15040 LockRecord::nestedAbort - no current action", (Object)null);
}
- public void log_LockManager_13(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockManager_13", new Object[] {arg0, arg1});
- }
+ public void warn_LockRecord_4() {
+ logger.logv(WARN, "ARJUNA-15041 LockRecord::nestedCommit - no current action", (Object)null);
}
- public void log_LockManager_2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockManager_2");
- }
+ public void warn_LockRecord_5(Uid arg0) {
+ logger.logv(WARN, "ARJUNA-15042 LockRecord - release failed for action {0}", arg0);
}
- public void log_LockManager_3() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockManager_3");
- }
+ public void warn_LockRecord_6() {
+ logger.logv(WARN, "ARJUNA-15043 LockRecord::topLevelCommit - no current action", (Object)null);
}
- public void log_LockManager_4() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockManager_4");
- }
+ public void warn_LockRecord_7(String arg0, Uid arg1) {
+ logger.logv(WARN, "ARJUNA-15044 Invocation of LockRecord::restore_state for {0} inappropriate - ignored for {1}", arg0, arg1);
}
-
- public void log_LockManager_5() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockManager_5");
- }
- }
-
- public void log_LockManager_6() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockManager_6");
- }
- }
-
- public void log_LockManager_7() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockManager_7");
- }
- }
-
- public void log_LockManager_8() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockManager_8");
- }
- }
-
- public void log_LockRecord_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockRecord_1");
- }
- }
-
- public void log_LockRecord_2(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockRecord_2", new Object[] {arg0});
- }
- }
-
- public void log_LockRecord_3() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockRecord_3");
- }
- }
-
- public void log_LockRecord_4() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockRecord_4");
- }
- }
-
- public void log_LockRecord_5(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockRecord_5", new Object[] {arg0});
- }
- }
-
- public void log_LockRecord_6() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockRecord_6");
- }
- }
-
- public void log_LockRecord_7(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.txoj.LockRecord_7", new Object[] {arg0, arg1});
- }
- }
-
}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojLogger.java 2010-06-22 04:54:25 UTC (rev 33589)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojLogger.java 2010-06-22 09:18:56 UTC (rev 33590)
@@ -22,18 +22,17 @@
package com.arjuna.ats.txoj.logging;
import com.arjuna.common.util.logging.*;
+import org.jboss.logging.Logger;
public class txojLogger
{
public static LogNoi18n aitLogger;
- public static Logi18n aitLoggerI18N;
public static txojI18NLogger i18NLogger;
public static void initialize(LogNoi18n noi18n, Logi18n i18n)
{
aitLogger = noi18n;
- aitLoggerI18N = i18n;
- i18NLogger = new txojI18NLoggerImpl(i18n);
+ i18NLogger = new txojI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.txoj"));
}
static
More information about the jboss-svn-commits
mailing list