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

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

Author: whitingjr
Date: 2010-01-03 17:08:58 -0500 (Sun, 03 Jan 2010)
New Revision: 30902

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
Log:
Added comments.
Added property expansion for profiler library loading.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2010-01-03 22:07:51 UTC (rev 30901)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2010-01-03 22:08:58 UTC (rev 30902)
@@ -28,6 +28,15 @@
 	./libs/dbdrivers/<dbvendor>
 	./src/main/resources/properties/database/<dbvendor>
 	./src/main/resources/xsl/database/<dbvendor>
+	
+	To use a profiler than the default Java Interactive Profiler you will need to 
+	configure the installation. If your profiler is not already included create a 
+	folder 
+	src/main/resources/properties/profiler/<profilervendor>
+	and use an existing property file as a guide. Profilers loaded using agentlib, agentpath 
+	and javaagent can be used. Create a new folder to include the java agent library
+	lib/profilerdrivers/<profilervendor>
+	when using a java agent such as JIP.
 	 -->
 
 	<!--
@@ -44,7 +53,7 @@
 	<property name="test.output.dir" value="target" />
 
 	<property file="build.properties" />
-	<property name="required-args" value="-Dtransaction.strategy=value -Dresource.A.db.installation=value -Dresource.A.db.vendor=value -Dresource.A.jdbc-datasource=value" />
+	<property name="required-args" value="-Dtransaction.strategy=value -Dresource.A.db.installation=value -Dresource.A.db.vendor=value -Dresource.A.jdbc-datasource=value -Dprofiler=value" />
 	<property name="optional-args" value="-Dtransaction.log.store=value -Dresource.B.db.installation=value -Dresource.B.db.vendor=value -Dresource.B.jdbc-datasource=value" />
 
 	<property name="driver.home" value="lib/dbdrivers" />
@@ -167,6 +176,8 @@
 				</and>
 			</condition>
 		</fail>
+		<!-- Do not check for profiler java library, the profiler might be using agentpath which does not 
+		require a library. -->
 
 	</target>
 
@@ -263,10 +274,6 @@
 				<expandproperties />
 			</filterchain>
 		</copy>
-		<!-- Use stylesheet to transform result tree, each vendor datasource has specific needs. -->
-		<!--xslt in="build/classes/META-INF/caveatemptor-beans-${db.vendor}.xml" out="build/classes/META-INF/caveatemptor-beans.xml" style="src/main/resources/xsl/database/${db.vendor}/${db.vendor}.xsl">
-			<outputproperty name="indent" value="yes" />
-		</xslt-->
 		<xslt in="src/main/resources/basedata.xml" out="build/classes/basedata.xml" style="src/main/resources/xsl/basedata.xsl">
 			<outputproperty name="indent" value="yes" />
 		</xslt>
@@ -276,6 +283,11 @@
 		<delete dir="${test.output.dir}" />
 		<mkdir dir="${test.output.dir}" />
 
+		<loadproperties srcfile="src/main/resources/properties/profiler/${profiler}/configuration.properties">
+         <filterchain>
+            <expandproperties />
+         </filterchain>
+      </loadproperties>
 		<copy file="src/test/resources/testsuite-integration-ejb3.xml" tofile="build/classes/testsuite-integration.xml">
 			<filterchain>
 				<expandproperties />
@@ -294,11 +306,7 @@
 		<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">
-			<filterchain>
-				<expandproperties />
-			</filterchain>
-		</loadproperties>
+		
 
 	</target>