[jboss-svn-commits] JBL Code SVN: r30965 - in labs/jbosstm/trunk: ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common and 34 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jan 7 04:21:29 EST 2010
Author: jhalliday
Date: 2010-01-07 04:21:27 -0500 (Thu, 07 Jan 2010)
New Revision: 30965
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/ActionHierarchy.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/tsLogger.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreType.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/InputBuffer.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputBuffer.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ExecProcessId.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/FileProcessId.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/MBeanProcessId.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ManualProcessId.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/SocketProcessId.java
labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxLogger.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockRecord.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojLogger.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/DirectRecoverableConnection.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/IndirectRecoverableConnection.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcLogger.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionSynchronizationRegistryImple.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TxWorkManager.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaLogger.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JNDIManager.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/XAHelper.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XidImple.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.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/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/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/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/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/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/thread/OTSThread.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/opLogger.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java
Log:
Remove direct use of ResourceBundles, indirect instead via Logi18n. JBTM-676
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -815,7 +815,7 @@
.warn("com.arjuna.ats.arjuna.StateManager_9");
}
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.StateManager_15"));
}
@@ -1318,7 +1318,7 @@
}
catch (final Throwable ex)
{
- throw new FatalError(tsLogger.log_mesg
+ throw new FatalError(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.StateManager_16")
+ " " + objectStoreType);
}
@@ -1335,7 +1335,7 @@
tsLogger.arjLoggerI18N
.warn("com.arjuna.ats.arjuna.StateManager_13");
- throw new FatalError(tsLogger.log_mesg
+ throw new FatalError(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.StateManager_14"));
// objectStore = new
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -317,7 +317,7 @@
{ uidString });
}
- throw new FatalError(tsLogger.log_mesg
+ throw new FatalError(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.common.Uid_2"), e);
}
}
@@ -330,7 +330,7 @@
{ uidString });
}
- throw new FatalError(tsLogger.log_mesg
+ throw new FatalError(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.common.Uid_3")
+ uidString);
}
@@ -357,7 +357,7 @@
{
_valid = false;
- throw new FatalError(tsLogger.log_mesg
+ throw new FatalError(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.common.Uid_11")
+ ex);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/ActionHierarchy.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/ActionHierarchy.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/ActionHierarchy.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -325,7 +325,7 @@
}
catch (OutOfMemoryError ex)
{
- IOException ioException = new IOException(tsLogger.log_mesg.getString("com.arjuna.ats.arjuna.coordinator.ActionHierarchy_1"));
+ IOException ioException = new IOException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.arjuna.coordinator.ActionHierarchy_1"));
ioException.initCause(ex);
throw ioException;
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -2816,7 +2816,7 @@
}
throw new com.arjuna.ats.arjuna.exceptions.FatalError(
- tsLogger.log_mesg.getString("com.arjuna.ats.arjuna.coordinator.BasicAction_69")
+ tsLogger.arjLoggerI18N.getString("com.arjuna.ats.arjuna.coordinator.BasicAction_69")
+ get_uid());
}
@@ -4111,7 +4111,7 @@
new Object[]{ checkedActionFactory }, ex);
}
- throw new FatalError(tsLogger.log_mesg.getString("com.arjuna.ats.arjuna.coordinator.cafactoryerror")+" "+checkedActionFactory, ex);
+ throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.arjuna.coordinator.cafactoryerror")+" "+checkedActionFactory, ex);
}
}
else
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -674,7 +674,7 @@
if ((_timeouts.putIfAbsent(reaperElement._control, reaperElement) == null)) {
_reaperElements.add(reaperElement);
} else {
- throw new IllegalStateException(tsLogger.log_mesg.getString("com.arjuna.ats.arjuna.coordinator.TransactionReaper_1"));
+ throw new IllegalStateException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.arjuna.coordinator.TransactionReaper_1"));
}
if (_dynamic && reaperElement.getAbsoluteTimeout() < nextDynamicCheckTime.get()) {
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -209,7 +209,7 @@
}
catch (final Throwable ex)
{
- throw new FatalError(tsLogger.log_mesg.getString("com.arjuna.ats.arjuna.coordinator.invalidos")+" "+recoveryType);
+ throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.arjuna.coordinator.invalidos")+" "+recoveryType);
}
return _recoveryStore;
@@ -263,7 +263,7 @@
{
ex.printStackTrace();
- throw new FatalError(tsLogger.log_mesg.getString("com.arjuna.ats.arjuna.coordinator.invalidos")+" "+actionStoreType);
+ throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.arjuna.coordinator.invalidos")+" "+actionStoreType);
}
return _objectStore;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/tsLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/tsLogger.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/tsLogger.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -43,7 +43,8 @@
public static LogNoi18n arjLogger;
public static Logi18n arjLoggerI18N;
- public static ResourceBundle log_mesg;
+
+ private static ResourceBundle log_mesg;
private static String language;
private static String country;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreType.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreType.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreType.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -198,7 +198,7 @@
}
throw new com.arjuna.ats.arjuna.exceptions.FatalError(
- tsLogger.log_mesg
+ tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.objectstore.ObjectStoreType_2")
+ c);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -188,7 +188,7 @@
new Object[]{getListenerHostName(), getListenerPort(-1)});
}
- throw new com.arjuna.ats.arjuna.exceptions.FatalError(tsLogger.log_mesg.getString("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_9"), ex);
+ throw new com.arjuna.ats.arjuna.exceptions.FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_9"), ex);
}
}
@@ -240,7 +240,7 @@
if (_port == -1)
{
// a previous attempt to create the socket failed
- throw new com.arjuna.ats.arjuna.exceptions.FatalError(tsLogger.log_mesg.getString("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_13"));
+ throw new com.arjuna.ats.arjuna.exceptions.FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.arjuna.recovery.TransactionStatusManager_13"));
}
try
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/InputBuffer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/InputBuffer.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/InputBuffer.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -223,7 +223,7 @@
public final synchronized byte unpackByte () throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.InputBuffer_1"));
int i = unpackInt();
@@ -239,7 +239,7 @@
public final synchronized byte[] unpackBytes () throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.InputBuffer_2"));
int size = unpackInt();
@@ -263,7 +263,7 @@
public final synchronized boolean unpackBoolean () throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.InputBuffer_3"));
_valid = false;
@@ -285,7 +285,7 @@
public final synchronized char unpackChar () throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.InputBuffer_4"));
int i = unpackInt();
@@ -301,7 +301,7 @@
public final synchronized short unpackShort () throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.InputBuffer_5"));
int i = unpackInt();
@@ -317,7 +317,7 @@
public final synchronized int unpackInt () throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.InputBuffer_6"));
_valid = false;
@@ -337,7 +337,7 @@
public final synchronized long unpackLong () throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.InputBuffer_7"));
_valid = false;
@@ -357,7 +357,7 @@
public final synchronized float unpackFloat () throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.InputBuffer_8"));
_valid = false;
@@ -377,7 +377,7 @@
public final synchronized double unpackDouble () throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.InputBuffer_9"));
_valid = false;
@@ -400,7 +400,7 @@
public final synchronized String unpackString () throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.InputBuffer_10"));
int length = unpackInt();
@@ -433,7 +433,7 @@
public synchronized void unpackFrom (InputBuffer buff) throws IOException
{
if (buff == null)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.InputBuffer_11"));
_valid = false;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputBuffer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputBuffer.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputBuffer.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -241,7 +241,7 @@
public final synchronized void packByte (byte b) throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.OutputBuffer_1"));
packInt((byte) b);
@@ -255,7 +255,7 @@
public final synchronized void packBytes (byte[] b) throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.OutputBuffer_2"));
packInt(b.length);
@@ -274,7 +274,7 @@
public final synchronized void packBoolean (boolean b) throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.OutputBuffer_3"));
_valid = false;
@@ -295,7 +295,7 @@
public final synchronized void packChar (char c) throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.OutputBuffer_4"));
packInt((int) c);
@@ -308,7 +308,7 @@
public final synchronized void packShort (short s) throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.OutputBuffer_5"));
packInt((int) s);
@@ -321,7 +321,7 @@
public final synchronized void packInt (int i) throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.OutputBuffer_6"));
_valid = false;
@@ -338,7 +338,7 @@
public final synchronized void packLong (long l) throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.OutputBuffer_7"));
_valid = false;
@@ -355,7 +355,7 @@
public final synchronized void packFloat (float f) throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.OutputBuffer_8"));
_valid = false;
@@ -372,7 +372,7 @@
public final synchronized void packDouble (double d) throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.OutputBuffer_9"));
_valid = false;
@@ -391,7 +391,7 @@
public final synchronized void packString (String s) throws IOException
{
if (!_valid)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.OutputBuffer_10"));
int sz = 0;
@@ -426,7 +426,7 @@
public synchronized void packInto (OutputBuffer buff) throws IOException
{
if (buff == null)
- throw new IOException(tsLogger.log_mesg
+ throw new IOException(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.arjuna.state.OutputBuffer_11"));
if (_valid)
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -287,7 +287,7 @@
}
catch (IOException e)
{
- throw new ObjectStoreException(tsLogger.log_mesg.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_2a"), e);
+ throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_2a"), e);
}
}
}
@@ -298,7 +298,7 @@
}
catch (IOException e)
{
- throw new ObjectStoreException(tsLogger.log_mesg.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_3"), e);
+ throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_3"), e);
}
state.setBuffer(store.buffer());
@@ -342,7 +342,7 @@
}
catch (IOException e)
{
- throw new ObjectStoreException(tsLogger.log_mesg.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_4"), e);
+ throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_4"), e);
}
}
@@ -356,7 +356,7 @@
}
catch (IOException e)
{
- throw new ObjectStoreException(tsLogger.log_mesg.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_5"), e);
+ throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_5"), e);
}
foundTypes.setBuffer(store.buffer());
@@ -386,7 +386,7 @@
}
catch (ObjectStoreException e)
{
- throw new IOException(tsLogger.log_mesg.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_6"));
+ throw new IOException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_6"));
}
}
@@ -653,7 +653,7 @@
}
catch (IOException e)
{
- throw new ObjectStoreException(tsLogger.log_mesg.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_7"), e);
+ throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_7"), e);
}
}
}
@@ -847,7 +847,7 @@
return f.exists();
}
else
- throw new ObjectStoreException(tsLogger.log_mesg.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_8"));
+ throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore_8"));
}
/**
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -160,7 +160,7 @@
}
catch (IOException e)
{
- throw new ObjectStoreException(tsLogger.log_mesg.getString("com.arjuna.ats.internal.arjuna.objectstore.HashedStore_5"), e);
+ throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.HashedStore_5"), e);
}
}
}
@@ -180,7 +180,7 @@
}
catch (IOException e)
{
- throw new ObjectStoreException(tsLogger.log_mesg.getString("com.arjuna.ats.internal.arjuna.objectstore.HashedStore_6"), e);
+ throw new ObjectStoreException(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.objectstore.HashedStore_6"), e);
}
state.setBuffer(store.buffer());
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -471,7 +471,7 @@
.fatal("com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_5");
throw new FatalError(
- tsLogger.log_mesg
+ tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_5"));
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -951,7 +951,7 @@
else
throw new ObjectStoreException(
"ShadowStore::write_state - "
- + tsLogger.log_mesg
+ + tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.internal.arjuna.objectstore.notypenameuid")
+ objUid);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -291,7 +291,7 @@
else
throw new ObjectStoreException(
"ShadowStore::commit_state - "
- + tsLogger.log_mesg
+ + tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.internal.arjuna.objectstore.notypenameuid")
+ objUid);
@@ -626,7 +626,7 @@
else
throw new ObjectStoreException(
"ShadowStore::read_state - "
- + tsLogger.log_mesg
+ + tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.internal.arjuna.objectstore.notypenameuid")
+ objUid);
@@ -870,7 +870,7 @@
else
throw new ObjectStoreException(
"ShadowStore::write_state - "
- + tsLogger.log_mesg
+ + tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.internal.arjuna.objectstore.notypenameuid")
+ objUid);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ExecProcessId.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ExecProcessId.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ExecProcessId.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -111,7 +111,7 @@
catch (final Exception ex)
{
throw new FatalError(
- tsLogger.log_mesg
+ tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.internal.arjuna.utils.ExecProcessId_2")+" "+ex, ex);
}
}
@@ -127,7 +127,7 @@
catch (final IOException ex)
{
throw new FatalError(
- tsLogger.log_mesg
+ tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.internal.arjuna.utils.ExecProcessId_3")+" "+ex, ex);
}
@@ -143,7 +143,7 @@
catch (final Exception ex)
{
throw new FatalError(
- tsLogger.log_mesg
+ tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.internal.arjuna.utils.ExecProcessId_4")+" "+ex, ex);
}
finally
@@ -184,7 +184,7 @@
if (_pid == -1)
throw new FatalError(
- tsLogger.log_mesg
+ tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.internal.arjuna.utils.ExecProcessId_1"));
return _pid;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/FileProcessId.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/FileProcessId.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/FileProcessId.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -92,7 +92,7 @@
File tmpDir = new File(dir);
if (tmpDir.isDirectory() == false && tmpDir.mkdirs() == false)
- throw new FatalError(tsLogger.log_mesg.getString("com.arjuna.ats.internal.arjuna.utils.FilePocessId_1"));
+ throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.utils.FilePocessId_1"));
for (int i = 0; i < retry; i++)
{
@@ -117,7 +117,7 @@
}
if (processId == 0)
- throw new FatalError(tsLogger.log_mesg.getString("com.arjuna.ats.internal.arjuna.utils.FilePocessId_2"));
+ throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.utils.FilePocessId_2"));
}
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/MBeanProcessId.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/MBeanProcessId.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/MBeanProcessId.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -73,13 +73,13 @@
}
catch (final Exception ex)
{
- throw new FatalError(tsLogger.log_mesg.getString("com.arjuna.ats.internal.arjuna.utils.MBeanProcessId_2")+" "+name, ex);
+ throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.utils.MBeanProcessId_2")+" "+name, ex);
}
}
}
if (_pid == -1)
- throw new FatalError(tsLogger.log_mesg.getString("com.arjuna.ats.internal.arjuna.utils.MBeanProcessId_1"));
+ throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.utils.MBeanProcessId_1"));
return _pid;
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ManualProcessId.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ManualProcessId.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ManualProcessId.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -108,7 +108,7 @@
}
if (_pid == -1)
- throw new FatalError(tsLogger.log_mesg.getString("com.arjuna.ats.internal.arjuna.utils.ManualProcessId_1"));
+ throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.utils.ManualProcessId_1"));
return _pid;
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/SocketProcessId.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/SocketProcessId.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/SocketProcessId.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -82,7 +82,7 @@
_thePort = ((_theSocket == null) ? -1 : _theSocket.getLocalPort());
if (_thePort == -1) {
- throw new FatalError(tsLogger.log_mesg.getString("com.arjuna.ats.internal.arjuna.utils.SocketProcessId_2"));
+ throw new FatalError(tsLogger.arjLoggerI18N.getString("com.arjuna.ats.internal.arjuna.utils.SocketProcessId_2"));
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxLogger.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/logging/tsmxLogger.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -44,8 +44,9 @@
public static LogNoi18n logger;
public static Logi18n loggerI18N;
- public static ResourceBundle log_mesg;
+ private static ResourceBundle log_mesg;
+
private static String language;
private static String country;
private static Locale currentLocale;
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockRecord.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/abstractrecords/CadaverLockRecord.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -129,7 +129,7 @@
txojLogger.aitLoggerI18N.fatal("CadaverLockRecord_1");
}
- throw new FatalError(txojLogger.log_mesg.getString("com.arjuna.ats.txoj.CadaverLockRecord_1"));
+ throw new FatalError(txojLogger.aitLoggerI18N.getString("com.arjuna.ats.txoj.CadaverLockRecord_1"));
}
return (manager.releaseAll(super.actionHandle.get_uid()) ? TwoPhaseOutcome.FINISH_OK : TwoPhaseOutcome.FINISH_ERROR);
@@ -162,7 +162,7 @@
txojLogger.aitLoggerI18N.fatal("com.arjuna.ats.txoj.CadaverLockRecord_2");
}
- throw new FatalError(txojLogger.log_mesg.getString("com.arjuna.ats.txoj.CadaverLockRecord_2"));
+ throw new FatalError(txojLogger.aitLoggerI18N.getString("com.arjuna.ats.txoj.CadaverLockRecord_2"));
}
CadaverLockManager manager = new CadaverLockManager(order(), objectTypeName);
@@ -191,7 +191,7 @@
txojLogger.aitLoggerI18N.fatal("com.arjuna.ats.txoj.CadaverLockRecord_3");
}
- throw new FatalError(txojLogger.log_mesg.getString("com.arjuna.ats.txoj.CadaverLockRecord_3"));
+ throw new FatalError(txojLogger.aitLoggerI18N.getString("com.arjuna.ats.txoj.CadaverLockRecord_3"));
}
CadaverLockManager manager = new CadaverLockManager(order(), objectTypeName);
@@ -220,7 +220,7 @@
txojLogger.aitLoggerI18N.fatal("com.arjuna.ats.txoj.CadaverLockRecord_4");
}
- throw new FatalError(txojLogger.log_mesg.getString("com.arjuna.ats.txoj.CadaverLockRecord_4"));
+ throw new FatalError(txojLogger.aitLoggerI18N.getString("com.arjuna.ats.txoj.CadaverLockRecord_4"));
}
CadaverLockManager manager = new CadaverLockManager(order(), objectTypeName);
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/recovery/TORecoveryModule.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -118,7 +118,7 @@
}
catch (final Throwable ex)
{
- throw new FatalError(tsLogger.log_mesg
+ throw new FatalError(tsLogger.arjLoggerI18N
.getString("com.arjuna.ats.internal.txoj.recovery.TORecoveryModule_osproblem"), ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojLogger.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/logging/txojLogger.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -33,8 +33,9 @@
public static LogNoi18n aitLogger;
public static Logi18n aitLoggerI18N;
- public static ResourceBundle log_mesg;
+ private static ResourceBundle log_mesg;
+
private static String language;
private static String country;
private static Locale currentLocale;
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -243,7 +243,7 @@
if (transactionRunning())
{
if (autoCommit)
- throw new SQLException(jdbcLogger.logMesg
+ throw new SQLException(jdbcLogger.loggerI18N
.getString("com.arjuna.ats.internal.jdbc.autocommit"));
}
else
@@ -271,7 +271,7 @@
if (transactionRunning())
{
- throw new SQLException(jdbcLogger.logMesg
+ throw new SQLException(jdbcLogger.loggerI18N
.getString("com.arjuna.ats.internal.jdbc.commiterror"));
}
else
@@ -287,7 +287,7 @@
{
if (transactionRunning())
{
- throw new SQLException(jdbcLogger.logMesg
+ throw new SQLException(jdbcLogger.loggerI18N
.getString("com.arjuna.ats.internal.jdbc.aborterror"));
}
else
@@ -350,7 +350,7 @@
if (!tx.delistResource(xares, XAResource.TMSUCCESS))
throw new SQLException(
- jdbcLogger.logMesg
+ jdbcLogger.loggerI18N
.getString("com.arjuna.ats.internal.jdbc.delisterror"));
getModifier();
@@ -405,7 +405,7 @@
}
}
else
- throw new SQLException(jdbcLogger.logMesg.getString("com.arjuna.ats.internal.jdbc.closeerrorinvalidtx") + tx);
+ throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.closeerrorinvalidtx") + tx);
}
if (!delayClose) // close now
@@ -429,7 +429,7 @@
}
catch (Exception e1)
{
- SQLException sqlException = new SQLException(jdbcLogger.logMesg
+ SQLException sqlException = new SQLException(jdbcLogger.loggerI18N
.getString("com.arjuna.ats.internal.jdbc.closeerror")
+ e1);
sqlException.initCause(e1);
@@ -472,7 +472,7 @@
getConnection().setReadOnly(ro);
}
else
- throw new SQLException(jdbcLogger.logMesg
+ throw new SQLException(jdbcLogger.loggerI18N
.getString("com.arjuna.ats.internal.jdbc.setreadonly"));
}
@@ -509,7 +509,7 @@
/*
* if (iso != Connection.TRANSACTION_SERIALIZABLE) throw new
- * SQLException(jdbcLogger.logMesg.getString("com.arjuna.ats.internal.jdbc.stateerror")+"Connection.TRANSACTION_SERIALIZABLE");
+ * SQLException(jdbcLogger.loggerI18N.getString.getString("com.arjuna.ats.internal.jdbc.stateerror")+"Connection.TRANSACTION_SERIALIZABLE");
*/
getConnection().setTransactionIsolation(iso);
@@ -571,7 +571,7 @@
{
if (transactionRunning())
{
- throw new SQLException(jdbcLogger.logMesg.getString("com.arjuna.ats.internal.jdbc.setsavepointerror"));
+ throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.setsavepointerror"));
}
else
{
@@ -583,7 +583,7 @@
{
if (transactionRunning())
{
- throw new SQLException(jdbcLogger.logMesg.getString("com.arjuna.ats.internal.jdbc.setsavepointerror"));
+ throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.setsavepointerror"));
}
else
{
@@ -602,7 +602,7 @@
{
if (transactionRunning())
{
- throw new SQLException(jdbcLogger.logMesg.getString("com.arjuna.ats.internal.jdbc.rollbacksavepointerror"));
+ throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.rollbacksavepointerror"));
}
else
{
@@ -617,7 +617,7 @@
{
if (transactionRunning())
{
- throw new SQLException(jdbcLogger.logMesg.getString("com.arjuna.ats.internal.jdbc.releasesavepointerror"));
+ throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.releasesavepointerror"));
}
else
{
@@ -777,7 +777,7 @@
}
SQLException sqlException = new SQLException(
- jdbcLogger.logMesg
+ jdbcLogger.loggerI18N
.getString("com.arjuna.ats.internal.jdbc.conniniterror")
+ ":" + e);
sqlException.initCause(e);
@@ -868,7 +868,7 @@
if (!_recoveryConnection.setTransaction(tx))
throw new SQLException(
- jdbcLogger.logMesg
+ jdbcLogger.loggerI18N
.getString("com.arjuna.ats.internal.jdbc.alreadyassociated"));
Object[] params;
@@ -918,7 +918,7 @@
throw new SQLException(
"ConnectionImple.registerDatabase - "
- + jdbcLogger.logMesg
+ + jdbcLogger.loggerI18N
.getString("com.arjuna.ats.internal.jdbc.enlistfailed"));
}
@@ -983,7 +983,7 @@
return;
if (tx.getStatus() != Status.STATUS_ACTIVE)
- throw new SQLException(jdbcLogger.logMesg
+ throw new SQLException(jdbcLogger.loggerI18N
.getString("com.arjuna.ats.internal.jdbc.inactivetransaction"));
/*
@@ -992,7 +992,7 @@
if (!_recoveryConnection.validTransaction(tx))
throw new SQLException(
- jdbcLogger.logMesg
+ jdbcLogger.loggerI18N
.getString("com.arjuna.ats.internal.jdbc.alreadyassociatedcheck"));
}
catch (SQLException ex)
@@ -1001,7 +1001,7 @@
}
catch (Exception e3)
{
- SQLException sqlException = new SQLException(jdbcLogger.logMesg
+ SQLException sqlException = new SQLException(jdbcLogger.loggerI18N
.getString("com.arjuna.ats.internal.jdbc.infoerror"));
sqlException.initCause(e3);
throw sqlException;
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/DirectRecoverableConnection.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/DirectRecoverableConnection.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/DirectRecoverableConnection.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -372,7 +372,7 @@
if ((_dynamic == null) || (_dynamic.equals("")))
{
- throw new SQLException(jdbcLogger.logMesg.getString("com.arjuna.ats.internal.jdbc.dynamicerror"));
+ throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.dynamicerror"));
}
else
{
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/IndirectRecoverableConnection.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/IndirectRecoverableConnection.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/IndirectRecoverableConnection.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -383,7 +383,7 @@
}
if (_theDataSource == null) {
- throw new SQLException(jdbcLogger.logMesg.getString("com.arjuna.ats.internal.jdbc.jndierror"));
+ throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.jndierror"));
}
}
catch (SQLException ex)
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -169,7 +169,7 @@
_dataSource = (XADataSource) context.lookup(_dbName);
if (_dataSource == null)
- throw new SQLException(jdbcLogger.logMesg.getString("com.arjuna.ats.internal.jdbc.xa.recjndierror"));
+ throw new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.xa.recjndierror"));
}
}
catch (SQLException ex)
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcLogger.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/logging/jdbcLogger.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -42,8 +42,9 @@
public static LogNoi18n logger;
public static Logi18n loggerI18N;
- public static ResourceBundle logMesg;
+ private static ResourceBundle logMesg;
+
private static String _language;
private static String _country;
private static Locale _currentLocale;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -132,7 +132,7 @@
if (theTransaction == null)
throw new IllegalStateException(
"BaseTransaction.commit - "
- + jtaLogger.logMesg
+ + jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.notx"));
theTransaction.commitAndDisassociate();
@@ -160,7 +160,7 @@
if (theTransaction == null)
throw new IllegalStateException(
"BaseTransaction.rollback - "
- + jtaLogger.logMesg
+ + jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.notx"));
theTransaction.rollbackAndDisassociate();
@@ -190,7 +190,7 @@
if (theTransaction == null)
throw new IllegalStateException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.nosuchtx"));
theTransaction.setRollbackOnly();
@@ -314,7 +314,7 @@
{
throw new IllegalStateException(
"BaseTransaction.checkTransactionState - "
- + jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.alreadyassociated"));
+ + jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.alreadyassociated"));
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -210,7 +210,7 @@
break;
default:
throw new IllegalStateException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
}
@@ -240,7 +240,7 @@
case ActionStatus.H_ROLLBACK:
case ActionStatus.ABORTED:
RollbackException rollbackException = new RollbackException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.commitwhenaborted"));
if (_theTransaction.getDeferredThrowable() != null)
{
@@ -250,13 +250,13 @@
throw rollbackException;
default:
throw new IllegalStateException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.invalidstate"));
}
}
else
throw new IllegalStateException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
}
@@ -293,7 +293,7 @@
break;
default:
throw new IllegalStateException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
}
@@ -327,19 +327,19 @@
break;
default:
throw new IllegalStateException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.rollbackstatus")
+ ActionStatus.stringForm(outcome));
}
if (endSuspendedFailed)
throw new IllegalStateException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.endsuspendfailed2"));
}
else
throw new IllegalStateException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
}
@@ -370,11 +370,11 @@
case Status.STATUS_PREPARING:
case Status.STATUS_PREPARED:
throw new InvalidTerminationStateException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.invalidstate"));
default:
throw new InactiveTransactionException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
}
}
@@ -389,7 +389,7 @@
}
else
throw new IllegalStateException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
}
@@ -438,7 +438,7 @@
{
throw new javax.transaction.SystemException(
"TransactionImple.registerSynchronization - "
- + jtaLogger.logMesg
+ + jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.nullparam"));
}
@@ -468,22 +468,22 @@
case ActionStatus.ABORT_ONLY:
case ActionStatus.ABORTED:
throw new javax.transaction.RollbackException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.syncwhenaborted"));
case ActionStatus.CREATED:
throw new IllegalStateException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
default:
throw new IllegalStateException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.syncsnotallowed")+ActionStatus.stringForm(status));
}
}
}
else
throw new IllegalStateException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
}
@@ -539,7 +539,7 @@
if (xaRes == null)
throw new javax.transaction.SystemException(
"TransactionImple.enlistResource - "
- + jtaLogger.logMesg
+ + jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.nullres"));
int status = getStatus();
@@ -549,13 +549,13 @@
case javax.transaction.Status.STATUS_MARKED_ROLLBACK:
throw new RollbackException(
"TransactionImple.enlistResource - "
- + jtaLogger.logMesg
+ + jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.nullres"));
case javax.transaction.Status.STATUS_ACTIVE:
break;
default:
throw new IllegalStateException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
}
@@ -664,7 +664,7 @@
throw new IllegalStateException(
"TransactionImple.enlistResource - "
- + jtaLogger.logMesg
+ + jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.illresstate")
+ ":" + info.getState());
}
@@ -863,7 +863,7 @@
throw new javax.transaction.SystemException(
"TransactionImple.enlistResource - XAResource.start "
- + jtaLogger.logMesg
+ + jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.couldnotregister")
+ ": " + xid);
}
@@ -999,7 +999,7 @@
if (xaRes == null)
throw new javax.transaction.SystemException(
"TransactionImple.delistResource - "
- + jtaLogger.logMesg
+ + jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.nullres"));
int status = getStatus();
@@ -1012,7 +1012,7 @@
break;
default:
throw new IllegalStateException(
- jtaLogger.logMesg
+ jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
}
@@ -1126,7 +1126,7 @@
throw new IllegalStateException(
"TransactionImple.delistResource - "
- + jtaLogger.logMesg
+ + jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.ressuspended"));
}
else
@@ -1147,7 +1147,7 @@
if (!optimizedRollback)
throw new IllegalStateException(
"TransactionImple.delistResource - "
- + jtaLogger.logMesg
+ + jtaLogger.loggerI18N
.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.illresstate")
+ ":" + info.getState());
}
@@ -1385,7 +1385,7 @@
case ActionStatus.ABORTING:
_theTransaction.abort(); // assure thread disassociation
throw new javax.transaction.RollbackException(
- jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
case ActionStatus.COMMITTED:
case ActionStatus.COMMITTING: // in case of async commit
@@ -1405,7 +1405,7 @@
case ActionStatus.H_ROLLBACK:
case ActionStatus.ABORTED:
case ActionStatus.ABORTING:
- RollbackException rollbackException = new RollbackException(jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.commitwhenaborted"));
+ RollbackException rollbackException = new RollbackException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.commitwhenaborted"));
if(_rollbackOnlyCallerStacktrace != null) {
// we rolled back beacuse the user explicitly told us not to commit. Attach the trace of who did that for debug:
rollbackException.initCause(_rollbackOnlyCallerStacktrace);
@@ -1417,12 +1417,12 @@
throw rollbackException;
default:
throw new InvalidTerminationStateException(
- jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.invalidstate"));
+ jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.invalidstate"));
}
}
else
throw new IllegalStateException(
- jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
}
finally
{
@@ -1477,14 +1477,14 @@
break;
default:
throw new InactiveTransactionException(
- jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.rollbackstatus")
+ jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.rollbackstatus")
+ ActionStatus.stringForm(outcome));
}
}
if(_theTransaction == null || !statusIsValid) {
throw new IllegalStateException(
- jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
+ jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.inactive"));
}
}
finally
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionSynchronizationRegistryImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionSynchronizationRegistryImple.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionSynchronizationRegistryImple.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -70,7 +70,7 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
+ throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
}
if (transactionImple == null) {
@@ -144,11 +144,11 @@
}
catch (RollbackException e)
{
- throw new com.arjuna.ats.jta.exceptions.RollbackException(jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.syncrollbackexception"), e);
+ throw new com.arjuna.ats.jta.exceptions.RollbackException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.syncrollbackexception"), e);
}
catch (SystemException e)
{
- throw new RuntimeException(jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
+ throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
}
}
@@ -170,7 +170,7 @@
}
catch(SystemException e)
{
- throw new RuntimeException(jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
+ throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
}
}
@@ -200,7 +200,7 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
+ throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
}
}
@@ -227,7 +227,7 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
+ throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
}
}
@@ -241,7 +241,7 @@
}
catch (SystemException e)
{
- throw new RuntimeException(jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
+ throw new RuntimeException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.systemexception"), e);
}
if(transactionImple == null)
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TxWorkManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TxWorkManager.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TxWorkManager.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -79,7 +79,7 @@
_transactions.put(tx, workers);
}
else
- throw new WorkCompletedException(jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.jca.busy"), WorkException.TX_CONCURRENT_WORK_DISALLOWED);
+ throw new WorkCompletedException(jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.jca.busy"), WorkException.TX_CONCURRENT_WORK_DISALLOWED);
}
synchronized (workers)
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -112,7 +112,7 @@
java.lang.IllegalStateException
{
throw new IllegalStateException(
- jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.subordinate.invalidstate"));
+ jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.subordinate.invalidstate"));
}
/**
@@ -124,7 +124,7 @@
java.lang.SecurityException, javax.transaction.SystemException
{
throw new InvalidTerminationStateException(
- jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.subordinate.invalidstate"));
+ jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.subordinate.invalidstate"));
}
// Should probably return XA status codes, c.f., XAResource.prepare
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaLogger.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaLogger.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -43,8 +43,9 @@
public static LogNoi18n logger;
public static Logi18n loggerI18N;
- public static ResourceBundle logMesg;
+ private static ResourceBundle logMesg;
+
private static String _language;
private static String _country;
private static Locale _currentLocale;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JNDIManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JNDIManager.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JNDIManager.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -172,7 +172,7 @@
try {
tsr = Class.forName(tsrImplementation).newInstance();
} catch(Exception e) {
- NamingException namingException = new ConfigurationException(jtaLogger.logMesg.getString("com.arjuna.ats.jta.utils.JNDIManager.tsr1"));
+ NamingException namingException = new ConfigurationException(jtaLogger.loggerI18N.getString("com.arjuna.ats.jta.utils.JNDIManager.tsr1"));
namingException.setRootCause(e);
throw namingException;
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/XAHelper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/XAHelper.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/XAHelper.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -54,7 +54,7 @@
{
if (e == null)
{
- return jtaLogger.logMesg.getString("com.arjuna.ats.jta.utils.nullexception");
+ return jtaLogger.loggerI18N.getString("com.arjuna.ats.jta.utils.nullexception");
}
else
{
@@ -105,7 +105,7 @@
case XAException.XA_RETRY:
return "XAException.XA_RETRY";
default:
- return jtaLogger.logMesg.getString("com.arjuna.ats.jta.utils.unknownerrorcode")
+ return jtaLogger.loggerI18N.getString("com.arjuna.ats.jta.utils.unknownerrorcode")
+ e.errorCode;
}
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XidImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XidImple.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XidImple.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -333,7 +333,7 @@
if (!x.packInto(os))
throw new IOException(
- jtaLogger.logMesg.getString("com.arjuna.ats.jta.xid.packerror"));
+ jtaLogger.loggerI18N.getString("com.arjuna.ats.jta.xid.packerror"));
}
else
{
@@ -390,7 +390,7 @@
if (_theXid != null)
return _theXid.toString();
else
- return jtaLogger.logMesg.getString("com.arjuna.ats.jta.xa.xidunset");
+ return jtaLogger.loggerI18N.getString("com.arjuna.ats.jta.xa.xidunset");
}
/**
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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -119,7 +119,7 @@
ex.printStackTrace();
- throw new FatalError("ContextManager "+jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.context.picreffail")+" "+ex, ex);
+ throw new FatalError("ContextManager "+jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.context.picreffail")+" "+ex, ex);
}
catch (Exception ex)
{
@@ -130,7 +130,7 @@
ex.printStackTrace();
- throw new FatalError("ContextManager "+jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.context.picreffail")+" "+ex, ex);
+ throw new FatalError("ContextManager "+jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.context.picreffail")+" "+ex, ex);
}
}
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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/ControlImple.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -294,7 +294,7 @@
throw new BAD_OPERATION(
"ControlImple "
- + jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.destroyfailed")
+ + jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.destroyfailed")
+ 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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -401,7 +401,7 @@
if (u == null)
throw new BAD_PARAM(
"otid_t "
- + jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.otiderror"));
+ + jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.otiderror"));
else
{
BasicAction act = ActionManager.manager().get(u);
@@ -447,7 +447,7 @@
if (u == null)
throw new BAD_PARAM(
"otid_t "
- + jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.otiderror"));
+ + jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.otiderror"));
else
return getCurrentStatus(u);
}
@@ -526,7 +526,7 @@
if (u == null)
throw new BAD_PARAM(
"otid_t "
- + jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.otiderror"));
+ + jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.otiderror"));
else
return getStatus(u);
}
@@ -680,7 +680,7 @@
if (u == null)
throw new BAD_PARAM(
"otid_t "
- + jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.otiderror"));
+ + jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.otiderror"));
else
return getTransactionInfo(u);
}
@@ -696,7 +696,7 @@
{
if (!u.valid())
throw new BAD_PARAM(
- jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.invaliduid"
+ jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.invaliduid"
+ " " + u));
else
{
@@ -750,7 +750,7 @@
if (u == null)
throw new BAD_PARAM(
"otid_t "
- + jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.otiderror"));
+ + jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.otiderror"));
else
return getTransaction(u);
}
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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -867,7 +867,7 @@
if (recoveryCoordinator == null)
throw new BAD_OPERATION(
"RecoveryCoordinator "
- + jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.coordinator.rcnotcreated"));
+ + jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.coordinator.rcnotcreated"));
}
catch (NO_IMPLEMENT ex)
{
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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedNestedAction.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -99,7 +99,7 @@
new Object[] {"ServerRestrictedNestedAction.child"});
}
- throw new com.arjuna.ats.jts.exceptions.TxError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contx_2"));
+ throw new com.arjuna.ats.jts.exceptions.TxError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contx_2"));
}
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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedTopLevelAction.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -110,7 +110,7 @@
new Object[] {"ServerRestrictedTopLevelAction.child"});
}
- throw new com.arjuna.ats.jts.exceptions.TxError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contx_4"));
+ throw new com.arjuna.ats.jts.exceptions.TxError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.restricted.contx_4"));
}
else
{
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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsLogger.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -43,8 +43,9 @@
public static LogNoi18n logger;
public static Logi18n loggerI18N;
- public static ResourceBundle logMesg;
+ private static ResourceBundle logMesg;
+
private static String _language;
private static String _country;
private static Locale _currentLocale;
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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextClientRequestInterceptorImpl.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -184,7 +184,7 @@
if ( (localData != null) && (localData.type().kind().value() != TCKind._tk_null) )
{
if ( (threadId = localData.extract_string()) == null )
- throw new UNKNOWN(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.invalidparam"));
+ throw new UNKNOWN(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.invalidparam"));
}
else
threadId = ThreadUtil.getThreadId() ;
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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextORBInitializerImpl.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -116,7 +116,7 @@
new java.lang.Object[] { "ContextORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
}
- throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.codeccreate"), ex);
+ throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.codeccreate"), ex);
}
/*
@@ -143,7 +143,7 @@
new java.lang.Object[] { "ContextORBInitializerImpl", "ClientRequestInterceptor" }, ex);
}
- throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.cie"), ex);
+ throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.cie"), ex);
}
/*
@@ -170,7 +170,7 @@
new java.lang.Object[] { "ContextORBInitializerImpl", "ServerRequestInterceptor" }, ex);
}
- throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.sie"), ex);
+ throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.sie"), ex);
}
}
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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -183,7 +183,7 @@
if ( localData != null && (localData.type().kind().value() != TCKind._tk_null) )
{
if ( (threadId = localData.extract_string()) == null )
- throw new UNKNOWN(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.invalidparam"));
+ throw new UNKNOWN(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionORBInitializerImpl.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -120,7 +120,7 @@
new java.lang.Object[] { "InterpositionORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
}
- throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.codeccreate"), ex);
+ throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.codeccreate"), ex);
}
/*
@@ -147,7 +147,7 @@
new java.lang.Object[] { "InterpositionORBInitializerImpl", "ClientRequestInterceptor" }, ex);
}
- throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.cie"), ex);
+ throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.cie"), ex);
}
/*
@@ -174,7 +174,7 @@
new java.lang.Object[] { "InterpositionORBInitializerImpl", "ServerRequestInterceptor" }, ex);
}
- throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.sie"), ex);
+ throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.sie"), ex);
}
}
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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextClientRequestInterceptorImpl.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -203,7 +203,7 @@
if (localData.type().kind().value() != TCKind._tk_null)
{
if ((threadId = localData.extract_string()) == null)
- throw new UNKNOWN(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.invalidparam"));
+ throw new UNKNOWN(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.invalidparam"));
}
else
threadId = ThreadUtil.getThreadId() ;
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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextORBInitializerImpl.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -130,7 +130,7 @@
new java.lang.Object[] { "ContextORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
}
- throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.codeccreate"), ex);
+ throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.codeccreate"), ex);
}
/*
@@ -157,7 +157,7 @@
new java.lang.Object[] { "ContextORBInitializerImpl", "ClientRequestInterceptor" }, ex);
}
- throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.cie"), ex);
+ throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.cie"), ex);
}
/*
@@ -184,7 +184,7 @@
new java.lang.Object[] { "ContextORBInitializerImpl", "ServerRequestInterceptor" }, ex);
}
- throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.sie"), ex);
+ throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.sie"), ex);
}
}
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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -202,7 +202,7 @@
if (localData.type().kind().value() != TCKind._tk_null)
{
if ((threadId = localData.extract_string()) == null)
- throw new UNKNOWN(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.invalidparam"));
+ throw new UNKNOWN(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionORBInitializerImpl.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -130,7 +130,7 @@
new java.lang.Object[] { "InterpositionORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
}
- throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.codeccreate"), ex);
+ throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.codeccreate"), ex);
}
/*
@@ -157,7 +157,7 @@
new java.lang.Object[] { "InterpositionORBInitializerImpl", "ClientRequestInterceptor" }, ex);
}
- throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.cie"), ex);
+ throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.cie"), ex);
}
/*
@@ -184,7 +184,7 @@
new java.lang.Object[] { "InterpositionORBInitializerImpl", "ServerRequestInterceptor" }, ex);
}
- throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.sie"), ex);
+ throw new FatalError(jtsLogger.loggerI18N.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.sie"), ex);
}
}
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-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/thread/OTSThread.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -109,7 +109,7 @@
new Object[] { "OTSThread.run", e} );
}
- throw new FatalError("OTSThread.run - "+jtsLogger.logMesg.getString("com.arjuna.ats.jts.thread.resumefailederror"+e), e);
+ throw new FatalError("OTSThread.run - "+jtsLogger.loggerI18N.getString("com.arjuna.ats.jts.thread.resumefailederror"+e), e);
}
_currentControl = null;
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -237,7 +237,7 @@
}
throw new FatalError(
- opLogger.logMesg
+ opLogger.loggerI18N
.getString("com.arjuna.orbportability.OA.uninitialsedorb"));
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -187,7 +187,7 @@
opLogger.loggerI18N.fatal( "com.arjuna.orbportability.ORBInfo.unsupportedorb", joe);
}
- throw new ExceptionInInitializerError( opLogger.logMesg.getString("com.arjuna.orbportability.ORBInfo.unsupportedorb"));
+ throw new ExceptionInInitializerError( opLogger.loggerI18N.getString("com.arjuna.orbportability.ORBInfo.unsupportedorb"));
}
}
@@ -209,7 +209,7 @@
}
throw new ExceptionInInitializerError(
- MessageFormat.format(opLogger.logMesg.getString("com.arjuna.orbportability.ORBInfo.creationfailed"),
+ MessageFormat.format(opLogger.loggerI18N.getString("com.arjuna.orbportability.ORBInfo.creationfailed"),
new Object[] { e } ));
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/opLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/opLogger.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/opLogger.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -34,8 +34,9 @@
public static LogNoi18n logger;
public static Logi18n loggerI18N;
- public static ResourceBundle logMesg;
+ private static ResourceBundle logMesg;
+
private static String _language;
private static String _country;
private static Locale _currentLocale;
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -166,7 +166,7 @@
je);
}
throw new ExceptionInInitializerError(
- opLogger.logMesg
+ opLogger.loggerI18N
.getString("com.arjuna.orbportability.oa.core.OA.nosupportedorb"));
}
}
@@ -198,7 +198,7 @@
}
throw new ExceptionInInitializerError(
- opLogger.logMesg
+ opLogger.loggerI18N
.getString("com.arjuna.orbportability.oa.core.OA.caughtexception"));
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java 2010-01-07 07:57:12 UTC (rev 30964)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java 2010-01-07 09:21:27 UTC (rev 30965)
@@ -137,7 +137,7 @@
opLogger.loggerI18N.fatal( "com.arjuna.orbportability.orb.core.ORB.unsupportedorb", je );
}
- throw new ExceptionInInitializerError(opLogger.logMesg.getString("com.arjuna.orbportability.orb.core.ORB.unsupportedorb"));
+ throw new ExceptionInInitializerError(opLogger.loggerI18N.getString("com.arjuna.orbportability.orb.core.ORB.unsupportedorb"));
}
}
}
@@ -162,7 +162,7 @@
new Object[] { e }, e );
}
- throw new ExceptionInInitializerError( opLogger.logMesg.getString("com.arjuna.orbportability.orb.core.ORB.caughtexception") );
+ throw new ExceptionInInitializerError( opLogger.loggerI18N.getString("com.arjuna.orbportability.orb.core.ORB.caughtexception") );
}
}
More information about the jboss-svn-commits
mailing list