--- a/.hgtags	Wed Nov 30 12:56:46 2011 -0800
+++ b/.hgtags	Mon Jan 30 21:10:42 2012 -0800
@@ -142,3 +142,12 @@
 e6eed2ff5d5f62bdc815beb5276d23347600c760 jdk8-b12
 adf2a6b5fde14090beb9ebc40c4114132ddee731 jdk8-b13
 54c4bf4b83ecc191351747d5d28da849d34c0243 jdk8-b14
+c9ab96ff23d52d85d5dcce1f9c0fd7a3de418c74 jdk8-b15
+3d45ab79643d5b4cc7e050ae2d9c08b4d89d665e jdk8-b17
+3d45ab79643d5b4cc7e050ae2d9c08b4d89d665e jdk8-b16
+54928c8850f5498670dd43d6c9299f36de1a6746 jdk8-b18
+b73b733214aa43648d69a2da51e6b48fda902a2d jdk8-b19
+2b2818e3386f4510c390f6aea90d77e1c6a5bf9e jdk8-b20
+c266cab0e3fff05f2048c23046c14d60f7102175 jdk8-b21
+8d3df89b0f2d3c603b2edb0f5e24af1245397cc6 jdk8-b22
+25ce7a0004874273f6aeda14e7c3538cba34bdf1 jdk8-b23

--- a/build-defs.xml	Wed Nov 30 12:56:46 2011 -0800
+++ b/build-defs.xml	Mon Jan 30 21:10:42 2012 -0800
@@ -96,6 +96,10 @@
         </replaceregexp>
 
         <mkdir dir="${build.classes.dir}/META-INF/services"/>
+        <copy todir="${build.classes.dir}/META-INF"
+              file="${secondary.src.dir}/META-INF/mailcap.default"/>
+        <copy todir="${build.classes.dir}/META-INF"
+              file="${secondary.src.dir}/META-INF/mimetypes.default"/>
         <copy todir="${build.classes.dir}/META-INF/services"
               file="${primary.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory"/>
         <copy todir="${build.classes.dir}/META-INF/services"
@@ -118,6 +122,7 @@
     <!-- Set up source to use drop.dir. -->
     <target name="-use-drop" depends="-set-props">
         <property name="primary.src.dir" value="${jaxws_src.src.dir}"/>
+        <property name="secondary.src.dir" value="${jaf_src.src.dir}"/>
         <path id="src.dir.id">
             <pathelement path="${primary.src.dir}"/>
             <pathelement path="${jaf_src.src.dir}"/>

--- a/build.properties	Wed Nov 30 12:56:46 2011 -0800
+++ b/build.properties	Mon Jan 30 21:10:42 2012 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 # Base locations where bundles are located
 slashjava=/java
-drops.dir=${slashjava}/devtools/share/jdk7-drops
+drops.dir=${slashjava}/devtools/share/jdk8-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

--- a/build.xml	Wed Nov 30 12:56:46 2011 -0800
+++ b/build.xml	Mon Jan 30 21:10:42 2012 -0800
@@ -43,14 +43,6 @@
       Run 'make help' for help using the Makefile.
     </description>
 
-    <!-- Mac is special, need to downgrade these before build.properties. -->
-    <condition property="javac.source" value="1.5">
-        <os family="mac"/>
-    </condition>
-    <condition property="javac.target" value="1.5">
-        <os family="mac"/>
-    </condition>
-
     <!-- Project build properties. -->
     <property file="build.properties"/>
 

--- a/make/Makefile	Wed Nov 30 12:56:46 2011 -0800
+++ b/make/Makefile	Mon Jan 30 21:10:42 2012 -0800
@@ -99,9 +99,9 @@
   DROPS_DIR = $(ALT_DROPS_DIR)
 else
   ifdef ALT_JDK_DEVTOOLS_DIR
-    DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
+    DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops
   else
-    DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
+    DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops
   endif
 endif
 

--- a/make/jprt.properties	Wed Nov 30 12:56:46 2011 -0800
+++ b/make/jprt.properties	Mon Jan 30 21:10:42 2012 -0800
@@ -25,21 +25,21 @@
 
 # Properties for jprt
 
-# The release to build
+# Locked down to jdk8
 jprt.tools.default.release=jdk8
 
 # The different build flavors we want, we override here so we just get these 2
 jprt.build.flavors=product,fastdebug
 
 # Standard list of jprt build targets for this source tree
-jprt.build.targets= 						\
-    solaris_sparc_5.10-{product|fastdebug}, 			\
-    solaris_sparcv9_5.10-{product|fastdebug}, 			\
-    solaris_i586_5.10-{product|fastdebug}, 			\
-    solaris_x64_5.10-{product|fastdebug}, 			\
-    linux_i586_2.6-{product|fastdebug}, 			\
-    linux_x64_2.6-{product|fastdebug}, 				\
-    windows_i586_5.1-{product|fastdebug}, 			\
+jprt.build.targets=                                             \
+    solaris_sparc_5.10-{product|fastdebug},                     \
+    solaris_sparcv9_5.10-{product|fastdebug},                   \
+    solaris_i586_5.10-{product|fastdebug},                      \
+    solaris_x64_5.10-{product|fastdebug},                       \
+    linux_i586_2.6-{product|fastdebug},                         \
+    linux_x64_2.6-{product|fastdebug},                          \
+    windows_i586_5.1-{product|fastdebug},                       \
     windows_x64_5.2-{product|fastdebug}
 
 # Directories to be excluded from the source bundles