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

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

Author: whitingjr
Date: 2009-12-08 12:29:06 -0500 (Tue, 08 Dec 2009)
New Revision: 30546

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties
   labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
Log:
Refactored codebase to support blended datasources.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties	2009-12-08 17:28:38 UTC (rev 30545)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties	2009-12-08 17:29:06 UTC (rev 30546)
@@ -3,9 +3,10 @@
 # required
 
 transaction.strategy=jta-managed
-db.installation=co-located-db
-db.vendor=oracle
+db.installation=remote-db
+db.vendor=postgresql
 jdbc-datasource=xa
+second.resource.db.vendor=oracle
 
 # optional
 

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2009-12-08 17:28:38 UTC (rev 30545)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2009-12-08 17:29:06 UTC (rev 30546)
@@ -43,7 +43,7 @@
 
 	<property file="build.properties" />
 	<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" />
+	<property name="optional-args" value="-Dtransaction.log.store=value -Dsecond.resource.db.vendor=value" />
 
 	<property name="driver.home" value="lib/dbdrivers" />
 	<property name="properties.home" value="src/main/resources/properties" />
@@ -52,6 +52,9 @@
 		<fileset dir="${driver.home}/${db.vendor}">
 			<include name="*.jar" />
 		</fileset>
+		<fileset dir="${driver.home}/${second.resource.db.vendor}">
+         <include name="*.jar" />
+      </fileset>
 	</path>
 
 	<path id="ant.classpath">
@@ -187,12 +190,19 @@
 			</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}"/>
+		
+	</target>
 
-	<target name="prepare" depends="check-arguments, check-setup">
+	<target name="prepare" depends="check-arguments, check-setup, second-resource">
 		<delete dir="build" />
 		<mkdir dir="build" />
 		<mkdir dir="build/classes" />
 		<mkdir dir="build/classes/META-INF" />
+		
+		<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" />
@@ -202,11 +212,17 @@
 				<expandproperties />
 			</filterchain>
 		</loadproperties>
+		<loadproperties srcfile="${properties.home}/database/${second.resource.db.vendor}/database-locations/${db.installation}/second-resource-installation.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">
 			<filterchain>
 				<expandproperties />
+				<expandproperties />
 			</filterchain>
 		</copy>
 		<copy file="src/main/resources/META-INF/persistence.xml" todir="build/classes/META-INF">
@@ -274,23 +290,25 @@
 	</target>
 
 	<target name="categorise" depends="profile">
-		<property name="xpaths-csv" value="${testcase.xpaths},${db-vendor.method.xpaths}"/>
+		<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>
 		<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" expression="${db-vendor-package.xpath}"/>
+			<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 package[${db-vendor-package.xpath}]xpaths-csv[${xpaths-csv}]"></echo>
+		<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" expression="${db-vendor-package.xpath}"/>
+			<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>