1 files changed, 20 insertions, 3 deletions
diff --git a/Tools/Java/Source/Common/build.xml b/Tools/Java/Source/Common/build.xml
index 4fd7285f01..376948c465 100644
--- a/Tools/Java/Source/Common/build.xml
+++ b/Tools/Java/Source/Common/build.xml
@@ -16,18 +16,34 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>
   <property name="buildDir" value="build"/>
   <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>
+
+  <path id="classpath">
+    <fileset dir="${WORKSPACE}/Tools/Jars">
+      <include name="SurfaceArea.jar"/>
+    </fileset>
+    <fileset dir="${env.XMLBEANS_HOME}/lib">
+      <include name="*.jar"/>
+    </fileset>
+    <pathelement path="${env.CLASSPATH}"/>
+  </path>
+
   <target name="Common_Jar" depends="install"/>
+
   <target name="source">
     <mkdir dir="${buildDir}"/>
     <javac srcdir="." destdir="${buildDir}">
+      <classpath refid="classpath"/>
       <compilerarg value="-Xlint"/>
     </javac>
   </target>
+
   <target name="clean">
-    <delete dir="${buildDir}"/>
+    <delete includeemptydirs="true" failonerror="false">
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/Common" includes="${buildDir}"/>
+    </delete>
   </target>
-  <target name="cleanall">
-    <delete dir="${buildDir}"/>
+
+  <target name="cleanall" depends="clean">
     <delete file="${installLocation}/Common.jar"/>
     <if>
       <available file="${installLocation}/Common.jar"/>
@@ -37,6 +53,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </then>
     </if>
   </target>
+
   <target name="install" depends="source">
     <jar destfile="${installLocation}/Common.jar"
       basedir="${buildDir}"