# HG changeset patch
# Parent b0d302f0916ebf976804c7035d40f37856f3b631
Model files generated by xjc stop a build on cp936 locale Windows.

diff --git a/nbbuild/templates/common.xml b/nbbuild/templates/common.xml
--- a/nbbuild/templates/common.xml
+++ b/nbbuild/templates/common.xml
@@ -190,38 +190,118 @@
         </autoupdate>
     </target>
 
+    <macrodef name="javac-compile">
+		<attribute name="src.dir" />
+		<attribute name="build.classes.dir" />
+		<attribute name="build.compiler.debug" />
+		<attribute name="build.compiler.debuglevel" />
+		<attribute name="build.compiler.deprecation" />
+		<attribute name="build.compiler.optimize" />
+		<attribute name="build.compiler.encoding" />
+		<attribute name="javac.compilerargs" />
+		<attribute name="javac.source" />
+		<attribute name="javac.target" />
+		<element name="before-compile" />
+		<element name="after-compile" />
+		<sequential>
+			<mkdir dir="@{build.classes.dir}"/>
+			<before-compile />
+			<depend srcdir="@{src.dir}" destdir="@{build.classes.dir}" cache="build/depcache">
+				<classpath refid="cp"/>
+			</depend>
+			<nb-javac srcdir="@{src.dir}" destdir="@{build.classes.dir}"
+				debug="@{build.compiler.debug}" debuglevel="@{build.compiler.debuglevel}"
+				encoding="@{build.compiler.encoding}"
+				deprecation="@{build.compiler.deprecation}" optimize="@{build.compiler.optimize}"
+				source="@{javac.source}" target="@{javac.target}"
+				includeantruntime="false">
+				<classpath refid="cp"/>
+				<compilerarg line="@{javac.compilerargs}"/>
+				<processorpath refid="processor.cp"/>
+			</nb-javac>
+			<after-compile />
+		</sequential>
+	</macrodef>
+
     <target name="compile" depends="init,up-to-date" unless="is.jar.uptodate">
-        <mkdir dir="${build.classes.dir}"/>
-        <depend srcdir="${src.dir}" destdir="${build.classes.dir}" cache="build/depcache">
-            <classpath refid="cp"/>
-        </depend>
-        <nb-javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="${build.compiler.debug}" debuglevel="${build.compiler.debuglevel}" encoding="UTF-8"
-                deprecation="${build.compiler.deprecation}" optimize="${build.compiler.optimize}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
-            <classpath refid="cp"/>
-            <compilerarg line="${javac.compilerargs}"/>
-            <processorpath refid="processor.cp"/>
-        </nb-javac>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${jar-excludes}"/>
-        </copy>
-    </target>
+		<javac-compile src.dir="${src.dir}"
+			build.classes.dir="${build.classes.dir}"
+			build.compiler.debug="${build.compiler.debug}"
+			build.compiler.debuglevel="${build.compiler.debuglevel}"
+			build.compiler.deprecation="${build.compiler.deprecation}"
+			build.compiler.optimize="${build.compiler.optimize}"
+			build.compiler.encoding="UTF-8"
+			javac.compilerargs="${javac.compilerargs}"
+			javac.source="${javac.source}"
+			javac.target="${javac.target}">
+			<before-compile />
+			<after-compile>
+				<copy todir="${build.classes.dir}">
+					<fileset dir="${src.dir}" excludes="${jar-excludes}"/>
+				</copy>
+			</after-compile>
+		</javac-compile>
+	</target>
+
+    <target name="compile-file-encoding" depends="init,up-to-date" unless="is.jar.uptodate">
+		<javac-compile src.dir="${src.dir}"
+			build.classes.dir="${build.classes.dir}"
+			build.compiler.debug="${build.compiler.debug}"
+			build.compiler.debuglevel="${build.compiler.debuglevel}"
+			build.compiler.deprecation="${build.compiler.deprecation}"
+			build.compiler.optimize="${build.compiler.optimize}"
+			build.compiler.encoding="${file.encoding}"
+			javac.compilerargs="${javac.compilerargs}"
+			javac.source="${javac.source}"
+			javac.target="${javac.target}">
+			<before-compile />
+			<after-compile>
+				<copy todir="${build.classes.dir}">
+					<fileset dir="${src.dir}" excludes="${jar-excludes}"/>
+				</copy>
+			</after-compile>
+		</javac-compile>
+	</target>
 
     <target name="compile-single" depends="init">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <mkdir dir="${build.classes.dir}"/>
-        <!-- XXX consider forcing debug=true and deprecation=true -->
-        <!-- XXX consider deleting the .class file first to force a rebuild -->
-        <depend srcdir="${src.dir}" destdir="${build.classes.dir}" cache="build/depcache">
-            <classpath refid="cp"/>
-        </depend>
-        <nb-javac srcdir="${src.dir}" destdir="${build.classes.dir}"
-               debug="${build.compiler.debug}" deprecation="${build.compiler.deprecation}" encoding="UTF-8"
-               source="${javac.source}" target="${javac.target}" includes="${javac.includes}" optimize="${build.compiler.optimize}" includeantruntime="false">
-            <classpath refid="cp"/>
-            <compilerarg line="${javac.compilerargs}"/>
-            <processorpath refid="processor.cp"/>
-        </nb-javac>
-    </target>
+		<javac-compile src.dir="${src.dir}"
+			build.classes.dir="${build.classes.dir}"
+			build.compiler.debug="${build.compiler.debug}"
+			build.compiler.debuglevel="${build.compiler.debuglevel}"
+			build.compiler.deprecation="${build.compiler.deprecation}"
+			build.compiler.optimize="${build.compiler.optimize}"
+			build.compiler.encoding="UTF-8"
+			javac.compilerargs="${javac.compilerargs}"
+			javac.source="${javac.source}"
+			javac.target="${javac.target}">
+			<before-compile>
+				<!-- XXX consider forcing debug=true and deprecation=true -->
+				<!-- XXX consider deleting the .class file first to force a rebuild -->
+			</before-compile>
+			<after-compile />
+		</javac-compile>
+	</target>
+
+    <target name="compile-single-file-encoding" depends="init">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+		<javac-compile src.dir="${src.dir}"
+			build.classes.dir="${build.classes.dir}"
+			build.compiler.debug="${build.compiler.debug}"
+			build.compiler.debuglevel="${build.compiler.debuglevel}"
+			build.compiler.deprecation="${build.compiler.deprecation}"
+			build.compiler.optimize="${build.compiler.optimize}"
+			build.compiler.encoding="${file.encoding}"
+			javac.compilerargs="${javac.compilerargs}"
+			javac.source="${javac.source}"
+			javac.target="${javac.target}">
+			<before-compile>
+				<!-- XXX consider forcing debug=true and deprecation=true -->
+				<!-- XXX consider deleting the .class file first to force a rebuild -->
+			</before-compile>
+			<after-compile />
+		</javac-compile>
+	</target>
 
     <target name="jar-prep" depends="init">
         <mkdir dir="${cluster}/${module.jar.dir}"/>
diff --git a/websvc.saas.api/build.xml b/websvc.saas.api/build.xml
--- a/websvc.saas.api/build.xml
+++ b/websvc.saas.api/build.xml
@@ -86,7 +86,7 @@
         </xjc>
     </target>
     
-    <target name="compile" depends="model-gen,projectized-common.compile"/>
+    <target name="compile" depends="model-gen,projectized-common.compile-file-encoding"/>
 
     <target name="clean" depends="projectized-common.clean">
         <delete dir="${saas.model.jaxb}"/>