From f98d3342f7b551a0ff87abaee17e5b901bcf845b Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 15 Dec 2010 17:07:49 +0000
Subject: [PATCH] NIHVIVO-1445 modify all "javac" steps in the build script to
 enforce UTF-8 interpretation of the source files, instead of letting it
 default to whatever the OS decides.

---
 utilities/testrunner/build.xml | 2 ++
 webapp/build.xml               | 3 +++
 webapp/product-build.xml       | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/utilities/testrunner/build.xml b/utilities/testrunner/build.xml
index 6025d1a74..2a474f20e 100644
--- a/utilities/testrunner/build.xml
+++ b/utilities/testrunner/build.xml
@@ -58,6 +58,7 @@ run      - Run the tester.
 		       destdir="${build.dir}"
 		       debug="true"
 		       deprecation="true"
+		       encoding="UTF8"
 		       optimize="true"
 		       source="1.6">
 			<classpath>
@@ -77,6 +78,7 @@ run      - Run the tester.
 		       destdir="${build.dir}"
 		       debug="true"
 		       deprecation="true"
+		       encoding="UTF8"
 		       optimize="false"
 		       source="1.6">
 			<classpath>
diff --git a/webapp/build.xml b/webapp/build.xml
index aeab3e9a2..7c463c9e6 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -228,6 +228,7 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 		       destdir="${war-classes.dir}"
 		       debug="true"
 		       deprecation="true"
+		       encoding="UTF8"
 		       optimize="true"
 		       source="1.6">
 			<classpath refid="compile.classpath" />
@@ -242,6 +243,7 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 		       destdir="${test-classes.dir}"
 		       debug="true"
 		       deprecation="true"
+		       encoding="UTF8"
 		       optimize="false"
 		       source="1.6">
 			<classpath refid="test.compile.classpath" />
@@ -275,6 +277,7 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 		       destdir="${test-classes.dir}"
 		       debug="true"
 		       deprecation="true"
+		       encoding="UTF8"
 		       optimize="false"
 		       source="1.6">
 		</javac>
diff --git a/webapp/product-build.xml b/webapp/product-build.xml
index 2987ee4b2..305cd12cc 100644
--- a/webapp/product-build.xml
+++ b/webapp/product-build.xml
@@ -142,6 +142,7 @@
 		       destdir="${product.classes.dir}"
 		       debug="true"
 		       deprecation="true"
+		       encoding="UTF8"
 		       optimize="true"
 		       source="1.6">
 			<classpath>
@@ -170,6 +171,7 @@
 		       destdir="${test-classes.dir}"
 		       debug="true"
 		       deprecation="true"
+		       encoding="UTF8"
 		       optimize="false"
 		       source="1.6">
 			<classpath refid="test.compile.classpath" />