[jboss-svn-commits] JBL Code SVN: r29871 - labs/jbosstm/workspace/whitingjr/trunk/performance.

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

Author: whitingjr
Date: 2009-10-29 14:09:50 -0400 (Thu, 29 Oct 2009)
New Revision: 29871

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath
   labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt
   labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
   labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml
Log:
upated configuration.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath	2009-10-29 15:37:28 UTC (rev 29870)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath	2009-10-29 18:09:50 UTC (rev 29871)
@@ -14,5 +14,6 @@
 	<classpathentry kind="lib" path="lib/jboss-ejb3-all.jar"/>
 	<classpathentry kind="lib" path="lib/thirdparty-all.jar"/>
 	<classpathentry kind="lib" path="lib/caveatemptor-jpa.jar"/>
+	<classpathentry kind="lib" path="lib/tomcat-integration.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt	2009-10-29 15:37:28 UTC (rev 29870)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt	2009-10-29 18:09:50 UTC (rev 29871)
@@ -14,7 +14,7 @@
          Supports multi-vendor database configuration.
          Support local transaction persistence configuration
          Supports JDBC driver for multi vendors
-         Supports profiling configuration for vendor specific classes.
+         Supports profiling configuration for vendor specific datasource classes.
 
 0.0.3    Supports Transaction XA single resource persistence configuration.
          Support NoTransaction resource persistence configuration.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2009-10-29 15:37:28 UTC (rev 29870)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2009-10-29 18:09:50 UTC (rev 29871)
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<project name="JBoss TM performance comparison project" default="profile-ejb3">
+<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" />
-	<!--
-	set this property for the LogStore location.
-	${jboss.server.data.dir}
-	   -->
 
+	<property name="M2_HOME" value="${user.home}/.m2" />
+   <property name="MAVEN_ANT_TASK_VERSION" value="2.0.10" />
+	<!-- to download dependencies execute mvn package on this module before calling ant script -->
+	<!--path id="maven-ant-tasks.classpath" path="${M2_HOME}/repository/org/apache/maven/maven-ant-tasks/${MAVEN_ANT_TASK_VERSION}/maven-ant-tasks-${MAVEN_ANT_TASK_VERSION}.jar" />
+	<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
+	<artifact:pom id="tsperfpom" file="pom.xml" />
+	<artifact:dependencies filesetId="tsperf" pomRefId="tsperfpom"/-->
+
 	<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" />
 
@@ -29,6 +33,8 @@
 		<pathelement path="lib/client.jar" />
 		<pathelement path="/home/whitingjr/.m2/repository/org/dbunit/dbunit/2.4.6/dbunit-2.4.6.jar" />
 		<pathelement path="lib/tomcat-integration.jar"/>
+		<pathelement path="lib/jboss-jta-4.3.jar"/>
+		<pathelement path="lib/testng-5.10-jdk15.jar"/>
 	</path>
 
 	<path id="demo.run.classpath">
@@ -101,6 +107,7 @@
 				</and>
 			</condition>
 		</fail>
+		
 	</target>
 
 	<target name="check-setup">
@@ -116,6 +123,13 @@
 				</not>
 			</condition>
 		</fail>
+		
+		<!--fail message="fileset missing">
+		   <condition>
+		   	<isreference refid="tsperf"/>
+			</condition>
+		</fail-->
+		
 	</target>
 
 	<target name="prepare" depends="check-arguments, check-setup">
@@ -127,6 +141,7 @@
 		
 
 		<!-- load properties, specific first then general -->
+		<loadproperties srcfile="src/main/resources/properties/log-store/store-data.properties"/>
 		<loadproperties srcfile="src/main/resources/properties/jdbc-resource/${jdbc-datasource}/datasource.properties"/>
 		<loadproperties srcfile="src/main/resources/properties/database/${db.vendor}/database-locations/${db.installation}/db-installation.properties" />
 		<loadproperties srcfile="src/main/resources/properties/database/${db.vendor}/db-profile.properties" />
@@ -175,7 +190,7 @@
 	</target>
 
 	<target name="compile" depends="prepare">
-		<javac srcdir="src/main/java" destdir="${build.classes.dir}" classpathref="demo.compile.classpath" />
+		<javac srcdir="src/main/java" destdir="${build.classes.dir}" classpathref="demo.compile.classpath" debug="true"/>
 		<javac srcdir="src/test/java" destdir="${build.classes.dir}" classpathref="demo.run.classpath" />
 	</target>
 

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml	2009-10-29 15:37:28 UTC (rev 29870)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml	2009-10-29 18:09:50 UTC (rev 29871)
@@ -38,6 +38,11 @@
 			<artifactId>dbunit</artifactId>
 			<version>2.4.6</version>
 		</dependency>
+		<dependency>
+         <groupId>org.jboss.jbossts</groupId>
+         <artifactId>jboss-jta</artifactId>
+         <version>4.3</version>
+      </dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -52,4 +57,6 @@
 			</plugin>
 		</plugins>
 	</build>
+	
+	
 </project>
\ No newline at end of file