[jboss-svn-commits] JBL Code SVN: r31020 - labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic.

[jboss-svn-commits at lists.jboss.org]

Author: whitingjr
Date: 2010-01-11 12:50:09 -0500 (Mon, 11 Jan 2010)
New Revision: 31020

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic/ProfiledStateTransitions.java
Log:
Added property to configure the transaction timeout. Controls the reaper.


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-01-11 17:49:23 UTC (rev 31019)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic/ProfiledStateTransitions.java	2010-01-11 17:50:09 UTC (rev 31020)
@@ -72,6 +72,8 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
+import com.arjuna.ats.arjuna.coordinator.TxControl;
+
 import auction.model.Address;
 import auction.model.AddressEntity;
 import auction.model.Auditable;
@@ -260,9 +262,9 @@
    
    @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"})
+   {"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"})
    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) throws Exception
+         String jndiNameUserTxA, String jndiNameUserTxB, String jndiNameHSF_A, String jndiNameHSF_B, String flag, String transactionTimeout) throws Exception
    {
       // Set configuration options from TestNG parameters
       JNDI_DATASOURCE = jndiDatasourceA;
@@ -274,6 +276,12 @@
       this.SESSION_FACTORY_JNDI_A = jndiNameHSF_A;
       this.SESSION_FACTORY_JNDI_B = jndiNameHSF_B;
       this.isOptionalWriteEnabled = Boolean.parseBoolean(flag);
+      
+      /* this will control the reaper getting started up */
+      if (null != transactionTimeout)
+      {
+         TxControl.setDefaultTimeout(Integer.parseInt(transactionTimeout));
+      }
 
       // Boot the JBoss Microcontainer with EJB3 settings, automatically
       // loads ejb3-interceptors-aop.xml and embedded-jboss-beans.xml
@@ -292,6 +300,7 @@
 
       // Create InitialContext from jndi.properties
       jndi = new InitialContext();
+      
    }