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

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

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

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
Log:
Relocated some of the preparation work. No changes.
Updated dependencies to use more recent version of Hibernate.


Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2009-11-20 11:07:08 UTC (rev 30265)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2009-11-20 11:08:05 UTC (rev 30266)
@@ -55,17 +55,17 @@
 	</path>
 
 	<path id="compile.classpath">
-		<pathelement path="lib//log4j-1.2.15.jar" />
+		<pathelement path="lib/log4j-1.2.15.jar" />
 		<pathelement path="lib/client.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" />
 		<pathelement path="lib/ejb3-persistence.jar" />
-		<pathelement path="lib/thirdparty-all.jar" />
-		<pathelement path="lib/hibernate3.jar" />
-		<pathelement path="lib/hibernate-annotations.jar" />
-		<pathelement path="lib/hibernate-entitymanager.jar" />
+		<pathelement path="lib/hibernate-core-3.3.0.GA.jar" />
+		<pathelement path="lib/hibernate-annotations-3.4.0.GA.jar" />
+		<pathelement path="lib/hibernate-commons-annotations-3.1.0.GA.jar" />
+		<pathelement path="lib/hibernate-entitymanager-3.4.0.GA.jar" />
 		<pathelement path="lib/jbossjta-4.8.0_GA-standalone.jar" />
 		<pathelement path="lib/jip-1.0.jar" />
 		<pathelement path="lib/jip-client-1.0.jar" />
@@ -75,6 +75,7 @@
 		<pathelement path="lib/commons-io-1.4.jar" />
 		<pathelement path="lib/commons-collections-3.2.1.jar" />
 		<pathelement path="lib/commons-lang-2.4.jar" />
+		<pathelement path="lib/thirdparty-all.jar" />
 		<path refid="database.driver" />
 	</path>
 
@@ -225,6 +226,22 @@
 		<delete dir="${test.output.dir}" />
 		<mkdir dir="${test.output.dir}" />
 
+		<copy file="src/test/resources/testsuite-integration-ejb3.xml" tofile="build/classes/testsuite-integration.xml">
+         <filterchain>
+            <expandproperties />
+         </filterchain>
+      </copy>
+
+      <copy file="src/main/resources/embedded-jboss-beans.xml" todir="build/classes" />
+      <copy file="src/main/resources/ejb3-interceptors-aop.xml" todir="build/classes" />
+      <copy file="src/main/resources/jndi.properties" todir="build/classes" />
+      <copy file="${properties.home}/transaction-management/${transaction.strategy}/default.persistence.properties" todir="build/classes" />
+      <unzip dest="build/classes" src="lib/caveatemptor-jpa.jar">
+         <patternset>
+            <include name="**/*.class" />
+         </patternset>
+      </unzip>
+		<echo message="Running with hibernate dialect [${hibernate.dialect}] and transaction management [${transaction.strategy}]"/>
 	</target>
 
 	<target name="compile" depends="prepare,check-xa-support">
@@ -233,27 +250,12 @@
 	</target>
 
 	<target name="profile" depends="compile">
-		<copy file="src/test/resources/testsuite-integration-ejb3.xml" tofile="build/classes/testsuite-integration.xml">
-			<filterchain>
-				<expandproperties />
-			</filterchain>
-		</copy>
-
-		<copy file="src/main/resources/embedded-jboss-beans.xml" todir="build/classes" />
-		<copy file="src/main/resources/ejb3-interceptors-aop.xml" todir="build/classes" />
-		<copy file="src/main/resources/jndi.properties" todir="build/classes" />
-		<copy file="${properties.home}/transaction-management/${transaction.strategy}/default.persistence.properties" todir="build/classes" />
-		<unzip dest="build/classes" src="lib/caveatemptor-jpa.jar">
-			<patternset>
-				<include name="**/*.class" />
-			</patternset>
-		</unzip>
-
 		<testng outputDir="${test.output.dir}">
 			<jvmarg value="-javaagent:lib/profile.jar" />
 			<jvmarg value="-Dprofile.properties=build/classes/profile.properties" />
+			<jvmarg value="-Djboss.server.data.dir=${jboss.server.data.dir}" />
 			<jvmarg value="-Xdebug" />
-			<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000" />
+			<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" />
 			<classpath>
 				<path refid="test.classpath" />
 			</classpath>