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

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

Author: whitingjr
Date: 2009-11-20 06:05:54 -0500 (Fri, 20 Nov 2009)
New Revision: 30263

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic/ProfiledStateTransitions.java
Log:
Complete - taskConfigure PostgreSQL 
Reworked the importing of data, initialising of sequences.


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	2009-11-20 11:02:32 UTC (rev 30262)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic/ProfiledStateTransitions.java	2009-11-20 11:05:54 UTC (rev 30263)
@@ -58,9 +58,6 @@
 import org.hibernate.tool.hbm2ddl.DatabaseMetadata;
 import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
 import org.jboss.jbossts.performance.persistence.vendor.AbstractVendorControl;
-import org.jboss.jbossts.performance.persistence.vendor.Constraint;
-import org.jboss.jbossts.performance.persistence.vendor.Purge;
-import org.jboss.jbossts.performance.persistence.vendor.SequenceSynchronizer;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterGroups;
 import org.testng.annotations.BeforeClass;
@@ -103,7 +100,7 @@
 
    protected SessionFactory hSessionFactory;
 
-   private Constraint integrityConstraint;
+   private AbstractVendorControl vendorController;
 
    protected String SESSION_FACTORY_JNDI;
    
@@ -138,7 +135,7 @@
       {
          AbstractVendorControl abconstraint = (AbstractVendorControl) Class.forName(constraint).newInstance();
          abconstraint.setTableNames(getTableNames(location));
-         this.integrityConstraint = abconstraint;
+         this.vendorController = abconstraint;
       }
    }
 
@@ -263,23 +260,23 @@
        Connection connectionConstraintModify =  null;
        try
        {
-          if (null != this.integrityConstraint)
+          if (null != this.vendorController)
           {
              connectionConstraintModify = getConnection().getConnection();
-             if (this.integrityConstraint.isDisablePreferedOverDrop())
+             if (this.vendorController.isDisablePreferedOverDrop())
              {
-                this.integrityConstraint.relax(connectionConstraintModify);
+                this.vendorController.relax(connectionConstraintModify);
              }
              else
              {
                 sessionFactory = (SessionFactoryImpl) getSessionFactory();
                 configuration = getConfiguration();
                 dropStatements = configuration.generateDropSchemaScript(sessionFactory.getDialect());
-                this.integrityConstraint.relax(connectionConstraintModify, dropStatements);
+                this.vendorController.relax(connectionConstraintModify, dropStatements);
              }
              
-              ((Purge)  this.integrityConstraint).purge(connectionConstraintModify);
-              ((SequenceSynchronizer)  this.integrityConstraint).synchronize(connectionConstraintModify);
+              this.vendorController.purge(connectionConstraintModify);
+              //this.vendorController.synchronize(connectionConstraintModify);
           }
        }
        catch (SQLException sqle)
@@ -314,11 +311,11 @@
        try
        {
           connectionConstraintModify = getConnection().getConnection();
-          if (null != this.integrityConstraint) 
+          if (null != this.vendorController) 
           {
-             if (this.integrityConstraint.isDisablePreferedOverDrop())
+             if (this.vendorController.isDisablePreferedOverDrop())
              {
-                this.integrityConstraint.constrain (connectionConstraintModify);
+                this.vendorController.constrain (connectionConstraintModify);
              }
              else
              {
@@ -328,7 +325,7 @@
                 configuration.setProperty( Environment.TRANSACTION_STRATEGY,  sessionFactory.getSettings().getTransactionFactory().getClass().getName());
                 configuration.setProperty( Environment.TRANSACTION_MANAGER_STRATEGY , sessionFactory.getSettings().getTransactionManagerLookup().getClass().getName());
                 String[] constrainStatements = configuration.generateSchemaUpdateScript(sessionFactory.getDialect(), metadata);
-                this.integrityConstraint.constrain (connectionConstraintModify,constrainStatements);
+                this.vendorController.constrain (connectionConstraintModify,constrainStatements);
              }
           }
        }