[jboss-svn-commits] JBL Code SVN: r34170 - in labs/jbosstm/trunk/txbridge: src/org/jboss/jbossts/txbridge and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 26 06:40:08 EDT 2010
Author: jhalliday
Date: 2010-07-26 06:40:07 -0400 (Mon, 26 Jul 2010)
New Revision: 34170
Added:
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/utils/
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeI18NLogger.java
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeI18NLoggerImpl.java
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeLogger.java
Modified:
labs/jbosstm/trunk/txbridge/build.xml
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/BridgeDurableParticipant.java
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/BridgeVolatileParticipant.java
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridge.java
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridgeManager.java
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridgeRecoveryManager.java
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/JaxWSTxInboundBridgeHandler.java
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/BridgeSynchronization.java
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/BridgeXAResource.java
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/JaxWSTxOutboundBridgeHandler.java
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/OutboundBridge.java
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/OutboundBridgeManager.java
labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/OutboundBridgeRecoveryManager.java
Log:
Convert txbridge to use our normal logger per module approach, replace log4j with jboss-logging and add i18n. JBTM-44
Modified: labs/jbosstm/trunk/txbridge/build.xml
===================================================================
--- labs/jbosstm/trunk/txbridge/build.xml 2010-07-26 10:25:57 UTC (rev 34169)
+++ labs/jbosstm/trunk/txbridge/build.xml 2010-07-26 10:40:07 UTC (rev 34170)
@@ -52,7 +52,7 @@
</fileset>
<fileset dir="${global.ext.lib.dir}">
- <include name="log4j.jar"/>
+ <include name="jboss-logging.jar"/>
<include name="jboss-transaction-api_1.1_spec.jar"/>
<include name="jboss-connector-api_1.5_spec.jar"/>
</fileset>
@@ -109,6 +109,7 @@
<!-- the following targets are utility functions for the JBossTS dev team.
You probably don't need to worry about them. -->
+
<property name="jbossas.home" location="/home/jhalli/IdeaProjects/jboss/jbossas_trunk/build/target/jboss-6.0.0-SNAPSHOT"/>
<property name="jbossas.server" value="default"/>
Modified: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/BridgeDurableParticipant.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/BridgeDurableParticipant.java 2010-07-26 10:25:57 UTC (rev 34169)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/BridgeDurableParticipant.java 2010-07-26 10:40:07 UTC (rev 34170)
@@ -23,10 +23,12 @@
*/
package org.jboss.jbossts.txbridge.inbound;
+import com.arjuna.ats.jta.utils.XAHelper;
import com.arjuna.wst.*;
import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.ats.internal.jta.transaction.arjunacore.jca.SubordinationManager;
-import org.apache.log4j.Logger;
+import org.jboss.jbossts.txbridge.utils.txbridgeLogger;
+import org.omg.XA.XIDsHelper;
import javax.transaction.xa.Xid;
import javax.transaction.xa.XAException;
@@ -47,8 +49,6 @@
*/
public class BridgeDurableParticipant implements Durable2PCParticipant, Serializable
{
- private static final Logger log = Logger.getLogger(BridgeDurableParticipant.class);
-
/*
* Uniq String used to prefix ids at participant registration,
* so that the recovery module can identify relevant instances.
@@ -82,7 +82,7 @@
*/
BridgeDurableParticipant(String externalTxId, Xid xid)
{
- log.trace("BridgeDurableParticipant(TxId="+externalTxId+", Xid="+xid+")");
+ txbridgeLogger.logger.trace("BridgeDurableParticipant.<ctor>(TxId="+externalTxId+", Xid="+xid+")");
this.xid = xid;
this.externalTxId = externalTxId;
@@ -97,7 +97,7 @@
*/
private void writeObject(ObjectOutputStream out) throws IOException
{
- log.trace("writeObject() for Xid="+xid);
+ txbridgeLogger.logger.trace("BridgeDurableParticipant.writeObject() for Xid="+xid);
// we need to preserve the Uid of the underlying SubordinateTx, as it's required
// to get a handle on it again during recovery, Using the xid wont work,
@@ -108,10 +108,8 @@
}
catch(XAException xaException)
{
- log.error("Unable to get subordinate transaction id", xaException);
- IOException ioException = new IOException("Unable to serialize");
- ioException.initCause(xaException);
- throw ioException;
+ txbridgeLogger.i18NLogger.error_ibdp_nosub(xaException);
+ throw new IOException(xaException);
}
//out.defaultWriteObject();
@@ -129,7 +127,7 @@
*/
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
{
- log.trace("readObject()");
+ txbridgeLogger.logger.trace("BridgeDurableParticipant.readObject()");
//in.defaultReadObject();
xid = (Xid)in.readObject();
@@ -146,10 +144,8 @@
}
catch(XAException xaException)
{
- log.error("Unable to recover subordinate transaction id="+subordinateTransactionId, xaException);
- IOException ioException = new IOException("unable to deserialize");
- ioException.initCause(xaException);
- throw ioException;
+ txbridgeLogger.i18NLogger.error_ibdp_norecovery(subordinateTransactionId, xaException);
+ throw new IOException(xaException);
}
}
@@ -164,7 +160,7 @@
*/
public Vote prepare() throws WrongStateException, SystemException
{
- log.trace("prepare(Xid="+xid+")");
+ txbridgeLogger.logger.trace("BridgeDurableParticipant.prepare(Xid="+xid+")");
try
{
@@ -172,13 +168,13 @@
int result = xaTerminator.prepare(xid);
if(result == XAResource.XA_OK)
{
- log.debug("prepare on Xid="+xid+" returning Prepared");
+ txbridgeLogger.logger.trace("prepare on Xid="+xid+" returning Prepared");
return new Prepared();
}
else
{
cleanupRefs();
- log.debug("prepare on Xid="+xid+" returning ReadOnly");
+ txbridgeLogger.logger.trace("prepare on Xid="+xid+" returning ReadOnly");
return new ReadOnly();
}
@@ -189,7 +185,7 @@
// e.g. due to failure of VolatileParticipant.prepare, then it's expected the prepare will fail.
// we really need to use XATerminatorExtensions to expose a isSetRollbackOnly...
cleanupRefs();
- log.warn("prepare on Xid="+xid+" returning Aborted", e);
+ txbridgeLogger.i18NLogger.warn_ibdp_aborted(XAHelper.xidToString(xid), e);
return new Aborted();
}
}
@@ -202,16 +198,16 @@
*/
public void commit() throws WrongStateException, SystemException
{
- log.trace("commit(Xid="+xid+")");
+ txbridgeLogger.logger.trace("BridgeDurableParticipant.commit(Xid="+xid+")");
try
{
xaTerminator.commit(xid, false);
- log.debug("commit on Xid="+xid+" OK");
+ txbridgeLogger.logger.trace("commit on Xid="+xid+" OK");
}
catch (XAException e)
{
- log.error("commit on Xid="+xid+" failed", e);
+ txbridgeLogger.i18NLogger.error_ibdp_commitfailed(XAHelper.xidToString(xid), e);
}
finally
{
@@ -228,16 +224,16 @@
*/
public void rollback() throws WrongStateException, SystemException
{
- log.trace("rollback(Xid="+xid+")");
+ txbridgeLogger.logger.trace("BridgeDurableParticipant.rollback(Xid="+xid+")");
try
{
xaTerminator.rollback(xid);
- log.debug("rollback on Xid="+xid+" OK");
+ txbridgeLogger.logger.trace("rollback on Xid="+xid+" OK");
}
catch (XAException e)
{
- log.error("rollback on Xid="+xid+" failed", e);
+ txbridgeLogger.i18NLogger.error_ibdp_rollbackfailed(XAHelper.xidToString(xid), e);
}
finally
{
@@ -253,7 +249,7 @@
*/
public void unknown() throws SystemException
{
- log.trace("unknown(Xid="+xid+"): NOT IMPLEMENTED");
+ txbridgeLogger.logger.trace("BridgeDurableParticipant.unknown(Xid="+xid+"): NOT IMPLEMENTED");
}
/**
@@ -263,7 +259,7 @@
*/
public void error() throws SystemException
{
- log.trace("error(Xid="+xid+"): NOT IMPLEMENTED");
+ txbridgeLogger.logger.trace("BridgeDurableParticipant.error(Xid="+xid+"): NOT IMPLEMENTED");
}
public boolean isAwaitingRecovery() {
@@ -277,7 +273,7 @@
private void cleanupRefs()
{
- log.trace("cleanupRefs()");
+ txbridgeLogger.logger.trace("BridgeDurableParticipant.cleanupRefs()");
org.jboss.jbossts.txbridge.inbound.InboundBridgeManager.removeMapping(externalTxId);
isAwaitingRecovery = false;
Modified: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/BridgeVolatileParticipant.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/BridgeVolatileParticipant.java 2010-07-26 10:25:57 UTC (rev 34169)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/BridgeVolatileParticipant.java 2010-07-26 10:40:07 UTC (rev 34170)
@@ -23,11 +23,12 @@
*/
package org.jboss.jbossts.txbridge.inbound;
+import com.arjuna.ats.jta.utils.XAHelper;
import com.arjuna.wst.*;
import com.arjuna.ats.internal.jta.resources.spi.XATerminatorExtensions;
import com.arjuna.ats.internal.jta.transaction.arjunacore.jca.SubordinationManager;
import com.arjuna.ats.jta.utils.JTAHelper;
-import org.apache.log4j.Logger;
+import org.jboss.jbossts.txbridge.utils.txbridgeLogger;
import javax.transaction.xa.Xid;
import javax.transaction.Status;
@@ -40,8 +41,6 @@
*/
public class BridgeVolatileParticipant implements Volatile2PCParticipant
{
- private static final Logger log = Logger.getLogger(BridgeVolatileParticipant.class);
-
// no standard interface for driving Synchronization phases separately
// in JCA, so we have to use proprietary API.
private final XATerminatorExtensions xaTerminatorExtensions;
@@ -58,7 +57,7 @@
*/
BridgeVolatileParticipant(String externalTxId, Xid xid)
{
- log.trace("BridgeVolatileParticipant(TxId="+externalTxId+", Xid="+xid+")");
+ txbridgeLogger.logger.trace("BridgeVolatileParticipant.<ctor>(TxId="+externalTxId+", Xid="+xid+")");
this.xid = xid;
this.externalTxId = externalTxId;
@@ -73,7 +72,7 @@
*/
public Vote prepare() throws WrongStateException, SystemException
{
- log.trace("prepare(Xid="+xid+")");
+ txbridgeLogger.logger.trace("BridgeVolatileParticipant.prepare(Xid="+xid+")");
// Usually a VolatileParticipant would return Aborted to stop the tx in error cases. However, that
// would mean rollback() would not be called on the instance returning Aborted, which would make it
@@ -92,7 +91,7 @@
if(!xaTerminatorExtensions.beforeCompletion(xid))
{
- log.warn("prepare on Xid="+xid+" failed, setting RollbackOnly");
+ txbridgeLogger.i18NLogger.warn_ibvp_preparefailed(XAHelper.xidToString(xid), null);
inboundBridge.setRollbackOnly();
}
@@ -100,14 +99,14 @@
}
catch(Exception e)
{
- log.warn("prepare on Xid="+xid+" failed, setting RollbackOnly", e);
+ txbridgeLogger.i18NLogger.warn_ibvp_preparefailed(XAHelper.xidToString(xid), e);
try
{
inboundBridge.setRollbackOnly();
}
catch(Exception e2)
{
- log.warn("setRollbackOnly failed", e2);
+ txbridgeLogger.i18NLogger.warn_ibvp_setrollbackfailed(e2);
}
return new Prepared();
@@ -120,7 +119,7 @@
}
catch(Exception e)
{
- log.warn("stop failed for Xid="+xid, e);
+ txbridgeLogger.i18NLogger.warn_ibvp_stopfailed(XAHelper.xidToString(xid), e);
}
}
}
@@ -132,7 +131,7 @@
*/
public void commit() throws WrongStateException, SystemException
{
- log.trace("commit(Xid="+xid+")");
+ txbridgeLogger.logger.trace("BridgeVolatileParticipant.commit(Xid="+xid+")");
afterCompletion(Status.STATUS_COMMITTED);
}
@@ -144,7 +143,7 @@
*/
public void rollback() throws WrongStateException, SystemException
{
- log.trace("rollback(Xid="+xid+")");
+ txbridgeLogger.logger.trace("BridgeVolatileParticipant.rollback(Xid="+xid+")");
afterCompletion(Status.STATUS_ROLLEDBACK);
}
@@ -156,7 +155,7 @@
*/
private void afterCompletion(int status)
{
- log.trace("afterCompletion(Xid="+xid+", status="+status+"/"+JTAHelper.stringForm(status)+")");
+ txbridgeLogger.logger.trace("BridgeVolatileParticipant.afterCompletion(Xid="+xid+", status="+status+"/"+JTAHelper.stringForm(status)+")");
// this is a null-op, the afterCompletion is done implicitly at the XAResource commit/rollback stage.
}
@@ -166,7 +165,7 @@
*/
public void unknown() throws SystemException
{
- log.trace("unknown(Xid="+xid+"): NOT IMPLEMENTED");
+ txbridgeLogger.logger.trace("BridgeVolatileParticipant.unknown(Xid="+xid+"): NOT IMPLEMENTED");
}
/**
@@ -174,6 +173,6 @@
*/
public void error() throws SystemException
{
- log.trace("unknown(Xid="+xid+"): NOT IMPLEMENTED");
+ txbridgeLogger.logger.trace("BridgeVolatileParticipant.unknown(Xid="+xid+"): NOT IMPLEMENTED");
}
}
Modified: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridge.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridge.java 2010-07-26 10:25:57 UTC (rev 34169)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridge.java 2010-07-26 10:40:07 UTC (rev 34170)
@@ -25,6 +25,7 @@
import com.arjuna.ats.jta.TransactionManager;
import com.arjuna.ats.internal.jta.transaction.arjunacore.jca.SubordinationManager;
+import org.jboss.jbossts.txbridge.utils.txbridgeLogger;
import javax.transaction.xa.Xid;
import javax.transaction.xa.XAException;
@@ -33,8 +34,6 @@
import javax.transaction.InvalidTransactionException;
import javax.transaction.Transaction;
-import org.apache.log4j.Logger;
-
/**
* Manages Thread association of the interposed coordinator.
* Typically called from handlers in the WS stack.
@@ -43,8 +42,6 @@
*/
public class InboundBridge
{
- private static final Logger log = Logger.getLogger(InboundBridge.class);
-
/**
* Identifier for the subordinate transaction.
*/
@@ -59,7 +56,7 @@
*/
InboundBridge(Xid xid) throws XAException, SystemException
{
- log.trace("InboundBridge(Xid="+xid+")");
+ txbridgeLogger.logger.trace("InboundBridge.<ctor>(Xid="+xid+")");
this.xid = xid;
@@ -76,7 +73,7 @@
*/
public void start() throws XAException, SystemException, InvalidTransactionException
{
- log.trace("start(Xid="+xid+")");
+ txbridgeLogger.logger.trace("InboundBridge.start(Xid="+xid+")");
Transaction tx = getTransaction();
@@ -93,14 +90,14 @@
*/
public void stop() throws XAException, SystemException, InvalidTransactionException
{
- log.trace("stop("+xid+")");
+ txbridgeLogger.logger.trace("InboundBridge.stop("+xid+")");
TransactionManager.transactionManager().suspend();
}
public void setRollbackOnly() throws XAException, SystemException
{
- log.trace("setRollbackOnly("+xid+")");
+ txbridgeLogger.logger.trace("InboundBridge.setRollbackOnly("+xid+")");
getTransaction().setRollbackOnly();
}
Modified: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridgeManager.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridgeManager.java 2010-07-26 10:25:57 UTC (rev 34169)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridgeManager.java 2010-07-26 10:40:07 UTC (rev 34170)
@@ -39,7 +39,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.log4j.Logger;
+import org.jboss.jbossts.txbridge.utils.txbridgeLogger;
/**
* Maintains the mapping data that relates WS-AT transactions to JTA subordinate transactions and related objects.
@@ -52,8 +52,6 @@
*/
public class InboundBridgeManager
{
- private static final Logger log = Logger.getLogger(InboundBridgeManager.class);
-
// maps WS-AT Tx Id to InboundBridge instance.
private static final ConcurrentMap<String, InboundBridge> inboundBridgeMappings = new ConcurrentHashMap<String, org.jboss.jbossts.txbridge.inbound.InboundBridge>();
@@ -71,7 +69,7 @@
throws XAException, WrongStateException, UnknownTransactionException,
com.arjuna.wst.SystemException, javax.transaction.SystemException, AlreadyRegisteredException
{
- log.trace("getInboundBridge()");
+ txbridgeLogger.logger.trace("InboundBridgeManager.getInboundBridge()");
String externalTxId = UserTransactionFactory.userTransaction().toString();
@@ -104,7 +102,7 @@
*/
public static synchronized void removeMapping(String externalTxId)
{
- log.trace("removeMapping(externalTxId="+externalTxId+")");
+ txbridgeLogger.logger.trace("InboundBridgeManager.removeMapping(externalTxId="+externalTxId+")");
if(externalTxId != null) {
inboundBridgeMappings.remove(externalTxId);
@@ -124,7 +122,7 @@
throws XAException, WrongStateException, UnknownTransactionException,
com.arjuna.wst.SystemException, javax.transaction.SystemException, AlreadyRegisteredException
{
- log.trace("createMapping(externalTxId="+externalTxId+")");
+ txbridgeLogger.logger.trace("InboundBridgeManager.createMapping(externalTxId="+externalTxId+")");
if(inboundBridgeMappings.containsKey(externalTxId)) {
return;
Modified: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridgeRecoveryManager.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridgeRecoveryManager.java 2010-07-26 10:25:57 UTC (rev 34169)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridgeRecoveryManager.java 2010-07-26 10:40:07 UTC (rev 34170)
@@ -28,7 +28,8 @@
import com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule;
import com.arjuna.ats.internal.jta.transaction.arjunacore.jca.SubordinationManager;
import com.arjuna.ats.jta.recovery.XAResourceOrphanFilter;
-import org.apache.log4j.Logger;
+import com.arjuna.ats.jta.utils.XAHelper;
+import org.jboss.jbossts.txbridge.utils.txbridgeLogger;
import org.jboss.jbossts.xts.recovery.participant.at.XTSATRecoveryModule;
import org.jboss.jbossts.xts.recovery.participant.at.XTSATRecoveryManager;
import com.arjuna.wst.Durable2PCParticipant;
@@ -48,8 +49,6 @@
*/
public class InboundBridgeRecoveryManager implements XTSATRecoveryModule, RecoveryModule, XAResourceOrphanFilter
{
- private static final Logger log = Logger.getLogger(InboundBridgeRecoveryManager.class);
-
private final XTSATRecoveryManager xtsATRecoveryManager = XTSATRecoveryManager.getRecoveryManager();
private final RecoveryManager acRecoveryManager = RecoveryManager.manager();
private final XATerminator xaTerminator = SubordinationManager.getXATerminator();
@@ -63,7 +62,7 @@
*/
public void start()
{
- log.info("InboundBridgeRecoveryManager starting");
+ txbridgeLogger.i18NLogger.info_ibrm_start();
xtsATRecoveryManager.registerRecoveryModule(this);
acRecoveryManager.addModule(this);
@@ -77,7 +76,7 @@
*/
public void stop()
{
- log.info("InboundBridgeRecoveryManager stopping");
+ txbridgeLogger.i18NLogger.info_ibrm_stop();
xtsATRecoveryManager.unregisterRecoveryModule(this);
acRecoveryManager.removeModule(this, false);
@@ -125,7 +124,7 @@
@Override
public Durable2PCParticipant deserialize(String id, ObjectInputStream objectInputStream) throws Exception
{
- log.trace("deserialize(id="+id+")");
+ txbridgeLogger.logger.trace("InboundBridgeRecoveryManager.deserialize(id="+id+")");
// Inbound bridge transactions don't have an independent log - their state is inlined into the
// XTS Participant log and this callback is used to recover that state.
@@ -161,7 +160,7 @@
@Override
public void periodicWorkFirstPass()
{
- log.trace("periodicWorkFirstPass()");
+ txbridgeLogger.logger.trace("InboundBridgeRecoveryManager.periodicWorkFirstPass()");
}
/**
@@ -171,7 +170,7 @@
@Override
public void periodicWorkSecondPass()
{
- log.trace("periodicWorkSecondPass()");
+ txbridgeLogger.logger.trace("InboundBridgeRecoveryManager.periodicWorkSecondPass()");
cleanupRecoveredParticipants();
@@ -185,11 +184,11 @@
List<Xid> indoubtSubordinates = getIndoubtSubordinates();
for(Xid xid : indoubtSubordinates) {
if(checkXid(xid) == XAResourceOrphanFilter.Vote.ROLLBACK) {
- log.trace("rolling back orphaned subordinate tx "+xid);
+ txbridgeLogger.logger.trace("rolling back orphaned subordinate tx "+xid);
try {
xaTerminator.rollback(xid);
} catch(XAException e) {
- log.error("problem rolling back orphaned subordinate tx "+xid, e);
+ txbridgeLogger.i18NLogger.error_ibrm_rollbackerr(XAHelper.xidToString(xid), e);
}
}
}
@@ -204,13 +203,13 @@
*/
private List<Xid> getIndoubtSubordinates()
{
- log.trace("getIndoubtSubordinates()");
+ txbridgeLogger.logger.trace("InboundBridgeRecoveryManager.getIndoubtSubordinates()");
Xid[] allSubordinateXids = null;
try {
allSubordinateXids = xaTerminator.recover(XAResource.TMSTARTRSCAN);
} catch(XAException e) {
- log.error("Problem whilst scanning for in-doubt subordinate transactions", e);
+ txbridgeLogger.i18NLogger.error_ibrm_scanerr(e);
} finally {
try {
xaTerminator.recover(XAResource.TMENDRSCAN);
@@ -226,7 +225,7 @@
for(Xid xid : allSubordinateXids) {
if(xid.getFormatId() == BridgeDurableParticipant.XARESOURCE_FORMAT_ID) {
mySubordinateXids.add(xid);
- log.trace("in-doubt subordinate, xid: "+xid);
+ txbridgeLogger.logger.trace("in-doubt subordinate, xid: "+xid);
}
}
@@ -239,7 +238,7 @@
*/
private void cleanupRecoveredParticipants()
{
- log.trace("cleanupRecoveredParticipants()");
+ txbridgeLogger.logger.trace("InboundBridgeRecoveryManager.cleanupRecoveredParticipants()");
synchronized(participantsAwaitingRecovery) {
Iterator<org.jboss.jbossts.txbridge.inbound.BridgeDurableParticipant> iter = participantsAwaitingRecovery.iterator();
@@ -263,7 +262,7 @@
@Override
public Vote checkXid(Xid xid)
{
- log.trace("checkXid("+xid+")");
+ txbridgeLogger.logger.trace("InboundBridgeRecoveryManager.checkXid("+xid+")");
if(xid.getFormatId() != BridgeDurableParticipant.XARESOURCE_FORMAT_ID) {
return Vote.ABSTAIN; // it's not one of ours, ignore it.
Modified: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/JaxWSTxInboundBridgeHandler.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/JaxWSTxInboundBridgeHandler.java 2010-07-26 10:25:57 UTC (rev 34169)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/JaxWSTxInboundBridgeHandler.java 2010-07-26 10:40:07 UTC (rev 34170)
@@ -26,7 +26,7 @@
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.MessageContext;
-import org.apache.log4j.Logger;
+import org.jboss.jbossts.txbridge.utils.txbridgeLogger;
/**
* A handler that sits in the server side JAX-WS processing pipeline between the XTS header
@@ -42,8 +42,6 @@
*/
public class JaxWSTxInboundBridgeHandler implements Handler
{
- private static final Logger log = Logger.getLogger(JaxWSTxInboundBridgeHandler.class);
-
/**
* Process a message. Determines if it is inbound or outbound and dispatches accordingly.
*
@@ -52,7 +50,7 @@
*/
public boolean handleMessage(MessageContext msgContext)
{
- log.trace("handleMessage()");
+ txbridgeLogger.logger.trace("JaxWSTxInboundBridgeHandler.handleMessage()");
Boolean outbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
if (outbound == null)
@@ -69,14 +67,14 @@
*/
public boolean handleFault(MessageContext messageContext)
{
- log.trace("handleFault()");
+ txbridgeLogger.logger.trace("JaxWSTxInboundBridgeHandler.handleFault()");
return suspendTransaction();
}
public void close(MessageContext messageContext)
{
- log.trace("close()");
+ txbridgeLogger.logger.trace("JaxWSTxInboundBridgeHandler.close()");
}
/**
@@ -88,7 +86,7 @@
*/
protected boolean handleInbound(MessageContext msgContext)
{
- log.trace("handleInbound()");
+ txbridgeLogger.logger.trace("JaxWSTxInboundBridgeHandler.handleInbound()");
try
{
@@ -97,7 +95,7 @@
}
catch (Exception e)
{
- log.error(e);
+ txbridgeLogger.logger.error(e);
return false;
}
@@ -112,7 +110,7 @@
*/
protected boolean handleOutbound(MessageContext msgContext)
{
- log.trace("handleOutbound()");
+ txbridgeLogger.logger.trace("JaxWSTxInboundBridgeHandler.handleOutbound()");
return suspendTransaction();
}
@@ -124,7 +122,7 @@
*/
private boolean suspendTransaction()
{
- log.trace("suspendTransaction()");
+ txbridgeLogger.logger.trace("JaxWSTxInboundBridgeHandler.suspendTransaction()");
try
{
@@ -133,7 +131,7 @@
}
catch (Exception e)
{
- log.error(e);
+ txbridgeLogger.logger.error(e);
return false;
}
Modified: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/BridgeSynchronization.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/BridgeSynchronization.java 2010-07-26 10:25:57 UTC (rev 34169)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/BridgeSynchronization.java 2010-07-26 10:40:07 UTC (rev 34170)
@@ -23,7 +23,7 @@
*/
package org.jboss.jbossts.txbridge.outbound;
-import org.apache.log4j.Logger;
+import org.jboss.jbossts.txbridge.utils.txbridgeLogger;
import org.jboss.jbossts.xts.bridge.at.BridgeWrapper;
import javax.transaction.Synchronization;
@@ -38,13 +38,11 @@
*/
public class BridgeSynchronization implements Synchronization
{
- private static final Logger log = Logger.getLogger(BridgeSynchronization.class);
-
private final BridgeWrapper bridgeWrapper;
public BridgeSynchronization(BridgeWrapper bridgeWrapper)
{
- log.trace("BridgeSynchronization(BridgeWrapper="+bridgeWrapper+")");
+ txbridgeLogger.logger.trace("BridgeSynchronization.<ctor>(BridgeWrapper="+bridgeWrapper+")");
this.bridgeWrapper = bridgeWrapper;
}
@@ -54,7 +52,7 @@
*/
public void beforeCompletion()
{
- log.trace("beforeCompletion()");
+ txbridgeLogger.logger.trace("BridgeSynchronization.beforeCompletion()");
if(!bridgeWrapper.prepareVolatile())
{
@@ -72,7 +70,7 @@
*/
public void afterCompletion(int status)
{
- log.trace("afterCompletion(status="+status+"/"+ JTAHelper.stringForm(status)+")");
+ txbridgeLogger.logger.trace("BridgeSynchronization.afterCompletion(status="+status+"/"+ JTAHelper.stringForm(status)+")");
switch(status)
{
@@ -83,7 +81,7 @@
bridgeWrapper.rollbackVolatile();
break;
default:
- log.warn("unexpected Status "+status+", treating as ROLLEDBACK");
+ txbridgeLogger.i18NLogger.warn_obs_unexpectedstatus(Integer.toString(status));
bridgeWrapper.rollbackVolatile();
}
}
Modified: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/BridgeXAResource.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/BridgeXAResource.java 2010-07-26 10:25:57 UTC (rev 34169)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/BridgeXAResource.java 2010-07-26 10:40:07 UTC (rev 34170)
@@ -24,7 +24,7 @@
package org.jboss.jbossts.txbridge.outbound;
import com.arjuna.wst.UnknownTransactionException;
-import org.apache.log4j.Logger;
+import org.jboss.jbossts.txbridge.utils.txbridgeLogger;
import org.jboss.jbossts.xts.bridge.at.BridgeWrapper;
import javax.transaction.xa.XAResource;
@@ -53,8 +53,6 @@
// Design note: Given the way JBossTS is designed, we could subclass AbstractRecord rather than
// implementing XAResource, but this design is more standards friendly and thus portable.
- private static final Logger log = Logger.getLogger(BridgeXAResource.class);
-
private static final List<BridgeXAResource> xaResourcesAwaitingRecovery =
Collections.synchronizedList(new LinkedList<BridgeXAResource>());
@@ -74,7 +72,7 @@
*/
public BridgeXAResource(Uid externalTxId, BridgeWrapper bridgeWrapper)
{
- log.trace("BridgeXARresource(TxId="+externalTxId+", BridgeWrapper="+bridgeWrapper+")");
+ txbridgeLogger.logger.trace("BridgeXARresource.<ctor>(TxId="+externalTxId+", BridgeWrapper="+bridgeWrapper+")");
this.externalTxId = externalTxId;
this.bridgeWrapper = bridgeWrapper;
@@ -89,7 +87,7 @@
*/
private void writeObject(ObjectOutputStream out) throws IOException
{
- log.trace("writeObject() for tx id="+externalTxId);
+ txbridgeLogger.logger.trace("BridgeXAResource.writeObject() for tx id="+externalTxId);
//out.defaultWriteObject();
out.writeObject(externalTxId);
@@ -106,7 +104,7 @@
*/
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
{
- log.trace("readObject()");
+ txbridgeLogger.logger.trace("BridgeXAResource.readObject()");
//in.defaultReadObject();
externalTxId = (Uid)in.readObject();
@@ -125,10 +123,8 @@
}
catch(UnknownTransactionException unknownTransactionException)
{
- log.error("Unable to recover subordinate transaction id="+bridgeWrapperId, unknownTransactionException);
- IOException ioException = new IOException("unable to deserialize");
- ioException.initCause(unknownTransactionException);
- throw ioException;
+ txbridgeLogger.i18NLogger.error_obxar_unabletorecover(bridgeWrapperId, unknownTransactionException);
+ throw new IOException(unknownTransactionException);
}
}
@@ -153,7 +149,7 @@
}
catch(UnknownTransactionException unknownTransactionException)
{
- log.error("Unable to recover subordinate transaction id="+bridgeWrapperId, unknownTransactionException);
+ txbridgeLogger.i18NLogger.error_obxar_unabletorecover(bridgeWrapperId, unknownTransactionException);
XAException xaException = new XAException(XAException.XAER_NOTA);
xaException.initCause(unknownTransactionException);
throw xaException;
@@ -171,25 +167,25 @@
*/
public int prepare(Xid xid) throws XAException
{
- log.trace("prepare(Xid="+xid+")");
+ txbridgeLogger.logger.trace("BridgeXAResource.prepare(Xid="+xid+")");
// TwoPhaseOutcome needs converting to XAResource rtn type.
int twoPhaseOutcome = bridgeWrapper.prepare();
- log.trace("prepare TwoPhaseOutcome is "+twoPhaseOutcome+"/"+TwoPhaseOutcome.stringForm(twoPhaseOutcome));
+ txbridgeLogger.logger.trace("prepare TwoPhaseOutcome is "+twoPhaseOutcome+"/"+TwoPhaseOutcome.stringForm(twoPhaseOutcome));
switch(twoPhaseOutcome)
{
case TwoPhaseOutcome.PREPARE_OK:
- log.trace("prepare returning XAResource.XA_OK");
+ txbridgeLogger.logger.trace("prepare returning XAResource.XA_OK");
return XAResource.XA_OK;
case TwoPhaseOutcome.PREPARE_READONLY:
cleanupRefs();
- log.trace("prepare returning XAResource.XA_RDONLY");
+ txbridgeLogger.logger.trace("prepare returning XAResource.XA_RDONLY");
return XAResource.XA_RDONLY;
default:
// TODO more find-grained error type handling
- log.trace("prepare TwoPhaseOutcome is "+twoPhaseOutcome+"/"+
+ txbridgeLogger.logger.trace("prepare TwoPhaseOutcome is "+twoPhaseOutcome+"/"+
TwoPhaseOutcome.stringForm(twoPhaseOutcome)+", throwing XAException...");
XAException xaException = new XAException("unexpected oucome: "+TwoPhaseOutcome.stringForm(twoPhaseOutcome));
xaException.errorCode = XAException.XA_RBROLLBACK;
@@ -203,7 +199,7 @@
*/
public static void cleanupRecoveredXAResources()
{
- log.trace("cleanupRecoveredXAResources()");
+ txbridgeLogger.logger.trace("BridgeXAResource.cleanupRecoveredXAResources()");
synchronized(xaResourcesAwaitingRecovery) {
Iterator<BridgeXAResource> iter = xaResourcesAwaitingRecovery.iterator();
@@ -244,7 +240,7 @@
*/
public void rollback(Xid xid) throws XAException
{
- log.trace("rollback(Xid="+xid+")");
+ txbridgeLogger.logger.trace("BridgeXAResource.rollback(Xid="+xid+")");
// if XTS has not finished recovery yet we can't throw XA_RETRY here.
// We'll settle for RMFAIL which has transient semantics.
@@ -269,7 +265,7 @@
*/
public void commit(Xid xid, boolean onePhase) throws XAException
{
- log.trace("commit(Xid="+xid+", onePhase="+onePhase+")");
+ txbridgeLogger.logger.trace("BridgeXAResource.commit(Xid="+xid+", onePhase="+onePhase+")");
// if XTS has not finished recovery yet we wont be able to complete until it does.
ensureRecoveryIsDoneIfNeeded(XAException.XA_RETRY);
@@ -302,7 +298,7 @@
*/
public void start(Xid xid, int flags) throws XAException
{
- log.trace("start(Xid="+xid+", flags="+flags+")");
+ txbridgeLogger.logger.trace("BridgeXAResource.start(Xid="+xid+", flags="+flags+")");
// do nothing
}
@@ -316,21 +312,21 @@
*/
public void end(Xid xid, int flags) throws XAException
{
- log.trace("end(Xid="+xid+", flags="+flags+")");
+ txbridgeLogger.logger.trace("BridgeXAResource.end(Xid="+xid+", flags="+flags+")");
// do nothing
}
public boolean isSameRM(XAResource xaResource) throws XAException
{
- log.trace("isSameRM(XAResource="+xaResource+")");
+ txbridgeLogger.logger.trace("BridgeXAResource.isSameRM(XAResource="+xaResource+")");
return false; // TODO
}
public void forget(Xid xid) throws XAException
{
- log.trace("forget(Xid="+xid+")");
+ txbridgeLogger.logger.trace("forget(Xid="+xid+")");
// TODO
}
@@ -344,7 +340,7 @@
*/
public Xid[] recover(int flag) throws XAException
{
- log.trace("recover(flag="+flag+")");
+ txbridgeLogger.logger.trace("BridgeXAResource.recover(flag="+flag+")");
return new Xid[0]; // TODO
}
@@ -358,7 +354,7 @@
*/
public boolean setTransactionTimeout(int seconds) throws XAException
{
- log.trace("setTransactionTimeout(seconds="+seconds+")");
+ txbridgeLogger.logger.trace("BridgeXAResource.setTransactionTimeout(seconds="+seconds+")");
return false; // TODO
}
@@ -371,7 +367,7 @@
*/
public int getTransactionTimeout() throws XAException
{
- log.trace("getTransactionTimeout()");
+ txbridgeLogger.logger.trace("BridgeXAResource.getTransactionTimeout()");
return 0; // TODO
}
@@ -382,7 +378,7 @@
private void cleanupRefs()
{
- log.trace("cleanupRefs()");
+ txbridgeLogger.logger.trace("BridgeXAResource.cleanupRefs()");
OutboundBridgeManager.removeMapping(externalTxId);
isAwaitingRecovery = false;
Modified: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/JaxWSTxOutboundBridgeHandler.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/JaxWSTxOutboundBridgeHandler.java 2010-07-26 10:25:57 UTC (rev 34169)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/JaxWSTxOutboundBridgeHandler.java 2010-07-26 10:40:07 UTC (rev 34170)
@@ -23,7 +23,7 @@
*/
package org.jboss.jbossts.txbridge.outbound;
-import org.apache.log4j.Logger;
+import org.jboss.jbossts.txbridge.utils.txbridgeLogger;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.MessageContext;
@@ -42,8 +42,6 @@
*/
public class JaxWSTxOutboundBridgeHandler implements Handler
{
- private static final Logger log = Logger.getLogger(JaxWSTxOutboundBridgeHandler.class);
-
/**
* Process a message. Determines if it is inbound or outbound and dispatches accordingly.
*
@@ -52,7 +50,7 @@
*/
public boolean handleMessage(MessageContext msgContext)
{
- log.trace("handleMessage()");
+ txbridgeLogger.logger.trace("JaxWSTxOutboundBridgeHandler.handleMessage()");
Boolean outbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
if (outbound == null)
@@ -69,14 +67,14 @@
*/
public boolean handleFault(MessageContext messageContext)
{
- log.trace("handleFault()");
+ txbridgeLogger.logger.trace("JaxWSTxOutboundBridgeHandler.handleFault()");
return suspendTransaction();
}
public void close(MessageContext messageContext)
{
- log.trace("close()");
+ txbridgeLogger.logger.trace("JaxWSTxOutboundBridgeHandler.close()");
}
/**
@@ -87,7 +85,7 @@
*/
protected boolean handleInbound(MessageContext msgContext)
{
- log.trace("handleInbound()");
+ txbridgeLogger.logger.trace("JaxWSTxOutboundBridgeHandler.handleInbound()");
return suspendTransaction();
}
@@ -101,7 +99,7 @@
*/
protected boolean handleOutbound(MessageContext msgContext)
{
- log.trace("handleOutbound()");
+ txbridgeLogger.logger.trace("JaxWSTxOutboundBridgeHandler.handleOutbound()");
try
{
@@ -110,7 +108,7 @@
}
catch (Exception e)
{
- log.error(e);
+ txbridgeLogger.logger.error(e);
return false;
}
@@ -124,7 +122,7 @@
*/
private boolean suspendTransaction()
{
- log.trace("suspendTransaction()");
+ txbridgeLogger.logger.trace("JaxWSTxOutboundBridgeHandler.suspendTransaction()");
try
{
@@ -133,7 +131,7 @@
}
catch (Exception e)
{
- log.error(e);
+ txbridgeLogger.logger.error(e);
return false;
}
Modified: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/OutboundBridge.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/OutboundBridge.java 2010-07-26 10:25:57 UTC (rev 34169)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/OutboundBridge.java 2010-07-26 10:40:07 UTC (rev 34170)
@@ -23,7 +23,7 @@
*/
package org.jboss.jbossts.txbridge.outbound;
-import org.apache.log4j.Logger;
+import org.jboss.jbossts.txbridge.utils.txbridgeLogger;
import org.jboss.jbossts.xts.bridge.at.BridgeWrapper;
import com.arjuna.mw.wst11.TransactionManagerFactory;
import com.arjuna.mw.wst.TxContext;
@@ -38,8 +38,6 @@
*/
public class OutboundBridge
{
- private static final Logger log = Logger.getLogger(OutboundBridge.class);
-
/**
* Management object for the subordinate transaction
*/
@@ -52,7 +50,7 @@
*/
public OutboundBridge(BridgeWrapper bridgeWrapper)
{
- log.trace("OutboundBridge(BridgeWrapper="+bridgeWrapper+")");
+ txbridgeLogger.logger.trace("OutboundBridge.<ctor>(BridgeWrapper="+bridgeWrapper+")");
this.bridgeWrapper = bridgeWrapper;
}
@@ -66,7 +64,7 @@
*/
public void start() throws UnknownTransactionException, SystemException
{
- log.trace("start(BridgeWrapper="+bridgeWrapper+")");
+ txbridgeLogger.logger.trace("OutboundBridge.start(BridgeWrapper="+bridgeWrapper+")");
TxContext txContext = bridgeWrapper.getContext();
@@ -81,7 +79,7 @@
*/
public void stop() throws SystemException
{
- log.trace("stop(BridgeWrapper="+bridgeWrapper+")");
+ txbridgeLogger.logger.trace("OutboundBridge.stop(BridgeWrapper="+bridgeWrapper+")");
TransactionManagerFactory.transactionManager().suspend();
}
Modified: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/OutboundBridgeManager.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/OutboundBridgeManager.java 2010-07-26 10:25:57 UTC (rev 34169)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/OutboundBridgeManager.java 2010-07-26 10:40:07 UTC (rev 34170)
@@ -32,7 +32,7 @@
import javax.transaction.Synchronization;
import javax.transaction.xa.XAResource;
-import org.apache.log4j.Logger;
+import org.jboss.jbossts.txbridge.utils.txbridgeLogger;
import org.jboss.jbossts.xts.bridge.at.BridgeWrapper;
import java.util.concurrent.ConcurrentMap;
@@ -49,8 +49,6 @@
*/
public class OutboundBridgeManager
{
- private static final Logger log = Logger.getLogger(OutboundBridgeManager.class);
-
public static String BRIDGEWRAPPER_PREFIX = "txbridge_";
// maps JTA Tx Id to OutboundBridge instance.
@@ -64,7 +62,7 @@
*/
public static org.jboss.jbossts.txbridge.outbound.OutboundBridge getOutboundBridge()
{
- log.trace("getOutboundBridge()");
+ txbridgeLogger.logger.trace("OutboundBridgeManager.getOutboundBridge()");
try
{
@@ -81,7 +79,7 @@
}
catch(SystemException e)
{
- log.error("problem", e);
+ txbridgeLogger.logger.error(e);
}
return null;
@@ -94,7 +92,7 @@
*/
public static synchronized void removeMapping(Uid externalTxId)
{
- log.trace("removeMapping(externalTxId="+externalTxId+")");
+ txbridgeLogger.logger.trace("OutboundBridgeManager.removeMapping(externalTxId="+externalTxId+")");
if(externalTxId != null) {
outboundBridgeMappings.remove(externalTxId);
@@ -109,7 +107,7 @@
*/
private static synchronized void createMapping(Transaction transaction, Uid externalTxId) throws SystemException
{
- log.trace("createmapping(externalTxId="+externalTxId+")");
+ txbridgeLogger.logger.trace("OutboundBridgeManager.createmapping(externalTxId="+externalTxId+")");
if(outboundBridgeMappings.containsKey(externalTxId)) {
return;
@@ -129,7 +127,7 @@
}
catch(RollbackException e)
{
- log.error("Unable to enlist BridgeXAResource or register BridgeSynchronization: ", e);
+ txbridgeLogger.i18NLogger.error_obm_unabletoenlist(e);
throw new SystemException(e.toString());
}
Modified: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/OutboundBridgeRecoveryManager.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/OutboundBridgeRecoveryManager.java 2010-07-26 10:25:57 UTC (rev 34169)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/outbound/OutboundBridgeRecoveryManager.java 2010-07-26 10:40:07 UTC (rev 34170)
@@ -22,14 +22,9 @@
import com.arjuna.ats.arjuna.recovery.RecoveryManager;
import com.arjuna.ats.arjuna.recovery.RecoveryModule;
-import org.apache.log4j.Logger;
+import org.jboss.jbossts.txbridge.utils.txbridgeLogger;
import org.jboss.jbossts.xts.bridge.at.BridgeWrapper;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
/**
* Integrates with JBossAS MC lifecycle and JBossTS recovery manager to provide
* recovery services for outbound bridged transactions.
@@ -38,8 +33,6 @@
*/
public class OutboundBridgeRecoveryManager implements RecoveryModule
{
- private static final Logger log = Logger.getLogger(OutboundBridgeRecoveryManager.class);
-
private final RecoveryManager acRecoveryManager = RecoveryManager.manager();
private volatile boolean orphanedBridgeWrappersAreIdentifiable = false;
@@ -49,7 +42,7 @@
*/
public void start()
{
- log.info("OutboundBridgeRecoveryManager starting");
+ txbridgeLogger.i18NLogger.info_obrm_start();
acRecoveryManager.addModule(this);
}
@@ -59,7 +52,7 @@
*/
public void stop()
{
- log.info("OutboundBridgeRecoveryManager stopping");
+ txbridgeLogger.i18NLogger.info_obrm_stop();
acRecoveryManager.removeModule(this, false);
}
@@ -72,7 +65,7 @@
@Override
public void periodicWorkFirstPass()
{
- log.trace("periodicWorkFirstPass()");
+ txbridgeLogger.logger.trace("OutboundBridgeRecoveryManager.periodicWorkFirstPass()");
}
/**
@@ -82,7 +75,7 @@
@Override
public void periodicWorkSecondPass()
{
- log.trace("periodicWorkSecondPass()");
+ txbridgeLogger.logger.trace("OutboundBridgeRecoveryManager.periodicWorkSecondPass()");
BridgeXAResource.cleanupRecoveredXAResources();
@@ -95,7 +88,7 @@
for(BridgeWrapper bridgeWrapper : bridgeWrappers) {
if( !BridgeXAResource.isAwaitingRecovery(bridgeWrapper.getIdentifier()) ) {
- log.info("rolling back orphaned subordinate BridgeWrapper "+bridgeWrapper.getIdentifier());
+ txbridgeLogger.logger.trace("rolling back orphaned subordinate BridgeWrapper "+bridgeWrapper.getIdentifier());
bridgeWrapper.rollback();
}
}
Added: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeI18NLogger.java (rev 0)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeI18NLogger.java 2010-07-26 10:40:07 UTC (rev 34170)
@@ -0,0 +1,131 @@
+/*
+ * 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 org.jboss.jbossts.txbridge.utils;
+
+import com.arjuna.ats.arjuna.common.Uid;
+import org.jboss.logging.LogMessage;
+import org.jboss.logging.Message;
+import org.jboss.logging.MessageLogger;
+
+import static org.jboss.logging.Logger.Level.*;
+import static org.jboss.logging.Message.Format.*;
+
+/**
+ * i18n log messages for the txbridge module.
+ *
+ * @author Jonathan Halliday (jonathan.halliday at redhat.com) 2010-07
+ */
+ at MessageLogger(projectCode = "ARJUNA")
+public interface txbridgeI18NLogger
+{
+ /*
+ 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 = 33001, value = "Unable to get subordinate transaction id", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_ibdp_nosub(Throwable arg0);
+
+ @Message(id = 33002, value = "Unable to recover subordinate transaction id {0}", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_ibdp_norecovery(Uid arg0, Throwable arg1);
+
+ @Message(id = 33003, value = "prepare on Xid={0} returning Aborted", format = MESSAGE_FORMAT)
+ @LogMessage(level = WARN)
+ public void warn_ibdp_aborted(String arg0, Throwable arg1);
+
+ @Message(id = 33004, value = "commit on Xid={0} failed", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_ibdp_commitfailed(String arg0, Throwable arg1);
+
+ @Message(id = 33005, value = "rollback on Xid={0} failed", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_ibdp_rollbackfailed(String arg0, Throwable arg1);
+
+
+ @Message(id = 33006, value = "InboundBridgeRecoveryManager starting", format = MESSAGE_FORMAT)
+ @LogMessage(level = INFO)
+ public void info_ibrm_start();
+
+ @Message(id = 33007, value = "InboundBridgeRecoveryManager stopping", format = MESSAGE_FORMAT)
+ @LogMessage(level = INFO)
+ public void info_ibrm_stop();
+
+ @Message(id = 33008, value = "problem rolling back orphaned subordinate tx {0}", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_ibrm_rollbackerr(String arg0, Throwable arg1);
+
+ @Message(id = 33009, value = "Problem whilst scanning for in-doubt subordinate transactions", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_ibrm_scanerr(Throwable arg0);
+
+
+ @Message(id = 33010, value = "prepare on Xid={0} failed, setting RollbackOnly", format = MESSAGE_FORMAT)
+ @LogMessage(level = WARN)
+ public void warn_ibvp_preparefailed(String arg0, Throwable arg1);
+
+ @Message(id = 33011, value = "setRollbackOnly failed", format = MESSAGE_FORMAT)
+ @LogMessage(level = WARN)
+ public void warn_ibvp_setrollbackfailed(Throwable arg0);
+
+ @Message(id = 33012, value = "stop failed for Xid {0}", format = MESSAGE_FORMAT)
+ @LogMessage(level = WARN)
+ public void warn_ibvp_stopfailed(String arg0, Throwable arg1);
+
+
+
+ @Message(id = 33013, value = "OutboundBridgeRecoveryManager starting", format = MESSAGE_FORMAT)
+ @LogMessage(level = INFO)
+ public void info_obrm_start();
+
+ @Message(id = 33014, value = "OutboundBridgeRecoveryManager stopping", format = MESSAGE_FORMAT)
+ @LogMessage(level = INFO)
+ public void info_obrm_stop();
+
+
+ @Message(id = 33015, value = "unexpected Status {0}, treating as ROLLEDBACK", format = MESSAGE_FORMAT)
+ @LogMessage(level = WARN)
+ public void warn_obs_unexpectedstatus(String arg0);
+
+
+ @Message(id = 33016, value = "Unable to recover subordinate transaction id={0},", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_obxar_unabletorecover(String arg0, Throwable arg1);
+
+ @Message(id = 33017, value = "Unable to enlist BridgeXAResource or register BridgeSynchronization", format = MESSAGE_FORMAT)
+ @LogMessage(level = ERROR)
+ public void error_obm_unabletoenlist(Throwable arg0);
+
+ /*
+ Allocate new messages directly above this notice.
+ - id: use the next id number in 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/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeI18NLoggerImpl.java (rev 0)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeI18NLoggerImpl.java 2010-07-26 10:40:07 UTC (rev 34170)
@@ -0,0 +1,111 @@
+/*
+ * 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 org.jboss.jbossts.txbridge.utils;
+
+import com.arjuna.ats.arjuna.common.Uid;
+import org.jboss.logging.Logger;
+
+import static org.jboss.logging.Logger.Level.ERROR;
+import static org.jboss.logging.Logger.Level.INFO;
+import static org.jboss.logging.Logger.Level.WARN;
+
+/**
+ * i18n log messages for the txbridge module.
+ * This class is autogenerated. Don't mess with it.
+ *
+ * @author Jonathan Halliday (jonathan.halliday at redhat.com) 2010-07
+ */
+public class txbridgeI18NLoggerImpl implements txbridgeI18NLogger
+{
+ private final Logger logger;
+
+ txbridgeI18NLoggerImpl(Logger logger) {
+ this.logger = logger;
+ }
+
+ public void error_ibdp_nosub(Throwable arg0) {
+ logger.logv(ERROR, arg0, "ARJUNA-33001 Unable to get subordinate transaction id", (Object)null);
+ }
+
+ public void error_ibdp_norecovery(Uid arg0, Throwable arg1) {
+ logger.logv(ERROR, arg1, "ARJUNA-33002 Unable to recover subordinate transaction id {0}", arg0);
+ }
+
+ public void warn_ibdp_aborted(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-33003 prepare on Xid={0} returning Aborted", arg0);
+ }
+
+ public void error_ibdp_commitfailed(String arg0, Throwable arg1) {
+ logger.logv(ERROR, arg1, "ARJUNA-33004 commit on Xid={0} failed", arg0);
+ }
+
+ public void error_ibdp_rollbackfailed(String arg0, Throwable arg1) {
+ logger.logv(ERROR, arg1, "ARJUNA-33005 rollback on Xid={0} failed", arg0);
+ }
+
+ public void info_ibrm_start() {
+ logger.logv(INFO, "ARJUNA-33006 InboundBridgeRecoveryManager starting", (Object)null);
+ }
+
+ public void info_ibrm_stop() {
+ logger.logv(INFO, "ARJUNA-33007 InboundBridgeRecoveryManager stopping", (Object)null);
+ }
+
+ public void error_ibrm_rollbackerr(String arg0, Throwable arg1) {
+ logger.logv(ERROR, arg1, "ARJUNA-33008 problem rolling back orphaned subordinate tx {0}", arg0);
+ }
+
+ public void error_ibrm_scanerr(Throwable arg0) {
+ logger.logv(ERROR, arg0, "ARJUNA-33009 Problem whilst scanning for in-doubt subordinate transactions", (Object)null);
+ }
+
+ public void warn_ibvp_preparefailed(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-33010 prepare on Xid={0} failed, setting RollbackOnly", arg0);
+ }
+
+ public void warn_ibvp_setrollbackfailed(Throwable arg0) {
+ logger.logv(WARN, arg0, "ARJUNA-33011 setRollbackOnly failed", (Object)null);
+ }
+
+ public void warn_ibvp_stopfailed(String arg0, Throwable arg1) {
+ logger.logv(WARN, arg1, "ARJUNA-33012 stop failed for Xid {0}", arg0);
+ }
+
+ public void info_obrm_start() {
+ logger.logv(INFO, "ARJUNA-33013 OutboundBridgeRecoveryManager starting", (Object)null);
+ }
+
+ public void info_obrm_stop() {
+ logger.logv(INFO, "ARJUNA-33014 OutboundBridgeRecoveryManager stopping", (Object)null);
+ }
+
+ public void warn_obs_unexpectedstatus(String arg0) {
+ logger.logv(WARN, "ARJUNA-33015 unexpected Status {0}, treating as ROLLEDBACK", arg0);
+ }
+
+ public void error_obxar_unabletorecover(String arg0, Throwable arg1) {
+ logger.logv(ERROR, arg1, "ARJUNA-33016 Unable to recover subordinate transaction id={0},", arg0);
+ }
+
+ public void error_obm_unabletoenlist(Throwable arg0) {
+ logger.logv(ERROR, arg0, "ARJUNA-33017 Unable to enlist BridgeXAResource or register BridgeSynchronization", (Object)null);
+ }
+}
Added: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeLogger.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeLogger.java (rev 0)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/utils/txbridgeLogger.java 2010-07-26 10:40:07 UTC (rev 34170)
@@ -0,0 +1,34 @@
+/*
+ * 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 org.jboss.jbossts.txbridge.utils;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Module logger for the txbridge.
+ *
+ * @author Jonathan Halliday (jonathan.halliday at redhat.com), 2010-07
+ */
+public class txbridgeLogger
+{
+ public static final Logger logger = Logger.getLogger("org.jboss.jbossts.txbridge");
+ public static final txbridgeI18NLogger i18NLogger = new txbridgeI18NLoggerImpl(logger);
+}
More information about the jboss-svn-commits
mailing list