[jboss-svn-commits] JBL Code SVN: r30105 - in labs/jbosstm/trunk/atsintegration: classes/com/arjuna/ats/internal/jbossatx and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 11 10:13:38 EST 2009
Author: jhalliday
Date: 2009-11-11 10:13:38 -0500 (Wed, 11 Nov 2009)
New Revision: 30105
Removed:
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/agent/
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/TransactionManagerDelegate.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/InboundTransactionCurrentInitializer.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerDelegate.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxLogger.java
labs/jbosstm/trunk/atsintegration/scripts/run-tools.bat
labs/jbosstm/trunk/atsintegration/scripts/run-tools.sh
Log:
Cleanup of atsintegration. JBTM-655
Modified: labs/jbosstm/trunk/atsintegration/build.xml
===================================================================
--- labs/jbosstm/trunk/atsintegration/build.xml 2009-11-11 13:55:12 UTC (rev 30104)
+++ labs/jbosstm/trunk/atsintegration/build.xml 2009-11-11 15:13:38 UTC (rev 30105)
@@ -63,10 +63,10 @@
<compile.macro excluded.classes="${exclude-these-classes}">
<additional.classpath>
- <!-- jboss-common-core.jar has UnexpectedThrowable, jboss-logging-spi.jar has Logger -->
- <fileset dir="${env.JBOSS_HOME}/lib" includes="jboss-common-core.jar jboss-logging-spi.jar"/>
- <!-- jboss-integration.jar has the transactions SPI, jmx-adaptor-plugin.jar has RMIAdaptor, jbosssx has security -->
- <fileset dir="${env.JBOSS_HOME}/common/lib" includes="jboss-integration.jar jmx-adaptor-plugin.jar jbosssx.jar"/>
+ <!-- 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>
</compile.macro>
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 13:55:12 UTC (rev 30104)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/AppServerJDBCXARecovery.java 2009-11-11 15:13:38 UTC (rev 30105)
@@ -21,6 +21,10 @@
package com.arjuna.ats.internal.jbossatx.jta;
import com.arjuna.ats.jta.recovery.XAResourceRecovery;
+import com.arjuna.ats.jbossatx.logging.jbossatxLogger;
+import com.arjuna.common.util.logging.DebugLevel;
+import com.arjuna.common.util.logging.VisibilityLevel;
+import com.arjuna.common.util.logging.FacilityCode;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.BadPaddingException;
@@ -67,7 +71,7 @@
* datasource configuration information from the app server's JMX and instantiate an XADataSource from
* which it can then create an XAConnection.
*
- * To use this class, add an XAResourceRecovery entry in the jta section of jbossjta-properties.xml
+ * To use this class, add an entry in the JTAEnvironmentBean's xaResourceRecoveryInstances list
* for each database for which you need recovery, ensuring the value ends with ;jndiname=<datasource-name>
* i.e. the same value as is in the -ds.xml jndi-name element.
*
@@ -88,14 +92,14 @@
* if you configure the recovery manager to run as a separate process. (JMX can be accessed remotely,
* but it would need code changes to the lookup function and some classpath additions).
*
+ * <bean name="JTAEnvironmentBean" class="com.arjuna.ats.jta.common.JTAEnvironmentBean">
+ * ...
+ * <property name="xaResourceRecoveryInstances">
+ * <list elementClass="java.lang.String">
+ * <value>com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery;jndiname=MyExampleDbName[,username=foo,password=bar]</value>
+ * </list>
+ * </property>
*
- * <properties depends="arjuna" name="jta">
- * ...
- * <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery1"
- * value= "com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery;jndiname=MyExampleDbName[,username=foo,password=bar]"/>
- * <!-- xaRecoveryNode should match value in nodeIdentifier or be * -->
- * <property name="com.arjuna.ats.jta.xaRecoveryNode" value="1"/>
- *
*/
public class AppServerJDBCXARecovery implements XAResourceRecovery {
@@ -104,9 +108,9 @@
public AppServerJDBCXARecovery()
throws SQLException
{
- if (log.isDebugEnabled())
+ if(jbossatxLogger.logger.isDebugEnabled())
{
- log.debug("AppServerJDBCXARecovery<init>");
+ jbossatxLogger.logger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL, "AppServerJDBCXARecovery<init>");
}
_hasMoreResources = false;
@@ -121,9 +125,9 @@
public boolean initialise(String parameter)
throws SQLException
{
- if (log.isDebugEnabled())
+ if(jbossatxLogger.logger.isDebugEnabled())
{
- log.debug("AppServerJDBCXARecovery.initialise(" + parameter + ")");
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL, "AppServerJDBCXARecovery.initialise(" + parameter + ")");
}
if (parameter == null)
@@ -197,8 +201,13 @@
}
String className = (String)server.invoke(objectName, "getManagedConnectionFactoryAttribute", new Object[] {"XADataSourceClass"}, new String[] {"java.lang.String"});
- log.debug("AppServerJDBCXARecovery datasource classname = "+className);
+ if(jbossatxLogger.logger.isDebugEnabled())
+ {
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE, FacilityCode.FAC_ALL,
+ "AppServerJDBCXARecovery datasource classname = "+className);
+ }
+
if(_username !=null && _password !=null)
{
SecurityAssociation.setPrincipal(new SimplePrincipal(_username));
@@ -218,8 +227,13 @@
}
String securityDomainName = (String) server.getAttribute(txCmObjectName, "SecurityDomainJndiName");
- log.debug("Security domain name associated with JCA ConnectionManager jboss.jca:name=" +_dataSourceId + ",service=XATxCM"+" is:"+securityDomainName);
+ if(jbossatxLogger.logger.isDebugEnabled())
+ {
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE, FacilityCode.FAC_ALL,
+ "Security domain name associated with JCA ConnectionManager jboss.jca:name=" +_dataSourceId + ",service=XATxCM"+" is:"+securityDomainName);
+ }
+
if(securityDomainName != null && !securityDomainName.equals(""))
{
ObjectName _objectName = new ObjectName("jboss.security:service=XMLLoginConfig");
@@ -312,10 +326,18 @@
} catch (NoSuchMethodException nsme) {
isConnectionValid = Boolean.FALSE;
_supportsIsValidMethod = false;
- log.debug("XA datasource does not support isValid method - connection will always be recreated");
+ if(jbossatxLogger.logger.isDebugEnabled())
+ {
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE, FacilityCode.FAC_ALL,
+ "XA datasource does not support isValid method - connection will always be recreated");
+ }
} catch (Throwable t) {
isConnectionValid = Boolean.FALSE;
- log.debug("XA connection is invalid - will recreate a new one. Cause: " + t);
+ if(jbossatxLogger.logger.isDebugEnabled())
+ {
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE, FacilityCode.FAC_ALL,
+ "XA connection is invalid - will recreate a new one. Cause: " + t);
+ }
}
if (!isConnectionValid.booleanValue()) {
@@ -338,7 +360,11 @@
_connection = _dataSource.getXAConnection(_dbUsername, _dbPassword);
}
_connection.addConnectionEventListener(_connectionEventListener);
- log.debug("Created new XAConnection");
+ if(jbossatxLogger.logger.isDebugEnabled())
+ {
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE, FacilityCode.FAC_ALL,
+ "Created new XAConnection");
+ }
}
}
catch (SQLException ex)
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 13:55:12 UTC (rev 30104)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/PropagationContextManager.java 2009-11-11 15:13:38 UTC (rev 30105)
@@ -47,6 +47,10 @@
import java.io.Serializable;
import com.arjuna.ats.jta.TransactionManager;
+import com.arjuna.ats.jbossatx.logging.jbossatxLogger;
+import com.arjuna.common.util.logging.DebugLevel;
+import com.arjuna.common.util.logging.VisibilityLevel;
+import com.arjuna.common.util.logging.FacilityCode;
public class PropagationContextManager
implements TransactionPropagationContextFactory, TransactionPropagationContextImporter, ObjectFactory, Serializable
@@ -61,17 +65,19 @@
public Object getTransactionPropagationContext()
{
- if (log.isDebugEnabled())
+ if (jbossatxLogger.logger.isDebugEnabled())
{
- log.debug("PropagationContextManager.getTransactionPropagationContext - called");
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL,
+ "PropagationContextManager.getTransactionPropagationContext - called");
}
String txid = ((BasicAction.Current() == null) ? null : BasicAction.Current().get_uid().stringForm());
- if (log.isDebugEnabled())
- {
- log.debug("PropagationContextManager.getTransactionPropagationContext() - returned tpc = " + txid);
- }
+ if (jbossatxLogger.logger.isDebugEnabled())
+ {
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL,
+ "PropagationContextManager.getTransactionPropagationContext() - returned tpc = " + txid);
+ }
return txid;
}
@@ -85,20 +91,22 @@
public Object getTransactionPropagationContext(Transaction tx)
{
- if (log.isDebugEnabled())
+ if (jbossatxLogger.logger.isDebugEnabled())
{
- log.debug("PropagationContextManager.getTransactionPropagationContext(Transaction) - called tx = " + tx);
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL,
+ "PropagationContextManager.getTransactionPropagationContext(Transaction) - called tx = " + tx);
}
if (tx instanceof com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple)
{
String tpc = ((com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple) tx).get_uid().stringForm();
+
+ if (jbossatxLogger.logger.isDebugEnabled())
+ {
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL,
+ "PropagationContextManager.getTransactionPropagationContext(Transaction) - returned tpc = " + tpc);
+ }
- if (log.isDebugEnabled())
- {
- log.debug("PropagationContextManager.getTransactionPropagationContext(Transaction) - returned tpc = " + tpc);
- }
-
return tpc;
}
else
@@ -118,39 +126,41 @@
public Transaction importTransactionPropagationContext(Object tpc)
{
- if (log.isDebugEnabled())
- {
- log.debug("PropagationContextManager.importTransactionPropagationContext(Object) - called tpc = " + tpc);
- }
+ if (jbossatxLogger.logger.isDebugEnabled())
+ {
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL,
+ "PropagationContextManager.importTransactionPropagationContext(Object) - called tpc = " + tpc);
+ }
- javax.transaction.TransactionManager tm = TransactionManager.transactionManager();
+ javax.transaction.TransactionManager tm = TransactionManager.transactionManager();
- if (tpc instanceof String)
- {
- try
- {
- Uid importedTx = new Uid((String)tpc);
+ if (tpc instanceof String)
+ {
+ try
+ {
+ Uid importedTx = new Uid((String)tpc);
- Transaction newTx = com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple.getTransaction(importedTx);
+ Transaction newTx = com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple.getTransaction(importedTx);
- if (log.isDebugEnabled())
- {
- log.debug("PropagationContextManager.importTransactionPropagationContext(Object) - transaction = " + newTx);
- }
+ if (jbossatxLogger.logger.isDebugEnabled())
+ {
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL,
+ "PropagationContextManager.importTransactionPropagationContext(Object) - transaction = " + newTx);
+ }
- return newTx;
- }
- catch (Exception e)
- {
- log.error("Unexpected exception occurred", e);
- return null;
- }
- }
- else
- {
- log.error("jboss-atx: unknown Tx PropagationContext");
- return null;
- }
+ return newTx;
+ }
+ catch (Exception e)
+ {
+ log.error("Unexpected exception occurred", e);
+ return null;
+ }
+ }
+ else
+ {
+ log.error("jboss-atx: unknown Tx PropagationContext");
+ return null;
+ }
}
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
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 2009-11-11 13:55:12 UTC (rev 30104)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java 2009-11-11 15:13:38 UTC (rev 30105)
@@ -45,7 +45,6 @@
import com.arjuna.ats.jta.TransactionManager;
import org.jboss.tm.JBossXATerminator;
-import org.jboss.util.UnexpectedThrowable;
import com.arjuna.ats.internal.jta.transaction.arjunacore.jca.*;
@@ -108,13 +107,13 @@
case Status.STATUS_NO_TRANSACTION:
case Status.STATUS_UNKNOWN:
throw new WorkCompletedException(
- jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.inactive"),
+ jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.jca.inactive"),
WorkException.TX_RECREATE_FAILED);
case Status.STATUS_ACTIVE:
break;
default:
throw new WorkCompletedException(
- jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.completing"),
+ jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.jca.completing"),
WorkException.TX_CONCURRENT_WORK_DISALLOWED);
}
@@ -146,7 +145,7 @@
ex.printStackTrace();
throw new WorkCompletedException(
- jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.unknown"),
+ jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.jca.unknown"),
WorkException.INTERNAL);
}
}
@@ -173,7 +172,7 @@
if (!TxWorkManager.getWork(tx).equals(work))
{
- throw new WorkCompletedException(jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.unknownwork"),
+ throw new WorkCompletedException(jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.jca.unknownwork"),
WorkException.INTERNAL);
}
@@ -186,13 +185,13 @@
catch (InvalidTransactionException ex)
{
throw new WorkCompletedException(
- jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.inactive"),
+ jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.jca.inactive"),
WorkException.TX_RECREATE_FAILED);
}
catch (SystemException ex)
{
throw new WorkCompletedException(
- jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.unknown"),
+ jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.jca.unknown"),
WorkException.INTERNAL);
}
}
@@ -208,19 +207,23 @@
public void endWork (Work work, Xid xid)
{
- try
- {
- Transaction tx = SubordinationManager.getTransactionImporter().importTransaction(xid);
+ try
+ {
+ Transaction tx = SubordinationManager.getTransactionImporter().importTransaction(xid);
- TransactionManager.transactionManager().suspend();
+ TransactionManager.transactionManager().suspend();
- TxWorkManager.removeWork(work, tx);
- }
- catch (Exception ex)
- {
- throw new UnexpectedThrowable(ex);
- }
- }
+ TxWorkManager.removeWork(work, tx);
+ }
+ catch (XAException xaException)
+ {
+ throw new RuntimeException(xaException);
+ }
+ catch (SystemException systemException)
+ {
+ throw new RuntimeException(systemException);
+ }
+ }
/**
* Remove the associated work from the transaction. Do not do
@@ -238,9 +241,9 @@
TxWorkManager.removeWork(work, tx);
}
- catch (Exception ex)
- {
- throw new UnexpectedThrowable(ex);
- }
+ catch (XAException xaException)
+ {
+ throw new RuntimeException(xaException);
+ }
}
}
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 13:55:12 UTC (rev 30104)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/InboundTransactionCurrentImple.java 2009-11-11 15:13:38 UTC (rev 30105)
@@ -28,6 +28,11 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
+import com.arjuna.ats.jbossatx.logging.jbossatxLogger;
+import com.arjuna.common.util.logging.DebugLevel;
+import com.arjuna.common.util.logging.VisibilityLevel;
+import com.arjuna.common.util.logging.FacilityCode;
+
/**
* Implementation of the InboundTransactionCurrent interface of the app server's
* transaction integration SPI. Provides a way for app server code to obtain the
@@ -47,9 +52,10 @@
public Transaction getCurrentTransaction()
{
- if (log.isTraceEnabled())
+ if (jbossatxLogger.logger.isDebugEnabled())
{
- log.trace("InboundTransactionCurrentImple.getCurrentTransaction() called");
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL,
+ "InboundTransactionCurrentImple.getCurrentTransaction() called");
}
TransactionManager transactionManager = null;
@@ -80,9 +86,10 @@
throw new RuntimeException("InboundTransactionCurrentImple unable to determine inbound transaction context", e);
}
- if (log.isTraceEnabled())
+ if (jbossatxLogger.logger.isDebugEnabled())
{
- log.trace("InboundTransactionCurrentImple.getCurrentTransaction() returning tx="+transaction);
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL,
+ "InboundTransactionCurrentImple.getCurrentTransaction() returning tx="+transaction);
}
return transaction;
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 13:55:12 UTC (rev 30104)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/PropagationContextManager.java 2009-11-11 15:13:38 UTC (rev 30105)
@@ -1,214 +1,224 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, 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) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
- *
- * Arjuna Technologies Ltd.
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: PropagationContextManager.java,v 1.5 2004/10/04 09:48:19 nmcl Exp $
- */
-
-package com.arjuna.ats.internal.jbossatx.jts;
-
-import org.jboss.tm.TransactionPropagationContextFactory;
-import org.jboss.tm.TransactionPropagationContextImporter;
-import org.jboss.logging.Logger;
-
-import org.omg.CosTransactions.*;
-
-import javax.transaction.Transaction;
-import javax.naming.spi.ObjectFactory;
-import javax.naming.Name;
-import javax.naming.Context;
-
-import java.util.Hashtable;
-import java.io.Serializable;
-
-import com.arjuna.ats.arjuna.utils.ThreadUtil;
-import com.arjuna.ats.internal.jts.ControlWrapper;
-import com.arjuna.ats.internal.jts.OTSImpleManager;
-import com.arjuna.ats.jta.TransactionManager;
-import com.arjuna.ats.jts.ExplicitInterposition;
-
-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>
- * if the invoking thread is not associated with a transaction.
- */
-
- public Object getTransactionPropagationContext()
- {
- if (log.isDebugEnabled())
- {
- log.debug("PropagationContextManager.getTransactionPropagationContext - called");
- }
-
- final String threadId = ThreadUtil.getThreadId() ;
- ControlWrapper theControl;
-
- if (threadId != null)
- {
- theControl = OTSImpleManager.current().contextManager().current(threadId);
- }
- else
- {
- theControl = OTSImpleManager.current().contextManager().current();
- }
-
- try
- {
- final PropagationContext cxt = theControl.get_coordinator().get_txcontext();
- PropagationContextWrapper pcw = new PropagationContextWrapper(cxt);
-
- if (log.isDebugEnabled())
- {
- log.debug("PropagationContextManager.getTransactionPropagationContext() - returned tpc = " + pcw);
- }
-
- return pcw;
- }
- catch (Exception e)
- {
- }
-
- return null;
- }
-
- /**
- * Return a transaction propagation context for the transaction
- * given as an argument, or <code>null</code>
- * if the argument is <code>null</code> or of a type unknown to
- * this factory.
- */
-
- public Object getTransactionPropagationContext(Transaction tx)
- {
- if (log.isDebugEnabled())
- {
- log.debug("PropagationContextManager.getTransactionPropagationContext(Transaction) - called tx = " + tx);
- }
-
- Transaction oldTx = null;
- Object tpc = null;
- javax.transaction.TransactionManager tm = TransactionManager.transactionManager();
-
- try
- {
- oldTx = tm.getTransaction();
-
- if ((tx == null) || (tx.equals(oldTx)))
- {
- // we are being called in the context of this transaction
- tpc = getTransactionPropagationContext();
- }
- else
- {
- tm.suspend();
- tm.resume(tx);
-
- tpc = getTransactionPropagationContext();
-
- tm.susp!
end();
- tm.resume(oldTx);
- }
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
- if (log.isDebugEnabled())
- {
- log.debug("PropagationContextManager.getTransactionPropagationContext(Transaction) - returned tpc = " + tpc);
- }
-
- return tpc;
- }
-
- /**
- * Import the transaction propagation context into the transaction
- * manager, and return the resulting transaction.
- * If this transaction propagation context has already been imported
- * into the transaction manager, this method simply returns the
- * <code>Transaction</code> representing the 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.
- */
-
- public Transaction importTransactionPropagationContext(Object tpc)
- {
- if (log.isDebugEnabled())
- {
- log.debug("PropagationContextManager.importTransactionPropagationContext(Object) - called tpc = " + tpc);
- }
-
- javax.transaction.TransactionManager tm = TransactionManager.transactionManager();
-
- if (tpc instanceof PropagationContextWrapper)
- {
- try
- {
- PropagationContext omgTpc = ((PropagationContext!
Wrapper) tpc).getPropagationContext();
- ExplicitInterposition ei = new ExplicitInterposition(omgTpc, true);
- Transaction newTx = tm.getTransaction();
-
- if (log.isDebugEnabled())
- {
- log.debug("PropagationContextManager.importTransactionPropagationContext(Object) - transaction = " + newTx);
- }
-
-
- ei.unregisterTransaction();
-
- return newTx;
- }
- catch (Exception e)
- {
- log.error("Unexpected exception occurred", e);
-
- return null;
- }
- }
- else
- {
- log.error("jboss-atx: unknown Tx PropagationContext");
-
- return null;
- }
- }
-
- public Object getObjectInstance(Object obj, Name name, Context nameCtx,
- Hashtable environment) throws Exception
- {
- return new PropagationContextManager();
- }
-}
-
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, 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) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
+ *
+ * Arjuna Technologies Ltd.
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: PropagationContextManager.java,v 1.5 2004/10/04 09:48:19 nmcl Exp $
+ */
+package com.arjuna.ats.internal.jbossatx.jts;
+
+import org.jboss.tm.TransactionPropagationContextFactory;
+import org.jboss.tm.TransactionPropagationContextImporter;
+import org.jboss.logging.Logger;
+
+import org.omg.CosTransactions.*;
+
+import javax.transaction.Transaction;
+import javax.naming.spi.ObjectFactory;
+import javax.naming.Name;
+import javax.naming.Context;
+
+import java.util.Hashtable;
+import java.io.Serializable;
+
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
+import com.arjuna.ats.internal.jts.ControlWrapper;
+import com.arjuna.ats.internal.jts.OTSImpleManager;
+import com.arjuna.ats.jta.TransactionManager;
+import com.arjuna.ats.jts.ExplicitInterposition;
+import com.arjuna.ats.jbossatx.logging.jbossatxLogger;
+import com.arjuna.common.util.logging.DebugLevel;
+import com.arjuna.common.util.logging.VisibilityLevel;
+import com.arjuna.common.util.logging.FacilityCode;
+
+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>
+ * if the invoking thread is not associated with a transaction.
+ */
+
+ public Object getTransactionPropagationContext()
+ {
+ if (jbossatxLogger.logger.isDebugEnabled())
+ {
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL,
+ "PropagationContextManager.getTransactionPropagationContext - called");
+ }
+
+ final String threadId = ThreadUtil.getThreadId() ;
+ ControlWrapper theControl;
+
+ if (threadId != null)
+ {
+ theControl = OTSImpleManager.current().contextManager().current(threadId);
+ }
+ else
+ {
+ theControl = OTSImpleManager.current().contextManager().current();
+ }
+
+ try
+ {
+ final PropagationContext cxt = theControl.get_coordinator().get_txcontext();
+ PropagationContextWrapper pcw = new PropagationContextWrapper(cxt);
+
+ if (jbossatxLogger.logger.isDebugEnabled())
+ {
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL,
+ "PropagationContextManager.getTransactionPropagationContext() - returned tpc = " + pcw);
+ }
+
+ return pcw;
+ }
+ catch (Exception e)
+ {
+ }
+
+ return null;
+ }
+
+ /**
+ * Return a transaction propagation context for the transaction
+ * given as an argument, or <code>null</code>
+ * if the argument is <code>null</code> or of a type unknown to
+ * this factory.
+ */
+
+ public Object getTransactionPropagationContext(Transaction tx)
+ {
+ if (jbossatxLogger.logger.isDebugEnabled())
+ {
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL,
+ "PropagationContextManager.getTransactionPropagationContext(Transaction) - called tx = " + tx);
+ }
+
+ Transaction oldTx = null;
+ Object tpc = null;
+ javax.transaction.TransactionManager tm = TransactionManager.transactionManager();
+
+ try
+ {
+ oldTx = tm.getTransaction();
+
+ if ((tx == null) || (tx.equals(oldTx)))
+ {
+ // we are being called in the context of this transaction
+ tpc = getTransactionPropagationContext();
+ }
+ else
+ {
+ tm.suspend();
+ tm.resume(tx);
+
+ tpc = getTransactionPropagationContext();
+
+ tm.suspend();
+ tm.resume(oldTx);
+ }
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+
+ if (jbossatxLogger.logger.isDebugEnabled())
+ {
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL,
+ "PropagationContextManager.getTransactionPropagationContext(Transaction) - returned tpc = " + tpc);
+ }
+
+ return tpc;
+ }
+
+ /**
+ * Import the transaction propagation context into the transaction
+ * manager, and return the resulting transaction.
+ * If this transaction propagation context has already been imported
+ * into the transaction manager, this method simply returns the
+ * <code>Transaction</code> representing the 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.
+ */
+
+ public Transaction importTransactionPropagationContext(Object tpc)
+ {
+ if (jbossatxLogger.logger.isDebugEnabled())
+ {
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL,
+ "PropagationContextManager.importTransactionPropagationContext(Object) - called tpc = " + tpc);
+ }
+
+ javax.transaction.TransactionManager tm = TransactionManager.transactionManager();
+
+ if (tpc instanceof PropagationContextWrapper)
+ {
+ try
+ {
+ PropagationContext omgTpc = ((PropagationContextWrapper) tpc).getPropagationContext();
+ ExplicitInterposition ei = new ExplicitInterposition(omgTpc, true);
+ Transaction newTx = tm.getTransaction();
+
+ if (jbossatxLogger.logger.isDebugEnabled())
+ {
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL,
+ "PropagationContextManager.importTransactionPropagationContext(Object) - transaction = " + newTx);
+ }
+
+
+ ei.unregisterTransaction();
+
+ return newTx;
+ }
+ catch (Exception e)
+ {
+ log.error("Unexpected exception occurred", e);
+
+ return null;
+ }
+ }
+ else
+ {
+ log.error("jboss-atx: unknown Tx PropagationContext");
+
+ return null;
+ }
+ }
+
+ public Object getObjectInstance(Object obj, Name name, Context nameCtx,
+ Hashtable environment) throws Exception
+ {
+ return new PropagationContextManager();
+ }
+}
+
+
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 2009-11-11 13:55:12 UTC (rev 30104)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java 2009-11-11 15:13:38 UTC (rev 30105)
@@ -45,7 +45,6 @@
import com.arjuna.ats.internal.jta.transaction.jts.jca.XATerminatorImple;
import org.jboss.tm.JBossXATerminator;
-import org.jboss.util.UnexpectedThrowable;
import com.arjuna.ats.jbossatx.logging.jbossatxLogger;
import com.arjuna.ats.jta.TransactionManager;
@@ -109,13 +108,13 @@
case Status.STATUS_NO_TRANSACTION:
case Status.STATUS_UNKNOWN:
throw new WorkCompletedException(
- jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.inactive"),
+ jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.jca.inactive"),
WorkException.TX_RECREATE_FAILED);
case Status.STATUS_ACTIVE:
break;
default:
throw new WorkCompletedException(
- jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.completing"),
+ jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.jca.completing"),
WorkException.TX_CONCURRENT_WORK_DISALLOWED);
}
@@ -147,7 +146,7 @@
ex.printStackTrace();
throw new WorkCompletedException(
- jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.unknown"),
+ jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.jca.unknown"),
WorkException.INTERNAL);
}
}
@@ -174,7 +173,7 @@
if (!TxWorkManager.getWork(tx).equals(work))
{
- throw new WorkCompletedException(jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.unknownwork"),
+ throw new WorkCompletedException(jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.jca.unknownwork"),
WorkException.INTERNAL);
}
@@ -187,13 +186,13 @@
catch (InvalidTransactionException ex)
{
throw new WorkCompletedException(
- jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.inactive"),
+ jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.jca.inactive"),
WorkException.TX_RECREATE_FAILED);
}
catch (SystemException ex)
{
throw new WorkCompletedException(
- jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.unknown"),
+ jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.jca.unknown"),
WorkException.INTERNAL);
}
}
@@ -217,10 +216,15 @@
TxWorkManager.removeWork(work, tx);
}
- catch (Exception ex)
- {
- throw new UnexpectedThrowable(ex);
- }
+ catch (XAException xaException)
+ {
+ throw new RuntimeException(xaException);
+ }
+ catch (SystemException systemException)
+ {
+ throw new RuntimeException(systemException);
+ }
+
}
/**
@@ -239,9 +243,9 @@
TxWorkManager.removeWork(work, tx);
}
- catch (Exception ex)
- {
- throw new UnexpectedThrowable(ex);
- }
+ catch (XAException xaException)
+ {
+ throw new RuntimeException(xaException);
+ }
}
}
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 2009-11-11 13:55:12 UTC (rev 30104)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerDelegate.java 2009-11-11 15:13:38 UTC (rev 30105)
@@ -91,7 +91,7 @@
case Status.STATUS_ROLLEDBACK:
case Status.STATUS_ROLLING_BACK:
if(errorRollback) {
- throw new RollbackException(jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_1"));
+ throw new RollbackException(jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_1"));
}
break;
case Status.STATUS_COMMITTED:
@@ -117,7 +117,7 @@
catch (final SystemException se)
{
RollbackException rollbackException = new RollbackException(
- jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_2")) ;
+ jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_2")) ;
rollbackException.initCause(se);
throw rollbackException;
}
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/InboundTransactionCurrentInitializer.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/InboundTransactionCurrentInitializer.java 2009-11-11 13:55:12 UTC (rev 30104)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/InboundTransactionCurrentInitializer.java 2009-11-11 15:13:38 UTC (rev 30105)
@@ -25,8 +25,11 @@
import org.omg.PortableInterceptor.ORBInitInfo;
import org.omg.PortableInterceptor.ORBInitInfoPackage.InvalidName;
import org.jboss.iiop.tm.InboundTransactionCurrent;
-import org.jboss.logging.Logger;
import com.arjuna.ats.internal.jbossatx.jts.InboundTransactionCurrentImple;
+import com.arjuna.ats.jbossatx.logging.jbossatxLogger;
+import com.arjuna.common.util.logging.FacilityCode;
+import com.arjuna.common.util.logging.VisibilityLevel;
+import com.arjuna.common.util.logging.DebugLevel;
/**
* This Initializer is used to register our InboundTransactionCurrent implementation
@@ -42,13 +45,12 @@
*/
public class InboundTransactionCurrentInitializer extends LocalObject implements ORBInitializer
{
- private Logger log = org.jboss.logging.Logger.getLogger(InboundTransactionCurrentInitializer.class);
-
public void pre_init(ORBInitInfo info)
{
- if(log.isTraceEnabled())
+ if(jbossatxLogger.logger.isDebugEnabled())
{
- log.trace("InboundTransactionCurrentInitializer.pre_init()");
+ jbossatxLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ALL,
+ "InboundTransactionCurrentInitializer.pre_init()");
}
try
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 2009-11-11 13:55:12 UTC (rev 30104)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerDelegate.java 2009-11-11 15:13:38 UTC (rev 30105)
@@ -87,7 +87,7 @@
case Status.STATUS_ROLLEDBACK:
case Status.STATUS_ROLLING_BACK:
if(errorRollback) {
- throw new RollbackException(jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_1"));
+ throw new RollbackException(jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_1"));
}
break;
case Status.STATUS_COMMITTED:
@@ -113,7 +113,7 @@
catch (final SystemException se)
{
RollbackException rollbackException = new RollbackException(
- jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_2")) ;
+ jbossatxLogger.loggerI18N.getString("com.arjuna.ats.jbossatx.jts.TransactionManagerDelegate.getTimeLeftBeforeTransactionTimeout_2")) ;
rollbackException.initCause(se);
throw rollbackException;
}
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 2009-11-11 13:55:12 UTC (rev 30104)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxLogger.java 2009-11-11 15:13:38 UTC (rev 30105)
@@ -32,9 +32,8 @@
package com.arjuna.ats.jbossatx.logging;
import com.arjuna.common.util.logging.*;
+import com.arjuna.common.internal.util.logging.commonPropertyManager;
-import com.arjuna.ats.jta.common.jtaPropertyManager;
-
import java.util.Locale;
import java.util.ResourceBundle;
@@ -42,7 +41,7 @@
{
public static LogNoi18n logger;
public static Logi18n loggerI18N;
- public static ResourceBundle logMesg;
+ private static ResourceBundle logMesg;
private static String _language;
private static String _country;
@@ -52,8 +51,8 @@
{
logger = LogFactory.getLogNoi18n("com.arjuna.ats.jbossatx.logging.logger");
- _language = System.getProperty("language","en");
- _country = System.getProperty("country","US");
+ _language = commonPropertyManager.getLoggingEnvironmentBean().getLanguage();
+ _country = commonPropertyManager.getLoggingEnvironmentBean().getCountry();
_currentLocale = new Locale(_language, _country);
Modified: labs/jbosstm/trunk/atsintegration/scripts/run-tools.bat
===================================================================
--- labs/jbosstm/trunk/atsintegration/scripts/run-tools.bat 2009-11-11 13:55:12 UTC (rev 30104)
+++ labs/jbosstm/trunk/atsintegration/scripts/run-tools.bat 2009-11-11 15:13:38 UTC (rev 30105)
@@ -36,7 +36,7 @@
set CLASSPATH=%CLASSPATH%;%@HOME_DIRECTORY@%\bin\tools\ext\jcommon-1.0.5.jar
rem Start the tools framework
-java "-Dcom.arjuna.mw.ArjunaToolsFramework.lib=%@HOME_DIRECTORY@%\bin\tools" -Dcom.arjuna.ats.tsmx.agentimpl=com.arjuna.ats.internal.jbossatx.agent.JBossAgentImpl com.arjuna.ats.tools.toolsframework.ArjunaToolsFramework
+java "-Dcom.arjuna.mw.ArjunaToolsFramework.lib=%@HOME_DIRECTORY@%\bin\tools" com.arjuna.ats.tools.toolsframework.ArjunaToolsFramework
goto finished
:atserror
Modified: labs/jbosstm/trunk/atsintegration/scripts/run-tools.sh
===================================================================
--- labs/jbosstm/trunk/atsintegration/scripts/run-tools.sh 2009-11-11 13:55:12 UTC (rev 30104)
+++ labs/jbosstm/trunk/atsintegration/scripts/run-tools.sh 2009-11-11 15:13:38 UTC (rev 30105)
@@ -61,4 +61,4 @@
export CLASSPATH
# Start the tools framework
-"$JAVA_HOME/bin/java" "-Dcom.arjuna.mw.ArjunaToolsFramework.lib=$@HOME_DIRECTORY@/bin/tools" -Dcom.arjuna.ats.tsmx.agentimpl=com.arjuna.ats.internal.jbossatx.agent.JBossAgentImpl com.arjuna.ats.tools.toolsframework.ArjunaToolsFramework
+"$JAVA_HOME/bin/java" "-Dcom.arjuna.mw.ArjunaToolsFramework.lib=$@HOME_DIRECTORY@/bin/tools" com.arjuna.ats.tools.toolsframework.ArjunaToolsFramework
More information about the jboss-svn-commits
mailing list