From facea76266a27bf1c8b678b427e6129ddd0389d6 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 27 Jan 2011 20:01:49 +0000
Subject: [PATCH] NIHVIVO-1129 tweak the report file to add a timestamp

---
 utilities/load-testing/build.xml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/utilities/load-testing/build.xml b/utilities/load-testing/build.xml
index 67b63f86..06822e31 100644
--- a/utilities/load-testing/build.xml
+++ b/utilities/load-testing/build.xml
@@ -16,6 +16,10 @@
 	         classname="org.programmerplanet.ant.taskdefs.jmeter.JMeterTask"
 	         classpath="lib/ant-jmeter-1.0.9.jar" />
 
+	<tstamp>
+		<format property="TIMESTAMP" pattern="MMMM dd, yyyy hh:mm a" />
+	</tstamp>
+
 	<!-- ================================= 
           target: describe              
          ================================= -->
@@ -160,6 +164,7 @@ report   - Just summarize output from previously run tests.
 			<property name="summariser.log" value="true" />
 			<property name="summariser.interval" value="10" />
 		</jmeter>
+
 	</target>
 
 	<!-- ================================= 
@@ -180,17 +185,9 @@ report   - Just summarize output from previously run tests.
 			<arg value="${report.style}" />
 		</java>
 
-		<property name="report2.out" location="${results.dir}/${test.name}-detail.html" />
-		<property name="report2.style" location="${basedir}/jmeter-results-detail-report.xsl" />
-
-		<java classname="org.apache.xalan.xslt.Process" classpathref="xslt.classpath">
-			<arg value="-in" />
-			<arg value="${report.in}" />
-			<arg value="-out" />
-			<arg value="${report2.out}" />
-			<arg value="-xsl" />
-			<arg value="${report2.style}" />
-		</java>
+		<echo append="true" file="${report.out}">
+			<![CDATA[<p>${TIMESTAMP}</p>]]>
+		</echo>
 	</target>
 
 	<!-- ================================= 
@@ -211,7 +208,7 @@ report   - Just summarize output from previously run tests.
 		          location="/Development/JIRA issues/NIHVIVO-1129_Load_testing/mergerFiles/results" />
 		<property name="merge.input.filenames"
 		          value="ver_release1.1.1/SecondTests-rel-1-1-1.html, ver_trunkRdb/SecondTests-rel-1-2.html, ver_trunkSdb/SecondTests-rel-1-2.html" />
-		
+
 		<java classname="edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger.ReportsMerger"
 		      fork="yes"
 		      failonerror="true">
@@ -221,8 +218,7 @@ report   - Just summarize output from previously run tests.
 			<arg value="${merge.input.filenames}" />
 		</java>
 
-		<copy file="mergedResults.css"
-		      todir="${merge.output.dir}" />
+		<copy file="mergedResults.css" todir="${merge.output.dir}" />
 	</target>
 
 </project>