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

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

Author: whitingjr
Date: 2010-05-24 06:04:57 -0400 (Mon, 24 May 2010)
New Revision: 33027

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
Log:
Updated build to copy the build.properties including the command line overrides.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2010-05-24 09:59:26 UTC (rev 33026)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2010-05-24 10:04:57 UTC (rev 33027)
@@ -121,13 +121,14 @@
 	<fileset dir="build/classes" id="configuration.path.1">
 		<include name="*.xml" />
 		<include name="*.properties" />
+		<exclude name="build.template.properties"/>
 	</fileset>
 
 	<fileset id="configuration.path.2" dir=".">
 		<include name="*.properties" />
+	   <exclude name="build.properties"/>
 	</fileset>
 
-
 	<taskdef resource="testngtasks" classpathref="test.classpath" />
 
 	<target name="check-arguments">
@@ -179,16 +180,6 @@
 			</condition>
 		</fail>
 
-		<fail message="Specify log store configuration when jta-managed. Usage: ant ${required-args} ${optional-args}">
-			<condition>
-				<and>
-					<not>
-						<isset property="transaction.log.store" />
-					</not>
-					<equals arg1="${transaction.strategy}" arg2="jta-managed" />
-				</and>
-			</condition>
-		</fail>
 		<!-- Do not check for profiler java library, the profiler might be using agentpath which does not 
 		require a library. -->
 
@@ -415,8 +406,14 @@
          <fileset refid="configuration.path.1" />
          <fileset refid="configuration.path.2" />
       </copy>
+		<copy file="src/main/resources/build.template.properties" tofile="${log.output.dir}/tx-type/${resource.A.jdbc-datasource}/installation/${installation-location}/profiler/${profiler}/${vendor-count}/${db-vendor-mix}/thread-count/${threads}/${DSTAMP}/${DSTAMP}-${time-stamp}/conf/build.properties" >
+			<filterchain>
+            <expandproperties />
+			</filterchain>         
+		</copy>
 		<copy todir="${log.output.dir}/tx-type/${resource.A.jdbc-datasource}/installation/${installation-location}/profiler/${profiler}/${vendor-count}/${db-vendor-mix}/thread-count/${threads}/${DSTAMP}/${DSTAMP}-${time-stamp}" file="${profile-file}"/>
 		<copy todir="${log.output.dir}/tx-type/${resource.A.jdbc-datasource}/installation/${installation-location}/profiler/${profiler}/${vendor-count}/${db-vendor-mix}/thread-count/${threads}/${DSTAMP}/${DSTAMP}-${time-stamp}" file="${dstat-file}"/>
+		
 	</target>
 	
 	<target name="htm" depends="copy-logs">