From 18c7ae52ef777dd1a07ba5d7fe2c603073df4429 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 3 Jan 2011 20:02:20 +0000
Subject: [PATCH] NIHVIVO-1129 Force the XSLT step to use JAR files that
 actually work.

---
 utilities/load-testing/build.xml                   | 14 +++++++++++++-
 .../load-testing/example.loadtesting.properties    |  4 +++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/utilities/load-testing/build.xml b/utilities/load-testing/build.xml
index 4a124955..1719fc85 100644
--- a/utilities/load-testing/build.xml
+++ b/utilities/load-testing/build.xml
@@ -66,6 +66,11 @@ report   - Just summarize output from previously run tests.
 
 		<fail unless="jmeter.home.dir"
 		      message="${properties.file} must contain a value for jmeter.home.dir" />
+		<fail unless="jmeter.serializer.jar"
+		      message="${properties.file} must contain a value for jmeter.serializer.jar" />
+		<fail unless="jmeter.xalan.jar"
+		      message="${properties.file} must contain a value for jmeter.xalan.jar" />
+
 		<fail unless="webapp.host"
 		      message="${properties.file} must contain a value for webapp.host" />
 		<fail unless="webapp.port"
@@ -74,6 +79,11 @@ report   - Just summarize output from previously run tests.
 		      message="${properties.file} must contain a value for webapp.name" />
 
 		<property name="webapp.url" value="http://${webapp.host}:${webapp.port}/${webapp.name}" />
+
+		<path id="xslt.classpath">
+			<pathelement location="${jmeter.serializer.jar}" />
+			<pathelement location="${jmeter.xalan.jar}" />
+		</path>
 	</target>
 
 	<!-- - - - - - - - - - - - - - - - - - 
@@ -123,6 +133,8 @@ report   - Just summarize output from previously run tests.
 	<target name="report" depends="prepare" description="--> Just summarize the output.">
 		<xslt in="${results.dir}/${test.name}.jtl"
 		      out="${results.dir}/${test.name}.html"
-		      style="jmeter-results-report.xsl" />
+		      style="jmeter-results-report.xsl"
+		      classpathref="xslt.classpath" />
+
 	</target>
 </project>
diff --git a/utilities/load-testing/example.loadtesting.properties b/utilities/load-testing/example.loadtesting.properties
index 276fb6c3..97eb597c 100644
--- a/utilities/load-testing/example.loadtesting.properties
+++ b/utilities/load-testing/example.loadtesting.properties
@@ -10,9 +10,11 @@
 # -----------------------------------------------------------------------------
 
 #
-# The base install directory for JMeter.
+# The base install directory for JMeter, and some JARs required by XSLT
 #
 jmeter.home.dir = /Users/jeb228/Downloads/JMeter/jakarta-jmeter-2.4
+jmeter.serializer.jar = ${jmeter.home.dir}/lib/serializer-2.7.1.jar
+jmeter.xalan.jar = ${jmeter.home.dir}/lib/xalan-2.7.1.jar
 
 #
 # Where do we find the Vivo instance that we are testing?