[jboss-svn-commits] JBL Code SVN: r33695 - in labs/jbosstm/trunk/atsintegration: classes/com/arjuna/ats/internal/jbossatx/jta and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jun 30 06:30:05 EDT 2010
Author: jhalliday
Date: 2010-06-30 06:30:04 -0400 (Wed, 30 Jun 2010)
New Revision: 33695
Added:
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLogger.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLoggerImpl.java
Modified:
labs/jbosstm/trunk/atsintegration/build.xml
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/AppServerJDBCXARecovery.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/PropagationContextManager.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/InboundTransactionCurrentImple.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/PropagationContextManager.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/RecoveryManagerService.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerDelegate.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/RecoveryManagerService.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerDelegate.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxLogger.java
Log:
Replace CLF with jboss-logging for i18n messages atsintegration module. JBTM-750
Modified: labs/jbosstm/trunk/atsintegration/build.xml
===================================================================
--- labs/jbosstm/trunk/atsintegration/build.xml 2010-06-30 10:26:20 UTC (rev 33694)
+++ labs/jbosstm/trunk/atsintegration/build.xml 2010-06-30 10:30:04 UTC (rev 33695)
@@ -22,7 +22,7 @@
<property name="modulename" value="jbossatx"/>
- <property name="global.ext.libs" value="jboss-transaction-api_1.1_spec.jar,jboss-connector-api_1.5_spec.jar"/>
+ <property name="global.ext.libs" value="jboss-transaction-api_1.1_spec.jar,jboss-connector-api_1.5_spec.jar,jboss-logging.jar"/>
<property name="component-module-list" value="../atsintegration"/>
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/AppServerJDBCXARecovery.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/AppServerJDBCXARecovery.java 2010-06-30 10:26:20 UTC (rev 33694)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/AppServerJDBCXARecovery.java 2010-06-30 10:30:04 UTC (rev 33695)
@@ -171,14 +171,6 @@
/**
* Lookup the XADataSource in JNDI.
- *
- * @message com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.createproblem
- * [com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.createproblem] createDataSource got exception {0} during getXADataSource call
- * @message com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.notfound
- * [com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.notfound] InstanceNotFound. Datasource {0} not deployed, or wrong name?"
- * @message com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.problem
- * [com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.problem] createDataSource {0} got exception {1}
- *
*/
private final void createDataSource()
throws SQLException
@@ -277,7 +269,7 @@
_supportsIsValidMethod = true; // assume it does; we'll lazily check the first time we try to connect
} catch(Exception e) {
_dataSource = null;
- jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.createproblem", new Object[] {e.toString()}, e);
+ jbossatxLogger.i18NLogger.error_jta_AppServerJDBCXARecovery_createproblem(e);
SQLException sqlException = new SQLException(e.toString());
sqlException.initCause(e);
throw sqlException;
@@ -288,13 +280,13 @@
{
if (mbe.getTargetException() instanceof InstanceNotFoundException)
{
- jbossatxLogger.loggerI18N.warn("com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.notfound", new Object[] {_dataSourceId});
+ jbossatxLogger.i18NLogger.warn_jta_AppServerJDBCXARecovery_notfound(_dataSourceId);
// this is an expected condition when the data source is not yet deployed
// just ignore this for now, the next time around, we try again to see if its deployed yet
return;
} else {
- jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.problem", new Object[] {_dataSourceId, mbe.toString()}, mbe);
+ jbossatxLogger.i18NLogger.error_jta_AppServerJDBCXARecovery_problem(_dataSourceId, mbe);
}
SQLException sqlException = new SQLException(mbe.toString());
@@ -303,13 +295,12 @@
}
catch (SQLException ex)
{
- jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.problem", new Object[] {_dataSourceId, ex.toString()}, ex);
-
+ jbossatxLogger.i18NLogger.error_jta_AppServerJDBCXARecovery_problem(_dataSourceId, ex);
throw ex;
}
catch (Exception e)
{
- jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.problem", new Object[] {_dataSourceId, e.toString()}, e);
+ jbossatxLogger.i18NLogger.error_jta_AppServerJDBCXARecovery_problem(_dataSourceId, e);
SQLException sqlException = new SQLException(e.toString());
sqlException.initCause(e);
@@ -319,9 +310,6 @@
/**
* Create the XAConnection from the XADataSource.
- *
- * @message com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.createconnectionproblem
- * [com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.createconnectionproblem] createConnection got exception {0}
*/
private final void createConnection()
@@ -387,13 +375,12 @@
}
catch (SQLException ex)
{
- jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.createconnectionproblem", new Object[] {ex.toString()}, ex);
-
+ jbossatxLogger.i18NLogger.error_jta_AppServerJDBCXARecovery_createconnectionproblem(ex);
throw ex;
}
catch (Exception e)
{
- jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.createconnectionproblem", new Object[] {e.toString()}, e);
+ jbossatxLogger.i18NLogger.error_jta_AppServerJDBCXARecovery_createconnectionproblem(e);
SQLException sqlException = new SQLException(e.toString());
sqlException.initCause(e);
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/PropagationContextManager.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/PropagationContextManager.java 2010-06-30 10:26:20 UTC (rev 33694)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/PropagationContextManager.java 2010-06-30 10:30:04 UTC (rev 33695)
@@ -111,11 +111,6 @@
* context in the local VM.
* Returns <code>null</code> if the transaction propagation context is
* <code>null</code>, or if it represents a <code>null</code> transaction.
- *
- * @message com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager.exception
- * [com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager.exception] Unexpected exception occurred
- * @message com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager.unknownctx
- * [com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager.unknownctx] jboss-atx: unknown Tx PropagationContext
*/
public Transaction importTransactionPropagationContext(Object tpc)
@@ -142,13 +137,13 @@
}
catch (Exception e)
{
- jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager.exception", e);
+ jbossatxLogger.i18NLogger.error_jta_PropagationContextManager_exception(e);
return null;
}
}
else
{
- jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager.unknownctx");
+ jbossatxLogger.i18NLogger.error_jta_PropagationContextManager_unknownctx();
return null;
}
}
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java 2010-06-30 10:26:20 UTC (rev 33694)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java 2010-06-30 10:30:04 UTC (rev 33695)
@@ -56,16 +56,6 @@
* transaction. JCA 1.5 has the concept of a WorkManager.
*
* @author mcl
- *
- * @message com.arjuna.ats.jbossatx.jta.jca.inactive [message
- * com.arjuna.ats.jbossatx.jta.jca.inactive] Transaction is inactive!
- * @message com.arjuna.ats.jbossatx.jta.jca.completing [message
- * com.arjuna.ats.jbossatx.jta.jca.completing] Transaction is
- * completing!
- * @message com.arjuna.ats.jbossatx.jta.jca.unknown [message
- * com.arjuna.ats.jbossatx.jta.jca.unknown] Unexpected error!
- * @message com.arjuna.ats.jbossatx.jta.jca.unknownwork [message
- * com.arjuna.ats.jbossatx.jta.jca.unknownwork] Work not registered!
*/
public class XATerminator extends XATerminatorImple implements
@@ -107,14 +97,14 @@
case Status.STATUS_NO_TRANSACTION:
case Status.STATUS_UNKNOWN:
throw new WorkCompletedException(
- jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.jca.inactive"),
- WorkException.TX_RECREATE_FAILED);
+ jbossatxLogger.i18NLogger.get_jta_jca_inactive(),
+ WorkException.TX_RECREATE_FAILED);
case Status.STATUS_ACTIVE:
break;
default:
throw new WorkCompletedException(
- jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.jca.completing"),
- WorkException.TX_CONCURRENT_WORK_DISALLOWED);
+ jbossatxLogger.i18NLogger.get_jta_jca_completing(),
+ WorkException.TX_CONCURRENT_WORK_DISALLOWED);
}
TxWorkManager.addWork(work, tx);
@@ -145,8 +135,8 @@
ex.printStackTrace();
throw new WorkCompletedException(
- jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.jca.unknown"),
- WorkException.INTERNAL);
+ jbossatxLogger.i18NLogger.get_jta_jca_unknown(),
+ WorkException.INTERNAL);
}
}
@@ -172,8 +162,8 @@
if (!TxWorkManager.getWork(tx).equals(work))
{
- throw new WorkCompletedException(jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.jca.unknownwork"),
- WorkException.INTERNAL);
+ throw new WorkCompletedException(jbossatxLogger.i18NLogger.get_jta_jca_unknownwork(),
+ WorkException.INTERNAL);
}
TransactionManager.transactionManager().resume(tx);
@@ -185,14 +175,14 @@
catch (InvalidTransactionException ex)
{
throw new WorkCompletedException(
- jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.jca.inactive"),
- WorkException.TX_RECREATE_FAILED);
+ jbossatxLogger.i18NLogger.get_jta_jca_inactive(),
+ WorkException.TX_RECREATE_FAILED);
}
catch (SystemException ex)
{
throw new WorkCompletedException(
- jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.jca.unknown"),
- WorkException.INTERNAL);
+ jbossatxLogger.i18NLogger.get_jta_jca_unknown(),
+ WorkException.INTERNAL);
}
}
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/InboundTransactionCurrentImple.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/InboundTransactionCurrentImple.java 2010-06-30 10:26:20 UTC (rev 33694)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/InboundTransactionCurrentImple.java 2010-06-30 10:30:04 UTC (rev 33695)
@@ -47,10 +47,6 @@
*/
public class InboundTransactionCurrentImple extends LocalObject implements InboundTransactionCurrent
{
- /**
- * @message com.arjuna.ats.internal.jbossatx.jts.InboundTransactionCurrentImple.exception
- * [com.arjuna.ats.internal.jbossatx.jts.InboundTransactionCurrentImple.exception] getCurrentTransaction() failed
- */
public Transaction getCurrentTransaction()
{
if (jbossatxLogger.logger.isDebugEnabled()) {
@@ -78,7 +74,7 @@
}
} catch(Exception e)
{
- jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jts.InboundTransactionCurrentImple.exception", e);
+ jbossatxLogger.i18NLogger.error_jts_InboundTransactionCurrentImple_exception(e);
// this is a problem, because we may actually have a valid tx context on the thread
// which could cause weird behaviour in downstream code. We need to ensure that code is not called
// but the API does not allow for checked excpetion to be thrown, so...
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/PropagationContextManager.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/PropagationContextManager.java 2010-06-30 10:26:20 UTC (rev 33694)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/PropagationContextManager.java 2010-06-30 10:30:04 UTC (rev 33695)
@@ -164,15 +164,6 @@
* transaction propagation context in the local VM. Returns
* <code>null</code> if the transaction propagation context is
* <code>null</code>, or if it represents a <code>null</code> transaction.
- *
- * @message
- * com.arjuna.ats.internal.jbossatx.jts.PropagationContextManager.exception
- * [com.arjuna.ats.internal.jbossatx.jts.PropagationContextManager.
- * exception] Unexpected exception occurred
- * @message com.arjuna.ats.internal.jbossatx.jts.PropagationContextManager.
- * unknownctx
- * [com.arjuna.ats.internal.jbossatx.jts.PropagationContextManager
- * .unknownctx] jboss-atx: unknown Tx PropagationContext
*/
public Transaction importTransactionPropagationContext (Object tpc)
@@ -206,18 +197,14 @@
}
catch (Exception e)
{
- jbossatxLogger.loggerI18N
- .error(
- "com.arjuna.ats.internal.jbossatx.jts.PropagationContextManager.exception",
- e);
+ jbossatxLogger.i18NLogger.error_jts_PropagationContextManager_exception(e);
return null;
}
}
else
{
- jbossatxLogger.loggerI18N
- .error("com.arjuna.ats.internal.jbossatx.jts.PropagationContextManager.unknownctx");
+ jbossatxLogger.i18NLogger.error_jts_PropagationContextManager_unknownctx();
return null;
}
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java 2010-06-30 10:26:20 UTC (rev 33694)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java 2010-06-30 10:30:04 UTC (rev 33695)
@@ -57,16 +57,6 @@
* JTA.
*
* @author mcl
- *
- * @message com.arjuna.ats.jbossatx.jts.jca.inactive [message
- * com.arjuna.ats.jbossatx.jts.jca.inactive] Transaction is inactive!
- * @message com.arjuna.ats.jbossatx.jts.jca.completing [message
- * com.arjuna.ats.jbossatx.jts.jca.completion] Transaction is
- * completing!
- * @message com.arjuna.ats.jbossatx.jts.jca.unknown [message
- * com.arjuna.ats.jbossatx.jts.jca.unknown] Unexpected error!
- * @message com.arjuna.ats.jbossatx.jts.jca.unknownwork [message
- * com.arjuna.ats.jbossatx.jts.jca.unknownwork] Work not registered!
*/
public class XATerminator extends XATerminatorImple implements
@@ -108,14 +98,14 @@
case Status.STATUS_NO_TRANSACTION:
case Status.STATUS_UNKNOWN:
throw new WorkCompletedException(
- jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.jca.inactive"),
- WorkException.TX_RECREATE_FAILED);
+ jbossatxLogger.i18NLogger.get_jts_jca_inactive(),
+ WorkException.TX_RECREATE_FAILED);
case Status.STATUS_ACTIVE:
break;
default:
throw new WorkCompletedException(
- jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.jca.completing"),
- WorkException.TX_CONCURRENT_WORK_DISALLOWED);
+ jbossatxLogger.i18NLogger.get_jts_jca_completing(),
+ WorkException.TX_CONCURRENT_WORK_DISALLOWED);
}
TxWorkManager.addWork(work, tx);
@@ -146,8 +136,8 @@
ex.printStackTrace();
throw new WorkCompletedException(
- jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.jca.unknown"),
- WorkException.INTERNAL);
+ jbossatxLogger.i18NLogger.get_jts_jca_unknown(),
+ WorkException.INTERNAL);
}
}
@@ -173,8 +163,8 @@
if (!TxWorkManager.getWork(tx).equals(work))
{
- throw new WorkCompletedException(jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.jca.unknownwork"),
- WorkException.INTERNAL);
+ throw new WorkCompletedException(jbossatxLogger.i18NLogger.get_jts_jca_unknownwork(),
+ WorkException.INTERNAL);
}
TransactionManager.transactionManager().resume(tx);
@@ -186,14 +176,14 @@
catch (InvalidTransactionException ex)
{
throw new WorkCompletedException(
- jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.jca.inactive"),
- WorkException.TX_RECREATE_FAILED);
+ jbossatxLogger.i18NLogger.get_jts_jca_inactive(),
+ WorkException.TX_RECREATE_FAILED);
}
catch (SystemException ex)
{
throw new WorkCompletedException(
- jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.jca.unknown"),
- WorkException.INTERNAL);
+ jbossatxLogger.i18NLogger.get_jts_jca_unknown(),
+ WorkException.INTERNAL);
}
}
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/RecoveryManagerService.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/RecoveryManagerService.java 2010-06-30 10:26:20 UTC (rev 33694)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/RecoveryManagerService.java 2010-06-30 10:30:04 UTC (rev 33695)
@@ -42,15 +42,11 @@
{
private RecoveryManager _recoveryManager;
- /**
- * @message com.arjuna.ats.jbossatx.jta.RecoveryManagerService.create
- * [com.arjuna.ats.jbossatx.jta.RecoveryManagerService.create] JBossTS Recovery Service (tag: {0}) - JBoss Inc.
- */
public void create() throws Exception
{
String tag = ConfigurationInfo.getSourceId();
- jbossatxLogger.loggerI18N.info("com.arjuna.ats.jbossatx.jta.RecoveryManagerService.create", new Object[] {tag});
+ jbossatxLogger.i18NLogger.info_jta_RecoveryManagerService_create(tag);
RecoveryManager.delayRecoveryManagerThread();
// listener (if any) is created here:
@@ -61,42 +57,27 @@
{
}
- /**
- * @message com.arjuna.ats.jbossatx.jta.RecoveryManagerService.start
- * [com.arjuna.ats.jbossatx.jta.RecoveryManagerService.start] Starting transaction recovery manager
- */
public void start()
{
- jbossatxLogger.loggerI18N.info("com.arjuna.ats.jbossatx.jta.RecoveryManagerService.start");
+ jbossatxLogger.i18NLogger.info_jta_RecoveryManagerService_start();
_recoveryManager.initialize();
_recoveryManager.startRecoveryManagerThread() ;
}
- /**
- * @message com.arjuna.ats.jbossatx.jta.RecoveryManagerService.stop
- * [com.arjuna.ats.jbossatx.jta.RecoveryManagerService.stop] Stopping transaction recovery manager
- */
public void stop() throws Exception
{
- jbossatxLogger.loggerI18N.info("com.arjuna.ats.jbossatx.jta.RecoveryManagerService.stop");
+ jbossatxLogger.i18NLogger.info_jta_RecoveryManagerService_stop();
_recoveryManager.terminate();
}
//////////////////////////////
- /**
- * @message com.arjuna.ats.jbossatx.jta.RecoveryManagerService.norecoverysystem
- * [com.arjuna.ats.jbossatx.jta.RecoveryManagerService.norecoverysystem] No recovery system in which to register XAResourceRecovery instance
- * @message com.arjuna.ats.jbossatx.jta.RecoveryManagerService.norecoverymodule
- * [com.arjuna.ats.jbossatx.jta.RecoveryManagerService.norecoverymodule] No suitable recovery module in which to register XAResourceRecovery instance
- */
public void addXAResourceRecovery(XAResourceRecovery xaResourceRecovery)
{
if(_recoveryManager == null) {
- jbossatxLogger.loggerI18N.error("com.arjuna.ats.jbossatx.jta.RecoveryManagerService.norecoverysystem");
- throw new IllegalStateException(jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.RecoveryManagerService.norecoverysystem"));
+ throw new IllegalStateException(jbossatxLogger.i18NLogger.get_jta_RecoveryManagerService_norecoverysystem());
}
XARecoveryModule xaRecoveryModule = null;
@@ -108,8 +89,7 @@
}
if(xaRecoveryModule == null) {
- jbossatxLogger.loggerI18N.error("com.arjuna.ats.jbossatx.jta.RecoveryManagerService.norecoverymodule");
- throw new IllegalStateException(jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.RecoveryManagerService.norecoverymodule"));
+ throw new IllegalStateException(jbossatxLogger.i18NLogger.get_jta_RecoveryManagerService_norecoverymodule());
}
xaRecoveryModule.addXAResourceRecoveryHelper(new XAResourceRecoveryHelperWrapper(xaResourceRecovery));
@@ -118,8 +98,7 @@
public void removeXAResourceRecovery(XAResourceRecovery xaResourceRecovery)
{
if(_recoveryManager == null) {
- jbossatxLogger.loggerI18N.warn("No recovery system from which to remove XAResourceRecovery instance");
- return;
+ throw new IllegalStateException(jbossatxLogger.i18NLogger.get_jta_RecoveryManagerService_norecoverysystem());
}
XARecoveryModule xaRecoveryModule = null;
@@ -131,8 +110,7 @@
}
if(xaRecoveryModule == null) {
- jbossatxLogger.loggerI18N.warn("No suitable recovery module in which to register XAResourceRecovery instance");
- return;
+ throw new IllegalStateException(jbossatxLogger.i18NLogger.get_jta_RecoveryManagerService_norecoverymodule());
}
xaRecoveryModule.removeXAResourceRecoveryHelper(new XAResourceRecoveryHelperWrapper(xaResourceRecovery));
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerDelegate.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerDelegate.java 2010-06-30 10:26:20 UTC (rev 33694)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerDelegate.java 2010-06-30 10:30:04 UTC (rev 33695)
@@ -30,12 +30,8 @@
import javax.transaction.SystemException;
import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple;
-import com.arjuna.ats.internal.arjuna.thread.ThreadActionData;
import com.arjuna.ats.jbossatx.BaseTransactionManagerDelegate;
import com.arjuna.ats.jbossatx.logging.jbossatxLogger;
-import com.arjuna.ats.arjuna.coordinator.BasicAction;
-import com.arjuna.ats.arjuna.coordinator.TransactionReaper;
public class TransactionManagerDelegate extends BaseTransactionManagerDelegate implements ObjectFactory
{
@@ -72,11 +68,6 @@
* if there is no transaction
* @throws RollbackException if the transaction is marked for rollback and
* errorRollback is true
- *
- * @message com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_1
- * [com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_1] - Transaction has or will rollback.
- * @message com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_2
- * [com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_2] - Unexpected error retrieving transaction status
*/
public long getTimeLeftBeforeTransactionTimeout(boolean errorRollback)
throws RollbackException
@@ -91,7 +82,7 @@
case Status.STATUS_ROLLEDBACK:
case Status.STATUS_ROLLING_BACK:
if(errorRollback) {
- throw new RollbackException(jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_1"));
+ throw new RollbackException(jbossatxLogger.i18NLogger.get_jta_TransactionManagerDelegate_getTimeLeftBeforeTransactionTimeout_1());
}
break;
case Status.STATUS_COMMITTED:
@@ -117,7 +108,7 @@
catch (final SystemException se)
{
RollbackException rollbackException = new RollbackException(
- jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_2")) ;
+ jbossatxLogger.i18NLogger.get_jta_TransactionManagerDelegate_getTimeLeftBeforeTransactionTimeout_2()) ;
rollbackException.initCause(se);
throw rollbackException;
}
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java 2010-06-30 10:26:20 UTC (rev 33694)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java 2010-06-30 10:30:04 UTC (rev 33695)
@@ -57,27 +57,19 @@
public TransactionManagerService() {}
- /**
- * @message com.arjuna.ats.jbossatx.jta.TransactionManagerService.create
- * [com.arjuna.ats.jbossatx.jta.TransactionManagerService.create] JBossTS Transaction Service ({0} version - tag: {1}) - JBoss Inc.
- */
public void create() throws Exception
{
String tag = ConfigurationInfo.getSourceId();
- jbossatxLogger.loggerI18N.info("com.arjuna.ats.jbossatx.jta.TransactionManagerService.create", new Object[] {mode, tag});
+ jbossatxLogger.i18NLogger.info_jta_TransactionManagerService_create(mode, tag);
// Associate transaction reaper with our context classloader.
TransactionReaper.transactionReaper();
}
- /**
- * @message com.arjuna.ats.jbossatx.jta.TransactionManagerService.destroy
- * [com.arjuna.ats.jbossatx.jta.TransactionManagerService.destroy] Destroying TransactionManagerService
- */
public void destroy()
{
- jbossatxLogger.loggerI18N.info("com.arjuna.ats.jbossatx.jta.TransactionManagerService.destroy");
+ jbossatxLogger.i18NLogger.info_jta_TransactionManagerService_destroy();
}
public void start()
@@ -148,13 +140,10 @@
/**
* This method has been put in here so that it is compatible with the JBoss standard Transaction Manager.
* As we do not support exception formatters just display a warning for the moment.
- *
- * @message com.arjuna.ats.jbossatx.jta.TransactionManagerService.noformatter
- * [com.arjuna.ats.jbossatx.jta.TransactionManagerService.noformatter] XAExceptionFormatters are not supported by the JBossTS Transaction Service - this warning can safely be ignored
*/
public void registerXAExceptionFormatter(Class c, XAExceptionFormatter f)
{
- jbossatxLogger.loggerI18N.warn("XAExceptionFormatters are not supported by the JBossTS Transaction Service - this warning can safely be ignored");
+ jbossatxLogger.i18NLogger.warn_jta_TransactionManagerService_noformatter();
}
/**
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/RecoveryManagerService.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/RecoveryManagerService.java 2010-06-30 10:26:20 UTC (rev 33694)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/RecoveryManagerService.java 2010-06-30 10:30:04 UTC (rev 33695)
@@ -33,13 +33,9 @@
*/
public class RecoveryManagerService extends com.arjuna.ats.jbossatx.jta.RecoveryManagerService
{
- /**
- * @message com.arjuna.ats.jbossatx.jts.RecoveryManagerService.init
- * [com.arjuna.ats.jbossatx.jts.RecoveryManagerService.init] <init> JTS transaction recovery manager
- */
public RecoveryManagerService(org.omg.CORBA.ORB theCorbaORB) throws Exception
{
- jbossatxLogger.loggerI18N.info("com.arjuna.ats.jbossatx.jts.RecoveryManagerService.init");
+ jbossatxLogger.i18NLogger.info_jts_RecoveryManagerService_init();
/** Create an ORB portability wrapper around the CORBA ORB services orb **/
ORB orb = ORB.getInstance("jboss-atx");
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerDelegate.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerDelegate.java 2010-06-30 10:26:20 UTC (rev 33694)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerDelegate.java 2010-06-30 10:30:04 UTC (rev 33695)
@@ -68,11 +68,6 @@
* if there is no transaction
* @throws RollbackException if the transaction is marked for rollback and
* errorRollback is true
- *
- * @message com.arjuna.ats.jbossatx.jts.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_1
- * [com.arjuna.ats.jbossatx.jts.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_1] - Transaction has or will rollback.
- * @message com.arjuna.ats.jbossatx.jts.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_2
- * [com.arjuna.ats.jbossatx.jts.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_2] - Unexpected error retrieving transaction status
*/
public long getTimeLeftBeforeTransactionTimeout(boolean errorRollback)
throws RollbackException
@@ -87,7 +82,7 @@
case Status.STATUS_ROLLEDBACK:
case Status.STATUS_ROLLING_BACK:
if(errorRollback) {
- throw new RollbackException(jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_1"));
+ throw new RollbackException(jbossatxLogger.i18NLogger.get_jts_TransactionManagerDelegate_getTimeLeftBeforeTransactionTimeout_1());
}
break;
case Status.STATUS_COMMITTED:
@@ -113,7 +108,7 @@
catch (final SystemException se)
{
RollbackException rollbackException = new RollbackException(
- jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_2")) ;
+ jbossatxLogger.i18NLogger.get_jts_TransactionManagerDelegate_getTimeLeftBeforeTransactionTimeout_2()) ;
rollbackException.initCause(se);
throw rollbackException;
}
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java 2010-06-30 10:26:20 UTC (rev 33694)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java 2010-06-30 10:30:04 UTC (rev 33695)
@@ -58,15 +58,9 @@
throw new IllegalArgumentException("JTS mode startup requires an ORB to be provided");
}
- /**
- * @message com.arjuna.ats.jbossatx.jts.TransactionManagerService.start
- * [com.arjuna.ats.jbossatx.jts.TransactionManagerService.start] registering transaction manager
- * @message com.arjuna.ats.jbossatx.jts.TransactionManagerService.failed
- * [com.arjuna.ats.jbossatx.jts.TransactionManagerService.failed] Problem encountered while trying to register transaction manager with ORB!
- */
public void start(org.omg.CORBA.ORB theCorbaORB) throws Exception
{
- jbossatxLogger.loggerI18N.info("registering transaction manager");
+ jbossatxLogger.i18NLogger.info_jts_TransactionManagerService_start();
// Create an ORB portability wrapper around the CORBA ORB services orb
ORB orb = ORB.getInstance("jboss-atx");
@@ -90,9 +84,7 @@
}
catch (final Exception ex)
{
- jbossatxLogger.loggerI18N.fatal("com.arjuna.ats.jbossatx.jts.TransactionManagerService.failed", ex);
-
- throw new Exception(jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.TransactionManagerService.failed"), ex);
+ throw new Exception(jbossatxLogger.i18NLogger.get_jts_TransactionManagerService_failed(), ex);
}
}
Added: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLogger.java (rev 0)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLogger.java 2010-06-30 10:30:04 UTC (rev 33695)
@@ -0,0 +1,166 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates,
+ * and individual contributors as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2010,
+ * @author JBoss, by Red Hat.
+ */
+package com.arjuna.ats.jbossatx.logging;
+
+import org.jboss.logging.*;
+import static org.jboss.logging.Logger.Level.*;
+import static org.jboss.logging.Message.Format.*;
+
+/**
+ * i18n log messages for the atsintegration module.
+ *
+ * @author Jonathan Halliday (jonathan.halliday at redhat.com) 2010-06
+ */
+ at MessageLogger(projectCode = "ARJUNA")
+public interface jbossatxI18NLogger {
+
+ /*
+ Message IDs are unique and non-recyclable.
+ Don't change the purpose of existing messages.
+ (tweak the message text or params for clarification if you like).
+ Allocate new messages by following instructions at the bottom of the file.
+ */
+
+ @Message(id = 32001, value = "createConnection got exception", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_jta_AppServerJDBCXARecovery_createconnectionproblem(Throwable arg0);
+
+ @Message(id = 32002, value = "createDataSource got exception during getXADataSource call", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_jta_AppServerJDBCXARecovery_createproblem(Throwable arg0);
+
+ @Message(id = 32003, value = "InstanceNotFound. Datasource {0} not deployed, or wrong name?", format = MESSAGE_FORMAT)
+ @LogMessage(level = WARN)
+ public void warn_jta_AppServerJDBCXARecovery_notfound(String arg0);
+
+ @Message(id = 32004, value = "createDataSource {0} got exception", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_jta_AppServerJDBCXARecovery_problem(String arg0, Throwable arg1);
+
+ @Message(id = 32005, value = "Unexpected exception occurred", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_jta_PropagationContextManager_exception(Throwable arg0);
+
+ @Message(id = 32006, value = "unknown Tx PropagationContext", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_jta_PropagationContextManager_unknownctx();
+
+ @Message(id = 32007, value = "getCurrentTransaction() failed", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_jts_InboundTransactionCurrentImple_exception(Throwable arg0);
+
+ @Message(id = 32008, value = "unknown Tx PropagationContext", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_jts_PropagationContextManager_unknownctx();
+
+ @Message(id = 32009, value = "Unexpected exception occurred", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_jts_PropagationContextManager_exception(Throwable arg0);
+
+ @Message(id = 32010, value = "JBossTS Recovery Service (tag: {0}) - JBoss Inc.", format = MESSAGE_FORMAT)
+ @LogMessage(level = INFO)
+ public void info_jta_RecoveryManagerService_create(String arg0);
+
+ @Message(id = 32011, value = "No suitable recovery module in which to register XAResourceRecovery instance", format = MESSAGE_FORMAT)
+ public String get_jta_RecoveryManagerService_norecoverymodule();
+
+ @Message(id = 32012, value = "No recovery system in which to register XAResourceRecovery instance", format = MESSAGE_FORMAT)
+ public String get_jta_RecoveryManagerService_norecoverysystem();
+
+ @Message(id = 32013, value = "Starting transaction recovery manager", format = MESSAGE_FORMAT)
+ @LogMessage(level = INFO)
+ public void info_jta_RecoveryManagerService_start();
+
+ @Message(id = 32014, value = "Stopping transaction recovery manager", format = MESSAGE_FORMAT)
+ @LogMessage(level = INFO)
+ public void info_jta_RecoveryManagerService_stop();
+
+ @Message(id = 32015, value = "Transaction has or will rollback.", format = MESSAGE_FORMAT)
+ public String get_jta_TransactionManagerDelegate_getTimeLeftBeforeTransactionTimeout_1();
+
+ @Message(id = 32016, value = "Unexpected error retrieving transaction status", format = MESSAGE_FORMAT)
+ public String get_jta_TransactionManagerDelegate_getTimeLeftBeforeTransactionTimeout_2();
+
+ @Message(id = 32017, value = "JBossTS Transaction Service ({0} version - tag: {1}) - JBoss Inc.", format = MESSAGE_FORMAT)
+ @LogMessage(level = INFO)
+ public void info_jta_TransactionManagerService_create(String arg0, String arg1);
+
+ @Message(id = 32018, value = "Destroying TransactionManagerService", format = MESSAGE_FORMAT)
+ @LogMessage(level = INFO)
+ public void info_jta_TransactionManagerService_destroy();
+
+ @Message(id = 32019, value = "XAExceptionFormatters are not supported by the JBossTS Transaction Service - this warning can safely be ignored", format = MESSAGE_FORMAT)
+ @LogMessage(level = WARN)
+ public void warn_jta_TransactionManagerService_noformatter();
+
+ @Message(id = 32020, value = "Transaction is completing!", format = MESSAGE_FORMAT)
+ public String get_jta_jca_completing();
+
+ @Message(id = 32021, value = "Transaction is inactive!", format = MESSAGE_FORMAT)
+ public String get_jta_jca_inactive();
+
+ @Message(id = 32022, value = "Unexpected error!", format = MESSAGE_FORMAT)
+ public String get_jta_jca_unknown();
+
+ @Message(id = 32023, value = "Work not registered!", format = MESSAGE_FORMAT)
+ public String get_jta_jca_unknownwork();
+
+ @Message(id = 32024, value = "<init> JTS transaction recovery manager", format = MESSAGE_FORMAT)
+ @LogMessage(level = INFO)
+ public void info_jts_RecoveryManagerService_init();
+
+ @Message(id = 32025, value = "Transaction has or will rollback.", format = MESSAGE_FORMAT)
+ public String get_jts_TransactionManagerDelegate_getTimeLeftBeforeTransactionTimeout_1();
+
+ @Message(id = 32026, value = "Unexpected error retrieving transaction status", format = MESSAGE_FORMAT)
+ public String get_jts_TransactionManagerDelegate_getTimeLeftBeforeTransactionTimeout_2();
+
+ @Message(id = 32027, value = "Problem encountered while trying to register transaction manager with ORB!", format = MESSAGE_FORMAT)
+ public String get_jts_TransactionManagerService_failed();
+
+ @Message(id = 32028, value = "registering transaction manager", format = MESSAGE_FORMAT)
+ @LogMessage(level = INFO)
+ public void info_jts_TransactionManagerService_start();
+
+ @Message(id = 32029, value = "Transaction is completing!", format = MESSAGE_FORMAT)
+ public String get_jts_jca_completing();
+
+ @Message(id = 32030, value = "Transaction is inactive!", format = MESSAGE_FORMAT)
+ public String get_jts_jca_inactive();
+
+ @Message(id = 32031, value = "Unexpected error!", format = MESSAGE_FORMAT)
+ public String get_jts_jca_unknown();
+
+ @Message(id = 32032, value = "Work not registered!", format = MESSAGE_FORMAT)
+ public String get_jts_jca_unknownwork();
+
+ /*
+ Allocate new messages directly above this notice.
+ - id: use the next id number in numeric sequence. Don't reuse ids.
+ The first two digits of the id(XXyyy) denote the module
+ all message in this file should have the same prefix.
+ - 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>_
+ */
+}
Added: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLoggerImpl.java (rev 0)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxI18NLoggerImpl.java 2010-06-30 10:30:04 UTC (rev 33695)
@@ -0,0 +1,169 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates,
+ * and individual contributors as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2010,
+ * @author JBoss, by Red Hat.
+ */
+package com.arjuna.ats.jbossatx.logging;
+
+import org.jboss.logging.Logger;
+import static org.jboss.logging.Logger.Level.*;
+import java.text.MessageFormat;
+import com.arjuna.ats.arjuna.common.Uid;
+
+/**
+ * i18n log messages for the atsintegration module.
+ * This class is autogenerated. Don't mess with it.
+ *
+ * @author Jonathan Halliday (jonathan.halliday at redhat.com) 2010-06
+ */
+public class jbossatxI18NLoggerImpl implements jbossatxI18NLogger {
+
+ private final Logger logger;
+
+ jbossatxI18NLoggerImpl(Logger logger) {
+ this.logger = logger;
+ }
+
+ public void error_jta_AppServerJDBCXARecovery_createconnectionproblem(Throwable arg0) {
+ logger.logv(ERROR, arg0, "ARJUNA-32001 createConnection got exception", (Object)null);
+ }
+
+ public void error_jta_AppServerJDBCXARecovery_createproblem(Throwable arg0) {
+ logger.logv(ERROR, arg0, "ARJUNA-32002 createDataSource got exception during getXADataSource call", (Object)null);
+ }
+
+ public void warn_jta_AppServerJDBCXARecovery_notfound(String arg0) {
+ logger.logv(WARN, "ARJUNA-32003 InstanceNotFound. Datasource {0} not deployed, or wrong name?", arg0);
+ }
+
+ public void error_jta_AppServerJDBCXARecovery_problem(String arg0, Throwable arg1) {
+ logger.logv(ERROR, arg1, "ARJUNA-32004 createDataSource {0} got exception", arg0);
+ }
+
+ public void error_jta_PropagationContextManager_exception(Throwable arg0) {
+ logger.logv(ERROR, arg0, "ARJUNA-32005 Unexpected exception occurred", (Object)null);
+ }
+
+ public void error_jta_PropagationContextManager_unknownctx() {
+ logger.logv(ERROR, "ARJUNA-32006 unknown Tx PropagationContext", (Object)null);
+ }
+
+ public void error_jts_InboundTransactionCurrentImple_exception(Throwable arg0) {
+ logger.logv(ERROR, arg0, "ARJUNA-32007 getCurrentTransaction() failed", (Object)null);
+ }
+
+ public void error_jts_PropagationContextManager_unknownctx() {
+ logger.logv(ERROR, "ARJUNA-32008 unknown Tx PropagationContext", (Object)null);
+ }
+
+ public void error_jts_PropagationContextManager_exception(Throwable arg0) {
+ logger.logv(ERROR, arg0, "ARJUNA-32009 Unexpected exception occurred", (Object)null);
+ }
+
+ public void info_jta_RecoveryManagerService_create(String arg0) {
+ logger.logv(INFO, "ARJUNA-32010 JBossTS Recovery Service (tag: {0}) - JBoss Inc.", arg0);
+ }
+
+ public String get_jta_RecoveryManagerService_norecoverymodule() {
+ return "ARJUNA-32011 No suitable recovery module in which to register XAResourceRecovery instance";
+ }
+
+ public String get_jta_RecoveryManagerService_norecoverysystem() {
+ return "ARJUNA-32012 No recovery system in which to register XAResourceRecovery instance";
+ }
+
+ public void info_jta_RecoveryManagerService_start() {
+ logger.logv(INFO, "ARJUNA-32013 Starting transaction recovery manager", (Object)null);
+ }
+
+ public void info_jta_RecoveryManagerService_stop() {
+ logger.logv(INFO, "ARJUNA-32014 Stopping transaction recovery manager", (Object)null);
+ }
+
+ public String get_jta_TransactionManagerDelegate_getTimeLeftBeforeTransactionTimeout_1() {
+ return "ARJUNA-32015 Transaction has or will rollback.";
+ }
+
+ public String get_jta_TransactionManagerDelegate_getTimeLeftBeforeTransactionTimeout_2() {
+ return "ARJUNA-32016 Unexpected error retrieving transaction status";
+ }
+
+ public void info_jta_TransactionManagerService_create(String arg0, String arg1) {
+ logger.logv(INFO, "ARJUNA-32017 JBossTS Transaction Service ({0} version - tag: {1}) - JBoss Inc.", arg0, arg1);
+ }
+
+ public void info_jta_TransactionManagerService_destroy() {
+ logger.logv(INFO, "ARJUNA-32018 Destroying TransactionManagerService", (Object)null);
+ }
+
+ public void warn_jta_TransactionManagerService_noformatter() {
+ logger.logv(WARN, "ARJUNA-32019 XAExceptionFormatters are not supported by the JBossTS Transaction Service - this warning can safely be ignored", (Object)null);
+ }
+
+ public String get_jta_jca_completing() {
+ return "ARJUNA-32020 Transaction is completing!";
+ }
+
+ public String get_jta_jca_inactive() {
+ return "ARJUNA-32021 Transaction is inactive!";
+ }
+
+ public String get_jta_jca_unknown() {
+ return "ARJUNA-32022 Unexpected error!";
+ }
+
+ public String get_jta_jca_unknownwork() {
+ return "ARJUNA-32023 Work not registered!";
+ }
+
+ public void info_jts_RecoveryManagerService_init() {
+ logger.logv(INFO, "ARJUNA-32024 <init> JTS transaction recovery manager", (Object)null);
+ }
+
+ public String get_jts_TransactionManagerDelegate_getTimeLeftBeforeTransactionTimeout_1() {
+ return "ARJUNA-32025 Transaction has or will rollback.";
+ }
+
+ public String get_jts_TransactionManagerDelegate_getTimeLeftBeforeTransactionTimeout_2() {
+ return "ARJUNA-32026 Unexpected error retrieving transaction status";
+ }
+
+ public String get_jts_TransactionManagerService_failed() {
+ return "ARJUNA-32027 Problem encountered while trying to register transaction manager with ORB!";
+ }
+
+ public void info_jts_TransactionManagerService_start() {
+ logger.logv(INFO, "ARJUNA-32028 registering transaction manager", (Object)null);
+ }
+
+ public String get_jts_jca_completing() {
+ return "ARJUNA-32029 Transaction is completing!";
+ }
+
+ public String get_jts_jca_inactive() {
+ return "ARJUNA-32030 Transaction is inactive!";
+ }
+
+ public String get_jts_jca_unknown() {
+ return "ARJUNA-32031 Unexpected error!";
+ }
+
+ public String get_jts_jca_unknownwork() {
+ return "ARJUNA-32032 Work not registered!";
+ }
+}
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxLogger.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxLogger.java 2010-06-30 10:26:20 UTC (rev 33694)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxLogger.java 2010-06-30 10:30:04 UTC (rev 33695)
@@ -33,6 +33,7 @@
import com.arjuna.common.util.logging.*;
import com.arjuna.common.internal.util.logging.commonPropertyManager;
+import org.jboss.logging.Logger;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -40,12 +41,15 @@
public class jbossatxLogger
{
public static LogNoi18n logger;
- public static Logi18n loggerI18N;
+ //public static Logi18n loggerI18N;
+ public static jbossatxI18NLogger i18NLogger;
+
public static void initialize(LogNoi18n noi18n, Logi18n i18n)
{
logger = noi18n;
- loggerI18N = i18n;
+ //loggerI18N = i18n;
+ i18NLogger = new jbossatxI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.jbossatx"));
}
static
More information about the jboss-svn-commits
mailing list