From 7ac06a7efb01d257ed623ab2b1444c50d5416f4a Mon Sep 17 00:00:00 2001
From: "Mesbah_Alam@ca.ibm.com" <Mesbah_Alam@ca.ibm.com>
Date: Wed, 9 Oct 2019 14:31:58 -0400
Subject: [PATCH 1/2] Print source encoding being used

Signed-off-by: Mesbah_Alam@ca.ibm.com <Mesbah_Alam@ca.ibm.com>
---
 stf.build/include/top.xml | 30 +++++++++++++++++-------------
 stf.core/build.xml        |  4 ++--
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/stf.build/include/top.xml b/stf.build/include/top.xml
index 149fe28..b18b1ae 100644
--- a/stf.build/include/top.xml
+++ b/stf.build/include/top.xml
@@ -33,6 +33,18 @@ limitations under the License.
 	<condition property="isOpenJ9" value="true" else="false" >
 		<contains string="${java_java_vm_vendor}" substring="J9"/>
 	</condition>
+	
+	<condition property="isZOS" value="true">
+		<equals arg1="${os.name}" arg2="z/OS"/>
+	</condition>
+
+	<condition property="download-tool" value="curl" else="wget">
+		<isset property="isZOS"/>
+	</condition>
+	
+	<condition property="src-encoding" value="IBM-1047" else="UTF-8">
+		<isset property="isZOS"/>
+	</condition>
 
 	<!--
 		Determine the java version being used for the build and set properties for use by build.xml files.
@@ -155,7 +167,7 @@ limitations under the License.
 									  check-for-asm-7.1, configure-asm-7.1, print-asm-7.1-location, print-asm-7.1-error,
 									  check-for-tools-jar, configure-tools-jar, print-tools-jar-location, print-tools-jar-error,
 									  check-for-windows-sysinternals, set-download-windows-sysinternals-required, configure-windows-sysinternals, print-windows-sysinternals-location, print-windows-sysinternals-error,
-									  fail-if-error">
+									  print-src-file-encoding, fail-if-error">
 	</target>
 
 	<!-- Target to check if ant 1.10.2 is available. -->
@@ -362,18 +374,6 @@ limitations under the License.
 		<available file="curl" filepath="${env.PATH}" property="curl_available"/>
 	</target>
 	
-	<condition property="isZOS" value="true">
-			<equals arg1="${os.name}" arg2="z/OS"/>
-	</condition>
-		
-	<condition property="src-encoding" value="IBM-1047" else="UTF-8">
-		<isset property="isZOS"/>
-	</condition>
-
-	<condition property="download-tool" value="curl" else="wget">
-		<isset property="isZOS"/>
-	</condition>
-	
 	<condition property="download-tool-security-options" value="-k" else="--no-check-certificate">
 		<isset property="isZOS"/>
 	</condition>
@@ -409,6 +409,10 @@ limitations under the License.
 		</sequential>
 	</macrodef>
 	
+	<target name="print-src-file-encoding">
+		<echo message="Using src-encoding: ${src-encoding}"/>
+	</target>
+	
 	<target name="print-ant-1.10.2-location" if="${ant_1.10.2_available}">
 		<echo message="Using ant-1.10.2 from ${ant_1.10.2}"/>
 	</target>
diff --git a/stf.core/build.xml b/stf.core/build.xml
index 96503d7..ee0bcba 100644
--- a/stf.core/build.xml
+++ b/stf.core/build.xml
@@ -83,7 +83,7 @@ limitations under the License.
 			   fork="true"
 			   executable="${java_compiler}"
 			   classpathref="project.class.path"
-			    encoding="${src-encoding}"
+			    encoding="ISO-8859-1"
 			   includeantruntime="false"
 			   failonerror="true">
 			<include name="**/*.java"/>
@@ -95,7 +95,7 @@ limitations under the License.
 			   fork="true"
 			   executable="${java_compiler}"
 			   classpathref="project.class.path"
