--- a/jaxp/build.properties	Wed Nov 11 15:49:38 2009 -0500
+++ b/jaxp/build.properties	Mon Nov 23 16:24:35 2009 -0500
@@ -25,7 +25,7 @@
 
 # Base locations where bundles are located
 slashjava=/java
-devtools=${slashjava}/devtools
+drops.dir=${slashjava}/devtools/share/jdk7-drops
 
 # This is the JDK used to build and run the bootstrap version of javac.
 # The bootstrap javac is used to compile both boostrap versions of the
@@ -64,16 +64,15 @@
 dist.classes.jar=${dist.lib.dir}/classes.jar
 dist.src.zip=${dist.lib.dir}/src.zip
 
-# Where all drop sources live
-drop.dir=./drop
+# Where all drop sources get placed when downloaded and unzipped
+drop.expanded.dir=${output.dir}/drop
+
+# Location if the sources were included already
+drop.included.dir=./drop_included
 
 # 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}\
@@ -98,6 +97,7 @@
   build.dir=${build.dir}${line.separator}\
   dist.dir=${dist.dir}${line.separator}\
   drop.dir=${drop.dir}${line.separator}\
+  drops.dir=${drops.dir}${line.separator}\
 ${line.separator}
 
 #------------------------------------------------------------