[jboss-svn-commits] JBL Code SVN: r30106 - in labs/jbosstm/trunk/atsintegration: classes/com/arjuna/ats/internal/jbossatx/jta and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 11 11:41:28 EST 2009
Author: jhalliday
Date: 2009-11-11 11:41:28 -0500 (Wed, 11 Nov 2009)
New Revision: 30106
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/jts/InboundTransactionCurrentImple.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/PropagationContextManager.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/RecoveryManagerService.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/TransactionManagerService.java
Log:
i18n for atsintegration module. JBTM-414
Modified: labs/jbosstm/trunk/atsintegration/build.xml
===================================================================
--- labs/jbosstm/trunk/atsintegration/build.xml 2009-11-11 15:13:38 UTC (rev 30105)
+++ labs/jbosstm/trunk/atsintegration/build.xml 2009-11-11 16:41:28 UTC (rev 30106)
@@ -63,8 +63,6 @@
<compile.macro excluded.classes="${exclude-these-classes}">
<additional.classpath>
- <!-- jboss-logging-spi.jar has Logger -->
- <fileset dir="${env.JBOSS_HOME}/lib" includes="jboss-logging-spi.jar"/>
<!-- jboss-integration.jar has the transactions SPI jbosssx has security -->
<fileset dir="${env.JBOSS_HOME}/common/lib" includes="jboss-integration.jar jbosssx.jar"/>
</additional.classpath>
@@ -72,14 +70,6 @@
</target>
- <target name="generateresourcebundle">
- <generateresourcebundle.macro>
- <args>
- <param name="-appendkey" value="[]"/>
- </args>
- </generateresourcebundle.macro>
- </target>
-
<target name="compile-tests"/>
<target name="run.tests"/>
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 2009-11-11 15:13:38 UTC (rev 30105)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/AppServerJDBCXARecovery.java 2009-11-11 16:41:28 UTC (rev 30106)
@@ -59,7 +59,6 @@
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
-import org.jboss.logging.Logger;
/**
* This provides recovery for compliant JDBC drivers accessed via datasources deployed in JBossAS 5
@@ -174,6 +173,14 @@
/**
* 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
@@ -256,7 +263,7 @@
_supportsIsValidMethod = true; // assume it does; we'll lazily check the first time we try to connect
} catch(Exception e) {
_dataSource = null;
- log.error("AppServerJDBCXARecovery.createDataSource got exception during getXADataSource call: "+e.toString(), e);
+ jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.createproblem", new Object[] {e.toString()}, e);
SQLException sqlException = new SQLException(e.toString());
sqlException.initCause(e);
throw sqlException;
@@ -267,13 +274,13 @@
{
if (mbe.getTargetException() instanceof InstanceNotFoundException)
{
- log.warn("AppServerJDBCXARecovery.createDataSource(name="+_dataSourceId+"): InstanceNotFound. Datasource not deployed, or wrong name?");
+ jbossatxLogger.loggerI18N.warn("com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.notfound", new Object[] {_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 {
- log.error("AppServerJDBCXARecovery.createDataSource(name="+_dataSourceId+") got exception " + mbe.toString(), mbe);
+ jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.problem", new Object[] {_dataSourceId, mbe.toString()}, mbe);
}
SQLException sqlException = new SQLException(mbe.toString());
@@ -282,13 +289,13 @@
}
catch (SQLException ex)
{
- log.error("AppServerJDBCXARecovery.createDataSource got exception "+ex.toString(), ex);
+ jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.problem", new Object[] {_dataSourceId, ex.toString()}, ex);
throw ex;
}
catch (Exception e)
{
- log.error("AppServerJDBCXARecovery.createDataSource got exception "+e.toString(), e);
+ jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.problem", new Object[] {_dataSourceId, e.toString()}, e);
SQLException sqlException = new SQLException(e.toString());
sqlException.initCause(e);
@@ -298,6 +305,9 @@
/**
* 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()
@@ -369,13 +379,13 @@
}
catch (SQLException ex)
{
- log.error("AppServerJDBCXARecovery.createConnection got exception "+ex.toString(), ex);
+ jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.createconnectionproblem", new Object[] {ex.toString()}, ex);
throw ex;
}
catch (Exception e)
{
- log.error("AppServerJDBCXARecovery.createConnection got exception "+e.toString(), e);
+ jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery.createconnectionproblem", new Object[] {e.toString()}, e);
SQLException sqlException = new SQLException(e.toString());
sqlException.initCause(e);
@@ -525,6 +535,4 @@
private final String _USERNAME = "username";
private final String _PASSWORD = "password";
private final String _DELIMITER = ",";
-
- private Logger log = org.jboss.logging.Logger.getLogger(AppServerJDBCXARecovery.class);
}
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 2009-11-11 15:13:38 UTC (rev 30105)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/PropagationContextManager.java 2009-11-11 16:41:28 UTC (rev 30106)
@@ -33,7 +33,6 @@
import org.jboss.tm.TransactionPropagationContextFactory;
import org.jboss.tm.TransactionPropagationContextImporter;
-import org.jboss.logging.Logger;
import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.ats.arjuna.coordinator.BasicAction;
@@ -55,8 +54,6 @@
public class PropagationContextManager
implements TransactionPropagationContextFactory, TransactionPropagationContextImporter, ObjectFactory, Serializable
{
- private Logger log = org.jboss.logging.Logger.getLogger(PropagationContextManager.class);
-
/**
* Return a transaction propagation context for the transaction
* currently associated with the invoking thread, or <code>null</code>
@@ -122,6 +119,11 @@
* 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)
@@ -152,13 +154,13 @@
}
catch (Exception e)
{
- log.error("Unexpected exception occurred", e);
+ jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager.exception", e);
return null;
}
}
else
{
- log.error("jboss-atx: unknown Tx PropagationContext");
+ jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager.unknownctx");
return null;
}
}
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 2009-11-11 15:13:38 UTC (rev 30105)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/InboundTransactionCurrentImple.java 2009-11-11 16:41:28 UTC (rev 30106)
@@ -22,7 +22,6 @@
import org.jboss.iiop.tm.InboundTransactionCurrent;
import org.jboss.tm.TransactionManagerLocator;
-import org.jboss.logging.Logger;
import org.omg.CORBA.LocalObject;
import javax.transaction.Transaction;
@@ -48,8 +47,10 @@
*/
public class InboundTransactionCurrentImple extends LocalObject implements InboundTransactionCurrent
{
- private Logger log = org.jboss.logging.Logger.getLogger(InboundTransactionCurrentImple.class);
-
+ /**
+ * @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())
@@ -79,7 +80,7 @@
}
} catch(Exception e)
{
- log.error("InboundTransactionCurrentImple.getCurrentTransaction() failed", e);
+ jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.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 2009-11-11 15:13:38 UTC (rev 30105)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/PropagationContextManager.java 2009-11-11 16:41:28 UTC (rev 30106)
@@ -33,7 +33,6 @@
import org.jboss.tm.TransactionPropagationContextFactory;
import org.jboss.tm.TransactionPropagationContextImporter;
-import org.jboss.logging.Logger;
import org.omg.CosTransactions.*;
@@ -58,8 +57,6 @@
public class PropagationContextManager
implements TransactionPropagationContextFactory, TransactionPropagationContextImporter, ObjectFactory, Serializable
{
- private Logger log = org.jboss.logging.Logger.getLogger(PropagationContextManager.class);
-
/**
* Return a transaction propagation context for the transaction
* currently associated with the invoking thread, or <code>null</code>
@@ -168,6 +165,11 @@
* 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)
@@ -201,14 +203,14 @@
}
catch (Exception e)
{
- log.error("Unexpected exception occurred", e);
+ jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jts.PropagationContextManager.exception", e);
return null;
}
}
else
{
- log.error("jboss-atx: unknown Tx PropagationContext");
+ jbossatxLogger.loggerI18N.error("com.arjuna.ats.internal.jbossatx.jts.PropagationContextManager.unknownctx");
return null;
}
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 2009-11-11 15:13:38 UTC (rev 30105)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/RecoveryManagerService.java 2009-11-11 16:41:28 UTC (rev 30106)
@@ -24,9 +24,9 @@
import com.arjuna.ats.arjuna.recovery.RecoveryModule;
import com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule;
import com.arjuna.ats.internal.jbossatx.jta.XAResourceRecoveryHelperWrapper;
+import com.arjuna.ats.jbossatx.logging.jbossatxLogger;
import com.arjuna.common.util.ConfigurationInfo;
-import org.jboss.logging.Logger;
import org.jboss.tm.XAResourceRecovery;
import org.jboss.tm.XAResourceRecoveryRegistry;
@@ -40,15 +40,17 @@
*/
public class RecoveryManagerService implements XAResourceRecoveryRegistry
{
- protected Logger log = org.jboss.logging.Logger.getLogger(RecoveryManagerService.class);
-
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();
- log.info("JBossTS Recovery Service (tag:"+tag+") - JBoss Inc.");
+ jbossatxLogger.loggerI18N.info("com.arjuna.ats.jbossatx.jta.RecoveryManagerService.create", new Object[] {tag});
RecoveryManager.delayRecoveryManagerThread();
// listener (if any) is created here:
@@ -59,28 +61,42 @@
{
}
+ /**
+ * @message com.arjuna.ats.jbossatx.jta.RecoveryManagerService.start
+ * [com.arjuna.ats.jbossatx.jta.RecoveryManagerService.start] Starting transaction recovery manager
+ */
public void start()
{
- log.info("Starting transaction recovery manager");
+ jbossatxLogger.loggerI18N.info("com.arjuna.ats.jbossatx.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
{
- log.info("Stopping transaction recovery manager");
+ jbossatxLogger.loggerI18N.info("com.arjuna.ats.jbossatx.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) {
- log.error("No recovery system in which to register XAResourceRecovery instance");
- throw new IllegalStateException("No recovery system present in this server");
+ jbossatxLogger.loggerI18N.error("com.arjuna.ats.jbossatx.jta.RecoveryManagerService.norecoverysystem");
+ throw new IllegalStateException(jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.RecoveryManagerService.norecoverysystem"));
}
XARecoveryModule xaRecoveryModule = null;
@@ -92,8 +108,8 @@
}
if(xaRecoveryModule == null) {
- log.error("No suitable recovery module in which to register XAResourceRecovery instance");
- throw new IllegalStateException("No xa recovery module present in this server");
+ jbossatxLogger.loggerI18N.error("com.arjuna.ats.jbossatx.jta.RecoveryManagerService.norecoverymodule");
+ throw new IllegalStateException(jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.RecoveryManagerService.norecoverymodule"));
}
xaRecoveryModule.addXAResourceRecoveryHelper(new XAResourceRecoveryHelperWrapper(xaResourceRecovery));
@@ -102,7 +118,7 @@
public void removeXAResourceRecovery(XAResourceRecovery xaResourceRecovery)
{
if(_recoveryManager == null) {
- log.warn("No recovery system from which to remove XAResourceRecovery instance");
+ jbossatxLogger.loggerI18N.warn("No recovery system from which to remove XAResourceRecovery instance");
return;
}
@@ -115,7 +131,7 @@
}
if(xaRecoveryModule == null) {
- log.warn("No suitable recovery module in which to register XAResourceRecovery instance");
+ jbossatxLogger.loggerI18N.warn("No suitable recovery module in which to register XAResourceRecovery instance");
return;
}
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 2009-11-11 15:13:38 UTC (rev 30105)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java 2009-11-11 16:41:28 UTC (rev 30106)
@@ -31,9 +31,9 @@
package com.arjuna.ats.jbossatx.jta;
import org.jboss.tm.*;
-import org.jboss.logging.Logger;
import com.arjuna.ats.arjuna.coordinator.TransactionReaper;
+import com.arjuna.ats.jbossatx.logging.jbossatxLogger;
import com.arjuna.common.util.ConfigurationInfo;
import javax.transaction.TransactionManager;
@@ -50,7 +50,6 @@
*/
public class TransactionManagerService implements TransactionManagerServiceMBean
{
- protected Logger log = org.jboss.logging.Logger.getLogger(TransactionManagerService.class);
protected String mode = "JTA";
private JBossXATerminator jbossXATerminator = null;
@@ -58,19 +57,27 @@
public TransactionManagerService() {}
+ /**
+ * @message com.arjuna.ats.jbossatx.jta.TransactionManagerService.create
+ * [com.arjuna.ats.jbossatx.jta.TransactionManagerService.create] JBossTS Transaction Service (tag: {0}) - JBoss Inc.
+ */
public void create() throws Exception
{
String tag = ConfigurationInfo.getSourceId();
- log.info("JBossTS Transaction Service ("+mode+" version - tag:"+tag+") - JBoss Inc.");
+ jbossatxLogger.loggerI18N.info("com.arjuna.ats.jbossatx.jta.TransactionManagerService.create", new Object[] {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()
{
- log.info("Destroying TransactionManagerService");
+ jbossatxLogger.loggerI18N.info("com.arjuna.ats.jbossatx.jta.TransactionManagerService.destroy");
}
public void start()
@@ -141,10 +148,13 @@
/**
* 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)
{
- log.warn("XAExceptionFormatters are not supported by the JBossTS Transaction Service - this warning can safely be ignored");
+ jbossatxLogger.loggerI18N.warn("XAExceptionFormatters are not supported by the JBossTS Transaction Service - this warning can safely be ignored");
}
/**
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 2009-11-11 15:13:38 UTC (rev 30105)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/RecoveryManagerService.java 2009-11-11 16:41:28 UTC (rev 30106)
@@ -23,6 +23,7 @@
import com.arjuna.orbportability.ORB;
import com.arjuna.orbportability.OA;
import com.arjuna.ats.internal.jts.recovery.RecoveryORBManager;
+import com.arjuna.ats.jbossatx.logging.jbossatxLogger;
/**
* JBoss Transaction Recovery Service.
@@ -32,12 +33,14 @@
*/
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
{
- log = org.jboss.logging.Logger.getLogger(RecoveryManagerService.class);
+ jbossatxLogger.loggerI18N.info("com.arjuna.ats.jbossatx.jts.RecoveryManagerService.init");
- log.info("<init> JTS transaction recovery manager");
-
/** 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/TransactionManagerService.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java 2009-11-11 15:13:38 UTC (rev 30105)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java 2009-11-11 16:41:28 UTC (rev 30106)
@@ -36,6 +36,7 @@
import com.arjuna.orbportability.OA;
import com.arjuna.ats.internal.jts.ORBManager;
+import com.arjuna.ats.jbossatx.logging.jbossatxLogger;
/**
* JBoss Transaction Manager Service.
@@ -49,7 +50,6 @@
{
public TransactionManagerService() {
mode = "JTS";
- log = org.jboss.logging.Logger.getLogger(TransactionManagerService.class);
}
public void start()
@@ -57,9 +57,15 @@
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
{
- log.info("registering transaction manager");
+ jbossatxLogger.loggerI18N.info("registering transaction manager");
// Create an ORB portability wrapper around the CORBA ORB services orb
ORB orb = ORB.getInstance("jboss-atx");
@@ -83,9 +89,9 @@
}
catch (final Exception ex)
{
- log.fatal("Problem encountered while trying to register transaction manager with ORB!");
+ jbossatxLogger.loggerI18N.fatal("com.arjuna.ats.jbossatx.jts.TransactionManagerService.failed", ex);
- throw new Exception("Problem encountered while trying to register transaction manager with ORB! "+ex, ex);
+ throw new Exception(jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.TransactionManagerService.failed"), ex);
}
}
More information about the jboss-svn-commits
mailing list