--- old/./build-defs.xml	Thu Oct 22 13:49:51 2009
+++ new/./build-defs.xml	Thu Oct 22 13:49:51 2009
@@ -68,32 +68,14 @@
         </replaceregexp>
     </target>
 
-    <!-- Try to get drop sources, set property use.orig.src.dir if no drops. -->
+    <!-- Try to get drop sources. -->
     <target name="-set-props"
 	    depends="init,
                      jaxp_src-update">
-        <condition property="use.orig.src.dir">
-            <and>
-                <available file="${orig.src.dir}" type="dir"/>
-                <not>
-                    <and>
-                        <available file="${jaxp_src.src.dir}" type="dir"/>
-                    </and>
-                </not>
-            </and>
-        </condition>
     </target>
 
-    <!-- Set up source to use orig.src.dir, if use.orig.src.dir defined. -->
-    <target name="-use-orig" depends="-set-props" if="use.orig.src.dir">
-        <property name="primary.src.dir" value="${orig.src.dir}"/>
-        <path id="src.dir.id">
-            <pathelement path="${primary.src.dir}"/>
-        </path>
-    </target>
-
-    <!-- Set up source to use drop.dir, if use.orig.src.dir not defined. -->
-    <target name="-use-drop" depends="-set-props" unless="use.orig.src.dir">
+    <!-- Set up source to use drop.dir. -->
+    <target name="-use-drop" depends="-set-props">
         <property name="primary.src.dir" value="${jaxp_src.src.dir}"/>
         <path id="src.dir.id">
             <pathelement path="${primary.src.dir}"/>
@@ -102,24 +84,19 @@
 
     <!-- Source directory selection. -->
     <target name="-init-src-dirs"
-	    depends="init, -use-orig, -use-drop">
+	    depends="init, -use-drop">
         <echo message="Using primary.src.dir=${primary.src.dir}"/>
         <pathconvert property="src.list.id" refid="src.dir.id"/>
         <echo message="Using src.dir.id=${src.list.id}"/>
     </target>
 
-    <!-- Create orig src.zip. -->
-    <target name="-orig-src-zip" depends="init, -set-props" if="use.orig.src.dir">
-        <zip file="${dist.src.zip}" basedir="${primary.src.dir}"/>
-    </target>
-
     <!-- Create drop src.zip. -->
-    <target name="-drop-src-zip" depends="init, -set-props" unless="use.orig.src.dir">
+    <target name="-drop-src-zip" depends="init, -set-props">
         <zip file="${dist.src.zip}" basedir="${primary.src.dir}"/>
     </target>
 
     <!-- Create src.zip. -->
-    <target name="-dist-src-zip" depends="init, -orig-src-zip, -drop-src-zip">
+    <target name="-dist-src-zip" depends="init, -drop-src-zip">
     </target>
     
 </project>
--- old/./build-drop-template.xml	Thu Oct 22 13:49:56 2009
+++ new/./build-drop-template.xml	Thu Oct 22 13:49:56 2009
@@ -72,7 +72,6 @@
     <target name="-@DROP@-url-should-be-used" unless="@DROP@.url.should.be.used">
         <condition property="@DROP@.url.should.be.used">
             <and>
-                <http url="${@DROP@.master.bundle.url.base}"/>
                 <not>
                     <isset property="@DROP@.master.bundle.copy.exists"/>
                 </not>
@@ -106,6 +105,16 @@
         <delete dir="${@DROP@.root.dir}"/>
         <delete dir="${@DROP@.root.dir}-temp"/>
         <mkdir dir="${@DROP@.root.dir}-temp"/>
+	<checksum file="${@DROP@.bundle.copy}" 
+		  property="@DROP@.bundle.md5.checksum.is"/>
+        <condition property="@DROP@.bundle.md5.checksum.good">
+            <equals arg1="${@DROP@.bundle.md5.checksum}"
+                    arg2="${@DROP@.bundle.md5.checksum.is}"/>
+        </condition>
+        <fail unless="@DROP@.bundle.md5.checksum.good">
+              Checksum on file ${@DROP@.bundle.copy} is 
+              ${@DROP@.bundle.md5.checksum.is}, not ${@DROP@.bundle.md5.checksum}
+        </fail>
         <unzip src="${@DROP@.bundle.copy}" dest="${@DROP@.root.dir}-temp"/>
         <move file="${@DROP@.root.dir}-temp" tofile="${@DROP@.root.dir}"/>
         <touch>
--- old/./build.properties	Thu Oct 22 13:49:59 2009
+++ new/./build.properties	Thu Oct 22 13:49:59 2009
@@ -70,10 +70,6 @@
 # Where patches to drop bundle sources live
 patches.dir=patches
 
-# Original source area
-orig.dir=src
-orig.src.dir=${orig.dir}/share/classes
-
 # Sanity information
 sanity.info= Sanity Settings:${line.separator}\
   ant.home=${ant.home}${line.separator}\
--- old/./jaxp.properties	Thu Oct 22 13:50:02 2009
+++ new/./jaxp.properties	Thu Oct 22 13:50:01 2009
@@ -24,11 +24,11 @@
 #
 
 drops.master.copy.base=${devtools}/share/jdk7-drops
-drops.master.url.base=http://kenai.com/projects/jdk7-drops/downloads/download
+drops.master.url.base=https://jaxp.dev.java.net/files/documents/913/144160
 
-jaxp_src.bundle.name=jdk7-jaxp-2009_09_28.zip
+jaxp_src.bundle.name=jdk7-jaxp-m5.zip
+jaxp_src.bundle.md5.checksum=8b58ce7919cda8e32a9afc5cb4b58bb1
 jaxp_src.master.bundle.dir=${drops.master.copy.base}
-#jaxp_src.bundle.url.base=https://jaxp.dev.java.net/files/documents/913/142147
 jaxp_src.master.bundle.url.base=${drops.master.url.base}
 
 jaxp_tests.bundle.name=jdk7-jaxp-tests-2009_08_28.zip