[jboss-svn-commits] JBL Code SVN: r30133 - in labs/jbosstm/workspace/whitingjr/trunk/performance: src/main/resources and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 12 08:38:37 EST 2009
Author: whitingjr
Date: 2009-11-12 08:38:36 -0500 (Thu, 12 Nov 2009)
New Revision: 30133
Modified:
labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/embedded-jboss-beans.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/db-profile.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/db-installation.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic/ProfiledStateTransitions.java
Log:
Added changes to remove import.
Changed build script with reminders to document steps for running performance tests.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2009-11-12 12:36:49 UTC (rev 30132)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2009-11-12 13:38:36 UTC (rev 30133)
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<project name="JBoss TM performance comparison project" default="profile-ejb3" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<import file="/home/whitingjr/java/hibernate/caveatemptor-jpa-061211/build.xml" />
-
+ <!-- TODO: Add a section to the beginning of the build.xml. Explain what the script does and the dependencies that have to be downloaded and installed.
+ -->
+ <!-- TODO: Remove obsolete properties and dependencies. -->
<property name="JBOSS_HOME_4_2_3" value="~/java/jboss/jboss-4.2.3.GA" />
<property name="M2_HOME" value="${user.home}/.m2" />
- <property name="MAVEN_ANT_TASK_VERSION" value="2.0.10" />
<property name="required-args" value="-Dtransaction.strategy=value -Ddb.installation=value -Ddb.vendor=value -Djdbc-datasource=value" />
<property name="optional-args" value="-Dtransaction.log.store=value" />
@@ -95,13 +96,12 @@
</condition>
</fail>
- <fail message="JDBC configuration must be either [no-tx|xa|local-tx]">
+ <fail message="JDBC datasource configuration must be either [local-tx|xa]">
<condition>
<not>
<or>
- <equals arg1="${jdbc-datasource}" arg2="no-tx" />
+ <equals arg1="${jdbc-datasource}" arg2="local-tx" />
<equals arg1="${jdbc-datasource}" arg2="xa" />
- <equals arg1="${jdbc-datasource}" arg2="local-tx" />
</or>
</not>
</condition>
@@ -179,8 +179,6 @@
<copy file="src/main/resources/log4j.xml" todir="build/classes" />
- <copy file="/home/whitingjr/eclipse/v3.5-galileo/workspaces/performance/tomcat-integration/tomcat-integration.jar" todir="lib" />
-
<delete dir="${test.output.dir}" />
<mkdir dir="${test.output.dir}" />
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/embedded-jboss-beans.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/embedded-jboss-beans.xml 2009-11-12 12:36:49 UTC (rev 30132)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/embedded-jboss-beans.xml 2009-11-12 13:38:36 UTC (rev 30133)
@@ -25,22 +25,6 @@
<property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
</bean>
- <bean name="XidFactory" class="org.jboss.tm.XidFactoryImpl"/>
-
- <bean name="XidFactoryMBean" class="org.jboss.ejb3.embedded.XidFactoryMBean">
- <constructor>
- <parameter class="org.jboss.tm.XidFactoryBase">
- <inject bean="XidFactory"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- bean name="TransactionManagerInitializer" class="org.jboss.tm.TransactionManagerInitializer">
- <property name="xidFactory"><inject bean="XidFactory"/></property>
- <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
- </bean-->
-
-
<bean name="UserTransaction" class="com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple">
</bean>
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/db-profile.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/db-profile.properties 2009-11-12 12:36:49 UTC (rev 30132)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/db-profile.properties 2009-11-12 13:38:36 UTC (rev 30133)
@@ -19,3 +19,6 @@
# class used to relax integrity constraint
db-vendor-constraint-class=org.jboss.jbossts.performance.persistence.vendor.MySQL
+
+# custom vendor database datasource property names
+db-vendor-property-name.url=url
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/db-installation.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/db-installation.properties 2009-11-12 12:36:49 UTC (rev 30132)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/db-installation.properties 2009-11-12 13:38:36 UTC (rev 30133)
@@ -1,9 +1,8 @@
# driver settings
-#db-vendor-jdbc-connectionURL=jdbc:mysql://localhost:3305/tsperf mysql
#jdbc:oracle:thin:@larry.buildnet.ncl.jboss.com:1521:orcl
-db-vendor-jdbc-connectionURL=jdbc:oracle:thin:@larry.buildnet.ncl.jboss.com:1521:orcl
+db-vendor-jdbc-connectionURL=jdbc:mysql://larry.buildnet.ncl.jboss.com:3306/jbossts
db-vendor-jdbc-userName=dtf11
db-vendor-jdbc-password=dtf11
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-12 12:36:49 UTC (rev 30132)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic/ProfiledStateTransitions.java 2009-11-12 13:38:36 UTC (rev 30133)
@@ -24,14 +24,10 @@
import java.io.BufferedInputStream;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
-import java.lang.reflect.Constructor;
import java.sql.Connection;
import java.sql.SQLException;
-import java.util.ArrayList;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
import javax.naming.InitialContext;
@@ -45,7 +41,6 @@
import javax.xml.xpath.XPathFactory;
import org.apache.commons.dbutils.DbUtils;
-import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger;
import org.dbunit.database.DatabaseConfig;
@@ -72,7 +67,6 @@
import auction.test.EJB3IntegrationTest;
import com.mentorgen.tools.profile.runtime.Profile;
-import com.sun.org.apache.xpath.internal.NodeSet;
@SqlResultSetMapping(name = "PriceSellerResult", columns =
{@ColumnResult(name = "IP"), @ColumnResult(name = "SID")
@@ -325,6 +319,7 @@
Object result = xpath.evaluate ("/dataset/*", new InputSource(iStream), XPathConstants.NODESET);
+ //TODO: test what happens when result tree == 1, is a Node interface returned instead
NodeList resultTree = (NodeList)result;
logger.trace("Size of element list ["+resultTree.getLength()+"]");
for (int position = 0 ; position < resultTree.getLength() ; position += 1)
More information about the jboss-svn-commits
mailing list