[jboss-svn-commits] JBL Code SVN: r32620 - labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Apr 23 13:54:32 EDT 2010
Author: whitingjr
Date: 2010-04-23 13:54:31 -0400 (Fri, 23 Apr 2010)
New Revision: 32620
Modified:
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic/ProfiledStateTransitions.java
Log:
Pruned dead code and fixed issues.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic/ProfiledStateTransitions.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic/ProfiledStateTransitions.java 2010-04-23 17:53:31 UTC (rev 32619)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic/ProfiledStateTransitions.java 2010-04-23 17:54:31 UTC (rev 32620)
@@ -26,10 +26,7 @@
import java.io.File;
import java.io.InputStream;
import java.sql.Connection;
-import java.sql.Date;
-import java.sql.PreparedStatement;
import java.sql.SQLException;
-import java.sql.Types;
import java.util.HashSet;
import java.util.Set;
@@ -40,6 +37,7 @@
import javax.persistence.EntityManagerFactory;
import javax.persistence.SqlResultSetMapping;
import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
@@ -100,7 +98,6 @@
import com.arjuna.ats.arjuna.common.arjPropertyManager;
import com.arjuna.ats.arjuna.coordinator.TxControl;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple;
import com.arjuna.ats.jta.common.jtaPropertyManager;
@SqlResultSetMapping(name = "PriceSellerResult", columns =
{@ColumnResult(name = "IP"), @ColumnResult(name = "SID")
@@ -120,10 +117,10 @@
protected String JNDI_DATASOURCE_B;
protected String JNDI_NAME_USERTX_B;
protected String JNDI_NAME_EMF_B;
+ protected String JNDI_NAME_TM ;
protected boolean isOptionalWriteEnabled;
private DefaultDataTypeFactory dataTypeFactoryB;
protected Profiler profiler;
- private int concurrencyCount;
private Class<ConnectionHandler> connectionHandlerClass;
@Override
@@ -157,7 +154,7 @@
this.dataTypeFactoryB = configureDataTypeFactory(factoryB);
this.vendorControllerB = configureVendorControlClass(constraintB, tableNames);
}
- if (null != profilerFQCN && !StringUtils.equals("", profilerFQCN.trim()))
+ if (StringUtils.isNotBlank(profilerFQCN))
{
this.profiler = (Profiler)Class.forName(profilerFQCN).newInstance();
}
@@ -171,12 +168,13 @@
}
return returnValue;
}
+ @SuppressWarnings("unchecked")
private AbstractVendorControl configureVendorControlClass(String type, Set tableNames)
throws Exception
{
AbstractVendorControl returnValue = null;
- if (null != type && !"".equals(type.trim()))
+ if (StringUtils.isNotBlank(type))
{
returnValue = (AbstractVendorControl) Class.forName(type).newInstance();
returnValue.setTableNames(tableNames);
@@ -235,8 +233,6 @@
IDatabaseConnection dbUnitCon = new DatabaseDataSourceConnection(this.jndi, jndiDataSource);
/* Relax the constraints for this connection allowing bulk imports of data */
- Connection con = dbUnitCon.getConnection();
-
if (null != this.datatypeFactory)
{
DatabaseConfig config = dbUnitCon.getConfig();
@@ -267,9 +263,10 @@
@SuppressWarnings("unchecked")
@BeforeTest(groups = "integration-warmup")
@Parameters(
- {"deploy_beans_xml", "scan_classpath", "jndi_datasource_A", "jndi_datasource_B", "jndi_name_emf_A", "jndi_name_emf_B", "jndi_name_usertx_A", "jndi_name_usertx_B", "session_jndi_A", "session_jndi_B", "invoke_optional_write", "transaction_timeout", "use_lrco", "concurrency_count", "connection_handler_fqcn"})
+ {"deploy_beans_xml", "scan_classpath", "jndi_datasource_A", "jndi_datasource_B", "jndi_name_emf_A", "jndi_name_emf_B", "jndi_name_usertx_A", "jndi_name_usertx_B", "session_jndi_A", "session_jndi_B", "invoke_optional_write", "transaction_timeout", "use_lrco", "connection_handler_fqcn", "tm_jndi", "action_store_fqcn"})
public void startContainer(String deployBeansXml, String scanClasspath, String jndiDatasourceA, String jndiDatasourceB, String jndiNameEMF_A, String jndiNameEMF_B,
- String jndiNameUserTxA, String jndiNameUserTxB, String jndiNameHSF_A, String jndiNameHSF_B, String flag, String transactionTimeout, String useLRCO, String concurrencyCountConfig, String connectionHandlerConfig) throws Exception
+ String jndiNameUserTxA, String jndiNameUserTxB, String jndiNameHSF_A, String jndiNameHSF_B, String flag, String transactionTimeout, String useLRCO, String connectionHandlerConfig, String jndiTransactionManager,
+ String actionStoreFQCN) throws Exception
{
// Set configuration options from TestNG parameters
JNDI_DATASOURCE = jndiDatasourceA;
@@ -281,6 +278,13 @@
this.SESSION_FACTORY_JNDI_A = jndiNameHSF_A;
this.SESSION_FACTORY_JNDI_B = jndiNameHSF_B;
this.isOptionalWriteEnabled = Boolean.parseBoolean(flag);
+ this.JNDI_NAME_TM= jndiTransactionManager;
+
+ /* Configure the object store */
+ if (StringUtils.isNotBlank(actionStoreFQCN))
+ {
+ arjPropertyManager.getCoordinatorEnvironmentBean().setActionStore(actionStoreFQCN);
+ }
/* this will control the reaper getting started up */
if (null != transactionTimeout)
@@ -296,11 +300,6 @@
jtaPropertyManager.getJTAEnvironmentBean().setLastResourceOptimisationInterface("org.jboss.tm.LastResource");
}
- if (StringUtils.isNotEmpty(concurrencyCountConfig))
- {
- this.concurrencyCount = Integer.parseInt(concurrencyCountConfig);
- }
-
if (StringUtils.isNotBlank(connectionHandlerConfig))
{
this.connectionHandlerClass = (Class<ConnectionHandler>)Class.forName(connectionHandlerConfig);
@@ -537,30 +536,6 @@
{
return this.profiler;
}
-
- private void insertUsers(Integer userCount, Connection connection)
- throws SQLException
- {
- PreparedStatement pStatement = connection.prepareStatement("insert into USERS (USER_ID, OBJ_VERSION, FIRSTNAME, LASTNAME, USERNAME, PASSWD, EMAIL, RANK, CREATED, HOME_STREET, HOME_ZIPCODE, HOME_CITY, DEFAULT_BILLING_DETAILS_ID) values (?,?,?,?,?,?,?,?,?,?,?,?,?)");;
- for (int count = 1; count <= userCount; count += 1)
- {
- pStatement.setInt(1, count);
- pStatement.setInt(2, 0);
- pStatement.setString(3, "John");
- pStatement.setString(4, "Doe");
- pStatement.setString(5, String.format("johndoe%1$s", count));
- pStatement.setString(6, "secret");
- pStatement.setString(7, "jd at mail.tld");
- pStatement.setInt(8, 0);
- pStatement.setDate(9, new Date(System.currentTimeMillis()));
- pStatement.setString(10, "Foostreet");
- pStatement.setString(11, "22222");
- pStatement.setString(12, "Foocity");
- pStatement.setNull(13, Types.NUMERIC);
- pStatement.addBatch();
- }
- pStatement.executeBatch();
- }
private DataSource getDataSource(String jndiName)
{
@@ -593,18 +568,6 @@
return returnValue;
}
- /*
- private XADataSource getXADataSource(String jndi)
- {
- XADataSource returnValue = null;
- Object dataSource = getJNDIObject(jndi);
-
- if (null != dataSource && dataSource.getClass().isInstance(XADataSource.class))
- {
- returnValue = (XADataSource)dataSource;
- }
- return returnValue;
- }*/
public DataSource getDataSourceA()
{
@@ -618,4 +581,14 @@
{
return connectionHandlerClass;
}
+ public TransactionManager getTransactionManager()
+ {
+ TransactionManager returnValue = null;
+ Object object = getJNDIObject(this.JNDI_NAME_TM);
+ if (null != object )
+ {
+ returnValue = (TransactionManager)object;
+ }
+ return returnValue;
+ }
}
More information about the jboss-svn-commits
mailing list