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

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

Author: whitingjr
Date: 2009-12-30 06:25:56 -0500 (Wed, 30 Dec 2009)
New Revision: 30865

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
Log:
Changed target.
Removed duplicate target.
Modified to support multiple profilers.
Removed comments.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2009-12-30 06:40:09 UTC (rev 30864)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2009-12-30 11:25:56 UTC (rev 30865)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<project name="JBoss TM performance comparison project" default="profile-agentlib" 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
@@ -294,7 +294,11 @@
 		<delete dir="logs/profiled" />
 		<mkdir dir="logs/profiled" />
 		<property name="db-vendor-package.xpath" value="${db-vendor-package.xpath.A},${db-vendor-package.xpath.B}"/>
-		<loadproperties srcfile="src/main/resources/properties/profiler/${profiler}/configuration.properties"/>
+		<loadproperties srcfile="src/main/resources/properties/profiler/${profiler}/configuration.properties">
+			<filterchain>
+				<expandproperties />
+			</filterchain>
+		</loadproperties>
 
 	</target>
 
@@ -305,10 +309,8 @@
 
 	<target name="profile" depends="compile">
 		<testng outputDir="${test.output.dir}">
-			<jvmarg value="${profiler.agent.argument}" />
+			<jvmarg value="${profiler.agent.argument}" /> <!-- property configuration allows agentlib, agentpath and javaagent support -->
 			<jvmarg value="${profiler.vm.arguments}" />
-			<!--jvmarg value="-agentlib:${profiler.agent.library}" />
-			<jvmarg value="-Xbootclasspath/a:${profiler.xbootclasspath}"/-->
 			<jvmarg value="-Djboss.server.data.dir=${jboss.server.data.dir}" />
 			<jvmarg value="-Xdebug" />
 			<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=${suspend},address=8000" />
@@ -319,22 +321,6 @@
 		</testng>
 	</target>
 	
-	<target name="profile-agentlib" depends="compile">
-		<property name="LD_LIBRARY_PATH" value="lib"/>
-
-      <testng outputDir="${test.output.dir}">
-         <jvmarg value="${profiler.agent.argument}" />
-         <jvmarg value="${profiler.vm.arguments}" />
-         <jvmarg value="-Djboss.server.data.dir=${jboss.server.data.dir}" />
-         <jvmarg value="-Xdebug" />
-         <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=${suspend},address=8000" />
-         <classpath>
-            <path refid="test.classpath" />
-         </classpath>
-         <xmlfileset file="build/classes/testsuite-integration.xml" />
-      </testng>
-   </target>
-
 	<target name="categorise" depends="profile">
 		<property name="xpaths-csv" value="${testcase.xpaths},${db-vendor.method.xpaths.A},${db-vendor.method.xpaths.B}" />
 		<tstamp />