[jboss-svn-commits] JBL Code SVN: r30637 - labs/jbosstm/workspace/whitingjr/trunk/performance.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Dec 14 11:43:55 EST 2009
Author: whitingjr
Date: 2009-12-14 11:43:55 -0500 (Mon, 14 Dec 2009)
New Revision: 30637
Modified:
labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
Log:
Updated to use second resource for connections.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2009-12-14 16:43:16 UTC (rev 30636)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2009-12-14 16:43:55 UTC (rev 30637)
@@ -36,7 +36,9 @@
for JIP from
http://jiprof.sourceforge.net/
Inside the client folder is the script to start jipViewer passing the generated XML file.
- usage: jipViewer.sh 20091123-114548.xml &
+ usage: jipViewer.sh 20091123-114548-raw.xml &
+ A second XML file is generated based on a transformation of the raw xml file. eg.
+ 20091123-114548-analysis.xml
-->
<property name="build.classes.dir" value="build/classes" />
<property name="test.output.dir" value="target" />
@@ -53,8 +55,8 @@
<include name="*.jar" />
</fileset>
<fileset dir="${driver.home}/${second.resource.db.vendor}">
- <include name="*.jar" />
- </fileset>
+ <include name="*.jar" />
+ </fileset>
</path>
<path id="ant.classpath">
@@ -190,10 +192,10 @@
</condition>
</fail>
</target>
-
+
<target name="second-resource" if="second.resource.db.vendor">
- <property name="db-vendor-profiling" value="${db-vendor-profiling.A},${db-vendor-profiling.B}"/>
-
+ <property name="db-vendor-profiling" value="${db-vendor-profiling.A},${db-vendor-profiling.B}" />
+
</target>
<target name="prepare" depends="check-arguments, check-setup, second-resource">
@@ -201,22 +203,33 @@
<mkdir dir="build" />
<mkdir dir="build/classes" />
<mkdir dir="build/classes/META-INF" />
-
- <property name="db-vendor-profiling" value="${db-vendor-profiling.A}"/>
+ <property name="db-vendor-profiling" value="${db-vendor-profiling.A}" />
+
<!-- load properties, specific first then general -->
<loadproperties srcfile="${properties.home}/log-store/store-data.properties" />
<loadproperties srcfile="${properties.home}/jdbc-resource/${jdbc-datasource}/datasource.properties" />
- <loadproperties srcfile="${properties.home}/database/${db.vendor}/database-locations/${db.installation}/db-installation.properties">
+ <loadproperties srcfile="${properties.home}/database/${db.vendor}/db-profile.properties" />
+ <loadproperties srcfile="${properties.home}/database/${db.vendor}/database-locations/${db.installation}/resourceA/connection.properties">
<filterchain>
<expandproperties />
</filterchain>
</loadproperties>
- <loadproperties srcfile="${properties.home}/database/${second.resource.db.vendor}/database-locations/${db.installation}/second-resource-installation.properties">
+ <loadproperties srcfile="${properties.home}/database/${db.vendor}/database-locations/${db.installation}/resourceA/resource.properties">
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </loadproperties>
+ <loadproperties srcfile="${properties.home}/database/${db.vendor}/database-locations/${db.installation}/resourceB/connection.properties">
<filterchain>
<expandproperties />
</filterchain>
</loadproperties>
+ <loadproperties srcfile="${properties.home}/database/${db.vendor}/database-locations/${db.installation}/resourceB/resource.properties">
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </loadproperties>
<loadproperties srcfile="${properties.home}/database/${db.vendor}/db-profile.properties" />
<loadproperties srcfile="${properties.home}/database/shared-database.properties" />
<copy file="src/main/resources/profile-remote.properties" tofile="build/classes/profile.properties">
@@ -268,6 +281,9 @@
<echo message="Running with hibernate dialect [${hibernate.dialect}] and transaction management [${transaction.strategy}]" />
<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}"/>
+
+
</target>
<target name="compile" depends="prepare,check-xa-support">
@@ -290,28 +306,30 @@
</target>
<target name="categorise" depends="profile">
- <property name="xpaths-csv" value="${testcase.xpaths},${db-vendor.method.xpaths.A},${db-vendor.method.xpaths.B}"/>
+ <property name="xpaths-csv" value="${testcase.xpaths},${db-vendor.method.xpaths.A},${db-vendor.method.xpaths.B}" />
<tstamp />
- <copy file="logs/profiled/DATE-TIME-profile.xml" tofile="logs/${DSTAMP}-${TSTAMP}-profile-raw.xml"/>
- <echo message="db vendor package[${db-vendor-package.xpath}]"></echo>
+ <copy file="logs/profiled/DATE-TIME-profile.xml" tofile="logs/${DSTAMP}-${TSTAMP}-profile-raw.xml" />
+ <echo message="db vendor package[${db-vendor-package.xpath}]">
+ </echo>
<xslt style="src/main/resources/xsl/analyseresults.xsl" in="logs/profiled/DATE-TIME-profile.xml" out="logs/${DSTAMP}-${TSTAMP}-profile-analysis.xml">
<outputproperty name="indent" value="yes" />
- <param name="db-vendor-package.A" expression="${db-vendor-package.xpath.A}"/>
- <param name="db-vendor-package.B" expression="${db-vendor-package.xpath.B}"/>
- <param name="xpaths" expression="${xpaths-csv}"/>
+ <param name="db-vendor-package.A" expression="${db-vendor-package.xpath.A}" />
+ <param name="db-vendor-package.B" expression="${db-vendor-package.xpath.B}" />
+ <param name="xpaths" expression="${xpaths-csv}" />
</xslt>
</target>
- <target name="transform">
- <property name="db-vendor-package.xpath" value="oracle"/>
- <property name="xpaths-csv" value="auction.dao.ejb3.GenericEJB3DAO:makePersistent"/>
- <echo message="db vendor packages[${db-vendor-package.xpath.A},${db-vendor-package.xpath.B}]xpaths-csv[${xpaths-csv}]"></echo>
+ <!--target name="transform">
+ <property name="db-vendor-package.xpath" value="oracle" />
+ <property name="xpaths-csv" value="auction.dao.ejb3.GenericEJB3DAO:makePersistent" />
+ <echo message="db vendor packages[${db-vendor-package.xpath.A},${db-vendor-package.xpath.B}]xpaths-csv[${xpaths-csv}]">
+ </echo>
<xslt style="src/main/resources/xsl/analyseresults.xsl" in="logs/profiled/DATE-TIME-profile.xml" out="logs/onthefly-profile-analysis.xml">
- <outputproperty name="indent" value="yes" />
- <param name="db-vendor-package.A" expression="${db-vendor-package.xpath.A}"/>
- <param name="db-vendor-package.B" expression="${db-vendor-package.xpath.B}"/>
- <param name="xpaths" expression="${xpaths-csv}"/>
- </xslt>
- </target>
+ <outputproperty name="indent" value="yes" />
+ <param name="db-vendor-package.A" expression="${db-vendor-package.xpath.A}" />
+ <param name="db-vendor-package.B" expression="${db-vendor-package.xpath.B}" />
+ <param name="xpaths" expression="${xpaths-csv}" />
+ </xslt>
+ </target-->
<target name="usage">
<echo>Usage: ant ${required-args} [${optional-args}]</echo>
More information about the jboss-svn-commits
mailing list