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

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

Author: whitingjr
Date: 2009-11-16 10:57:45 -0500 (Mon, 16 Nov 2009)
New Revision: 30181

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
Log:
Removed old properties. 
Fixed build paths.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2009-11-16 15:48:55 UTC (rev 30180)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2009-11-16 15:57:45 UTC (rev 30181)
@@ -1,9 +1,10 @@
 <?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">
+<project name="JBoss TM performance comparison project" default="profile" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
 	<!--
 	This project executes the Hibernate sample application Caveat Emptor. There are two versions
 	and this project uses the version based on JPA. By running the sample test case and additional
-	tests the quantity of time necessary for components can be captured and compared.
+	tests the quantity of time components demand for applications using ORM and a database can be
+	captured for comparison and analysis.
 	The criteria for comparison are: database vendor, JDBC native or JTA managed transaction
 	and datasource configuration using a XA aware resource driver.
 	To run the performance tests you will need to download the client database driver
@@ -19,15 +20,10 @@
 	using the same <dbvendor> used in the previous step.
 	./performance/src/main/resources/properties/database/<dbvendor>/
 	Then copy the contents of the sample directory into the one just created.
+	 -->
 	
-	
-	
-	 -->
-	<!-- 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="build.classes.dir" value="build/classes"/>
 
 	<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" />
@@ -48,10 +44,10 @@
 		<pathelement path="${ant.home}/lib/ant-launcher.jar" />
 	</path>
 
-	<path id="demo.compile.classpath">
-		<pathelement path="/home/whitingjr/.m2/repository/log4j/log4j/1.2.15/log4j-1.2.15.jar" />
+	<path id="compile.classpath">
+		<pathelement path="lib//log4j-1.2.15.jar" />
 		<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/dbunit-2.4.6.jar" />
 		<pathelement path="lib/testng-5.10-jdk15.jar" />
 		<pathelement path="lib/jboss-ejb3-all.jar" />
 		<pathelement path="lib/caveatemptor-jpa.jar" />
@@ -70,15 +66,17 @@
 		<path refid="database.driver" />
 	</path>
 
-	<path id="demo.run.classpath">
-		<path refid="demo.compile.classpath" />
+	<path id="run.classpath">
+		<path refid="compile.classpath" />
 		<pathelement path="build/classes" />
 	</path>
 
-	<path id="demo.test.classpath">
-		<path refid="demo.run.classpath" />
+	<path id="test.classpath">
+		<path refid="run.classpath" />
 		<pathelement path="src/test/resources" />
 	</path>
+	
+	<taskdef resource="testngtasks" classpathref="test.classpath"/>
 
 	<target name="check-arguments">
 
@@ -207,11 +205,11 @@
 	</target>
 
 	<target name="compile" depends="prepare,check-xa-support">
-		<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" debug="true" />
+		<javac srcdir="src/main/java" destdir="${build.classes.dir}" classpathref="compile.classpath" debug="true" />
+		<javac srcdir="src/test/java" destdir="${build.classes.dir}" classpathref="run.classpath" debug="true" />
 	</target>
 
-	<target name="profile-ejb3" depends="compile">
+	<target name="profile" depends="compile">
 		<copy file="src/test/resources/testsuite-integration-ejb3.xml" tofile="build/classes/testsuite-integration.xml">
 			<filterchain>
 				<expandproperties />
@@ -235,11 +233,15 @@
 			<jvmarg value="-Xdebug" />
 			<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" />
 			<classpath>
-				<path refid="demo.test.classpath" />
+				<path refid="test.classpath" />
 			</classpath>
 			<xmlfileset file="build/classes/testsuite-integration.xml" />
 		</testng>
 	</target>
+	
+	<target name="categorise" depends="profile">
+		
+	</target>
 
 	<target name="usage">
 		<echo>Usage: ant ${required-args} ${optional-args} (optional) </echo>