[jboss-svn-commits] JBL Code SVN: r33624 - in labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats: internal/jts/context and 27 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jun 24 10:09:54 EDT 2010
Author: jhalliday
Date: 2010-06-24 10:09:51 -0400 (Thu, 24 Jun 2010)
New Revision: 33624
Modified:
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/ControlWrapper.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/ORBManager.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/OTSImpleManager.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextPropagationManager.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/FactoryList.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/ServerControlWrapper.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/ServerFactory.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/Interposition.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/ServerResource.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/ControlImple.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/ServerControl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/ServerSynchronization.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/arjuna/ServerNestedAction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/arjuna/ServerTopLevelAction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedNestedAction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedTopLevelAction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/strict/ServerStrictNestedAction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/strict/ServerStrictTopLevelAction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ClientForwardInterceptor.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ClientInitializer.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCDefaultServant.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRecoveryInit.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ServerInitializer.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ServerRecoveryInterceptor.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/RecoveryEnablement.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/recoverycoordinators/GenericRecoveryCoordinator.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/recoverycoordinators/RecoveryCoordinatorId.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryCreator.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryInit.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/ExpiredContactScanner.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/FactoryContactItem.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/RecoveryContactWriter.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/StatusChecker.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/recoverycoordinators/GenericRecoveryCreator.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/recoverycoordinators/ResourceCompletor.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/AssumedCompleteServerTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/AssumedCompleteTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/CachedRecoveredTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/ExpiredAssumedCompleteScanner.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredServerTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/ServerTransactionRecoveryModule.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TopLevelTransactionRecoveryModule.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionCache.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionCacheItem.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionRecoveryModule.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecord.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ResourceRecord.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/ExplicitInterposition.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/AtomicTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/ThreadAssociations.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/TopLevelTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLogger.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLoggerImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsLogger.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextClientRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextORBInitializerImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextServerRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionORBInitializerImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextClientRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextORBInitializerImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextServerRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionORBInitializerImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/thread/OTSThread.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/utils/ORBSetup.java
Log:
Convert i18n logging from CLF to jboss-logging in jts module. JBTM-750
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/ControlWrapper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/ControlWrapper.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/ControlWrapper.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -157,11 +157,6 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jts.cwcommit Failed to mark transaction
- * as rollback only:
- */
-
public boolean preventCommit ()
{
try
@@ -170,22 +165,13 @@
return true;
}
- catch (Exception ex)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.cwcommit", ex);
- }
+ catch (Exception ex) {
+ jtsLogger.i18NLogger.warn_cwcommit(ex);
- return false;
- }
+ return false;
+ }
}
- /**
- * @message com.arjuna.ats.internal.jts.cwabort Failed to cancel
- * transaction:
- */
-
public int cancel ()
{
try
@@ -202,15 +188,11 @@
{
return ActionStatus.NO_ACTION;
}
- catch (Exception ex)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.cwabort", ex);
- }
+ catch (Exception ex) {
+ jtsLogger.i18NLogger.warn_cwabort(ex);
- return ActionStatus.INVALID;
- }
+ return ActionStatus.INVALID;
+ }
}
public Uid get_uid ()
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/ORBManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/ORBManager.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/ORBManager.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -44,10 +44,6 @@
public class ORBManager
{
-
- /**
- * @message com.arjuna.ats.internal.jts.ORBManager The ORB has not been initialized yet
- */
public static final com.arjuna.orbportability.ORB getORB ()
{
if (isInitialised() )
@@ -56,7 +52,7 @@
}
else
{
- jtsLogger.loggerI18N.fatal("com.arjuna.ats.internal.jts.ORBManager");
+ jtsLogger.i18NLogger.fatal_ORBManager();
throw new com.arjuna.ats.arjuna.exceptions.FatalError();
}
}
@@ -90,7 +86,7 @@
}
else
{
- jtsLogger.loggerI18N.fatal("com.arjuna.ats.internal.jts.ORBManager");
+ jtsLogger.i18NLogger.fatal_ORBManager();
throw new com.arjuna.ats.arjuna.exceptions.FatalError();
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/OTSImpleManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/OTSImpleManager.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/OTSImpleManager.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -31,6 +31,7 @@
package com.arjuna.ats.internal.jts;
+import com.arjuna.ats.arjuna.exceptions.FatalError;
import com.arjuna.ats.jts.common.jtsPropertyManager;
import com.arjuna.ats.jts.logging.*;
@@ -176,13 +177,6 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jts.otsserverfailed Resolution of OTS
- * server failed - invalid name: {0}
- * @message com.arjuna.ats.internal.jts.otsservererror Resolution of OTS
- * server failed: {0}
- */
-
private static final synchronized void init ()
{
if (_current == null)
@@ -235,61 +229,36 @@
if (OTSImpleManager._theFactoryRef == null)
throw new BAD_PARAM();
}
- catch (InvalidName e1)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.otsserverfailed", new Object[]
- { e1 });
- }
+ catch (InvalidName e1) {
+ jtsLogger.i18NLogger.warn_otsserverfailed(e1);
- throw new com.arjuna.ats.arjuna.exceptions.FatalError(
- e1.toString(), e1);
- }
- catch (BAD_PARAM ex1)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.otsserverfailed", new Object[]
- { ex1 });
- }
+ throw new FatalError(
+ e1.toString(), e1);
+ }
+ catch (BAD_PARAM ex1) {
+ jtsLogger.i18NLogger.warn_otsserverfailed(ex1);
- throw new com.arjuna.ats.arjuna.exceptions.FatalError(
- ex1.toString(), ex1);
- }
- catch (IOException e2)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.otsservererror", new Object[]
- { e2 });
- }
+ throw new FatalError(
+ ex1.toString(), ex1);
+ }
+ catch (IOException e2) {
+ jtsLogger.i18NLogger.warn_otsservererror(e2);
- throw new com.arjuna.ats.arjuna.exceptions.FatalError(
- e2.toString(), e2);
- }
- catch (SystemException e3)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.otsservererror", new Object[]
- { e3 });
- }
+ throw new FatalError(
+ e2.toString(), e2);
+ }
+ catch (SystemException e3) {
+ jtsLogger.i18NLogger.warn_otsservererror(e3);
- throw new com.arjuna.ats.arjuna.exceptions.FatalError(
- e3.toString(), e3);
- }
- catch (UserException e4)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.otsservererror", new Object[]
- { e4 });
- }
+ throw new FatalError(
+ e3.toString(), e3);
+ }
+ catch (UserException e4) {
+ jtsLogger.i18NLogger.warn_otsservererror(e4);
- throw new com.arjuna.ats.arjuna.exceptions.FatalError(
- e4.toString(), e4);
- }
+ throw new FatalError(
+ e4.toString(), e4);
+ }
}
else
{
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -72,17 +72,10 @@
* @author Mark Little (mark at arjuna.com)
* @version $Id: ContextManager.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.0.
- *
- * @message com.arjuna.ats.internal.jts.context.genfail {0} caught exception: {1}
*/
public class ContextManager
{
-
- /**
- * @message com.arjuna.ats.internal.jts.context.picreffail Failed when getting a reference to PICurrent.
- */
-
public ContextManager ()
{
if (jtsLogger.logger.isDebugEnabled()) {
@@ -95,25 +88,11 @@
}
catch (InvalidName ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.context.picreffail");
- }
-
- ex.printStackTrace();
-
- throw new FatalError("ContextManager "+jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.context.picreffail")+" "+ex, ex);
+ throw new FatalError("ContextManager "+jtsLogger.i18NLogger.get_context_picreffail()+" "+ex, ex);
}
catch (Exception ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.context.picreffail");
- }
-
- ex.printStackTrace();
-
- throw new FatalError("ContextManager "+jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.context.picreffail")+" "+ex, ex);
+ throw new FatalError("ContextManager "+jtsLogger.i18NLogger.get_context_picreffail()+" "+ex, ex);
}
}
@@ -200,11 +179,7 @@
}
catch (Throwable ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.context.genfail",
- new Object[] { "ContextManager.current", ex}, ex );
- }
+ jtsLogger.i18NLogger.warn_context_genfail("ContextManager.current", ex);
throw new BAD_OPERATION();
}
@@ -472,11 +447,7 @@
}
catch (Exception e)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.context.genfail",
- new Object[] { "ContextManager.addActionControlHierarchy", e}, e);
- }
+ jtsLogger.i18NLogger.warn_context_genfail("ContextManager.addActionControlHierarchy", e);
isError = true;
}
@@ -528,11 +499,7 @@
}
catch (Exception e)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.context.genfail",
- new Object[] { "ContextManager.addActionControlImple", e}, e);
- }
+ jtsLogger.i18NLogger.warn_context_genfail("ContextManager.addActionControlImple", e);
isError = true;
}
@@ -672,10 +639,6 @@
return null;
}
- /**
- * @message com.arjuna.ats.internal.jts.context.coorref {0} expected a Coordinator reference and did not get one: {1}
- */
-
public final ControlWrapper createProxy (org.omg.CORBA.Any ctx) throws SystemException
{
String stringRef = null;
@@ -715,22 +678,13 @@
}
catch (BAD_PARAM e1)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.context.genfail",
- new Object[] { "ContextManager", stringRef}, e1 );
- }
+ jtsLogger.i18NLogger.warn_context_genfail("ContextManager "+stringRef, e1);
}
- catch (Exception e2)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.context.genfail",
- new Object[] { "ContextManager", e2} );
- }
+ catch (Exception e2) {
+ jtsLogger.i18NLogger.warn_context_genfail("ContextManager", e2);
- throw new UNKNOWN(e2.toString());
- }
+ throw new UNKNOWN(e2.toString());
+ }
return null;
}
@@ -758,24 +712,15 @@
}
catch (SystemException ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.context.genfail",
- new Object[] { "ContextManager.createHierarchy", ex} );
- }
+ jtsLogger.i18NLogger.warn_context_genfail("ContextManager.createHierarchy", ex);
throw ex;
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.context.genfail",
- new Object[] { "ContextManager.createHierarchy", e}, e );
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_context_genfail("ContextManager.createHierarchy", e);
- throw new UNKNOWN();
- }
+ throw new UNKNOWN();
+ }
}
else
return null;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextPropagationManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextPropagationManager.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextPropagationManager.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -47,11 +47,6 @@
public class ContextPropagationManager
{
-
- /**
- * @message com.arjuna.ats.internal.jts.context.orbnotsupported {0} does not support ORB: {1}
- */
-
public ContextPropagationManager ()
{
String contextMode = jtsPropertyManager.getJTSEnvironmentBean().getContextPropMode();
@@ -90,11 +85,7 @@
break;
default:
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.context.orbnotsupported",
- new Object[] {"ContextPropagationManager", ORBInfo.getInfo()} );
- }
+ jtsLogger.i18NLogger.warn_context_orbnotsupported("ContextPropagationManager", ORBInfo.getInfo());
}
break;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/FactoryList.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/FactoryList.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/FactoryList.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -186,9 +186,6 @@
/**
* Only allow a default to be added once!
- *
- * @message com.arjuna.ats.internal.jts.interposition.fldefault {0} -
- * default already set!
*/
public static boolean addDefault (FactoryCreator create, int formatID)
@@ -202,14 +199,9 @@
FactoryList._default = new FactoryElement(create, formatID);
res = true;
}
- else
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.fldefault", new Object[]
- { "FactoryList.addDefault" });
- }
- }
+ else {
+ jtsLogger.i18NLogger.warn_interposition_fldefault("FactoryList.addDefault");
+ }
_lock.unlock();
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/ServerControlWrapper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/ServerControlWrapper.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/ServerControlWrapper.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -100,11 +100,6 @@
* Override some Reapable methods.
*/
- /**
- * @message com.arjuna.ats.internal.jts.interposition.cwabort Failed to
- * cancel transaction:
- */
-
public int cancel ()
{
try
@@ -123,15 +118,11 @@
{
return ActionStatus.NO_ACTION;
}
- catch (Exception ex)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.cwabort", ex);
- }
+ catch (Exception ex) {
+ jtsLogger.i18NLogger.warn_interposition_cwabort(ex);
- return ActionStatus.INVALID;
- }
+ return ActionStatus.INVALID;
+ }
}
public ControlWrapper create_subtransaction () throws Unavailable,
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/ServerFactory.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/ServerFactory.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/ServerFactory.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -55,9 +55,6 @@
* @author Mark Little (mark at arjuna.com)
* @version $Id: ServerFactory.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.2.4.
- *
- * @message com.arjuna.ats.internal.jts.interposition.sfcaught {0} for
- * transaction {1} caught {2}
*/
public class ServerFactory
@@ -122,16 +119,11 @@
{
return org.omg.CosTransactions.Status.StatusNoTransaction;
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.sfcaught", new Object[]
- { "ServerFactory.getCurrentStatus", uid, e });
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_interposition_sfcaught("ServerFactory.getCurrentStatus", uid, e);
- return org.omg.CosTransactions.Status.StatusUnknown;
- }
+ return Status.StatusUnknown;
+ }
}
}
@@ -154,16 +146,11 @@
{
throw e2;
}
- catch (Exception e3)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.sfcaught", new Object[]
- { "ServerFactory.getStatus", u, e3 });
- }
+ catch (Exception e3) {
+ jtsLogger.i18NLogger.warn_interposition_sfcaught("ServerFactory.getStatus", u, e3);
- return org.omg.CosTransactions.Status.StatusUnknown;
- }
+ return Status.StatusUnknown;
+ }
if ((s == org.omg.CosTransactions.Status.StatusUnknown)
|| (s == org.omg.CosTransactions.Status.StatusNoTransaction))
@@ -219,16 +206,11 @@
return org.omg.CosTransactions.Status.StatusUnknown;
}
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.sfcaught", new Object[]
- { "ServerFactory.getStatus", u, e });
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_interposition_sfcaught("ServerFactory.getStatus", u, e);
- return org.omg.CosTransactions.Status.StatusUnknown;
- }
+ return Status.StatusUnknown;
+ }
}
}
@@ -254,23 +236,13 @@
return tranControl;
}
- /**
- * @message com.arjuna.ats.internal.jts.interposition.sfnoparent {0} - no
- * parent transaction given!
- */
-
public static ServerControl create_subtransaction (Uid actUid, Coordinator realCoord, Terminator realTerm, ServerControl parent)
{
- if (parent == null)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.sfnoparent", new Object[]
- { "ServerFactory.create_subtransaction" });
- }
+ if (parent == null) {
+ jtsLogger.i18NLogger.warn_interposition_sfnoparent("ServerFactory.create_subtransaction");
- return null;
- }
+ return null;
+ }
ServerControl toReturn = null;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/Interposition.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/Interposition.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/Interposition.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -480,10 +480,6 @@
return control;
}
- /**
- * @message com.arjuna.ats.internal.jts.interposition.resources.arjuna.ipfail {0} - could not find {1} to remove.
- */
-
protected final synchronized boolean removeHierarchy (Uid theUid)
{
ServerTopLevelAction action = present(theUid);
@@ -495,26 +491,14 @@
}
else
{
- if (jtsLogger.logger.isDebugEnabled())
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.ipfail",
- new Object[] {"Interposition.removeHeirarchy", theUid} );
- }
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.i18NLogger.warn_interposition_resources_arjuna_ipfail("Interposition.removeHeirarchy", theUid);
}
}
return false;
}
- /**
- * @message com.arjuna.ats.internal.jts.interposition.resources.arjuna.iptl TopLevel transactions not identical: {0} {1}
- * @message com.arjuna.ats.internal.jts.interposition.resources.arjuna.ipnt Nested transactions not identical.
- * @message com.arjuna.ats.internal.jts.interposition.resources.arjuna.ipnull Interposed hierarchy is null!
- * @message com.arjuna.ats.internal.jts.interposition.resources.arjuna.problemhierarchy hierarchy: {0}
- */
-
protected final void compareHierarchies (PropagationContext ctx, ServerTopLevelAction action)
{
int depth = ctx.parents.length;
@@ -532,16 +516,11 @@
if (action != null)
{
- if (action.get_uid().notEquals(ctxHierarchy[depth]))
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.iptl",
- new Object[] {action.get_uid(), ctxHierarchy[depth-1]} );
- }
+ if (action.get_uid().notEquals(ctxHierarchy[depth])) {
+ jtsLogger.i18NLogger.warn_interposition_resources_arjuna_iptl(action.get_uid(), ctxHierarchy[depth - 1]);
- printHierarchies = true;
- }
+ printHierarchies = true;
+ }
else
{
if (depth > 0)
@@ -570,26 +549,18 @@
problem = true;
}
- if (problem)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.ipnt");
- }
+ if (problem) {
+ jtsLogger.i18NLogger.warn_interposition_resources_arjuna_ipnt();
- printHierarchies = true;
- }
+ printHierarchies = true;
+ }
}
}
- else
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.ipnull");
- }
+ else {
+ jtsLogger.i18NLogger.warn_interposition_resources_arjuna_ipnull();
- printHierarchies = true;
- }
+ printHierarchies = true;
+ }
if (!printHierarchies)
printHierarchies = jtsLogger.logger.isDebugEnabled();
@@ -607,13 +578,8 @@
}
else
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.problemhierarchy",
- new Object[] {Utility.getHierarchy(ctx)});
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.problemhierarchy",
- new Object[] {hierarchytoString(action)});
- }
+ jtsLogger.i18NLogger.warn_interposition_resources_arjuna_problemhierarchy(Utility.getHierarchy(ctx));
+ jtsLogger.i18NLogger.warn_interposition_resources_arjuna_problemhierarchy(hierarchytoString(action));
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/ServerResource.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/ServerResource.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/ServerResource.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -141,11 +141,6 @@
return _children;
}
- /**
- * @message com.arjuna.ats.internal.jts.interposition.resources.arjuna.notchild {0} - not my child!
- * @message com.arjuna.ats.internal.jts.interposition.resources.arjuna.nochild {0} - error, no child found!
- */
-
public final boolean abortChild (ServerNestedAction toAbort)
{
if (toAbort != null)
@@ -179,23 +174,13 @@
return true;
}
- else
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.notchild",
- new Object[] {"ServerResource.abortChild"});
- }
- }
+ else {
+ jtsLogger.i18NLogger.warn_interposition_resources_arjuna_notchild("ServerResource.abortChild");
+ }
}
- else
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.nochild",
- new Object[] {"ServerResource.abortChild"});
- }
- }
+ else {
+ jtsLogger.i18NLogger.warn_interposition_resources_arjuna_nochild("ServerResource.abortChild");
+ }
return false;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/ControlImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/ControlImple.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/ControlImple.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -39,8 +39,6 @@
import com.arjuna.ats.arjuna.coordinator.BasicAction;
-import com.arjuna.common.util.logging.*;
-
import org.omg.CosTransactions.*;
import com.arjuna.ArjunaOTS.*;
@@ -240,9 +238,6 @@
* Since we assume that a factory will either be remote or local, we can
* destroy this object and rely upon the ORB to return an exception to
* subsequent clients which indicates they no longer have a valid reference.
- *
- * @message com.arjuna.ats.internal.jts.orbspecific.destroyfailed could not
- * destroy object:
*/
public synchronized void destroy () throws ActiveTransaction,
@@ -287,11 +282,9 @@
}
catch (Exception e)
{
- e.printStackTrace();
-
throw new BAD_OPERATION(
- "ControlImple "
- + jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.destroyfailed")
+ "ControlImple "
+ + jtsLogger.i18NLogger.get_orbspecific_destroyfailed()
+ e);
}
}
@@ -596,9 +589,6 @@
* No need to protect with mutex since only called from destroy (and
* destructor), which is protected with a mutex. Do not call directly
* without synchronizing.
- *
- * @message com.arjuna.ats.internal.jts.orbspecific.tidyfail {0} attempt to
- * clean up failed with: {1}
*/
protected final void tidyup ()
@@ -625,11 +615,7 @@
}
catch (Exception e)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.threaderror", new Object[]
- { "ControlImple.tidyup", e });
- }
+ jtsLogger.i18NLogger.warn_orbspecific_tidyfail("ControlImple.tidyup", e);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -41,11 +41,8 @@
import com.arjuna.ats.internal.jts.utils.TxStoreLog;
import com.arjuna.ats.jts.utils.Utility;
-import com.arjuna.ats.jts.common.jtsPropertyManager;
import com.arjuna.ats.jts.logging.*;
-import com.arjuna.common.util.logging.*;
-
import com.arjuna.ats.arjuna.objectstore.ObjectStore;
import com.arjuna.ats.arjuna.objectstore.StateStatus;
import com.arjuna.ats.arjuna.coordinator.BasicAction;
@@ -86,11 +83,6 @@
* @author Mark Little (mark at arjuna.com)
* @version $Id: TransactionFactoryImple.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.0.
- *
- * @message com.arjuna.ats.internal.jts.orbspecific.tficaught {0} for {1} caught
- * exception: {2}
- * @message com.arjuna.ats.internal.jts.orbspecific.otiderror is not a valid
- * unique identifier!
*/
public class TransactionFactoryImple extends
@@ -392,8 +384,8 @@
if (u == null)
throw new BAD_PARAM(
- "otid_t "
- + jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.otiderror"));
+ "otid_t "
+ + jtsLogger.i18NLogger.get_orbspecific_otiderror());
else
{
BasicAction act = ActionManager.manager().get(u);
@@ -438,8 +430,8 @@
if (u == null)
throw new BAD_PARAM(
- "otid_t "
- + jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.otiderror"));
+ "otid_t "
+ + jtsLogger.i18NLogger.get_orbspecific_otiderror());
else
return getCurrentStatus(u);
}
@@ -490,16 +482,11 @@
return s;
}
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.tficaught", new Object[]
- { "TransactionFactoryImple.getCurrentStatus", u, e });
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_tficaught("TransactionFactoryImple.getCurrentStatus", u, e);
- return org.omg.CosTransactions.Status.StatusUnknown;
- }
+ return Status.StatusUnknown;
+ }
}
}
@@ -517,8 +504,8 @@
if (u == null)
throw new BAD_PARAM(
- "otid_t "
- + jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.otiderror"));
+ "otid_t "
+ + jtsLogger.i18NLogger.get_orbspecific_otiderror());
else
return getStatus(u);
}
@@ -543,16 +530,11 @@
{
throw e2;
}
- catch (Exception e3)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.tficaught", new Object[]
- { "TransactionFactoryImple.getStatus", u, e3 });
- }
+ catch (Exception e3) {
+ jtsLogger.i18NLogger.warn_orbspecific_tficaught("TransactionFactoryImple.getStatus", u, e3);
- return org.omg.CosTransactions.Status.StatusUnknown;
- }
+ return Status.StatusUnknown;
+ }
/*
* If status is unknown, then transaction is cannot be active (even if
@@ -613,16 +595,11 @@
return ServerFactory.getStatus(u);
}
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.tficaught", new Object[]
- { "TransactionFactoryImple.getStatus", u, e });
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_tficaught("TransactionFactoryImple.getStatus", u, e);
- return org.omg.CosTransactions.Status.StatusUnknown;
- }
+ return Status.StatusUnknown;
+ }
}
}
@@ -671,8 +648,8 @@
if (u == null)
throw new BAD_PARAM(
- "otid_t "
- + jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.otiderror"));
+ "otid_t "
+ + jtsLogger.i18NLogger.get_orbspecific_otiderror());
else
return getTransactionInfo(u);
}
@@ -680,16 +657,13 @@
/**
* @return information on a specific transaction.
* @since JTS 2.1.2.
- * @message com.arjuna.ats.internal.jts.orbspecific.invaliduid Invalid Uid:
*/
public TransactionInfo getTransactionInfo (Uid u)
throws org.omg.CosTransactions.NoTransaction, SystemException
{
if (!u.valid())
- throw new BAD_PARAM(
- jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.invaliduid"
- + " " + u));
+ throw new BAD_PARAM( jtsLogger.i18NLogger.get_orbspecific_invaliduid()+ " " + u);
else
{
try
@@ -741,8 +715,8 @@
if (u == null)
throw new BAD_PARAM(
- "otid_t "
- + jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.otiderror"));
+ "otid_t "
+ + jtsLogger.i18NLogger.get_orbspecific_otiderror());
else
return getTransaction(u);
}
@@ -884,9 +858,4 @@
private TransactionFactory _factoryRef;
private static FactoryList creators = new FactoryList();
-
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.tfitimeout {0} - invalid
- * default transaction timeout {1}. Caught exception: {2}
- */
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -38,8 +38,6 @@
import com.arjuna.ats.jts.common.jtsPropertyManager;
import com.arjuna.ats.jts.logging.*;
-import com.arjuna.common.util.logging.*;
-
import com.arjuna.ats.internal.jts.recovery.RecoveryCreator;
import com.arjuna.ats.internal.jts.OTSImpleManager;
import com.arjuna.ats.internal.jts.utils.Helper;
@@ -84,11 +82,6 @@
* @author Mark Little (mark at arjuna.com)
* @version $Id: ArjunaTransactionImple.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.0.
- *
- * @message com.arjuna.ats.internal.jts.orbspecific.coordinator.generror {0}
- * caught exception: {1}
- * @message com.arjuna.ats.internal.jts.orbspecific.coordinator.rbofail {0}
- * attempt to mark transaction {1} as rollback only threw: {2}
*/
public class ArjunaTransactionImple extends
@@ -258,11 +251,6 @@
* the Control referencing the transaction and vice versa.
*/
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.coordinator.zsync {0} -
- * none zero Synchronization list!
- */
-
public void finalize ()
{
if (jtsLogger.logger.isDebugEnabled()) {
@@ -270,20 +258,15 @@
+ get_uid() + " >");
}
- if (_synchs != null)
- {
- // should not happen if the transaction has terminated
+ if (_synchs != null) {
+ // should not happen if the transaction has terminated
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.szync", new Object[]
- { "ArjunaTransactionImple.finalize()" });
- }
+ jtsLogger.i18NLogger.warn_orbspecific_coordinator_zsync("ArjunaTransactionImple.finalize()");
- // "delete" list anyway, but don't do anything with list elements
+ // "delete" list anyway, but don't do anything with list elements
- _synchs = null;
- }
+ _synchs = null;
+ }
controlHandle = null;
@@ -781,11 +764,6 @@
* Resources are only registered with the current transaction, whereas
* subtransaction aware resources are registered with their parents when the
* current transaction ends.
- *
- * @message com.arjuna.ats.internal.jts.orbspecific.coordinator.rccreate
- * Creation of RecoveryCoordinator for {0} threw: {1}
- * @message com.arjuna.ats.internal.jts.orbspecific.coordinator.rcnotcreated
- * not created!
*/
public RecoveryCoordinator register_resource (Resource r)
@@ -854,8 +832,8 @@
if (recoveryCoordinator == null)
throw new BAD_OPERATION(
- "RecoveryCoordinator "
- + jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.coordinator.rcnotcreated"));
+ "RecoveryCoordinator "
+ + jtsLogger.i18NLogger.get_orbspecific_coordinator_rcnotcreated());
}
catch (NO_IMPLEMENT ex)
{
@@ -866,38 +844,26 @@
recoveryCoordinator = null;
}
- catch (SystemException e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.rccreate", new Object[]
- { get_uid(), e });
- }
+ catch (SystemException e) {
+ jtsLogger.i18NLogger.warn_orbspecific_coordinator_rccreate(get_uid(), e);
- /*
- * Set transaction to rollback only and re-throw exception.
- */
+ /*
+ * Set transaction to rollback only and re-throw exception.
+ */
- try
- {
- rollback_only();
- }
- catch (Inactive ex1)
- {
- }
- catch (SystemException ex2)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.rbofail", new Object[]
- { "ArjunaTransactionImple.register_resource", get_uid(), ex2 });
- }
+ try {
+ rollback_only();
+ }
+ catch (Inactive ex1) {
+ }
+ catch (SystemException ex2) {
+ jtsLogger.i18NLogger.warn_orbspecific_coordinator_rbofail("ArjunaTransactionImple.register_resource", get_uid(), ex2);
- throw ex2;
- }
+ throw ex2;
+ }
- throw e;
- }
+ throw e;
+ }
if (recoveryCoordinator != null)
{
@@ -1487,44 +1453,33 @@
c.before_completion();
}
}
- catch (SystemException e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.generror", new Object[]
- { "ArjunaTransactionImple.doBeforeCompletion", e });
- }
+ catch (SystemException e) {
+ jtsLogger.i18NLogger.warn_orbspecific_coordinator_generror("ArjunaTransactionImple.doBeforeCompletion", e);
- if (!problem)
- {
- exp = e;
+ if (!problem) {
+ exp = e;
- problem = true;
+ problem = true;
- /*
- * Mark as rollback_only, so when we try to commit it will
- * fail.
- */
+ /*
+ * Mark as rollback_only, so when we try to commit it will
+ * fail.
+ */
- try
- {
- rollback_only();
- }
- catch (Inactive ex)
- {
- /*
- * This should not happen. If it does, continue with
- * commit to tidy-up.
- */
+ try {
+ rollback_only();
+ }
+ catch (Inactive ex) {
+ /*
+ * This should not happen. If it does, continue with
+ * commit to tidy-up.
+ */
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.rbofail", new Object[]
- { "ArjunaTransactionImple.doBeforeCompletion", get_uid(), ex });
- }
- }
- }
- }
+ jtsLogger.i18NLogger.warn_orbspecific_coordinator_rbofail(
+ "ArjunaTransactionImple.doBeforeCompletion", get_uid(), ex);
+ }
+ }
+ }
finally
{
if (doSuspend)
@@ -1557,11 +1512,6 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.coordinator.txrun {0}
- * called on still running transaction!
- */
-
protected void doAfterCompletion (org.omg.CosTransactions.Status myStatus)
throws SystemException
{
@@ -1570,16 +1520,11 @@
+ get_uid());
}
- if (myStatus == Status.StatusActive)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.txrun", new Object[]
- { "ArjunaTransactionImple.doAfterCompletion" });
- }
+ if (myStatus == Status.StatusActive) {
+ jtsLogger.i18NLogger.warn_orbspecific_coordinator_txrun("ArjunaTransactionImple.doAfterCompletion");
- return;
- }
+ return;
+ }
boolean problem = false;
SystemException exp = null;
@@ -1824,11 +1769,6 @@
return theStatus;
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.coordinator.uidfail {0} -
- * could not get unique identifier of object.
- */
-
protected final AbstractRecord createOTSRecord (boolean propagate, Resource resource, Coordinator coord)
{
return createOTSRecord(propagate, resource, coord, null);
@@ -1904,14 +1844,9 @@
u = null;
}
- if (u == null)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.uidfail", new Object[]
- { "ArjunaTransactionImple.createOTSRecord" });
- }
- }
+ if (u == null) {
+ jtsLogger.i18NLogger.warn_orbspecific_coordinator_uidfail("ArjunaTransactionImple.createOTSRecord");
+ }
}
if (u == null)
@@ -2135,16 +2070,11 @@
{
context.parents = resizeHierarchy(context.parents, index);
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.generror", new Object[]
- { "ArjunaTransactionImple.resizeHierarchy", e });
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_coordinator_generror("ArjunaTransactionImple.resizeHierarchy", e);
- context = null;
- }
+ context = null;
+ }
return context;
}
@@ -2228,61 +2158,31 @@
controlHandle = null;
}
}
- catch (ActiveThreads ex1)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.generror", new Object[]
- { "ArjunaTransactionImple.destroyAction", ex1 });
- }
- }
- catch (BadControl ex2)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.generror", new Object[]
- { "ArjunaTransactionImple.destroyAction", ex2 });
- }
- }
- catch (ActiveTransaction ex3)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.generror", new Object[]
- { "ArjunaTransactionImple.destroyAction", ex3 });
- }
- }
- catch (Destroyed ex4)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.generror", new Object[]
- { "ArjunaTransactionImple.destroyAction", ex4 });
- }
- }
- catch (OutOfMemoryError ex5)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.generror", new Object[]
- { "ArjunaTransactionImple.destroyAction", ex5 });
- }
+ catch (ActiveThreads ex1) {
+ jtsLogger.i18NLogger.warn_orbspecific_coordinator_generror("ArjunaTransactionImple.destroyAction", ex1);
+ }
+ catch (BadControl ex2) {
+ jtsLogger.i18NLogger.warn_orbspecific_coordinator_generror("ArjunaTransactionImple.destroyAction", ex2);
+ }
+ catch (ActiveTransaction ex3) {
+ jtsLogger.i18NLogger.warn_orbspecific_coordinator_generror("ArjunaTransactionImple.destroyAction", ex3);
+ }
+ catch (Destroyed ex4) {
+ jtsLogger.i18NLogger.warn_orbspecific_coordinator_generror("ArjunaTransactionImple.destroyAction", ex4);
+ }
+ catch (OutOfMemoryError ex5) {
+ jtsLogger.i18NLogger.warn_orbspecific_coordinator_generror("ArjunaTransactionImple.destroyAction", ex5);
- /*
- * Rather than try again after running gc simply return and let the
- * user deal with it. May help with memory!
- */
+ /*
+ * Rather than try again after running gc simply return and let the
+ * user deal with it. May help with memory!
+ */
- System.gc();
- }
- catch (Exception ex6)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.generror", new Object[]
- { "ArjunaTransactionImple.destroyAction", ex6 });
- }
- }
+ System.gc();
+ }
+ catch (Exception ex6) {
+ jtsLogger.i18NLogger.warn_orbspecific_coordinator_generror("ArjunaTransactionImple.destroyAction", ex6);
+ }
}
protected ArjunaTransactionImple parentTransaction; // rather than rely on
@@ -2317,11 +2217,6 @@
static boolean _propagateRemainingTimeout = true; // OTS 1.2 onwards supported this.
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.coordinator.ipunknown
- * {0} - unknown interposition type: {1}
- */
-
static
{
String interpositionType = jtsPropertyManager.getJTSEnvironmentBean().getInterposition();
@@ -2332,14 +2227,9 @@
if (ipType != -1)
ArjunaTransactionImple._ipType = ipType;
- else
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.ipunknown", new Object[]
- { "ArjunaTransactionImple.init", interpositionType });
- }
- }
+ else {
+ jtsLogger.i18NLogger.warn_orbspecific_coordinator_ipunknown("ArjunaTransactionImple.init", interpositionType);
+ }
}
_subtran = jtsPropertyManager.getJTSEnvironmentBean().isSupportSubtransactions();
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/ServerControl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/ServerControl.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/ServerControl.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -172,11 +172,6 @@
return _realTerminator;
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.destfailed
- * {0} could not destroy object: {1}
- */
-
public synchronized void destroy () throws ActiveTransaction,
ActiveThreads, BadControl, Destroyed, SystemException
{
@@ -206,14 +201,9 @@
{
// already destroyed
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.destfailed", new Object[]
- { "ServerControl", e });
- }
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_destfailed("ServerControl", e);
+ }
}
public ServerControl (ServerTransaction stx)
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -64,9 +64,6 @@
* @author Mark Little (mark at arjuna.com)
* @version $Id: ServerTransaction.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.0.
- *
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.coordinator.generror
- * {0} caught exception: {1}
*/
/*
@@ -135,11 +132,6 @@
return _savingUid;
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.coordinator.syncerror
- * {0} - synchronizations have not been called!
- */
-
public final int doPrepare ()
{
if (jtsLogger.logger.isDebugEnabled()) {
@@ -184,24 +176,19 @@
}
}
- if (!_beforeCompleted && (_sync != null))
- {
- /*
- * Synchronizations should have been called by now if we have them!
- */
+ if (!_beforeCompleted && (_sync != null)) {
+ /*
+ * Synchronizations should have been called by now if we have them!
+ */
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.coordinator.sycerror", new Object[]
- { "ServerTransaction.doPrepare" });
- }
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_coordinator_syncerror("ServerTransaction.doPrepare");
- /*
- * Prevent commit!
- */
+ /*
+ * Prevent commit!
+ */
- super.preventCommit();
- }
+ super.preventCommit();
+ }
int res = super.prepare(true);
@@ -226,11 +213,6 @@
super.destroyAction();
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.coordinator.txnotprepared
- * {0} - transaction not in prepared state: {1}
- */
-
public final int doPhase2Commit ()
{
if (jtsLogger.logger.isDebugEnabled()) {
@@ -244,16 +226,11 @@
org.omg.CosTransactions.Status s = get_status();
- if (s != org.omg.CosTransactions.Status.StatusPrepared)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.coordinator.txnotprepared", new Object[]
- { "ServerTransaction.doPhase2Commit", Utility.stringStatus(s) });
- }
+ if (s != org.omg.CosTransactions.Status.StatusPrepared) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_coordinator_txnotprepared("ServerTransaction.doPhase2Commit", Utility.stringStatus(s));
- return finalStatus();
- }
+ return finalStatus();
+ }
super.phase2Commit(true);
@@ -580,11 +557,9 @@
}
catch (IOException e)
{
- if (jtsLogger.logger.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.coordinator.generror", new Object[]
- { "ServerTransaction.save_state", e });
- }
+ if (jtsLogger.logger.isWarnEnabled()) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_coordinator_generror("ServerTransaction.save_state", e);
+ }
}
return false;
@@ -606,11 +581,9 @@
}
catch (Exception e)
{
- if (jtsLogger.logger.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.coordinator.generror", new Object[]
- { "ServerTransaction.restore_state", e });
- }
+ if (jtsLogger.logger.isWarnEnabled()) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_coordinator_generror("ServerTransaction.restore_state", e);
+ }
return false;
}
@@ -622,11 +595,9 @@
}
catch (IOException ex)
{
- if (jtsLogger.logger.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.coordinator.generror", new Object[]
- { "ServerTransaction.restore_state", ex });
- }
+ if (jtsLogger.logger.isWarnEnabled()) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_coordinator_generror("ServerTransaction.restore_state", ex);
+ }
}
return false;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/ServerSynchronization.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/ServerSynchronization.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/ServerSynchronization.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -37,6 +37,7 @@
import com.arjuna.ats.jts.exceptions.ExceptionCodes;
import com.arjuna.ats.jts.logging.*;
+import com.arjuna.ats.jts.utils.Utility;
import org.omg.CosTransactions.*;
import org.omg.CORBA.CompletionStatus;
@@ -61,11 +62,6 @@
return _theSynchronization;
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.destroyfailed
- * Failed to destroy server-side synchronization object!
- */
-
public void destroy()
{
try
@@ -74,11 +70,9 @@
}
catch (Exception e)
{
- if (jtsLogger.logger.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.destroyfailed");
- }
+ if (jtsLogger.logger.isWarnEnabled()) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_destroyfailed();
+ }
}
}
@@ -93,12 +87,6 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.stateerror
- * {0} status of transaction is different from our status: <{1},
- * {2}>
- */
-
public void after_completion(org.omg.CosTransactions.Status status)
throws SystemException
{
@@ -127,52 +115,40 @@
myStatus = org.omg.CosTransactions.Status.StatusUnknown;
}
- if (myStatus != status)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.stateerror",
- new Object[]
- { "ServerSynchronization.after_completion",
- com.arjuna.ats.jts.utils.Utility.stringStatus(myStatus), com.arjuna.ats.jts.utils.Utility.stringStatus(status) });
- }
+ if (myStatus != status) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_stateerror(
+ "ServerSynchronization.after_completion",
+ Utility.stringStatus(myStatus), Utility.stringStatus(status));
- /*
- * There's nothing much we can do, since the transaction should
- * have completed. The best we can hope for it to try to
- * rollback our portion of the transaction, but this may result
- * in heuristics (which may not be reported to the coordinator,
- * since exceptions from after_completion can be ignored in the
- * spec.)
- */
+ /*
+ * There's nothing much we can do, since the transaction should
+ * have completed. The best we can hope for it to try to
+ * rollback our portion of the transaction, but this may result
+ * in heuristics (which may not be reported to the coordinator,
+ * since exceptions from after_completion can be ignored in the
+ * spec.)
+ */
- if (myStatus == org.omg.CosTransactions.Status.StatusActive)
- {
- try
- {
- _theTransaction.rollback();
- }
- catch (Exception e)
- {
- }
+ if (myStatus == Status.StatusActive) {
+ try {
+ _theTransaction.rollback();
+ }
+ catch (Exception e) {
+ }
- /*
- * Get the local status to pass to our local
- * synchronizations.
- */
+ /*
+ * Get the local status to pass to our local
+ * synchronizations.
+ */
- try
- {
- status = _theTransaction.get_status();
- }
- catch (Exception e)
- {
- status = org.omg.CosTransactions.Status.StatusUnknown;
- }
- }
- }
+ try {
+ status = _theTransaction.get_status();
+ }
+ catch (Exception e) {
+ status = Status.StatusUnknown;
+ }
+ }
+ }
_theTransaction.doAfterCompletion(status);
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/arjuna/ServerNestedAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/arjuna/ServerNestedAction.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/arjuna/ServerNestedAction.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -57,8 +57,6 @@
* This looks like an atomic action, but is not actually derived from
* BasicAction or OTS_Transaction. This is because of the way in which the OTS
* creates and manipulates transactions. This is a nested action proxy.
- *
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror_2 {0} caught exception: {1}
*/
public class ServerNestedAction extends ServerResource implements
@@ -67,8 +65,6 @@
/**
* Create local transactions with same ids as remote.
- *
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.ipfailed_2 {0} - could not register interposed hierarchy!
*/
public ServerNestedAction(ServerControl myControl)
@@ -102,16 +98,8 @@
Coordinator realCoordinator = _theControl.originalCoordinator();
- if (!(_valid = registerSubTran(realCoordinator)))
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.ipfailed_2",
- new Object[]
- { "ServerNestedAction" });
- }
+ if (!(_valid = registerSubTran(realCoordinator))) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_ipfailed_2("ServerNestedAction");
/*
* Failed to register. Valid is set, and the interposition
@@ -123,10 +111,6 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.nullcontrol_1 {0} - attempt to commit with null control!
- */
-
public void commit_subtransaction (Coordinator parent)
throws SystemException
{
@@ -134,16 +118,9 @@
jtsLogger.logger.debug("ServerNestedAction::commit_subtransaction : " + _theUid);
}
- if (_theControl == null)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.nullcontrol_1",
- new Object[]
- { "ServerNestedAction.commit_subtransaction" });
- }
+ if (_theControl == null) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_nullcontrol_1(
+ "ServerNestedAction.commit_subtransaction");
throw new INVALID_TRANSACTION(ExceptionCodes.SERVERAA_NO_CONTROL,
CompletionStatus.COMPLETED_NO);
@@ -173,45 +150,21 @@
{
theTransaction.commit(false);
}
- catch (TRANSACTION_ROLLEDBACK e1)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror_2",
- new Object[]
- { "ServerNestedAction.commit_subtransaction",
- e1 });
- }
+ catch (TRANSACTION_ROLLEDBACK e1) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror_2(
+ "ServerNestedAction.commit_subtransaction", e1);
throw e1;
}
- catch (INVALID_TRANSACTION e5)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror_2",
- new Object[]
- { "ServerNestedAction.commit_subtransaction",
- e5 });
- }
+ catch (INVALID_TRANSACTION e5) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror_2(
+ "ServerNestedAction.commit_subtransaction", e5);
throw e5;
}
- catch (HeuristicMixed e2)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror_2",
- new Object[]
- { "ServerNestedAction.commit_subtransaction",
- e2 });
- }
+ catch (HeuristicMixed e2) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror_2(
+ "ServerNestedAction.commit_subtransaction", e2);
/*
* Can't rethrow heuristic exceptions for subtransactions!
@@ -220,46 +173,22 @@
throw new BAD_OPERATION(ExceptionCodes.HEURISTIC_COMMIT,
CompletionStatus.COMPLETED_MAYBE);
}
- catch (HeuristicHazard e3)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror_2",
- new Object[]
- { "ServerNestedAction.commit_subtransaction",
- e3 });
- }
+ catch (HeuristicHazard e3) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror_2(
+ "ServerNestedAction.commit_subtransaction", e3);
throw new BAD_OPERATION(ExceptionCodes.HEURISTIC_COMMIT,
CompletionStatus.COMPLETED_MAYBE);
}
- catch (SystemException e4)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror_2",
- new Object[]
- { "ServerNestedAction.commit_subtransaction",
- e4 });
- }
+ catch (SystemException e4) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror_2(
+ "ServerNestedAction.commit_subtransaction", e4);
throw e4;
}
- catch (Exception e5)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror_2",
- new Object[]
- { "ServerNestedAction.commit_subtransaction",
- e5 });
- }
+ catch (Exception e5) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror_2(
+ "ServerNestedAction.commit_subtransaction", e5);
throw new UNKNOWN(e5.toString());
}
@@ -270,26 +199,15 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.nullcontrol_2 {0} - attempt to rollback transaction will null control!
- */
-
public void rollback_subtransaction () throws SystemException
{
if (jtsLogger.logger.isDebugEnabled()) {
jtsLogger.logger.debug("ServerNestedAction::rollback_subtransaction : " + _theUid);
}
- if (_theControl == null)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.nullcontrol_2",
- new Object[]
- { "ServerNestedAction.rollback_subtransaction" });
- }
+ if (_theControl == null) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_nullcontrol_2(
+ "ServerNestedAction.rollback_subtransaction");
throw new INVALID_TRANSACTION(ExceptionCodes.SERVERAA_NO_CONTROL,
CompletionStatus.COMPLETED_NO);
@@ -372,10 +290,6 @@
_resourceRef = null;
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.childerror Could not remove child {0} from {1}
- */
-
protected final synchronized void destroyResource ()
{
if (!_destroyed)
@@ -390,16 +304,9 @@
* again.
*/
- if (!_parent.removeChild(this))
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.childerror",
- new Object[]
- { get_uid(), _parent.get_uid() });
- }
+ if (!_parent.removeChild(this)) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_childerror(
+ get_uid(), _parent.get_uid());
}
}
@@ -413,10 +320,6 @@
tidyup();
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.nullcoord {0} - could not register as no Coordinator has been given!
- */
-
protected boolean registerSubTran (Coordinator theCoordinator)
{
boolean result = false;
@@ -428,50 +331,22 @@
theCoordinator.register_subtran_aware(_resourceRef);
result = true;
}
- catch (Inactive e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror_2",
- new Object[]
- { "ServerNestedAction.registerSubTran", e });
- }
+ catch (Inactive e) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror_2(
+ "ServerNestedAction.registerSubTran", e);
}
- catch (NotSubtransaction e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror_2",
- new Object[]
- { "ServerNestedAction.registerSubTran", e });
- }
+ catch (NotSubtransaction e) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror_2(
+ "ServerNestedAction.registerSubTran", e);
}
- catch (SystemException e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror_2",
- new Object[]
- { "ServerNestedAction.registerSubTran", e });
- }
+ catch (SystemException e) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror_2(
+ "ServerNestedAction.registerSubTran", e);
}
}
- else
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.nullcoord",
- new Object[]
- { "ServerNestedAction.registerSubTran" });
- }
+ else {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_nullcoord(
+ "ServerNestedAction.registerSubTran");
}
return result;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/arjuna/ServerTopLevelAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/arjuna/ServerTopLevelAction.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/arjuna/ServerTopLevelAction.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -74,8 +74,6 @@
* would not have to call resume at all.
*
* This is a top-level action proxy.
- *
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror {0} caught exception: {1}
*/
/*
@@ -92,10 +90,6 @@
public class ServerTopLevelAction extends ServerResource implements org.omg.CosTransactions.ResourceOperations
{
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.ipfailed {0} - could not register interposed hierarchy!
- */
-
public ServerTopLevelAction (ServerControl control)
{
super(control);
@@ -125,19 +119,14 @@
Coordinator realCoordinator = _theControl.originalCoordinator();
- if (!(_valid = registerResource(realCoordinator)))
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.ipfailed",
- new Object[] {"ServerTopLevelAction"});
- }
+ if (!(_valid = registerResource(realCoordinator))) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_ipfailed("ServerTopLevelAction");
- /*
- * Failed to register. Valid is set, and the interposition
- * controller will now deal with this.
- */
- }
+ /*
+ * Failed to register. Valid is set, and the interposition
+ * controller will now deal with this.
+ */
+ }
realCoordinator = null;
}
@@ -473,10 +462,6 @@
throw new BAD_OPERATION();
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.notx {0} - no transaction!
- */
-
public void commit_one_phase () throws HeuristicHazard, SystemException
{
if (jtsLogger.logger.isDebugEnabled()) {
@@ -496,16 +481,11 @@
ServerTransaction theTransaction = (ServerTransaction) _theControl.getImplHandle();
- if (theTransaction == null)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.notx",
- new Object[] {"ServerTopLevelAction.commit_one_phase"});
- }
+ if (theTransaction == null) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_notx("ServerTopLevelAction.commit_one_phase");
- throw new INVALID_TRANSACTION(ExceptionCodes.NO_TRANSACTION, CompletionStatus.COMPLETED_NO);
- }
+ throw new INVALID_TRANSACTION(ExceptionCodes.NO_TRANSACTION, CompletionStatus.COMPLETED_NO);
+ }
// ThreadActionData.pushAction(theTransaction);
@@ -587,14 +567,9 @@
if (Interposition.destroy(get_uid()))
_destroyed = true;
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror",
- new Object[] {"ServerTopLevelAction.destroyResource", e});
- }
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror("ServerTopLevelAction.destroyResource", e);
+ }
try
{
@@ -604,23 +579,14 @@
_theResource = null;
}
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror",
- new Object[] {"ServerTopLevelAction.destroyResource", e});
- }
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror("ServerTopLevelAction.destroyResource", e);
+ }
}
tidyup();
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.nocoord {0} - no coordinator to use!
- */
-
protected boolean registerResource (Coordinator theCoordinator)
{
boolean result = false;
@@ -652,55 +618,25 @@
else
result = true;
}
- catch (ClassCastException classCastException)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror",
- new Object[] {"ServerTopLevelAction.registerResource", classCastException});
- }
- }
- catch (Inactive ine)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror",
- new Object[] {"ServerTopLevelAction.registerResource", ine});
- }
- }
- catch (TRANSACTION_ROLLEDBACK ex1)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror",
- new Object[] {"ServerTopLevelAction.registerResource", ex1});
- }
- }
- catch (INVALID_TRANSACTION ex2)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror",
- new Object[] {"ServerTopLevelAction.registerResource", ex2});
- }
- }
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror",
- new Object[] {"ServerTopLevelAction.registerResource", e}, e);
- }
- }
+ catch (ClassCastException classCastException) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror("ServerTopLevelAction.registerResource", classCastException);
+ }
+ catch (Inactive ine) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror("ServerTopLevelAction.registerResource", ine);
+ }
+ catch (TRANSACTION_ROLLEDBACK ex1) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror("ServerTopLevelAction.registerResource", ex1);
+ }
+ catch (INVALID_TRANSACTION ex2) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror("ServerTopLevelAction.registerResource", ex2);
+ }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_generror("ServerTopLevelAction.registerResource", e);
+ }
}
- else
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.nocoord",
- new Object[] {"ServerTopLevelAction.registerResource"});
- }
- }
+ else {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_arjuna_nocoord("ServerTopLevelAction.registerResource");
+ }
return result;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedNestedAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedNestedAction.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedNestedAction.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -31,13 +31,12 @@
package com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted;
+import com.arjuna.ats.jts.exceptions.TxError;
import com.arjuna.ats.jts.logging.*;
import com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.*;
import com.arjuna.ats.internal.jts.orbspecific.interposition.*;
-import com.arjuna.common.util.logging.*;
-
import java.util.List;
public class ServerRestrictedNestedAction extends ServerNestedAction
@@ -66,26 +65,17 @@
return control();
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contxfound_1 {0} - found concurrent ({1}) transactions!
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contx_1 Concurrent children found for restricted interposition!
- */
-
public final synchronized ServerRestrictedNestedAction child ()
{
ServerRestrictedNestedAction toReturn = null;
List<ServerNestedAction> children = getChildren();
// There should be only one child!
- if (children.size() > 1)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contxfound_1",
- new Object[] {"ServerRestrictedNestedAction.child", children.size()});
- }
+ if (children.size() > 1) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_restricted_contxfound_1(
+ "ServerRestrictedNestedAction.child", Integer.toString(children.size()));
- throw new com.arjuna.ats.jts.exceptions.TxError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contx_1"));
+ throw new TxError(jtsLogger.i18NLogger.get_orbspecific_interposition_resources_restricted_contx_1());
}
else
{
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedTopLevelAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedTopLevelAction.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedTopLevelAction.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -34,6 +34,7 @@
import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.jts.exceptions.ExceptionCodes;
+import com.arjuna.ats.jts.exceptions.TxError;
import com.arjuna.ats.jts.logging.*;
import com.arjuna.ats.internal.jts.interposition.*;
@@ -90,25 +91,17 @@
return control();
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contxfound_3 {0} - found concurrent ({1}) transactions!
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contx_4 {0} Concurrent children found for restricted interposition!
- */
public final synchronized ServerRestrictedNestedAction child ()
{
ServerRestrictedNestedAction toReturn = null;
List<ServerNestedAction> children = getChildren();
// There should be only one child!
- if (children.size() > 1)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contxfound_3",
- new Object[] {"ServerRestrictedTopLevelAction.child", children.size()});
- }
+ if (children.size() > 1) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_restricted_contxfound_3(
+ "ServerRestrictedTopLevelAction.child", Integer.toString(children.size()));
- throw new com.arjuna.ats.jts.exceptions.TxError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contx_4"));
+ throw new TxError(jtsLogger.i18NLogger.get_orbspecific_interposition_resources_restricted_contx_4(Integer.toString(children.size())));
}
else
{
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/strict/ServerStrictNestedAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/strict/ServerStrictNestedAction.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/strict/ServerStrictNestedAction.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -82,10 +82,6 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.strict.ipfailed {0} - could not register interposed hierarchy!
- */
-
public boolean interposeResource ()
{
if (!_registered)
@@ -96,16 +92,8 @@
{
Coordinator realCoordinator = _theControl.originalCoordinator();
- if (!(_valid = registerSubTran(realCoordinator)))
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.orbspecific.interposition.resources.strict.ipfailed",
- new Object[]
- { "ServerStrictNestedAction" });
- }
+ if (!(_valid = registerSubTran(realCoordinator))) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_strict_ipfailed("ServerStrictNestedAction");
/*
* Failed to register. Valid is set, and the interposition
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/strict/ServerStrictTopLevelAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/strict/ServerStrictTopLevelAction.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/strict/ServerStrictTopLevelAction.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -80,10 +80,6 @@
}
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.interposition.resources.strict.iptlfailed {0} - could not register interposed hierarchy!
- */
-
public boolean interposeResource ()
{
if (!_registered)
@@ -94,19 +90,14 @@
{
Coordinator realCoordinator = _theControl.originalCoordinator();
- if (!(_valid = registerResource(realCoordinator)))
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.strict.iptlfailed",
- new Object[] {"ServerStrictNestedAction"});
- }
+ if (!(_valid = registerResource(realCoordinator))) {
+ jtsLogger.i18NLogger.warn_orbspecific_interposition_resources_strict_iptlfailed("ServerStrictNestedAction");
- /*
- * Failed to register. Valid is set, and the interposition
- * controller will now deal with this.
- */
- }
+ /*
+ * Failed to register. Valid is set, and the interposition
+ * controller will now deal with this.
+ */
+ }
realCoordinator = null;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ClientForwardInterceptor.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ClientForwardInterceptor.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ClientForwardInterceptor.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -53,14 +53,6 @@
*
* @author Malik Saheb
*/
-
-/**
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientForwardInterceptor_1 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientForwardInterceptor_1] - Client Interceptor for RecoveryCoordinators created
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientForwardInterceptor_2 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientForwardInterceptor_2] - Failed to retreive the Object reference of the default RecoverCoordinator Object.
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientForwardInterceptor_3 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientForwardInterceptor_3] - Failed to obtain the ObjectId string of the RecveryCoordinator target.
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientForwardInterceptor_4 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientForwardInterceptor_4] - Failed to build service context with the ObjectId
- */
-
public class ClientForwardInterceptor
extends org.omg.CORBA.LocalObject
implements ClientRequestInterceptor
@@ -70,8 +62,8 @@
int _IndicatorSlotId)
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientForwardInterceptor_1");
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("Client Interceptor for RecoveryCoordinators created");
}
piCurrent = _piCurrent;
@@ -113,10 +105,9 @@
}
}
}
- catch(Exception ex)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientForwardInterceptor_4", ex);
- }
+ catch(Exception ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_4(ex);
+ }
if (!in_loop)
@@ -201,10 +192,9 @@
org.omg.CORBA.Object obj = _ourOrb.string_to_object(RCDefaultObjectReference) ;
reco = RecoveryCoordinatorHelper.narrow(obj);
}
- catch (Exception e)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientForwardInterceptor_2", e);
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_2(e);
+ }
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ClientInitializer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ClientInitializer.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ClientInitializer.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -51,8 +51,6 @@
* with the ORB.
*
* @author Malik Saheb
- *
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientInitializer_ [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientInitializer_1] - Failed in ClientInitializer::post_init -
*/
public class ClientInitializer
@@ -90,9 +88,8 @@
info.add_client_request_interceptor
(new ClientForwardInterceptor(theORB, piCurrent, outSlotId));
}
- catch (Exception e)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientInitialize_1", e);
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_ClientInitializer_1(e);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCDefaultServant.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCDefaultServant.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCDefaultServant.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -47,11 +47,6 @@
import java.lang.Object;
-/**
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbDefaultServant_1 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCDefaultServant_1] - JacOrbDefaultServant replay_completion for recoverId {0}
-* @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbDefaultServant_2 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCDefaultServant_2] - JacOrbDefaultServant replay_completion for ObjectId {0}
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCDefaultServant_3 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCDefaultServant_3] - JacOrbServant.replay_completion got {0}
- */
public class JacOrbRCDefaultServant extends GenericRecoveryCoordinator
{
@@ -93,10 +88,8 @@
// convert that to the structured id
RecoveryCoordinatorId recovCoId = RecoveryCoordinatorId.reconstruct(objectIdString);
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCDefaultServant_1", new Object[]{recovCoId});
-
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCDefaultServant_2", new Object[]{objectIdString});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("JacOrbDefaultServant replay_completion for Id "+recovCoId);
}
// and do the real replay
@@ -108,11 +101,10 @@
throw exp;
}
/**/
- catch (Exception ex)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCDefaultServant_3", ex);
+ catch (Exception ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCDefaultServant_3(ex);
- return Status.StatusUnknown;
- }
+ return Status.StatusUnknown;
}
+ }
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -59,12 +59,6 @@
* JacOrb . The RCs are created locally but also will be
* recreated in the RecoveryManager if necessary following a crash
* of this process.
- *
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_1 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_1] - JacOrbRCManager: Created reference for tran {0} = {1}
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_2 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_2] - RCManager.makeRC did not make rcvco reference
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_3 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_3] - RCManager could not find file in object store.
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_4 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_4] - RCManager could not find file in object store during setup.
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_5 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_5] - Unexpected exception during IOR setup {0}
*/
public class JacOrbRCManager implements RcvCoManager
@@ -116,27 +110,25 @@
rc = RecoveryCoordinatorHelper.narrow(rcAsObject);
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_1", new Object[]{tranUid, rc});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("JacOrbRCManager: Created reference for tran "+tranUid+" = "+rc);
}
}
else
{
if (JacOrbRCManager._runWithoutDaemon)
throw new NO_IMPLEMENT();
- else
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_3");
+ else {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_3();
- rc = null;
- }
+ rc = null;
+ }
}
}
- catch (Exception ex)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_2", ex);
- }
+ catch (Exception ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_2(ex);
+ }
return rc;
}
@@ -169,19 +161,17 @@
InputObjectState iState = currentStore.read_committed(new Uid( JacOrbRCServiceInit.uid4Recovery), JacOrbRCServiceInit.type());
- if (iState != null)
- ref_ReCoo = iState.unpackString();
- else
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_4");
+ if (iState != null)
+ ref_ReCoo = iState.unpackString();
+ else
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_4();
}
- catch (java.io.FileNotFoundException ex)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_4");
- }
- catch (Exception ex)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_5", new java.lang.Object[]{ex});
- }
+ catch (java.io.FileNotFoundException ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_4();
+ }
+ catch (Exception ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_5(ex);
+ }
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -39,9 +39,7 @@
import com.arjuna.ats.internal.jts.Implementations;
import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.common.util.logging.*;
-
import com.arjuna.ats.jts.common.jtsPropertyManager;
import com.arjuna.ats.internal.jts.recovery.RecoveryORBManager;
@@ -67,15 +65,6 @@
* All orbs are likely to be the same, constructing a GenericRecoveryCreator,
* but with an orb-specific manager
*
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_1 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_1] - Failed to create poa for recoverycoordinators
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_2 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_2] - JacOrbRCServiceInit - set default servant and activated
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_3 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_3] - JacOrbRCServiceInit - Failed to start RC service
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_4 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_4] - Unable to create file ObjectId
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_5 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_5] - Unable to create file ObjectId - security problems
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_6 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_6] - Starting RecoveryServer ORB on port {0} and address {1}
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_6a [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_6a] - Sharing RecoveryServer ORB on port {0}
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_7 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_7] - Failed to create orb and poa for transactional objects {1}
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_8 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_8] - RootPOA is null. Initialization failed. Check no conflicting or duplicate service is running.
*/
public class JacOrbRCServiceInit implements RecoveryServiceInit
@@ -121,11 +110,7 @@
if (recoveryManagerAddr == null)
recoveryManagerAddr = "";
- if (jtsLogger.loggerI18N.isInfoEnabled())
- {
- jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_6",
- new java.lang.Object[]{recoveryManagerPort, recoveryManagerAddr});
- }
+ jtsLogger.i18NLogger.info_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6(recoveryManagerPort, recoveryManagerAddr);
final Properties p = new Properties();
// Try to preload jacorb.properties
@@ -172,10 +157,7 @@
oaInit = false;
- if (jtsLogger.loggerI18N.isInfoEnabled())
- {
- jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_6a", new java.lang.Object[]{oldPort});
- }
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6a(oldPort);
}
try
@@ -196,19 +178,17 @@
ORBManager.setORB(_orb);
ORBManager.setPOA(_oa);
}
- catch (Exception ex)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_7", ex);
+ catch (Exception ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_7(ex);
}
}
org.omg.CORBA.ORB theORB = _orb.orb();
org.omg.PortableServer.POA rootPOA = _oa.rootPoa();
- if (rootPOA == null)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_8");
-
+ if (rootPOA == null) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_8();
+
return null;
}
@@ -227,9 +207,8 @@
_poa = rootPOA.create_POA(poaName, rootPOA.the_POAManager(), policies);
}
- catch (Exception ex)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_1",ex);
+ catch (Exception ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_1(ex);
}
}
@@ -278,12 +257,12 @@
currentStore.write_committed( new Uid(uid4Recovery), type(), oState);
}
catch ( java.lang.SecurityException sex )
- {
- jtsLogger.loggerI18N.fatal("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_5");
- }
+ {
+ jtsLogger.i18NLogger.fatal_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_5();
+ }
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_2");
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("JacOrbRCServiceInit - set default servant and activated");
}
// activate the poa
@@ -295,9 +274,9 @@
return true;
} catch (Exception ex) {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_3", ex);
- return false;
- }
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_3(ex);
+ return false;
+ }
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRecoveryInit.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRecoveryInit.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRecoveryInit.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -47,7 +47,6 @@
* All orbs are likely to be the same, constructing a GenericRecoveryCreator,
* but with an orb-specific manager
*
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRecoveryInit_1 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRecoveryInit_1] - JacOrb RecoveryCoordinator creator setup
*/
public class JacOrbRecoveryInit
@@ -61,11 +60,11 @@
// and it's registration with CosTransactions)
GenericRecoveryCreator.register(theManager);
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRecoveryInit_1");
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("JacOrb RecoveryCoordinator creator setup");
}
}
-};
+}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ServerInitializer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ServerInitializer.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ServerInitializer.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -52,7 +52,6 @@
*
* @author Malik Saheb
*
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ServerInitializer_1 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ServerInitializer_1] - Failed in ServerInitializer::post_init -
*/
public class ServerInitializer
@@ -78,9 +77,8 @@
info.add_server_request_interceptor (new ServerRecoveryInterceptor(theORB));
}
- catch (Exception e)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ServerInitializer_1", e);
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_ServerInitializer_1(e);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ServerRecoveryInterceptor.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ServerRecoveryInterceptor.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/ServerRecoveryInterceptor.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -46,7 +46,6 @@
*
* @author Malik Saheb
*
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ServerRecoveryInterceptor_1 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ServerRecoveryInterceptor_1] - Failed to obtain the service context -
*/
public class ServerRecoveryInterceptor
@@ -80,9 +79,8 @@
String objectIdString = new String(context.context_data);
JacOrbRCDefaultServant.RCObjectId = context.context_data;
}
- catch (Exception ex)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ServerInitialize_1", ex);
+ catch (Exception ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_ServerInitializer_1(ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/RecoveryEnablement.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/RecoveryEnablement.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/RecoveryEnablement.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -60,12 +60,6 @@
* @version $Id: RecoveryEnablement.java 2342 2006-03-30 13:06:17Z $
* @since JTS 2.1.
*
- * @message com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_1 [com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_1] - Could not locate supported ORB for RecoveryCoordinator initialisation.
- * @message com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_2 [com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_2] - Full crash recovery is not supported with this orb
- * @message com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_3 [com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_3] - Set property {0} = {1}
- * @message com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_4 [com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_4] - RecoveryCoordinator service can only be provided in RecoveryManager
- * @message com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_5 [com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_5] - ORB/OA initialisation failed: {0}
- * @message com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_6 [com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_5] - The Recovery Service Initialisation failed: {0}
*/
public class RecoveryEnablement implements RecoveryActivator
@@ -129,19 +123,15 @@
result = true;
}
break;
- default:
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_1");
- }
- }
+ default: {
+ jtsLogger.i18NLogger.warn_recovery_RecoveryEnablement_1();
+ }
break;
}
}
catch (Exception e)
{
- jtsLogger.loggerI18N.fatal("com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_6", new Object[] {e}, e);
+ jtsLogger.i18NLogger.warn_recovery_RecoveryEnablement_6(e);
}
return result;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/recoverycoordinators/GenericRecoveryCoordinator.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/recoverycoordinators/GenericRecoveryCoordinator.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/recoverycoordinators/GenericRecoveryCoordinator.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -56,12 +56,7 @@
* <P>
* @author Dave Ingham(dave.ingham at arjuna.com), Peter Furniss, Mark Little (mark.little at arjuna.com) Malik SAHEB (malik.saheb at arjuna.com
* @version $Id: GenericRecoveryCoordinator.java 2342 2006-03-30 13:06:17Z $
- *
- * @message com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCoordinator_1 [com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCoordinator_1] - GenericRecoveryCoordinator {0} constructed
- * @message com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCoordinator_2 [com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCoordinator_2] - GenericRecoveryCoordinator() constructing
- * @message com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCoordinator_4 [com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCoordinator_4] - GenericRecoveryCoordinator - swapping Resource for RC {0}
*/
-
public class GenericRecoveryCoordinator extends org.omg.CosTransactions.RecoveryCoordinatorPOA
{
@@ -79,8 +74,8 @@
{
_id = new RecoveryCoordinatorId(RCUid, actionUid, processUid, isServerTransaction);
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCoordinator_1", new Object[]{_id});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("GenericRecoveryCoordinator "+_id+" constructed");
}
}
@@ -92,8 +87,8 @@
*/
protected GenericRecoveryCoordinator()
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCoordinator_2");
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("GenericRecoveryCoordinator() constructing");
}
_id = null;
}
@@ -224,8 +219,8 @@
if ( (replayer.getRecoveryStatus() != com.arjuna.ats.internal.jts.recovery.transactions.RecoveryStatus.ACTIVATE_FAILED) &&
(res != null) )
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCoordinator_4", new Object[]{id._RCUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("GenericRecoveryCoordinator - swapping Resource for RC "+id._RCUid);
}
replayer.swapResource(id._RCUid, res);
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/recoverycoordinators/RecoveryCoordinatorId.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/recoverycoordinators/RecoveryCoordinatorId.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/recoverycoordinators/RecoveryCoordinatorId.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -63,9 +63,6 @@
* @author Peter Furniss (peter.furniss at arjuna.com)
* @version $Id: RecoveryCoordinatorId.java 2342 2006-03-30 13:06:17Z $
*
- * @message com.arjuna.ats.internal.jts.recovery.recoverycoordinators.RecoveryCoordinatorId_1 [com.arjuna.ats.internal.jts.recovery.recoverycoordinators.RecoveryCoordinatorId_1] - RecoveryCoordinatorId: created RCkey {0}
- * @message com.arjuna.ats.internal.jts.recovery.recoverycoordinators.RecoveryCoordinatorId_2 [com.arjuna.ats.internal.jts.recovery.recoverycoordinators.RecoveryCoordinatorId_2] - System exception when creating RecoveryCoordinator object key
- * @message com.arjuna.ats.internal.jts.recovery.recoverycoordinators.RecoveryCoordinatorId_3 [com.arjuna.ats.internal.jts.recovery.recoverycoordinators.RecoveryCoordinatorId_3] - RecoveryCoordinatorId could not decode data {0}
*/
public class RecoveryCoordinatorId
@@ -118,14 +115,13 @@
stringBuf.append(_isServerTransaction);
rcObjectKey = stringBuf.toString();
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.RecoveryCoordinatorId_1", new Object[]{rcObjectKey});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("RecoveryCoordinatorId: created RCkey "+rcObjectKey);
}
}
- catch (Exception e)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.RecoveryCoordinatorId_2", e);
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_recovery_recoverycoordinators_RecoveryCoordinatorId_2(e);
+ }
return rcObjectKey;
}
@@ -198,10 +194,10 @@
return new RecoveryCoordinatorId (RCUid, actionUid,
originalProcessUid, isServerTransaction);
} else {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.RecoveryCoordinatorId_3", new Object[]{encodedRCData});
- return null;
- }
+ jtsLogger.i18NLogger.warn_recovery_recoverycoordinators_RecoveryCoordinatorId_3(encodedRCData);
+ return null;
}
+ }
/**
* override base toString for clarity
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryCreator.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryCreator.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryCreator.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -80,20 +80,12 @@
return _theCreator;
}
- /**
- * @message com.arjuna.ats.internal.jts.recovery.rcnull {0} - being passed a null reference. Will ignore!
- */
public static final void setCreator (RecoveryCreator c)
{
- if (c == null)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.rcnull",
- new Object[] { "RecoveryCreator.setCreator"} );
- }
- }
+ if (c == null) {
+ jtsLogger.i18NLogger.warn_recovery_rcnull("RecoveryCreator.setCreator");
+ }
else
_theCreator = c;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryInit.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryInit.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryInit.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -51,11 +51,6 @@
*
* @author Malik SAHEB
*
- * @message com.arjuna.ats.internal.jts.recovery.RecoveryInit_1 [com.arjuna.ats.internal.jts.recovery.RecoveryInit_1] - added ORBAttribute for recoveryCoordinatorInitialiser
- * @message com.arjuna.ats.internal.jts.recovery.RecoveryInit_2 [com.arjuna.ats.internal.jts.recovery.RecoveryInit_2] - Full crash recovery is not supported with this orb
- * @message com.arjuna.ats.internal.jts.recovery.RecoveryInit_3 [com.arjuna.ats.internal.jts.recovery.RecoveryInit_3] - added event handler {1}
- * @message com.arjuna.ats.internal.jts.recovery.RecoveryInit_4 [com.arjuna.ats.internal.jts.recovery.RecoveryInit_4] - RecoveryCoordinator service can only be provided in RecoveryManager
- * @message com.arjuna.ats.internal.jts.recovery.RecoveryInit_5 [com.arjuna.ats.internal.jts.recovery.RecoveryInit_5] - ORB/OA initialisation failed: {0}
*/
public class RecoveryInit
@@ -67,8 +62,6 @@
/**
* Constructor does the work as a result of being registered as an ORBPreInit
* class
- *
- * @message com.arjuna.ats.internal.jts.recovery.recoveryinit_1 Failure recovery not supported for this ORB.
*/
public RecoveryInit ()
{
@@ -104,13 +97,9 @@
recoveryCoordinatorInitialiser = Thread.currentThread().getContextClassLoader().loadClass(InitClassName).newInstance();
}
break;
- default:
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.recoveryinit_1");
- }
- }
+ default: {
+ jtsLogger.i18NLogger.warn_recovery_recoveryinit_1();
+ }
break;
}
@@ -125,15 +114,14 @@
}
catch (Exception e)
{
- jtsLogger.loggerI18N.fatal("com.arjuna.ats.internal.jts.recovery.RecoveryInit_4", new Object[] {e});
+ jtsLogger.i18NLogger.fatal_recovery_RecoveryInit_4();
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
}
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.RecoveryInit_1");
-
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.RecoveryInit_3", new Object[]{eventHandlerClassName});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("added ORBAttribute for recoveryCoordinatorInitialiser");
+ jtsLogger.logger.debug("added event handler "+eventHandlerClassName);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/ExpiredContactScanner.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/ExpiredContactScanner.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/ExpiredContactScanner.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -43,26 +43,18 @@
import com.arjuna.ats.internal.arjuna.common.UidHelper;
import com.arjuna.ats.jts.logging.jtsLogger;
-import com.arjuna.common.util.logging.*;
-
/**
* This class is a plug-in module for the recovery manager. This
* class is responsible for the removing contact items that are too old
- *
- * @message com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_1 [com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_1] ExpiredContactScanner created, with expiry time of {0} seconds
- * @message com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_2 [com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_2] ExpiredContactScanner - scanning to remove items from before {0}
- * @message com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_3 [com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_3] Removing old contact item {0}
- * @message com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_4 [com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_4] Expiry scan interval set to {0} seconds
- * @message com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_5 [com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_5] {0} has inappropriate value {1}
*/
public class ExpiredContactScanner implements ExpiryScanner
{
public ExpiredContactScanner ()
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_1", new Object[]{Integer.toString(_expiryTime)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("ExpiredContactScanner created, with expiry time of "+_expiryTime+" seconds");
}
_objectStore = FactoryContactItem.getStore();
_itemTypeName = FactoryContactItem.getTypeName();
@@ -78,8 +70,8 @@
// calculate the time before which items will be removed
Date oldestSurviving = new Date( new Date().getTime() - _expiryTime * 1000);
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_2", new Object[]{_timeFormat.format(oldestSurviving)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("ExpiredContactScanner - scanning to remove items from before "+_timeFormat.format(oldestSurviving));
}
try
{
@@ -110,7 +102,7 @@
Date timeOfDeath = anItem.getDeadTime();
if (timeOfDeath != null && timeOfDeath.before(oldestSurviving))
{
- jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_3", new Object[]{newUid});
+ jtsLogger.i18NLogger.info_recovery_ExpiredContactScanner_3(newUid);
_objectStore.remove_committed(newUid, _itemTypeName);
}
}
@@ -138,8 +130,8 @@
{
_expiryTime = recoveryPropertyManager.getRecoveryEnvironmentBean().getTransactionStatusManagerExpiryTime() * 60 * 60;
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_4", new Object[]{Integer.toString(_expiryTime)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("Expiry scan interval set to "+_expiryTime+" seconds");
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/FactoryContactItem.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/FactoryContactItem.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/FactoryContactItem.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -54,14 +54,6 @@
* find the status of any transaction.
*
* Identifying uid is the processUid
- *
- * @message com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_1 [com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_1] - Problem with storing process/factory link {0}
- * @message com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_2 [com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_2] - Attempted to read FactoryContactItem of different version
- * @message com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_3 [com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_3] - Stored IOR is not an ArjunaFactory
- * @message com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_4 [com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_4] - Problem with restoring process/factory link {0}
- * @message com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_5 [com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_5] - Problem with restoring process/factory link
- * @message com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_6 [com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_6] - Problem with storing process/factory link
- * @message com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_7 [com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_7] - Problem with removing contact item {0}
*/
public class FactoryContactItem
@@ -249,13 +241,11 @@
}
return true;
}
- catch (java.io.IOException ex)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_1", new Object[] {ex});
+ catch (java.io.IOException ex) {
+ jtsLogger.i18NLogger.warn_recovery_contact_FactoryContactItem_1(ex);
}
- catch (Exception exp)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_1", new Object[] {exp});
+ catch (Exception exp) {
+ jtsLogger.i18NLogger.warn_recovery_contact_FactoryContactItem_1(exp);
}
return false;
@@ -271,8 +261,8 @@
try {
int oldversion = objstate.unpackInt();
if (oldversion != version) {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_2");
- }
+ jtsLogger.i18NLogger.warn_recovery_contact_FactoryContactItem_2();
+ }
long oldtime = objstate.unpackLong();
_creationTime = new Date(oldtime);
String iorAsString = objstate.unpackString();
@@ -288,10 +278,9 @@
***/
_factory = ArjunaFactoryHelper.narrow(corbject);
- if (_factory == null)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_3");
- }
+ if (_factory == null) {
+ jtsLogger.i18NLogger.warn_recovery_contact_FactoryContactItem_3();
+ }
_deadTime = null;
} else {
_factory = null;
@@ -301,13 +290,11 @@
_aliveTime = null;
return true;
}
- catch (java.io.IOException ex)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_4", new Object[] {ex});
+ catch (java.io.IOException ex) {
+ jtsLogger.i18NLogger.warn_recovery_contact_FactoryContactItem_4(ex);
}
- catch (Exception exp)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_4", new Object[] {exp});
+ catch (Exception exp) {
+ jtsLogger.i18NLogger.warn_recovery_contact_FactoryContactItem_4(exp);
}
return false;
@@ -324,28 +311,27 @@
return true;
}
} catch (ObjectStoreException exo) {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_1", new Object[] {exo});
+ jtsLogger.i18NLogger.warn_recovery_contact_FactoryContactItem_1(exo);
}
return false;
}
private boolean restoreMe()
{
- try
- {
- InputObjectState objstate = getStore().read_committed(_uid, _pseudoTypeName);
+ try {
+ InputObjectState objstate = getStore().read_committed(_uid, _pseudoTypeName);
- if (objstate == null) // not in object store any more
- return false;
-
- if ( restore_state(objstate)) {
- return true;
- }
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_5");
+ if (objstate == null) // not in object store any more
+ return false;
+
+ if (restore_state(objstate)) {
+ return true;
+ }
+ jtsLogger.i18NLogger.warn_recovery_contact_FactoryContactItem_5();
} catch (ObjectStoreException exo) {
- // this shouldn't happen, because we shouldn't be looking for a factory
- // that was never recorded
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_6");
+ // this shouldn't happen, because we shouldn't be looking for a factory
+ // that was never recorded
+ jtsLogger.i18NLogger.warn_recovery_contact_FactoryContactItem_6();
}
return false;
}
@@ -355,9 +341,9 @@
try {
return getStore().remove_committed(uid, _pseudoTypeName);
} catch (ObjectStoreException exo) {
- // this shouldn't happen, because we shouldn't be looking for a factory
- // that was never recorded
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_7", new Object[] {exo});
+ // this shouldn't happen, because we shouldn't be looking for a factory
+ // that was never recorded
+ jtsLogger.i18NLogger.warn_recovery_contact_FactoryContactItem_7(exo);
}
return false;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/RecoveryContactWriter.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/RecoveryContactWriter.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/RecoveryContactWriter.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -49,10 +49,6 @@
* deregisters itself
* (and thus relies on the fact (true for 2.1) that any ArjunaFactory can be used to
* find the status of any transaction.
- *
- * @message com.arjuna.ats.internal.jts.recovery.contact.RecoveryContactWriter_1 [com.arjuna.ats.internal.jts.recovery.contact.RecoveryContactWriter_1] - RecoveryContactWriter() created
- * @message com.arjuna.ats.internal.jts.recovery.contact.RecoveryContactWriter_2 [com.arjuna.ats.internal.jts.recovery.contact.RecoveryContactWriter_2] - RecoveryContactWriter.connected( " {0} ")
- * @message com.arjuna.ats.internal.jts.recovery.contact.RecoveryContactWriter_3 [com.arjuna.ats.internal.jts.recovery.contact.RecoveryContactWriter_3] - RecoveryContactWriter.connected - found ArjunaFactory
*/
public class RecoveryContactWriter implements com.arjuna.orbportability.event.EventHandler
@@ -61,8 +57,8 @@
public RecoveryContactWriter()
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.contact.RecoveryContactWriter_1");
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("RecoveryContactWriter() created");
}
_noted = false;
@@ -70,8 +66,8 @@
public void connected (org.omg.CORBA.Object obj)
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.contact.RecoveryContactWriter_2", new Object[]{obj});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("RecoveryContactWriter.connected("+obj+")");
}
// only do this once - but shouldn't need this, since de-register on writing
@@ -84,8 +80,8 @@
if (theFactory != null) {
// if that didn't blow, we have a hit
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.contact.RecoveryContactWriter_1");
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("RecoveryContactWriter.connected - found ArjunaFactory");
}
FactoryContactItem.createAndSave(theFactory);
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/StatusChecker.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/StatusChecker.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/StatusChecker.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -72,22 +72,6 @@
* find the status of any transaction.
*
* Singleton class
- *
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_1 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_1] - StatusChecker.getStatus( {0} ) - current status = {1}
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_2 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_2] - StatusChecker.getStatus( {0} ) - stored status = {1}
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_3 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_3] - StatusChecked.getStatus - found intentions list for apparently unknown transaction: {0}
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_4 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_4] - StatusChecker.getStatus( {0} ) - Status = {1}
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_5 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_5] - StatusChecker.getStatus({0}) - NO_IMPLEMENT = dead
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_6 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_6] - StatusChecker.getStatus({0}) - TRANSIENT = dead
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_7 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_7] - StatusChecker.getStatus({0}) - COMM_FAILURE = live
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_8 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_8] - StatusChecker.getStatus({0}) - OBJECT_NOT_EXIST = dead
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_9 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_9] - BAD_PARAM exception on trying to contact original process
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_10 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_10] - NoTransaction exception on trying to contact original process
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_11 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_11] - CORBA exception on trying to contact original process "
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_12 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_12] - Exception on trying to contact original process
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_13 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_13] - StatusChecker.getStatus({0}) - no factory, process previously dead
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_14 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_14] - no known contactitem for {0}
- * @message com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_15 [com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_15] - surprise item in StatusChecker list for {0}, {1}
*/
public class StatusChecker
@@ -207,8 +191,8 @@
otsStatus = factory.getCurrentStatus(otid);
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_1", new Object[]{transactionUid, Utility.stringStatus(otsStatus)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("StatusChecker.getStatus("+transactionUid+") - current status = "+Utility.stringStatus(otsStatus));
}
/*
@@ -223,8 +207,8 @@
{
otsStatus = factory.getStatus(otid);
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_2", new Object[]{transactionUid, Utility.stringStatus(otsStatus)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("StatusChecker.getStatus("+transactionUid+") - stored status = "+Utility.stringStatus(otsStatus));
}
switch (otsStatus.value())
@@ -239,33 +223,32 @@
return otsStatus;
case Status._StatusUnknown:
return otsStatus;
- default:
- {
- /*
- * We got an answer! This probably means that the
- * factory has just finished with the transaction, but
- * the state hasn't been removed by the file system yet
- * - we don't sync the removal to improve performance.
- */
+ default: {
+ /*
+ * We got an answer! This probably means that the
+ * factory has just finished with the transaction, but
+ * the state hasn't been removed by the file system yet
+ * - we don't sync the removal to improve performance.
+ */
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_3", new Object[] {transactionUid});
+ jtsLogger.i18NLogger.warn_recovery_contact_StatusChecker_3(transactionUid);
- otsStatus = Status.StatusUnknown;
- }
+ otsStatus = Status.StatusUnknown;
+ }
break;
}
}
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_4", new Object[]{transactionUid, Utility.stringStatus(otsStatus)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("StatusChecker.getStatus("+transactionUid+") - Status = "+Utility.stringStatus(otsStatus));
}
item.markAsAlive();
} catch ( NO_IMPLEMENT ex_noimp) {
// the original application has died
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_5", new Object[]{transactionUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("StatusChecker.getStatus("+transactionUid+") - NO_IMPLEMENT = dead");
}
originalDead = true;
@@ -277,8 +260,8 @@
if (ORBInfo.getOrbEnumValue() == ORBType.JACORB)
{
// the original application has (probably) died
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_6", new Object[]{transactionUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("StatusChecker.getStatus("+transactionUid+") - TRANSIENT = dead");
}
originalDead = true;
}
@@ -288,8 +271,8 @@
* Probably the original application has died, but only just - do
* not mark either way.
*/
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_7", new Object[]{transactionUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("StatusChecker.getStatus("+transactionUid+") - COMM_FAILURE = live");
}
} catch ( OBJECT_NOT_EXIST ex_noobj) {
@@ -297,23 +280,23 @@
// come up in the same place
// (or, just possibly, the original closed the ots)
originalDead = true;
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_8", new Object[]{transactionUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("StatusChecker.getStatus("+transactionUid+") - OBJECT_NOT_EXIST = dead");
}
} catch ( BAD_PARAM ex_badparam) {
- jtsLogger.loggerI18N.warn(" com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_9");
+ jtsLogger.i18NLogger.warn_recovery_contact_StatusChecker_9();
// the transactionUid is invalid !
} catch ( NoTransaction ex_notran) {
- jtsLogger.loggerI18N.warn(" com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_10");
+ jtsLogger.i18NLogger.warn_recovery_contact_StatusChecker_10();
// the transactionUid is invalid !
// no transaction
} catch ( SystemException ex_corba ) {
// why did this happen ?
- jtsLogger.loggerI18N.warn(" com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_11", ex_corba);
+ jtsLogger.i18NLogger.warn_recovery_contact_StatusChecker_11(ex_corba);
} catch ( Exception ex_other) {
// this really shouldn't happen
- jtsLogger.loggerI18N.warn(" com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_12", ex_other);
+ jtsLogger.i18NLogger.warn_recovery_contact_StatusChecker_12(ex_other);
}
if (originalDead)
@@ -333,8 +316,8 @@
else
{
// factory in item is null - process already dead
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_13", new Object[]{transactionUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("StatusChecker.getStatus("+transactionUid+") - no factory, process previously dead");
}
/*
@@ -400,15 +383,15 @@
if (theItem == null) {
- // if it's still null, either something has gone wrong
- // - how did it get in the recoverycoordkey when the
- // factory was unknown
- // or it's very old and been fully deleted
+ // if it's still null, either something has gone wrong
+ // - how did it get in the recoverycoordkey when the
+ // factory was unknown
+ // or it's very old and been fully deleted
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_14", new Object[]{uid});
- // treat as long-dead process - return null
- }
+ jtsLogger.i18NLogger.warn_recovery_contact_StatusChecker_14(uid);
+ // treat as long-dead process - return null
}
+ }
return theItem;
}
@@ -421,8 +404,8 @@
theItem = (FactoryContactItem) _itemFromUid.get(uid);
return theItem;
} catch (ClassCastException ex) {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_15", new Object[]{uid, ex});
- return null;
+ jtsLogger.i18NLogger.warn_recovery_contact_StatusChecker_15(uid, ex);
+ return null;
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/recoverycoordinators/GenericRecoveryCreator.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/recoverycoordinators/GenericRecoveryCreator.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/recoverycoordinators/GenericRecoveryCreator.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -65,7 +65,6 @@
* will be recreated in the RecoveryManager if called there (possibly following
* a crash of this process).
*
- * @message com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCreator_1 [com.arjuna.ats.internal.jts.recovery.RecoveryCoordinator.GenericRecoveryCreator_1] - GenericRecoveryCreator: Missing params to create
*/
public class GenericRecoveryCreator extends RecoveryCreator
@@ -144,12 +143,11 @@
// Pass the RecoveryCoordinator Uid back
params[0] = RCUid;
}
- else
- {
+ else {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCreator_1");
-
- }
+ jtsLogger.i18NLogger.warn_recovery_recoverycoordinators_GenericRecoveryCreator_1();
+
+ }
return recoveryCoordinator;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/recoverycoordinators/ResourceCompletor.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/recoverycoordinators/ResourceCompletor.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/recoverycoordinators/ResourceCompletor.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -47,7 +47,6 @@
* subordinate coordinators) may use the replay_completion response to
* trigger their own rollback.
*
- * @message com.arjuna.ats.internal.jts.recovery.recoverycoordinators.ResourceCompletor_1 [com.arjuna.ats.internal.jts.recovery.recoverycoordinators.ResourceCompletor_1] - ResourceCompletor.rollback() - rollback failed: {0}
*/
public class ResourceCompletor extends Thread
@@ -79,8 +78,8 @@
}
catch (Exception e)
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.ResourceCompletor_1", new Object[]{e});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("ResourceCompletor.rollback() - rollback failed: "+e);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/AssumedCompleteServerTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/AssumedCompleteServerTransaction.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/AssumedCompleteServerTransaction.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -56,7 +56,6 @@
* @author Peter Furniss (peter.furniss at arjuna.com)
* @version $Id: AssumedCompleteServerTransaction.java 2342 2006-03-30 13:06:17Z $
*
- * @message com.arjuna.ats.internal.jts.recovery.transactions.AssumedCompleteServerTransaction_1 [com.arjuna.ats.internal.jts.recovery.transactions.AssumedCompleteServerTransaction_1] - AssumedCompleteServerTransaction {0} created
*/
public class AssumedCompleteServerTransaction extends RecoveredServerTransaction
@@ -64,8 +63,8 @@
public AssumedCompleteServerTransaction ( Uid actionUid )
{
super(actionUid,ourTypeName);
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.AssumedCompleteServerTransaction_1", new Object[]{get_uid()});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("AssumedCompleteServerTransaction "+get_uid()+" created");
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/AssumedCompleteTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/AssumedCompleteTransaction.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/AssumedCompleteTransaction.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -57,7 +57,6 @@
* @author Peter Furniss (peter.furniss at arjuna.com)
* @version $Id: AssumedCompleteTransaction.java 2342 2006-03-30 13:06:17Z $
*
- * @message com.arjuna.ats.internal.jts.recovery.transactions.AssumedCompleteTransaction_1 [com.arjuna.ats.internal.jts.recovery.transactions.AssumedCompleteTransaction_1] - AssumedCompleteTransaction {0} created
*/
public class AssumedCompleteTransaction extends RecoveredTransaction
@@ -66,8 +65,8 @@
{
super(actionUid,ourTypeName);
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.AssumedCompleteTransaction_1", new Object[]{get_uid()});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("AssumedCompleteTransaction "+get_uid()+" created");
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/CachedRecoveredTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/CachedRecoveredTransaction.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/CachedRecoveredTransaction.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -60,8 +60,6 @@
* @version $Id: CachedRecoveredTransaction.java 2342 2006-03-30 13:06:17Z $
* @see TransactionCache
*
- * @message com.arjuna.ats.internal.jts.recovery.transactions.CachedRecoveredTransaction_1 [com.arjuna.ats.internal.jts.recovery.transactions.CachedRecoveredTransaction_1] - CachedRecoveredTransaction created [{0}, {1}]
- * @message com.arjuna.ats.internal.jts.recovery.transactions.CachedRecoveredTransaction_2 [com.arjuna.ats.internal.jts.recovery.transactions.CachedRecoveredTransaction_2] - CachedRecoveredTransaction.originalBusy - told status is {0}
*/
public class CachedRecoveredTransaction
{
@@ -70,8 +68,8 @@
_theTransactionUid = new Uid (actionUid);
_theTransactionType = theType;
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.CachedRecoveredTransaction_1", new Object[]{_theTransactionUid, _theTransactionType});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("CachedRecoveredTransaction created ["+_theTransactionUid+", "+_theTransactionType+"]");
}
}
@@ -105,8 +103,8 @@
{
Status originalStatus = getOriginalStatus();
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.CachedRecoveredTransaction_2", new Object[]{Utility.stringStatus(originalStatus)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("CachedRecoveredTransaction.originalBusy - told status is "+Utility.stringStatus(originalStatus));
}
switch (originalStatus.value()) {
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/ExpiredAssumedCompleteScanner.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/ExpiredAssumedCompleteScanner.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/ExpiredAssumedCompleteScanner.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -53,11 +53,6 @@
* particular object type to be scanned for.
* <p>Expiry time is determined by property ASSUMED_COMPLETE_EXPIRY_TIME.
*
- * @message com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_1 [com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_1] - ExpiredAssumedCompleteScanner created, with expiry time of {0} seconds
- * @message com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_2 [com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_2] - ExpiredAssumedCompleteScanner - scanning to remove items from before {0}
- * @message com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_3 [com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_3] - Removing old assumed complete transaction {0}
- * @message com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_4 [com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_4] - Expiry scan interval set to {0} seconds
- * @message com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_5 [com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_5] - {0} has inappropriate value ({1})
*/
public class ExpiredAssumedCompleteScanner implements ExpiryScanner
@@ -70,8 +65,8 @@
protected ExpiredAssumedCompleteScanner (String typeName, ObjectStore objectStore)
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_1", new Object[]{Integer.toString(_expiryTime)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("ExpiredAssumedCompleteScanner created, with expiry time of "+_expiryTime+" seconds");
}
_objectStore = objectStore;
@@ -86,8 +81,8 @@
Date oldestSurviving = new Date( new Date().getTime() - _expiryTime * 1000);
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_2", new Object[]{_timeFormat.format(oldestSurviving)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("ExpiredAssumedCompleteScanner - scanning to remove items from before "+_timeFormat.format(oldestSurviving));
}
try
@@ -124,11 +119,8 @@
Date timeLastActive = aTransaction.getLastActiveTime();
if (timeLastActive != null && timeLastActive.before(oldestSurviving))
{
-
- if (jtsLogger.loggerI18N.isInfoEnabled())
- {
- jtsLogger.loggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner_3", new Object[]{newUid});
- }
+
+ jtsLogger.i18NLogger.info_arjuna_recovery_ExpiredAssumedCompleteScanner_3(newUid);
_objectStore.remove_committed(newUid, _typeName);
}
@@ -159,8 +151,8 @@
{
_expiryTime = recoveryPropertyManager.getRecoveryEnvironmentBean().getTransactionStatusManagerExpiryTime() * 60 * 60;
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_4", new Object[]{Integer.toString(_expiryTime)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("Expiry scan interval set to "+_expiryTime+" seconds");
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredServerTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredServerTransaction.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredServerTransaction.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -66,75 +66,6 @@
*
* @author Dave Ingham (dave at arjuna.com)
* @version $Id: RecoveredServerTransaction.java 2342 2006-03-30 13:06:17Z $
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_1
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_1] - RecoveredServerTransaction {0}
- * created
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_2
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_2] - RecoveredServerTransaction -
- * activate of {0} failed!
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_4
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_4] -
- * RecoveredServerTransaction.replayPhase2({0}) - status = {1}
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_5
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_5] -
- * RecoveredServerTransaction.replayPhase2({0}) - status after
- * contacting parent = {1}
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_6
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_6] - ServerTransaction {0} unable
- * determine status - retry later
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_7
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_7] -
- * RecoveredServerTransaction.replayPhase2: unexpected Status: {0}
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_8
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_8] -
- * RecoveredServerTransaction.replayPhase2: ({0}) finished
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_9
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_9] -
- * RecoveredServerTransaction.getStatusFromParent - replay_completion
- * status = {0}
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_10
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_10] - Got TRANSIENT from ORB for tx {0}
- * and assuming OBJECT_NOT_EXIST
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_11
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_11] -
- * RecoveredServerTransaction.getStatusFromParent - replay_completion
- * got object_not_exist = {0}
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_12
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_12] - RecoveredServerTransaction: caught
- * NotPrepared
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_13
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_13] - RecoveredServerTransaction: caught
- * unexpected exception:
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_14
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_14] - RecoveredServerTransaction: {0} is
- * invalid
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_15
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_15] -
- * RecoveredServerTransaction:getStatusFromParent - no recovcoord or
- * status not prepared
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_16
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_16] -
- * "RecoveredServerTransaction.unpackHeader - txid = {0} and processUid
- * = {1}
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_17
- * [com.arjuna.ats.internal.jts.recovery.transactions
- * .RecoveredServerTransaction_17] - RecoveredServerTransaction -
- * activate of {0} failed with {1}
*/
public class RecoveredServerTransaction extends ServerTransaction implements
@@ -163,9 +94,8 @@
{
super(actionUid);
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_1", new Object[]
- {getSavingUid()});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("RecoveredServerTransaction "+getSavingUid()+" created");
}
// Don't bother trying to activate a transaction that isn't in
@@ -197,24 +127,13 @@
if (activate())
_recoveryStatus = RecoveryStatus.ACTIVATED;
- else
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_2",
- new Object[]
- { getSavingUid() });
+ else {
+ jtsLogger.i18NLogger.warn_recovery_transactions_RecoveredServerTransaction_2(getSavingUid());
}
- ;
}
}
- catch (Exception e)
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_2",
- new Object[]
- { getSavingUid(), e });
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_recovery_transactions_RecoveredServerTransaction_2(getSavingUid());
}
_txStatus = Status.StatusUnknown;
@@ -262,9 +181,8 @@
Status theStatus = get_status();
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_4", new Object[]
- {get_uid(), Utility.stringStatus(theStatus)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("RecoveredServerTransaction.replayPhase2("+get_uid()+") - status = "+Utility.stringStatus(theStatus));
}
if (theStatus == Status.StatusPrepared)
@@ -275,9 +193,9 @@
*/
theStatus = getStatusFromParent();
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_5", new Object[]
- {get_uid(), Utility.stringStatus(theStatus)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("RecoveredServerTransaction.replayPhase2("+get_uid()+") -" +
+ " status after contacting parent = "+ Utility.stringStatus(theStatus));
}
}
@@ -303,29 +221,16 @@
}
else if (theStatus == Status.StatusUnknown)
{
- if (jtsLogger.loggerI18N.isInfoEnabled())
- {
- jtsLogger.loggerI18N
- .info(
- "com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_6",
- new Object[]
- { get_uid() });
- }
+ jtsLogger.i18NLogger.info_recovery_transactions_RecoveredServerTransaction_6(get_uid());
_recoveryStatus = RecoveryStatus.REPLAY_FAILED;
}
- else
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_7",
- new Object[]
- { Utility.stringStatus(theStatus) });
+ else {
+ jtsLogger.i18NLogger.warn_recovery_transactions_RecoveredServerTransaction_7(Utility.stringStatus(theStatus));
_recoveryStatus = RecoveryStatus.REPLAY_FAILED;
}
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_8", new Object[]
- {get_uid()});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("RecoveredServerTransaction.replayPhase2: ("+get_uid()+") finished");
}
}
@@ -391,22 +296,16 @@
theStatus = super._recoveryCoordinator
.replay_completion(tla.getReference());
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_9", new Object[]
- {Utility.stringStatus(theStatus)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("RecoveredServerTransaction.getStatusFromParent - replay_completion status = "+Utility.stringStatus(theStatus));
}
}
- catch (TRANSIENT ex_trans)
- {
+ catch (TRANSIENT ex_trans) {
// orbix seems to count unreachable as transient, but we no
// longer support orbix
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_10",
- new Object[]
- { get_uid() });
- theStatus = org.omg.CosTransactions.Status.StatusRolledBack;
+ jtsLogger.i18NLogger.warn_recovery_transactions_RecoveredServerTransaction_10(get_uid());
+ theStatus = Status.StatusRolledBack;
}
// What here what should be done for Orbix2000
catch (OBJECT_NOT_EXIST ex)
@@ -420,35 +319,23 @@
// theStatus =
// org.omg.CosTransactions.Status.StatusNoTransaction;
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_11", new Object[]
- {Utility.stringStatus(theStatus)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("RecoveredServerTransaction.getStatusFromParent -" +
+ " replay_completion got object_not_exist = "+Utility.stringStatus(theStatus));
}
}
- catch (NotPrepared ex1)
- {
- jtsLogger.loggerI18N
- .warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_12");
- theStatus = org.omg.CosTransactions.Status.StatusActive;
+ catch (NotPrepared ex1) {
+ jtsLogger.i18NLogger.warn_recovery_transactions_RecoveredServerTransaction_12();
+ theStatus = Status.StatusActive;
}
- catch (Exception e)
- {
+ catch (Exception e) {
// Unknown error, so better to do nothing at this stage.
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_13",
- e);
+ jtsLogger.i18NLogger.warn_recovery_transactions_RecoveredServerTransaction_13(e);
}
}
- else
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_14",
- new Object[]
- { get_uid() });
+ else {
+ jtsLogger.i18NLogger.warn_recovery_transactions_RecoveredServerTransaction_14(get_uid());
}
- ;
// Make sure we "delete" these objects when we are finished
// with them or there will be a memory leak. If they are deleted
@@ -460,8 +347,9 @@
}
else
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_15");
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("RecoveredServerTransaction:getStatusFromParent - " +
+ "no recovcoord or status not prepared");
}
}
@@ -495,8 +383,7 @@
}
catch (ObjectStoreException ex)
{
- jtsLogger.loggerI18N.warn(
- "RecoveredServerTransaction.removeOldStoreEntry ", ex);
+ jtsLogger.i18NLogger.warn_recoveredServerTransaction_removeOldStoreEntry(ex);
}
}
@@ -539,9 +426,9 @@
super.objectUid = hdr.getTxId();
_originalProcessUid = hdr.getProcessId();
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_16", new Object[]
- {get_uid(), _originalProcessUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("RecoveredServerTransaction.unpackHeader - txid = " +
+ get_uid() + " and processUid = "+_originalProcessUid);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredTransaction.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredTransaction.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -60,40 +60,6 @@
*
* @author Dave Ingham (dave at arjuna.com)
* @version $Id: RecoveredTransaction.java 2342 2006-03-30 13:06:17Z $
- * @message
- * com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_1
- * [com.arjuna.ats.internal.jts.recovery.transactions.
- * RecoveredTransaction_1] - RecoveredTransaction {0} created
- * @message
- * com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_2
- * [com.arjuna.ats.internal.jts.recovery.transactions.
- * RecoveredTransaction_2] - RecoveredTransaction activate of {0}
- * failed
- * @message
- * com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_3
- * [com.arjuna.ats.internal.jts.recovery.transactions.
- * RecoveredTransaction_3] - RecoveredTransaction activate of {0}
- * failed - {1}
- * @message
- * com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_5
- * [com.arjuna.ats.internal.jts.recovery.transactions.
- * RecoveredTransaction_5] - RecoveredTransaction.replayPhase2 ({0}) -
- * status = {1}
- * @message
- * com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_6
- * [com.arjuna.ats.internal.jts.recovery.transactions.
- * RecoveredTransaction_6] - RecoveredTransaction.replayPhase2 for {0}
- * failed
- * @message
- * com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_7
- * [com.arjuna.ats.internal.jts.recovery.transactions.
- * RecoveredTransaction_7] - RecoveredTransaction.replayPhase2 ({0})
- * finished
- * @message
- * com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_8
- * [com.arjuna.ats.internal.jts.recovery.transactions.
- * RecoveredTransaction_8] - RecoveredTransaction.removeOldStoreEntry -
- * problem
*/
public class RecoveredTransaction extends ArjunaTransactionImple implements
@@ -108,9 +74,8 @@
{
super(actionUid);
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_1", new Object[]
- {get_uid()});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("RecoveredTransaction "+get_uid()+" created");
}
// Don't bother trying to activate a transaction that isn't in
@@ -137,23 +102,14 @@
{
if (activate())
_recoveryStatus = RecoveryStatus.ACTIVATED;
- else
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_2",
- new Object[]
- { actionUid });
+ else {
+ jtsLogger.i18NLogger.warn_recovery_transactions_RecoveredTransaction_2(actionUid);
}
}
}
catch (Exception e)
{
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_3",
- new Object[]
- { actionUid, e }, e);
+ jtsLogger.i18NLogger.warn_recovery_transactions_RecoveredTransaction_3(actionUid, e);
}
_txStatus = Status.StatusUnknown;
@@ -229,9 +185,8 @@
Status theStatus = get_status();
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_5", new Object[]
- {get_uid(), Utility.stringStatus(theStatus)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("RecoveredTransaction.replayPhase2 ("+get_uid()+") - status = "+Utility.stringStatus(theStatus));
}
if ((theStatus == Status.StatusPrepared)
@@ -254,19 +209,13 @@
_txStatus = Status.StatusRolledBack;
}
- else
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_6",
- new Object[]
- { Utility.stringStatus(theStatus) });
+ else {
+ jtsLogger.i18NLogger.warn_recovery_transactions_RecoveredTransaction_6(Utility.stringStatus(theStatus));
_recoveryStatus = RecoveryStatus.REPLAY_FAILED;
}
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_5", new Object[]
- {get_uid()});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("RecoveredTransaction.replayPhase2 ("+get_uid()+") - status = "+Utility.stringStatus(theStatus));
}
}
@@ -326,12 +275,8 @@
{
store().remove_committed(get_uid(), super.type());
}
- catch (ObjectStoreException ex)
- {
- jtsLogger.loggerI18N
- .warn(
- "com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_8",
- ex);
+ catch (ObjectStoreException ex) {
+ jtsLogger.i18NLogger.warn_recovery_transactions_RecoveredTransaction_8(ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/ServerTransactionRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/ServerTransactionRecoveryModule.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/ServerTransactionRecoveryModule.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -55,16 +55,7 @@
/**
* This class is a plug-in module for the recovery manager.
* It is responsible for the recovery of server transactions
- *
- * @message com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_1 [com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_1] - ServerTransactionRecoveryModule created
- * @message com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_3 [com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_3] - ServerTransactionRecoveryModule - First Pass
- * @message com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_4 [com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_4] - ServerTransactionRecoveryModule - Second Pass
- * @message com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_5 [com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_5] - ServerTransactionRecoveryModule - Transaction {0} still in ActionStore
- * @message com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_6 [com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_6] - ServerTransactionRecoveryModule - Transaction {0} still in state unknown (?).
- * @message com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_7 [com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_7] - ServerTransactionRecoveryModule - Transaction {0} is not in object store - assumed completed
- * @message com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_8 [com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_8] - Activated transaction {0} status = {1}
- * @message com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_9 [com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_9] - Transaction {0} still busy
-
+ *
*/
public class ServerTransactionRecoveryModule extends TransactionRecoveryModule
@@ -72,8 +63,8 @@
{
public ServerTransactionRecoveryModule ()
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_1");
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("ServerTransactionRecoveryModule created");
}
if (_transactionType == null)
@@ -85,19 +76,13 @@
*/
public void periodicWorkFirstPass ()
{
- if (jtsLogger.loggerI18N.isInfoEnabled())
- {
- jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_3");
- }
+ jtsLogger.i18NLogger.info_recovery_transactions_ServerTransactionRecoveryModule_3();
super.periodicWorkFirstPass();
}
public void periodicWorkSecondPass ()
{
- if (jtsLogger.loggerI18N.isInfoEnabled())
- {
- jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_4");
- }
+ jtsLogger.i18NLogger.info_recovery_transactions_ServerTransactionRecoveryModule_4();
//super.periodicWorkSecondPass();
@@ -114,21 +99,18 @@
// Is the intentions list still there? Is this the best way to check?
if (_transactionStore.currentState(currentUid, _transactionType) != StateStatus.OS_UNKNOWN)
{
- if (jtsLogger.loggerI18N.isInfoEnabled())
- {
- jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_5", new Object[]{currentUid});
- }
- recoverTransaction(currentUid);
+ jtsLogger.i18NLogger.info_recovery_transactions_ServerTransactionRecoveryModule_5(currentUid);
+ recoverTransaction(currentUid);
} else {
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_6", new Object[]{currentUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("ServerTransactionRecoveryModule - Transaction "+currentUid+" still in state unknown (?).");
}
}
}
catch (ObjectStoreException e4)
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_7", new Object[]{currentUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("ServerTransactionRecoveryModule - Transaction "+currentUid+" is not in object store - assumed completed");
}
}
}
@@ -159,14 +141,14 @@
currentStatus = cachedRecoveredTransaction.get_status();
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_8", new Object[]{tranUid, Utility.stringStatus(currentStatus)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("Activated transaction "+tranUid+" status = "+Utility.stringStatus(currentStatus));
}
// but first check that the original transaction isn't in mid-flight
if ( cachedRecoveredTransaction.originalBusy() && (currentStatus != Status.StatusPrepared) )
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_9", new Object[]{tranUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("Transaction "+tranUid+" still busy");
}
return;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TopLevelTransactionRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TopLevelTransactionRecoveryModule.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TopLevelTransactionRecoveryModule.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -46,11 +46,6 @@
* This class is a plug-in module for the recovery manager.
* It is responsible for the recovery of server transactions
*
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_1 [com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_1] - TopLevelTransactionRecoveryModule created
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_2 [com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_2] - TopLevelTransactionRecoveryModule destoryed
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_3 [com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_3] - TopLevelTransactionRecoveryModule First Pass
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_4 [com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_4] - TopLevelTransactionRecoveryModule Second Pass
- *
*/
public class TopLevelTransactionRecoveryModule extends TransactionRecoveryModule
@@ -58,8 +53,8 @@
{
public TopLevelTransactionRecoveryModule ()
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_1");
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("TopLevelTransactionRecoveryModule created");
}
// Set the transaction type that this module wants to recover
@@ -70,8 +65,8 @@
public void finalize () throws Throwable
{
super.finalize();
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_2");
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("TopLevelTransactionRecoveryModule destoryed");
}
}
@@ -80,19 +75,13 @@
*/
public void periodicWorkFirstPass ()
{
- if (jtsLogger.loggerI18N.isInfoEnabled())
- {
- jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_3");
- }
+ jtsLogger.i18NLogger.info_recovery_transactions_TopLevelTransactionRecoveryModule_3();
super.periodicWorkFirstPass();
}
public void periodicWorkSecondPass ()
{
- if (jtsLogger.loggerI18N.isInfoEnabled())
- {
- jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_4");
- }
+ jtsLogger.i18NLogger.info_recovery_transactions_TopLevelTransactionRecoveryModule_4();
super.periodicWorkSecondPass();
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionCache.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionCache.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionCache.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -58,14 +58,6 @@
* @see CachedRecoveredTransaction
* @see RecoveredTransaction
*
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_1 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_1] - asking the tran for original status
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_2 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_2] - no transaction in cache so not asking for original status
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_3 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_3] - Transaction {0} assumed complete - changing type.
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_4 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_4] - Transaction {0} assumed complete - will not poll any more
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_5 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_5] - Transaction {0} recovery completed
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_6 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_6] - TransactionCache.remove {0}: transaction not in cache
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_7 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_7] - TransactionCache.remove {0}: removed transaction from cache
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_8 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_8] - Non-integer value for property {0}
*/
public class TransactionCache
@@ -130,13 +122,13 @@
RecoveringTransaction theTransaction = cacheItem.freshTransaction();
if (theTransaction != null)
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_1");
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("asking the tran for original status");
}
theStatus = theTransaction.getOriginalStatus();
} else {
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_2");
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("no transaction in cache so not asking for original status");
}
}
}
@@ -233,8 +225,8 @@
int previousAttempts = cacheItem.countAttempts();
if (previousAttempts >= attemptsBeforeConversion) {
converting = theTransaction.assumeComplete();
- if (converting && (jtsLogger.loggerI18N.isDebugEnabled())) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_3", new Object[]{actionUid});
+ if (converting && (jtsLogger.logger.isDebugEnabled())) {
+ jtsLogger.logger.debug(" Transaction "+actionUid+" assumed complete - changing type.");
}
}
}
@@ -252,10 +244,7 @@
fullyCompleted = theTransaction.allCompleted(); // only remove if committed?
if (converting && !fullyCompleted) {
- if (jtsLogger.loggerI18N.isInfoEnabled())
- {
- jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_4", new Object[]{actionUid});
- }
+ jtsLogger.i18NLogger.info_recovery_transactions_TransactionCache_4(actionUid);
theTransaction.removeOldStoreEntry();
cacheItem.updateType();
}
@@ -269,10 +258,7 @@
*/
if (fullyCompleted) {
- if (jtsLogger.loggerI18N.isInfoEnabled())
- {
- jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_5", new Object[]{actionUid});
- }
+ jtsLogger.i18NLogger.info_recovery_transactions_TransactionCache_5(actionUid);
remove(actionUid);
@@ -312,8 +298,8 @@
if (cacheItem == null)
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_6", new Object[]{theUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("TransactionCache.remove "+theUid+": transaction not in cache");
}
}
else
@@ -323,8 +309,8 @@
_theCache.remove(theUid);
}
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_7", new Object[]{theUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("TransactionCache.remove "+theUid+": removed transaction from cache");
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionCacheItem.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionCacheItem.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionCacheItem.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -49,8 +49,6 @@
* method of TransactionCache.
* (handles the creation of different kinds of transaction).
*
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionCacheItem_1 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionCacheItem_1] - Transaction {0} previously assumed complete
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionCacheItem_2 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionCacheItem_2] - TransactionCacheItem.loadTransaction - unknown type: {0}
*/
class TransactionCacheItem
{
@@ -85,8 +83,8 @@
// perhaps it was previously assumed complete
RecoveringTransaction assumed = new AssumedCompleteTransaction(_uid);
if ( assumed.getRecoveryStatus() != RecoveryStatus.ACTIVATE_FAILED ) {
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCacheItem_1, new Object[]{_uid}");
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("Transaction "+_uid+" previously assumed complete");
}
_transaction = assumed;
_type = _transaction.type();
@@ -101,8 +99,8 @@
// perhaps it was previously assumed complete
RecoveringTransaction assumed = new AssumedCompleteServerTransaction(_uid);
if ( assumed.getRecoveryStatus() != RecoveryStatus.ACTIVATE_FAILED ) {
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCacheItem_1, new Object[]{_uid}");
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("Transaction "+_uid+" previously assumed complete");
}
_transaction = assumed;
_type = _transaction.type();
@@ -117,12 +115,11 @@
{
_transaction = new AssumedCompleteServerTransaction(_uid);
}
- else
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCacheItem_2", new Object[]{_type});
- _transaction = null;
- return false;
- }
+ else {
+ jtsLogger.i18NLogger.warn_recovery_transactions_TransactionCacheItem_2(_type);
+ _transaction = null;
+ return false;
+ }
return true;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionRecoveryModule.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionRecoveryModule.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -45,8 +45,6 @@
import com.arjuna.ats.jts.logging.jtsLogger;
-import com.arjuna.common.util.logging.*;
-
/**
* This class is a plug-in module for the recovery manager. This is a
* generic class from which TopLevel and Server transaction recovery
@@ -55,25 +53,13 @@
* This class does not implement {@link com.arjuna.CosRecovery.RecoveryModule}
* (the plug-in definition) itself - this is left to the subclass.
*
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_1 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_1] - TransactionRecoveryModule created
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_2 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_2] - TransactionRecoveryModule: transaction type not set
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_3 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_3] - TransactionRecoveryModule: scanning for {0}
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_4 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_4] - TransactionRecoveryModule: Object store exception:
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_5 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_5] - found transaction {0}
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_6 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_6] - Transaction {0} still in ActionStore
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_7 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_7] - Transaction {0} in state unknown (?).
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_8 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_8] - Transaction {0} is not in object store - assumed completed
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_9 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_9] - Activated transaction {0} status = {1}
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_10 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_10] - Transaction {0} still busy
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_11 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_11] - TransactionRecoveryModule.periodicWorkFirstPass()
- * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_12 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_12] - TransactionRecoveryModule.periodicWorkSecondPass()
*/
public abstract class TransactionRecoveryModule
{
public TransactionRecoveryModule ()
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_1");
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("TransactionRecoveryModule created");
}
if (_transactionStore == null)
@@ -87,16 +73,12 @@
*/
protected void periodicWorkFirstPass ()
{
- if (jtsLogger.loggerI18N.isInfoEnabled())
- {
- jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_11");
- }
+ jtsLogger.i18NLogger.info_recovery_transactions_TransactionRecoveryModule_11();
// Sanity check - make sure we know what type of transaction we're looking for
- if (_transactionType == null)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_2");
- return;
- }
+ if (_transactionType == null) {
+ jtsLogger.i18NLogger.warn_recovery_transactions_TransactionRecoveryModule_2();
+ return;
+ }
// Build a Vector of transaction Uids found in the ObjectStore
_transactionUidVector = new Vector();
@@ -106,15 +88,15 @@
try
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_3", new Object[]{_transactionType});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("TransactionRecoveryModule: scanning for "+_transactionType);
}
anyTransactions = _transactionStore.allObjUids(_transactionType, uids);
}
catch (ObjectStoreException e1)
{
- jtsLogger.loggerI18N.warn("om.hp.mwlabs.ts.jts.recovery.transactions.TransactionRecoveryModule_4", e1);
+ jtsLogger.i18NLogger.warn_recovery_transactions_TransactionRecoveryModule_4(e1);
}
if (anyTransactions)
@@ -137,8 +119,8 @@
{
Uid newUid = new Uid (theUid);
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_5", new Object[]{newUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("found transaction "+newUid);
}
_transactionUidVector.addElement(newUid);
}
@@ -160,10 +142,7 @@
protected void periodicWorkSecondPass ()
{
- if (jtsLogger.loggerI18N.isInfoEnabled())
- {
- jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_12");
- }
+ jtsLogger.i18NLogger.info_recovery_transactions_TransactionRecoveryModule_12();
// Process the Vector of transaction Uids
Enumeration transactionUidEnum = _transactionUidVector.elements();
@@ -176,16 +155,13 @@
// Is the intentions list still there? Is this the best way to check?
if (_transactionStore.currentState(currentUid, _transactionType) != StateStatus.OS_UNKNOWN)
{
- if (jtsLogger.loggerI18N.isInfoEnabled())
- {
- jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_6", new Object[]{currentUid});
- }
+ jtsLogger.i18NLogger.info_recovery_transactions_TransactionRecoveryModule_6(currentUid);
recoverTransaction(currentUid);
} else {
// Transaction has gone away - probably completed normally
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_7", new Object[]{currentUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("Transaction "+currentUid+" in state unknown (?)");
}
}
}
@@ -193,8 +169,8 @@
{
// Transaction has gone away - probably completed normally
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_8", new Object[]{currentUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("Transaction "+currentUid+" is not in object store - assumed completed");
}
}
}
@@ -224,15 +200,15 @@
currentStatus = cachedRecoveredTransaction.get_status();
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_9", new Object[]{tranUid, Utility.stringStatus(currentStatus)});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("Activated transaction "+tranUid+" status = "+Utility.stringStatus(currentStatus));
}
// but first check that the original transaction isn't in mid-flight
if ( cachedRecoveredTransaction.originalBusy() )
{
- if (jtsLogger.loggerI18N.isDebugEnabled()) {
- jtsLogger.loggerI18N.debug("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_10", new Object[]{tranUid});
+ if (jtsLogger.logger.isDebugEnabled()) {
+ jtsLogger.logger.debug("Transaction "+tranUid+" still busy");
}
return;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecord.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecord.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -85,9 +85,6 @@
* @author Mark Little (mark at arjuna.com)
* @version $Id: ExtendedResourceRecord.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.0.
- *
- * @message com.arjuna.ats.internal.jts.resources.errgenerr {0} caught exception: {1}
- * @message com.arjuna.ats.internal.jts.resources.noparent {0} has no parent transaction!
*/
public class ExtendedResourceRecord extends
@@ -250,11 +247,6 @@
return toReturn;
}
- /**
- * @message com.arjuna.ats.internal.jts.resources.errtypefail {0} failed.
- * Returning default value: {1}
- */
-
public int typeIs ()
{
OTSAbstractRecord resHandle = otsRecord();
@@ -267,18 +259,13 @@
if ((resHandle != null) && !_endpointFailed)
_cachedType = r = resHandle.type_id();
}
- catch (Exception e)
- {
- r = RecordType.OTS_ABSTRACTRECORD;
+ catch (Exception e) {
+ r = RecordType.OTS_ABSTRACTRECORD;
- _endpointFailed = true;
+ _endpointFailed = true;
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errtypefail", new Object[]
- { "ExtendedResourceRecord.typeIs", new Integer(r) });
- }
- }
+ jtsLogger.i18NLogger.warn_resources_errtypefail("ExtendedResourceRecord.typeIs", Integer.toString(r));
+ }
}
else
r = _cachedType;
@@ -293,19 +280,10 @@
return _resourceHandle;
}
- /**
- * @message com.arjuna.ats.internal.jts.resources.errsetvalue {0} called
- * illegally!
- */
-
public void setValue (Object o)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errsetvalue", new Object[]
- { "ExtendedResourceRecord.set_value" });
- }
- }
+ {
+ jtsLogger.i18NLogger.warn_resources_errsetvalue("ExtendedResourceRecord.set_value");
+ }
/**
* General nesting rules:
@@ -345,25 +323,15 @@
else
return TwoPhaseOutcome.FINISH_ERROR;
}
- catch (SystemException ex)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[]
- { "ExtendedResourceRecord.nestedAbort", ex });
- }
-
- return TwoPhaseOutcome.FINISH_ERROR;
- }
+ catch (SystemException ex) {
+ jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.nestedAbort", ex);
+ return TwoPhaseOutcome.FINISH_ERROR;
+ }
+
return TwoPhaseOutcome.FINISH_OK;
}
- /**
- * @message com.arjuna.ats.internal.jts.resources.errnoparent {0} - no
- * parent!
- */
-
public int nestedCommit ()
{
if (jtsLogger.logger.isDebugEnabled())
@@ -404,41 +372,24 @@
o = TwoPhaseOutcome.FINISH_OK;
}
- else
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errnoparent", new Object[]
- { "ExtendedResourceRecord.nestedCommit" });
- }
+ else {
+ jtsLogger.i18NLogger.warn_resources_errnoparent("ExtendedResourceRecord.nestedCommit");
- o = TwoPhaseOutcome.FINISH_ERROR;
- }
+ o = TwoPhaseOutcome.FINISH_ERROR;
+ }
}
- else
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.noparent", new Object[]
- { get_uid() });
- }
-
- o = TwoPhaseOutcome.FINISH_ERROR;
- }
+ else {
+ jtsLogger.i18NLogger.warn_resources_noparent(get_uid());
+
+ o = TwoPhaseOutcome.FINISH_ERROR;
+ }
}
- catch (Exception e)
- {
- e.printStackTrace();
-
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[]
- { "ExtendedResourceRecord.nestedCommit", e });
- }
-
- o = TwoPhaseOutcome.FINISH_ERROR;
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.nestedCommit", e);
+ o = TwoPhaseOutcome.FINISH_ERROR;
+ }
+
return o;
}
@@ -472,17 +423,12 @@
break;
}
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[]
- { "ExtendedResourceRecord.nestedPrepare", e });
- }
-
- o = TwoPhaseOutcome.PREPARE_NOTOK;
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.nestedPrepare", e);
+ o = TwoPhaseOutcome.PREPARE_NOTOK;
+ }
+
return o;
}
@@ -532,16 +478,11 @@
else
return TwoPhaseOutcome.HEURISTIC_HAZARD;
}
- catch (SystemException e4)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[]
- { "ExtendedResourceRecord.topLevelAbort", e4 });
- }
+ catch (SystemException e4) {
+ jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.topLevelAbort", e4);
- return TwoPhaseOutcome.FINISH_ERROR;
- }
+ return TwoPhaseOutcome.FINISH_ERROR;
+ }
return TwoPhaseOutcome.FINISH_OK;
}
@@ -578,17 +519,12 @@
{
return TwoPhaseOutcome.HEURISTIC_HAZARD;
}
- catch (SystemException e5)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[]
- { "ExtendedResourceRecord.topLevelCommit", e5 });
- }
-
- return TwoPhaseOutcome.FINISH_ERROR;
- }
+ catch (SystemException e5) {
+ jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.topLevelCommit", e5);
+ return TwoPhaseOutcome.FINISH_ERROR;
+ }
+
return TwoPhaseOutcome.FINISH_OK;
}
@@ -626,17 +562,12 @@
{
return TwoPhaseOutcome.HEURISTIC_HAZARD;
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[]
- { "ExtendedResourceRecord.topLevelPrepare", e });
- }
-
- return TwoPhaseOutcome.PREPARE_NOTOK;
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.topLevelPrepare", e);
+ return TwoPhaseOutcome.PREPARE_NOTOK;
+ }
+
return TwoPhaseOutcome.PREPARE_NOTOK;
}
@@ -685,31 +616,21 @@
return TwoPhaseOutcome.FINISH_ERROR;
}
- catch (Exception e5)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[]
- { "ExtendedResourceRecord.topLevelOnePhaseCommit", e5 });
- }
-
- e5.printStackTrace();
-
- /*
- * Unknown error - better assume heuristic!
- */
+ catch (Exception e5) {
+ jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.topLevelOnePhaseCommit", e5);
- return TwoPhaseOutcome.HEURISTIC_HAZARD;
- }
+ e5.printStackTrace();
+ /*
+ * Unknown error - better assume heuristic!
+ */
+
+ return TwoPhaseOutcome.HEURISTIC_HAZARD;
+ }
+
return TwoPhaseOutcome.FINISH_OK;
}
- /**
- * @message com.arjuna.ats.internal.jts.resources.errnores {0} called
- * without a resource reference!
- */
-
public boolean forgetHeuristic ()
{
try
@@ -719,23 +640,13 @@
_resourceHandle.forget();
return true;
}
- else
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errnores", new Object[]
- { "ExtendedResourceRecord.forgetHeuristic" });
- }
- }
+ else {
+ jtsLogger.i18NLogger.warn_resources_errnores("ExtendedResourceRecord.forgetHeuristic");
+ }
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[]
- { "ExtendedResourceRecord.forgetHeuristic", e });
- }
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.forgetHeuristic", e);
+ }
return false;
}
@@ -936,10 +847,6 @@
return "/StateManager/AbstractRecord/ExtendedResourceRecord";
}
- /**
- * @message com.arjuna.ats.internal.jts.resources.errsavefail {0} failed.
- * Returning default value: {1}
- */
public boolean doSave ()
{
@@ -966,18 +873,13 @@
if ((resHandle != null) && !_endpointFailed)
save = resHandle.saveRecord();
}
- catch (Exception e)
- {
- save = true; // just to be on the safe side!
+ catch (Exception e) {
+ save = true; // just to be on the safe side!
- _endpointFailed = true;
+ _endpointFailed = true;
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errsavefail", new Object[]
- { "ExtendedResourceRecord.doSave", new Boolean(save) });
- }
- }
+ jtsLogger.i18NLogger.warn_resources_errsavefail("ExtendedResourceRecord.doSave", Boolean.toString(save));
+ }
resHandle = null;
@@ -1008,14 +910,9 @@
catch (OBJECT_NOT_EXIST ex)
{
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[]
- { "ExtendedResourceRecord.merge", e });
- }
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.merge", e);
+ }
rec = null;
}
@@ -1041,14 +938,9 @@
catch (OBJECT_NOT_EXIST ex)
{
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[]
- { "ExtendedResourceRecord.alter", e });
- }
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.alter", e);
+ }
rec = null;
}
@@ -1075,16 +967,11 @@
catch (OBJECT_NOT_EXIST ex)
{
}
- catch (Exception e)
- {
- _endpointFailed = true;
+ catch (Exception e) {
+ _endpointFailed = true;
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[]
- { "ExtendedResourceRecord.shouldAdd", e });
- }
- }
+ jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.shouldAdd", e);
+ }
rec = null;
}
@@ -1113,16 +1000,11 @@
catch (OBJECT_NOT_EXIST ex)
{
}
- catch (Exception e)
- {
- _endpointFailed = true;
+ catch (Exception e) {
+ _endpointFailed = true;
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[]
- { "ExtendedResourceRecord.shouldAlter", e });
- }
- }
+ jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.shouldAlter", e);
+ }
rec = null;
}
@@ -1151,16 +1033,11 @@
catch (OBJECT_NOT_EXIST ex)
{
}
- catch (Exception e)
- {
- _endpointFailed = true;
+ catch (Exception e) {
+ _endpointFailed = true;
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[]
- { "ExtendedResourceRecord.shouldMerge", e });
- }
- }
+ jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.shouldMerge", e);
+ }
rec = null;
}
@@ -1189,16 +1066,11 @@
catch (OBJECT_NOT_EXIST ex)
{
}
- catch (Exception e)
- {
- _endpointFailed = true;
+ catch (Exception e) {
+ _endpointFailed = true;
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[]
- { "ExtendedResourceRecord.shouldReplace", e });
- }
- }
+ jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.shouldReplace", e);
+ }
rec = null;
}
@@ -1276,14 +1148,9 @@
theResource = null;
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[]
- { "ExtendedResourceRecord.otsRecord", e });
- }
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.otsRecord", e);
+ }
}
return resHandle;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ResourceRecord.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ResourceRecord.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -113,8 +113,6 @@
* @author Mark Little (mark at arjuna.com)
* @version $Id: ResourceRecord.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.0.
- *
- * @message com.arjuna.ats.internal.jts.resources.rrcaught {0} caught exception: {1}
*/
public class ResourceRecord extends com.arjuna.ats.arjuna.coordinator.AbstractRecord
@@ -224,17 +222,9 @@
return _resourceHandle;
}
- /**
- * @message com.arjuna.ats.internal.jts.resources.rrillegalvalue {0} called illegally.
- */
-
public void setValue (Object o)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.rrillegalvalue",
- new Object[] {"ResourceRecord.set_value"} );
- }
+ jtsLogger.i18NLogger.warn_resources_rrillegalvalue("ResourceRecord.set_value");
}
/**
@@ -437,16 +427,11 @@
else
return TwoPhaseOutcome.HEURISTIC_HAZARD;
}
- catch (SystemException ex3)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.rrcaught",
- new Object[] {"ResourceRecord.topLevelAbort", ex3} );
- }
-
- return TwoPhaseOutcome.FINISH_ERROR;
- }
+ catch (SystemException ex3) {
+ jtsLogger.i18NLogger.warn_resources_rrcaught("ResourceRecord.topLevelAbort", ex3);
+
+ return TwoPhaseOutcome.FINISH_ERROR;
+ }
return TwoPhaseOutcome.FINISH_OK;
}
@@ -483,16 +468,11 @@
{
return TwoPhaseOutcome.HEURISTIC_HAZARD;
}
- catch (SystemException ex5)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.rrcaught",
- new Object[] {"ResourceRecord commit -", ex5} );
- }
+ catch (SystemException ex5) {
+ jtsLogger.i18NLogger.warn_resources_rrcaught("ResourceRecord commit -", ex5);
- return TwoPhaseOutcome.FINISH_ERROR;
- }
+ return TwoPhaseOutcome.FINISH_ERROR;
+ }
return TwoPhaseOutcome.FINISH_OK;
}
@@ -585,10 +565,6 @@
return TwoPhaseOutcome.FINISH_OK;
}
- /**
- * @message com.arjuna.ats.internal.jts.resources.rrinvalid {0} called without a resource!
- */
-
public boolean forgetHeuristic ()
{
try
@@ -599,23 +575,13 @@
return true;
}
- else
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.rrinvalid",
- new Object[] {"ResourceRecord.forgetHeuristic"} );
- }
- }
+ else {
+ jtsLogger.i18NLogger.warn_resources_rrinvalid("ResourceRecord.forgetHeuristic");
+ }
}
- catch (SystemException e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.resources.rrcaught",
- new Object[] {"ResourceRecord.forgetHeuristic", e} );
- }
- }
+ catch (SystemException e) {
+ jtsLogger.i18NLogger.warn_resources_rrcaught("ResourceRecord.forgetHeuristic", e);
+ }
return false;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/ExplicitInterposition.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/ExplicitInterposition.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/ExplicitInterposition.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -58,8 +58,6 @@
* @author Mark Little (mark_little at hp.com)
* @version $Id: ExplicitInterposition.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.0.
- *
- * @message com.arjuna.ats.jts.excalledagain {0} called multiple times.
*/
public class ExplicitInterposition
@@ -138,11 +136,6 @@
registerTransaction(ctx);
}
- /**
- * @message com.arjuna.ats.jts.exunregfail {0} - could not unregister from
- * transaction!
- */
-
public void finalize ()
{
if (jtsLogger.logger.isDebugEnabled()) {
@@ -157,11 +150,7 @@
}
catch (Exception e)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.exunregfail", new Object[]
- { "ExplicitInterposition.finalize" });
- }
+ jtsLogger.i18NLogger.warn_exunregfail("ExplicitInterposition.finalize");
}
}
}
@@ -179,11 +168,7 @@
if (_inUse)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.excalledagain", new Object[]
- { "ExplicitInterposition.unregisterTransaction" });
- }
+ jtsLogger.i18NLogger.warn_excalledagain("ExplicitInterposition.unregisterTransaction");
throw new InterpositionFailed();
}
@@ -309,11 +294,6 @@
}
}
- /**
- * @message com.arjuna.ats.jts.eicaughtexception {0} caught unexpected
- * exception: {1}
- */
-
private final synchronized void registerTransaction (PropagationContext ctx)
throws InterpositionFailed, SystemException
{
@@ -323,11 +303,7 @@
if (_inUse)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.excalledagain", new Object[]
- { "ExplicitInterposition.registerTransaction" });
- }
+ jtsLogger.i18NLogger.warn_excalledagain("ExplicitInterposition.registerTransaction");
throw new InterpositionFailed();
}
@@ -375,11 +351,7 @@
}
catch (Exception e)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.eicaughtexception", new Object[]
- { "ExplicitInterposition.registerTransaction(PropagationContext)", e });
- }
+ jtsLogger.i18NLogger.warn_eicaughtexception("ExplicitInterposition.registerTransaction(PropagationContext)", e);
throw new InterpositionFailed();
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/AtomicTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/AtomicTransaction.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/AtomicTransaction.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -94,17 +94,6 @@
_timeout = get_timeout();
}
- /**
- * @message com.arjuna.ats.jts.extensions.atscope {0} - running atomic
- * transaction going out of scope. Will roll back. {1}
- * @message com.arjuna.ats.jts.extensions.namefail Cannot determine
- * transaction name!
- * @message com.arjuna.ats.jts.extensions.abortfailnoexist Could not
- * rollback transaction {0} as it does not exist!
- * @message com.arjuna.ats.jts.extensions.abortfail Could not rollback
- * transaction {0}
- */
-
public void finalize ()
{
if (jtsLogger.logger.isDebugEnabled()) {
@@ -113,57 +102,33 @@
if (_theAction != null)
{
- if (getStatus() == Status.StatusActive)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.extensions.atscope", new Object[]
- { "AtomicTransaction.finalize", get_uid().toString() });
- }
+ if (getStatus() == Status.StatusActive) {
+ jtsLogger.i18NLogger.warn_extensions_atscope("AtomicTransaction.finalize", get_uid());
- String name = null;
+ String name = null;
- try
- {
- name = get_transaction_name();
- }
- catch (SystemException ex)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.extensions.namefail");
- }
- }
+ try {
+ name = get_transaction_name();
+ }
+ catch (SystemException ex) {
+ jtsLogger.i18NLogger.warn_extensions_namefail(ex);
+ }
- try
- {
- rollback(); // tidies up for us.
- }
- catch (NoTransaction e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.extensions.abortfailnoexist", new Object[]
- { name });
- }
- }
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.extensions.abortfail", new Object[]
- { name });
- }
- }
- }
+ try {
+ rollback(); // tidies up for us.
+ }
+ catch (NoTransaction e) {
+ jtsLogger.i18NLogger.warn_extensions_abortfailnoexist(name);
+ }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_extensions_abortfail(name);
+ }
+ }
}
}
/**
* @return the transaction name. Should only be used for debugging purposes.
- *
- * @message com.arjuna.ats.jts.extensions.atunavailable {0} - transaction
- * unavailable.
*/
public String get_transaction_name () throws SystemException
@@ -180,11 +145,7 @@
}
catch (SystemException e)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.extensions.atunavailable", new Object[]
- { "AtomicTransaction.get_transaction_name" });
- }
+ jtsLogger.i18NLogger.warn_extensions_atunavailable("AtomicTransaction.get_transaction_name");
throw e;
}
@@ -789,18 +750,6 @@
* a transaction!
*
* If not valid then abort this transaction here. Leave current alone.
- *
- * @message com.arjuna.ats.jts.extensions.atnovalidtx {0} - no transaction!
- * @message com.arjuna.ats.jts.extensions.atcurrenttxnull {0} - current
- * transaction is null!
- * @message com.arjuna.ats.jts.extensions.atoutofseq {0} - terminated out of
- * sequence {1}
- * @message com.arjuna.ats.jts.extensions.atwillabort Will roll back.
- * Current transaction is {0}
- * @message com.arjuna.ats.jts.extensions.atcannotabort {0} - cannot
- * rollback {1}
- * @message com.arjuna.ats.jts.extensions.atgenerror {0} caught unexpected
- * exception {1}
*/
protected final boolean validTransaction ()
@@ -823,11 +772,7 @@
if (currentTransaction == null)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.extensions.atnovalidtx", new Object[]
- { "AtomicTransaction.validTransaction" });
- }
+ jtsLogger.i18NLogger.warn_extensions_atnovalidtx("AtomicTransaction.validTransaction");
return false;
}
@@ -839,36 +784,22 @@
String transactionName = get_transaction_name();
String currentTransactionName = currentTransaction.get_transaction_name();
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.extensions.atoutofseq", new Object[]
- { "AtomicTransaction", transactionName });
+ jtsLogger.i18NLogger.warn_extensions_atoutofseq("AtomicTransaction", transactionName);
+ jtsLogger.i18NLogger.warn_extensions_atwillabort(currentTransactionName);
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.extensions.atwillabort", new Object[]
- { currentTransactionName });
- }
-
try
{
_theAction.rollback();
}
catch (Exception ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.extensions.atcannotabort", new Object[]
- { "AtomicTransaction", transactionName });
- }
+ jtsLogger.i18NLogger.warn_extensions_atcannotabort("AtomicTransaction", transactionName);
}
}
}
catch (Exception e)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.extensions.atgenerror", new Object[]
- { "AtomicTransaction", e });
- }
+ jtsLogger.i18NLogger.warn_extensions_atgenerror("AtomicTransaction", e );
}
return valid;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/ThreadAssociations.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/ThreadAssociations.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/ThreadAssociations.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -53,7 +53,6 @@
* @version $Id: ThreadAssociations.java 2342 2006-03-30 13:06:17Z $
* @since JTS 2.0.
*
- * @message com.arjuna.ats.jts.extensions.threadasserror {0} caught exception {1}
*/
public class ThreadAssociations
@@ -176,11 +175,7 @@
}
catch (SystemException e)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.extensions.threadasserror",
- new Object[] {"ThreadAssociations.updateAssociations", e} );
- }
+ jtsLogger.i18NLogger.warn_extensions_threadasserror("ThreadAssociations.updateAssociations", e);
}
}
}
@@ -203,11 +198,7 @@
}
catch (SystemException e)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.extensions.threadasserror",
- new Object[] {"ThreadAssociations.updateAssociations", e} );
- }
+ jtsLogger.i18NLogger.warn_extensions_threadasserror("ThreadAssociations.updateAssociations", e);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/TopLevelTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/TopLevelTransaction.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/TopLevelTransaction.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -71,10 +71,6 @@
_originalTransaction = null;
}
- /**
- * @message com.arjuna.ats.jts.extensions.tltnestedscope Top-level transaction going out of scope with nested transaction {0} still set.
- */
-
public void finalize ()
{
if (jtsLogger.logger.isDebugEnabled()) {
@@ -101,11 +97,7 @@
coord = null;
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.extensions.tltnestedscope",
- new Object[] {((name != null) ? name : "UNKNOWN") } );
- }
+ jtsLogger.i18NLogger.warn_extensions_tltnestedscope(((name != null) ? name : "UNKNOWN"));
name = null;
_originalTransaction = null;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLogger.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLogger.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -20,6 +20,7 @@
*/
package com.arjuna.ats.jts.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.*;
@@ -39,1010 +40,1010 @@
Allocate new messages by following instructions at the bottom of the file.
*/
- @Message(id = 22001, value = "ExpiredAssumedCompleteScanner created, with expiry time of {0} seconds", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_arjuna_recovery_ExpiredAssumedCompleteScanner_1(String arg0);
+// @Message(id = 22001, value = "ExpiredAssumedCompleteScanner created, with expiry time of {0} seconds", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_arjuna_recovery_ExpiredAssumedCompleteScanner_1(String arg0);
- @Message(id = 22002, value = "ExpiredAssumedCompleteScanner - scanning to remove items from before {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_arjuna_recovery_ExpiredAssumedCompleteScanner_2(String arg0);
+// @Message(id = 22002, value = "ExpiredAssumedCompleteScanner - scanning to remove items from before {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_arjuna_recovery_ExpiredAssumedCompleteScanner_2(String arg0);
@Message(id = 22003, value = "Removing old assumed complete transaction {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_arjuna_recovery_ExpiredAssumedCompleteScanner_3(String arg0);
+ @LogMessage(level = INFO)
+ public void info_arjuna_recovery_ExpiredAssumedCompleteScanner_3(Uid arg0);
- @Message(id = 22004, value = "Expiry scan interval set to {0} seconds", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_arjuna_recovery_ExpiredAssumedCompleteScanner_4(String arg0);
+// @Message(id = 22004, value = "Expiry scan interval set to {0} seconds", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_arjuna_recovery_ExpiredAssumedCompleteScanner_4(String arg0);
- @Message(id = 22005, value = "{0} has inappropriate value ({1})", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_com_arjuna_ats_internal_arjuna_recovery_ExpiredAssumedCompleteScanner_5(String arg0, String arg1);
+// @Message(id = 22005, value = "{0} has inappropriate value ({1})", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_arjuna_recovery_ExpiredAssumedCompleteScanner_5(String arg0, String arg1);
@Message(id = 22006, value = "The ORB has not been initialized yet", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_ORBManager();
+ @LogMessage(level = FATAL)
+ public void fatal_ORBManager();
- @Message(id = 22007, value = "{0} expected a Coordinator reference and did not get one: {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_context_coorref(String arg0, String arg1);
+// @Message(id = 22007, value = "{0} expected a Coordinator reference and did not get one: {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_context_coorref(String arg0, String arg1);
- @Message(id = 22008, value = "{0} caught exception: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22008, value = "{0} caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_context_genfail(String arg0, String arg1);
+ public void warn_context_genfail(String arg0, Throwable arg1);
@Message(id = 22009, value = "{0} does not support ORB: {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_context_orbnotsupported(String arg0, String arg1);
+ public void warn_context_orbnotsupported(String arg0, String arg1);
@Message(id = 22010, value = "Failed when getting a reference to PICurrent.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_context_picreffail();
+ public String get_context_picreffail();
- @Message(id = 22011, value = "Failed to cancel transaction:", format = MESSAGE_FORMAT)
+ @Message(id = 22011, value = "Failed to cancel transaction", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_cwabort();
+ public void warn_cwabort(Throwable arg0);
- @Message(id = 22012, value = "Failed to mark transaction as rollback only:", format = MESSAGE_FORMAT)
+ @Message(id = 22012, value = "Failed to mark transaction as rollback only", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_cwcommit();
+ public void warn_cwcommit(Throwable arg0);
- @Message(id = 22013, value = "Failed to cancel transaction:", format = MESSAGE_FORMAT)
+ @Message(id = 22013, value = "Failed to cancel transaction", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_interposition_cwabort();
+ public void warn_interposition_cwabort(Throwable arg0);
@Message(id = 22014, value = "{0} - default already set!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_interposition_fldefault(String arg0);
+ public void warn_interposition_fldefault(String arg0);
@Message(id = 22015, value = "{0} - could not find {1} to remove.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_interposition_resources_arjuna_ipfail(String arg0, String arg1);
+ public void warn_interposition_resources_arjuna_ipfail(String arg0, Uid arg1);
@Message(id = 22016, value = "Nested transactions not identical.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_interposition_resources_arjuna_ipnt();
+ public void warn_interposition_resources_arjuna_ipnt();
@Message(id = 22017, value = "Interposed hierarchy is null!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_interposition_resources_arjuna_ipnull();
+ public void warn_interposition_resources_arjuna_ipnull();
@Message(id = 22018, value = "TopLevel transactions not identical: {0} {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_interposition_resources_arjuna_iptl(String arg0, String arg1);
+ public void warn_interposition_resources_arjuna_iptl(Uid arg0, Uid arg1);
@Message(id = 22019, value = "{0} - error, no child found!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_interposition_resources_arjuna_nochild(String arg0);
+ public void warn_interposition_resources_arjuna_nochild(String arg0);
@Message(id = 22020, value = "{0} - not my child!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_interposition_resources_arjuna_notchild(String arg0);
+ public void warn_interposition_resources_arjuna_notchild(String arg0);
@Message(id = 22021, value = "hierarchy: {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_interposition_resources_arjuna_problemhierarchy(String arg0);
+ public void warn_interposition_resources_arjuna_problemhierarchy(String arg0);
- @Message(id = 22022, value = "{0} for transaction {1} caught {2}", format = MESSAGE_FORMAT)
+ @Message(id = 22022, value = "{0} for transaction {1} caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_interposition_sfcaught(String arg0, String arg1, String arg2);
+ public void warn_interposition_sfcaught(String arg0, Uid arg1, Throwable arg2);
@Message(id = 22023, value = "{0} - no parent transaction given!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_interposition_sfnoparent(String arg0);
+ public void warn_interposition_sfnoparent(String arg0);
- @Message(id = 22024, value = "{0} caught exception: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22024, value = "{0} caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_coordinator_generror(String arg0, String arg1);
+ public void warn_orbspecific_coordinator_generror(String arg0, Throwable arg1);
- @Message(id = 22025, value = "{0} attempt to mark transaction {1} as rollback only threw: {2}", format = MESSAGE_FORMAT)
+ @Message(id = 22025, value = "{0} attempt to mark transaction {1} as rollback only threw exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_coordinator_rbofail(String arg0, String arg1, String arg2);
+ public void warn_orbspecific_coordinator_rbofail(String arg0, Uid arg1, Throwable arg2);
- @Message(id = 22026, value = "Creation of RecoveryCoordinator for {0} threw: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22026, value = "Creation of RecoveryCoordinator for {0} threw exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_coordinator_rccreate(String arg0, String arg1);
+ public void warn_orbspecific_coordinator_rccreate(Uid arg0, Throwable arg1);
@Message(id = 22027, value = "not created!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_coordinator_rcnotcreated();
+ public String get_orbspecific_coordinator_rcnotcreated();
@Message(id = 22028, value = "{0} called on still running transaction!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_coordinator_txrun(String arg0);
+ public void warn_orbspecific_coordinator_txrun(String arg0);
@Message(id = 22029, value = "{0} - could not get unique identifier of object.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_coordinator_uidfail(String arg0);
+ public void warn_orbspecific_coordinator_uidfail(String arg0);
@Message(id = 22030, value = "{0} - none zero Synchronization list!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_coordinator_zsync(String arg0);
+ public void warn_orbspecific_coordinator_zsync(String arg0);
@Message(id = 22031, value = "could not destroy object:", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_destroyfailed();
+ public String get_orbspecific_destroyfailed();
- @Message(id = 22032, value = "{0} caught exception: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22032, value = "{0} caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_coordinator_generror(String arg0, String arg1);
+ public void warn_orbspecific_interposition_coordinator_generror(String arg0, Throwable arg1);
@Message(id = 22033, value = "{0} - synchronizations have not been called!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_coordinator_syncerror(String arg0);
+ public void warn_orbspecific_interposition_coordinator_syncerror(String arg0);
@Message(id = 22034, value = "{0} - transaction not in prepared state: {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_coordinator_txnotprepared(String arg0, String arg1);
+ public void warn_orbspecific_interposition_coordinator_txnotprepared(String arg0, String arg1);
- @Message(id = 22035, value = "{0} could not destroy object: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22035, value = "{0} could not destroy object", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_destfailed(String arg0, String arg1);
+ public void warn_orbspecific_interposition_destfailed(String arg0, Throwable arg1);
@Message(id = 22036, value = "Could not remove child {0} from {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_arjuna_childerror(String arg0, String arg1);
+ public void warn_orbspecific_interposition_resources_arjuna_childerror(Uid arg0, Uid arg1);
- @Message(id = 22037, value = "{0} caught exception: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22037, value = "{0} caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_arjuna_generror(String arg0, String arg1);
+ public void warn_orbspecific_interposition_resources_arjuna_generror(String arg0, Throwable arg1);
- @Message(id = 22038, value = "{0} caught exception: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22038, value = "{0} caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_arjuna_generror_2(String arg0, String arg1);
+ public void warn_orbspecific_interposition_resources_arjuna_generror_2(String arg0, Throwable arg1);
@Message(id = 22039, value = "{0} - could not register interposed hierarchy!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_arjuna_ipfailed(String arg0);
+ public void warn_orbspecific_interposition_resources_arjuna_ipfailed(String arg0);
@Message(id = 22040, value = "{0} - could not register interposed hierarchy!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_arjuna_ipfailed_2(String arg0);
+ public void warn_orbspecific_interposition_resources_arjuna_ipfailed_2(String arg0);
@Message(id = 22041, value = "{0} - no coordinator to use!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_arjuna_nocoord(String arg0);
+ public void warn_orbspecific_interposition_resources_arjuna_nocoord(String arg0);
@Message(id = 22042, value = "{0} - no transaction!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_arjuna_notx(String arg0);
+ public void warn_orbspecific_interposition_resources_arjuna_notx(String arg0);
@Message(id = 22043, value = "{0} - attempt to commit with null control!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_arjuna_nullcontrol_1(String arg0);
+ public void warn_orbspecific_interposition_resources_arjuna_nullcontrol_1(String arg0);
@Message(id = 22044, value = "{0} - attempt to rollback transaction will null control!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_arjuna_nullcontrol_2(String arg0);
+ public void warn_orbspecific_interposition_resources_arjuna_nullcontrol_2(String arg0);
@Message(id = 22045, value = "{0} - could not register as no Coordinator has been given!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_arjuna_nullcoord(String arg0);
+ public void warn_orbspecific_interposition_resources_arjuna_nullcoord(String arg0);
@Message(id = 22046, value = "Failed to destroy server-side synchronization object!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_destroyfailed();
+ public void warn_orbspecific_interposition_resources_destroyfailed();
@Message(id = 22047, value = "Concurrent children found for restricted interposition!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_restricted_contx_1();
+ public String get_orbspecific_interposition_resources_restricted_contx_1();
@Message(id = 22048, value = "{0} Concurrent children found for restricted interposition!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_restricted_contx_4(String arg0);
+ public String get_orbspecific_interposition_resources_restricted_contx_4(String arg0);
@Message(id = 22049, value = "{0} - found concurrent ({1}) transactions!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_restricted_contxfound_1(String arg0, String arg1);
+ public void warn_orbspecific_interposition_resources_restricted_contxfound_1(String arg0, String arg1);
@Message(id = 22050, value = "{0} - found concurrent ({1}) transactions!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_restricted_contxfound_3(String arg0, String arg1);
+ public void warn_orbspecific_interposition_resources_restricted_contxfound_3(String arg0, String arg1);
@Message(id = 22051, value = "{0} status of transaction is different from our status: <{1}, {2}>", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_stateerror(String arg0, String arg1, String arg2);
+ public void warn_orbspecific_interposition_resources_stateerror(String arg0, String arg1, String arg2);
@Message(id = 22052, value = "{0} - could not register interposed hierarchy!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_strict_ipfailed(String arg0);
+ public void warn_orbspecific_interposition_resources_strict_ipfailed(String arg0);
@Message(id = 22053, value = "{0} - could not register interposed hierarchy!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_interposition_resources_strict_iptlfailed(String arg0);
+ public void warn_orbspecific_interposition_resources_strict_iptlfailed(String arg0);
@Message(id = 22054, value = "Invalid Uid:", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_invaliduid();
+ public String get_orbspecific_invaliduid();
@Message(id = 22055, value = "Cannot create a codec of the required encoding.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_interceptors_context_codeccreate();
+ public String get_orbspecific_jacorb_interceptors_context_codeccreate();
@Message(id = 22056, value = "{0} - a failure occured when getting {1} codec - unknown encoding.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_interceptors_context_codecerror(String arg0, String arg1);
+ public void warn_orbspecific_jacorb_interceptors_context_codecerror(String arg0, String arg1, Throwable arg2);
@Message(id = 22057, value = "{0} - duplicate interceptor name for {1} when registering", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_interceptors_context_duplicatename(String arg0, String arg1);
+ public void warn_orbspecific_jacorb_interceptors_context_duplicatename(String arg0, String arg1, Throwable arg2);
- @Message(id = 22058, value = "Context interceptor caught an unexpected exception:", format = MESSAGE_FORMAT)
+ @Message(id = 22058, value = "Context interceptor caught an unexpected exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_interceptors_context_error();
+ public void warn_orbspecific_jacorb_interceptors_context_error(Throwable arg0);
@Message(id = 22059, value = "Invalid portable interceptor transaction parameter!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_interceptors_context_invalidparam();
+ public String get_orbspecific_jacorb_interceptors_context_invalidparam();
@Message(id = 22060, value = "A server-side request interceptor already exists with that name.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_interceptors_context_sie();
+ public String get_orbspecific_jacorb_interceptors_context_sie();
- @Message(id = 22061, value = "{0} caught an unexpected exception: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22061, value = "{0} caught an unexpected exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_interceptors_context_srie(String arg0, String arg1);
+ public void warn_orbspecific_jacorb_interceptors_context_srie(String arg0, Throwable arg1);
@Message(id = 22062, value = "Cannot create a codec of the required encoding.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_interceptors_interposition_codeccreate();
+ public String get_orbspecific_jacorb_interceptors_interposition_codeccreate();
@Message(id = 22063, value = "{0} - a failure occured when getting {1} codec - unknown encoding.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_interceptors_interposition_codecerror(String arg0, String arg1);
+ public void warn_orbspecific_jacorb_interceptors_interposition_codecerror(String arg0, String arg1, Throwable arg2);
@Message(id = 22064, value = "{0} - duplicate interceptor name for {1} when registering", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_interceptors_interposition_duplicatename(String arg0, String arg1);
+ public void warn_orbspecific_jacorb_interceptors_interposition_duplicatename(String arg0, String arg1, Throwable arg2);
@Message(id = 22065, value = "Invalid portable interceptor transaction parameter!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_interceptors_interposition_invalidparam();
+ public String get_orbspecific_jacorb_interceptors_interposition_invalidparam();
@Message(id = 22066, value = "A server-side request interceptor already exists with that name.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_interceptors_interposition_sie();
+ public String get_orbspecific_jacorb_interceptors_interposition_sie();
- @Message(id = 22067, value = "{0} caught an unexpected exception: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22067, value = "{0} caught an unexpected exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_interceptors_interposition_srie(String arg0, String arg1);
+ public void warn_orbspecific_jacorb_interceptors_interposition_srie(String arg0, Throwable arg1);
- @Message(id = 22068, value = "Client Interceptor for RecoveryCoordinators created", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_1();
+// @Message(id = 22068, value = "Client Interceptor for RecoveryCoordinators created", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_1();
@Message(id = 22069, value = "Failed to retreive the Object reference of the default RecoverCoordinator Object.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_2();
+ public void warn_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_2(Throwable arg0);
- @Message(id = 22070, value = "Failed to obtain the ObjectId string of the RecveryCoordinator target.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_3();
+// @Message(id = 22070, value = "Failed to obtain the ObjectId string of the RecveryCoordinator target.", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_3();
@Message(id = 22071, value = "Failed to build service context with the ObjectId", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_4();
+ public void warn_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_4(Throwable arg0);
@Message(id = 22072, value = "Failed in ClientInitializer::post_init -", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_ClientInitializer_();
+ public void warn_orbspecific_jacorb_recoverycoordinators_ClientInitializer_1(Throwable arg0);
- @Message(id = 22073, value = "JacOrbDefaultServant replay_completion for recoverId {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbDefaultServant_1(String arg0);
+// @Message(id = 22073, value = "JacOrbDefaultServant replay_completion for recoverId {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbDefaultServant_1(String arg0);
- @Message(id = 22074, value = "JacOrbDefaultServant replay_completion for ObjectId {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbDefaultServant_2(String arg0);
+// @Message(id = 22074, value = "JacOrbDefaultServant replay_completion for ObjectId {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbDefaultServant_2(String arg0);
- @Message(id = 22075, value = "JacOrbServant.replay_completion got {0}", format = MESSAGE_FORMAT)
+ @Message(id = 22075, value = "JacOrbServant.replay_completion got exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCDefaultServant_3(String arg0);
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCDefaultServant_3(Throwable arg0);
- @Message(id = 22076, value = "JacOrbRCManager: Created reference for tran {0} = {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_1(String arg0, String arg1);
+// @Message(id = 22076, value = "JacOrbRCManager: Created reference for tran {0} = {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_1(String arg0, String arg1);
@Message(id = 22077, value = "RCManager.makeRC did not make rcvco reference", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_2();
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_2(Throwable arg0);
@Message(id = 22078, value = "RCManager could not find file in object store.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_3();
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_3();
@Message(id = 22079, value = "RCManager could not find file in object store during setup.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_4();
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_4();
- @Message(id = 22080, value = "Unexpected exception during IOR setup {0}", format = MESSAGE_FORMAT)
+ @Message(id = 22080, value = "Unexpected exception during IOR setup", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_5(String arg0);
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_5(Throwable arg0);
@Message(id = 22081, value = "Failed to create poa for recoverycoordinators", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_1();
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_1(Throwable arg0);
- @Message(id = 22082, value = "JacOrbRCServiceInit - set default servant and activated", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_2();
+// @Message(id = 22082, value = "JacOrbRCServiceInit - set default servant and activated", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_2();
@Message(id = 22083, value = "JacOrbRCServiceInit - Failed to start RC service", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_3();
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_3(Throwable arg0);
- @Message(id = 22084, value = "Unable to create file ObjectId", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_4();
+// @Message(id = 22084, value = "Unable to create file ObjectId", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_4();
@Message(id = 22085, value = "Unable to create file ObjectId - security problems", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_5();
+ @LogMessage(level = FATAL)
+ public void fatal_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_5();
@Message(id = 22086, value = "Starting RecoveryServer ORB on port {0} and address {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6(String arg0, String arg1);
+ @LogMessage(level = INFO)
+ public void info_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6(String arg0, String arg1);
@Message(id = 22087, value = "Sharing RecoveryServer ORB on port {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6a(String arg0);
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6a(String arg0);
- @Message(id = 22088, value = "Failed to create orb and poa for transactional objects {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22088, value = "Failed to create orb and poa for transactional objects", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_7(String arg0);
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_7(Throwable arg0);
@Message(id = 22089, value = "RootPOA is null. Initialization failed. Check no conflicting or duplicate service is running.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_8();
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_8();
- @Message(id = 22090, value = "JacOrb RecoveryCoordinator creator setup", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRecoveryInit_1();
+// @Message(id = 22090, value = "JacOrb RecoveryCoordinator creator setup", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRecoveryInit_1();
@Message(id = 22091, value = "Failed in ServerInitializer::post_init -", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_ServerInitializer_1();
+ public void warn_orbspecific_jacorb_recoverycoordinators_ServerInitializer_1(Throwable arg0);
- @Message(id = 22092, value = "Failed to obtain the service context -", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_jacorb_recoverycoordinators_ServerRecoveryInterceptor_1();
+// @Message(id = 22092, value = "Failed to obtain the service context -", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_orbspecific_jacorb_recoverycoordinators_ServerRecoveryInterceptor_1();
@Message(id = 22093, value = "Cannot create a codec of the required encoding.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_javaidl_interceptors_context_codeccreate();
+ public String get_orbspecific_javaidl_interceptors_context_codeccreate();
@Message(id = 22094, value = "{0} - a failure occured when getting {1} codec - unknown encoding.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_javaidl_interceptors_context_codecerror(String arg0, String arg1);
+ public void warn_orbspecific_javaidl_interceptors_context_codecerror(String arg0, String arg1, Throwable arg2);
@Message(id = 22095, value = "{0} - duplicate interceptor name for {1} when registering", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_javaidl_interceptors_context_duplicatename(String arg0, String arg1);
+ public void warn_orbspecific_javaidl_interceptors_context_duplicatename(String arg0, String arg1, Throwable arg2);
- @Message(id = 22096, value = "Context interceptor caught an unexpected exception:", format = MESSAGE_FORMAT)
+ @Message(id = 22096, value = "Context interceptor caught an unexpected exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_javaidl_interceptors_context_error();
+ public void warn_orbspecific_javaidl_interceptors_context_error(Throwable arg0);
@Message(id = 22097, value = "Invalid portable interceptor transaction parameter!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_javaidl_interceptors_context_invalidparam();
+ public String get_orbspecific_javaidl_interceptors_context_invalidparam();
@Message(id = 22098, value = "A server-side request interceptor already exists with that name.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_javaidl_interceptors_context_sie();
+ public String get_orbspecific_javaidl_interceptors_context_sie();
- @Message(id = 22099, value = "{0} caught an unexpected exception: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22099, value = "{0} caught an unexpected exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_javaidl_interceptors_context_srie(String arg0, String arg1);
+ public void warn_orbspecific_javaidl_interceptors_context_srie(String arg0, Throwable arg1);
@Message(id = 22100, value = "Cannot create a codec of the required encoding.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_javaidl_interceptors_interposition_codeccreate();
+ public String get_orbspecific_javaidl_interceptors_interposition_codeccreate();
@Message(id = 22101, value = "{0} - a failure occured when getting {1} codec - unknown encoding.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_javaidl_interceptors_interposition_codecerror(String arg0, String arg1);
+ public void warn_orbspecific_javaidl_interceptors_interposition_codecerror(String arg0, String arg1, Throwable arg2);
@Message(id = 22102, value = "{0} - duplicate interceptor name for {1} when registering", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_javaidl_interceptors_interposition_duplicatename(String arg0, String arg1);
+ public void warn_orbspecific_javaidl_interceptors_interposition_duplicatename(String arg0, String arg1, Throwable arg2);
@Message(id = 22103, value = "Invalid portable interceptor transaction parameter!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_javaidl_interceptors_interposition_invalidparam();
+ public String get_orbspecific_javaidl_interceptors_interposition_invalidparam();
@Message(id = 22104, value = "A server-side request interceptor already exists with that name.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_javaidl_interceptors_interposition_sie();
+ public String get_orbspecific_javaidl_interceptors_interposition_sie();
- @Message(id = 22105, value = "{0} caught an unexpected exception: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22105, value = "{0} caught an unexpected exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_javaidl_interceptors_interposition_srie(String arg0, String arg1);
+ public void warn_orbspecific_javaidl_interceptors_interposition_srie(String arg0, Throwable arg1);
@Message(id = 22106, value = "is not a valid unique identifier!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_orbspecific_otiderror();
+ public String get_orbspecific_otiderror();
- @Message(id = 22107, value = "{0} for {1} caught exception: {2}", format = MESSAGE_FORMAT)
+ @Message(id = 22107, value = "{0} for {1} caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_tficaught(String arg0, String arg1, String arg2);
+ public void warn_orbspecific_tficaught(String arg0, Uid arg1, Throwable arg2);
- @Message(id = 22108, value = "{0} attempt to clean up failed with: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22108, value = "{0} attempt to clean up failed with exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_orbspecific_tidyfail(String arg0, String arg1);
+ public void warn_orbspecific_tidyfail(String arg0, Throwable arg1);
- @Message(id = 22109, value = "Resolution of OTS server failed: {0}", format = MESSAGE_FORMAT)
+ @Message(id = 22109, value = "Resolution of OTS server failed", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_otsservererror(String arg0);
+ public void warn_otsservererror(Throwable arg0);
- @Message(id = 22110, value = "Resolution of OTS server failed - invalid name: {0}", format = MESSAGE_FORMAT)
+ @Message(id = 22110, value = "Resolution of OTS server failed - invalid name", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_otsserverfailed(String arg0);
+ public void warn_otsserverfailed(Throwable arg0);
- @Message(id = 22111, value = "ExpiredContactScanner created, with expiry time of {0} seconds", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_ExpiredContactScanner_1(String arg0);
+// @Message(id = 22111, value = "ExpiredContactScanner created, with expiry time of {0} seconds", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_ExpiredContactScanner_1(String arg0);
- @Message(id = 22112, value = "ExpiredContactScanner - scanning to remove items from before {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_ExpiredContactScanner_2(String arg0);
+// @Message(id = 22112, value = "ExpiredContactScanner - scanning to remove items from before {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_ExpiredContactScanner_2(String arg0);
@Message(id = 22113, value = "Removing old contact item {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_ExpiredContactScanner_3(String arg0);
+ @LogMessage(level = INFO)
+ public void info_recovery_ExpiredContactScanner_3(Uid arg0);
- @Message(id = 22114, value = "Expiry scan interval set to {0} seconds", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_ExpiredContactScanner_4(String arg0);
+// @Message(id = 22114, value = "Expiry scan interval set to {0} seconds", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_ExpiredContactScanner_4(String arg0);
- @Message(id = 22115, value = "{0} has inappropriate value {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_ExpiredContactScanner_5(String arg0, String arg1);
+// @Message(id = 22115, value = "{0} has inappropriate value {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_ExpiredContactScanner_5(String arg0, String arg1);
@Message(id = 22116, value = "Could not locate supported ORB for RecoveryCoordinator initialisation.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_RecoveryEnablement_1();
+ public void warn_recovery_RecoveryEnablement_1();
- @Message(id = 22117, value = "Full crash recovery is not supported with this orb", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_RecoveryEnablement_2();
+// @Message(id = 22117, value = "Full crash recovery is not supported with this orb", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_RecoveryEnablement_2();
- @Message(id = 22118, value = "Set property {0} = {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_RecoveryEnablement_3(String arg0, String arg1);
+// @Message(id = 22118, value = "Set property {0} = {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_RecoveryEnablement_3(String arg0, String arg1);
- @Message(id = 22119, value = "RecoveryCoordinator service can only be provided in RecoveryManager", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_RecoveryEnablement_4();
+// @Message(id = 22119, value = "RecoveryCoordinator service can only be provided in RecoveryManager", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_RecoveryEnablement_4();
- @Message(id = 22120, value = "ORB/OA initialisation failed: {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_RecoveryEnablement_5(String arg0);
+// @Message(id = 22120, value = "ORB/OA initialisation failed: {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_RecoveryEnablement_5(String arg0);
- @Message(id = 22121, value = "The Recovery Service Initialisation failed: {0}", format = MESSAGE_FORMAT)
+ @Message(id = 22121, value = "The Recovery Service Initialisation failed}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_RecoveryEnablement_6(String arg0);
+ public void warn_recovery_RecoveryEnablement_6(Throwable arg0);
- @Message(id = 22122, value = "added ORBAttribute for recoveryCoordinatorInitialiser", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_RecoveryInit_1();
+// @Message(id = 22122, value = "added ORBAttribute for recoveryCoordinatorInitialiser", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_RecoveryInit_1();
- @Message(id = 22123, value = "Full crash recovery is not supported with this orb", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_RecoveryInit_2();
+// @Message(id = 22123, value = "Full crash recovery is not supported with this orb", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_RecoveryInit_2();
- @Message(id = 22124, value = "added event handler {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_RecoveryInit_3(String arg0);
+// @Message(id = 22124, value = "added event handler {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_RecoveryInit_3(String arg0);
@Message(id = 22125, value = "RecoveryCoordinator service can only be provided in RecoveryManager", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_RecoveryInit_4();
+ @LogMessage(level = FATAL)
+ public void fatal_recovery_RecoveryInit_4();
- @Message(id = 22126, value = "ORB/OA initialisation failed: {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_RecoveryInit_5(String arg0);
+// @Message(id = 22126, value = "ORB/OA initialisation failed: {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_RecoveryInit_5(String arg0);
- @Message(id = 22127, value = "Problem with storing process/factory link {0}", format = MESSAGE_FORMAT)
+ @Message(id = 22127, value = "Problem with storing process/factory link", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_contact_FactoryContactItem_1(String arg0);
+ public void warn_recovery_contact_FactoryContactItem_1(Throwable arg0);
@Message(id = 22128, value = "Attempted to read FactoryContactItem of different version", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_contact_FactoryContactItem_2();
+ public void warn_recovery_contact_FactoryContactItem_2();
@Message(id = 22129, value = "Stored IOR is not an ArjunaFactory", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_contact_FactoryContactItem_3();
+ public void warn_recovery_contact_FactoryContactItem_3();
- @Message(id = 22130, value = "Problem with restoring process/factory link {0}", format = MESSAGE_FORMAT)
+ @Message(id = 22130, value = "Problem with restoring process/factory link", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_contact_FactoryContactItem_4(String arg0);
+ public void warn_recovery_contact_FactoryContactItem_4(Throwable arg0);
@Message(id = 22131, value = "Problem with restoring process/factory link", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_contact_FactoryContactItem_5();
+ public void warn_recovery_contact_FactoryContactItem_5();
@Message(id = 22132, value = "Problem with storing process/factory link", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_contact_FactoryContactItem_6();
+ public void warn_recovery_contact_FactoryContactItem_6();
- @Message(id = 22133, value = "Problem with removing contact item {0}", format = MESSAGE_FORMAT)
+ @Message(id = 22133, value = "Problem with removing contact item", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_contact_FactoryContactItem_7(String arg0);
+ public void warn_recovery_contact_FactoryContactItem_7(Throwable arg0);
- @Message(id = 22134, value = "RecoveryContactWriter() created", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_contact_RecoveryContactWriter_1();
+// @Message(id = 22134, value = "RecoveryContactWriter() created", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_contact_RecoveryContactWriter_1();
- @Message(id = 22135, value = "RecoveryContactWriter.connected( \" {0} \")", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_contact_RecoveryContactWriter_2(String arg0);
+// @Message(id = 22135, value = "RecoveryContactWriter.connected( \" {0} \")", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_contact_RecoveryContactWriter_2(String arg0);
- @Message(id = 22136, value = "RecoveryContactWriter.connected - found ArjunaFactory", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_contact_RecoveryContactWriter_3();
+// @Message(id = 22136, value = "RecoveryContactWriter.connected - found ArjunaFactory", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_contact_RecoveryContactWriter_3();
- @Message(id = 22137, value = "StatusChecker.getStatus( {0} ) - current status = {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_contact_StatusChecker_1(String arg0, String arg1);
+// @Message(id = 22137, value = "StatusChecker.getStatus( {0} ) - current status = {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_contact_StatusChecker_1(String arg0, String arg1);
@Message(id = 22138, value = "NoTransaction exception on trying to contact original process", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_contact_StatusChecker_10();
+ public void warn_recovery_contact_StatusChecker_10();
- @Message(id = 22139, value = "CORBA exception on trying to contact original process \"", format = MESSAGE_FORMAT)
+ @Message(id = 22139, value = "CORBA exception on trying to contact original process", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_contact_StatusChecker_11();
+ public void warn_recovery_contact_StatusChecker_11(Throwable arg0);
@Message(id = 22140, value = "Exception on trying to contact original process", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_contact_StatusChecker_12();
+ public void warn_recovery_contact_StatusChecker_12(Throwable arg0);
- @Message(id = 22141, value = "StatusChecker.getStatus({0}) - no factory, process previously dead", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_contact_StatusChecker_13(String arg0);
+// @Message(id = 22141, value = "StatusChecker.getStatus({0}) - no factory, process previously dead", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_contact_StatusChecker_13(String arg0);
@Message(id = 22142, value = "no known contactitem for {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_contact_StatusChecker_14(String arg0);
+ public void warn_recovery_contact_StatusChecker_14(Uid arg0);
- @Message(id = 22143, value = "surprise item in StatusChecker list for {0}, {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22143, value = "surprise item in StatusChecker list for {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_contact_StatusChecker_15(String arg0, String arg1);
+ public void warn_recovery_contact_StatusChecker_15(Uid arg0, Throwable arg1);
- @Message(id = 22144, value = "StatusChecker.getStatus( {0} ) - stored status = {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_contact_StatusChecker_2(String arg0, String arg1);
+// @Message(id = 22144, value = "StatusChecker.getStatus( {0} ) - stored status = {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_contact_StatusChecker_2(String arg0, String arg1);
@Message(id = 22145, value = "StatusChecked.getStatus - found intentions list for apparently unknown transaction: {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_contact_StatusChecker_3(String arg0);
+ public void warn_recovery_contact_StatusChecker_3(Uid arg0);
- @Message(id = 22146, value = "StatusChecker.getStatus( {0} ) - Status = {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_contact_StatusChecker_4(String arg0, String arg1);
+// @Message(id = 22146, value = "StatusChecker.getStatus( {0} ) - Status = {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_contact_StatusChecker_4(String arg0, String arg1);
- @Message(id = 22147, value = "StatusChecker.getStatus({0}) - NO_IMPLEMENT = dead", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_contact_StatusChecker_5(String arg0);
+// @Message(id = 22147, value = "StatusChecker.getStatus({0}) - NO_IMPLEMENT = dead", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_contact_StatusChecker_5(String arg0);
- @Message(id = 22148, value = "StatusChecker.getStatus({0}) - TRANSIENT = dead", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_contact_StatusChecker_6(String arg0);
+// @Message(id = 22148, value = "StatusChecker.getStatus({0}) - TRANSIENT = dead", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_contact_StatusChecker_6(String arg0);
- @Message(id = 22149, value = "StatusChecker.getStatus({0}) - COMM_FAILURE = live", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_contact_StatusChecker_7(String arg0);
+// @Message(id = 22149, value = "StatusChecker.getStatus({0}) - COMM_FAILURE = live", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_contact_StatusChecker_7(String arg0);
- @Message(id = 22150, value = "StatusChecker.getStatus({0}) - OBJECT_NOT_EXIST = dead", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_contact_StatusChecker_8(String arg0);
+// @Message(id = 22150, value = "StatusChecker.getStatus({0}) - OBJECT_NOT_EXIST = dead", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_contact_StatusChecker_8(String arg0);
@Message(id = 22151, value = "BAD_PARAM exception on trying to contact original process", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_contact_StatusChecker_9();
+ public void warn_recovery_contact_StatusChecker_9();
@Message(id = 22152, value = "{0} - being passed a null reference. Will ignore!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_rcnull(String arg0);
+ public void warn_recovery_rcnull(String arg0);
- @Message(id = 22153, value = "GenericRecoveryCoordinator {0} constructed", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_recoverycoordinators_GenericRecoveryCoordinator_1(String arg0);
+// @Message(id = 22153, value = "GenericRecoveryCoordinator {0} constructed", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_recoverycoordinators_GenericRecoveryCoordinator_1(String arg0);
- @Message(id = 22154, value = "GenericRecoveryCoordinator() constructing", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_recoverycoordinators_GenericRecoveryCoordinator_2();
+// @Message(id = 22154, value = "GenericRecoveryCoordinator() constructing", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_recoverycoordinators_GenericRecoveryCoordinator_2();
- @Message(id = 22155, value = "GenericRecoveryCoordinator - swapping Resource for RC {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_recoverycoordinators_GenericRecoveryCoordinator_4(String arg0);
+// @Message(id = 22155, value = "GenericRecoveryCoordinator - swapping Resource for RC {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_recoverycoordinators_GenericRecoveryCoordinator_4(String arg0);
@Message(id = 22156, value = "GenericRecoveryCreator: Missing params to create", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_recoverycoordinators_GenericRecoveryCreator_1();
+ public void warn_recovery_recoverycoordinators_GenericRecoveryCreator_1();
- @Message(id = 22157, value = "RecoveryCoordinatorId: created RCkey {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_recoverycoordinators_RecoveryCoordinatorId_1(String arg0);
+// @Message(id = 22157, value = "RecoveryCoordinatorId: created RCkey {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_recoverycoordinators_RecoveryCoordinatorId_1(String arg0);
@Message(id = 22158, value = "System exception when creating RecoveryCoordinator object key", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_recoverycoordinators_RecoveryCoordinatorId_2();
+ public void warn_recovery_recoverycoordinators_RecoveryCoordinatorId_2(Throwable arg0);
@Message(id = 22159, value = "RecoveryCoordinatorId could not decode data {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_recoverycoordinators_RecoveryCoordinatorId_3(String arg0);
+ public void warn_recovery_recoverycoordinators_RecoveryCoordinatorId_3(String arg0);
- @Message(id = 22160, value = "ResourceCompletor.rollback() - rollback failed: {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_recoverycoordinators_ResourceCompletor_1(String arg0);
+// @Message(id = 22160, value = "ResourceCompletor.rollback() - rollback failed: {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_recoverycoordinators_ResourceCompletor_1(String arg0);
@Message(id = 22161, value = "Failure recovery not supported for this ORB.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_recoveryinit_1();
+ public void warn_recovery_recoveryinit_1();
- @Message(id = 22162, value = "AssumedCompleteServerTransaction {0} created", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_AssumedCompleteServerTransaction_1(String arg0);
+// @Message(id = 22162, value = "AssumedCompleteServerTransaction {0} created", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_AssumedCompleteServerTransaction_1(String arg0);
- @Message(id = 22163, value = "AssumedCompleteTransaction {0} created", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_AssumedCompleteTransaction_1(String arg0);
+// @Message(id = 22163, value = "AssumedCompleteTransaction {0} created", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_AssumedCompleteTransaction_1(String arg0);
- @Message(id = 22164, value = "", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_CachedRecoveredTransaction_1();
+// @Message(id = 22164, value = "", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_CachedRecoveredTransaction_1();
- @Message(id = 22165, value = "CachedRecoveredTransaction.originalBusy - told status is {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_CachedRecoveredTransaction_2(String arg0);
+// @Message(id = 22165, value = "CachedRecoveredTransaction.originalBusy - told status is {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_CachedRecoveredTransaction_2(String arg0);
- @Message(id = 22166, value = "RecoveredServerTransaction {0} created", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_1(String arg0);
+// @Message(id = 22166, value = "RecoveredServerTransaction {0} created", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_RecoveredServerTransaction_1(String arg0);
@Message(id = 22167, value = "Got TRANSIENT from ORB for tx {0} and assuming OBJECT_NOT_EXIST", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_10(String arg0);
+ public void warn_recovery_transactions_RecoveredServerTransaction_10(Uid arg0);
- @Message(id = 22168, value = "RecoveredServerTransaction.getStatusFromParent - replay_completion got object_not_exist = {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_11(String arg0);
+// @Message(id = 22168, value = "RecoveredServerTransaction.getStatusFromParent - replay_completion got object_not_exist = {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_RecoveredServerTransaction_11(String arg0);
@Message(id = 22169, value = "RecoveredServerTransaction: caught NotPrepared", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_12();
+ public void warn_recovery_transactions_RecoveredServerTransaction_12();
- @Message(id = 22170, value = "RecoveredServerTransaction: caught unexpected exception:", format = MESSAGE_FORMAT)
+ @Message(id = 22170, value = "RecoveredServerTransaction: caught unexpected exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_13();
+ public void warn_recovery_transactions_RecoveredServerTransaction_13(Throwable arg0);
@Message(id = 22171, value = "RecoveredServerTransaction: {0} is invalid", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_14(String arg0);
+ public void warn_recovery_transactions_RecoveredServerTransaction_14(Uid arg0);
- @Message(id = 22172, value = "RecoveredServerTransaction:getStatusFromParent - no recovcoord or status not prepared", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_15();
+// @Message(id = 22172, value = "RecoveredServerTransaction:getStatusFromParent - no recovcoord or status not prepared", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_RecoveredServerTransaction_15();
- @Message(id = 22173, value = "\"RecoveredServerTransaction.unpackHeader - txid = {0} and processUid = {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_16(String arg0, String arg1);
+// @Message(id = 22173, value = "\"RecoveredServerTransaction.unpackHeader - txid = {0} and processUid = {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_RecoveredServerTransaction_16(String arg0, String arg1);
- @Message(id = 22174, value = "RecoveredServerTransaction - activate of {0} failed with {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_17(String arg0, String arg1);
+// @Message(id = 22174, value = "RecoveredServerTransaction - activate of {0} failed with {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_RecoveredServerTransaction_17(String arg0, String arg1);
@Message(id = 22175, value = "RecoveredServerTransaction - activate of {0} failed!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_2(String arg0);
+ public void warn_recovery_transactions_RecoveredServerTransaction_2(Uid arg0);
- @Message(id = 22176, value = "RecoveredServerTransaction.replayPhase2({0}) - status = {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_4(String arg0, String arg1);
+// @Message(id = 22176, value = "RecoveredServerTransaction.replayPhase2({0}) - status = {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_RecoveredServerTransaction_4(String arg0, String arg1);
- @Message(id = 22177, value = "RecoveredServerTransaction.replayPhase2({0}) - status after contacting parent = {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_5(String arg0, String arg1);
+// @Message(id = 22177, value = "RecoveredServerTransaction.replayPhase2({0}) - status after contacting parent = {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_RecoveredServerTransaction_5(String arg0, String arg1);
@Message(id = 22178, value = "ServerTransaction {0} unable determine status - retry later", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_6(String arg0);
+ @LogMessage(level = INFO)
+ public void info_recovery_transactions_RecoveredServerTransaction_6(Uid arg0);
@Message(id = 22179, value = "RecoveredServerTransaction.replayPhase2: unexpected Status: {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_7(String arg0);
+ public void warn_recovery_transactions_RecoveredServerTransaction_7(String arg0);
- @Message(id = 22180, value = "RecoveredServerTransaction.replayPhase2: ({0}) finished", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_8(String arg0);
+// @Message(id = 22180, value = "RecoveredServerTransaction.replayPhase2: ({0}) finished", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_RecoveredServerTransaction_8(String arg0);
- @Message(id = 22181, value = "RecoveredServerTransaction.getStatusFromParent - replay_completion status = {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredServerTransaction_9(String arg0);
+// @Message(id = 22181, value = "RecoveredServerTransaction.getStatusFromParent - replay_completion status = {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_RecoveredServerTransaction_9(String arg0);
- @Message(id = 22182, value = "RecoveredTransaction {0} created", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredTransaction_1(String arg0);
+// @Message(id = 22182, value = "RecoveredTransaction {0} created", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_RecoveredTransaction_1(String arg0);
@Message(id = 22183, value = "RecoveredTransaction activate of {0} failed", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredTransaction_2(String arg0);
+ public void warn_recovery_transactions_RecoveredTransaction_2(Uid arg0);
- @Message(id = 22184, value = "RecoveredTransaction activate of {0} failed - {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22184, value = "RecoveredTransaction activate of {0} failed", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredTransaction_3(String arg0, String arg1);
+ public void warn_recovery_transactions_RecoveredTransaction_3(Uid arg0, Throwable arg1);
- @Message(id = 22185, value = "RecoveredTransaction.replayPhase2 ({0}) - status = {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredTransaction_5(String arg0, String arg1);
+// @Message(id = 22185, value = "RecoveredTransaction.replayPhase2 ({0}) - status = {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_RecoveredTransaction_5(String arg0, String arg1);
@Message(id = 22186, value = "RecoveredTransaction.replayPhase2 for {0} failed", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredTransaction_6(String arg0);
+ public void warn_recovery_transactions_RecoveredTransaction_6(String arg0);
- @Message(id = 22187, value = "RecoveredTransaction.replayPhase2 ({0}) finished", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredTransaction_7(String arg0);
+// @Message(id = 22187, value = "RecoveredTransaction.replayPhase2 ({0}) finished", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_RecoveredTransaction_7(String arg0);
@Message(id = 22188, value = "RecoveredTransaction.removeOldStoreEntry - problem", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_transactions_RecoveredTransaction_8();
+ public void warn_recovery_transactions_RecoveredTransaction_8(Throwable arg0);
- @Message(id = 22189, value = "ServerTransactionRecoveryModule created", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_ServerTransactionRecoveryModule_1();
+// @Message(id = 22189, value = "ServerTransactionRecoveryModule created", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_ServerTransactionRecoveryModule_1();
@Message(id = 22190, value = "ServerTransactionRecoveryModule - First Pass", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_ServerTransactionRecoveryModule_3();
+ @LogMessage(level = INFO)
+ public void info_recovery_transactions_ServerTransactionRecoveryModule_3();
@Message(id = 22191, value = "ServerTransactionRecoveryModule - Second Pass", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_ServerTransactionRecoveryModule_4();
+ @LogMessage(level = INFO)
+ public void info_recovery_transactions_ServerTransactionRecoveryModule_4();
@Message(id = 22192, value = "ServerTransactionRecoveryModule - Transaction {0} still in ActionStore", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_ServerTransactionRecoveryModule_5(String arg0);
+ @LogMessage(level = INFO)
+ public void info_recovery_transactions_ServerTransactionRecoveryModule_5(Uid arg0);
- @Message(id = 22193, value = "ServerTransactionRecoveryModule - Transaction {0} still in state unknown (?).", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_ServerTransactionRecoveryModule_6(String arg0);
+// @Message(id = 22193, value = "ServerTransactionRecoveryModule - Transaction {0} still in state unknown (?).", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_ServerTransactionRecoveryModule_6(String arg0);
- @Message(id = 22194, value = "ServerTransactionRecoveryModule - Transaction {0} is not in object store - assumed completed", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_ServerTransactionRecoveryModule_7(String arg0);
+// @Message(id = 22194, value = "ServerTransactionRecoveryModule - Transaction {0} is not in object store - assumed completed", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_ServerTransactionRecoveryModule_7(String arg0);
- @Message(id = 22195, value = "Activated transaction {0} status = {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_ServerTransactionRecoveryModule_8(String arg0, String arg1);
+// @Message(id = 22195, value = "Activated transaction {0} status = {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_ServerTransactionRecoveryModule_8(String arg0, String arg1);
- @Message(id = 22196, value = "Transaction {0} still busy", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_ServerTransactionRecoveryModule_9(String arg0);
+// @Message(id = 22196, value = "Transaction {0} still busy", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_ServerTransactionRecoveryModule_9(String arg0);
- @Message(id = 22197, value = "TopLevelTransactionRecoveryModule created", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TopLevelTransactionRecoveryModule_1();
+// @Message(id = 22197, value = "TopLevelTransactionRecoveryModule created", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TopLevelTransactionRecoveryModule_1();
- @Message(id = 22198, value = "TopLevelTransactionRecoveryModule destoryed", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TopLevelTransactionRecoveryModule_2();
+// @Message(id = 22198, value = "TopLevelTransactionRecoveryModule destoryed", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TopLevelTransactionRecoveryModule_2();
@Message(id = 22199, value = "TopLevelTransactionRecoveryModule First Pass", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TopLevelTransactionRecoveryModule_3();
+ @LogMessage(level = INFO)
+ public void info_recovery_transactions_TopLevelTransactionRecoveryModule_3();
@Message(id = 22200, value = "TopLevelTransactionRecoveryModule Second Pass", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TopLevelTransactionRecoveryModule_4();
+ @LogMessage(level = INFO)
+ public void info_recovery_transactions_TopLevelTransactionRecoveryModule_4();
- @Message(id = 22201, value = "Transaction {0} previously assumed complete", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionCacheItem_1(String arg0);
+// @Message(id = 22201, value = "Transaction {0} previously assumed complete", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TransactionCacheItem_1(String arg0);
@Message(id = 22202, value = "TransactionCacheItem.loadTransaction - unknown type: {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionCacheItem_2(String arg0);
+ public void warn_recovery_transactions_TransactionCacheItem_2(String arg0);
- @Message(id = 22203, value = "asking the tran for original status", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionCache_1();
+// @Message(id = 22203, value = "asking the tran for original status", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TransactionCache_1();
- @Message(id = 22204, value = "no transaction in cache so not asking for original status", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionCache_2();
+// @Message(id = 22204, value = "no transaction in cache so not asking for original status", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TransactionCache_2();
- @Message(id = 22205, value = "Transaction {0} assumed complete - changing type.", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionCache_3(String arg0);
+// @Message(id = 22205, value = "Transaction {0} assumed complete - changing type.", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TransactionCache_3(String arg0);
@Message(id = 22206, value = "Transaction {0} assumed complete - will not poll any more", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionCache_4(String arg0);
+ @LogMessage(level = INFO)
+ public void info_recovery_transactions_TransactionCache_4(Uid arg0);
@Message(id = 22207, value = "Transaction {0} recovery completed", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionCache_5(String arg0);
+ @LogMessage(level = INFO)
+ public void info_recovery_transactions_TransactionCache_5(Uid arg0);
- @Message(id = 22208, value = "TransactionCache.remove {0}: transaction not in cache", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionCache_6(String arg0);
+// @Message(id = 22208, value = "TransactionCache.remove {0}: transaction not in cache", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TransactionCache_6(String arg0);
- @Message(id = 22209, value = "TransactionCache.remove {0}: removed transaction from cache", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionCache_7(String arg0);
+// @Message(id = 22209, value = "TransactionCache.remove {0}: removed transaction from cache", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TransactionCache_7(String arg0);
- @Message(id = 22210, value = "Non-integer value for property {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionCache_8(String arg0);
+// @Message(id = 22210, value = "Non-integer value for property {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TransactionCache_8(String arg0);
- @Message(id = 22211, value = "TransactionRecoveryModule created", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionRecoveryModule_1();
+// @Message(id = 22211, value = "TransactionRecoveryModule created", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TransactionRecoveryModule_1();
- @Message(id = 22212, value = "Transaction {0} still busy", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionRecoveryModule_10(String arg0);
+// @Message(id = 22212, value = "Transaction {0} still busy", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TransactionRecoveryModule_10(String arg0);
@Message(id = 22213, value = "TransactionRecoveryModule.periodicWorkFirstPass()", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionRecoveryModule_11();
+ @LogMessage(level = INFO)
+ public void info_recovery_transactions_TransactionRecoveryModule_11();
@Message(id = 22214, value = "TransactionRecoveryModule.periodicWorkSecondPass()", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionRecoveryModule_12();
+ @LogMessage(level = INFO)
+ public void info_recovery_transactions_TransactionRecoveryModule_12();
@Message(id = 22215, value = "TransactionRecoveryModule: transaction type not set", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionRecoveryModule_2();
+ public void warn_recovery_transactions_TransactionRecoveryModule_2();
- @Message(id = 22216, value = "TransactionRecoveryModule: scanning for {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionRecoveryModule_3(String arg0);
+// @Message(id = 22216, value = "TransactionRecoveryModule: scanning for {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TransactionRecoveryModule_3(String arg0);
- @Message(id = 22217, value = "TransactionRecoveryModule: Object store exception:", format = MESSAGE_FORMAT)
+ @Message(id = 22217, value = "TransactionRecoveryModule: Object store exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionRecoveryModule_4();
+ public void warn_recovery_transactions_TransactionRecoveryModule_4(Throwable arg0);
- @Message(id = 22218, value = "found transaction {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionRecoveryModule_5(String arg0);
+// @Message(id = 22218, value = "found transaction {0}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TransactionRecoveryModule_5(String arg0);
@Message(id = 22219, value = "Transaction {0} still in ActionStore", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionRecoveryModule_6(String arg0);
+ @LogMessage(level = INFO)
+ public void info_recovery_transactions_TransactionRecoveryModule_6(Uid arg0);
- @Message(id = 22220, value = "Transaction {0} in state unknown (?).", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionRecoveryModule_7(String arg0);
+// @Message(id = 22220, value = "Transaction {0} in state unknown (?).", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TransactionRecoveryModule_7(String arg0);
- @Message(id = 22221, value = "Transaction {0} is not in object store - assumed completed", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionRecoveryModule_8(String arg0);
+// @Message(id = 22221, value = "Transaction {0} is not in object store - assumed completed", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TransactionRecoveryModule_8(String arg0);
- @Message(id = 22222, value = "Activated transaction {0} status = {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_recovery_transactions_TransactionRecoveryModule_9(String arg0, String arg1);
+// @Message(id = 22222, value = "Activated transaction {0} status = {1}", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_recovery_transactions_TransactionRecoveryModule_9(String arg0, String arg1);
- @Message(id = 22223, value = "{0} caught exception: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22223, value = "{0} caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_errgenerr(String arg0, String arg1);
+ public void warn_resources_errgenerr(String arg0, Throwable arg1);
@Message(id = 22224, value = "{0} - no parent!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_errnoparent(String arg0);
+ public void warn_resources_errnoparent(String arg0);
@Message(id = 22225, value = "{0} called without a resource reference!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_errnores(String arg0);
+ public void warn_resources_errnores(String arg0);
@Message(id = 22226, value = "{0} failed. Returning default value: {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_errsavefail(String arg0, String arg1);
+ public void warn_resources_errsavefail(String arg0, String arg1);
@Message(id = 22227, value = "{0} called illegally!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_errsetvalue(String arg0);
+ public void warn_resources_errsetvalue(String arg0);
@Message(id = 22228, value = "{0} failed. Returning default value: {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_errtypefail(String arg0, String arg1);
+ public void warn_resources_errtypefail(String arg0, String arg1);
@Message(id = 22229, value = "{0} has no parent transaction!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_noparent(String arg0);
+ public void warn_resources_noparent(Uid arg0);
- @Message(id = 22230, value = "{0} caught exception: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22230, value = "{0} caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_rrcaught(String arg0, String arg1);
+ public void warn_resources_rrcaught(String arg0, Throwable arg1);
@Message(id = 22231, value = "{0} called illegally.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_rrillegalvalue(String arg0);
+ public void warn_resources_rrillegalvalue(String arg0);
@Message(id = 22232, value = "{0} called without a resource!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_resources_rrinvalid(String arg0);
+ public void warn_resources_rrinvalid(String arg0);
- @Message(id = 22233, value = "{0} caught unexpected exception: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22233, value = "{0} caught unexpected exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_eicaughtexception(String arg0, String arg1);
+ public void warn_eicaughtexception(String arg0, Throwable arg1);
@Message(id = 22234, value = "{0} called multiple times.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_excalledagain(String arg0);
+ public void warn_excalledagain(String arg0);
@Message(id = 22235, value = "Could not rollback transaction {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_extensions_abortfail(String arg0);
+ public void warn_extensions_abortfail(String arg0);
@Message(id = 22236, value = "Could not rollback transaction {0} as it does not exist!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_extensions_abortfailnoexist(String arg0);
+ public void warn_extensions_abortfailnoexist(String arg0);
@Message(id = 22237, value = "{0} - cannot rollback {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_extensions_atcannotabort(String arg0, String arg1);
+ public void warn_extensions_atcannotabort(String arg0, String arg1);
- @Message(id = 22238, value = "{0} - current transaction is null!", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_extensions_atcurrenttxnull(String arg0);
+// @Message(id = 22238, value = "{0} - current transaction is null!", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_extensions_atcurrenttxnull(String arg0);
- @Message(id = 22239, value = "{0} caught unexpected exception {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22239, value = "{0} caught unexpected exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_extensions_atgenerror(String arg0, String arg1);
+ public void warn_extensions_atgenerror(String arg0, Throwable arg1);
@Message(id = 22240, value = "{0} - no transaction!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_extensions_atnovalidtx(String arg0);
+ public void warn_extensions_atnovalidtx(String arg0);
@Message(id = 22241, value = "{0} - terminated out of sequence {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_extensions_atoutofseq(String arg0, String arg1);
+ public void warn_extensions_atoutofseq(String arg0, String arg1);
@Message(id = 22242, value = "{0} - running atomic transaction going out of scope. Will roll back. {1}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_extensions_atscope(String arg0, String arg1);
+ public void warn_extensions_atscope(String arg0, Uid arg1);
@Message(id = 22243, value = "{0} - transaction unavailable.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_extensions_atunavailable(String arg0);
+ public void warn_extensions_atunavailable(String arg0);
@Message(id = 22244, value = "Will roll back. Current transaction is {0}", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_extensions_atwillabort(String arg0);
+ public void warn_extensions_atwillabort(String arg0);
@Message(id = 22245, value = "Cannot determine transaction name!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_extensions_namefail();
+ public void warn_extensions_namefail(Throwable arg0);
- @Message(id = 22246, value = "{0} caught exception {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22246, value = "{0} caught exception", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_extensions_threadasserror(String arg0, String arg1);
+ public void warn_extensions_threadasserror(String arg0, Throwable arg1);
@Message(id = 22247, value = "Top-level transaction going out of scope with nested transaction {0} still set.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_extensions_tltnestedscope(String arg0);
+ public void warn_extensions_tltnestedscope(String arg0);
@Message(id = 22248, value = "{0} - could not unregister from transaction!", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_exunregfail(String arg0);
+ public void warn_exunregfail(String arg0);
- @Message(id = 22249, value = "{0} - could not resume transaction: {1}", format = MESSAGE_FORMAT)
+ @Message(id = 22249, value = "{0} - could not resume transaction", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_thread_resumefailed(String arg0, String arg1);
+ public void warn_thread_resumefailed(String arg0, Throwable arg1);
@Message(id = 22250, value = "could not resume transaction:", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void log_thread_resumefailederror();
+ public String get_thread_resumefailederror();
@Message(id = 22251, value = "The ORBManager is already associated with an ORB/OA.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
- public void log_utils_ORBSetup_orbalreadyset();
+ public void warn_utils_ORBSetup_orbalreadyset();
+ @Message(id = 22252, value = "Failed to remove old ObjectStore entry", format = MESSAGE_FORMAT)
+ @LogMessage(level = WARN)
+ public void warn_recoveredServerTransaction_removeOldStoreEntry(Throwable arg0);
+
+ @Message(id = 22253, value = "A client-side request interceptor already exists with that name.", format = MESSAGE_FORMAT)
+ public String get_orbspecific_jacorb_interceptors_context_cie();
+
+ @Message(id = 22254, value = "A client-side request interceptor already exists with that name.", format = MESSAGE_FORMAT)
+ public String get_orbspecific_jacorb_interceptors_interposition_cie();
+
+ @Message(id = 22255, value = "A client-side request interceptor already exists with that name.", format = MESSAGE_FORMAT)
+ public String get_orbspecific_javaidl_interceptors_context_cie();
+
+ @Message(id = 22256, value = "A client-side request interceptor already exists with that name.", format = MESSAGE_FORMAT)
+ public String get_orbspecific_javaidl_interceptors_interposition_cie();
+
+ @Message(id = 22257, value = "{0} - unknown interposition type: {1}", format = MESSAGE_FORMAT)
+ @LogMessage(level = WARN)
+ public void warn_orbspecific_coordinator_ipunknown(String arg0, String arg1);
+
/*
Allocate new messages directly above this notice.
- id: use the next id number in sequence. Don't reuse ids.
@@ -1051,5 +1052,7 @@
- value: default (English) version of the log message.
- level: according to severity semantics defined at http://docspace.corp.redhat.com/docs/DOC-30217
Debug and trace don't get i18n. Everything else MUST be i18n.
- */
+ By convention methods with String return type have prefix get_,
+ all others are log methods and have prefix <level>_
+ */
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLoggerImpl.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLoggerImpl.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -20,8 +20,13 @@
*/
package com.arjuna.ats.jts.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 jts module.
* This class is autogenerated. Don't mess with it.
@@ -30,1516 +35,717 @@
*/
public class jtsI18NLoggerImpl implements jtsI18NLogger {
- private final Logi18n logi18n;
+ private final Logger logger;
- jtsI18NLoggerImpl(Logi18n logi18n) {
- this.logi18n = logi18n;
- }
+ jtsI18NLoggerImpl(Logger logger) {
+ this.logger = logger;
+ }
- public void log_com_arjuna_ats_internal_arjuna_recovery_ExpiredAssumedCompleteScanner_1(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_1", new Object[] {arg0});
- }
- }
+ public void info_arjuna_recovery_ExpiredAssumedCompleteScanner_3(Uid arg0) {
+ logger.logv(INFO, "ARJUNA-22003 Removing old assumed complete transaction {0}", arg0);
+ }
- public void log_com_arjuna_ats_internal_arjuna_recovery_ExpiredAssumedCompleteScanner_2(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_2", new Object[] {arg0});
- }
- }
+ public void fatal_ORBManager() {
+ logger.logv(FATAL, "ARJUNA-22006 The ORB has not been initialized yet", (Object)null);
+ }
- public void log_com_arjuna_ats_internal_arjuna_recovery_ExpiredAssumedCompleteScanner_3(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_3", new Object[] {arg0});
- }
- }
+ public void warn_context_genfail(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22008 {0} caught exception", arg0);
+ }
- public void log_com_arjuna_ats_internal_arjuna_recovery_ExpiredAssumedCompleteScanner_4(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_4", new Object[] {arg0});
- }
- }
+ public void warn_context_orbnotsupported(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-22009 {0} does not support ORB: {1}", arg0, arg1);
+ }
- public void log_com_arjuna_ats_internal_arjuna_recovery_ExpiredAssumedCompleteScanner_5(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.arjuna.recovery.ExpiredAssumedCompleteScanner_5", new Object[] {arg0, arg1});
- }
- }
+ public String get_context_picreffail() {
+ return "ARJUNA-22010 Failed when getting a reference to PICurrent.";
+ }
- public void log_ORBManager() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.ORBManager");
- }
- }
+ public void warn_cwabort(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22011 Failed to cancel transaction", (Object)null);
+ }
- public void log_context_coorref(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.context.coorref", new Object[] {arg0, arg1});
- }
- }
+ public void warn_cwcommit(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22012 Failed to mark transaction as rollback only", (Object)null);
+ }
- public void log_context_genfail(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.context.genfail", new Object[] {arg0, arg1});
- }
- }
+ public void warn_interposition_cwabort(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22013 Failed to cancel transaction", (Object)null);
+ }
- public void log_context_orbnotsupported(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.context.orbnotsupported", new Object[] {arg0, arg1});
- }
- }
+ public void warn_interposition_fldefault(String arg0) {
+ logger.logv(WARN, "ARJUNA-22014 {0} - default already set!", arg0);
+ }
- public void log_context_picreffail() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.context.picreffail");
- }
- }
+ public void warn_interposition_resources_arjuna_ipfail(String arg0, Uid arg1) {
+ logger.logv(WARN, "ARJUNA-22015 {0} - could not find {1} to remove.", arg0, arg1);
+ }
- public void log_cwabort() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.cwabort");
- }
- }
+ public void warn_interposition_resources_arjuna_ipnt() {
+ logger.logv(WARN, "ARJUNA-22016 Nested transactions not identical.", (Object)null);
+ }
- public void log_cwcommit() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.cwcommit");
- }
- }
+ public void warn_interposition_resources_arjuna_ipnull() {
+ logger.logv(WARN, "ARJUNA-22017 Interposed hierarchy is null!", (Object)null);
+ }
- public void log_interposition_cwabort() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.interposition.cwabort");
- }
- }
+ public void warn_interposition_resources_arjuna_iptl(Uid arg0, Uid arg1) {
+ logger.logv(WARN, "ARJUNA-22018 TopLevel transactions not identical: {0} {1}", arg0, arg1);
+ }
- public void log_interposition_fldefault(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.interposition.fldefault", new Object[] {arg0});
- }
- }
+ public void warn_interposition_resources_arjuna_nochild(String arg0) {
+ logger.logv(WARN, "ARJUNA-22019 {0} - error, no child found!", arg0);
+ }
- public void log_interposition_resources_arjuna_ipfail(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.ipfail", new Object[] {arg0, arg1});
- }
- }
+ public void warn_interposition_resources_arjuna_notchild(String arg0) {
+ logger.logv(WARN, "ARJUNA-22020 {0} - not my child!", arg0);
+ }
- public void log_interposition_resources_arjuna_ipnt() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.ipnt");
- }
- }
+ public void warn_interposition_resources_arjuna_problemhierarchy(String arg0) {
+ logger.logv(WARN, "ARJUNA-22021 hierarchy: {0}", arg0);
+ }
- public void log_interposition_resources_arjuna_ipnull() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.ipnull");
- }
- }
+ public void warn_interposition_sfcaught(String arg0, Uid arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-22022 {0} for transaction {1} caught exception", arg0, arg1);
+ }
- public void log_interposition_resources_arjuna_iptl(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.iptl", new Object[] {arg0, arg1});
- }
- }
+ public void warn_interposition_sfnoparent(String arg0) {
+ logger.logv(WARN, "ARJUNA-22023 {0} - no parent transaction given!", arg0);
+ }
- public void log_interposition_resources_arjuna_nochild(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.nochild", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_coordinator_generror(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22024 {0} caught exception", arg0);
+ }
- public void log_interposition_resources_arjuna_notchild(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.notchild", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_coordinator_rbofail(String arg0, Uid arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-22025 {0} attempt to mark transaction {1} as rollback only threw exception", arg0, arg1);
+ }
- public void log_interposition_resources_arjuna_problemhierarchy(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.problemhierarchy", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_coordinator_rccreate(Uid arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22026 Creation of RecoveryCoordinator for {0} threw exception", arg0);
+ }
- public void log_interposition_sfcaught(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.interposition.sfcaught", new Object[] {arg0, arg1, arg2});
- }
- }
+ public String get_orbspecific_coordinator_rcnotcreated() {
+ return "ARJUNA-22027 not created!";
+ }
- public void log_interposition_sfnoparent(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.interposition.sfnoparent", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_coordinator_txrun(String arg0) {
+ logger.logv(WARN, "ARJUNA-22028 {0} called on still running transaction!", arg0);
+ }
- public void log_orbspecific_coordinator_generror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.generror", new Object[] {arg0, arg1});
- }
- }
+ public void warn_orbspecific_coordinator_uidfail(String arg0) {
+ logger.logv(WARN, "ARJUNA-22029 {0} - could not get unique identifier of object.", arg0);
+ }
- public void log_orbspecific_coordinator_rbofail(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.rbofail", new Object[] {arg0, arg1, arg2});
- }
- }
+ public void warn_orbspecific_coordinator_zsync(String arg0) {
+ logger.logv(WARN, "ARJUNA-22030 {0} - none zero Synchronization list!", arg0);
+ }
- public void log_orbspecific_coordinator_rccreate(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.rccreate", new Object[] {arg0, arg1});
- }
- }
+ public String get_orbspecific_destroyfailed() {
+ return "ARJUNA-22031 could not destroy object:";
+ }
- public void log_orbspecific_coordinator_rcnotcreated() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.rcnotcreated");
- }
- }
+ public void warn_orbspecific_interposition_coordinator_generror(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22032 {0} caught exception", arg0);
+ }
- public void log_orbspecific_coordinator_txrun(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.txrun", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_interposition_coordinator_syncerror(String arg0) {
+ logger.logv(WARN, "ARJUNA-22033 {0} - synchronizations have not been called!", arg0);
+ }
- public void log_orbspecific_coordinator_uidfail(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.uidfail", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_interposition_coordinator_txnotprepared(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-22034 {0} - transaction not in prepared state: {1}", arg0, arg1);
+ }
- public void log_orbspecific_coordinator_zsync(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.coordinator.zsync", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_interposition_destfailed(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22035 {0} could not destroy object", arg0);
+ }
- public void log_orbspecific_destroyfailed() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.destroyfailed");
- }
- }
+ public void warn_orbspecific_interposition_resources_arjuna_childerror(Uid arg0, Uid arg1) {
+ logger.logv(WARN, "ARJUNA-22036 Could not remove child {0} from {1}", arg0, arg1);
+ }
- public void log_orbspecific_interposition_coordinator_generror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.coordinator.generror", new Object[] {arg0, arg1});
- }
- }
+ public void warn_orbspecific_interposition_resources_arjuna_generror(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22037 {0} caught exception", arg0);
+ }
- public void log_orbspecific_interposition_coordinator_syncerror(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.coordinator.syncerror", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_interposition_resources_arjuna_generror_2(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22038 {0} caught exception", arg0);
+ }
- public void log_orbspecific_interposition_coordinator_txnotprepared(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.coordinator.txnotprepared", new Object[] {arg0, arg1});
- }
- }
+ public void warn_orbspecific_interposition_resources_arjuna_ipfailed(String arg0) {
+ logger.logv(WARN, "ARJUNA-22039 {0} - could not register interposed hierarchy!", arg0);
+ }
- public void log_orbspecific_interposition_destfailed(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.destfailed", new Object[] {arg0, arg1});
- }
- }
+ public void warn_orbspecific_interposition_resources_arjuna_ipfailed_2(String arg0) {
+ logger.logv(WARN, "ARJUNA-22040 {0} - could not register interposed hierarchy!", arg0);
+ }
- public void log_orbspecific_interposition_resources_arjuna_childerror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.childerror", new Object[] {arg0, arg1});
- }
- }
+ public void warn_orbspecific_interposition_resources_arjuna_nocoord(String arg0) {
+ logger.logv(WARN, "ARJUNA-22041 {0} - no coordinator to use!", arg0);
+ }
- public void log_orbspecific_interposition_resources_arjuna_generror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror", new Object[] {arg0, arg1});
- }
- }
+ public void warn_orbspecific_interposition_resources_arjuna_notx(String arg0) {
+ logger.logv(WARN, "ARJUNA-22042 {0} - no transaction!", arg0);
+ }
- public void log_orbspecific_interposition_resources_arjuna_generror_2(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror_2", new Object[] {arg0, arg1});
- }
- }
+ public void warn_orbspecific_interposition_resources_arjuna_nullcontrol_1(String arg0) {
+ logger.logv(WARN, "ARJUNA-22043 {0} - attempt to commit with null control!", arg0);
+ }
- public void log_orbspecific_interposition_resources_arjuna_ipfailed(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.ipfailed", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_interposition_resources_arjuna_nullcontrol_2(String arg0) {
+ logger.logv(WARN, "ARJUNA-22044 {0} - attempt to rollback transaction will null control!", arg0);
+ }
- public void log_orbspecific_interposition_resources_arjuna_ipfailed_2(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.ipfailed_2", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_interposition_resources_arjuna_nullcoord(String arg0) {
+ logger.logv(WARN, "ARJUNA-22045 {0} - could not register as no Coordinator has been given!", arg0);
+ }
- public void log_orbspecific_interposition_resources_arjuna_nocoord(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.nocoord", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_interposition_resources_destroyfailed() {
+ logger.logv(WARN, "ARJUNA-22046 Failed to destroy server-side synchronization object!", (Object)null);
+ }
- public void log_orbspecific_interposition_resources_arjuna_notx(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.notx", new Object[] {arg0});
- }
- }
+ public String get_orbspecific_interposition_resources_restricted_contx_1() {
+ return "ARJUNA-22047 Concurrent children found for restricted interposition!";
+ }
- public void log_orbspecific_interposition_resources_arjuna_nullcontrol_1(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.nullcontrol_1", new Object[] {arg0});
- }
- }
+ public String get_orbspecific_interposition_resources_restricted_contx_4(String arg0) {
+ return MessageFormat.format("ARJUNA-22048 {0} Concurrent children found for restricted interposition!", arg0);
+ }
- public void log_orbspecific_interposition_resources_arjuna_nullcontrol_2(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.nullcontrol_2", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_interposition_resources_restricted_contxfound_1(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-22049 {0} - found concurrent ({1}) transactions!", arg0, arg1);
+ }
- public void log_orbspecific_interposition_resources_arjuna_nullcoord(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.nullcoord", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_interposition_resources_restricted_contxfound_3(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-22050 {0} - found concurrent ({1}) transactions!", arg0, arg1);
+ }
- public void log_orbspecific_interposition_resources_destroyfailed() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.destroyfailed");
- }
- }
+ public void warn_orbspecific_interposition_resources_stateerror(String arg0, String arg1, String arg2) {
+ logger.logv(WARN, "ARJUNA-22051 {0} status of transaction is different from our status: <{1}, {2}>", arg0, arg1, arg2);
+ }
- public void log_orbspecific_interposition_resources_restricted_contx_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contx_1");
- }
- }
+ public void warn_orbspecific_interposition_resources_strict_ipfailed(String arg0) {
+ logger.logv(WARN, "ARJUNA-22052 {0} - could not register interposed hierarchy!", arg0);
+ }
- public void log_orbspecific_interposition_resources_restricted_contx_4(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contx_4", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_interposition_resources_strict_iptlfailed(String arg0) {
+ logger.logv(WARN, "ARJUNA-22053 {0} - could not register interposed hierarchy!", arg0);
+ }
- public void log_orbspecific_interposition_resources_restricted_contxfound_1(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contxfound_1", new Object[] {arg0, arg1});
- }
- }
+ public String get_orbspecific_invaliduid() {
+ return "ARJUNA-22054 Invalid Uid:";
+ }
- public void log_orbspecific_interposition_resources_restricted_contxfound_3(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contxfound_3", new Object[] {arg0, arg1});
- }
- }
+ public String get_orbspecific_jacorb_interceptors_context_codeccreate() {
+ return "ARJUNA-22055 Cannot create a codec of the required encoding.";
+ }
- public void log_orbspecific_interposition_resources_stateerror(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.stateerror", new Object[] {arg0, arg1, arg2});
- }
- }
+ public void warn_orbspecific_jacorb_interceptors_context_codecerror(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-22056 {0} - a failure occured when getting {1} codec - unknown encoding.", arg0, arg1);
+ }
- public void log_orbspecific_interposition_resources_strict_ipfailed(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.strict.ipfailed", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_jacorb_interceptors_context_duplicatename(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-22057 {0} - duplicate interceptor name for {1} when registering", arg0, arg1);
+ }
- public void log_orbspecific_interposition_resources_strict_iptlfailed(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.strict.iptlfailed", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_jacorb_interceptors_context_error(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22058 Context interceptor caught an unexpected exception", (Object)null);
+ }
- public void log_orbspecific_invaliduid() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.invaliduid");
- }
- }
+ public String get_orbspecific_jacorb_interceptors_context_invalidparam() {
+ return "ARJUNA-22059 Invalid portable interceptor transaction parameter!";
+ }
- public void log_orbspecific_jacorb_interceptors_context_codeccreate() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.codeccreate");
- }
- }
+ public String get_orbspecific_jacorb_interceptors_context_sie() {
+ return "ARJUNA-22060 A server-side request interceptor already exists with that name.";
+ }
- public void log_orbspecific_jacorb_interceptors_context_codecerror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.codecerror", new Object[] {arg0, arg1});
- }
- }
+ public void warn_orbspecific_jacorb_interceptors_context_srie(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22061 {0} caught an unexpected exception", arg0);
+ }
- public void log_orbspecific_jacorb_interceptors_context_duplicatename(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.duplicatename", new Object[] {arg0, arg1});
- }
- }
+ public String get_orbspecific_jacorb_interceptors_interposition_codeccreate() {
+ return "ARJUNA-22062 Cannot create a codec of the required encoding.";
+ }
- public void log_orbspecific_jacorb_interceptors_context_error() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.error");
- }
+ public void warn_orbspecific_jacorb_interceptors_interposition_codecerror(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-22063 {0} - a failure occured when getting {1} codec - unknown encoding.", arg0, arg1);
}
- public void log_orbspecific_jacorb_interceptors_context_invalidparam() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.invalidparam");
- }
- }
+ public void warn_orbspecific_jacorb_interceptors_interposition_duplicatename(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-22064 {0} - duplicate interceptor name for {1} when registering", arg0, arg1);
+ }
- public void log_orbspecific_jacorb_interceptors_context_sie() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.sie");
- }
- }
+ public String get_orbspecific_jacorb_interceptors_interposition_invalidparam() {
+ return "ARJUNA-22065 Invalid portable interceptor transaction parameter!";
+ }
- public void log_orbspecific_jacorb_interceptors_context_srie(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.srie", new Object[] {arg0, arg1});
- }
- }
+ public String get_orbspecific_jacorb_interceptors_interposition_sie() {
+ return "ARJUNA-22066 A server-side request interceptor already exists with that name.";
+ }
- public void log_orbspecific_jacorb_interceptors_interposition_codeccreate() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.codeccreate");
- }
- }
+ public void warn_orbspecific_jacorb_interceptors_interposition_srie(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22067 {0} caught an unexpected exception", arg0);
+ }
- public void log_orbspecific_jacorb_interceptors_interposition_codecerror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.codecerror", new Object[] {arg0, arg1});
- }
- }
+ public void warn_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_2(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22069 Failed to retreive the Object reference of the default RecoverCoordinator Object.", (Object)null);
+ }
- public void log_orbspecific_jacorb_interceptors_interposition_duplicatename(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.duplicatename", new Object[] {arg0, arg1});
- }
- }
+ public void warn_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_4(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22071 Failed to build service context with the ObjectId", (Object)null);
+ }
- public void log_orbspecific_jacorb_interceptors_interposition_invalidparam() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.invalidparam");
- }
- }
+ public void warn_orbspecific_jacorb_recoverycoordinators_ClientInitializer_1(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22072 Failed in ClientInitializer::post_init -", (Object)null);
+ }
- public void log_orbspecific_jacorb_interceptors_interposition_sie() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.sie");
- }
- }
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCDefaultServant_3(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22075 JacOrbServant.replay_completion got exception", (Object)null);
+ }
- public void log_orbspecific_jacorb_interceptors_interposition_srie(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.srie", new Object[] {arg0, arg1});
- }
- }
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_2(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22077 RCManager.makeRC did not make rcvco reference", (Object)null);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientForwardInterceptor_1");
- }
- }
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_3() {
+ logger.logv(WARN, "ARJUNA-22078 RCManager could not find file in object store.", (Object)null);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientForwardInterceptor_2");
- }
- }
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_4() {
+ logger.logv(WARN, "ARJUNA-22079 RCManager could not find file in object store during setup.", (Object)null);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_3() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientForwardInterceptor_3");
- }
- }
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_5(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22080 Unexpected exception during IOR setup", (Object)null);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_ClientForwardInterceptor_4() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientForwardInterceptor_4");
- }
- }
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_1(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22081 Failed to create poa for recoverycoordinators", (Object)null);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_ClientInitializer_() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ClientInitializer_");
- }
- }
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_3(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22083 JacOrbRCServiceInit - Failed to start RC service", (Object)null);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbDefaultServant_1(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbDefaultServant_1", new Object[] {arg0});
- }
- }
+ public void fatal_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_5() {
+ logger.logv(FATAL, "ARJUNA-22085 Unable to create file ObjectId - security problems", (Object)null);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbDefaultServant_2(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbDefaultServant_2", new Object[] {arg0});
- }
- }
+ public void info_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6(String arg0, String arg1) {
+ logger.logv(INFO, "ARJUNA-22086 Starting RecoveryServer ORB on port {0} and address {1}", arg0, arg1);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCDefaultServant_3(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCDefaultServant_3", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6a(String arg0) {
+ logger.logv(WARN, "ARJUNA-22087 Sharing RecoveryServer ORB on port {0}", arg0);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_1(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_1", new Object[] {arg0, arg1});
- }
- }
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_7(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22088 Failed to create orb and poa for transactional objects", (Object)null);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_2");
- }
- }
+ public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_8() {
+ logger.logv(WARN, "ARJUNA-22089 RootPOA is null. Initialization failed. Check no conflicting or duplicate service is running.", (Object)null);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_3() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_3");
- }
- }
+ public void warn_orbspecific_jacorb_recoverycoordinators_ServerInitializer_1(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22091 Failed in ServerInitializer::post_init -", (Object)null);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_4() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_4");
- }
- }
+ public String get_orbspecific_javaidl_interceptors_context_codeccreate() {
+ return "ARJUNA-22093 Cannot create a codec of the required encoding.";
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCManager_5(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_5", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_javaidl_interceptors_context_codecerror(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-22094 {0} - a failure occured when getting {1} codec - unknown encoding.", arg0, arg1);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_1");
- }
- }
+ public void warn_orbspecific_javaidl_interceptors_context_duplicatename(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-22095 {0} - duplicate interceptor name for {1} when registering", arg0, arg1);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_2");
- }
- }
+ public void warn_orbspecific_javaidl_interceptors_context_error(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22096 Context interceptor caught an unexpected exception", (Object)null);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_3() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_3");
- }
- }
+ public String get_orbspecific_javaidl_interceptors_context_invalidparam() {
+ return "ARJUNA-22097 Invalid portable interceptor transaction parameter!";
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_4() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_4");
- }
- }
+ public String get_orbspecific_javaidl_interceptors_context_sie() {
+ return "ARJUNA-22098 A server-side request interceptor already exists with that name.";
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_5() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_5");
- }
- }
+ public void warn_orbspecific_javaidl_interceptors_context_srie(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22099 {0} caught an unexpected exception", arg0);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_6", new Object[] {arg0, arg1});
- }
- }
+ public String get_orbspecific_javaidl_interceptors_interposition_codeccreate() {
+ return "ARJUNA-22100 Cannot create a codec of the required encoding.";
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6a(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_6a", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_javaidl_interceptors_interposition_codecerror(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-22101 {0} - a failure occured when getting {1} codec - unknown encoding.", arg0, arg1);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_7(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_7", new Object[] {arg0});
- }
- }
+ public void warn_orbspecific_javaidl_interceptors_interposition_duplicatename(String arg0, String arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-22102 {0} - duplicate interceptor name for {1} when registering", arg0, arg1);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_8() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_8");
- }
- }
+ public String get_orbspecific_javaidl_interceptors_interposition_invalidparam() {
+ return "ARJUNA-22103 Invalid portable interceptor transaction parameter!";
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_JacOrbRecoveryInit_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRecoveryInit_1");
- }
- }
+ public String get_orbspecific_javaidl_interceptors_interposition_sie() {
+ return "ARJUNA-22104 A server-side request interceptor already exists with that name.";
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_ServerInitializer_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ServerInitializer_1");
- }
- }
+ public void warn_orbspecific_javaidl_interceptors_interposition_srie(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22105 {0} caught an unexpected exception", arg0);
+ }
- public void log_orbspecific_jacorb_recoverycoordinators_ServerRecoveryInterceptor_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.ServerRecoveryInterceptor_1");
- }
- }
+ public String get_orbspecific_otiderror() {
+ return "ARJUNA-22106 is not a valid unique identifier!";
+ }
- public void log_orbspecific_javaidl_interceptors_context_codeccreate() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.codeccreate");
- }
- }
+ public void warn_orbspecific_tficaught(String arg0, Uid arg1, Throwable arg2) {
+ logger.logv(WARN, arg2, "ARJUNA-22107 {0} for {1} caught exception", arg0, arg1);
+ }
- public void log_orbspecific_javaidl_interceptors_context_codecerror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.codecerror", new Object[] {arg0, arg1});
- }
- }
+ public void warn_orbspecific_tidyfail(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22108 {0} attempt to clean up failed with exception", arg0);
+ }
- public void log_orbspecific_javaidl_interceptors_context_duplicatename(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.duplicatename", new Object[] {arg0, arg1});
- }
- }
+ public void warn_otsservererror(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22109 Resolution of OTS server failed", (Object)null);
+ }
- public void log_orbspecific_javaidl_interceptors_context_error() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.error");
- }
- }
+ public void warn_otsserverfailed(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22110 Resolution of OTS server failed - invalid name", (Object)null);
+ }
- public void log_orbspecific_javaidl_interceptors_context_invalidparam() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.invalidparam");
- }
- }
+ public void info_recovery_ExpiredContactScanner_3(Uid arg0) {
+ logger.logv(INFO, "ARJUNA-22113 Removing old contact item {0}", arg0);
+ }
- public void log_orbspecific_javaidl_interceptors_context_sie() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.sie");
- }
- }
+ public void warn_recovery_RecoveryEnablement_1() {
+ logger.logv(WARN, "ARJUNA-22116 Could not locate supported ORB for RecoveryCoordinator initialisation.", (Object)null);
+ }
- public void log_orbspecific_javaidl_interceptors_context_srie(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.srie", new Object[] {arg0, arg1});
- }
- }
+ public void warn_recovery_RecoveryEnablement_6(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22121 The Recovery Service Initialisation failed}", (Object)null);
+ }
- public void log_orbspecific_javaidl_interceptors_interposition_codeccreate() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.codeccreate");
- }
- }
+ public void fatal_recovery_RecoveryInit_4() {
+ logger.logv(FATAL, "ARJUNA-22125 RecoveryCoordinator service can only be provided in RecoveryManager", (Object)null);
+ }
- public void log_orbspecific_javaidl_interceptors_interposition_codecerror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.codecerror", new Object[] {arg0, arg1});
- }
- }
+ public void warn_recovery_contact_FactoryContactItem_1(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22127 Problem with storing process/factory link", (Object)null);
+ }
- public void log_orbspecific_javaidl_interceptors_interposition_duplicatename(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.duplicatename", new Object[] {arg0, arg1});
- }
- }
+ public void warn_recovery_contact_FactoryContactItem_2() {
+ logger.logv(WARN, "ARJUNA-22128 Attempted to read FactoryContactItem of different version", (Object)null);
+ }
- public void log_orbspecific_javaidl_interceptors_interposition_invalidparam() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.invalidparam");
- }
- }
+ public void warn_recovery_contact_FactoryContactItem_3() {
+ logger.logv(WARN, "ARJUNA-22129 Stored IOR is not an ArjunaFactory", (Object)null);
+ }
- public void log_orbspecific_javaidl_interceptors_interposition_sie() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.sie");
- }
- }
+ public void warn_recovery_contact_FactoryContactItem_4(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22130 Problem with restoring process/factory link", (Object)null);
+ }
- public void log_orbspecific_javaidl_interceptors_interposition_srie(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.srie", new Object[] {arg0, arg1});
- }
- }
+ public void warn_recovery_contact_FactoryContactItem_5() {
+ logger.logv(WARN, "ARJUNA-22131 Problem with restoring process/factory link", (Object)null);
+ }
- public void log_orbspecific_otiderror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.otiderror");
- }
- }
+ public void warn_recovery_contact_FactoryContactItem_6() {
+ logger.logv(WARN, "ARJUNA-22132 Problem with storing process/factory link", (Object)null);
+ }
- public void log_orbspecific_tficaught(String arg0, String arg1, String arg2) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.tficaught", new Object[] {arg0, arg1, arg2});
- }
- }
+ public void warn_recovery_contact_FactoryContactItem_7(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22133 Problem with removing contact item", (Object)null);
+ }
- public void log_orbspecific_tidyfail(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.orbspecific.tidyfail", new Object[] {arg0, arg1});
- }
- }
+ public void warn_recovery_contact_StatusChecker_10() {
+ logger.logv(WARN, "ARJUNA-22138 NoTransaction exception on trying to contact original process", (Object)null);
+ }
- public void log_otsservererror(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.otsservererror", new Object[] {arg0});
- }
- }
+ public void warn_recovery_contact_StatusChecker_11(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22139 CORBA exception on trying to contact original process", (Object)null);
+ }
- public void log_otsserverfailed(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.otsserverfailed", new Object[] {arg0});
- }
- }
+ public void warn_recovery_contact_StatusChecker_12(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22140 Exception on trying to contact original process", (Object)null);
+ }
- public void log_recovery_ExpiredContactScanner_1(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_1", new Object[] {arg0});
- }
- }
+ public void warn_recovery_contact_StatusChecker_14(Uid arg0) {
+ logger.logv(WARN, "ARJUNA-22142 no known contactitem for {0}", arg0);
+ }
- public void log_recovery_ExpiredContactScanner_2(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_2", new Object[] {arg0});
- }
- }
+ public void warn_recovery_contact_StatusChecker_15(Uid arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22143 surprise item in StatusChecker list for {0}", arg0);
+ }
- public void log_recovery_ExpiredContactScanner_3(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_3", new Object[] {arg0});
- }
- }
+ public void warn_recovery_contact_StatusChecker_3(Uid arg0) {
+ logger.logv(WARN, "ARJUNA-22145 StatusChecked.getStatus - found intentions list for apparently unknown transaction: {0}", arg0);
+ }
- public void log_recovery_ExpiredContactScanner_4(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_4", new Object[] {arg0});
- }
- }
+ public void warn_recovery_contact_StatusChecker_9() {
+ logger.logv(WARN, "ARJUNA-22151 BAD_PARAM exception on trying to contact original process", (Object)null);
+ }
- public void log_recovery_ExpiredContactScanner_5(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.ExpiredContactScanner_5", new Object[] {arg0, arg1});
- }
- }
+ public void warn_recovery_rcnull(String arg0) {
+ logger.logv(WARN, "ARJUNA-22152 {0} - being passed a null reference. Will ignore!", arg0);
+ }
- public void log_recovery_RecoveryEnablement_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_1");
- }
- }
+ public void warn_recovery_recoverycoordinators_GenericRecoveryCreator_1() {
+ logger.logv(WARN, "ARJUNA-22156 GenericRecoveryCreator: Missing params to create", (Object)null);
+ }
- public void log_recovery_RecoveryEnablement_2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_2");
- }
- }
+ public void warn_recovery_recoverycoordinators_RecoveryCoordinatorId_2(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22158 System exception when creating RecoveryCoordinator object key", (Object)null);
+ }
- public void log_recovery_RecoveryEnablement_3(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_3", new Object[] {arg0, arg1});
- }
- }
+ public void warn_recovery_recoverycoordinators_RecoveryCoordinatorId_3(String arg0) {
+ logger.logv(WARN, "ARJUNA-22159 RecoveryCoordinatorId could not decode data {0}", arg0);
+ }
- public void log_recovery_RecoveryEnablement_4() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_4");
- }
- }
+ public void warn_recovery_recoveryinit_1() {
+ logger.logv(WARN, "ARJUNA-22161 Failure recovery not supported for this ORB.", (Object)null);
+ }
- public void log_recovery_RecoveryEnablement_5(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_5", new Object[] {arg0});
- }
- }
+ public void warn_recovery_transactions_RecoveredServerTransaction_10(Uid arg0) {
+ logger.logv(WARN, "ARJUNA-22167 Got TRANSIENT from ORB for tx {0} and assuming OBJECT_NOT_EXIST", arg0);
+ }
- public void log_recovery_RecoveryEnablement_6(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_6", new Object[] {arg0});
- }
- }
+ public void warn_recovery_transactions_RecoveredServerTransaction_12() {
+ logger.logv(WARN, "ARJUNA-22169 RecoveredServerTransaction: caught NotPrepared", (Object)null);
+ }
- public void log_recovery_RecoveryInit_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.RecoveryInit_1");
- }
- }
+ public void warn_recovery_transactions_RecoveredServerTransaction_13(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22170 RecoveredServerTransaction: caught unexpected exception", (Object)null);
+ }
- public void log_recovery_RecoveryInit_2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.RecoveryInit_2");
- }
- }
+ public void warn_recovery_transactions_RecoveredServerTransaction_14(Uid arg0) {
+ logger.logv(WARN, "ARJUNA-22171 RecoveredServerTransaction: {0} is invalid", arg0);
+ }
- public void log_recovery_RecoveryInit_3(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.RecoveryInit_3", new Object[] {arg0});
- }
- }
+ public void warn_recovery_transactions_RecoveredServerTransaction_2(Uid arg0) {
+ logger.logv(WARN, "ARJUNA-22175 RecoveredServerTransaction - activate of {0} failed!", arg0);
+ }
- public void log_recovery_RecoveryInit_4() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.RecoveryInit_4");
- }
- }
+ public void info_recovery_transactions_RecoveredServerTransaction_6(Uid arg0) {
+ logger.logv(INFO, "ARJUNA-22178 ServerTransaction {0} unable determine status - retry later", arg0);
+ }
- public void log_recovery_RecoveryInit_5(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.RecoveryInit_5", new Object[] {arg0});
- }
- }
+ public void warn_recovery_transactions_RecoveredServerTransaction_7(String arg0) {
+ logger.logv(WARN, "ARJUNA-22179 RecoveredServerTransaction.replayPhase2: unexpected Status: {0}", arg0);
+ }
- public void log_recovery_contact_FactoryContactItem_1(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_1", new Object[] {arg0});
- }
- }
+ public void warn_recovery_transactions_RecoveredTransaction_2(Uid arg0) {
+ logger.logv(WARN, "ARJUNA-22183 RecoveredTransaction activate of {0} failed", arg0);
+ }
- public void log_recovery_contact_FactoryContactItem_2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_2");
- }
- }
+ public void warn_recovery_transactions_RecoveredTransaction_3(Uid arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22184 RecoveredTransaction activate of {0} failed", arg0);
+ }
- public void log_recovery_contact_FactoryContactItem_3() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_3");
- }
- }
+ public void warn_recovery_transactions_RecoveredTransaction_6(String arg0) {
+ logger.logv(WARN, "ARJUNA-22186 RecoveredTransaction.replayPhase2 for {0} failed", arg0);
+ }
- public void log_recovery_contact_FactoryContactItem_4(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_4", new Object[] {arg0});
- }
- }
+ public void warn_recovery_transactions_RecoveredTransaction_8(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22188 RecoveredTransaction.removeOldStoreEntry - problem", (Object)null);
+ }
- public void log_recovery_contact_FactoryContactItem_5() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_5");
- }
- }
+ public void info_recovery_transactions_ServerTransactionRecoveryModule_3() {
+ logger.logv(INFO, "ARJUNA-22190 ServerTransactionRecoveryModule - First Pass", (Object)null);
+ }
- public void log_recovery_contact_FactoryContactItem_6() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_6");
- }
- }
+ public void info_recovery_transactions_ServerTransactionRecoveryModule_4() {
+ logger.logv(INFO, "ARJUNA-22191 ServerTransactionRecoveryModule - Second Pass", (Object)null);
+ }
- public void log_recovery_contact_FactoryContactItem_7(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.FactoryContactItem_7", new Object[] {arg0});
- }
- }
+ public void info_recovery_transactions_ServerTransactionRecoveryModule_5(Uid arg0) {
+ logger.logv(INFO, "ARJUNA-22192 ServerTransactionRecoveryModule - Transaction {0} still in ActionStore", arg0);
+ }
- public void log_recovery_contact_RecoveryContactWriter_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.RecoveryContactWriter_1");
- }
- }
+ public void info_recovery_transactions_TopLevelTransactionRecoveryModule_3() {
+ logger.logv(INFO, "ARJUNA-22199 TopLevelTransactionRecoveryModule First Pass", (Object)null);
+ }
- public void log_recovery_contact_RecoveryContactWriter_2(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.RecoveryContactWriter_2", new Object[] {arg0});
- }
- }
+ public void info_recovery_transactions_TopLevelTransactionRecoveryModule_4() {
+ logger.logv(INFO, "ARJUNA-22200 TopLevelTransactionRecoveryModule Second Pass", (Object)null);
+ }
- public void log_recovery_contact_RecoveryContactWriter_3() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.RecoveryContactWriter_3");
- }
- }
+ public void warn_recovery_transactions_TransactionCacheItem_2(String arg0) {
+ logger.logv(WARN, "ARJUNA-22202 TransactionCacheItem.loadTransaction - unknown type: {0}", arg0);
+ }
- public void log_recovery_contact_StatusChecker_1(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_1", new Object[] {arg0, arg1});
- }
- }
+ public void info_recovery_transactions_TransactionCache_4(Uid arg0) {
+ logger.logv(INFO, "ARJUNA-22206 Transaction {0} assumed complete - will not poll any more", arg0);
+ }
- public void log_recovery_contact_StatusChecker_10() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_10");
- }
- }
+ public void info_recovery_transactions_TransactionCache_5(Uid arg0) {
+ logger.logv(INFO, "ARJUNA-22207 Transaction {0} recovery completed", arg0);
+ }
- public void log_recovery_contact_StatusChecker_11() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_11");
- }
- }
+ public void info_recovery_transactions_TransactionRecoveryModule_11() {
+ logger.logv(INFO, "ARJUNA-22213 TransactionRecoveryModule.periodicWorkFirstPass()", (Object)null);
+ }
- public void log_recovery_contact_StatusChecker_12() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_12");
- }
- }
+ public void info_recovery_transactions_TransactionRecoveryModule_12() {
+ logger.logv(INFO, "ARJUNA-22214 TransactionRecoveryModule.periodicWorkSecondPass()", (Object)null);
+ }
- public void log_recovery_contact_StatusChecker_13(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_13", new Object[] {arg0});
- }
- }
+ public void warn_recovery_transactions_TransactionRecoveryModule_2() {
+ logger.logv(WARN, "ARJUNA-22215 TransactionRecoveryModule: transaction type not set", (Object)null);
+ }
- public void log_recovery_contact_StatusChecker_14(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_14", new Object[] {arg0});
- }
- }
+ public void warn_recovery_transactions_TransactionRecoveryModule_4(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22217 TransactionRecoveryModule: Object store exception", (Object)null);
+ }
- public void log_recovery_contact_StatusChecker_15(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_15", new Object[] {arg0, arg1});
- }
- }
+ public void info_recovery_transactions_TransactionRecoveryModule_6(Uid arg0) {
+ logger.logv(INFO, "ARJUNA-22219 Transaction {0} still in ActionStore", arg0);
+ }
- public void log_recovery_contact_StatusChecker_2(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_2", new Object[] {arg0, arg1});
- }
- }
+ public void warn_resources_errgenerr(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22223 {0} caught exception", arg0);
+ }
- public void log_recovery_contact_StatusChecker_3(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_3", new Object[] {arg0});
- }
- }
+ public void warn_resources_errnoparent(String arg0) {
+ logger.logv(WARN, "ARJUNA-22224 {0} - no parent!", arg0);
+ }
- public void log_recovery_contact_StatusChecker_4(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_4", new Object[] {arg0, arg1});
- }
- }
+ public void warn_resources_errnores(String arg0) {
+ logger.logv(WARN, "ARJUNA-22225 {0} called without a resource reference!", arg0);
+ }
- public void log_recovery_contact_StatusChecker_5(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_5", new Object[] {arg0});
- }
- }
+ public void warn_resources_errsavefail(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-22226 {0} failed. Returning default value: {1}", arg0, arg1);
+ }
- public void log_recovery_contact_StatusChecker_6(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_6", new Object[] {arg0});
- }
- }
+ public void warn_resources_errsetvalue(String arg0) {
+ logger.logv(WARN, "ARJUNA-22227 {0} called illegally!", arg0);
+ }
- public void log_recovery_contact_StatusChecker_7(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_7", new Object[] {arg0});
- }
- }
+ public void warn_resources_errtypefail(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-22228 {0} failed. Returning default value: {1}", arg0, arg1);
+ }
- public void log_recovery_contact_StatusChecker_8(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_8", new Object[] {arg0});
- }
- }
+ public void warn_resources_noparent(Uid arg0) {
+ logger.logv(WARN, "ARJUNA-22229 {0} has no parent transaction!", arg0);
+ }
- public void log_recovery_contact_StatusChecker_9() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.contact.StatusChecker_9");
- }
- }
+ public void warn_resources_rrcaught(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22230 {0} caught exception", arg0);
+ }
- public void log_recovery_rcnull(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.rcnull", new Object[] {arg0});
- }
- }
+ public void warn_resources_rrillegalvalue(String arg0) {
+ logger.logv(WARN, "ARJUNA-22231 {0} called illegally.", arg0);
+ }
- public void log_recovery_recoverycoordinators_GenericRecoveryCoordinator_1(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCoordinator_1", new Object[] {arg0});
- }
- }
+ public void warn_resources_rrinvalid(String arg0) {
+ logger.logv(WARN, "ARJUNA-22232 {0} called without a resource!", arg0);
+ }
- public void log_recovery_recoverycoordinators_GenericRecoveryCoordinator_2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCoordinator_2");
- }
- }
+ public void warn_eicaughtexception(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22233 {0} caught unexpected exception", arg0);
+ }
- public void log_recovery_recoverycoordinators_GenericRecoveryCoordinator_4(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCoordinator_4", new Object[] {arg0});
- }
- }
+ public void warn_excalledagain(String arg0) {
+ logger.logv(WARN, "ARJUNA-22234 {0} called multiple times.", arg0);
+ }
- public void log_recovery_recoverycoordinators_GenericRecoveryCreator_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCreator_1");
- }
- }
+ public void warn_extensions_abortfail(String arg0) {
+ logger.logv(WARN, "ARJUNA-22235 Could not rollback transaction {0}", arg0);
+ }
- public void log_recovery_recoverycoordinators_RecoveryCoordinatorId_1(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.RecoveryCoordinatorId_1", new Object[] {arg0});
- }
- }
+ public void warn_extensions_abortfailnoexist(String arg0) {
+ logger.logv(WARN, "ARJUNA-22236 Could not rollback transaction {0} as it does not exist!", arg0);
+ }
- public void log_recovery_recoverycoordinators_RecoveryCoordinatorId_2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.RecoveryCoordinatorId_2");
- }
- }
+ public void warn_extensions_atcannotabort(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-22237 {0} - cannot rollback {1}", arg0, arg1);
+ }
- public void log_recovery_recoverycoordinators_RecoveryCoordinatorId_3(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.RecoveryCoordinatorId_3", new Object[] {arg0});
- }
- }
+ public void warn_extensions_atgenerror(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22239 {0} caught unexpected exception", arg0);
+ }
- public void log_recovery_recoverycoordinators_ResourceCompletor_1(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.recoverycoordinators.ResourceCompletor_1", new Object[] {arg0});
- }
- }
+ public void warn_extensions_atnovalidtx(String arg0) {
+ logger.logv(WARN, "ARJUNA-22240 {0} - no transaction!", arg0);
+ }
- public void log_recovery_recoveryinit_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.recoveryinit_1");
- }
- }
+ public void warn_extensions_atoutofseq(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-22241 {0} - terminated out of sequence {1}", arg0, arg1);
+ }
- public void log_recovery_transactions_AssumedCompleteServerTransaction_1(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.AssumedCompleteServerTransaction_1", new Object[] {arg0});
- }
- }
+ public void warn_extensions_atscope(String arg0, Uid arg1) {
+ logger.logv(WARN, "ARJUNA-22242 {0} - running atomic transaction going out of scope. Will roll back. {1}", arg0, arg1);
+ }
- public void log_recovery_transactions_AssumedCompleteTransaction_1(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.AssumedCompleteTransaction_1", new Object[] {arg0});
- }
- }
+ public void warn_extensions_atunavailable(String arg0) {
+ logger.logv(WARN, "ARJUNA-22243 {0} - transaction unavailable.", arg0);
+ }
- public void log_recovery_transactions_CachedRecoveredTransaction_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.CachedRecoveredTransaction_1");
- }
- }
+ public void warn_extensions_atwillabort(String arg0) {
+ logger.logv(WARN, "ARJUNA-22244 Will roll back. Current transaction is {0}", arg0);
+ }
- public void log_recovery_transactions_CachedRecoveredTransaction_2(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.CachedRecoveredTransaction_2", new Object[] {arg0});
- }
- }
+ public void warn_extensions_namefail(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22245 Cannot determine transaction name!", (Object)null);
+ }
- public void log_recovery_transactions_RecoveredServerTransaction_1(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_1", new Object[] {arg0});
- }
- }
+ public void warn_extensions_threadasserror(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22246 {0} caught exception", arg0);
+ }
- public void log_recovery_transactions_RecoveredServerTransaction_10(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_10", new Object[] {arg0});
- }
- }
+ public void warn_extensions_tltnestedscope(String arg0) {
+ logger.logv(WARN, "ARJUNA-22247 Top-level transaction going out of scope with nested transaction {0} still set.", arg0);
+ }
- public void log_recovery_transactions_RecoveredServerTransaction_11(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_11", new Object[] {arg0});
- }
- }
+ public void warn_exunregfail(String arg0) {
+ logger.logv(WARN, "ARJUNA-22248 {0} - could not unregister from transaction!", arg0);
+ }
- public void log_recovery_transactions_RecoveredServerTransaction_12() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_12");
- }
- }
+ public void warn_thread_resumefailed(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-22249 {0} - could not resume transaction", arg0);
+ }
- public void log_recovery_transactions_RecoveredServerTransaction_13() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_13");
- }
- }
+ public String get_thread_resumefailederror() {
+ return "ARJUNA-22250 could not resume transaction:";
+ }
- public void log_recovery_transactions_RecoveredServerTransaction_14(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_14", new Object[] {arg0});
- }
- }
+ public void warn_utils_ORBSetup_orbalreadyset() {
+ logger.logv(WARN, "ARJUNA-22251 The ORBManager is already associated with an ORB/OA.", (Object)null);
+ }
- public void log_recovery_transactions_RecoveredServerTransaction_15() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_15");
- }
+ public void warn_recoveredServerTransaction_removeOldStoreEntry(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-22252 Failed to remove old ObjectStore entry", (Object)null);
}
- public void log_recovery_transactions_RecoveredServerTransaction_16(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_16", new Object[] {arg0, arg1});
- }
+ public String get_orbspecific_jacorb_interceptors_context_cie() {
+ return "ARJUNA-22253 A client-side request interceptor already exists with that name.";
}
- public void log_recovery_transactions_RecoveredServerTransaction_17(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_17", new Object[] {arg0, arg1});
- }
+ public String get_orbspecific_jacorb_interceptors_interposition_cie() {
+ return "ARJUNA-22254 A client-side request interceptor already exists with that name.";
}
- public void log_recovery_transactions_RecoveredServerTransaction_2(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_2", new Object[] {arg0});
- }
+ public String get_orbspecific_javaidl_interceptors_context_cie() {
+ return "ARJUNA-22255 A client-side request interceptor already exists with that name.";
}
- public void log_recovery_transactions_RecoveredServerTransaction_4(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_4", new Object[] {arg0, arg1});
- }
+ public String get_orbspecific_javaidl_interceptors_interposition_cie() {
+ return "ARJUNA-22256 A client-side request interceptor already exists with that name.";
}
- public void log_recovery_transactions_RecoveredServerTransaction_5(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_5", new Object[] {arg0, arg1});
- }
+ public void warn_orbspecific_coordinator_ipunknown(String arg0, String arg1) {
+ logger.logv(WARN, "ARJUNA-22257 {0} - unknown interposition type: {1}", arg0, arg1);
}
-
- public void log_recovery_transactions_RecoveredServerTransaction_6(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_6", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_RecoveredServerTransaction_7(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_7", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_RecoveredServerTransaction_8(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_8", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_RecoveredServerTransaction_9(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredServerTransaction_9", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_RecoveredTransaction_1(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_1", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_RecoveredTransaction_2(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_2", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_RecoveredTransaction_3(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_3", new Object[] {arg0, arg1});
- }
- }
-
- public void log_recovery_transactions_RecoveredTransaction_5(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_5", new Object[] {arg0, arg1});
- }
- }
-
- public void log_recovery_transactions_RecoveredTransaction_6(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_6", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_RecoveredTransaction_7(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_7", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_RecoveredTransaction_8() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_8");
- }
- }
-
- public void log_recovery_transactions_ServerTransactionRecoveryModule_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_1");
- }
- }
-
- public void log_recovery_transactions_ServerTransactionRecoveryModule_3() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_3");
- }
- }
-
- public void log_recovery_transactions_ServerTransactionRecoveryModule_4() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_4");
- }
- }
-
- public void log_recovery_transactions_ServerTransactionRecoveryModule_5(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_5", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_ServerTransactionRecoveryModule_6(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_6", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_ServerTransactionRecoveryModule_7(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_7", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_ServerTransactionRecoveryModule_8(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_8", new Object[] {arg0, arg1});
- }
- }
-
- public void log_recovery_transactions_ServerTransactionRecoveryModule_9(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule_9", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_TopLevelTransactionRecoveryModule_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_1");
- }
- }
-
- public void log_recovery_transactions_TopLevelTransactionRecoveryModule_2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_2");
- }
- }
-
- public void log_recovery_transactions_TopLevelTransactionRecoveryModule_3() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_3");
- }
- }
-
- public void log_recovery_transactions_TopLevelTransactionRecoveryModule_4() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule_4");
- }
- }
-
- public void log_recovery_transactions_TransactionCacheItem_1(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCacheItem_1", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_TransactionCacheItem_2(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCacheItem_2", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_TransactionCache_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_1");
- }
- }
-
- public void log_recovery_transactions_TransactionCache_2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_2");
- }
- }
-
- public void log_recovery_transactions_TransactionCache_3(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_3", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_TransactionCache_4(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_4", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_TransactionCache_5(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_5", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_TransactionCache_6(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_6", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_TransactionCache_7(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_7", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_TransactionCache_8(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionCache_8", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_TransactionRecoveryModule_1() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_1");
- }
- }
-
- public void log_recovery_transactions_TransactionRecoveryModule_10(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_10", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_TransactionRecoveryModule_11() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_11");
- }
- }
-
- public void log_recovery_transactions_TransactionRecoveryModule_12() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_12");
- }
- }
-
- public void log_recovery_transactions_TransactionRecoveryModule_2() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_2");
- }
- }
-
- public void log_recovery_transactions_TransactionRecoveryModule_3(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_3", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_TransactionRecoveryModule_4() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_4");
- }
- }
-
- public void log_recovery_transactions_TransactionRecoveryModule_5(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_5", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_TransactionRecoveryModule_6(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_6", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_TransactionRecoveryModule_7(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_7", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_TransactionRecoveryModule_8(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_8", new Object[] {arg0});
- }
- }
-
- public void log_recovery_transactions_TransactionRecoveryModule_9(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_9", new Object[] {arg0, arg1});
- }
- }
-
- public void log_resources_errgenerr(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.resources.errgenerr", new Object[] {arg0, arg1});
- }
- }
-
- public void log_resources_errnoparent(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.resources.errnoparent", new Object[] {arg0});
- }
- }
-
- public void log_resources_errnores(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.resources.errnores", new Object[] {arg0});
- }
- }
-
- public void log_resources_errsavefail(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.resources.errsavefail", new Object[] {arg0, arg1});
- }
- }
-
- public void log_resources_errsetvalue(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.resources.errsetvalue", new Object[] {arg0});
- }
- }
-
- public void log_resources_errtypefail(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.resources.errtypefail", new Object[] {arg0, arg1});
- }
- }
-
- public void log_resources_noparent(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.resources.noparent", new Object[] {arg0});
- }
- }
-
- public void log_resources_rrcaught(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.resources.rrcaught", new Object[] {arg0, arg1});
- }
- }
-
- public void log_resources_rrillegalvalue(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.resources.rrillegalvalue", new Object[] {arg0});
- }
- }
-
- public void log_resources_rrinvalid(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.internal.jts.resources.rrinvalid", new Object[] {arg0});
- }
- }
-
- public void log_eicaughtexception(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.eicaughtexception", new Object[] {arg0, arg1});
- }
- }
-
- public void log_excalledagain(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.excalledagain", new Object[] {arg0});
- }
- }
-
- public void log_extensions_abortfail(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.extensions.abortfail", new Object[] {arg0});
- }
- }
-
- public void log_extensions_abortfailnoexist(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.extensions.abortfailnoexist", new Object[] {arg0});
- }
- }
-
- public void log_extensions_atcannotabort(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.extensions.atcannotabort", new Object[] {arg0, arg1});
- }
- }
-
- public void log_extensions_atcurrenttxnull(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.extensions.atcurrenttxnull", new Object[] {arg0});
- }
- }
-
- public void log_extensions_atgenerror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.extensions.atgenerror", new Object[] {arg0, arg1});
- }
- }
-
- public void log_extensions_atnovalidtx(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.extensions.atnovalidtx", new Object[] {arg0});
- }
- }
-
- public void log_extensions_atoutofseq(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.extensions.atoutofseq", new Object[] {arg0, arg1});
- }
- }
-
- public void log_extensions_atscope(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.extensions.atscope", new Object[] {arg0, arg1});
- }
- }
-
- public void log_extensions_atunavailable(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.extensions.atunavailable", new Object[] {arg0});
- }
- }
-
- public void log_extensions_atwillabort(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.extensions.atwillabort", new Object[] {arg0});
- }
- }
-
- public void log_extensions_namefail() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.extensions.namefail");
- }
- }
-
- public void log_extensions_threadasserror(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.extensions.threadasserror", new Object[] {arg0, arg1});
- }
- }
-
- public void log_extensions_tltnestedscope(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.extensions.tltnestedscope", new Object[] {arg0});
- }
- }
-
- public void log_exunregfail(String arg0) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.exunregfail", new Object[] {arg0});
- }
- }
-
- public void log_thread_resumefailed(String arg0, String arg1) {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.thread.resumefailed", new Object[] {arg0, arg1});
- }
- }
-
- public void log_thread_resumefailederror() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.thread.resumefailederror");
- }
- }
-
- public void log_utils_ORBSetup_orbalreadyset() {
- if(logi18n.isWarnEnabled()) {
- logi18n.warn("com.arjuna.ats.jts.utils.ORBSetup.orbalreadyset");
- }
- }
-
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsLogger.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsLogger.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -32,18 +32,17 @@
package com.arjuna.ats.jts.logging;
import com.arjuna.common.util.logging.*;
+import org.jboss.logging.Logger;
public class jtsLogger
{
public static LogNoi18n logger;
- public static Logi18n loggerI18N;
public static jtsI18NLogger i18NLogger;
public static void initialize(LogNoi18n noi18n, Logi18n i18n)
{
logger = noi18n;
- loggerI18N = i18n;
- i18NLogger = new jtsI18NLoggerImpl(i18n);
+ i18NLogger = new jtsI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.jts"));
}
static
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextClientRequestInterceptorImpl.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextClientRequestInterceptorImpl.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -116,11 +116,6 @@
return "OTS_Context";
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.error Context interceptor caught an unexpected exception:
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.invalidparam Invalid portable interceptor transaction parameter!
- */
-
public void send_request (ClientRequestInfo request_info) throws SystemException
{
if (jtsLogger.logger.isDebugEnabled())
@@ -181,7 +176,7 @@
if ( (localData != null) && (localData.type().kind().value() != TCKind._tk_null) )
{
if ( (threadId = localData.extract_string()) == null )
- throw new UNKNOWN(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.invalidparam"));
+ throw new UNKNOWN(jtsLogger.i18NLogger.get_orbspecific_jacorb_interceptors_context_invalidparam());
}
else
threadId = ThreadUtil.getThreadId() ;
@@ -247,15 +242,11 @@
{
throw e;
}
- catch (Exception ex)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.error", ex);
- }
+ catch (Exception ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_context_error(ex);
- throw new UNKNOWN(ex.toString());
- }
+ throw new UNKNOWN(ex.toString());
+ }
finally
{
/** If we are set to always propagate then ensure we clear the inuse flag **/
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextORBInitializerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextORBInitializerImpl.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextORBInitializerImpl.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -37,8 +37,6 @@
import com.arjuna.ats.jts.*;
import com.arjuna.ats.jts.logging.*;
-import com.arjuna.common.util.logging.*;
-
import org.omg.CORBA.*;
import org.omg.PortableInterceptor.*;
import org.omg.PortableInterceptor.ORBInitInfoPackage.*;
@@ -63,13 +61,6 @@
ThreadActionData.addSetup(new ContextThreadSetup());
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.codecerror {0} - a failure occured when getting {1} codec - unknown encoding.
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.duplicatename {0} - duplicate interceptor name for {1} when registering
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.codeccreate Cannot create a codec of the required encoding.
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.sie A server-side request interceptor already exists with that name.
- */
-
public void pre_init (ORBInitInfo init_info)
{
if (jtsLogger.logger.isDebugEnabled())
@@ -107,13 +98,10 @@
}
catch (UnknownEncoding ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.codecerror",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_context_codecerror(
+ "ContextORBInitializerImpl", "ENCODING_CDR_ENCAPS", ex);
- throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.codeccreate"), ex);
+ throw new FatalError(jtsLogger.i18NLogger.get_orbspecific_jacorb_interceptors_context_codeccreate(), ex);
}
/*
@@ -133,13 +121,10 @@
}
catch (DuplicateName ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.duplicatename",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ClientRequestInterceptor" }, ex);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_context_duplicatename(
+ "ContextORBInitializerImpl", "ClientRequestInterceptor", ex);
- throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.cie"), ex);
+ throw new FatalError(jtsLogger.i18NLogger.get_orbspecific_jacorb_interceptors_context_cie(), ex);
}
/*
@@ -159,13 +144,10 @@
}
catch (DuplicateName ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.duplicatename",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ServerRequestInterceptor" }, ex);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_context_duplicatename(
+ "ContextORBInitializerImpl", "ServerRequestInterceptor", ex);
- throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.sie"), ex);
+ throw new FatalError(jtsLogger.i18NLogger.get_orbspecific_jacorb_interceptors_context_sie(), ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextServerRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextServerRequestInterceptorImpl.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextServerRequestInterceptorImpl.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -58,8 +58,6 @@
/**
* PortableInterceptor::ServerRequestInterceptor implementation which checks
* that a transaction context was received.
- *
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.srie {0} caught an unexpected exception: {1}
*/
/*
@@ -220,25 +218,18 @@
{
suspendContext(request_info);
}
- catch (SystemException ex)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.srie",
- new java.lang.Object[] {"ContextServerRequestInterceptorImpl::send_reply", ex} );
- }
-
- throw ex;
- }
- catch (Exception e)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.srie",
- new java.lang.Object[] {"ContextServerRequestInterceptorImpl::send_reply", e} );
+ catch (SystemException ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_context_srie("ContextServerRequestInterceptorImpl::send_reply", ex);
- throw new BAD_OPERATION(e.toString());
- }
+ throw ex;
}
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_context_srie("ContextServerRequestInterceptorImpl::send_reply", e);
+ throw new BAD_OPERATION(e.toString());
+ }
+ }
+
public void send_exception (ServerRequestInfo request_info) throws SystemException
{
if (jtsLogger.logger.isDebugEnabled())
@@ -250,27 +241,17 @@
{
suspendContext(request_info);
}
- catch (SystemException e1)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.srie",
- new java.lang.Object[] {"ContextServerRequestInterceptorImpl::send_exception", e1} );
- }
+ catch (SystemException e1) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_context_srie("ContextServerRequestInterceptorImpl::send_exception", e1);
- throw e1;
- }
- catch (Exception e2)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.srie",
- new java.lang.Object[] {"ContextServerRequestInterceptorImpl::send_exception", e2} );
- }
+ throw e1;
+ }
+ catch (Exception e2) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_context_srie("ContextServerRequestInterceptorImpl::send_exception", e2);
- throw new BAD_OPERATION(e2.toString());
- }
+ throw new BAD_OPERATION(e2.toString());
}
+ }
public void send_other (ServerRequestInfo request_info) throws SystemException
{
@@ -283,27 +264,17 @@
{
suspendContext(request_info);
}
- catch (SystemException ex)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.srie",
- new java.lang.Object[] {"ContextServerRequestInterceptorImpl::send_other", ex} );
- }
+ catch (SystemException ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_context_srie("ContextServerRequestInterceptorImpl::send_other", ex);
- throw ex;
- }
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.srie",
- new java.lang.Object[] {"ContextServerRequestInterceptorImpl::send_other", e} );
- }
+ throw ex;
+ }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_context_srie("ContextServerRequestInterceptorImpl::send_other", e);
- throw new BAD_OPERATION(e.toString());
- }
+ throw new BAD_OPERATION(e.toString());
}
+ }
/*
* If there is a thread id associated with PICurrent then it will
@@ -342,16 +313,11 @@
OTSManager.destroyControl(ctx.getControl());
ctx = null;
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.srie",
- new java.lang.Object[] {"ContextServerRequestInterceptorImpl.suspendContext", e} );
- }
-
- throw new UNKNOWN(e.toString());
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_context_srie("ContextServerRequestInterceptorImpl.suspendContext", e);
+
+ throw new UNKNOWN(e.toString());
+ }
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -118,10 +118,6 @@
return "OTS_Interposition";
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.invalidparam Invalid portable interceptor transaction parameter!
- */
-
public void send_request (ClientRequestInfo request_info) throws SystemException
{
if (jtsLogger.logger.isDebugEnabled())
@@ -181,7 +177,7 @@
if ( localData != null && (localData.type().kind().value() != TCKind._tk_null) )
{
if ( (threadId = localData.extract_string()) == null )
- throw new UNKNOWN(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.invalidparam"));
+ throw new UNKNOWN(jtsLogger.i18NLogger.get_orbspecific_jacorb_interceptors_interposition_invalidparam());
}
else
threadId = ThreadUtil.getThreadId() ;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionORBInitializerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionORBInitializerImpl.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionORBInitializerImpl.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -36,13 +36,8 @@
import com.arjuna.ats.internal.arjuna.thread.ThreadActionData;
import com.arjuna.ats.jts.*;
-import com.arjuna.ats.jts.orbspecific.jacorb.interceptors.interposition.InterpositionThreadSetup;
-import com.arjuna.ats.jts.orbspecific.jacorb.interceptors.interposition.InterpositionClientRequestInterceptorImpl;
-import com.arjuna.ats.jts.orbspecific.jacorb.interceptors.interposition.InterpositionServerRequestInterceptorImpl;
import com.arjuna.ats.jts.logging.*;
-import com.arjuna.common.util.logging.*;
-
import org.omg.CORBA.*;
import org.omg.PortableInterceptor.*;
import org.omg.PortableInterceptor.ORBInitInfoPackage.*;
@@ -67,13 +62,6 @@
ThreadActionData.addSetup(new InterpositionThreadSetup());
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.codecerror {0} - a failure occured when getting {1} codec - unknown encoding.
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.duplicatename {0} - duplicate interceptor name for {1} when registering
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.codeccreate Cannot create a codec of the required encoding.
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.sie A server-side request interceptor already exists with that name.
- */
-
public void pre_init (ORBInitInfo init_info)
{
if (jtsLogger.logger.isDebugEnabled())
@@ -111,13 +99,10 @@
}
catch (UnknownEncoding ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.codecerror",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_interposition_codecerror(
+ "InterpositionORBInitializerImpl", "ENCODING_CDR_ENCAPS", ex);
- throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.codeccreate"), ex);
+ throw new FatalError(jtsLogger.i18NLogger.get_orbspecific_jacorb_interceptors_interposition_codeccreate(), ex);
}
/*
@@ -137,13 +122,10 @@
}
catch (DuplicateName ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.duplicatename",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ClientRequestInterceptor" }, ex);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_interposition_duplicatename(
+ "InterpositionORBInitializerImpl", "ClientRequestInterceptor", ex);
- throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.cie"), ex);
+ throw new FatalError(jtsLogger.i18NLogger.get_orbspecific_jacorb_interceptors_interposition_cie(), ex);
}
/*
@@ -163,13 +145,10 @@
}
catch (DuplicateName ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.duplicatename",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ServerRequestInterceptor" }, ex);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_interposition_duplicatename(
+ "InterpositionORBInitializerImpl", "ServerRequestInterceptor", ex);
- throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.sie"), ex);
+ throw new FatalError(jtsLogger.i18NLogger.get_orbspecific_jacorb_interceptors_interposition_sie(), ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -57,8 +57,6 @@
/**
* PortableInterceptor::ServerRequestInterceptor implementation which checks
* that a transaction context was received.
- *
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.srie {0} caught an unexpected exception: {1}
*/
/*
@@ -222,25 +220,17 @@
}
catch (SystemException ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_reply", ex}, ex);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_interposition_srie(
+ "InterpositionServerRequestInterceptorImpl::send_reply", ex);
throw ex;
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_reply", e} );
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_interposition_srie("InterpositionServerRequestInterceptorImpl::send_reply", e);
- throw new BAD_OPERATION();
- }
+ throw new BAD_OPERATION();
}
+ }
public void send_exception (ServerRequestInfo request_info) throws SystemException
{
@@ -253,27 +243,17 @@
{
suspendContext(request_info);
}
- catch (SystemException ex)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_exception", ex} );
- }
+ catch (SystemException ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_interposition_srie("InterpositionServerRequestInterceptorImpl::send_exception", ex);
- throw ex;
- }
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_exception", e} );
- }
+ throw ex;
+ }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_interposition_srie("InterpositionServerRequestInterceptorImpl::send_exception", e);
- throw new BAD_OPERATION();
- }
+ throw new BAD_OPERATION();
}
+ }
public void send_other (ServerRequestInfo request_info) throws SystemException
{
@@ -286,27 +266,17 @@
{
suspendContext(request_info);
}
- catch (SystemException ex)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_other", ex} );
- }
+ catch (SystemException ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_interposition_srie("InterpositionServerRequestInterceptorImpl::send_other", ex);
- throw ex;
- }
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_other", e} );
- }
+ throw ex;
+ }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_jacorb_interceptors_interposition_srie("InterpositionServerRequestInterceptorImpl::send_other", e);
- throw new BAD_OPERATION();
- }
+ throw new BAD_OPERATION();
}
+ }
/*
* If there is a thread id associated with PICurrent then it will
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextClientRequestInterceptorImpl.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextClientRequestInterceptorImpl.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -135,11 +135,6 @@
return "OTS_Context";
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.error Context interceptor caught an unexpected exception:
- * @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.invalidparam Invalid portable interceptor transaction parameter!
- */
-
public void send_request (ClientRequestInfo request_info) throws SystemException
{
if (jtsLogger.logger.isDebugEnabled())
@@ -200,7 +195,7 @@
if (localData.type().kind().value() != TCKind._tk_null)
{
if ((threadId = localData.extract_string()) == null)
- throw new UNKNOWN(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.invalidparam"));
+ throw new UNKNOWN(jtsLogger.i18NLogger.get_orbspecific_javaidl_interceptors_context_invalidparam());
}
else
threadId = ThreadUtil.getThreadId() ;
@@ -266,15 +261,11 @@
{
throw e;
}
- catch (Exception ex)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.error", ex);
- }
+ catch (Exception ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_context_error(ex);
- throw new UNKNOWN(ex.toString());
- }
+ throw new UNKNOWN(ex.toString());
+ }
finally
{
/** If we are set to always propagate then ensure we clear the inuse flag **/
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextORBInitializerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextORBInitializerImpl.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextORBInitializerImpl.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -31,34 +31,19 @@
package com.arjuna.ats.jts.orbspecific.javaidl.interceptors.context;
-import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.exceptions.FatalError;
import com.arjuna.ats.internal.arjuna.thread.ThreadActionData;
import com.arjuna.ats.jts.*;
-import com.arjuna.ats.jts.orbspecific.javaidl.interceptors.context.ContextThreadSetup;
-import com.arjuna.ats.jts.orbspecific.javaidl.interceptors.context.ContextClientRequestInterceptorImpl;
-import com.arjuna.ats.jts.orbspecific.javaidl.interceptors.context.ContextServerRequestInterceptorImpl;
import com.arjuna.ats.jts.logging.*;
-import com.arjuna.orbportability.*;
-
-import com.arjuna.common.util.logging.*;
-
-import org.omg.CosTransactions.*;
import org.omg.CORBA.*;
import org.omg.PortableInterceptor.*;
import org.omg.PortableInterceptor.ORBInitInfoPackage.*;
import org.omg.IOP.*;
import org.omg.IOP.CodecFactoryPackage.*;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.UNKNOWN;
-import org.omg.CORBA.TRANSACTION_REQUIRED;
-import org.omg.CosTransactions.Unavailable;
-
public class ContextORBInitializerImpl extends LocalObject implements ORBInitializer
{
@@ -77,13 +62,6 @@
ThreadActionData.addSetup(new ContextThreadSetup());
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.codecerror {0} - a failure occured when getting {1} codec - unknown encoding.
- * @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.duplicatename {0} - duplicate interceptor name for {1} when registering
- * @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.codeccreate Cannot create a codec of the required encoding.
- * @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.sie A server-side request interceptor already exists with that name.
- */
-
public void pre_init (ORBInitInfo init_info)
{
if (jtsLogger.logger.isDebugEnabled())
@@ -121,13 +99,10 @@
}
catch (UnknownEncoding ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.codecerror",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_context_codecerror(
+ "ContextORBInitializerImpl", "ENCODING_CDR_ENCAPS", ex);
- throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.codeccreate"), ex);
+ throw new FatalError(jtsLogger.i18NLogger.get_orbspecific_javaidl_interceptors_context_codeccreate(), ex);
}
/*
@@ -147,13 +122,10 @@
}
catch (DuplicateName ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.duplicatename",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ClientRequestInterceptor" }, ex);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_context_duplicatename(
+ "ContextORBInitializerImpl", "ClientRequestInterceptor", ex);
- throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.cie"), ex);
+ throw new FatalError(jtsLogger.i18NLogger.get_orbspecific_javaidl_interceptors_context_cie(), ex);
}
/*
@@ -173,13 +145,10 @@
}
catch (DuplicateName ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.duplicatename",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ServerRequestInterceptor" }, ex);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_context_duplicatename(
+ "ContextORBInitializerImpl", "ServerRequestInterceptor", ex);
- throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.sie"), ex);
+ throw new FatalError(jtsLogger.i18NLogger.get_orbspecific_javaidl_interceptors_context_sie(), ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextServerRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextServerRequestInterceptorImpl.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextServerRequestInterceptorImpl.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -58,8 +58,6 @@
/**
* PortableInterceptor::ServerRequestInterceptor implementation which checks
* that a transaction context was received.
- *
- * @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.srie {0} caught an unexpected exception: {1}
*/
/*
@@ -240,25 +238,18 @@
{
suspendContext(request_info);
}
- catch (SystemException ex)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.srie",
- new java.lang.Object[] {"ContextServerRequestInterceptorImpl::send_reply", ex} );
- }
-
- throw ex;
- }
- catch (Exception e)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.srie",
- new java.lang.Object[] {"ContextServerRequestInterceptorImpl::send_reply", e} );
+ catch (SystemException ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_context_srie("ContextServerRequestInterceptorImpl::send_reply", ex);
- throw new BAD_OPERATION(e.toString());
- }
+ throw ex;
}
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_context_srie("ContextServerRequestInterceptorImpl::send_reply", e);
+ throw new BAD_OPERATION(e.toString());
+ }
+ }
+
public void send_exception (ServerRequestInfo request_info) throws SystemException
{
if (jtsLogger.logger.isDebugEnabled())
@@ -270,27 +261,17 @@
{
suspendContext(request_info);
}
- catch (SystemException e1)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.srie",
- new java.lang.Object[] {"ContextServerRequestInterceptorImpl::send_exception", e1} );
- }
+ catch (SystemException e1) {
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_context_srie("ContextServerRequestInterceptorImpl::send_exception", e1);
- throw e1;
- }
- catch (Exception e2)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.srie",
- new java.lang.Object[] {"ContextServerRequestInterceptorImpl::send_exception", e2} );
- }
+ throw e1;
+ }
+ catch (Exception e2) {
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_context_srie("ContextServerRequestInterceptorImpl::send_exception", e2);
- throw new BAD_OPERATION(e2.toString());
- }
+ throw new BAD_OPERATION(e2.toString());
}
+ }
public void send_other (ServerRequestInfo request_info) throws SystemException
{
@@ -303,27 +284,17 @@
{
suspendContext(request_info);
}
- catch (SystemException ex)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.srie",
- new java.lang.Object[] {"ContextServerRequestInterceptorImpl::send_other", ex} );
- }
+ catch (SystemException ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_context_srie("ContextServerRequestInterceptorImpl::send_other", ex);
- throw ex;
- }
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.srie",
- new java.lang.Object[] {"ContextServerRequestInterceptorImpl::send_other", e} );
- }
+ throw ex;
+ }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_context_srie("ContextServerRequestInterceptorImpl::send_other", e);
- throw new BAD_OPERATION(e.toString());
- }
+ throw new BAD_OPERATION(e.toString());
}
+ }
/*
* If there is a thread id associated with PICurrent then it will
@@ -362,16 +333,11 @@
OTSManager.destroyControl(ctx.getControl());
ctx = null;
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.srie",
- new java.lang.Object[] {"ContextServerRequestInterceptorImpl.suspendContext", e} );
- }
-
- throw new UNKNOWN(e.toString());
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_context_srie("ContextServerRequestInterceptorImpl.suspendContext", e);
+
+ throw new UNKNOWN(e.toString());
+ }
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -137,10 +137,6 @@
return "OTS_Interposition";
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.invalidparam Invalid portable interceptor transaction parameter!
- */
-
public void send_request (ClientRequestInfo request_info) throws SystemException
{
if (jtsLogger.logger.isDebugEnabled())
@@ -200,7 +196,7 @@
if (localData.type().kind().value() != TCKind._tk_null)
{
if ((threadId = localData.extract_string()) == null)
- throw new UNKNOWN(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.invalidparam"));
+ throw new UNKNOWN(jtsLogger.i18NLogger.get_orbspecific_javaidl_interceptors_interposition_invalidparam());
}
else
threadId = ThreadUtil.getThreadId() ;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionORBInitializerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionORBInitializerImpl.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionORBInitializerImpl.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -31,34 +31,19 @@
package com.arjuna.ats.jts.orbspecific.javaidl.interceptors.interposition;
-import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.exceptions.FatalError;
import com.arjuna.ats.internal.arjuna.thread.ThreadActionData;
import com.arjuna.ats.jts.*;
-import com.arjuna.ats.jts.orbspecific.javaidl.interceptors.interposition.InterpositionThreadSetup;
-import com.arjuna.ats.jts.orbspecific.javaidl.interceptors.interposition.InterpositionClientRequestInterceptorImpl;
-import com.arjuna.ats.jts.orbspecific.javaidl.interceptors.interposition.InterpositionServerRequestInterceptorImpl;
import com.arjuna.ats.jts.logging.*;
-import com.arjuna.orbportability.*;
-
-import com.arjuna.common.util.logging.*;
-
-import org.omg.CosTransactions.*;
import org.omg.CORBA.*;
import org.omg.PortableInterceptor.*;
import org.omg.PortableInterceptor.ORBInitInfoPackage.*;
import org.omg.IOP.*;
import org.omg.IOP.CodecFactoryPackage.*;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.UNKNOWN;
-import org.omg.CORBA.TRANSACTION_REQUIRED;
-import org.omg.CosTransactions.Unavailable;
-
public class InterpositionORBInitializerImpl extends LocalObject implements ORBInitializer
{
@@ -77,12 +62,6 @@
ThreadActionData.addSetup(new InterpositionThreadSetup());
}
- /**
- * @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.codecerror {0} - a failure occured when getting {1} codec - unknown encoding.
- * @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.duplicatename {0} - duplicate interceptor name for {1} when registering
- * @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.codeccreate Cannot create a codec of the required encoding.
- * @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.sie A server-side request interceptor already exists with that name.
- */
public void pre_init (ORBInitInfo init_info)
{
@@ -121,13 +100,10 @@
}
catch (UnknownEncoding ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.codecerror",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_interposition_codecerror(
+ "InterpositionORBInitializerImpl", "ENCODING_CDR_ENCAPS", ex);
- throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.codeccreate"), ex);
+ throw new FatalError(jtsLogger.i18NLogger.get_orbspecific_javaidl_interceptors_interposition_codeccreate(), ex);
}
/*
@@ -147,13 +123,10 @@
}
catch (DuplicateName ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.duplicatename",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ClientRequestInterceptor" }, ex);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_interposition_duplicatename(
+ "InterpositionORBInitializerImpl", "ClientRequestInterceptor", ex);
- throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.cie"), ex);
+ throw new FatalError(jtsLogger.i18NLogger.get_orbspecific_javaidl_interceptors_interposition_cie(), ex);
}
/*
@@ -173,13 +146,10 @@
}
catch (DuplicateName ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.duplicatename",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ServerRequestInterceptor" }, ex);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_interposition_duplicatename(
+ "InterpositionORBInitializerImpl", "ServerRequestInterceptor", ex);
- throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.sie"), ex);
+ throw new FatalError(jtsLogger.i18NLogger.get_orbspecific_javaidl_interceptors_interposition_sie(), ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -57,8 +57,6 @@
/**
* PortableInterceptor::ServerRequestInterceptor implementation which checks
* that a transaction context was received.
- *
- * @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.srie {0} caught an unexpected exception: {1}
*/
/*
@@ -242,25 +240,17 @@
}
catch (SystemException ex)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_reply", ex}, ex);
- }
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_interposition_srie(
+ "InterpositionServerRequestInterceptorImpl::send_reply", ex);
throw ex;
}
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_reply", e} );
- }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_interposition_srie("InterpositionServerRequestInterceptorImpl::send_reply", e);
- throw new BAD_OPERATION();
- }
+ throw new BAD_OPERATION();
}
+ }
public void send_exception (ServerRequestInfo request_info) throws SystemException
{
@@ -273,27 +263,17 @@
{
suspendContext(request_info);
}
- catch (SystemException ex)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_exception", ex} );
- }
+ catch (SystemException ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_interposition_srie("InterpositionServerRequestInterceptorImpl::send_exception", ex);
- throw ex;
- }
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_exception", e} );
- }
+ throw ex;
+ }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_interposition_srie("InterpositionServerRequestInterceptorImpl::send_exception", e);
- throw new BAD_OPERATION();
- }
+ throw new BAD_OPERATION();
}
+ }
public void send_other (ServerRequestInfo request_info) throws SystemException
{
@@ -306,27 +286,17 @@
{
suspendContext(request_info);
}
- catch (SystemException ex)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_other", ex} );
- }
+ catch (SystemException ex) {
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_interposition_srie("InterpositionServerRequestInterceptorImpl::send_other", ex);
- throw ex;
- }
- catch (Exception e)
- {
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_other", e} );
- }
+ throw ex;
+ }
+ catch (Exception e) {
+ jtsLogger.i18NLogger.warn_orbspecific_javaidl_interceptors_interposition_srie("InterpositionServerRequestInterceptorImpl::send_other", e);
- throw new BAD_OPERATION();
- }
+ throw new BAD_OPERATION();
}
+ }
/*
* If there is a thread id associated with PICurrent then it will
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/thread/OTSThread.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/thread/OTSThread.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/thread/OTSThread.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -82,11 +82,6 @@
}
}
- /**
- * @message com.arjuna.ats.jts.thread.resumefailed {0} - could not resume transaction: {1}
- * @message com.arjuna.ats.jts.thread.resumefailederror - could not resume transaction:
- */
-
public void run ()
{
if (_currentControl != null)
@@ -103,13 +98,9 @@
}
catch (Exception e)
{
- if (jtsLogger.loggerI18N.isWarnEnabled())
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.jts.thread.resumefailed",
- new Object[] { "OTSThread.run", e} );
- }
+ jtsLogger.i18NLogger.warn_thread_resumefailed( "OTSThread.run", e);
- throw new FatalError("OTSThread.run - "+jtsLogger.loggerI18N.getString("com.arjuna.ats.jts.thread.resumefailederror"+e), e);
+ throw new FatalError("OTSThread.run - "+jtsLogger.i18NLogger.get_thread_resumefailederror(), e);
}
_currentControl = null;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/utils/ORBSetup.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/utils/ORBSetup.java 2010-06-24 13:53:50 UTC (rev 33623)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/utils/ORBSetup.java 2010-06-24 14:09:51 UTC (rev 33624)
@@ -54,8 +54,6 @@
{
/**
* This method is invoked when the ORB is initialised
- *
- * @message com.arjuna.ats.jts.utils.ORBSetup.orbalreadyset The ORBManager is already associated with an ORB/OA.
*/
public void invoke(Object obj)
{
@@ -107,10 +105,7 @@
}
else
{
- if ( jtsLogger.loggerI18N.isDebugEnabled() )
- {
- jtsLogger.loggerI18N.warn( "com.arjuna.ats.jts.utils.ORBSetup.orbalreadyset" );
- }
+ jtsLogger.i18NLogger.warn_utils_ORBSetup_orbalreadyset();
}
}
}
More information about the jboss-svn-commits
mailing list