-			   encoding="${src-encoding}"
+			   encoding="ISO-8859-1"
 			   includeantruntime="false"
 			   failonerror="true">
 			<include name="**/*.java"/>

From 5f64de28d368329546397fbdcf497d8c13154220 Mon Sep 17 00:00:00 2001
From: "Mesbah_Alam@ca.ibm.com" <Mesbah_Alam@ca.ibm.com>
Date: Wed, 9 Oct 2019 16:06:36 -0400
Subject: [PATCH 2/2] Use encoding ISO-8859-1 for compiling system tests

Signed-off-by: Mesbah_Alam@ca.ibm.com <Mesbah_Alam@ca.ibm.com>
---
 stf.build/include/top.xml | 10 +---------
 stf.core/build.xml        |  2 +-
 stf.load/build.xml        |  2 +-
 stf.samples/build.xml     |  2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/stf.build/include/top.xml b/stf.build/include/top.xml
index b18b1ae..ad2aa95 100644
--- a/stf.build/include/top.xml
+++ b/stf.build/include/top.xml
@@ -41,10 +41,6 @@ limitations under the License.
 	<condition property="download-tool" value="curl" else="wget">
 		<isset property="isZOS"/>
 	</condition>
-	
-	<condition property="src-encoding" value="IBM-1047" else="UTF-8">
-		<isset property="isZOS"/>
-	</condition>
 
 	<!--
 		Determine the java version being used for the build and set properties for use by build.xml files.
@@ -167,7 +163,7 @@ limitations under the License.
 									  check-for-asm-7.1, configure-asm-7.1, print-asm-7.1-location, print-asm-7.1-error,
 									  check-for-tools-jar, configure-tools-jar, print-tools-jar-location, print-tools-jar-error,
 									  check-for-windows-sysinternals, set-download-windows-sysinternals-required, configure-windows-sysinternals, print-windows-sysinternals-location, print-windows-sysinternals-error,
-									  print-src-file-encoding, fail-if-error">
+									  fail-if-error">
 	</target>
 
 	<!-- Target to check if ant 1.10.2 is available. -->
@@ -409,10 +405,6 @@ limitations under the License.
 		</sequential>
 	</macrodef>
 	
-	<target name="print-src-file-encoding">
-		<echo message="Using src-encoding: ${src-encoding}"/>
-	</target>
-	
 	<target name="print-ant-1.10.2-location" if="${ant_1.10.2_available}">
 		<echo message="Using ant-1.10.2 from ${ant_1.10.2}"/>
 	</target>
diff --git a/stf.core/build.xml b/stf.core/build.xml
index ee0bcba..f4b64d3 100644
--- a/stf.core/build.xml
+++ b/stf.core/build.xml
@@ -83,7 +83,7 @@ limitations under the License.
 			   fork="true"
 			   executable="${java_compiler}"
 			   classpathref="project.class.path"
-			    encoding="ISO-8859-1"
+			   encoding="ISO-8859-1"
 			   includeantruntime="false"
 			   failonerror="true">
 			<include name="**/*.java"/>
diff --git a/stf.load/build.xml b/stf.load/build.xml
index 9018ef8..9367e43 100644
--- a/stf.load/build.xml
+++ b/stf.load/build.xml
@@ -82,7 +82,7 @@ limitations under the License.
 			   fork="true"
 			   executable="${java_compiler}"
 			   classpathref="project.class.path"
-			   encoding="${src-encoding}"
+			   encoding="ISO-8859-1"
 			   includeantruntime="false"
 			   failonerror="true">
 			<include name="**/*.java"/>
diff --git a/stf.samples/build.xml b/stf.samples/build.xml
index 10fe513..a344867 100644
--- a/stf.samples/build.xml
+++ b/stf.samples/build.xml
@@ -84,7 +84,7 @@ limitations under the License.
 			   fork="true"
 			   executable="${java_compiler}"
 			   classpathref="project.class.path"
-			   encoding="${src-encoding}"
+			   encoding="ISO-8859-1"
 			   includeantruntime="false"
 			   failonerror="true">
 			<include name="**/*.java"/>