changeset 1120:ba5645f2735b jdk9-b27

8054834: Modular Source Code Reviewed-by: alanb, chegar, ihse, mduigou Contributed-by: alan.bateman@oracle.com, alex.buckley@oracle.com, chris.hegarty@oracle.com, erik.joelsson@oracle.com, jonathan.gibbons@oracle.com, karen.kinnear@oracle.com, magnus.ihse.bursie@oracle.com, mandy.chung@oracle.com, mark.reinhold@oracle.com, paul.sandoz@oracle.com
author chegar
date Sun, 17 Aug 2014 15:51:37 +0100
parents a5c324e6f840
children b4397a1f36c5 c72d6edec4cf
files Makefile common/autoconf/basics.m4 common/autoconf/boot-jdk.m4 common/autoconf/compare.sh.in common/autoconf/flags.m4 common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4 common/autoconf/platform.m4 common/autoconf/spec.gmk.in common/bin/compare.sh common/bin/unshuffle_list.txt common/bin/unshuffle_patch.sh make/CompileJavaModules.gmk make/Install.gmk make/Javadoc.gmk make/Jprt.gmk make/Main.gmk make/MakeHelpers.gmk make/common/JavaCompilation.gmk make/common/MakeBase.gmk make/common/NativeCompilation.gmk make/common/SetupJava.gmk make/common/modules.list make/common/support/ListPathsSafely-pre-compress.incl make/common/support/ListPathsSafely-uncompress.sed make/jprt.properties modules.xml test/make/TestJavaCompilation.gmk test/make/TestMake.gmk test/make/TestMakeBase.gmk
diffstat 30 files changed, 5739 insertions(+), 480 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Aug 10 19:38:50 2014 -0700
+++ b/Makefile	Sun Aug 17 15:51:37 2014 +0100
@@ -58,29 +58,70 @@
 ifeq ($(SPEC),)
   # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
 else
-  ifeq ($(words $(SPEC)),1)
-    # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
-    include $(root_dir)/make/Main.gmk
-  else
-    # We are building multiple configurations.
-    # First, find out the valid targets
-    # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
-    # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
-    all_phony_targets=$(filter-out $(global_targets), $(strip $(shell \
-        cd $(root_dir) && $(MAKE) -p -q FRC SPEC=$(firstword $(SPEC)) | \
-        grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
+  # In Cygwin, the MAKE variable gets messed up if the make executable is called with
+  # a Windows mixed path (c:/cygwin/bin/make.exe). If that's the case, fix it by removing
+  # the prepended root_dir.
+  ifneq ($(findstring :, $(MAKE)), )
+    MAKE := $(patsubst $(root_dir)%, %, $(MAKE))
+  endif
 
-    $(all_phony_targets):
-	@$(foreach spec,$(SPEC),(cd $(root_dir) && $(MAKE) SPEC=$(spec) \
-	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
+  # We are potentially building multiple configurations.
+  # First, find out the valid targets
+  # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
+  # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
+  all_phony_targets := $(sort $(filter-out $(global_targets), $(strip $(shell \
+      cd $(root_dir)/make && $(MAKE) -f Main.gmk -p -q FRC SPEC=$(firstword $(SPEC)) | \
+      grep "^.PHONY:" | head -n 1 | cut -d " " -f 2-))))
 
-    .PHONY: $(all_phony_targets)
+  # Loop through the configurations and call the main-wrapper for each one. The wrapper
+  # target will execute with a single configuration loaded.
+  $(all_phony_targets):
+	@$(if $(TARGET_RUN),,\
+          $(foreach spec,$(SPEC),\
+            (cd $(root_dir) && $(MAKE) SPEC=$(spec) MAIN_TARGETS="$(call GetRealTarget)" \
+	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) main-wrapper) &&) true)
+	@echo > /dev/null
+	$(eval TARGET_RUN=true)
 
-  endif
+  .PHONY: $(all_phony_targets)
+
+  ifneq ($(MAIN_TARGETS), )
+    # The wrapper target was called so we now have a single configuration. Load the spec file
+    # and call the real Main.gmk.
+    include $(SPEC)
+
+    ### Clean up from previous run
+    # Remove any build.log from a previous run, if they exist
+    ifneq (,$(BUILD_LOG))
+      ifneq (,$(BUILD_LOG_PREVIOUS))
+        # Rotate old log
+        $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
+        $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
+      else
+        $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
+      endif
+      $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null)
+    endif
+    # Remove any javac server logs and port files. This
+    # prevents a new make run to reuse the previous servers.
+    ifneq (,$(SJAVAC_SERVER_DIR))
+      $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
+    endif
+
+    main-wrapper:
+	@$(if $(findstring clean, $(MAIN_TARGETS)), , $(call AtMakeStart))
+	(cd $(root_dir)/make && $(BUILD_LOG_WRAPPER) $(MAKE) -f Main.gmk SPEC=$(SPEC) -j $(JOBS) \
+	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $(MAIN_TARGETS) \
+	    $(if $(filter true, $(OUTPUT_SYNC_SUPPORTED)), -O$(OUTPUT_SYNC)))
+	@$(if $(findstring clean, $(MAIN_TARGETS)), , $(call AtMakeEnd))
+
+     .PHONY: main-wrapper
+
+   endif
 endif
 
 # Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
-# If you addd more global targets, please update the variable global_targets in MakeHelpers.
+# If you add more global targets, please update the variable global_targets in MakeHelpers.
 
 help:
 	$(info )
@@ -88,12 +129,12 @@
 	$(info =====================)
 	$(info )
 	$(info Common make targets)
-	$(info .  make [default]         # Compile all product in langtools, hotspot, jaxp, jaxws,)
-	$(info .                         # corba and jdk)
-	$(info .  make all               # Compile everything, all repos and images)
+	$(info .  make [default]         # Compile all modules in langtools, hotspot, jaxp, jaxws,)
+	$(info .                         # corba and jdk and create a runnable "exploded" image)
+	$(info .  make all               # Compile everything, all repos, docs and images)
 	$(info .  make images            # Create complete j2sdk and j2re images)
-	$(info .  make docs              # Create javadocs)
-	$(info .  make overlay-images    # Create limited images for sparc 64 bit platforms)
+	$(info .  make docs              # Create all docs)
+	$(info .  make docs-javadoc      # Create just javadocs, depends on less than full docs)
 	$(info .  make profiles          # Create complete j2re compact profile images)
 	$(info .  make bootcycle-images  # Build images twice, second time with newly build JDK)
 	$(info .  make install           # Install the generated images locally)
@@ -103,12 +144,18 @@
 	$(info .  make help              # Give some help on using make)
 	$(info .  make test              # Run tests, default is all tests (see TEST below))
 	$(info )
-	$(info Targets for specific components)
-	$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test))
-	$(info .  make <component>       # Build <component> and everything it depends on. )
-	$(info .  make <component>-only  # Build <component> only, without dependencies. This)
+	$(info Targets for specific modules)
+	$(info .  make <module>          # Build <module> and everything it depends on. )
+	$(info .  make <module>-only     # Build <module> only, without dependencies. This)
 	$(info .                         # is faster but can result in incorrect build results!)
-	$(info .  make clean-<component> # Remove files generated by make for <component>)
+	$(info .  make <module>-java     # Compile java classes for <module> and everything it)
+	$(info .                         # depends on)
+	$(info .  make <module>-libs     # Build native libraries for <module> and everything it)
+	$(info .                         # depends on)
+	$(info .  make <module>-launchers# Build native executables for <module> and everything it)
+	$(info .                         # depends on)
+	$(info .  make <module>-gensrc   # Execute the gensrc step for <module> and everything it)
+	$(info .                         # depends on)
 	$(info )
 	$(info Useful make variables)
 	$(info .  make CONF=             # Build all configurations (note, assignment is empty))
--- a/common/autoconf/basics.m4	Sun Aug 10 19:38:50 2014 -0700
+++ b/common/autoconf/basics.m4	Sun Aug 17 15:51:37 2014 +0100
@@ -759,6 +759,32 @@
   fi
 ])
 
+AC_DEFUN([BASIC_CHECK_MAKE_OUTPUT_SYNC],
+[
+  # Check if make supports the output sync option and if so, setup using it.
+  AC_MSG_CHECKING([if make --output-sync is supported])
+  if $MAKE --version -O > /dev/null 2>&1; then
+    OUTPUT_SYNC_SUPPORTED=true
+    AC_MSG_RESULT([yes])
+    AC_MSG_CHECKING([for output-sync value])
+    AC_ARG_WITH([output-sync], [AS_HELP_STRING([--with-output-sync],
+      [set make output sync type if supported by make. @<:@recurse@:>@])],
+      [OUTPUT_SYNC=$with_output_sync])
+    if test "x$OUTPUT_SYNC" = "x"; then
+      OUTPUT_SYNC=none
+    fi
+    AC_MSG_RESULT([$OUTPUT_SYNC])
+    if ! $MAKE --version -O$OUTPUT_SYNC > /dev/null 2>&1; then
+      AC_MSG_ERROR([Make did not the support the value $OUTPUT_SYNC as output sync type.])
+    fi
+  else
+    OUTPUT_SYNC_SUPPORTED=false
+    AC_MSG_RESULT([no])
+  fi
+  AC_SUBST(OUTPUT_SYNC_SUPPORTED)
+  AC_SUBST(OUTPUT_SYNC)
+])
+
 # Goes looking for a usable version of GNU make.
 AC_DEFUN([BASIC_CHECK_GNU_MAKE],
 [
@@ -805,6 +831,8 @@
   MAKE=$FOUND_MAKE
   AC_SUBST(MAKE)
   AC_MSG_NOTICE([Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)])
+
+  BASIC_CHECK_MAKE_OUTPUT_SYNC
 ])
 
 AC_DEFUN([BASIC_CHECK_FIND_DELETE],
--- a/common/autoconf/boot-jdk.m4	Sun Aug 10 19:38:50 2014 -0700
+++ b/common/autoconf/boot-jdk.m4	Sun Aug 17 15:51:37 2014 +0100
@@ -401,4 +401,10 @@
 
   JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small
   AC_SUBST(JAVA_FLAGS_SMALL)
+
+  JAVA_TOOL_FLAGS_SMALL=""
+  for f in $JAVA_FLAGS_SMALL; do
+    JAVA_TOOL_FLAGS_SMALL="$JAVA_TOOL_FLAGS_SMALL -J$f"
+  done
+  AC_SUBST(JAVA_TOOL_FLAGS_SMALL)
 ])
--- a/common/autoconf/compare.sh.in	Sun Aug 10 19:38:50 2014 -0700
+++ b/common/autoconf/compare.sh.in	Sun Aug 17 15:51:37 2014 +0100
@@ -45,7 +45,7 @@
 FILE="@FILE@"
 FIND="@FIND@"
 GREP="@GREP@"
-JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap"
+JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
 LDD="@LDD@"
 MKDIR="@MKDIR@"
 NAWK="@NAWK@"
--- a/common/autoconf/flags.m4	Sun Aug 10 19:38:50 2014 -0700
+++ b/common/autoconf/flags.m4	Sun Aug 17 15:51:37 2014 +0100
@@ -668,12 +668,9 @@
 
   # Setup some hard coded includes
   COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
-      -I${JDK_OUTPUTDIR}/include \
-      -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
-      -I${JDK_TOPDIR}/src/share/javavm/export \
-      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \
-      -I${JDK_TOPDIR}/src/share/native/common \
-      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
+      -I${JDK_TOPDIR}/src/java.base/share/native/include \
+      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \
+      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_API_DIR/native/include"
 
   # The shared libraries are compiled using the picflag.
   CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
--- a/common/autoconf/generated-configure.sh	Sun Aug 10 19:38:50 2014 -0700
+++ b/common/autoconf/generated-configure.sh	Sun Aug 17 15:51:37 2014 +0100
@@ -805,6 +805,7 @@
 JAXP_TOPDIR
 CORBA_TOPDIR
 LANGTOOLS_TOPDIR
+JAVA_TOOL_FLAGS_SMALL
 JAVA_FLAGS_SMALL
 JAVA_FLAGS_BIG
 JAVA_FLAGS
@@ -865,6 +866,8 @@
 ZIP
 UNZIP
 FIND_DELETE
+OUTPUT_SYNC
+OUTPUT_SYNC_SUPPORTED
 MAKE
 CHECK_TOOLSDIR_MAKE
 CHECK_TOOLSDIR_GMAKE
@@ -1044,6 +1047,7 @@
 with_extra_path
 with_sdk_name
 with_conf_name
+with_output_sync
 with_builddeps_conf
 with_builddeps_server
 with_builddeps_dir
@@ -1881,6 +1885,8 @@
   --with-sdk-name         use the platform SDK of the given name. [macosx]
   --with-conf-name        use this as the name of the configuration [generated
                           from important configuration options]
+  --with-output-sync      set make output sync type if supported by make.
+                          [recurse]
   --with-builddeps-conf   use this configuration file for the builddeps
   --with-builddeps-server download and use build dependencies from this server
                           url
@@ -3487,6 +3493,8 @@
 # $2: the description on how we found this
 
 
+
+
 # Goes looking for a usable version of GNU make.
 
 
@@ -4311,7 +4319,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1405336663
+DATE_WHEN_GENERATED=1407143049
 
 ###############################################################################
 #
@@ -13924,7 +13932,7 @@
 
   # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
   if test "x$OPENJDK_TARGET_OS_API" = xposix; then
-    OPENJDK_TARGET_OS_API_DIR="solaris"
+    OPENJDK_TARGET_OS_API_DIR="unix"
   fi
   if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
     OPENJDK_TARGET_OS_API_DIR="windows"
@@ -17147,6 +17155,39 @@
 $as_echo "$as_me: Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)" >&6;}
 
 
+  # Check if make supports the output sync option and if so, setup using it.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if make --output-sync is supported" >&5
+$as_echo_n "checking if make --output-sync is supported... " >&6; }
+  if $MAKE --version -O > /dev/null 2>&1; then
+    OUTPUT_SYNC_SUPPORTED=true
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for output-sync value" >&5
+$as_echo_n "checking for output-sync value... " >&6; }
+
+# Check whether --with-output-sync was given.
+if test "${with_output_sync+set}" = set; then :
+  withval=$with_output_sync; OUTPUT_SYNC=$with_output_sync
+fi
+
+    if test "x$OUTPUT_SYNC" = "x"; then
+      OUTPUT_SYNC=none
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OUTPUT_SYNC" >&5
+$as_echo "$OUTPUT_SYNC" >&6; }
+    if ! $MAKE --version -O$OUTPUT_SYNC > /dev/null 2>&1; then
+      as_fn_error $? "Make did not the support the value $OUTPUT_SYNC as output sync type." "$LINENO" 5
+    fi
+  else
+    OUTPUT_SYNC_SUPPORTED=false
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  fi
+
+
+
+
+
 
   # Test if find supports -delete
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if find supports -delete" >&5
@@ -19866,8 +19907,6 @@
 
   if test "x$with_cacerts_file" != x; then
     CACERTS_FILE=$with_cacerts_file
-  else
-    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
   fi
 
 
@@ -26378,6 +26417,12 @@
   JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small
 
 
+  JAVA_TOOL_FLAGS_SMALL=""
+  for f in $JAVA_FLAGS_SMALL; do
+    JAVA_TOOL_FLAGS_SMALL="$JAVA_TOOL_FLAGS_SMALL -J$f"
+  done
+
+
 
 ###############################################################################
 #
@@ -42285,12 +42330,9 @@
 
   # Setup some hard coded includes
   COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
-      -I${JDK_OUTPUTDIR}/include \
-      -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
-      -I${JDK_TOPDIR}/src/share/javavm/export \
-      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \
-      -I${JDK_TOPDIR}/src/share/native/common \
-      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
+      -I${JDK_TOPDIR}/src/java.base/share/native/include \
+      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \
+      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_API_DIR/native/include"
 
   # The shared libraries are compiled using the picflag.
   CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
@@ -49120,7 +49162,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5
 $as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; }
 
-    if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
+    if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then
       ENABLE_INTREE_EC=yes
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
--- a/common/autoconf/jdk-options.m4	Sun Aug 10 19:38:50 2014 -0700
+++ b/common/autoconf/jdk-options.m4	Sun Aug 17 15:51:37 2014 +0100
@@ -414,8 +414,6 @@
       [specify alternative cacerts file])])
   if test "x$with_cacerts_file" != x; then
     CACERTS_FILE=$with_cacerts_file
-  else
-    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
   fi
   AC_SUBST(CACERTS_FILE)
 
@@ -441,7 +439,7 @@
   [
     AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
 
-    if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
+    if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then
       ENABLE_INTREE_EC=yes
       AC_MSG_RESULT([yes])
     else
--- a/common/autoconf/platform.m4	Sun Aug 10 19:38:50 2014 -0700
+++ b/common/autoconf/platform.m4	Sun Aug 17 15:51:37 2014 +0100
@@ -331,7 +331,7 @@
 
   # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
   if test "x$OPENJDK_TARGET_OS_API" = xposix; then
-    OPENJDK_TARGET_OS_API_DIR="solaris"
+    OPENJDK_TARGET_OS_API_DIR="unix"
   fi
   if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
     OPENJDK_TARGET_OS_API_DIR="windows"
--- a/common/autoconf/spec.gmk.in	Sun Aug 10 19:38:50 2014 -0700
+++ b/common/autoconf/spec.gmk.in	Sun Aug 17 15:51:37 2014 +0100
@@ -74,6 +74,9 @@
   MAKE:=$(MAKE) -I @TOPDIR@/make/common
 endif
 
+OUTPUT_SYNC_SUPPORTED:=@OUTPUT_SYNC_SUPPORTED@
+OUTPUT_SYNC:=@OUTPUT_SYNC@
+
 # The "human readable" name of this configuration
 CONF_NAME:=@CONF_NAME@
 
@@ -240,6 +243,7 @@
 JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
 NASHORN_OUTPUTDIR=$(BUILD_OUTPUT)/nashorn
 IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
+TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/testmake
 
 LANGTOOLS_DIST=$(LANGTOOLS_OUTPUTDIR)/dist
 CORBA_DIST=$(CORBA_OUTPUTDIR)/dist
@@ -446,6 +450,7 @@
 JAVA_FLAGS:=@JAVA_FLAGS@
 JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@
 JAVA_FLAGS_SMALL:=@JAVA_FLAGS_SMALL@
+JAVA_TOOL_FLAGS_SMALL:=@JAVA_TOOL_FLAGS_SMALL@
 
 JAVA=@FIXPATH@ @JAVA@ $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
 JAVA_SMALL=@FIXPATH@ @JAVA@ $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
@@ -459,7 +464,7 @@
 
 JAR:=@FIXPATH@ @JAR@
 
-NATIVE2ASCII:=@FIXPATH@ @NATIVE2ASCII@ $(addprefix -J, $(JAVA_FLAGS_SMALL))
+NATIVE2ASCII:=@FIXPATH@ @NATIVE2ASCII@ $(JAVA_TOOL_FLAGS_SMALL)
 
 JARSIGNER:=@FIXPATH@ @JARSIGNER@
 
--- a/common/bin/compare.sh	Sun Aug 10 19:38:50 2014 -0700
+++ b/common/bin/compare.sh	Sun Aug 17 15:51:37 2014 +0100
@@ -93,14 +93,16 @@
     fi
     # Ignore date strings in class files.
     # On Macosx the system sources for generated java classes produce different output on 
-    # consequtive invokations seemingly randomly.
+    # consequtive invocations seemingly randomly.
     # For example a method parameter randomly named "thePoint" or "aPoint". Ignore this.
+    # Anonymous lambda classes get randomly assigned counters in their names.
     if test "x$SUFFIX" = "xclass"; then
         # To improve performance when large diffs are found, do a rough filtering of classes
         # elibeble for these exceptions
         if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' \
 	        -e '[0-9]\{2\}/[0-9]\{2\}/[0-9]\{4\}' \
-	        -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then
+	        -e thePoint -e aPoint -e setItemsPtr \
+                -e 'lambda\$[a-zA-Z0-9]*\$[0-9]' ${THIS_FILE} > /dev/null; then
             $JAVAP -c -constants -l -p ${OTHER_FILE} >  ${OTHER_FILE}.javap
             $JAVAP -c -constants -l -p ${THIS_FILE} > ${THIS_FILE}.javap
             TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \
@@ -109,7 +111,8 @@
 		     -e '/[0-9]\{2\}\/[0-9]\{2\}\/[0-9]\{4\}/d' \
  	             -e '/[<>].*Point   Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \
 	             -e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \
-	             -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d')
+	             -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d' \
+                     -e '/[<>].*lambda\$[a-zA-Z0-9]*\$[0-9]*/d')
         fi
     fi
     if test "x$SUFFIX" = "xproperties"; then
@@ -122,7 +125,16 @@
 #            -e :a -e '/\\$/N; s/\\\n//; ta' \
 #  	    -e 's/^[ \t]*//;s/[ \t]*$//' \
 #	    -e 's/\\=/=/' | LC_ALL=C $SORT > $OTHER_FILE.cleaned
-        TMP=$(LC_ALL=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
+        # Filter out date string differences.
+        TMP=$(LC_ALL=C $DIFF $OTHER_FILE.cleaned $THIS_FILE | \
+            $GREP '^[<>]' | \
+            $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d')
+    fi
+    if test "x$SUFFIX" = "xMF"; then
+        # Filter out date string differences.
+        TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \
+            $GREP '^[<>]' | \
+            $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d')
     fi
     if test -n "$TMP"; then
         echo Files $OTHER_FILE and $THIS_FILE differ
@@ -145,7 +157,7 @@
     (cd $OTHER_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_other)
     (cd $THIS_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_this)
 
-    $DIFF $WORK_DIR/dirs_other $WORK_DIR/dirs_other > $WORK_DIR/dirs_diff
+    $DIFF $WORK_DIR/dirs_other $WORK_DIR/dirs_this > $WORK_DIR/dirs_diff
     
     echo -n Directory structure...
     if [ -s $WORK_DIR/dirs_diff ]; then
@@ -251,8 +263,8 @@
     do
         if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi
         if [ ! -f ${THIS_DIR}/$f ]; then continue; fi
-        OF=`cd ${OTHER_DIR} && $FILE -h $f`
-        TF=`cd ${THIS_DIR} && $FILE -h $f`
+        OF=`cd ${OTHER_DIR} && $FILE -h $f | $SED 's/BuildID[^,]*//g'`
+        TF=`cd ${THIS_DIR} && $FILE -h $f | $SED 's/BuildID[^,]*//g'`
         if [ "$f" = "./src.zip" ] || [[ "$f" = *"/Home/src.zip" ]] || [[ "$f" = *"/lib/JObjC.jar" ]]
         then
 	    if [ "`echo $OF | $GREP -ic zip`" -gt 0 -a "`echo $TF | $GREP -ic zip`" -gt 0 ]
@@ -317,12 +329,14 @@
                                           -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \
                                           -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \
                                           -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \
+                                          -e 's/^\(.*\)\( o'"'"'clock \)\([A-Z][A-Z][A-Z]\)/(removed)\2(removed)/' \
                     > $OTHER_FILE
                 $CAT $THIS_DIR/$f  | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \
                                           -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \
                                           -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \
                                           -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \
                                           -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \
+                                          -e 's/^\(.*\)\( o'"'"'clock \)\([A-Z][A-Z][A-Z]\)/(removed)\2(removed)/' \
                     > $THIS_FILE
             else
                 OTHER_FILE=$OTHER_DIR/$f
@@ -510,7 +524,8 @@
     WORK_DIR=$3
 
     # TODO filter?
-    ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" -o -name "*.war" | $SORT | $FILTER)
+    ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" -o -name "*.war" \
+        | $SORT | $FILTER)
 
     if [ -n "$ZIPS" ]; then
         echo Jar files...
@@ -538,9 +553,14 @@
     OTHER_DIR=$2
     WORK_DIR=$3
     BIN_FILE=$4
+    OTHER_BIN_FILE=$5
 
     THIS_FILE=$THIS_DIR/$BIN_FILE
-    OTHER_FILE=$OTHER_DIR/$BIN_FILE
+    if [ -n "$OTHER_BIN_FILE" ]; then
+        OTHER_FILE=$OTHER_DIR/$OTHER_BIN_FILE
+    else
+        OTHER_FILE=$OTHER_DIR/$BIN_FILE
+    fi
     NAME=$(basename $BIN_FILE)
     WORK_FILE_BASE=$WORK_DIR/$BIN_FILE
     FILE_WORK_DIR=$(dirname $WORK_FILE_BASE)
@@ -970,6 +990,8 @@
     echo "bash ./common/bin/compareimages.sh CodePointIM.jar"
     echo ""
     echo "-2zips <file1> <file2> Compare two zip files only"
+    echo "-2bins <file1> <file2> Compare two binary files only"
+    echo "-2dirs <dir1> <dir2> Compare two directories as if they were images"
     echo ""
     exit 10
 fi
@@ -1032,6 +1054,15 @@
         -execs)
             CMP_EXECS=true
             ;;
+        -2dirs)
+            THIS="$(cd "$2" && pwd )"
+            OTHER="$(cd "$3" && pwd )"
+            THIS_BASE_DIR="$THIS"
+            OTHER_BASE_DIR="$OTHER"
+            SKIP_DEFAULT=true
+            shift
+            shift
+            ;;
         -2zips)
             CMP_2_ZIPS=true
             THIS_FILE=$2
@@ -1039,6 +1070,13 @@
             shift
             shift
             ;;
+        -2bins)
+            CMP_2_BINS=true
+            THIS_FILE=$2
+            OTHER_FILE=$3
+            shift
+            shift
+            ;;
         *)
             CMP_NAMES=false
             CMP_PERMS=false
@@ -1069,6 +1107,18 @@
     exit
 fi
 
+if [ "$CMP_2_BINS" = "true" ]; then
+    THIS_DIR="$(dirname $THIS_FILE)"
+    THIS_DIR="$(cd "$THIS_DIR" && pwd )"
+    OTHER_DIR="$(dirname $OTHER_FILE)"
+    OTHER_DIR="$(cd "$OTHER_DIR" && pwd )"
+    THIS_FILE_NAME="$(basename $THIS_FILE)"
+    OTHER_FILE_NAME="$(basename $OTHER_FILE)"
+    echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME
+    compare_bin_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2bins $THIS_FILE_NAME $OTHER_FILE_NAME
+    exit
+fi
+
 if [ "$CMP_NAMES" = "false" ] && [ "$CMP_TYPES" = "false" ] && [ "$CMP_PERMS" = "false" ] && [ "$CMP_GENERAL" = "false" ] && [ "$CMP_ZIPS" = "false" ] && [ "$CMP_JARS" = "false" ] && [ "$CMP_LIBS" = "false" ] && [ "$CMP_EXECS" = "false" ]; then
     CMP_NAMES=true
     CMP_PERMS=true
@@ -1084,151 +1134,154 @@
     FILTER="$CAT"
 fi
 
-if [ -z "$OTHER" ]; then
-    OTHER="$THIS/../$LEGACY_BUILD_DIR"
-    if [ -d "$OTHER" ]; then
+if [ "$SKIP_DEFAULT" != "true" ]; then
+    if [ -z "$OTHER" ]; then
+        OTHER="$THIS/../$LEGACY_BUILD_DIR"
+        if [ -d "$OTHER" ]; then
+            OTHER="$( cd "$OTHER" && pwd )"
+        else
+            echo "Default old build directory does not exist:"
+            echo "$OTHER"
+            exit 1
+        fi
+        echo "Comparing to default old build:"
+        echo "$OTHER"
+        echo
+    else
+        if [ ! -d "$OTHER" ]; then
+            echo "Other build directory does not exist:"
+            echo "$OTHER"
+            exit 1
+        fi
         OTHER="$( cd "$OTHER" && pwd )"
-    else
-        echo "Default old build directory does not exist:"
+        echo "Comparing to:"
         echo "$OTHER"
+        echo
+    fi
+
+
+    # Figure out the layout of the this build. Which kinds of images have been produced
+    if [ -d "$THIS/install/j2sdk-image" ]; then
+        THIS_J2SDK="$THIS/install/j2sdk-image"
+        THIS_J2RE="$THIS/install/j2re-image"
+        echo "Selecting install images in this build"
+    elif [ -d "$THIS/deploy/j2sdk-image" ]; then
+        THIS_J2SDK="$THIS/deploy/j2sdk-image"
+        THIS_J2RE="$THIS/deploy/j2re-image"
+        echo "Selecting deploy images in this build"
+    elif [ -d "$THIS/images/j2sdk-image" ]; then
+        THIS_J2SDK="$THIS/images/j2sdk-image"
+        THIS_J2RE="$THIS/images/j2re-image"
+        echo "Selecting jdk images in this build"
+    fi
+
+    if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
+        if [ -d "$THIS/install/j2sdk-image" ]; then
+            # If there is an install image, prefer that, it's also overlay
+            THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image"
+            THIS_J2RE_OVERLAY="$THIS/install/j2re-image"
+            echo "Selecting install overlay images in this build"
+        else
+            THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
+            THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
+            echo "Selecting jdk overlay images in this build"
+        fi
+    fi
+
+    if [ -d "$THIS/images/j2sdk-bundle" ]; then
+        THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle"
+        THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle"
+        echo "Selecting bundles in this build"
+    fi
+
+    # Figure out the layout of the other build (old or new, normal or overlay image)
+    if [ -d "$OTHER/j2sdk-image" ]; then
+        if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then
+            OTHER_J2SDK="$OTHER/j2sdk-image"
+            OTHER_J2RE="$OTHER/j2re-image"
+            echo "Selecting old-style images in other build"
+        else
+            OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
+            OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
+            echo "Selecting overlay images in other build"
+        fi
+    elif [ -d "$OTHER/install/j2sdk-image" ]; then
+        OTHER_J2SDK="$OTHER/install/j2sdk-image"
+        OTHER_J2RE="$OTHER/install/j2re-image"
+        echo "Selecting install images in other build"
+    elif [ -d "$OTHER/deploy/j2sdk-image" ]; then
+        OTHER_J2SDK="$OTHER/deploy/j2sdk-image"
+        OTHER_J2RE="$OTHER/deploy/j2re-image"
+        echo "Selecting deploy images in other build"
+    elif [ -d "$OTHER/images/j2sdk-image" ]; then
+        OTHER_J2SDK="$OTHER/images/j2sdk-image"
+        OTHER_J2RE="$OTHER/images/j2re-image"
+        echo "Selecting jdk images in other build"
+    fi
+
+    if [ -d "$OTHER/j2sdk-bundle" ]; then
+        OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle"
+        OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle"
+        echo "Selecting bundles in other build"
+    elif [ -d "$OTHER/images/j2sdk-bundle" ]; then
+        OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle"
+        OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle"
+        echo "Selecting jdk bundles in other build"
+    fi
+    
+    if [ -z "$THIS_J2SDK" ] || [ -z "$THIS_J2RE" ]; then
+        if [ -z "$THIS_J2SDK_OVERLAY" ]; then
+            echo "Cannot locate images for this build. Are you sure you have run 'make images'?"
+            exit 1
+        fi
+    fi
+
+    if [ -z "$OTHER_J2SDK" ] && [ -n "$OTHER_J2SDK_OVERLAY" ] && [ -z "$THIS_J2SDK_OVERLAY" ]; then
+        echo "OTHER build only has an overlay image while this build does not. Nothing to compare!"
         exit 1
     fi
-    echo "Comparing to default old build:"
-    echo "$OTHER"
-    echo
-else
-    if [ ! -d "$OTHER" ]; then
-        echo "Other build directory does not exist:"
-        echo "$OTHER"
-        exit 1
+
+    if [ -z "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
+        echo "WARNING! OTHER build has bundles built while this build does not."
+        echo "Skipping bundle compare!"
     fi
-    OTHER="$( cd "$OTHER" && pwd )"
-    echo "Comparing to:"
-    echo "$OTHER"
-    echo
-fi
 
+    if [ -d "$OTHER/images" ]; then
+        OTHER_SEC_DIR="$OTHER/images"
+    else
+        OTHER_SEC_DIR="$OTHER/tmp"
+    fi
+    OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip"
+    THIS_SEC_DIR="$THIS/images"
+    THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip"
+    if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
+        if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
+            JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip"
+        else
+            JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip"
+        fi
+        OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip"
+        OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN"
+        THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip"
+        THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN"
+    fi
 
-# Figure out the layout of the this build. Which kinds of images have been produced
-if [ -d "$THIS/install/j2sdk-image" ]; then
-    THIS_J2SDK="$THIS/install/j2sdk-image"
-    THIS_J2RE="$THIS/install/j2re-image"
-    echo "Selecting install images in this build"
-elif [ -d "$THIS/deploy/j2sdk-image" ]; then
-    THIS_J2SDK="$THIS/deploy/j2sdk-image"
-    THIS_J2RE="$THIS/deploy/j2re-image"
-    echo "Selecting deploy images in this build"
-elif [ -d "$THIS/images/j2sdk-image" ]; then
-    THIS_J2SDK="$THIS/images/j2sdk-image"
-    THIS_J2RE="$THIS/images/j2re-image"
-    echo "Selecting jdk images in this build"
-fi
+    if [ -d "$THIS/docs" ]; then
+        THIS_DOCS="$THIS/docs"
+    fi
 
-if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
-    if [ -d "$THIS/install/j2sdk-image" ]; then
-        # If there is an install image, prefer that, it's also overlay
-        THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image"
-        THIS_J2RE_OVERLAY="$THIS/install/j2re-image"
-        echo "Selecting install overlay images in this build"
-    else
-        THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
-        THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
-        echo "Selecting jdk overlay images in this build"
+    if [ -d "$OTHER/docs" ]; then
+        OTHER_DOCS="$OTHER/docs"
     fi
-fi
 
-if [ -d "$THIS/images/j2sdk-bundle" ]; then
-    THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle"
-    THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle"
-    echo "Selecting bundles in this build"
-fi
+    if [ -z "$THIS_DOCS" ]; then
+        echo "WARNING! Docs haven't been built and won't be compared."
+    fi
 
-# Figure out the layout of the other build (old or new, normal or overlay image)
-if [ -d "$OTHER/j2sdk-image" ]; then
-    if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then
-        OTHER_J2SDK="$OTHER/j2sdk-image"
-        OTHER_J2RE="$OTHER/j2re-image"
-        echo "Selecting old-style images in other build"
-    else
-        OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
-        OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
-        echo "Selecting overlay images in other build"
+    if [ -z "$OTHER_DOCS" ]; then
+        echo "WARNING! Other build doesn't contain docs, skipping doc compare."
     fi
-elif [ -d "$OTHER/install/j2sdk-image" ]; then
-    OTHER_J2SDK="$OTHER/install/j2sdk-image"
-    OTHER_J2RE="$OTHER/install/j2re-image"
-    echo "Selecting install images in other build"
-elif [ -d "$OTHER/deploy/j2sdk-image" ]; then
-    OTHER_J2SDK="$OTHER/deploy/j2sdk-image"
-    OTHER_J2RE="$OTHER/deploy/j2re-image"
-    echo "Selecting deploy images in other build"
-elif [ -d "$OTHER/images/j2sdk-image" ]; then
-    OTHER_J2SDK="$OTHER/images/j2sdk-image"
-    OTHER_J2RE="$OTHER/images/j2re-image"
-    echo "Selecting jdk images in other build"
-fi
 
-if [ -d "$OTHER/j2sdk-bundle" ]; then
-    OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle"
-    OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle"
-    echo "Selecting bundles in other build"
-elif [ -d "$OTHER/images/j2sdk-bundle" ]; then
-    OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle"
-    OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle"
-    echo "Selecting jdk bundles in other build"
-fi
-
-if [ -z "$THIS_J2SDK" ] || [ -z "$THIS_J2RE" ]; then
-    if [ -z "$THIS_J2SDK_OVERLAY" ]; then
-        echo "Cannot locate images for this build. Are you sure you have run 'make images'?"
-        exit 1
-    fi
-fi
-
-if [ -z "$OTHER_J2SDK" ] && [ -n "$OTHER_J2SDK_OVERLAY" ] && [ -z "$THIS_J2SDK_OVERLAY" ]; then
-    echo "OTHER build only has an overlay image while this build does not. Nothing to compare!"
-    exit 1
-fi
-
-if [ -z "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
-    echo "WARNING! OTHER build has bundles built while this build does not."
-    echo "Skipping bundle compare!"
-fi
-
-if [ -d "$THIS/docs" ]; then
-    THIS_DOCS="$THIS/docs"
-fi
-
-if [ -d "$OTHER/docs" ]; then
-    OTHER_DOCS="$OTHER/docs"
-fi
-
-if [ -z "$THIS_DOCS" ]; then
-    echo "WARNING! Docs haven't been built and won't be compared."
-fi
-
-if [ -z "$OTHER_DOCS" ]; then
-    echo "WARNING! Other build doesn't contain docs, skipping doc compare."
-fi
-
-if [ -d "$OTHER/images" ]; then
-    OTHER_SEC_DIR="$OTHER/images"
-else
-    OTHER_SEC_DIR="$OTHER/tmp"
-fi
-OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip"
-THIS_SEC_DIR="$THIS/images"
-THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip"
-if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-    if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
-        JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip"
-    else
-        JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip"
-    fi
-    OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip"
-    OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN"
-    THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip"
-    THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN"
 fi
 
 ##########################################################################################
@@ -1274,6 +1327,10 @@
         echo -n "Docs "
         compare_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_dirs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+        compare_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 if [ "$CMP_PERMS" = "true" ]; then
@@ -1295,6 +1352,9 @@
         echo -n "J2RE  Bundle "
         compare_permissions $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_permissions $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 if [ "$CMP_TYPES" = "true" ]; then
@@ -1316,6 +1376,9 @@
         echo -n "J2RE  Bundle "
         compare_file_types $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_file_types $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 if [ "$CMP_GENERAL" = "true" ]; then
@@ -1341,6 +1404,9 @@
         echo -n "Docs "
         compare_general_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_general_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 if [ "$CMP_ZIPS" = "true" ]; then
@@ -1365,12 +1431,18 @@
             compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin $JGSS_WINDOWS_BIN
         fi
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_all_zip_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 if [ "$CMP_JARS" = "true" ]; then
     if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
         compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_all_jar_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 if [ "$CMP_LIBS" = "true" ]; then
@@ -1386,6 +1458,9 @@
         echo -n "Bundle   "
         compare_all_libs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_all_libs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 if [ "$CMP_EXECS" = "true" ]; then
@@ -1396,6 +1471,9 @@
         echo -n "Overlay "
         compare_all_execs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_all_execs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 echo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/bin/unshuffle_list.txt	Sun Aug 17 15:51:37 2014 +0100
@@ -0,0 +1,1502 @@
+#
+# Copyright (c) 2014, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+corba/src/java.corba/share/classes/com/sun/corba/se : corba/src/share/classes/com/sun/corba/se
+corba/src/java.corba/share/classes/com/sun/org/omg : corba/src/share/classes/com/sun/org/omg
+corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl : corba/src/share/classes/com/sun/tools/corba/se/idl
+corba/src/java.corba/share/classes/javax/activity : corba/src/share/classes/javax/activity
+corba/src/java.corba/share/classes/javax/rmi : corba/src/share/classes/javax/rmi
+corba/src/java.corba/share/classes/javax/transaction : corba/src/share/classes/javax/transaction
+corba/src/java.corba/share/classes/org/omg : corba/src/share/classes/org/omg
+corba/src/java.corba/share/classes/sun/corba : corba/src/share/classes/sun/corba
+corba/src/java.sql/share/classes/javax/transaction/xa : corba/src/share/classes/javax/transaction/xa
+corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop : corba/src/share/classes/sun/rmi/rmic/iiop
+jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime : jaxp/src/com/sun/java_cup/internal/runtime
+jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal : jaxp/src/com/sun/org/apache/bcel/internal
+jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal : jaxp/src/com/sun/org/apache/regexp/internal
+jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan : jaxp/src/com/sun/org/apache/xalan
+jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces : jaxp/src/com/sun/org/apache/xerces
+jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm : jaxp/src/com/sun/org/apache/xml/internal/dtm
+jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res : jaxp/src/com/sun/org/apache/xml/internal/res
+jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver : jaxp/src/com/sun/org/apache/xml/internal/resolver
+jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize : jaxp/src/com/sun/org/apache/xml/internal/serialize
+jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer : jaxp/src/com/sun/org/apache/xml/internal/serializer
+jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils : jaxp/src/com/sun/org/apache/xml/internal/utils
+jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath : jaxp/src/com/sun/org/apache/xpath
+jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream : jaxp/src/com/sun/xml/internal/stream
+jaxp/src/java.xml/share/classes/javax/xml/datatype : jaxp/src/javax/xml/datatype
+jaxp/src/java.xml/share/classes/javax/xml/namespace : jaxp/src/javax/xml/namespace
+jaxp/src/java.xml/share/classes/javax/xml/parsers : jaxp/src/javax/xml/parsers
+jaxp/src/java.xml/share/classes/javax/xml/stream : jaxp/src/javax/xml/stream
+jaxp/src/java.xml/share/classes/javax/xml/transform : jaxp/src/javax/xml/transform
+jaxp/src/java.xml/share/classes/javax/xml/validation : jaxp/src/javax/xml/validation
+jaxp/src/java.xml/share/classes/javax/xml/XMLConstants.java : jaxp/src/javax/xml/XMLConstants.java
+jaxp/src/java.xml/share/classes/javax/xml/xpath : jaxp/src/javax/xml/xpath
+jaxp/src/java.xml/share/classes/org/w3c/dom : jaxp/src/org/w3c/dom
+jaxp/src/java.xml/share/classes/org/xml/sax : jaxp/src/org/xml/sax
+jaxws/src/java.activation/share/classes/com/sun/activation/registries : jaxws/src/share/jaf_classes/com/sun/activation/registries
+jaxws/src/java.activation/share/classes/javax/activation : jaxws/src/share/jaf_classes/javax/activation
+jaxws/src/java.activation/share/classes/META-INF : jaxws/src/share/jaf_classes/META-INF
+jaxws/src/java.annotations.common/share/classes/javax/annotation : jaxws/src/share/jaxws_classes/javax/annotation
+jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal : jaxws/src/share/jaxws_classes/com/sun/istack/internal
+jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization : jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization
+jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/logging/Logger.java : jaxws/src/share/jaxws_classes/com/sun/istack/internal/logging/Logger.java
+jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind : jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind
+jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset : jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset
+jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org : jaxws/src/share/jaxws_classes/com/sun/xml/internal/org
+jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2 : jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2
+jaxws/src/java.xml.bind/share/classes/javax/xml/bind : jaxws/src/share/jaxws_classes/javax/xml/bind
+jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging : jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging
+jaxws/src/java.xml.soap/share/classes/javax/xml/soap : jaxws/src/share/jaxws_classes/javax/xml/soap
+jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal : jaxws/src/share/jaxws_classes/com/oracle/webservices/internal
+jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal : jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal
+jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish : jaxws/src/share/jaxws_classes/com/sun/org/glassfish
+jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream : jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream
+jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws : jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws
+jaxws/src/java.xml.ws/share/classes/javax/jws : jaxws/src/share/jaxws_classes/javax/jws
+jaxws/src/java.xml.ws/share/classes/javax/xml/ws : jaxws/src/share/jaxws_classes/javax/xml/ws
+jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel : jaxws/src/share/jaxws_classes/com/sun/codemodel
+jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools : jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools
+jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal : jaxws/src/share/jaxws_classes/com/sun/tools/internal
+jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser : jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser
+jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom : jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom
+jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom : jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom
+jaxws/src/jdk.xml.bind/share/classes/META-INF/services/com.sun.tools.internal.xjc.Plugin : jaxws/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin
+jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype : jaxws/src/share/jaxws_classes/org/relaxng/datatype
+jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws : jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws
+jaxws/src/jdk.xml.ws/share/classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin : jaxws/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin
+jdk/src/demo/share : jdk/src/share/demo
+jdk/src/demo/share/jpda/com/sun/tools/example : jdk/src/share/classes/com/sun/tools/example
+jdk/src/demo/solaris/jni/Poller : jdk/src/solaris/demo/jni/Poller
+jdk/src/demo/unix/jvmti/hprof/hprof_md.c : jdk/src/solaris/demo/jvmti/hprof/hprof_md.c
+jdk/src/demo/windows/jvmti/hprof : jdk/src/windows/demo/jvmti/hprof
+jdk/src/java.base/aix/conf/tzmappings : jdk/src/aix/lib/tzmappings
+jdk/src/java.base/aix/native/libnet/java/net : jdk/src/aix/native/java/net
+jdk/src/java.base/aix/native/libnio/ch : jdk/src/aix/native/sun/nio/ch
+jdk/src/java.base/aix/native/libnio/fs/AixNativeDispatcher.c : jdk/src/aix/native/sun/nio/fs/AixNativeDispatcher.c
+jdk/src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java : jdk/src/macosx/classes/java/lang/ClassLoaderHelper.java
+jdk/src/java.base/macosx/classes/java/net/DefaultInterface.java : jdk/src/macosx/classes/java/net/DefaultInterface.java
+jdk/src/java.base/macosx/classes/sun/nio/ch : jdk/src/macosx/classes/sun/nio/ch
+jdk/src/java.base/macosx/classes/sun/util/locale/provider : jdk/src/macosx/classes/sun/util/locale/provider
+jdk/src/java.base/macosx/conf/x86_64/jvm.cfg : jdk/src/macosx/bin/x86_64/jvm.cfg
+jdk/src/java.base/macosx/native/include/jni_md.h : jdk/src/macosx/javavm/export/jni_md.h
+jdk/src/java.base/macosx/native/include/jvm_md.h : jdk/src/macosx/javavm/export/jvm_md.h
+jdk/src/java.base/macosx/native/launcher/Info-cmdline.plist : jdk/src/macosx/lib/Info-cmdline.plist
+jdk/src/java.base/macosx/native/launcher/Info-privileged.plist : jdk/src/macosx/lib/Info-privileged.plist
+jdk/src/java.base/macosx/native/launcher/jexec.c : jdk/src/macosx/bin/jexec.c
+jdk/src/java.base/macosx/native/libjava/HostLocaleProviderAdapter_md.c : jdk/src/macosx/native/sun/util/locale/provider/HostLocaleProviderAdapter_md.c
+jdk/src/java.base/macosx/native/libjli/java_md_macosx.c : jdk/src/macosx/bin/java_md_macosx.c
+jdk/src/java.base/macosx/native/libjli/java_md_macosx.h : jdk/src/macosx/bin/java_md_macosx.h
+jdk/src/java.base/share/classes/com/sun/crypto/provider : jdk/src/share/classes/com/sun/crypto/provider
+jdk/src/java.base/share/classes/com/sun/java/util/jar/pack : jdk/src/share/classes/com/sun/java/util/jar/pack
+jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl : jdk/src/share/classes/com/sun/net/ssl/internal/ssl
+jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https : jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https
+jdk/src/java.base/share/classes/com/sun/net/ssl : jdk/src/share/classes/com/sun/net/ssl
+jdk/src/java.base/share/classes/com/sun/nio/file : jdk/src/share/classes/com/sun/nio/file
+jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509 : jdk/src/share/classes/com/sun/security/cert/internal/x509
+jdk/src/java.base/share/classes/com/sun/security/ntlm : jdk/src/share/classes/com/sun/security/ntlm
+jdk/src/java.base/share/classes/java/io : jdk/src/share/classes/java/io
+jdk/src/java.base/share/classes/java/lang/annotation : jdk/src/share/classes/java/lang/annotation
+jdk/src/java.base/share/classes/java/lang/doc-files : jdk/src/share/classes/java/lang/doc-files
+jdk/src/java.base/share/classes/java/lang/invoke : jdk/src/share/classes/java/lang/invoke
+jdk/src/java.base/share/classes/java/lang : jdk/src/share/classes/java/lang
+jdk/src/java.base/share/classes/java/lang/ref : jdk/src/share/classes/java/lang/ref
+jdk/src/java.base/share/classes/java/lang/reflect : jdk/src/share/classes/java/lang/reflect
+jdk/src/java.base/share/classes/java/math : jdk/src/share/classes/java/math
+jdk/src/java.base/share/classes/java/net : jdk/src/share/classes/java/net
+jdk/src/java.base/share/classes/java/nio : jdk/src/share/classes/java/nio
+jdk/src/java.base/share/classes/java/security/cert : jdk/src/share/classes/java/security/cert
+jdk/src/java.base/share/classes/java/security/interfaces : jdk/src/share/classes/java/security/interfaces
+jdk/src/java.base/share/classes/java/security : jdk/src/share/classes/java/security
+jdk/src/java.base/share/classes/java/security/spec : jdk/src/share/classes/java/security/spec
+jdk/src/java.base/share/classes/java/text : jdk/src/share/classes/java/text
+jdk/src/java.base/share/classes/java/time : jdk/src/share/classes/java/time
+jdk/src/java.base/share/classes/java/util/concurrent : jdk/src/share/classes/java/util/concurrent
+jdk/src/java.base/share/classes/java/util/function : jdk/src/share/classes/java/util/function
+jdk/src/java.base/share/classes/java/util/jar : jdk/src/share/classes/java/util/jar
+jdk/src/java.base/share/classes/java/util : jdk/src/share/classes/java/util
+jdk/src/java.base/share/classes/java/util/regex : jdk/src/share/classes/java/util/regex
+jdk/src/java.base/share/classes/java/util/spi : jdk/src/share/classes/java/util/spi
+jdk/src/java.base/share/classes/java/util/stream : jdk/src/share/classes/java/util/stream
+jdk/src/java.base/share/classes/java/util/zip : jdk/src/share/classes/java/util/zip
+jdk/src/java.base/share/classes/javax/crypto : jdk/src/share/classes/javax/crypto
+jdk/src/java.base/share/classes/javax/net : jdk/src/share/classes/javax/net
+jdk/src/java.base/share/classes/javax/security/auth/callback : jdk/src/share/classes/javax/security/auth/callback
+jdk/src/java.base/share/classes/javax/security/auth : jdk/src/share/classes/javax/security/auth
+jdk/src/java.base/share/classes/javax/security/auth/login : jdk/src/share/classes/javax/security/auth/login
+jdk/src/java.base/share/classes/javax/security/auth/spi : jdk/src/share/classes/javax/security/auth/spi
+jdk/src/java.base/share/classes/javax/security/auth/x500 : jdk/src/share/classes/javax/security/auth/x500
+jdk/src/java.base/share/classes/javax/security/cert : jdk/src/share/classes/javax/security/cert
+jdk/src/java.base/share/classes/jdk/internal/org/objectweb : jdk/src/share/classes/jdk/internal/org/objectweb
+jdk/src/java.base/share/classes/jdk/internal/org/xml/sax : jdk/src/share/classes/jdk/internal/org/xml/sax
+jdk/src/java.base/share/classes/jdk/internal/util/xml : jdk/src/share/classes/jdk/internal/util/xml
+jdk/src/java.base/share/classes/jdk/net : jdk/src/share/classes/jdk/net
+jdk/src/java.base/share/classes/overview-core.html : jdk/src/share/classes/overview-core.html
+jdk/src/java.base/share/classes/sun/invoke : jdk/src/share/classes/sun/invoke
+jdk/src/java.base/share/classes/sun/launcher : jdk/src/share/classes/sun/launcher
+jdk/src/java.base/share/classes/sun/misc : jdk/src/share/classes/sun/misc
+jdk/src/java.base/share/classes/sun/net/dns : jdk/src/share/classes/sun/net/dns
+jdk/src/java.base/share/classes/sun/net/ftp/impl : jdk/src/share/classes/sun/net/ftp/impl
+jdk/src/java.base/share/classes/sun/net/ftp : jdk/src/share/classes/sun/net/ftp
+jdk/src/java.base/share/classes/sun/net/idn : jdk/src/share/classes/sun/net/idn
+jdk/src/java.base/share/classes/sun/net : jdk/src/share/classes/sun/net
+jdk/src/java.base/share/classes/sun/net/sdp : jdk/src/share/classes/sun/net/sdp
+jdk/src/java.base/share/classes/sun/net/smtp : jdk/src/share/classes/sun/net/smtp
+jdk/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java : jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
+jdk/src/java.base/share/classes/sun/net/spi/nameservice : jdk/src/share/classes/sun/net/spi/nameservice
+jdk/src/java.base/share/classes/sun/net/util : jdk/src/share/classes/sun/net/util
+jdk/src/java.base/share/classes/sun/net/www/content/text : jdk/src/share/classes/sun/net/www/content/text
+jdk/src/java.base/share/classes/sun/net/www/http : jdk/src/share/classes/sun/net/www/http
+jdk/src/java.base/share/classes/sun/net/www : jdk/src/share/classes/sun/net/www
+jdk/src/java.base/share/classes/sun/net/www/protocol/file : jdk/src/share/classes/sun/net/www/protocol/file
+jdk/src/java.base/share/classes/sun/net/www/protocol/ftp : jdk/src/share/classes/sun/net/www/protocol/ftp
+jdk/src/java.base/share/classes/sun/net/www/protocol/http : jdk/src/share/classes/sun/net/www/protocol/http
+jdk/src/java.base/share/classes/sun/net/www/protocol/http/ntlm : jdk/src/share/classes/sun/net/www/protocol/http/ntlm
+jdk/src/java.base/share/classes/sun/net/www/protocol/https : jdk/src/share/classes/sun/net/www/protocol/https
+jdk/src/java.base/share/classes/sun/net/www/protocol/jar : jdk/src/share/classes/sun/net/www/protocol/jar
+jdk/src/java.base/share/classes/sun/net/www/protocol/mailto : jdk/src/share/classes/sun/net/www/protocol/mailto
+jdk/src/java.base/share/classes/sun/net/www/protocol/netdoc/Handler.java : jdk/src/share/classes/sun/net/www/protocol/netdoc/Handler.java
+jdk/src/java.base/share/classes/sun/nio/ByteBuffered.java : jdk/src/share/classes/sun/nio/ByteBuffered.java
+jdk/src/java.base/share/classes/sun/nio/ch : jdk/src/share/classes/sun/nio/ch
+jdk/src/java.base/share/classes/sun/nio/cs : jdk/src/share/classes/sun/nio/cs
+jdk/src/java.base/share/classes/sun/nio/fs : jdk/src/share/classes/sun/nio/fs
+jdk/src/java.base/share/classes/sun/reflect : jdk/src/share/classes/sun/reflect
+jdk/src/java.base/share/classes/sun/security/action : jdk/src/share/classes/sun/security/action
+jdk/src/java.base/share/classes/sun/security/internal : jdk/src/share/classes/sun/security/internal
+jdk/src/java.base/share/classes/sun/security/jca : jdk/src/share/classes/sun/security/jca
+jdk/src/java.base/share/classes/sun/security/pkcs10 : jdk/src/share/classes/sun/security/pkcs10
+jdk/src/java.base/share/classes/sun/security/pkcs12 : jdk/src/share/classes/sun/security/pkcs12
+jdk/src/java.base/share/classes/sun/security/pkcs : jdk/src/share/classes/sun/security/pkcs
+jdk/src/java.base/share/classes/sun/security/provider/certpath : jdk/src/share/classes/sun/security/provider/certpath
+jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl : jdk/src/share/classes/sun/security/provider/certpath/ssl
+jdk/src/java.base/share/classes/sun/security/provider : jdk/src/share/classes/sun/security/provider
+jdk/src/java.base/share/classes/sun/security/rsa : jdk/src/share/classes/sun/security/rsa
+jdk/src/java.base/share/classes/sun/security/ssl : jdk/src/share/classes/sun/security/ssl
+jdk/src/java.base/share/classes/sun/security/timestamp : jdk/src/share/classes/sun/security/timestamp
+jdk/src/java.base/share/classes/sun/security/tools : jdk/src/share/classes/sun/security/tools
+jdk/src/java.base/share/classes/sun/security/tools/keytool : jdk/src/share/classes/sun/security/tools/keytool
+jdk/src/java.base/share/classes/sun/security/util : jdk/src/share/classes/sun/security/util
+jdk/src/java.base/share/classes/sun/security/validator : jdk/src/share/classes/sun/security/validator
+jdk/src/java.base/share/classes/sun/security/x509 : jdk/src/share/classes/sun/security/x509
+jdk/src/java.base/share/classes/sun/text/bidi : jdk/src/share/classes/sun/text/bidi
+jdk/src/java.base/share/classes/sun/text : jdk/src/share/classes/sun/text
+jdk/src/java.base/share/classes/sun/text/normalizer : jdk/src/share/classes/sun/text/normalizer
+jdk/src/java.base/share/classes/sun/text/resources/en : jdk/src/share/classes/sun/text/resources/en
+jdk/src/java.base/share/classes/sun/text/resources : jdk/src/share/classes/sun/text/resources
+jdk/src/java.base/share/classes/sun/util/calendar : jdk/src/share/classes/sun/util/calendar
+jdk/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java : jdk/src/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
+jdk/src/java.base/share/classes/sun/util : jdk/src/share/classes/sun/util
+jdk/src/java.base/share/classes/sun/util/locale : jdk/src/share/classes/sun/util/locale
+jdk/src/java.base/share/classes/sun/util/locale/provider : jdk/src/share/classes/sun/util/locale/provider
+jdk/src/java.base/share/classes/sun/util/logging : jdk/src/share/classes/sun/util/logging
+jdk/src/java.base/share/classes/sun/util/resources/en : jdk/src/share/classes/sun/util/resources/en
+jdk/src/java.base/share/classes/sun/util/resources : jdk/src/share/classes/sun/util/resources
+jdk/src/java.base/share/classes/sun/util/spi : jdk/src/share/classes/sun/util/spi
+jdk/src/java.base/share/conf/calendars.properties : jdk/src/share/lib/calendars.properties
+jdk/src/java.base/share/conf/hijrah-config-umalqura.properties : jdk/src/share/lib/hijrah-config-umalqura.properties
+jdk/src/java.base/share/conf/net.properties : jdk/src/share/lib/net.properties
+jdk/src/java.base/share/conf/security : jdk/src/share/lib/security
+jdk/src/java.base/share/native/include/classfile_constants.h : jdk/src/share/javavm/export/classfile_constants.h
+jdk/src/java.base/share/native/include/jni.h : jdk/src/share/javavm/export/jni.h
+jdk/src/java.base/share/native/include/jvm.h : jdk/src/share/javavm/export/jvm.h
+jdk/src/java.base/share/native/include/jvmticmlr.h : jdk/src/share/javavm/export/jvmticmlr.h
+jdk/src/java.base/share/native/include/jvmti.h : jdk/src/share/javavm/export/jvmti.h
+jdk/src/java.base/share/native/launcher/defines.h : jdk/src/share/bin/defines.h
+jdk/src/java.base/share/native/launcher/main.c : jdk/src/share/bin/main.c
+jdk/src/java.base/share/native/libfdlibm/e_acos.c : jdk/src/share/native/java/lang/fdlibm/src/e_acos.c
+jdk/src/java.base/share/native/libfdlibm/e_asin.c : jdk/src/share/native/java/lang/fdlibm/src/e_asin.c
+jdk/src/java.base/share/native/libfdlibm/e_atan2.c : jdk/src/share/native/java/lang/fdlibm/src/e_atan2.c
+jdk/src/java.base/share/native/libfdlibm/e_atanh.c : jdk/src/share/native/java/lang/fdlibm/src/e_atanh.c
+jdk/src/java.base/share/native/libfdlibm/e_cosh.c : jdk/src/share/native/java/lang/fdlibm/src/e_cosh.c
+jdk/src/java.base/share/native/libfdlibm/e_exp.c : jdk/src/share/native/java/lang/fdlibm/src/e_exp.c
+jdk/src/java.base/share/native/libfdlibm/e_fmod.c : jdk/src/share/native/java/lang/fdlibm/src/e_fmod.c
+jdk/src/java.base/share/native/libfdlibm/e_hypot.c : jdk/src/share/native/java/lang/fdlibm/src/e_hypot.c
+jdk/src/java.base/share/native/libfdlibm/e_log10.c : jdk/src/share/native/java/lang/fdlibm/src/e_log10.c
+jdk/src/java.base/share/native/libfdlibm/e_log.c : jdk/src/share/native/java/lang/fdlibm/src/e_log.c
+jdk/src/java.base/share/native/libfdlibm/e_pow.c : jdk/src/share/native/java/lang/fdlibm/src/e_pow.c
+jdk/src/java.base/share/native/libfdlibm/e_remainder.c : jdk/src/share/native/java/lang/fdlibm/src/e_remainder.c
+jdk/src/java.base/share/native/libfdlibm/e_rem_pio2.c : jdk/src/share/native/java/lang/fdlibm/src/e_rem_pio2.c
+jdk/src/java.base/share/native/libfdlibm/e_scalb.c : jdk/src/share/native/java/lang/fdlibm/src/e_scalb.c
+jdk/src/java.base/share/native/libfdlibm/e_sinh.c : jdk/src/share/native/java/lang/fdlibm/src/e_sinh.c
+jdk/src/java.base/share/native/libfdlibm/e_sqrt.c : jdk/src/share/native/java/lang/fdlibm/src/e_sqrt.c
+jdk/src/java.base/share/native/libfdlibm/fdlibm.h : jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
+jdk/src/java.base/share/native/libfdlibm/jfdlibm.h : jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h
+jdk/src/java.base/share/native/libfdlibm/k_cos.c : jdk/src/share/native/java/lang/fdlibm/src/k_cos.c
+jdk/src/java.base/share/native/libfdlibm/k_rem_pio2.c : jdk/src/share/native/java/lang/fdlibm/src/k_rem_pio2.c
+jdk/src/java.base/share/native/libfdlibm/k_sin.c : jdk/src/share/native/java/lang/fdlibm/src/k_sin.c
+jdk/src/java.base/share/native/libfdlibm/k_standard.c : jdk/src/share/native/java/lang/fdlibm/src/k_standard.c
+jdk/src/java.base/share/native/libfdlibm/k_tan.c : jdk/src/share/native/java/lang/fdlibm/src/k_tan.c
+jdk/src/java.base/share/native/libfdlibm/s_atan.c : jdk/src/share/native/java/lang/fdlibm/src/s_atan.c
+jdk/src/java.base/share/native/libfdlibm/s_cbrt.c : jdk/src/share/native/java/lang/fdlibm/src/s_cbrt.c
+jdk/src/java.base/share/native/libfdlibm/s_ceil.c : jdk/src/share/native/java/lang/fdlibm/src/s_ceil.c
+jdk/src/java.base/share/native/libfdlibm/s_copysign.c : jdk/src/share/native/java/lang/fdlibm/src/s_copysign.c
+jdk/src/java.base/share/native/libfdlibm/s_cos.c : jdk/src/share/native/java/lang/fdlibm/src/s_cos.c
+jdk/src/java.base/share/native/libfdlibm/s_expm1.c : jdk/src/share/native/java/lang/fdlibm/src/s_expm1.c
+jdk/src/java.base/share/native/libfdlibm/s_fabs.c : jdk/src/share/native/java/lang/fdlibm/src/s_fabs.c
+jdk/src/java.base/share/native/libfdlibm/s_finite.c : jdk/src/share/native/java/lang/fdlibm/src/s_finite.c
+jdk/src/java.base/share/native/libfdlibm/s_floor.c : jdk/src/share/native/java/lang/fdlibm/src/s_floor.c
+jdk/src/java.base/share/native/libfdlibm/s_frexp.c : jdk/src/share/native/java/lang/fdlibm/src/s_frexp.c
+jdk/src/java.base/share/native/libfdlibm/s_ilogb.c : jdk/src/share/native/java/lang/fdlibm/src/s_ilogb.c
+jdk/src/java.base/share/native/libfdlibm/s_isnan.c : jdk/src/share/native/java/lang/fdlibm/src/s_isnan.c
+jdk/src/java.base/share/native/libfdlibm/s_ldexp.c : jdk/src/share/native/java/lang/fdlibm/src/s_ldexp.c
+jdk/src/java.base/share/native/libfdlibm/s_lib_version.c : jdk/src/share/native/java/lang/fdlibm/src/s_lib_version.c
+jdk/src/java.base/share/native/libfdlibm/s_log1p.c : jdk/src/share/native/java/lang/fdlibm/src/s_log1p.c
+jdk/src/java.base/share/native/libfdlibm/s_logb.c : jdk/src/share/native/java/lang/fdlibm/src/s_logb.c
+jdk/src/java.base/share/native/libfdlibm/s_matherr.c : jdk/src/share/native/java/lang/fdlibm/src/s_matherr.c
+jdk/src/java.base/share/native/libfdlibm/s_modf.c : jdk/src/share/native/java/lang/fdlibm/src/s_modf.c
+jdk/src/java.base/share/native/libfdlibm/s_nextafter.c : jdk/src/share/native/java/lang/fdlibm/src/s_nextafter.c
+jdk/src/java.base/share/native/libfdlibm/s_rint.c : jdk/src/share/native/java/lang/fdlibm/src/s_rint.c
+jdk/src/java.base/share/native/libfdlibm/s_scalbn.c : jdk/src/share/native/java/lang/fdlibm/src/s_scalbn.c
+jdk/src/java.base/share/native/libfdlibm/s_signgam.c : jdk/src/share/native/java/lang/fdlibm/src/s_signgam.c
+jdk/src/java.base/share/native/libfdlibm/s_significand.c : jdk/src/share/native/java/lang/fdlibm/src/s_significand.c
+jdk/src/java.base/share/native/libfdlibm/s_sin.c : jdk/src/share/native/java/lang/fdlibm/src/s_sin.c
+jdk/src/java.base/share/native/libfdlibm/s_tan.c : jdk/src/share/native/java/lang/fdlibm/src/s_tan.c
+jdk/src/java.base/share/native/libfdlibm/s_tanh.c : jdk/src/share/native/java/lang/fdlibm/src/s_tanh.c
+jdk/src/java.base/share/native/libfdlibm/w_acos.c : jdk/src/share/native/java/lang/fdlibm/src/w_acos.c
+jdk/src/java.base/share/native/libfdlibm/w_asin.c : jdk/src/share/native/java/lang/fdlibm/src/w_asin.c
+jdk/src/java.base/share/native/libfdlibm/w_atan2.c : jdk/src/share/native/java/lang/fdlibm/src/w_atan2.c
+jdk/src/java.base/share/native/libfdlibm/w_atanh.c : jdk/src/share/native/java/lang/fdlibm/src/w_atanh.c
+jdk/src/java.base/share/native/libfdlibm/w_cosh.c : jdk/src/share/native/java/lang/fdlibm/src/w_cosh.c
+jdk/src/java.base/share/native/libfdlibm/w_exp.c : jdk/src/share/native/java/lang/fdlibm/src/w_exp.c
+jdk/src/java.base/share/native/libfdlibm/w_fmod.c : jdk/src/share/native/java/lang/fdlibm/src/w_fmod.c
+jdk/src/java.base/share/native/libfdlibm/w_hypot.c : jdk/src/share/native/java/lang/fdlibm/src/w_hypot.c
+jdk/src/java.base/share/native/libfdlibm/w_log10.c : jdk/src/share/native/java/lang/fdlibm/src/w_log10.c
+jdk/src/java.base/share/native/libfdlibm/w_log.c : jdk/src/share/native/java/lang/fdlibm/src/w_log.c
+jdk/src/java.base/share/native/libfdlibm/w_pow.c : jdk/src/share/native/java/lang/fdlibm/src/w_pow.c
+jdk/src/java.base/share/native/libfdlibm/w_remainder.c : jdk/src/share/native/java/lang/fdlibm/src/w_remainder.c
+jdk/src/java.base/share/native/libfdlibm/w_scalb.c : jdk/src/share/native/java/lang/fdlibm/src/w_scalb.c
+jdk/src/java.base/share/native/libfdlibm/w_sinh.c : jdk/src/share/native/java/lang/fdlibm/src/w_sinh.c
+jdk/src/java.base/share/native/libfdlibm/w_sqrt.c : jdk/src/share/native/java/lang/fdlibm/src/w_sqrt.c
+jdk/src/java.base/share/native/libjava/AccessController.c : jdk/src/share/native/java/security/AccessController.c
+jdk/src/java.base/share/native/libjava/Array.c : jdk/src/share/native/java/lang/reflect/Array.c
+jdk/src/java.base/share/native/libjava/AtomicLong.c : jdk/src/share/native/java/util/concurrent/atomic/AtomicLong.c
+jdk/src/java.base/share/native/libjava/Bits.c : jdk/src/share/native/java/nio/Bits.c
+jdk/src/java.base/share/native/libjava/check_version.c : jdk/src/share/native/common/check_version.c
+jdk/src/java.base/share/native/libjava/Class.c : jdk/src/share/native/java/lang/Class.c
+jdk/src/java.base/share/native/libjava/ClassLoader.c : jdk/src/share/native/java/lang/ClassLoader.c
+jdk/src/java.base/share/native/libjava/Compiler.c : jdk/src/share/native/java/lang/Compiler.c
+jdk/src/java.base/share/native/libjava/ConstantPool.c : jdk/src/share/native/sun/reflect/ConstantPool.c
+jdk/src/java.base/share/native/libjava/Double.c : jdk/src/share/native/java/lang/Double.c
+jdk/src/java.base/share/native/libjava/Executable.c : jdk/src/share/native/java/lang/reflect/Executable.c
+jdk/src/java.base/share/native/libjava/Field.c : jdk/src/share/native/java/lang/reflect/Field.c
+jdk/src/java.base/share/native/libjava/FileInputStream.c : jdk/src/share/native/java/io/FileInputStream.c
+jdk/src/java.base/share/native/libjava/Float.c : jdk/src/share/native/java/lang/Float.c
+jdk/src/java.base/share/native/libjava/GC.c : jdk/src/share/native/sun/misc/GC.c
+jdk/src/java.base/share/native/libjava/gdefs.h : jdk/src/share/native/common/gdefs.h
+jdk/src/java.base/share/native/libjava/io_util.c : jdk/src/share/native/java/io/io_util.c
+jdk/src/java.base/share/native/libjava/io_util.h : jdk/src/share/native/java/io/io_util.h
+jdk/src/java.base/share/native/libjava/java_props.h : jdk/src/share/native/java/lang/java_props.h
+jdk/src/java.base/share/native/libjava/jdk_util.c : jdk/src/share/native/common/jdk_util.c
+jdk/src/java.base/share/native/libjava/jdk_util.h : jdk/src/share/native/common/jdk_util.h
+jdk/src/java.base/share/native/libjava/jio.c : jdk/src/share/native/common/jio.c
+jdk/src/java.base/share/native/libjava/jlong.h : jdk/src/share/native/common/jlong.h
+jdk/src/java.base/share/native/libjava/jni_util.c : jdk/src/share/native/common/jni_util.c
+jdk/src/java.base/share/native/libjava/jni_util.h : jdk/src/share/native/common/jni_util.h
+jdk/src/java.base/share/native/libjava/MessageUtils.c : jdk/src/share/native/sun/misc/MessageUtils.c
+jdk/src/java.base/share/native/libjava/NativeAccessors.c : jdk/src/share/native/sun/reflect/NativeAccessors.c
+jdk/src/java.base/share/native/libjava/NativeSignalHandler.c : jdk/src/share/native/sun/misc/NativeSignalHandler.c
+jdk/src/java.base/share/native/libjava/Object.c : jdk/src/share/native/java/lang/Object.c
+jdk/src/java.base/share/native/libjava/ObjectInputStream.c : jdk/src/share/native/java/io/ObjectInputStream.c
+jdk/src/java.base/share/native/libjava/ObjectOutputStream.c : jdk/src/share/native/java/io/ObjectOutputStream.c
+jdk/src/java.base/share/native/libjava/ObjectStreamClass.c : jdk/src/share/native/java/io/ObjectStreamClass.c
+jdk/src/java.base/share/native/libjava/Package.c : jdk/src/share/native/java/lang/Package.c
+jdk/src/java.base/share/native/libjava/Proxy.c : jdk/src/share/native/java/lang/reflect/Proxy.c
+jdk/src/java.base/share/native/libjava/RandomAccessFile.c : jdk/src/share/native/java/io/RandomAccessFile.c
+jdk/src/java.base/share/native/libjava/Reflection.c : jdk/src/share/native/sun/reflect/Reflection.c
+jdk/src/java.base/share/native/libjava/Runtime.c : jdk/src/share/native/java/lang/Runtime.c
+jdk/src/java.base/share/native/libjava/SecurityManager.c : jdk/src/share/native/java/lang/SecurityManager.c
+jdk/src/java.base/share/native/libjava/Shutdown.c : jdk/src/share/native/java/lang/Shutdown.c
+jdk/src/java.base/share/native/libjava/Signal.c : jdk/src/share/native/sun/misc/Signal.c
+jdk/src/java.base/share/native/libjava/sizecalc.h : jdk/src/share/native/common/sizecalc.h
+jdk/src/java.base/share/native/libjava/StrictMath.c : jdk/src/share/native/java/lang/StrictMath.c
+jdk/src/java.base/share/native/libjava/String.c : jdk/src/share/native/java/lang/String.c
+jdk/src/java.base/share/native/libjava/System.c : jdk/src/share/native/java/lang/System.c
+jdk/src/java.base/share/native/libjava/Thread.c : jdk/src/share/native/java/lang/Thread.c
+jdk/src/java.base/share/native/libjava/Throwable.c : jdk/src/share/native/java/lang/Throwable.c
+jdk/src/java.base/share/native/libjava/TimeZone.c : jdk/src/share/native/java/util/TimeZone.c
+jdk/src/java.base/share/native/libjava/verify_stub.c : jdk/src/share/native/common/verify_stub.c
+jdk/src/java.base/share/native/libjava/Version.c : jdk/src/share/native/sun/misc/Version.c
+jdk/src/java.base/share/native/libjava/VM.c : jdk/src/share/native/sun/misc/VM.c
+jdk/src/java.base/share/native/libjava/VMSupport.c : jdk/src/share/native/sun/misc/VMSupport.c
+jdk/src/java.base/share/native/libjli/emessages.h : jdk/src/share/bin/emessages.h
+jdk/src/java.base/share/native/libjli/java.c : jdk/src/share/bin/java.c
+jdk/src/java.base/share/native/libjli/java.h : jdk/src/share/bin/java.h
+jdk/src/java.base/share/native/libjli/jli_util.c : jdk/src/share/bin/jli_util.c
+jdk/src/java.base/share/native/libjli/jli_util.h : jdk/src/share/bin/jli_util.h
+jdk/src/java.base/share/native/libjli/manifest_info.h : jdk/src/share/bin/manifest_info.h
+jdk/src/java.base/share/native/libjli/parse_manifest.c : jdk/src/share/bin/parse_manifest.c
+jdk/src/java.base/share/native/libjli/splashscreen.h : jdk/src/share/bin/splashscreen.h
+jdk/src/java.base/share/native/libjli/splashscreen_stubs.c : jdk/src/share/bin/splashscreen_stubs.c
+jdk/src/java.base/share/native/libjli/version_comp.c : jdk/src/share/bin/version_comp.c
+jdk/src/java.base/share/native/libjli/version_comp.h : jdk/src/share/bin/version_comp.h
+jdk/src/java.base/share/native/libjli/wildcard.c : jdk/src/share/bin/wildcard.c
+jdk/src/java.base/share/native/libjli/wildcard.h : jdk/src/share/bin/wildcard.h
+jdk/src/java.base/share/native/libnet : jdk/src/share/native/java/net
+jdk/src/java.base/share/native/libnio/ch/nio.h : jdk/src/share/native/sun/nio/ch/nio.h
+jdk/src/java.base/share/native/libverify/check_code.c : jdk/src/share/native/common/check_code.c
+jdk/src/java.base/share/native/libverify/check_format.c : jdk/src/share/native/common/check_format.c
+jdk/src/java.base/share/native/libverify/opcodes.in_out : jdk/src/share/native/common/opcodes.in_out
+jdk/src/java.base/share/native/libzip : jdk/src/share/native/java/util/zip
+jdk/src/java.base/share/native/libzip/zlib-1.2.8 : jdk/src/share/native/java/util/zip/zlib-1.2.8
+jdk/src/java.base/share/native/libzip/zlib-1.2.8/patches/ChangeLog_java : jdk/src/share/native/java/util/zip/zlib-1.2.8/patches/ChangeLog_java
+jdk/src/java.base/unix/classes/java/io : jdk/src/solaris/classes/java/io
+jdk/src/java.base/unix/classes/java/lang : jdk/src/solaris/classes/java/lang
+jdk/src/java.base/unix/classes/java/net : jdk/src/solaris/classes/java/net
+jdk/src/java.base/unix/classes/sun/misc : jdk/src/solaris/classes/sun/misc
+jdk/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java : jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
+jdk/src/java.base/unix/classes/sun/net : jdk/src/solaris/classes/sun/net
+jdk/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java : jdk/src/solaris/classes/sun/net/sdp/SdpProvider.java
+jdk/src/java.base/unix/classes/sun/net/www/content-types.properties : jdk/src/solaris/classes/sun/net/www/content-types.properties
+jdk/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java : jdk/src/solaris/classes/sun/net/www/protocol/file/Handler.java
+jdk/src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java : jdk/src/solaris/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
+jdk/src/java.base/unix/classes/sun/net/www/protocol/jar/JarFileFactory.java : jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java
+jdk/src/java.base/unix/classes/sun/nio/ch : jdk/src/solaris/classes/sun/nio/ch
+jdk/src/java.base/unix/classes/sun/nio/fs : jdk/src/solaris/classes/sun/nio/fs
+jdk/src/java.base/unix/classes/sun/security/provider : jdk/src/solaris/classes/sun/security/provider
+jdk/src/java.base/unix/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java : jdk/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
+jdk/src/java.base/unix/conf/amd64/jvm.cfg : jdk/src/solaris/bin/amd64/jvm.cfg
+jdk/src/java.base/unix/conf/arm/jvm.cfg : jdk/src/solaris/bin/arm/jvm.cfg
+jdk/src/java.base/unix/conf/i586/jvm.cfg : jdk/src/solaris/bin/i586/jvm.cfg
+jdk/src/java.base/unix/conf/ia64/jvm.cfg : jdk/src/solaris/bin/ia64/jvm.cfg
+jdk/src/java.base/unix/conf/ppc64/jvm.cfg : jdk/src/solaris/bin/ppc64/jvm.cfg
+jdk/src/java.base/unix/conf/ppc/jvm.cfg : jdk/src/solaris/bin/ppc/jvm.cfg
+jdk/src/java.base/unix/conf/sdp/sdp.conf.template : jdk/src/solaris/lib/sdp/sdp.conf.template
+jdk/src/java.base/unix/conf/sparc/jvm.cfg : jdk/src/solaris/bin/sparc/jvm.cfg
+jdk/src/java.base/unix/conf/sparcv9/jvm.cfg : jdk/src/solaris/bin/sparcv9/jvm.cfg
+jdk/src/java.base/unix/conf/zero/jvm.cfg : jdk/src/solaris/bin/zero/jvm.cfg
+jdk/src/java.base/unix/native/include/jni_md.h : jdk/src/solaris/javavm/export/jni_md.h
+jdk/src/java.base/unix/native/include/jvm_md.h : jdk/src/solaris/javavm/export/jvm_md.h
+jdk/src/java.base/unix/native/jspawnhelper/jspawnhelper.c : jdk/src/solaris/native/java/lang/jspawnhelper.c
+jdk/src/java.base/unix/native/launcher/jexec.c : jdk/src/solaris/bin/jexec.c
+jdk/src/java.base/unix/native/libjava/canonicalize_md.c : jdk/src/solaris/native/java/io/canonicalize_md.c
+jdk/src/java.base/unix/native/libjava/childproc.c : jdk/src/solaris/native/java/lang/childproc.c
+jdk/src/java.base/unix/native/libjava/childproc.h : jdk/src/solaris/native/java/lang/childproc.h
+jdk/src/java.base/unix/native/libjava/Console_md.c : jdk/src/solaris/native/java/io/Console_md.c
+jdk/src/java.base/unix/native/libjava/FileDescriptor_md.c : jdk/src/solaris/native/java/io/FileDescriptor_md.c
+jdk/src/java.base/unix/native/libjava/FileInputStream_md.c : jdk/src/solaris/native/java/io/FileInputStream_md.c
+jdk/src/java.base/unix/native/libjava/FileOutputStream_md.c : jdk/src/solaris/native/java/io/FileOutputStream_md.c
+jdk/src/java.base/unix/native/libjava/gdefs_md.h : jdk/src/solaris/native/common/gdefs_md.h
+jdk/src/java.base/unix/native/libjava/io_util_md.c : jdk/src/solaris/native/java/io/io_util_md.c
+jdk/src/java.base/unix/native/libjava/io_util_md.h : jdk/src/solaris/native/java/io/io_util_md.h
+jdk/src/java.base/unix/native/libjava/java_props_macosx.c : jdk/src/solaris/native/java/lang/java_props_macosx.c
+jdk/src/java.base/unix/native/libjava/java_props_macosx.h : jdk/src/solaris/native/java/lang/java_props_macosx.h
+jdk/src/java.base/unix/native/libjava/java_props_md.c : jdk/src/solaris/native/java/lang/java_props_md.c
+jdk/src/java.base/unix/native/libjava/jdk_util_md.c : jdk/src/solaris/native/common/jdk_util_md.c
+jdk/src/java.base/unix/native/libjava/jdk_util_md.h : jdk/src/solaris/native/common/jdk_util_md.h
+jdk/src/java.base/unix/native/libjava/jlong_md.h : jdk/src/solaris/native/common/jlong_md.h
+jdk/src/java.base/unix/native/libjava/jni_util_md.c : jdk/src/solaris/native/common/jni_util_md.c
+jdk/src/java.base/unix/native/libjava/locale_str.h : jdk/src/solaris/native/java/lang/locale_str.h
+jdk/src/java.base/unix/native/libjava/ProcessEnvironment_md.c : jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c
+jdk/src/java.base/unix/native/libjava/RandomAccessFile_md.c : jdk/src/solaris/native/java/io/RandomAccessFile_md.c
+jdk/src/java.base/unix/native/libjava/TimeZone_md.c : jdk/src/solaris/native/java/util/TimeZone_md.c
+jdk/src/java.base/unix/native/libjava/TimeZone_md.h : jdk/src/solaris/native/java/util/TimeZone_md.h
+jdk/src/java.base/unix/native/libjava/UnixFileSystem_md.c : jdk/src/solaris/native/java/io/UnixFileSystem_md.c
+jdk/src/java.base/unix/native/libjava/UNIXProcess_md.c : jdk/src/solaris/native/java/lang/UNIXProcess_md.c
+jdk/src/java.base/unix/native/libjava/VM_md.c : jdk/src/solaris/native/sun/misc/VM_md.c
+jdk/src/java.base/unix/native/libjli/ergo.c : jdk/src/solaris/bin/ergo.c
+jdk/src/java.base/unix/native/libjli/ergo.h : jdk/src/solaris/bin/ergo.h
+jdk/src/java.base/unix/native/libjli/ergo_i586.c : jdk/src/solaris/bin/ergo_i586.c
+jdk/src/java.base/unix/native/libjli/java_md_common.c : jdk/src/solaris/bin/java_md_common.c
+jdk/src/java.base/unix/native/libjli/java_md.h : jdk/src/solaris/bin/java_md.h
+jdk/src/java.base/unix/native/libjli/java_md_solinux.c : jdk/src/solaris/bin/java_md_solinux.c
+jdk/src/java.base/unix/native/libjli/java_md_solinux.h : jdk/src/solaris/bin/java_md_solinux.h
+jdk/src/java.base/unix/native/libnet/bsd_close.c : jdk/src/solaris/native/java/net/bsd_close.c
+jdk/src/java.base/unix/native/libnet/DefaultProxySelector.c : jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c
+jdk/src/java.base/unix/native/libnet/ExtendedOptionsImpl.c : jdk/src/solaris/native/java/net/ExtendedOptionsImpl.c
+jdk/src/java.base/unix/native/libnet/Inet4AddressImpl.c : jdk/src/solaris/native/java/net/Inet4AddressImpl.c
+jdk/src/java.base/unix/native/libnet/Inet6AddressImpl.c : jdk/src/solaris/native/java/net/Inet6AddressImpl.c
+jdk/src/java.base/unix/native/libnet/InetAddressImplFactory.c : jdk/src/solaris/native/java/net/InetAddressImplFactory.c
+jdk/src/java.base/unix/native/libnet/linux_close.c : jdk/src/solaris/native/java/net/linux_close.c
+jdk/src/java.base/unix/native/libnet/net_util_md.c : jdk/src/solaris/native/java/net/net_util_md.c
+jdk/src/java.base/unix/native/libnet/net_util_md.h : jdk/src/solaris/native/java/net/net_util_md.h
+jdk/src/java.base/unix/native/libnet/NetworkInterface.c : jdk/src/solaris/native/java/net/NetworkInterface.c
+jdk/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c : jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+jdk/src/java.base/unix/native/libnet/PlainSocketImpl.c : jdk/src/solaris/native/java/net/PlainSocketImpl.c
+jdk/src/java.base/unix/native/libnet/portconfig.c : jdk/src/solaris/native/sun/net/portconfig.c
+jdk/src/java.base/unix/native/libnet/ResolverConfigurationImpl.c : jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c
+jdk/src/java.base/unix/native/libnet/SdpSupport.c : jdk/src/solaris/native/sun/net/sdp/SdpSupport.c
+jdk/src/java.base/unix/native/libnet/SocketInputStream.c : jdk/src/solaris/native/java/net/SocketInputStream.c
+jdk/src/java.base/unix/native/libnet/SocketOutputStream.c : jdk/src/solaris/native/java/net/SocketOutputStream.c
+jdk/src/java.base/unix/native/libnet/solaris_close.c : jdk/src/solaris/native/java/net/solaris_close.c
+jdk/src/java.base/unix/native/libnio/ch : jdk/src/solaris/native/sun/nio/ch
+jdk/src/java.base/unix/native/libnio/fs : jdk/src/solaris/native/sun/nio/fs
+jdk/src/java.base/unix/native/libnio/MappedByteBuffer.c : jdk/src/solaris/native/java/nio/MappedByteBuffer.c
+jdk/src/java.base/windows/classes/java/io : jdk/src/windows/classes/java/io
+jdk/src/java.base/windows/classes/java/lang : jdk/src/windows/classes/java/lang
+jdk/src/java.base/windows/classes/java/net : jdk/src/windows/classes/java/net
+jdk/src/java.base/windows/classes/sun/misc : jdk/src/windows/classes/sun/misc
+jdk/src/java.base/windows/classes/sun/net/dns/ResolverConfigurationImpl.java : jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
+jdk/src/java.base/windows/classes/sun/net : jdk/src/windows/classes/sun/net
+jdk/src/java.base/windows/classes/sun/net/www/content-types.properties : jdk/src/windows/classes/sun/net/www/content-types.properties
+jdk/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java : jdk/src/windows/classes/sun/net/www/protocol/file/Handler.java
+jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java : jdk/src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
+jdk/src/java.base/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java : jdk/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java
+jdk/src/java.base/windows/classes/sun/nio/ch : jdk/src/windows/classes/sun/nio/ch
+jdk/src/java.base/windows/classes/sun/nio/fs : jdk/src/windows/classes/sun/nio/fs
+jdk/src/java.base/windows/classes/sun/security/provider : jdk/src/windows/classes/sun/security/provider
+jdk/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java : jdk/src/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
+jdk/src/java.base/windows/conf/amd64/jvm.cfg : jdk/src/windows/bin/amd64/jvm.cfg
+jdk/src/java.base/windows/conf/i586/jvm.cfg : jdk/src/windows/bin/i586/jvm.cfg
+jdk/src/java.base/windows/conf/ia64/jvm.cfg : jdk/src/windows/bin/ia64/jvm.cfg
+jdk/src/java.base/windows/conf/tzmappings : jdk/src/windows/lib/tzmappings
+jdk/src/java.base/windows/native/common/version.rc : jdk/src/windows/resource/version.rc
+jdk/src/java.base/windows/native/include/jni_md.h : jdk/src/windows/javavm/export/jni_md.h
+jdk/src/java.base/windows/native/include/jvm_md.h : jdk/src/windows/javavm/export/jvm_md.h
+jdk/src/java.base/windows/native/launcher/icons/awt.ico : jdk/src/windows/resource/icons/awt.ico
+jdk/src/java.base/windows/native/launcher/java.manifest : jdk/src/windows/resource/java.manifest
+jdk/src/java.base/windows/native/launcher/java.rc : jdk/src/windows/resource/java.rc
+jdk/src/java.base/windows/native/libjava/canonicalize_md.c : jdk/src/windows/native/java/io/canonicalize_md.c
+jdk/src/java.base/windows/native/libjava/Console_md.c : jdk/src/windows/native/java/io/Console_md.c
+jdk/src/java.base/windows/native/libjava/dirent_md.c : jdk/src/windows/native/java/io/dirent_md.c
+jdk/src/java.base/windows/native/libjava/dirent_md.h : jdk/src/windows/native/java/io/dirent_md.h
+jdk/src/java.base/windows/native/libjava/FileDescriptor_md.c : jdk/src/windows/native/java/io/FileDescriptor_md.c
+jdk/src/java.base/windows/native/libjava/FileInputStream_md.c : jdk/src/windows/native/java/io/FileInputStream_md.c
+jdk/src/java.base/windows/native/libjava/FileOutputStream_md.c : jdk/src/windows/native/java/io/FileOutputStream_md.c
+jdk/src/java.base/windows/native/libjava/gdefs_md.h : jdk/src/windows/native/common/gdefs_md.h
+jdk/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c : jdk/src/windows/native/sun/util/locale/provider/HostLocaleProviderAdapter_md.c
+jdk/src/java.base/windows/native/libjava/io_util_md.c : jdk/src/windows/native/java/io/io_util_md.c
+jdk/src/java.base/windows/native/libjava/io_util_md.h : jdk/src/windows/native/java/io/io_util_md.h
+jdk/src/java.base/windows/native/libjava/java_main_md.h : jdk/src/windows/native/common/java_main_md.h
+jdk/src/java.base/windows/native/libjava/java_props_md.c : jdk/src/windows/native/java/lang/java_props_md.c
+jdk/src/java.base/windows/native/libjava/jdk_util_md.c : jdk/src/windows/native/common/jdk_util_md.c
+jdk/src/java.base/windows/native/libjava/jdk_util_md.h : jdk/src/windows/native/common/jdk_util_md.h
+jdk/src/java.base/windows/native/libjava/jlong_md.h : jdk/src/windows/native/common/jlong_md.h
+jdk/src/java.base/windows/native/libjava/jni_util_md.c : jdk/src/windows/native/common/jni_util_md.c
+jdk/src/java.base/windows/native/libjava/locale_str.h : jdk/src/windows/native/common/locale_str.h
+jdk/src/java.base/windows/native/libjava/ProcessEnvironment_md.c : jdk/src/windows/native/java/lang/ProcessEnvironment_md.c
+jdk/src/java.base/windows/native/libjava/ProcessImpl_md.c : jdk/src/windows/native/java/lang/ProcessImpl_md.c
+jdk/src/java.base/windows/native/libjava/RandomAccessFile_md.c : jdk/src/windows/native/java/io/RandomAccessFile_md.c
+jdk/src/java.base/windows/native/libjava/TimeZone_md.c : jdk/src/windows/native/java/util/TimeZone_md.c
+jdk/src/java.base/windows/native/libjava/TimeZone_md.h : jdk/src/windows/native/java/util/TimeZone_md.h
+jdk/src/java.base/windows/native/libjava/VM_md.c : jdk/src/windows/native/sun/misc/VM_md.c
+jdk/src/java.base/windows/native/libjava/Win32ErrorMode.c : jdk/src/windows/native/sun/io/Win32ErrorMode.c
+jdk/src/java.base/windows/native/libjava/WinCAPISeedGenerator.c : jdk/src/windows/native/sun/security/provider/WinCAPISeedGenerator.c
+jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c : jdk/src/windows/native/java/io/WinNTFileSystem_md.c
+jdk/src/java.base/windows/native/libjli : jdk/src/windows/bin
+jdk/src/java.base/windows/native/libnet/DefaultProxySelector.c : jdk/src/windows/native/sun/net/spi/DefaultProxySelector.c
+jdk/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c : jdk/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c
+jdk/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c : jdk/src/windows/native/java/net/DualStackPlainSocketImpl.c
+jdk/src/java.base/windows/native/libnet/ExtendedOptionsImpl.c : jdk/src/windows/native/java/net/ExtendedOptionsImpl.c
+jdk/src/java.base/windows/native/libnet/icmp.h : jdk/src/windows/native/java/net/icmp.h
+jdk/src/java.base/windows/native/libnet/Inet4AddressImpl.c : jdk/src/windows/native/java/net/Inet4AddressImpl.c
+jdk/src/java.base/windows/native/libnet/Inet6AddressImpl.c : jdk/src/windows/native/java/net/Inet6AddressImpl.c
+jdk/src/java.base/windows/native/libnet/InetAddressImplFactory.c : jdk/src/windows/native/java/net/InetAddressImplFactory.c
+jdk/src/java.base/windows/native/libnet/net_util_md.c : jdk/src/windows/native/java/net/net_util_md.c
+jdk/src/java.base/windows/native/libnet/net_util_md.h : jdk/src/windows/native/java/net/net_util_md.h
+jdk/src/java.base/windows/native/libnet/NetworkInterface.c : jdk/src/windows/native/java/net/NetworkInterface.c
+jdk/src/java.base/windows/native/libnet/NetworkInterface.h : jdk/src/windows/native/java/net/NetworkInterface.h
+jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c : jdk/src/windows/native/java/net/NetworkInterface_winXP.c
+jdk/src/java.base/windows/native/libnet/NTLMAuthSequence.c : jdk/src/windows/native/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.c
+jdk/src/java.base/windows/native/libnet/portconfig.c : jdk/src/windows/native/sun/net/portconfig.c
+jdk/src/java.base/windows/native/libnet/ResolverConfigurationImpl.c : jdk/src/windows/native/sun/net/dns/ResolverConfigurationImpl.c
+jdk/src/java.base/windows/native/libnet/SocketInputStream.c : jdk/src/windows/native/java/net/SocketInputStream.c
+jdk/src/java.base/windows/native/libnet/SocketOutputStream.c : jdk/src/windows/native/java/net/SocketOutputStream.c
+jdk/src/java.base/windows/native/libnet/TwoStacksPlainDatagramSocketImpl.c : jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c
+jdk/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c : jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c
+jdk/src/java.base/windows/native/libnio/ch : jdk/src/windows/native/sun/nio/ch
+jdk/src/java.base/windows/native/libnio/fs : jdk/src/windows/native/sun/nio/fs
+jdk/src/java.base/windows/native/libnio/MappedByteBuffer.c : jdk/src/windows/native/java/nio/MappedByteBuffer.c
+jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming : jdk/src/share/classes/com/sun/jndi/cosnaming
+jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba : jdk/src/share/classes/com/sun/jndi/toolkit/corba
+jdk/src/java.corba/share/classes/com/sun/jndi/url/corbaname : jdk/src/share/classes/com/sun/jndi/url/corbaname
+jdk/src/java.corba/share/classes/com/sun/jndi/url/iiop : jdk/src/share/classes/com/sun/jndi/url/iiop
+jdk/src/java.corba/share/classes/com/sun/jndi/url/iiopname : jdk/src/share/classes/com/sun/jndi/url/iiopname
+jdk/src/java.desktop/aix/native/libawt : jdk/src/aix/porting
+jdk/src/java.desktop/linux/conf/oblique-fonts/fonts.dir : jdk/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir
+jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/package.html : jdk/src/macosx/classes/com/apple/eawt/event/package.html
+jdk/src/java.desktop/macosx/classes/com/apple/eawt/package.html : jdk/src/macosx/classes/com/apple/eawt/package.html
+jdk/src/java.desktop/macosx/classes/com/apple/eio/package.html : jdk/src/macosx/classes/com/apple/eio/package.html
+jdk/src/java.desktop/macosx/classes/com/apple/laf/resources : jdk/src/macosx/classes/com/apple/laf/resources
+jdk/src/java.desktop/macosx/classes/sun/awt/resources/awtosx.properties : jdk/src/macosx/classes/sun/awt/resources/awtosx.properties
+jdk/src/java.desktop/macosx/classes/sun/java2d/BackBufferCapsProvider.java : jdk/src/macosx/classes/sun/java2d/BackBufferCapsProvider.java
+jdk/src/java.desktop/macosx/conf/flavormap.properties : jdk/src/macosx/lib/flavormap.properties
+jdk/src/java.desktop/macosx/native/include/jawt_md.h : jdk/src/macosx/javavm/export/jawt_md.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.h : jdk/src/macosx/native/sun/awt/ApplicationDelegate.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.m : jdk/src/macosx/native/sun/awt/ApplicationDelegate.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/awt_DrawingSurface.m : jdk/src/macosx/native/sun/awt/awt_DrawingSurface.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.h : jdk/src/macosx/native/sun/awt/AWTEvent.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.m : jdk/src/macosx/native/sun/awt/AWTEvent.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/awt.m : jdk/src/macosx/native/sun/awt/awt.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.h : jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.m : jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.h : jdk/src/macosx/native/sun/awt/AWTView.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.m : jdk/src/macosx/native/sun/awt/AWTView.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.h : jdk/src/macosx/native/sun/awt/AWTWindow.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.m : jdk/src/macosx/native/sun/awt/AWTWindow.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CClipboard.m : jdk/src/macosx/native/sun/awt/CClipboard.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CCursorManager.m : jdk/src/macosx/native/sun/awt/CCursorManager.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.h : jdk/src/macosx/native/sun/awt/CDataTransferer.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.m : jdk/src/macosx/native/sun/awt/CDataTransferer.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDesktopPeer.m : jdk/src/macosx/native/sun/awt/CDesktopPeer.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSourceContextPeer.m : jdk/src/macosx/native/sun/awt/CDragSourceContextPeer.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.h : jdk/src/macosx/native/sun/awt/CDragSource.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.m : jdk/src/macosx/native/sun/awt/CDragSource.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTargetContextPeer.m : jdk/src/macosx/native/sun/awt/CDropTargetContextPeer.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.h : jdk/src/macosx/native/sun/awt/CDropTarget.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.m : jdk/src/macosx/native/sun/awt/CDropTarget.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.h : jdk/src/macosx/native/sun/awt/CFileDialog.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.m : jdk/src/macosx/native/sun/awt/CFileDialog.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFRetainedResource.m : jdk/src/macosx/native/sun/awt/CFRetainedResource.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsConfig.m : jdk/src/macosx/native/sun/awt/CGraphicsConfig.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsDevice.m : jdk/src/macosx/native/sun/awt/CGraphicsDevice.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsEnv.m : jdk/src/macosx/native/sun/awt/CGraphicsEnv.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CImage.m : jdk/src/macosx/native/sun/awt/CImage.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CInputMethod.m : jdk/src/macosx/native/sun/awt/CInputMethod.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.h : jdk/src/macosx/native/sun/awt/CMenuBar.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.m : jdk/src/macosx/native/sun/awt/CMenuBar.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.h : jdk/src/macosx/native/sun/awt/CMenuComponent.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.m : jdk/src/macosx/native/sun/awt/CMenuComponent.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.h : jdk/src/macosx/native/sun/awt/CMenu.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.h : jdk/src/macosx/native/sun/awt/CMenuItem.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.m : jdk/src/macosx/native/sun/awt/CMenuItem.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.m : jdk/src/macosx/native/sun/awt/CMenu.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.h : jdk/src/macosx/native/sun/awt/CPopupMenu.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.m : jdk/src/macosx/native/sun/awt/CPopupMenu.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPrinterJob.m : jdk/src/macosx/native/sun/awt/CPrinterJob.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CRobot.m : jdk/src/macosx/native/sun/awt/CRobot.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.h : jdk/src/macosx/native/sun/awt/CSystemColors.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.m : jdk/src/macosx/native/sun/awt/CSystemColors.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTextPipe.m : jdk/src/macosx/native/sun/awt/CTextPipe.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.h : jdk/src/macosx/native/sun/awt/CTrayIcon.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.m : jdk/src/macosx/native/sun/awt/CTrayIcon.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CWrapper.m : jdk/src/macosx/native/sun/awt/CWrapper.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.h : jdk/src/macosx/native/sun/awt/DnDUtilities.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.m : jdk/src/macosx/native/sun/awt/DnDUtilities.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.h : jdk/src/macosx/native/sun/awt/GeomUtilities.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.m : jdk/src/macosx/native/sun/awt/GeomUtilities.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.h : jdk/src/macosx/native/sun/awt/ImageSurfaceData.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.m : jdk/src/macosx/native/sun/awt/ImageSurfaceData.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.h : jdk/src/macosx/native/sun/awt/InitIDs.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.m : jdk/src/macosx/native/sun/awt/InitIDs.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.h : jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.m : jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.h : jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.m : jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.h : jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.m : jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.h : jdk/src/macosx/native/sun/awt/JavaTextAccessibility.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.m : jdk/src/macosx/native/sun/awt/JavaTextAccessibility.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.h : jdk/src/macosx/native/sun/awt/LWCToolkit.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.m : jdk/src/macosx/native/sun/awt/LWCToolkit.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.h : jdk/src/macosx/native/sun/awt/OSVersion.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.m : jdk/src/macosx/native/sun/awt/OSVersion.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.h : jdk/src/macosx/native/sun/awt/PrinterSurfaceData.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.m : jdk/src/macosx/native/sun/awt/PrinterSurfaceData.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.h : jdk/src/macosx/native/sun/awt/PrinterView.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.m : jdk/src/macosx/native/sun/awt/PrinterView.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.h : jdk/src/macosx/native/sun/awt/PrintModel.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.m : jdk/src/macosx/native/sun/awt/PrintModel.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzRenderer.m : jdk/src/macosx/native/sun/awt/QuartzRenderer.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.h : jdk/src/macosx/native/sun/awt/QuartzSurfaceData.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.m : jdk/src/macosx/native/sun/awt/QuartzSurfaceData.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font : jdk/src/macosx/native/sun/font
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/J2D_GL/cglext.h : jdk/src/macosx/native/sun/java2d/opengl/J2D_GL/cglext.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl : jdk/src/macosx/native/sun/java2d/opengl
+jdk/src/java.desktop/macosx/native/libjawt/jawt.m : jdk/src/macosx/native/sun/awt/jawt.m
+jdk/src/java.desktop/macosx/native/libjsound : jdk/src/macosx/native/com/sun/media/sound
+jdk/src/java.desktop/macosx/native/libosxapp : jdk/src/macosx/native/sun/osxapp
+jdk/src/java.desktop/macosx/native/libosxui : jdk/src/macosx/native/com/apple/laf
+jdk/src/java.desktop/macosx/native/libsplashscreen : jdk/src/macosx/native/sun/awt/splashscreen
+jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources : jdk/src/share/classes/com/sun/accessibility/internal/resources
+jdk/src/java.desktop/share/classes/com/sun/awt : jdk/src/share/classes/com/sun/awt
+jdk/src/java.desktop/share/classes/com/sun/beans/decoder : jdk/src/share/classes/com/sun/beans/decoder
+jdk/src/java.desktop/share/classes/com/sun/beans/editors : jdk/src/share/classes/com/sun/beans/editors
+jdk/src/java.desktop/share/classes/com/sun/beans/finder : jdk/src/share/classes/com/sun/beans/finder
+jdk/src/java.desktop/share/classes/com/sun/beans/infos : jdk/src/share/classes/com/sun/beans/infos
+jdk/src/java.desktop/share/classes/com/sun/beans : jdk/src/share/classes/com/sun/beans
+jdk/src/java.desktop/share/classes/com/sun/beans/util : jdk/src/share/classes/com/sun/beans/util
+jdk/src/java.desktop/share/classes/com/sun/imageio : jdk/src/share/classes/com/sun/imageio
+jdk/src/java.desktop/share/classes/com/sun/java/swing : jdk/src/share/classes/com/sun/java/swing
+jdk/src/java.desktop/share/classes/com/sun/media/sound : jdk/src/share/classes/com/sun/media/sound
+jdk/src/java.desktop/share/classes/com/sun/swing : jdk/src/share/classes/com/sun/swing
+jdk/src/java.desktop/share/classes/java/applet : jdk/src/share/classes/java/applet
+jdk/src/java.desktop/share/classes/java/awt : jdk/src/share/classes/java/awt
+jdk/src/java.desktop/share/classes/java/beans : jdk/src/share/classes/java/beans
+jdk/src/java.desktop/share/classes/javax/accessibility : jdk/src/share/classes/javax/accessibility
+jdk/src/java.desktop/share/classes/javax/imageio : jdk/src/share/classes/javax/imageio
+jdk/src/java.desktop/share/classes/javax/print : jdk/src/share/classes/javax/print
+jdk/src/java.desktop/share/classes/javax/sound : jdk/src/share/classes/javax/sound
+jdk/src/java.desktop/share/classes/javax/swing : jdk/src/share/classes/javax/swing
+jdk/src/java.desktop/share/classes/META-INF/services : jdk/src/share/classes/com/sun/media/sound/services
+jdk/src/java.desktop/share/classes/sun/applet : jdk/src/share/classes/sun/applet
+jdk/src/java.desktop/share/classes/sun/audio : jdk/src/share/classes/sun/audio
+jdk/src/java.desktop/share/classes/sun/awt : jdk/src/share/classes/sun/awt
+jdk/src/java.desktop/share/classes/sun/font : jdk/src/share/classes/sun/font
+jdk/src/java.desktop/share/classes/sun/java2d : jdk/src/share/classes/sun/java2d
+jdk/src/java.desktop/share/classes/sun/net/www/content/audio : jdk/src/share/classes/sun/net/www/content/audio
+jdk/src/java.desktop/share/classes/sun/net/www/content/image : jdk/src/share/classes/sun/net/www/content/image
+jdk/src/java.desktop/share/classes/sun/print/AttributeUpdater.java : jdk/src/share/classes/sun/print/AttributeUpdater.java
+jdk/src/java.desktop/share/classes/sun/print/BackgroundLookupListener.java : jdk/src/share/classes/sun/print/BackgroundLookupListener.java
+jdk/src/java.desktop/share/classes/sun/print/BackgroundServiceLookup.java : jdk/src/share/classes/sun/print/BackgroundServiceLookup.java
+jdk/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java : jdk/src/share/classes/sun/print/CustomMediaSizeName.java
+jdk/src/java.desktop/share/classes/sun/print/CustomMediaTray.java : jdk/src/share/classes/sun/print/CustomMediaTray.java
+jdk/src/java.desktop/share/classes/sun/print/DialogOwner.java : jdk/src/share/classes/sun/print/DialogOwner.java
+jdk/src/java.desktop/share/classes/sun/print/DocumentPropertiesUI.java : jdk/src/share/classes/sun/print/DocumentPropertiesUI.java
+jdk/src/java.desktop/share/classes/sun/print/ImagePrinter.java : jdk/src/share/classes/sun/print/ImagePrinter.java
+jdk/src/java.desktop/share/classes/sun/print/OpenBook.java : jdk/src/share/classes/sun/print/OpenBook.java
+jdk/src/java.desktop/share/classes/sun/print/PageableDoc.java : jdk/src/share/classes/sun/print/PageableDoc.java
+jdk/src/java.desktop/share/classes/sun/print/PathGraphics.java : jdk/src/share/classes/sun/print/PathGraphics.java
+jdk/src/java.desktop/share/classes/sun/print/PeekGraphics.java : jdk/src/share/classes/sun/print/PeekGraphics.java
+jdk/src/java.desktop/share/classes/sun/print/PeekMetrics.java : jdk/src/share/classes/sun/print/PeekMetrics.java
+jdk/src/java.desktop/share/classes/sun/print/PrinterGraphicsConfig.java : jdk/src/share/classes/sun/print/PrinterGraphicsConfig.java
+jdk/src/java.desktop/share/classes/sun/print/PrinterGraphicsDevice.java : jdk/src/share/classes/sun/print/PrinterGraphicsDevice.java
+jdk/src/java.desktop/share/classes/sun/print/PrinterJobWrapper.java : jdk/src/share/classes/sun/print/PrinterJobWrapper.java
+jdk/src/java.desktop/share/classes/sun/print/PrintJob2D.java : jdk/src/share/classes/sun/print/PrintJob2D.java
+jdk/src/java.desktop/share/classes/sun/print/PrintJobAttributeException.java : jdk/src/share/classes/sun/print/PrintJobAttributeException.java
+jdk/src/java.desktop/share/classes/sun/print/PrintJobFlavorException.java : jdk/src/share/classes/sun/print/PrintJobFlavorException.java
+jdk/src/java.desktop/share/classes/sun/print/ProxyGraphics2D.java : jdk/src/share/classes/sun/print/ProxyGraphics2D.java
+jdk/src/java.desktop/share/classes/sun/print/ProxyGraphics.java : jdk/src/share/classes/sun/print/ProxyGraphics.java
+jdk/src/java.desktop/share/classes/sun/print/ProxyPrintGraphics.java : jdk/src/share/classes/sun/print/ProxyPrintGraphics.java
+jdk/src/java.desktop/share/classes/sun/print/PSPathGraphics.java : jdk/src/share/classes/sun/print/PSPathGraphics.java
+jdk/src/java.desktop/share/classes/sun/print/PSPrinterJob.java : jdk/src/share/classes/sun/print/PSPrinterJob.java
+jdk/src/java.desktop/share/classes/sun/print/PSStreamPrinterFactory.java : jdk/src/share/classes/sun/print/PSStreamPrinterFactory.java
+jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java : jdk/src/share/classes/sun/print/PSStreamPrintJob.java
+jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java : jdk/src/share/classes/sun/print/PSStreamPrintService.java
+jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java : jdk/src/share/classes/sun/print/RasterPrinterJob.java
+jdk/src/java.desktop/share/classes/sun/print/resources : jdk/src/share/classes/sun/print/resources
+jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java : jdk/src/share/classes/sun/print/ServiceDialog.java
+jdk/src/java.desktop/share/classes/sun/print/ServiceNotifier.java : jdk/src/share/classes/sun/print/ServiceNotifier.java
+jdk/src/java.desktop/share/classes/sun/print/SunAlternateMedia.java : jdk/src/share/classes/sun/print/SunAlternateMedia.java
+jdk/src/java.desktop/share/classes/sun/print/SunMinMaxPage.java : jdk/src/share/classes/sun/print/SunMinMaxPage.java
+jdk/src/java.desktop/share/classes/sun/print/SunPageSelection.java : jdk/src/share/classes/sun/print/SunPageSelection.java
+jdk/src/java.desktop/share/classes/sun/print/SunPrinterJobService.java : jdk/src/share/classes/sun/print/SunPrinterJobService.java
+jdk/src/java.desktop/share/classes/sun/swing : jdk/src/share/classes/sun/swing
+jdk/src/java.desktop/share/conf/cmm/lcms : jdk/src/share/lib/cmm/lcms
+jdk/src/java.desktop/share/conf/images/cursors : jdk/src/share/lib/images/cursors
+jdk/src/java.desktop/share/conf/psfontj2d.properties : jdk/src/share/classes/sun/print/psfontj2d.properties
+jdk/src/java.desktop/share/conf/psfont.properties.ja : jdk/src/share/classes/sun/print/psfont.properties.ja
+jdk/src/java.desktop/share/conf/sound.properties : jdk/src/share/lib/sound.properties
+jdk/src/java.desktop/share/native/common/sun/awt/debug : jdk/src/share/native/sun/awt/debug
+jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCopy_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c
+jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCreate.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.c
+jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_sys.c : jdk/src/share/native/sun/awt/medialib/mlib_sys.c
+jdk/src/java.desktop/share/native/common/sun/awt/utility/rect.c : jdk/src/share/native/sun/awt/utility/rect.c
+jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.c : jdk/src/share/native/sun/font/AccelGlyphCache.c
+jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.h : jdk/src/share/native/sun/font/AccelGlyphCache.h
+jdk/src/java.desktop/share/native/common/sun/font/fontscalerdefs.h : jdk/src/share/native/sun/font/fontscalerdefs.h
+jdk/src/java.desktop/share/native/common/sun/font/sunfontids.h : jdk/src/share/native/sun/font/sunfontids.h
+jdk/src/java.desktop/share/native/common/sun/java2d/opengl/J2D_GL : jdk/src/share/native/sun/java2d/opengl/J2D_GL
+jdk/src/java.desktop/share/native/common/sun/java2d/opengl : jdk/src/share/native/sun/java2d/opengl
+jdk/src/java.desktop/share/native/include/jawt.h : jdk/src/share/javavm/export/jawt.h
+jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils : jdk/src/share/native/sun/awt/image/cvutils
+jdk/src/java.desktop/share/native/libawt/sun/awt/image/gif/gifdecoder.c : jdk/src/share/native/sun/awt/image/gif/gifdecoder.c
+jdk/src/java.desktop/share/native/libawt/sun/awt/image : jdk/src/share/native/sun/awt/image
+jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.c : jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c
+jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.h : jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.h
+jdk/src/java.desktop/share/native/libawt/sun/java2d : jdk/src/share/native/sun/java2d
+jdk/src/java.desktop/share/native/libawt/sun/java2d/loops : jdk/src/share/native/sun/java2d/loops
+jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe : jdk/src/share/native/sun/java2d/pipe
+jdk/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c : jdk/src/share/native/sun/font/DrawGlyphList.c
+jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.cpp : jdk/src/share/native/sun/font/FontInstanceAdapter.cpp
+jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.h : jdk/src/share/native/sun/font/FontInstanceAdapter.h
+jdk/src/java.desktop/share/native/libfontmanager/fontscaler.h : jdk/src/share/native/sun/font/fontscaler.h
+jdk/src/java.desktop/share/native/libfontmanager/freetypeScaler.c : jdk/src/share/native/sun/font/freetypeScaler.c
+jdk/src/java.desktop/share/native/libfontmanager/glyphblitting.h : jdk/src/share/native/sun/font/glyphblitting.h
+jdk/src/java.desktop/share/native/libfontmanager/layout : jdk/src/share/native/sun/font/layout
+jdk/src/java.desktop/share/native/libfontmanager/sunFont.c : jdk/src/share/native/sun/font/sunFont.c
+jdk/src/java.desktop/share/native/libjavajpeg : jdk/src/share/native/sun/awt/image/jpeg
+jdk/src/java.desktop/share/native/libjsound : jdk/src/share/native/com/sun/media/sound
+jdk/src/java.desktop/share/native/liblcms : jdk/src/share/native/sun/java2d/cmm/lcms
+jdk/src/java.desktop/share/native/libmlib_image/j2d_names.h : jdk/src/share/native/sun/awt/medialib/j2d_names.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_S16.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_S16.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_U16.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_U16.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_S16.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_S16.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_U16.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_U16.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BC.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BC.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BL.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BL.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_NN.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_NN.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.h : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageBlendTable.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvClearEdge.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvClearEdge.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvCopyEdge.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvCopyEdge.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv_f.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConv_f.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConv.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvVersion.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvVersion.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageCopy.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp_f.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.h : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1.h : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1_U8.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1_U8.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib.h : jdk/src/share/native/sun/awt/medialib/mlib.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_D64.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_D64.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_F32.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_F32.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_S32.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_S32.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_D64.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_D64.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_F32.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_F32.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_S32.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_S32.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffineEdge.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffineEdge.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN_Bit.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_image_blend_proto.h : jdk/src/share/native/sun/awt/medialib/mlib_image_blend_proto.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCheck.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageCheck.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageClipping.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageClipping.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColormap.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageColormap.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColorTrue2Index.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageColorTrue2Index.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv2x2_f.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Bit.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Fp.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Fp.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvCopyEdge_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Bit.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_D64nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_D64nw.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvEdge.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvEdge.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_F32nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_F32nw.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvKernelConvert.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_ext.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_Fp.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_Fp.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCopy.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCreate.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageDivTables.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageDivTables.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageFilters.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageFilters.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_image_get.h : jdk/src/share/native/sun/awt/medialib/mlib_image_get.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_image.h : jdk/src/share/native/sun/awt/medialib/mlib_image.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_64.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h : jdk/src/share/native/sun/awt/medialib/mlib_image_proto.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageRowTable.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageRowTable.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageScanPoly.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageScanPoly.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_image_types.h : jdk/src/share/native/sun/awt/medialib/mlib_image_types.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageUtils.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c
+jdk/src/java.desktop/share/native/libmlib_image/mlib_status.h : jdk/src/share/native/sun/awt/medialib/mlib_status.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_sys.h : jdk/src/share/native/sun/awt/medialib/mlib_sys.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_SysMath.h : jdk/src/share/native/sun/awt/medialib/mlib_SysMath.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_sys_proto.h : jdk/src/share/native/sun/awt/medialib/mlib_sys_proto.h
+jdk/src/java.desktop/share/native/libmlib_image/mlib_types.h : jdk/src/share/native/sun/awt/medialib/mlib_types.h
+jdk/src/java.desktop/share/native/libmlib_image/safe_alloc.h : jdk/src/share/native/sun/awt/medialib/safe_alloc.h
+jdk/src/java.desktop/share/native/libmlib_image/safe_math.h : jdk/src/share/native/sun/awt/medialib/safe_math.h
+jdk/src/java.desktop/share/native/libsplashscreen/giflib : jdk/src/share/native/sun/awt/giflib
+jdk/src/java.desktop/share/native/libsplashscreen : jdk/src/share/native/sun/awt/splashscreen
+jdk/src/java.desktop/share/native/libsplashscreen/libpng : jdk/src/share/native/sun/awt/libpng
+jdk/src/java.desktop/unix/classes/META-INF/services : jdk/src/solaris/classes/sun/print/services
+jdk/src/java.desktop/unix/classes/sun/awt : jdk/src/solaris/classes/sun/awt
+jdk/src/java.desktop/unix/classes/sun/awt/motif/MFontConfiguration.java : jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java
+jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643.java : jdk/src/solaris/classes/sun/awt/motif/X11CNS11643.java
+jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P1.java : jdk/src/solaris/classes/sun/awt/motif/X11CNS11643P1.java
+jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P2.java : jdk/src/solaris/classes/sun/awt/motif/X11CNS11643P2.java
+jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P3.java : jdk/src/solaris/classes/sun/awt/motif/X11CNS11643P3.java
+jdk/src/java.desktop/unix/classes/sun/awt/motif/X11Dingbats.java : jdk/src/solaris/classes/sun/awt/motif/X11Dingbats.java
+jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB18030_0.java : jdk/src/solaris/classes/sun/awt/motif/X11GB18030_0.java
+jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB18030_1.java : jdk/src/solaris/classes/sun/awt/motif/X11GB18030_1.java
+jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB2312.java : jdk/src/solaris/classes/sun/awt/motif/X11GB2312.java
+jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GBK.java : jdk/src/solaris/classes/sun/awt/motif/X11GBK.java
+jdk/src/java.desktop/unix/classes/sun/awt/motif/X11JIS0201.java : jdk/src/solaris/classes/sun/awt/motif/X11JIS0201.java
+jdk/src/java.desktop/unix/classes/sun/awt/motif/X11JIS0208.java : jdk/src/solaris/classes/sun/awt/motif/X11JIS0208.java
+jdk/src/java.desktop/unix/classes/sun/awt/motif/X11JIS0212.java : jdk/src/solaris/classes/sun/awt/motif/X11JIS0212.java
+jdk/src/java.desktop/unix/classes/sun/awt/motif/X11Johab.java : jdk/src/solaris/classes/sun/awt/motif/X11Johab.java
+jdk/src/java.desktop/unix/classes/sun/awt/motif/X11KSC5601.java : jdk/src/solaris/classes/sun/awt/motif/X11KSC5601.java
+jdk/src/java.desktop/unix/classes/sun/awt/motif/X11SunUnicode_0.java : jdk/src/solaris/classes/sun/awt/motif/X11SunUnicode_0.java
+jdk/src/java.desktop/unix/classes/sun/awt/windows/ThemeReader.java : jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java
+jdk/src/java.desktop/unix/classes/sun/awt/X11/doc-files/Modality.txt : jdk/src/solaris/classes/sun/awt/X11/doc-files/Modality.txt
+jdk/src/java.desktop/unix/classes/sun/awt/X11 : jdk/src/solaris/classes/sun/awt/X11
+jdk/src/java.desktop/unix/classes/sun/font : jdk/src/solaris/classes/sun/font
+jdk/src/java.desktop/unix/classes/sun/java2d : jdk/src/solaris/classes/sun/java2d
+jdk/src/java.desktop/unix/classes/sun/java2d/jules : jdk/src/solaris/classes/sun/java2d/jules
+jdk/src/java.desktop/unix/classes/sun/java2d/opengl : jdk/src/solaris/classes/sun/java2d/opengl
+jdk/src/java.desktop/unix/classes/sun/java2d/x11 : jdk/src/solaris/classes/sun/java2d/x11
+jdk/src/java.desktop/unix/classes/sun/java2d/xr : jdk/src/solaris/classes/sun/java2d/xr
+jdk/src/java.desktop/unix/classes/sun/print : jdk/src/solaris/classes/sun/print
+jdk/src/java.desktop/unix/conf/flavormap.properties : jdk/src/solaris/lib/flavormap.properties
+jdk/src/java.desktop/unix/conf/fonts/fonts.dir : jdk/src/solaris/classes/sun/awt/motif/java.fonts.dir
+jdk/src/java.desktop/unix/conf/images/cursors/cursors.properties : jdk/src/solaris/lib/images/cursors/cursors.properties
+jdk/src/java.desktop/unix/native/common/sun/awt/awt_Component.h : jdk/src/solaris/native/sun/awt/awt_Component.h
+jdk/src/java.desktop/unix/native/common/sun/awt/awt_DrawingSurface.h : jdk/src/solaris/native/sun/awt/awt_DrawingSurface.h
+jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.c : jdk/src/solaris/native/sun/awt/awt_Font.c
+jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.h : jdk/src/solaris/native/sun/awt/awt_Font.h
+jdk/src/java.desktop/unix/native/common/sun/awt/awt_GraphicsEnv.h : jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h
+jdk/src/java.desktop/unix/native/common/sun/awt/awt.h : jdk/src/solaris/native/sun/awt/awt.h
+jdk/src/java.desktop/unix/native/common/sun/awt/awt_Mlib.h : jdk/src/solaris/native/sun/awt/awt_Mlib.h
+jdk/src/java.desktop/unix/native/common/sun/awt/awt_p.h : jdk/src/solaris/native/sun/awt/awt_p.h
+jdk/src/java.desktop/unix/native/common/sun/awt/awt_util.h : jdk/src/solaris/native/sun/awt/awt_util.h
+jdk/src/java.desktop/unix/native/common/sun/awt/colordata.h : jdk/src/solaris/native/sun/awt/colordata.h
+jdk/src/java.desktop/unix/native/common/sun/awt/color.h : jdk/src/solaris/native/sun/awt/color.h
+jdk/src/java.desktop/unix/native/common/sun/awt/CUPSfuncs.c : jdk/src/solaris/native/sun/awt/CUPSfuncs.c
+jdk/src/java.desktop/unix/native/common/sun/awt/fontconfig.h : jdk/src/solaris/native/sun/awt/fontconfig.h
+jdk/src/java.desktop/unix/native/common/sun/awt/fontpath.c : jdk/src/solaris/native/sun/awt/fontpath.c
+jdk/src/java.desktop/unix/native/common/sun/awt/img_util_md.h : jdk/src/solaris/native/sun/awt/img_util_md.h
+jdk/src/java.desktop/unix/native/common/sun/awt/initIDs.c : jdk/src/solaris/native/sun/awt/initIDs.c
+jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.c
+jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.h
+jdk/src/java.desktop/unix/native/common/sun/awt/medialib/vis_proto.h : jdk/src/solaris/native/sun/awt/medialib/vis_proto.h
+jdk/src/java.desktop/unix/native/common/sun/awt/utility/rect.h : jdk/src/solaris/native/sun/awt/utility/rect.h
+jdk/src/java.desktop/unix/native/common/sun/awt/X11Color.c : jdk/src/solaris/native/sun/awt/X11Color.c
+jdk/src/java.desktop/unix/native/common/sun/font/X11FontScaler.h : jdk/src/solaris/native/sun/font/X11FontScaler.h
+jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/J2D_GL : jdk/src/solaris/native/sun/java2d/opengl/J2D_GL
+jdk/src/java.desktop/unix/native/common/sun/java2d/opengl : jdk/src/solaris/native/sun/java2d/opengl
+jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11FontScaler_md.c : jdk/src/solaris/native/sun/java2d/x11/X11FontScaler_md.c
+jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11PMBlitLoops.c : jdk/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c
+jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11Renderer.c : jdk/src/solaris/native/sun/java2d/x11/X11Renderer.c
+jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.c : jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.h : jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h
+jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11TextRenderer_md.c : jdk/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c
+jdk/src/java.desktop/unix/native/include/jawt_md.h : jdk/src/solaris/javavm/export/jawt_md.h
+jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/HeadlessToolkit.c : jdk/src/solaris/native/sun/awt/HeadlessToolkit.c
+jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingArea.c : jdk/src/solaris/native/sun/awt/VDrawingArea.c
+jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_LoadLibrary.c : jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
+jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_Mlib.c : jdk/src/solaris/native/sun/awt/awt_Mlib.c
+jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy_blk.s : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_blk.s
+jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy.c
+jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/vis_asi.h : jdk/src/solaris/native/sun/awt/medialib/vis_asi.h
+jdk/src/java.desktop/unix/native/libawt/sun/java2d/j2d_md.h : jdk/src/solaris/native/sun/java2d/j2d_md.h
+jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops : jdk/src/solaris/native/sun/java2d/loops
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.c : jdk/src/solaris/native/sun/awt/awt_AWTEvent.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.h : jdk/src/solaris/native/sun/awt/awt_AWTEvent.h
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_DrawingSurface.c : jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.c : jdk/src/solaris/native/sun/awt/awt_Event.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.h : jdk/src/solaris/native/sun/awt/awt_Event.h
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_GraphicsEnv.c : jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_InputMethod.c : jdk/src/solaris/native/sun/awt/awt_InputMethod.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.c : jdk/src/solaris/native/sun/awt/awt_Insets.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.h : jdk/src/solaris/native/sun/awt/awt_Insets.h
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_MenuComponent.h : jdk/src/solaris/native/sun/awt/awt_MenuComponent.h
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Robot.c : jdk/src/solaris/native/sun/awt/awt_Robot.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_UNIXToolkit.c : jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_util.c : jdk/src/solaris/native/sun/awt/awt_util.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/canvas.h : jdk/src/solaris/native/sun/awt/canvas.h
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.c : jdk/src/solaris/native/sun/awt/gtk2_interface.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.h : jdk/src/solaris/native/sun/awt/gtk2_interface.h
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/HPkeysym.h : jdk/src/solaris/native/sun/awt/HPkeysym.h
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.c : jdk/src/solaris/native/sun/awt/list.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.h : jdk/src/solaris/native/sun/awt/list.h
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.c : jdk/src/solaris/native/sun/awt/multi_font.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.h : jdk/src/solaris/native/sun/awt/multi_font.h
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.c : jdk/src/solaris/native/sun/awt/multiVis.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.h : jdk/src/solaris/native/sun/awt/multiVis.h
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/randr.h : jdk/src/solaris/native/sun/awt/randr.h
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.c : jdk/src/solaris/native/sun/awt/robot_common.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.h : jdk/src/solaris/native/sun/awt/robot_common.h
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/sun_awt_X11_GtkFileDialogPeer.c : jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKEngine.c : jdk/src/solaris/native/sun/awt/swing_GTKEngine.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKStyle.c : jdk/src/solaris/native/sun/awt/swing_GTKStyle.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/wsutils.h : jdk/src/solaris/native/sun/awt/wsutils.h
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/Xrandr.h : jdk/src/solaris/native/sun/awt/Xrandr.h
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRBackendNative.c : jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRSurfaceData.c : jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
+jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt : jdk/src/solaris/native/sun/xawt
+jdk/src/java.desktop/unix/native/libfontmanager/X11FontScaler.c : jdk/src/solaris/native/sun/font/X11FontScaler.c
+jdk/src/java.desktop/unix/native/libfontmanager/X11TextRenderer.c : jdk/src/solaris/native/sun/font/X11TextRenderer.c
+jdk/src/java.desktop/unix/native/libjawt/jawt.c : jdk/src/solaris/native/sun/awt/jawt.c
+jdk/src/java.desktop/unix/native/libjsound : jdk/src/solaris/native/com/sun/media/sound
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_ImageConvCopyEdge_Fp.c : jdk/src/solaris/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Fp.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_S16.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_S16.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_U16.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_U16.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.h
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_U16.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_U16.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffineIndex_BC.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffineIndex_BC.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_NN.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_NN.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_1.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_1.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_43.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_43.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.h
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_1.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert_1.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.h
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv_8nw.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv_8nw.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvClearEdge.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvClearEdge.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvCopyEdge.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvCopyEdge.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv.h
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8ext.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8ext.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvVersion.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvVersion.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.h
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUp.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUp.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpFunc.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpFunc.h
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16S16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16S32Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U8Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S32Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U8Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S32Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U8Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S32Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U8Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16S16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16S32Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U8Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S32Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U8Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S32Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U8Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S32Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U16Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U8Func.c
+jdk/src/java.desktop/unix/native/libmlib_image/vis_32.il : jdk/src/solaris/native/sun/awt/medialib/vis_32.il
+jdk/src/java.desktop/unix/native/libmlib_image/vis_64.il : jdk/src/solaris/native/sun/awt/medialib/vis_64.il
+jdk/src/java.desktop/unix/native/libsplashscreen : jdk/src/solaris/native/sun/awt/splashscreen
+jdk/src/java.desktop/unix/native/libsunwjdga : jdk/src/solaris/native/sun/jdga
+jdk/src/java.desktop/windows/classes/META-INF/services : jdk/src/windows/classes/sun/print/services
+jdk/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java : jdk/src/windows/classes/sun/awt/windows/ThemeReader.java
+jdk/src/java.desktop/windows/classes/sun/font : jdk/src/windows/classes/sun/font
+jdk/src/java.desktop/windows/conf/flavormap.properties : jdk/src/windows/lib/flavormap.properties
+jdk/src/java.desktop/windows/conf/images/cursors/cursors.properties : jdk/src/windows/lib/images/cursors/cursors.properties
+jdk/src/java.desktop/windows/native/common/sun/awt/utility/rect.h : jdk/src/windows/native/sun/awt/utility/rect.h
+jdk/src/java.desktop/windows/native/include/jawt_md.h : jdk/src/windows/javavm/export/jawt_md.h
+jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d : jdk/src/windows/native/sun/java2d/d3d
+jdk/src/java.desktop/windows/native/libawt/sun/java2d : jdk/src/windows/native/sun/java2d
+jdk/src/java.desktop/windows/native/libawt/sun/windows/alloc.h : jdk/src/windows/native/sun/windows/alloc.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.cpp : jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.h : jdk/src/windows/native/sun/windows/awt_AWTEvent.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.cpp : jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.h : jdk/src/windows/native/sun/windows/awt_BitmapUtil.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.cpp : jdk/src/windows/native/sun/windows/awt_Brush.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.h : jdk/src/windows/native/sun/windows/awt_Brush.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.cpp : jdk/src/windows/native/sun/windows/awt_Button.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.h : jdk/src/windows/native/sun/windows/awt_Button.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.cpp : jdk/src/windows/native/sun/windows/awt_Canvas.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.h : jdk/src/windows/native/sun/windows/awt_Canvas.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.cpp : jdk/src/windows/native/sun/windows/awt_Checkbox.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.h : jdk/src/windows/native/sun/windows/awt_Checkbox.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.cpp : jdk/src/windows/native/sun/windows/awt_Choice.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.h : jdk/src/windows/native/sun/windows/awt_Choice.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.cpp : jdk/src/windows/native/sun/windows/awt_Clipboard.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.h : jdk/src/windows/native/sun/windows/awt_Clipboard.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.cpp : jdk/src/windows/native/sun/windows/awt_Color.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.h : jdk/src/windows/native/sun/windows/awt_Color.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.cpp : jdk/src/windows/native/sun/windows/awt_Component.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.h : jdk/src/windows/native/sun/windows/awt_Component.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.cpp : jdk/src/windows/native/sun/windows/awt_Container.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.h : jdk/src/windows/native/sun/windows/awt_Container.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.cpp : jdk/src/windows/native/sun/windows/awt_Cursor.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.h : jdk/src/windows/native/sun/windows/awt_Cursor.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_CustomPaletteDef.h : jdk/src/windows/native/sun/windows/awt_CustomPaletteDef.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.cpp : jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.h : jdk/src/windows/native/sun/windows/awt_DataTransferer.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.cpp : jdk/src/windows/native/sun/windows/awt_DCHolder.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.h : jdk/src/windows/native/sun/windows/awt_DCHolder.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.cpp : jdk/src/windows/native/sun/windows/awt_Debug.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.h : jdk/src/windows/native/sun/windows/awt_Debug.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Desktop.cpp : jdk/src/windows/native/sun/windows/awt_Desktop.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.cpp : jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.h : jdk/src/windows/native/sun/windows/awt_DesktopProperties.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.cpp : jdk/src/windows/native/sun/windows/awt_Dialog.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.h : jdk/src/windows/native/sun/windows/awt_Dialog.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.cpp : jdk/src/windows/native/sun/windows/awt_Dimension.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.h : jdk/src/windows/native/sun/windows/awt_Dimension.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.cpp : jdk/src/windows/native/sun/windows/awt_DnDDS.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.h : jdk/src/windows/native/sun/windows/awt_DnDDS.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.cpp : jdk/src/windows/native/sun/windows/awt_DnDDT.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.h : jdk/src/windows/native/sun/windows/awt_DnDDT.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.cpp : jdk/src/windows/native/sun/windows/awt_DrawingSurface.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.h : jdk/src/windows/native/sun/windows/awt_DrawingSurface.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.cpp : jdk/src/windows/native/sun/windows/awt_Event.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.h : jdk/src/windows/native/sun/windows/awt_Event.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.cpp : jdk/src/windows/native/sun/windows/awt_FileDialog.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.h : jdk/src/windows/native/sun/windows/awt_FileDialog.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.cpp : jdk/src/windows/native/sun/windows/awt_Font.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.h : jdk/src/windows/native/sun/windows/awt_Font.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.cpp : jdk/src/windows/native/sun/windows/awt_Frame.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.h : jdk/src/windows/native/sun/windows/awt_Frame.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.cpp : jdk/src/windows/native/sun/windows/awt_GDIObject.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.h : jdk/src/windows/native/sun/windows/awt_GDIObject.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.h : jdk/src/windows/native/sun/windows/awt.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.cpp : jdk/src/windows/native/sun/windows/awt_IconCursor.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.h : jdk/src/windows/native/sun/windows/awt_IconCursor.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.cpp : jdk/src/windows/native/sun/windows/awt_InputEvent.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.h : jdk/src/windows/native/sun/windows/awt_InputEvent.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputMethod.cpp : jdk/src/windows/native/sun/windows/awt_InputMethod.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.cpp : jdk/src/windows/native/sun/windows/awt_InputTextInfor.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.h : jdk/src/windows/native/sun/windows/awt_InputTextInfor.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.cpp : jdk/src/windows/native/sun/windows/awt_Insets.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.h : jdk/src/windows/native/sun/windows/awt_Insets.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyboardFocusManager.cpp : jdk/src/windows/native/sun/windows/awt_KeyboardFocusManager.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.cpp : jdk/src/windows/native/sun/windows/awt_KeyEvent.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.h : jdk/src/windows/native/sun/windows/awt_KeyEvent.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.cpp : jdk/src/windows/native/sun/windows/awt_Label.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.h : jdk/src/windows/native/sun/windows/awt_Label.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.cpp : jdk/src/windows/native/sun/windows/awt_List.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.h : jdk/src/windows/native/sun/windows/awt_List.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.cpp : jdk/src/windows/native/sun/windows/awt_MenuBar.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.h : jdk/src/windows/native/sun/windows/awt_MenuBar.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.cpp : jdk/src/windows/native/sun/windows/awt_Menu.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.h : jdk/src/windows/native/sun/windows/awt_Menu.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.cpp : jdk/src/windows/native/sun/windows/awt_MenuItem.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.h : jdk/src/windows/native/sun/windows/awt_MenuItem.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.cpp : jdk/src/windows/native/sun/windows/awt_Mlib.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.h : jdk/src/windows/native/sun/windows/awt_Mlib.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.cpp : jdk/src/windows/native/sun/windows/awt_MouseEvent.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.h : jdk/src/windows/native/sun/windows/awt_MouseEvent.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awtmsg.h : jdk/src/windows/native/sun/windows/awtmsg.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.cpp : jdk/src/windows/native/sun/windows/awt_new.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.h : jdk/src/windows/native/sun/windows/awt_new.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.cpp : jdk/src/windows/native/sun/windows/awt_Object.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.h : jdk/src/windows/native/sun/windows/awt_Object.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.cpp : jdk/src/windows/native/sun/windows/awt_ole.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.h : jdk/src/windows/native/sun/windows/awt_ole.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.cpp : jdk/src/windows/native/sun/windows/awt_Palette.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.h : jdk/src/windows/native/sun/windows/awt_Palette.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.cpp : jdk/src/windows/native/sun/windows/awt_Panel.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.h : jdk/src/windows/native/sun/windows/awt_Panel.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.cpp : jdk/src/windows/native/sun/windows/awt_Pen.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.h : jdk/src/windows/native/sun/windows/awt_Pen.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.cpp : jdk/src/windows/native/sun/windows/awt_PopupMenu.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.h : jdk/src/windows/native/sun/windows/awt_PopupMenu.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.cpp : jdk/src/windows/native/sun/windows/awt_PrintControl.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.h : jdk/src/windows/native/sun/windows/awt_PrintControl.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.cpp : jdk/src/windows/native/sun/windows/awt_PrintDialog.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.h : jdk/src/windows/native/sun/windows/awt_PrintDialog.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintJob.cpp : jdk/src/windows/native/sun/windows/awt_PrintJob.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.rc : jdk/src/windows/native/sun/windows/awt.rc
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.cpp : jdk/src/windows/native/sun/windows/awt_Rectangle.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.h : jdk/src/windows/native/sun/windows/awt_Rectangle.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.cpp : jdk/src/windows/native/sun/windows/awt_Robot.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.h : jdk/src/windows/native/sun/windows/awt_Robot.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.cpp : jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.h : jdk/src/windows/native/sun/windows/awt_Scrollbar.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.cpp : jdk/src/windows/native/sun/windows/awt_ScrollPane.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.h : jdk/src/windows/native/sun/windows/awt_ScrollPane.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.cpp : jdk/src/windows/native/sun/windows/awt_TextArea.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.h : jdk/src/windows/native/sun/windows/awt_TextArea.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.cpp : jdk/src/windows/native/sun/windows/awt_TextComponent.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.h : jdk/src/windows/native/sun/windows/awt_TextComponent.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.cpp : jdk/src/windows/native/sun/windows/awt_TextField.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.h : jdk/src/windows/native/sun/windows/awt_TextField.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.cpp : jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.h : jdk/src/windows/native/sun/windows/awt_Toolkit.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.cpp : jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.h : jdk/src/windows/native/sun/windows/awt_TrayIcon.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.h : jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.h : jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsEnv.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.cpp : jdk/src/windows/native/sun/windows/awt_Window.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.h : jdk/src/windows/native/sun/windows/awt_Window.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/check.bmp : jdk/src/windows/native/sun/windows/check.bmp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.cpp : jdk/src/windows/native/sun/windows/CmdIDList.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.h : jdk/src/windows/native/sun/windows/CmdIDList.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/colordata.h : jdk/src/windows/native/sun/windows/colordata.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.cpp : jdk/src/windows/native/sun/windows/ComCtl32Util.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.h : jdk/src/windows/native/sun/windows/ComCtl32Util.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.cpp : jdk/src/windows/native/sun/windows/Devices.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.h : jdk/src/windows/native/sun/windows/Devices.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.cpp : jdk/src/windows/native/sun/windows/DllUtil.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.h : jdk/src/windows/native/sun/windows/DllUtil.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.cpp : jdk/src/windows/native/sun/windows/GDIHashtable.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.h : jdk/src/windows/native/sun/windows/GDIHashtable.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/hand.cur : jdk/src/windows/native/sun/windows/hand.cur
+jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.cpp : jdk/src/windows/native/sun/windows/Hashtable.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.h : jdk/src/windows/native/sun/windows/Hashtable.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/img_util_md.h : jdk/src/windows/native/sun/windows/img_util_md.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/initIDs.cpp : jdk/src/windows/native/sun/windows/initIDs.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/mlib_types_md.h : jdk/src/windows/native/sun/windows/mlib_types_md.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/MouseInfo.cpp : jdk/src/windows/native/sun/windows/MouseInfo.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.cpp : jdk/src/windows/native/sun/windows/ObjectList.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.h : jdk/src/windows/native/sun/windows/ObjectList.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/README.JNI : jdk/src/windows/native/sun/windows/README.JNI
+jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_bw.ico : jdk/src/windows/native/sun/windows/security_warning_bw.ico
+jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning.ico : jdk/src/windows/native/sun/windows/security_warning.ico
+jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_int.ico : jdk/src/windows/native/sun/windows/security_warning_int.ico
+jdk/src/java.desktop/windows/native/libawt/sun/windows/ShellFolder2.cpp : jdk/src/windows/native/sun/windows/ShellFolder2.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/stdhdrs.h : jdk/src/windows/native/sun/windows/stdhdrs.h
+jdk/src/java.desktop/windows/native/libawt/sun/windows/ThemeReader.cpp : jdk/src/windows/native/sun/windows/ThemeReader.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/WBufferStrategy.cpp : jdk/src/windows/native/sun/windows/WBufferStrategy.cpp
+jdk/src/java.desktop/windows/native/libawt/sun/windows/WPrinterJob.cpp : jdk/src/windows/native/sun/windows/WPrinterJob.cpp
+jdk/src/java.desktop/windows/native/libfontmanager : jdk/src/windows/native/sun/font
+jdk/src/java.desktop/windows/native/libjawt/jawt.cpp : jdk/src/windows/native/sun/windows/jawt.cpp
+jdk/src/java.desktop/windows/native/libjsound : jdk/src/windows/native/com/sun/media/sound
+jdk/src/java.desktop/windows/native/libsplashscreen : jdk/src/windows/native/sun/awt/splashscreen
+jdk/src/java.instrument/share/classes/java/lang/instrument : jdk/src/share/classes/java/lang/instrument
+jdk/src/java.instrument/share/classes/sun/instrument : jdk/src/share/classes/sun/instrument
+jdk/src/java.instrument/share/native/libinstrument : jdk/src/share/instrument
+jdk/src/java.instrument/unix/native/libinstrument : jdk/src/solaris/instrument
+jdk/src/java.instrument/windows/native/libinstrument : jdk/src/windows/instrument
+jdk/src/java.logging/share/classes/java/util/logging : jdk/src/share/classes/java/util/logging
+jdk/src/java.logging/share/classes/sun/net/www/protocol/http/logging : jdk/src/share/classes/sun/net/www/protocol/http/logging
+jdk/src/java.logging/share/classes/sun/util/logging/resources : jdk/src/share/classes/sun/util/logging/resources
+jdk/src/java.logging/share/conf/logging.properties : jdk/src/share/lib/logging.properties
+jdk/src/java.management/share/classes/com/sun/jmx/defaults : jdk/src/share/classes/com/sun/jmx/defaults
+jdk/src/java.management/share/classes/com/sun/jmx/interceptor : jdk/src/share/classes/com/sun/jmx/interceptor
+jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver : jdk/src/share/classes/com/sun/jmx/mbeanserver
+jdk/src/java.management/share/classes/com/sun/jmx/remote : jdk/src/share/classes/com/sun/jmx/remote
+jdk/src/java.management/share/classes/com/sun/management : jdk/src/share/classes/com/sun/management
+jdk/src/java.management/share/classes/java/lang/management : jdk/src/share/classes/java/lang/management
+jdk/src/java.management/share/classes/javax/management : jdk/src/share/classes/javax/management
+jdk/src/java.management/share/classes/mgmt-overview.html : jdk/src/share/classes/com/sun/management/mgmt-overview.html
+jdk/src/java.management/share/classes/sun/management/counter : jdk/src/share/classes/sun/management/counter
+jdk/src/java.management/share/classes/sun/management/counter/perf : jdk/src/share/classes/sun/management/counter/perf
+jdk/src/java.management/share/classes/sun/management : jdk/src/share/classes/sun/management
+jdk/src/java.management/share/classes/sun/management/jdp : jdk/src/share/classes/sun/management/jdp
+jdk/src/java.management/share/classes/sun/management/jmxremote : jdk/src/share/classes/sun/management/jmxremote
+jdk/src/java.management/share/classes/sun/management/resources : jdk/src/share/classes/sun/management/resources
+jdk/src/java.management/share/conf : jdk/src/share/lib/management
+jdk/src/java.management/share/native/include/jmm.h : jdk/src/share/javavm/export/jmm.h
+jdk/src/java.management/share/native/libmanagement : jdk/src/share/native/sun/management
+jdk/src/java.management/unix/classes/sun/management : jdk/src/solaris/classes/sun/management
+jdk/src/java.management/unix/native/libmanagement : jdk/src/solaris/native/sun/management
+jdk/src/java.management/windows/classes/sun/management : jdk/src/windows/classes/sun/management
+jdk/src/java.management/windows/native/libmanagement : jdk/src/windows/native/sun/management
+jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ext : jdk/src/share/classes/com/sun/jndi/ldap/ext
+jdk/src/java.naming/share/classes/com/sun/jndi/ldap : jdk/src/share/classes/com/sun/jndi/ldap
+jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool : jdk/src/share/classes/com/sun/jndi/ldap/pool
+jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl : jdk/src/share/classes/com/sun/jndi/ldap/sasl
+jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx : jdk/src/share/classes/com/sun/jndi/toolkit/ctx
+jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir : jdk/src/share/classes/com/sun/jndi/toolkit/dir
+jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url : jdk/src/share/classes/com/sun/jndi/toolkit/url
+jdk/src/java.naming/share/classes/com/sun/jndi/url/ldap : jdk/src/share/classes/com/sun/jndi/url/ldap
+jdk/src/java.naming/share/classes/com/sun/jndi/url/ldaps : jdk/src/share/classes/com/sun/jndi/url/ldaps
+jdk/src/java.naming/share/classes/com/sun/naming/internal : jdk/src/share/classes/com/sun/naming/internal
+jdk/src/java.naming/share/classes/javax/naming/directory : jdk/src/share/classes/javax/naming/directory
+jdk/src/java.naming/share/classes/javax/naming/event : jdk/src/share/classes/javax/naming/event
+jdk/src/java.naming/share/classes/javax/naming : jdk/src/share/classes/javax/naming
+jdk/src/java.naming/share/classes/javax/naming/ldap : jdk/src/share/classes/javax/naming/ldap
+jdk/src/java.naming/share/classes/javax/naming/spi : jdk/src/share/classes/javax/naming/spi
+jdk/src/java.naming/share/classes/sun/security/provider/certpath/ldap : jdk/src/share/classes/sun/security/provider/certpath/ldap
+jdk/src/java.prefs/macosx/native/libprefs : jdk/src/macosx/native/java/util/prefs
+jdk/src/java.prefs/unix/classes/java/util/prefs : jdk/src/solaris/classes/java/util/prefs
+jdk/src/java.prefs/unix/native/libprefs : jdk/src/solaris/native/java/util/prefs
+jdk/src/java.prefs/windows/native/libprefs : jdk/src/windows/native/java/util/prefs
+jdk/src/java.rmi/share/classes/com/sun/rmi/rmid : jdk/src/share/classes/com/sun/rmi/rmid
+jdk/src/java.rmi/share/classes/java/rmi/activation : jdk/src/share/classes/java/rmi/activation
+jdk/src/java.rmi/share/classes/java/rmi/dgc : jdk/src/share/classes/java/rmi/dgc
+jdk/src/java.rmi/share/classes/java/rmi : jdk/src/share/classes/java/rmi
+jdk/src/java.rmi/share/classes/java/rmi/registry : jdk/src/share/classes/java/rmi/registry
+jdk/src/java.rmi/share/classes/java/rmi/server : jdk/src/share/classes/java/rmi/server
+jdk/src/java.rmi/share/classes/javax/rmi/ssl : jdk/src/share/classes/javax/rmi/ssl
+jdk/src/java.rmi/share/classes/sun/rmi/log : jdk/src/share/classes/sun/rmi/log
+jdk/src/java.rmi/share/classes/sun/rmi/registry : jdk/src/share/classes/sun/rmi/registry
+jdk/src/java.rmi/share/classes/sun/rmi/runtime : jdk/src/share/classes/sun/rmi/runtime
+jdk/src/java.rmi/share/classes/sun/rmi/server : jdk/src/share/classes/sun/rmi/server
+jdk/src/java.rmi/share/classes/sun/rmi/server/resources : jdk/src/share/classes/sun/rmi/server/resources
+jdk/src/java.rmi/share/classes/sun/rmi/transport : jdk/src/share/classes/sun/rmi/transport
+jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy : jdk/src/share/classes/sun/rmi/transport/proxy
+jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp : jdk/src/share/classes/sun/rmi/transport/tcp
+jdk/src/java.rmi/share/doc/stub/java/rmi/activation : jdk/src/share/doc/stub/java/rmi/activation
+jdk/src/java.rmi/unix/bin/java-rmi.cgi.sh : jdk/src/solaris/bin/java-rmi.cgi.sh
+jdk/src/java.scripting/share/classes/javax/script : jdk/src/share/classes/javax/script
+jdk/src/java.security.acl/share/classes/java/security/acl : jdk/src/share/classes/java/security/acl
+jdk/src/java.security.acl/share/classes/sun/security/acl : jdk/src/share/classes/sun/security/acl
+jdk/src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c : jdk/src/share/native/sun/security/krb5/nativeccache.c
+jdk/src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m : jdk/src/macosx/native/sun/security/krb5/SCDynamicStoreConfig.m
+jdk/src/java.security.jgss/share/classes/com/sun/security/jgss : jdk/src/share/classes/com/sun/security/jgss
+jdk/src/java.security.jgss/share/classes/com/sun/security/sasl/gsskerb : jdk/src/share/classes/com/sun/security/sasl/gsskerb
+jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos : jdk/src/share/classes/javax/security/auth/kerberos
+jdk/src/java.security.jgss/share/classes/jgss-overview.html : jdk/src/share/classes/com/sun/security/jgss/jgss-overview.html
+jdk/src/java.security.jgss/share/classes/org/ietf/jgss : jdk/src/share/classes/org/ietf/jgss
+jdk/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego : jdk/src/share/classes/sun/net/www/protocol/http/spnego
+jdk/src/java.security.jgss/share/classes/sun/security/jgss : jdk/src/share/classes/sun/security/jgss
+jdk/src/java.security.jgss/share/classes/sun/security/krb5 : jdk/src/share/classes/sun/security/krb5
+jdk/src/java.security.jgss/share/classes/sun/security/ssl/krb5 : jdk/src/share/classes/sun/security/ssl/krb5
+jdk/src/java.security.jgss/share/native/libj2gss : jdk/src/share/native/sun/security/jgss/wrapper
+jdk/src/java.security.jgss/unix/native/libj2gss : jdk/src/solaris/native/sun/security/jgss/wrapper
+jdk/src/java.security.jgss/windows/native/libw2k_lsa_auth : jdk/src/windows/native/sun/security/krb5
+jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest : jdk/src/share/classes/com/sun/security/sasl/digest
+jdk/src/java.security.sasl/share/classes/com/sun/security/sasl : jdk/src/share/classes/com/sun/security/sasl
+jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm : jdk/src/share/classes/com/sun/security/sasl/ntlm
+jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/util : jdk/src/share/classes/com/sun/security/sasl/util
+jdk/src/java.security.sasl/share/classes/javax/security/sasl : jdk/src/share/classes/javax/security/sasl
+jdk/src/java.smartcardio/share/classes/javax/smartcardio : jdk/src/share/classes/javax/smartcardio
+jdk/src/java.smartcardio/share/classes/sun/security/smartcardio : jdk/src/share/classes/sun/security/smartcardio
+jdk/src/java.smartcardio/share/native/libj2pcsc : jdk/src/share/native/sun/security/smartcardio
+jdk/src/java.smartcardio/unix/classes/sun/security/smartcardio : jdk/src/solaris/classes/sun/security/smartcardio
+jdk/src/java.smartcardio/unix/native/libj2pcsc : jdk/src/solaris/native/sun/security/smartcardio
+jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE : jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
+jdk/src/java.smartcardio/windows/classes/sun/security/smartcardio : jdk/src/windows/classes/sun/security/smartcardio
+jdk/src/java.smartcardio/windows/native/libj2pcsc : jdk/src/windows/native/sun/security/smartcardio
+jdk/src/java.sql.rowset/share/classes/com/sun/rowset : jdk/src/share/classes/com/sun/rowset
+jdk/src/java.sql.rowset/share/classes/javax/sql/rowset : jdk/src/share/classes/javax/sql/rowset
+jdk/src/java.sql/share/classes/java/sql : jdk/src/share/classes/java/sql
+jdk/src/java.sql/share/classes/javax/sql : jdk/src/share/classes/javax/sql
+jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security : jdk/src/share/classes/com/sun/org/apache/xml/internal/security
+jdk/src/java.xml.crypto/share/classes/javax/xml/crypto : jdk/src/share/classes/javax/xml/crypto
+jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal : jdk/src/share/classes/org/jcp/xml/dsig/internal
+jdk/src/jdk.attach/aix/native/libattach/AixVirtualMachine.c : jdk/src/aix/native/sun/tools/attach/AixVirtualMachine.c
+jdk/src/jdk.attach/share/classes/com/sun/tools/attach : jdk/src/share/classes/com/sun/tools/attach
+jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi : jdk/src/share/classes/com/sun/tools/attach/spi
+jdk/src/jdk.attach/share/classes/META-INF/services : jdk/src/share/classes/sun/tools/attach/META-INF/services
+jdk/src/jdk.attach/share/classes/sun/tools/attach : jdk/src/share/classes/sun/tools/attach
+jdk/src/jdk.attach/unix/classes/sun/tools/attach : jdk/src/solaris/classes/sun/tools/attach
+jdk/src/jdk.attach/unix/native/libattach : jdk/src/solaris/native/sun/tools/attach
+jdk/src/jdk.attach/windows/native/libattach : jdk/src/windows/native/sun/tools/attach
+jdk/src/jdk.base/share/native/libnpt : jdk/src/share/npt
+jdk/src/jdk.base/unix/native/libnpt : jdk/src/solaris/npt
+jdk/src/jdk.base/windows/native/libnpt : jdk/src/windows/npt
+jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext : jdk/src/share/classes/sun/nio/cs/ext
+jdk/src/jdk.charsets/unix/classes/sun/nio/cs/ext : jdk/src/solaris/classes/sun/nio/cs/ext
+jdk/src/jdk.compiler/share/classes/sun/tools/serialver : jdk/src/share/classes/sun/tools/serialver
+jdk/src/jdk.crypto.ec/share/classes/sun/security/ec : jdk/src/share/classes/sun/security/ec
+jdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp : jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
+jdk/src/jdk.crypto.ec/share/native/libsunec/impl : jdk/src/share/native/sun/security/ec/impl
+jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi : jdk/src/windows/classes/sun/security/mscapi
+jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi : jdk/src/windows/native/sun/security/mscapi
+jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11 : jdk/src/share/classes/sun/security/pkcs11
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.c : jdk/src/share/native/sun/security/pkcs11/j2secmod.c
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.h : jdk/src/share/native/sun/security/pkcs11/j2secmod.h
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_crypt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_digest.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_dual.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_general.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_keymgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_mutex.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_objmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sessmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sign.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_util.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11f.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11t.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs-11v2-20a3.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h
+jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11wrapper.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
+jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.c : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
+jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.h : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h
+jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.c : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c
+jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.h : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h
+jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.c : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c
+jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.h : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.h
+jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.c : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c
+jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.h : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h
+jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/package.html : jdk/src/macosx/classes/com/apple/concurrent/package.html
+jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine : jdk/src/macosx/native/apple/applescript
+jdk/src/jdk.deploy.osx/macosx/native/libosx/CFileManager.m : jdk/src/macosx/native/com/apple/eio/CFileManager.m
+jdk/src/jdk.deploy.osx/macosx/native/libosx/Dispatch.m : jdk/src/macosx/native/com/apple/concurrent/Dispatch.m
+jdk/src/jdk.deploy.osx/macosx/native/libosx/JavaAppLauncher.m : jdk/src/macosx/native/apple/launcher/JavaAppLauncher.m
+jdk/src/jdk.deploy.osx/macosx/native/libosx/KeystoreImpl.m : jdk/src/macosx/native/apple/security/KeystoreImpl.m
+jdk/src/jdk.dev/share/classes/com/sun/jarsigner : jdk/src/share/classes/com/sun/jarsigner
+jdk/src/jdk.dev/share/classes/com/sun/tools/extcheck : jdk/src/share/classes/com/sun/tools/extcheck
+jdk/src/jdk.dev/share/classes/com/sun/tools/hat : jdk/src/share/classes/com/sun/tools/hat
+jdk/src/jdk.dev/share/classes/com/sun/tools/script/shell : jdk/src/share/classes/com/sun/tools/script/shell
+jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner : jdk/src/share/classes/sun/security/tools/jarsigner
+jdk/src/jdk.dev/share/classes/sun/tools/jar : jdk/src/share/classes/sun/tools/jar
+jdk/src/jdk.dev/share/classes/sun/tools/native2ascii : jdk/src/share/classes/sun/tools/native2ascii
+jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof : jdk/src/share/classes/com/sun/demo/jvmti/hprof
+jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver : jdk/src/share/classes/com/sun/net/httpserver
+jdk/src/jdk.httpserver/share/classes/sun/net/httpserver : jdk/src/share/classes/sun/net/httpserver
+jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd : jdk/src/share/classes/sun/tools/jcmd
+jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo : jdk/src/share/classes/sun/tools/jinfo
+jdk/src/jdk.jcmd/share/classes/sun/tools/jmap : jdk/src/share/classes/sun/tools/jmap
+jdk/src/jdk.jcmd/share/classes/sun/tools/jps : jdk/src/share/classes/sun/tools/jps
+jdk/src/jdk.jcmd/share/classes/sun/tools/jstack : jdk/src/share/classes/sun/tools/jstack
+jdk/src/jdk.jcmd/share/classes/sun/tools/jstat : jdk/src/share/classes/sun/tools/jstat
+jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole : jdk/src/share/classes/com/sun/tools/jconsole
+jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole : jdk/src/share/classes/sun/tools/jconsole
+jdk/src/jdk.jdi/share/classes/com/sun/jdi : jdk/src/share/classes/com/sun/jdi
+jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr : jdk/src/share/classes/com/sun/tools/example/debug/expr
+jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty : jdk/src/share/classes/com/sun/tools/example/debug/tty
+jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi : jdk/src/share/classes/com/sun/tools/jdi
+jdk/src/jdk.jdi/share/classes/jdi-overview.html : jdk/src/share/classes/jdi-overview.html
+jdk/src/jdk.jdi/share/classes/META-INF/services : jdk/src/share/classes/com/sun/tools/jdi/META-INF/services
+jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryConnection.c : jdk/src/share/native/com/sun/tools/jdi/SharedMemoryConnection.c
+jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemory.h : jdk/src/share/native/com/sun/tools/jdi/SharedMemory.h
+jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryTransport.c : jdk/src/share/native/com/sun/tools/jdi/SharedMemoryTransport.c
+jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBack.c : jdk/src/share/transport/shmem/shmemBack.c
+jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBase.c : jdk/src/share/transport/shmem/shmemBase.c
+jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBase.h : jdk/src/share/transport/shmem/shmemBase.h
+jdk/src/jdk.jdi/share/native/libdt_shmem/sysShmem.h : jdk/src/share/transport/shmem/sysShmem.h
+jdk/src/jdk.jdi/windows/native/libdt_shmem : jdk/src/windows/transport/shmem
+jdk/src/jdk.jdwp.agent/share/native/include/jdwpTransport.h : jdk/src/share/javavm/export/jdwpTransport.h
+jdk/src/jdk.jdwp.agent/share/native/libdt_socket : jdk/src/share/transport/socket
+jdk/src/jdk.jdwp.agent/share/native/libjdwp : jdk/src/share/back
+jdk/src/jdk.jdwp.agent/unix/native/libdt_socket : jdk/src/solaris/transport/socket
+jdk/src/jdk.jdwp.agent/unix/native/libjdwp : jdk/src/solaris/back
+jdk/src/jdk.jdwp.agent/windows/native/libdt_socket : jdk/src/windows/transport/socket
+jdk/src/jdk.jdwp.agent/windows/native/libjdwp : jdk/src/windows/back
+jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor : jdk/src/share/classes/sun/jvmstat/monitor
+jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata : jdk/src/share/classes/sun/jvmstat/perfdata
+jdk/src/jdk.jvmstat/share/classes/sun/tools/jstatd : jdk/src/share/classes/sun/tools/jstatd
+jdk/src/jdk.localedata/share/classes/sun/text/resources/ar : jdk/src/share/classes/sun/text/resources/ar
+jdk/src/jdk.localedata/share/classes/sun/text/resources/be : jdk/src/share/classes/sun/text/resources/be
+jdk/src/jdk.localedata/share/classes/sun/text/resources/bg : jdk/src/share/classes/sun/text/resources/bg
+jdk/src/jdk.localedata/share/classes/sun/text/resources/ca : jdk/src/share/classes/sun/text/resources/ca
+jdk/src/jdk.localedata/share/classes/sun/text/resources/cs : jdk/src/share/classes/sun/text/resources/cs
+jdk/src/jdk.localedata/share/classes/sun/text/resources/da : jdk/src/share/classes/sun/text/resources/da
+jdk/src/jdk.localedata/share/classes/sun/text/resources/de : jdk/src/share/classes/sun/text/resources/de
+jdk/src/jdk.localedata/share/classes/sun/text/resources/el : jdk/src/share/classes/sun/text/resources/el
+jdk/src/jdk.localedata/share/classes/sun/text/resources/es : jdk/src/share/classes/sun/text/resources/es
+jdk/src/jdk.localedata/share/classes/sun/text/resources/et : jdk/src/share/classes/sun/text/resources/et
+jdk/src/jdk.localedata/share/classes/sun/text/resources/fi : jdk/src/share/classes/sun/text/resources/fi
+jdk/src/jdk.localedata/share/classes/sun/text/resources/fr : jdk/src/share/classes/sun/text/resources/fr
+jdk/src/jdk.localedata/share/classes/sun/text/resources/ga : jdk/src/share/classes/sun/text/resources/ga
+jdk/src/jdk.localedata/share/classes/sun/text/resources/hi : jdk/src/share/classes/sun/text/resources/hi
+jdk/src/jdk.localedata/share/classes/sun/text/resources/hr : jdk/src/share/classes/sun/text/resources/hr
+jdk/src/jdk.localedata/share/classes/sun/text/resources/hu : jdk/src/share/classes/sun/text/resources/hu
+jdk/src/jdk.localedata/share/classes/sun/text/resources/in : jdk/src/share/classes/sun/text/resources/in
+jdk/src/jdk.localedata/share/classes/sun/text/resources/is : jdk/src/share/classes/sun/text/resources/is
+jdk/src/jdk.localedata/share/classes/sun/text/resources/it : jdk/src/share/classes/sun/text/resources/it
+jdk/src/jdk.localedata/share/classes/sun/text/resources/iw : jdk/src/share/classes/sun/text/resources/iw
+jdk/src/jdk.localedata/share/classes/sun/text/resources/ja : jdk/src/share/classes/sun/text/resources/ja
+jdk/src/jdk.localedata/share/classes/sun/text/resources/ko : jdk/src/share/classes/sun/text/resources/ko
+jdk/src/jdk.localedata/share/classes/sun/text/resources/lt : jdk/src/share/classes/sun/text/resources/lt
+jdk/src/jdk.localedata/share/classes/sun/text/resources/lv : jdk/src/share/classes/sun/text/resources/lv
+jdk/src/jdk.localedata/share/classes/sun/text/resources/mk : jdk/src/share/classes/sun/text/resources/mk
+jdk/src/jdk.localedata/share/classes/sun/text/resources/ms : jdk/src/share/classes/sun/text/resources/ms
+jdk/src/jdk.localedata/share/classes/sun/text/resources/mt : jdk/src/share/classes/sun/text/resources/mt
+jdk/src/jdk.localedata/share/classes/sun/text/resources/nl : jdk/src/share/classes/sun/text/resources/nl
+jdk/src/jdk.localedata/share/classes/sun/text/resources/no : jdk/src/share/classes/sun/text/resources/no
+jdk/src/jdk.localedata/share/classes/sun/text/resources/pl : jdk/src/share/classes/sun/text/resources/pl
+jdk/src/jdk.localedata/share/classes/sun/text/resources/pt : jdk/src/share/classes/sun/text/resources/pt
+jdk/src/jdk.localedata/share/classes/sun/text/resources/ro : jdk/src/share/classes/sun/text/resources/ro
+jdk/src/jdk.localedata/share/classes/sun/text/resources/ru : jdk/src/share/classes/sun/text/resources/ru
+jdk/src/jdk.localedata/share/classes/sun/text/resources/sk : jdk/src/share/classes/sun/text/resources/sk
+jdk/src/jdk.localedata/share/classes/sun/text/resources/sl : jdk/src/share/classes/sun/text/resources/sl
+jdk/src/jdk.localedata/share/classes/sun/text/resources/sq : jdk/src/share/classes/sun/text/resources/sq
+jdk/src/jdk.localedata/share/classes/sun/text/resources/sr : jdk/src/share/classes/sun/text/resources/sr
+jdk/src/jdk.localedata/share/classes/sun/text/resources/sv : jdk/src/share/classes/sun/text/resources/sv
+jdk/src/jdk.localedata/share/classes/sun/text/resources/th : jdk/src/share/classes/sun/text/resources/th
+jdk/src/jdk.localedata/share/classes/sun/text/resources/tr : jdk/src/share/classes/sun/text/resources/tr
+jdk/src/jdk.localedata/share/classes/sun/text/resources/uk : jdk/src/share/classes/sun/text/resources/uk
+jdk/src/jdk.localedata/share/classes/sun/text/resources/vi : jdk/src/share/classes/sun/text/resources/vi
+jdk/src/jdk.localedata/share/classes/sun/text/resources/zh : jdk/src/share/classes/sun/text/resources/zh
+jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources : jdk/src/share/classes/sun/util/cldr/resources
+jdk/src/jdk.localedata/share/classes/sun/util/resources/ar : jdk/src/share/classes/sun/util/resources/ar
+jdk/src/jdk.localedata/share/classes/sun/util/resources/be : jdk/src/share/classes/sun/util/resources/be
+jdk/src/jdk.localedata/share/classes/sun/util/resources/bg : jdk/src/share/classes/sun/util/resources/bg
+jdk/src/jdk.localedata/share/classes/sun/util/resources/ca : jdk/src/share/classes/sun/util/resources/ca
+jdk/src/jdk.localedata/share/classes/sun/util/resources/cs : jdk/src/share/classes/sun/util/resources/cs
+jdk/src/jdk.localedata/share/classes/sun/util/resources/da : jdk/src/share/classes/sun/util/resources/da
+jdk/src/jdk.localedata/share/classes/sun/util/resources/de : jdk/src/share/classes/sun/util/resources/de
+jdk/src/jdk.localedata/share/classes/sun/util/resources/el : jdk/src/share/classes/sun/util/resources/el
+jdk/src/jdk.localedata/share/classes/sun/util/resources/es : jdk/src/share/classes/sun/util/resources/es
+jdk/src/jdk.localedata/share/classes/sun/util/resources/et : jdk/src/share/classes/sun/util/resources/et
+jdk/src/jdk.localedata/share/classes/sun/util/resources/fi : jdk/src/share/classes/sun/util/resources/fi
+jdk/src/jdk.localedata/share/classes/sun/util/resources/fr : jdk/src/share/classes/sun/util/resources/fr
+jdk/src/jdk.localedata/share/classes/sun/util/resources/ga : jdk/src/share/classes/sun/util/resources/ga
+jdk/src/jdk.localedata/share/classes/sun/util/resources/hi : jdk/src/share/classes/sun/util/resources/hi
+jdk/src/jdk.localedata/share/classes/sun/util/resources/hr : jdk/src/share/classes/sun/util/resources/hr
+jdk/src/jdk.localedata/share/classes/sun/util/resources/hu : jdk/src/share/classes/sun/util/resources/hu
+jdk/src/jdk.localedata/share/classes/sun/util/resources/in : jdk/src/share/classes/sun/util/resources/in
+jdk/src/jdk.localedata/share/classes/sun/util/resources/is : jdk/src/share/classes/sun/util/resources/is
+jdk/src/jdk.localedata/share/classes/sun/util/resources/it : jdk/src/share/classes/sun/util/resources/it
+jdk/src/jdk.localedata/share/classes/sun/util/resources/iw : jdk/src/share/classes/sun/util/resources/iw
+jdk/src/jdk.localedata/share/classes/sun/util/resources/ja : jdk/src/share/classes/sun/util/resources/ja
+jdk/src/jdk.localedata/share/classes/sun/util/resources/ko : jdk/src/share/classes/sun/util/resources/ko
+jdk/src/jdk.localedata/share/classes/sun/util/resources/lt : jdk/src/share/classes/sun/util/resources/lt
+jdk/src/jdk.localedata/share/classes/sun/util/resources/lv : jdk/src/share/classes/sun/util/resources/lv
+jdk/src/jdk.localedata/share/classes/sun/util/resources/mk : jdk/src/share/classes/sun/util/resources/mk
+jdk/src/jdk.localedata/share/classes/sun/util/resources/ms : jdk/src/share/classes/sun/util/resources/ms
+jdk/src/jdk.localedata/share/classes/sun/util/resources/mt : jdk/src/share/classes/sun/util/resources/mt
+jdk/src/jdk.localedata/share/classes/sun/util/resources/nl : jdk/src/share/classes/sun/util/resources/nl
+jdk/src/jdk.localedata/share/classes/sun/util/resources/no : jdk/src/share/classes/sun/util/resources/no
+jdk/src/jdk.localedata/share/classes/sun/util/resources/pl : jdk/src/share/classes/sun/util/resources/pl
+jdk/src/jdk.localedata/share/classes/sun/util/resources/pt : jdk/src/share/classes/sun/util/resources/pt
+jdk/src/jdk.localedata/share/classes/sun/util/resources/ro : jdk/src/share/classes/sun/util/resources/ro
+jdk/src/jdk.localedata/share/classes/sun/util/resources/ru : jdk/src/share/classes/sun/util/resources/ru
+jdk/src/jdk.localedata/share/classes/sun/util/resources/sk : jdk/src/share/classes/sun/util/resources/sk
+jdk/src/jdk.localedata/share/classes/sun/util/resources/sl : jdk/src/share/classes/sun/util/resources/sl
+jdk/src/jdk.localedata/share/classes/sun/util/resources/sq : jdk/src/share/classes/sun/util/resources/sq
+jdk/src/jdk.localedata/share/classes/sun/util/resources/sr : jdk/src/share/classes/sun/util/resources/sr
+jdk/src/jdk.localedata/share/classes/sun/util/resources/sv : jdk/src/share/classes/sun/util/resources/sv
+jdk/src/jdk.localedata/share/classes/sun/util/resources/th : jdk/src/share/classes/sun/util/resources/th
+jdk/src/jdk.localedata/share/classes/sun/util/resources/tr : jdk/src/share/classes/sun/util/resources/tr
+jdk/src/jdk.localedata/share/classes/sun/util/resources/uk : jdk/src/share/classes/sun/util/resources/uk
+jdk/src/jdk.localedata/share/classes/sun/util/resources/vi : jdk/src/share/classes/sun/util/resources/vi
+jdk/src/jdk.localedata/share/classes/sun/util/resources/zh : jdk/src/share/classes/sun/util/resources/zh
+jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns : jdk/src/share/classes/com/sun/jndi/dns
+jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns : jdk/src/share/classes/com/sun/jndi/url/dns
+jdk/src/jdk.naming.dns/share/classes/META-INF/services : jdk/src/share/classes/sun/net/spi/nameservice/dns/META-INF/services
+jdk/src/jdk.naming.dns/share/classes/sun/net/spi/nameservice/dns : jdk/src/share/classes/sun/net/spi/nameservice/dns
+jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry : jdk/src/share/classes/com/sun/jndi/rmi/registry
+jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi : jdk/src/share/classes/com/sun/jndi/url/rmi
+jdk/src/jdk.rmic/share/classes/sun/rmi/rmic : jdk/src/share/classes/sun/rmi/rmic
+jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic : jdk/src/share/classes/sun/rmi/rmic/newrmic
+jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp : jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp
+jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/resources : jdk/src/share/classes/sun/rmi/rmic/resources
+jdk/src/jdk.rmic/share/classes/sun/tools/asm : jdk/src/share/classes/sun/tools/asm
+jdk/src/jdk.rmic/share/classes/sun/tools/javac : jdk/src/share/classes/sun/tools/javac
+jdk/src/jdk.rmic/share/classes/sun/tools/java : jdk/src/share/classes/sun/tools/java
+jdk/src/jdk.rmic/share/classes/sun/tools/tree : jdk/src/share/classes/sun/tools/tree
+jdk/src/jdk.rmic/share/classes/sun/tools/util : jdk/src/share/classes/sun/tools/util
+jdk/src/jdk.runtime/share/classes/com/sun/tracing : jdk/src/share/classes/com/sun/tracing
+jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool : jdk/src/share/classes/sun/security/tools/policytool
+jdk/src/jdk.runtime/share/classes/sun/tracing : jdk/src/share/classes/sun/tracing
+jdk/src/jdk.runtime/share/native/common-unpack/bands.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp
+jdk/src/jdk.runtime/share/native/common-unpack/bands.h : jdk/src/share/native/com/sun/java/util/jar/pack/bands.h
+jdk/src/jdk.runtime/share/native/common-unpack/bytes.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp
+jdk/src/jdk.runtime/share/native/common-unpack/bytes.h : jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
+jdk/src/jdk.runtime/share/native/common-unpack/coding.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp
+jdk/src/jdk.runtime/share/native/common-unpack/coding.h : jdk/src/share/native/com/sun/java/util/jar/pack/coding.h
+jdk/src/jdk.runtime/share/native/common-unpack/constants.h : jdk/src/share/native/com/sun/java/util/jar/pack/constants.h
+jdk/src/jdk.runtime/share/native/common-unpack/defines.h : jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
+jdk/src/jdk.runtime/share/native/common-unpack/unpack.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+jdk/src/jdk.runtime/share/native/common-unpack/unpack.h : jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
+jdk/src/jdk.runtime/share/native/common-unpack/utils.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
+jdk/src/jdk.runtime/share/native/common-unpack/utils.h : jdk/src/share/native/com/sun/java/util/jar/pack/utils.h
+jdk/src/jdk.runtime/share/native/common-unpack/zip.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+jdk/src/jdk.runtime/share/native/common-unpack/zip.h : jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+jdk/src/jdk.runtime/share/native/libjsdt : jdk/src/share/native/sun/tracing/dtrace
+jdk/src/jdk.runtime/share/native/libunpack/jni.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
+jdk/src/jdk.runtime/share/native/unpack200/main.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
+jdk/src/jdk.runtime/unix/native/libjsdt/jvm_symbols_md.c : jdk/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c
+jdk/src/jdk.runtime/windows/native/libjsdt/jvm_symbols_md.c : jdk/src/windows/native/sun/tracing/dtrace/jvm_symbols_md.c
+jdk/src/jdk.runtime/windows/native/unpack200/unpack200_proto.exe.manifest : jdk/src/windows/resource/unpack200_proto.exe.manifest
+jdk/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp : jdk/src/macosx/classes/sun/nio/ch/sctp
+jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp : jdk/src/share/classes/com/sun/nio/sctp
+jdk/src/jdk.sctp/share/classes/sun/nio/ch/sctp : jdk/src/share/classes/sun/nio/ch/sctp
+jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp : jdk/src/solaris/classes/sun/nio/ch/sctp
+jdk/src/jdk.sctp/unix/native/libsctp : jdk/src/solaris/native/sun/nio/ch/sctp
+jdk/src/jdk.sctp/windows/classes/sun/nio/ch/sctp : jdk/src/windows/classes/sun/nio/ch/sctp
+jdk/src/jdk.security.auth/share/classes/com/sun/security/auth : jdk/src/share/classes/com/sun/security/auth
+jdk/src/jdk.security.auth/share/classes/jaas-overview.html : jdk/src/share/classes/com/sun/security/auth/jaas-overview.html
+jdk/src/jdk.security.auth/unix/native/libjaas : jdk/src/solaris/native/com/sun/security/auth/module
+jdk/src/jdk.security.auth/windows/native/libjaas : jdk/src/windows/native/com/sun/security/auth/module
+jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp : jdk/src/share/classes/com/sun/jmx/snmp
+jdk/src/jdk.snmp/share/classes/sun/management/snmp : jdk/src/share/classes/sun/management/snmp
+jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs : jdk/src/share/classes/jdk/nio/zipfs
+jdk/src/jdk.zipfs/share/classes/META-INF : jdk/src/share/classes/jdk/nio/zipfs/META-INF
+jdk/src/sample/share : jdk/src/share/sample
+langtools/src/java.base/share/classes/jdk/Exported.java : langtools/src/share/classes/jdk/Exported.java
+langtools/src/java.compiler/share/classes/javax/annotation/processing : langtools/src/share/classes/javax/annotation/processing
+langtools/src/java.compiler/share/classes/javax/lang/model : langtools/src/share/classes/javax/lang/model
+langtools/src/java.compiler/share/classes/javax/tools : langtools/src/share/classes/javax/tools
+langtools/src/jdk.compiler/share/classes/com/sun/source : langtools/src/share/classes/com/sun/source
+langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile : langtools/src/share/classes/com/sun/tools/classfile
+langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint : langtools/src/share/classes/com/sun/tools/doclint
+langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources : langtools/src/share/classes/com/sun/tools/doclint/resources
+langtools/src/jdk.compiler/share/classes/com/sun/tools/javac : langtools/src/share/classes/com/sun/tools/javac
+langtools/src/jdk.compiler/share/classes/com/sun/tools/javah : langtools/src/share/classes/com/sun/tools/javah
+langtools/src/jdk.compiler/share/classes/com/sun/tools/javap : langtools/src/share/classes/com/sun/tools/javap
+langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac : langtools/src/share/classes/com/sun/tools/sjavac
+langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps : langtools/src/share/classes/com/sun/tools/jdeps
+langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources : langtools/src/share/classes/com/sun/tools/jdeps/resources
+langtools/src/jdk.javadoc/share/classes/com/sun/javadoc : langtools/src/share/classes/com/sun/javadoc
+langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets : langtools/src/share/classes/com/sun/tools/doclets
+langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc : langtools/src/share/classes/com/sun/tools/javadoc
+nashorn/src/jdk.scripting.nashorn/share/classes : nashorn/src
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/bin/unshuffle_patch.sh	Sun Aug 17 15:51:37 2014 +0100
@@ -0,0 +1,196 @@
+#!/bin/sh
+#
+# Copyright (c) 2014, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Script for updating a patch file as per the shuffled/unshuffled source location.
+
+usage() {
+      echo "Usage: $0 [-h|--help] [-v|--verbose] <repo> <input_patch> <output_patch>"
+      echo "where:"
+      echo "  <repo>          is one of: corba, jaxp, jaxws, jdk, langtools, nashorn"
+      echo "                  [Note: patches from other repos do not need updating]"
+      echo "  <input_patch>   is the input patch file, that needs shuffling/unshuffling"
+      echo "  <output_patch>  is the updated patch file "
+      echo " "
+      exit 1
+}
+
+SCRIPT_DIR=`pwd`/`dirname $0`
+UNSHUFFLE_LIST=$SCRIPT_DIR"/unshuffle_list.txt"
+
+if [ ! -f "$UNSHUFFLE_LIST" ] ; then
+  echo "FATAL: cannot find $UNSHUFFLE_LIST"
+  exit 1
+fi
+
+vflag="false"
+while [ $# -gt 0 ]
+do
+  case $1 in
+    -h | --help )
+      usage
+      ;;
+
+    -v | --verbose )
+      vflag="true"
+      ;;
+
+    -*)  # bad option
+      usage
+      ;;
+
+     * )  # non option
+      break
+      ;;
+  esac
+  shift
+done
+
+# Make sure we have the right number of arguments
+if [ ! $# -eq 3 ] ; then
+  echo "ERROR: Invalid number of arguments."
+  usage
+fi
+
+# Check the given repo
+repos="corba jaxp jaxws jdk langtools nashorn"
+repo="$1"
+found="false"
+for r in $repos ; do
+  if [ $repo = "$r" ] ; then
+    found="true"
+    break;
+  fi 
+done
+if [ $found = "false" ] ; then
+  echo "ERROR: Unknown repo: $repo. Should be one of [$repos]."
+  usage
+fi
+
+# Check given input/output files
+input="$2"
+output="$3"
+
+if [ ! -f $input ] ; then
+  echo "ERROR: Cannot find input patch file: $input"
+  exit 1
+fi
+
+if [ -f $output ] ; then
+  echo "ERROR: Output patch already exists: $output"
+  exit 1
+fi
+
+what=""  ## shuffle or unshuffle
+
+verbose() {
+  if [ ${vflag} = "true" ] ; then
+    echo "$@"
+  fi
+}
+
+unshuffle() {
+  line=$@
+  verbose "Attempting to rewrite: \"$line\""
+
+  # Retrieve the file name
+  path=
+  if echo "$line" | egrep '^diff' > /dev/null ; then
+    if ! echo "$line" | egrep '\-\-git' > /dev/null ; then
+      echo "ERROR: Only git patches supported. Please use 'hg export --git ...'."
+      exit 1
+    fi
+    path="`echo "$line" | sed -e s@'diff --git a/'@@ -e s@' b/.*$'@@`"
+  elif echo "$line" | egrep '^\-\-\-' > /dev/null ; then
+    path="`echo "$line" | sed -e s@'--- a/'@@`"
+  elif echo "$line" | egrep '^\+\+\+' > /dev/null ; then
+    path="`echo "$line" | sed s@'+++ b/'@@`"
+  fi
+  verbose "Extracted path: \"$path\""
+
+  # Only source can be shuffled, or unshuffled
+  if ! echo "$path" | egrep '^src/.*' > /dev/null ; then
+    verbose "Not a src path, skipping."
+    echo "$line" >> $output
+    return
+  fi
+
+  # Shuffle or unshuffle?
+  if [ "${what}" = "" ] ; then
+    if echo "$path" | egrep '^src/java\..*|^src/jdk\..*' > /dev/null ; then
+      what="unshuffle"
+    else
+      what="shuffle"
+    fi
+    verbose "Shuffle or unshuffle: $what"
+  fi
+
+  # Find the most specific matches in the shuffle list
+  matches=
+  matchpath="$repo"/"$path"/x
+  while [ "$matchpath" != "" ] ; do
+    matchpath="`echo $matchpath | sed s@'\(.*\)/.*$'@'\1'@`"
+
+    if [ "${what}" =  "shuffle" ] ; then
+      pattern=": $matchpath$"
+    else
+      pattern="^$matchpath :"
+    fi
+    verbose "Attempting to find \"$matchpath\""
+    matches=`egrep "$pattern" "$UNSHUFFLE_LIST"`
+    if ! [ "x${matches}" = "x" ] ; then
+      verbose "Got matches: [$matches]"
+      break;
+    fi
+
+    if ! echo "$matchpath" | egrep '.*/.*' > /dev/null ; then
+      break;
+    fi
+  done
+
+  # Rewrite the line, if we have a match
+  if ! [ "x${matches}" = "x" ] ; then
+    shuffled="`echo "$matches" | sed -e s@' : .*'@@g -e s@'^[a-z]*\/'@@`"
+    unshuffled="`echo "$matches" | sed -e s@'.* : '@@g -e s@'^[a-z]*\/'@@`"
+    if [ "${what}" =  "shuffle" ] ; then
+      newline="`echo "$line" | sed -e s@"$unshuffled"@"$shuffled"@g`"
+    else
+      newline="`echo "$line" | sed -e s@"$shuffled"@"$unshuffled"@g`"
+    fi
+    verbose "Rewriting to \"$newline\""
+    echo "$newline" >> $output
+  else
+    echo "WARNING: no match found for $path"
+    echo "$line" >> $output
+  fi
+}
+
+while IFS= read -r line
+do
+  if echo "$line" | egrep '^diff|^\-\-\-|^\+\+\+' > /dev/null ; then
+    unshuffle "$line"
+  else
+    printf "%s\n" "$line" >> $output
+  fi
+done < "$input"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/CompileJavaModules.gmk	Sun Aug 17 15:51:37 2014 +0100
@@ -0,0 +1,559 @@
+#
+# Copyright (c) 2014, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This must be the first rule
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+include SetupJava.gmk
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, , CompileJavaModules.gmk))
+
+################################################################################
+# Module specific build settings
+
+java.activation_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+
+################################################################################
+
+java.base_COPY := .icu .dat .spp content-types.properties
+java.base_CLEAN := intrinsic.properties
+
+java.base_EXCLUDES += java/lang/doc-files
+
+# Exclude BreakIterator classes that are just used in compile process to generate
+# data files and shouldn't go in the product
+java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+  JAVA_BASE_UNIX_DIR := $(JDK_TOPDIR)/src/java.base/unix/classes
+  # TODO: make JavaCompilation handle overrides automatically instead of excluding here
+  # These files are overridden in macosx
+  java.base_EXCLUDE_FILES += \
+      $(JAVA_BASE_UNIX_DIR)/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \
+      $(JAVA_BASE_UNIX_DIR)/java/net/DefaultInterface.java \
+      $(JAVA_BASE_UNIX_DIR)/java/lang/ClassLoaderHelper.java \
+      $(JAVA_BASE_UNIX_DIR)/sun/nio/ch/DefaultSelectorProvider.java \
+      #
+  # This is just skipped on macosx
+  java.base_EXCLUDE_FILES += $(JAVA_BASE_UNIX_DIR)/sun/nio/fs/GnomeFileTypeDetector.java
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+  java.base_EXCLUDE_FILES += \
+      SolarisLoginModule.java \
+      SolarisSystem.java \
+      #
+endif
+
+ifeq ($(filter $(OPENJDK_TARGET_OS), solaris macosx aix), )
+  #
+  # only solaris, macosx and aix
+  #
+  java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+  java.base_EXCLUDE_FILES += \
+      sun/nio/ch/AbstractPollSelectorImpl.java \
+      sun/nio/ch/PollSelectorProvider.java \
+      sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
+      #
+endif
+
+################################################################################
+
+java.desktop_COPY := .gif .png .wav .txt .xml .css flavormap.properties
+java.desktop_CLEAN := iio-plugin.properties
+
+java.desktop_EXCLUDES += \
+    java/awt/doc-files \
+    javax/swing/doc-files \
+    javax/swing/text/doc-files \
+    javax/swing/plaf/synth/doc-files \
+    javax/swing/undo/doc-files \
+    sun/awt/X11/doc-files \
+    #
+
+# The exception handling of swing beaninfo
+# These resources violates the convention of having code and resources together under
+# $(JDK_TOPDIR)/src/.../classes directories
+$(eval $(call SetupCopyFiles,COPY_BEANINFO, \
+    SRC := $(JDK_TOPDIR)/make/data/swingbeaninfo/images, \
+    DEST := $(JDK_OUTPUTDIR)/modules/java.desktop/javax/swing/beaninfo/images, \
+    FILES := $(wildcard $(JDK_TOPDIR)/make/data/swingbeaninfo/images/*.gif)))
+
+java.desktop_COPY_EXTRA += $(COPY_BEANINFO)
+
+java.desktop_EXCLUDE_FILES += \
+    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
+    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
+    javax/swing/plaf/nimbus/ScrollBarPainter.java \
+    javax/swing/plaf/nimbus/SliderPainter.java \
+    javax/swing/plaf/nimbus/SpinnerPainter.java \
+    javax/swing/plaf/nimbus/SplitPanePainter.java \
+    javax/swing/plaf/nimbus/TabbedPanePainter.java \
+    sun/awt/resources/security-icon-bw16.png \
+    sun/awt/resources/security-icon-bw24.png \
+    sun/awt/resources/security-icon-bw32.png \
+    sun/awt/resources/security-icon-bw48.png \
+    sun/awt/resources/security-icon-interim16.png \
+    sun/awt/resources/security-icon-interim24.png \
+    sun/awt/resources/security-icon-interim32.png \
+    sun/awt/resources/security-icon-interim48.png \
+    sun/awt/resources/security-icon-yellow16.png \
+    sun/awt/resources/security-icon-yellow24.png \
+    sun/awt/resources/security-icon-yellow32.png \
+    sun/awt/resources/security-icon-yellow48.png \
+    sun/awt/X11/java-icon16.png \
+    sun/awt/X11/java-icon24.png \
+    sun/awt/X11/java-icon32.png \
+    sun/awt/X11/java-icon48.png \
+    .template \
+    #
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+  # exclude all X11 on Mac.
+  java.desktop_EXCLUDES += sun/awt/X11
+  java.desktop_EXCLUDE_FILES += \
+      $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/BackBufferCapsProvider.java \
+      #
+else
+  # TBD: figure out how to eliminate this long list
+  java.desktop_EXCLUDE_FILES += \
+      sun/awt/X11/ScreenFormat.java \
+      sun/awt/X11/XArc.java \
+      sun/awt/X11/XChar2b.java \
+      sun/awt/X11/XCharStruct.java \
+      sun/awt/X11/XClassHint.java \
+      sun/awt/X11/XComposeStatus.java \
+      sun/awt/X11/XExtCodes.java \
+      sun/awt/X11/XFontProp.java \
+      sun/awt/X11/XFontSetExtents.java \
+      sun/awt/X11/XFontStruct.java \
+      sun/awt/X11/XGCValues.java \
+      sun/awt/X11/XHostAddress.java \
+      sun/awt/X11/XIMCallback.java \
+      sun/awt/X11/XIMHotKeyTrigger.java \
+      sun/awt/X11/XIMHotKeyTriggers.java \
+      sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
+      sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
+      sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
+      sun/awt/X11/XIMStatusDrawCallbackStruct.java \
+      sun/awt/X11/XIMStringConversionCallbackStruct.java \
+      sun/awt/X11/XIMStringConversionText.java \
+      sun/awt/X11/XIMStyles.java \
+      sun/awt/X11/XIMText.java \
+      sun/awt/X11/XIMValuesList.java \
+      sun/awt/X11/XImage.java \
+      sun/awt/X11/XKeyboardControl.java \
+      sun/awt/X11/XKeyboardState.java \
+      sun/awt/X11/XOMCharSetList.java \
+      sun/awt/X11/XOMFontInfo.java \
+      sun/awt/X11/XOMOrientation.java \
+      sun/awt/X11/XPoint.java \
+      sun/awt/X11/XRectangle.java \
+      sun/awt/X11/XSegment.java \
+      sun/awt/X11/XStandardColormap.java \
+      sun/awt/X11/XTextItem.java \
+      sun/awt/X11/XTextItem16.java \
+      sun/awt/X11/XTextProperty.java \
+      sun/awt/X11/XTimeCoord.java \
+      sun/awt/X11/XWindowChanges.java \
+      sun/awt/X11/XdbeSwapInfo.java \
+      sun/awt/X11/XmbTextItem.java \
+      sun/awt/X11/XwcTextItem.java
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+  java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk
+endif
+
+ifdef BUILD_HEADLESS_ONLY
+  java.desktop_EXCLUDES += sun/applet
+endif
+
+# Why is this in the open source tree?
+ifdef OPENJDK
+  java.desktop_EXCLUDES += sun/dc
+endif
+
+# Used on windows and macosx
+ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), )
+  java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java
+endif
+
+# These files do not appear in the build result of the old build. This
+# is because they are generated sources, but the AUTO_JAVA_FILES won't
+# pick them up since they aren't generated when the source dirs are
+# searched and they aren't referenced by any other classes so they won't
+# be picked up by implicit compilation. On a rebuild, they are picked up
+# and compiled. Exclude them here to produce the same rt.jar as the old
+# build does when building just once.
+java.desktop_EXCLUDE_FILES += \
+    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
+    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
+    javax/swing/plaf/nimbus/ScrollBarPainter.java \
+    javax/swing/plaf/nimbus/SliderPainter.java \
+    javax/swing/plaf/nimbus/SpinnerPainter.java \
+    javax/swing/plaf/nimbus/SplitPanePainter.java \
+    javax/swing/plaf/nimbus/TabbedPanePainter.java \
+    #
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+  # These files are duplicated in MACOSX_SRC_DIRS
+  java.desktop_EXCLUDE_FILES += \
+      $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/BackBufferCapsProvider.java \
+      #
+endif
+
+################################################################################
+
+java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+
+################################################################################
+
+java.sql.rowset_CLEAN_FILES := $(wildcard \
+    $(JDK_TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
+    $(JDK_TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
+
+################################################################################
+# Exclude building of IIOP transport for RMI Connector
+java.management_EXCLUDES := com/sun/jmx/remote/protocol/iiop
+
+# Why is this in the open source tree?
+ifdef OPENJDK
+  java.management_EXCLUDES := \
+      com/sun/jmx/snmp \
+      sun/management/snmp \
+      #
+endif
+
+ifeq ($(RMICONNECTOR_IIOP), false)
+  java.management_EXCLUDES += com/sun/jmx/remote/protocol/iiop
+endif
+
+################################################################################
+
+java.rmi_CLEAN_FILES := $(wildcard \
+    $(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \
+    $(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties)
+
+################################################################################
+
+java.corba_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+
+java.corba_COPY := .prp
+java.corba_CLEAN := .properties
+
+java.corba_EXCLUDES := \
+    com/sun/corba/se/PortableActivationIDL \
+    com/sun/tools/corba/se/logutil \
+    #
+java.corba_EXCLUDE_FILES := \
+    com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
+    com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
+    com/sun/org/omg/CORBA/IDLTypeOperations.java \
+    com/sun/org/omg/CORBA/IRObjectOperations.java \
+    org/omg/PortableInterceptor/UNKNOWN.java \
+    com/sun/tools/corba/se/idl/ResourceBundleUtil.java \
+    com/sun/corba/se/impl/presentation/rmi/jndi.properties \
+    #
+
+################################################################################
+
+java.xml_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+java.xml_CLEAN := .properties
+
+################################################################################
+
+java.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+java.xml.bind_CLEAN := .properties
+
+################################################################################
+
+java.xml.soap_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+java.xml.soap_CLEAN := .properties
+
+################################################################################
+
+java.xml.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+java.xml.ws_COPY := .xml
+java.xml.ws_CLEAN := .properties
+
+################################################################################
+
+java.naming_CLEAN := jndiprovider.properties
+
+################################################################################
+
+java.security.saaj_CLEAN := .properties
+
+################################################################################
+
+java.xml.crypto_COPY := .dtd .xml
+java.xml.crypto_CLEAN := .properties
+
+################################################################################
+
+jdk.charsets_COPY := .dat
+
+################################################################################
+
+jdk.compiler_COPY := javax.tools.JavaCompilerTool
+
+################################################################################
+
+jdk.jcmd_COPY := _options 
+
+################################################################################
+
+jdk.javadoc_COPY := .xml .css .js
+
+################################################################################
+
+jdk.rmic_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+jdk.rmic_CLEAN := .properties
+
+################################################################################
+
+# No SCTP implementation on Mac OS X or AIX. These classes should be excluded.
+SCTP_IMPL_CLASSES = \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
+    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+  jdk.sctp_EXCLUDE_FILES := $(SCTP_IMPL_CLASSES)
+endif
+
+ifeq ($(OPENJDK_TARGET_OS),aix)
+  # These files are duplicated in AIX_SRC_DIRS
+  jdk.sctp_EXCLUDE_FILES := $(SCTP_IMPL_CLASSES)
+endif
+
+################################################################################
+
+jdk.jconsole_COPY := .gif .png
+
+jdk.jconsole_CLEAN_FILES := $(wildcard \
+    $(JDK_TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
+
+################################################################################
+
+jdk.compiler_CLEAN_FILES := $(wildcard \
+    $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
+        sun/tools/serialver/resources))
+
+################################################################################
+
+jdk.jdi_EXCLUDES := \
+    com/sun/tools/example/debug/bdi \
+    com/sun/tools/example/debug/event \
+    com/sun/tools/example/debug/gui \
+    com/sun/jdi/doc-files \
+    #
+
+jdk.jdi_EXCLUDE_FILES += jdi-overview.html
+
+################################################################################
+
+jdk.dev_CLEAN_FILES := $(wildcard \
+    $(patsubst %, $(JDK_TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \
+        com/sun/tools/script/shell))
+
+jdk.dev_COPY := .js oqlhelp.html .txt
+
+################################################################################
+
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+  jdk.attach_EXCLUDE_FILES += \
+      sun/tools/attach/SolarisAttachProvider.java \
+      sun/tools/attach/SolarisVirtualMachine.java \
+      #
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), linux)
+  jdk.attach_EXCLUDE_FILES += \
+      sun/tools/attach/LinuxAttachProvider.java \
+      sun/tools/attach/LinuxVirtualMachine.java \
+      #
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), macosx)
+  jdk.attach_EXCLUDE_FILES += \
+      sun/tools/attach/BsdAttachProvider.java \
+      sun/tools/attach/BsdVirtualMachine.java \
+      #
+endif
+
+ifneq ($(OPENJDK_TARGET_OS),aix)
+  jdk.attach_EXCLUDE_FILES += \
+      sun/tools/attach/AixAttachProvider.java \
+      sun/tools/attach/AixVirtualMachine.java \
+      #
+endif
+
+################################################################################
+
+jdk.jvmstat_COPY := aliasmap
+
+################################################################################
+
+jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+jdk.xml.bind_CLEAN := .properties
+jdk.xml.bind_COPY := .xsd JAXBContextFactory.java ZeroOneBooleanAdapter.java
+
+################################################################################
+
+jdk.xml.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+jdk.xml.ws_CLEAN := .properties
+
+################################################################################
+
+sun.charsets_COPY := .dat
+
+################################################################################
+
+jdk.localedata_COPY := _dict _th
+# Exclude BreakIterator classes that are just used in compile process to generate
+# data files and shouldn't go in the product
+jdk.localedata_EXCLUDE_FILES := sun/text/resources/th/BreakIteratorRules_th.java
+
+################################################################################
+# Setup the compilation of each module
+#
+# Do not include nashorn src here since it needs to be compiled separately due
+# to nasgen.
+#
+# Order src dirs in order of override with the most important first. Generated
+# source before static source and platform specific source before shared.
+#
+# To use this variable, use $(call ALL_SRC_DIRS,module) with no space.
+GENERATED_SRC_DIRS += \
+    $(JDK_OUTPUTDIR)/gensrc/$1 \
+    $(LANGTOOLS_OUTPUTDIR)/gensrc/$1 \
+    $(CORBA_OUTPUTDIR)/gensrc/$1 \
+    $(JDK_OUTPUTDIR)/gensrc_no_srczip/$1 \
+    #
+
+OS_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS)/classes
+ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_API_DIR))
+OS_API_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS_API_DIR)/classes
+endif
+
+SHARE_SRC_DIRS += \
+    $(JDK_TOPDIR)/src/$1/share/classes \
+    $(LANGTOOLS_TOPDIR)/src/$1/share/classes \
+    $(CORBA_TOPDIR)/src/$1/share/classes \
+    $(JAXP_TOPDIR)/src/$1/share/classes \
+    $(JAXWS_TOPDIR)/src/$1/share/classes \
+    #
+
+ALL_SRC_DIRS = \
+    $(GENERATED_SRC_DIRS) \
+    $(OS_SRC_DIRS) \
+    $(OS_API_SRC_DIRS) \
+    $(SHARE_SRC_DIRS) \
+    #
+
+# Find all modules with java sources. Filter out nashorn since it needs to be
+# compiled separately.
+ALL_JAVA_MODULES := $(filter-out jdk.scripting.nashorn, $(call FindJavaModules))
+JAVA_MODULES := $(ALL_JAVA_MODULES)
+
+# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying
+# JDK_FILTER at the make command line, only a subset of the JDK java files will
+# be recompiled. If multiple paths are separated by comma, convert that into a
+# space separated list.
+JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER)))
+
+# This macro sets up compilation of a module and declares dependencies for it.
+# Param 1 - module name
+define SetupModuleCompilation
+  # Find the module dependencies by parsing modules.list file
+  $1_DEPS := $$(call FindDepsForModule, $1)
+
+  $1_CLASSPATH := $$(addprefix $(JDK_OUTPUTDIR)/modules/,$$($1_DEPS))
+  ifeq ($1, jdk.hotspot.agent)
+    ## The source of this module is compiled elsewhere, hotspot, and imported.
+    ## Service types are required in the classpath when compiing module-info
+    $1_CLASSPATH := $$($1_CLASSPATH) $$(addprefix $(JDK_OUTPUTDIR)/modules/,jdk.hotspot.agent)
+  endif
+  $1_CLASSPATH := $$(subst $$(SPACE),$$(PATH_SEP),$$($1_CLASSPATH))
+  $1_JAVAC_FLAGS := -bootclasspath "$$($1_CLASSPATH)"
+
+  $$(eval $$(call SetupJavaCompilation,$1, \
+      SETUP := $$(if $$($1_SETUP), $$($1_SETUP), GENERATE_JDKBYTECODE), \
+      SRC := $$(wildcard $$(call ALL_SRC_DIRS,$1)), \
+      INCLUDES:=$(JDK_USER_DEFINED_FILTER),\
+      BIN := $(JDK_OUTPUTDIR)/modules/$1, \
+      HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers/$1, \
+      ADD_JAVAC_FLAGS := $$($1_JAVAC_FLAGS)))
+
+  $1: $$($1) $$($1_COPY_EXTRA)
+
+  # Declare dependencies between java compilation of different modules.
+  # Since not all modules have been declared yet, or might be declared
+  # in different invocations of this file, use the macro to find the 
+  # correct target file to depend on.
+  # Only the javac compilation actually depends on other modules so limit
+  # dependency declaration to that by using the *_COMPILE_TARGET variable.
+  $$($1_COMPILE_TARGETS): $$(foreach d,$$($1_DEPS), \
+      $$(call SetupJavaCompilationCompileTarget, $$d, $(JDK_OUTPUTDIR)/modules/$$d))
+endef
+
+# Setup compilation for each module
+$(foreach m,$(JAVA_MODULES),$(eval $(call SetupModuleCompilation,$m)))
+
+################################################################################
+# Copy zh_HK properties files from zh_TW
+
+$(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties
+	$(install-file)
+
+define CreateHkTargets
+  $(patsubst $(JDK_TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
+    $(subst /share/classes,, \
+      $(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1))))
+endef
+
+java.sql.rowset: $(call CreateHkTargets, $(java.sql.rowset_CLEAN_FILES))
+java.rmi: $(call CreateHkTargets, $(java.rmi_CLEAN_FILES))
+
+all: $(JAVA_MODULES)
+
+.PHONY: all $(JAVA_MODULES)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/Install.gmk	Sun Aug 17 15:51:37 2014 +0100
@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2014, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: install
+
+include $(SPEC)
+
+BINARIES := $(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*))
+INSTALLDIR := openjdk-$(RELEASE)
+
+# Install the jdk image, in a very crude way. Not taking into
+# account, how to install properly on macosx or windows etc.
+install:
+	echo Installing jdk image into $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
+	echo and creating $(words $(BINARIES)) links from $(INSTALL_PREFIX)/bin into the jdk.
+	$(MKDIR) -p $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
+	$(RM) -r $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/*
+	$(CP) -rp $(JDK_IMAGE_DIR)/* $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
+	$(MKDIR) -p $(INSTALL_PREFIX)/bin
+	$(RM) $(addprefix $(INSTALL_PREFIX)/bin/, $(BINARIES))
+	$(foreach b, $(BINARIES), $(LN) -s $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/bin/$b $(INSTALL_PREFIX)/bin/$b &&) true
--- a/make/Javadoc.gmk	Sun Aug 10 19:38:50 2014 -0700
+++ b/make/Javadoc.gmk	Sun Aug 17 15:51:37 2014 +0100
@@ -41,18 +41,11 @@
 .SUFFIXES: .java
 
 #
-# Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc.
+# Definitions for directories
 #
 
-DOCSDIR=$(OUTPUT_ROOT)/docs
-TEMPDIR=$(OUTPUT_ROOT)/docstemp
-
-JDK_SHARE_SRC=$(JDK_TOPDIR)/src/share
-JDK_SHARE_CLASSES=$(JDK_SHARE_SRC)/classes
-
-JDK_IMPSRC = $(JDK_OUTPUTDIR)/impsrc
-
-JDK_GENSRC = $(JDK_OUTPUTDIR)/gensrc
+DOCSDIR := $(OUTPUT_ROOT)/docs
+TEMPDIR := $(OUTPUT_ROOT)/docstemp
 
 HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPUTDIR)/docs
 
@@ -143,16 +136,19 @@
 # Otherwise, you get "No packages or classes specified." due
 # to $(PATH_SEP) being interpreted as an end of
 # command (newline or shell ; character)
-ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \
-    $(JDK_IMPSRC) \
-    $(JDK_GENSRC) \
-    $(JDK_OUTPUTDIR)/gendocsrc_rmic \
-    $(JDK_TOPDIR)/src/solaris/classes \
-    $(JDK_TOPDIR)/src/windows/classes \
-    $(JDK_SHARE_SRC)/doc/stub
-
-# List of directories that actually exist
-ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS))
+ALL_SOURCE_DIRS := $(wildcard \
+      $(JDK_TOPDIR)/src/*/share/classes \
+      $(JDK_TOPDIR)/src/*/$(OPENJDK_TARGET_OS_API_DIR)/classes \
+      $(LANGTOOLS_TOPDIR)/src/*/share/classes \
+      $(CORBA_TOPDIR)/src/*/share/classes \
+      $(JAXP_TOPDIR)/src/*/share/classes \
+      $(JAXWS_TOPDIR)/src/*/share/classes \
+      $(JDK_OUTPUTDIR)/gensrc/j* \
+      $(JDK_OUTPUTDIR)/gendocsrc_rmic \
+      $(CORBA_OUTPUTDIR)/gensrc/j* \
+      $(JDK_TOPDIR)/src/*/share/doc/stub \
+      ) \
+      #
 
 # List with classpath separator between them
 EMPTY:=
@@ -176,7 +172,7 @@
 
 $(eval $(call FillCacheFind, $(ALL_SOURCE_DIRS)))
 define PackageDependencies
-  $(call CacheFind, $(foreach p, $(subst .,/,$1), $(addsuffix /$p, $(ALL_SOURCE_DIRS))))
+  $(call CacheFind, $(wildcard $(foreach p, $(subst .,/,$1), $(addsuffix /$p, $(ALL_SOURCE_DIRS)))))
 endef
 
 # Given a list of packages, add packages that exist to $@, print summary
@@ -382,7 +378,7 @@
 <strong>Java$(TRADEMARK)&nbsp;Platform<br>Standard&nbsp;Ed.&nbsp;$(JDK_MINOR_VERSION)</strong>
 
 # Overview file for core apis
-COREAPI_OVERVIEW = $(JDK_SHARE_CLASSES)/overview-core.html
+COREAPI_OVERVIEW = $(JDK_TOPDIR)/src/java.base/share/classes/overview-core.html
 
 # The index.html, options, and packages files
 COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
@@ -534,7 +530,7 @@
 # Create a file with the package names in it
 $(TAGLETAPI_PACKAGES_FILE): $(call PackageDependencies,$(TAGLETAPI_PKGS))
 	$(prep-target)
-	@($(ECHO) "$(JDK_IMPSRC)/$(TAGLETAPI_FILE)" ) > $@
+	@($(ECHO) "$(LANGTOOLS_TOPDIR)/src/jdk.javadoc/share/classes/$(TAGLETAPI_FILE)" ) > $@
 
 #############################################################
 #
@@ -614,7 +610,7 @@
 JDI_WINDOWTITLE := Java Debug Interface
 JDI_HEADER := <strong>Java Debug Interface</strong>
 JDI_BOTTOM := $(call CommonBottom,$(JDI_FIRST_COPYRIGHT_YEAR))
-JDI_OVERVIEW := $(JDK_SHARE_CLASSES)/jdi-overview.html
+JDI_OVERVIEW := $(JDK_TOPDIR)/src/jdk.jdi/share/classes/jdi-overview.html
 # JDI_PKGS is located in NON_CORE_PKGS.gmk
 
 # The index.html, options, and packages files
@@ -703,7 +699,7 @@
 JAAS_HEADER := <strong>Java Authentication and Authorization Service</strong>
 JAAS_BOTTOM := $(call CommonBottom,$(JAAS_FIRST_COPYRIGHT_YEAR))
 # JAAS_PKGS is located in NON_CORE_PKGS.gmk
-JAAS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/auth/jaas-overview.html
+JAAS_OVERVIEW := $(JDK_TOPDIR)/src/jdk.security.auth/share/classes/jaas-overview.html
 
 # The index.html, options, and packages files
 JAAS_INDEX_FILE = $(JAAS_DOCDIR)/index.html
@@ -756,7 +752,7 @@
 JGSS_WINDOWTITLE := Java GSS-API Utilities
 JGSS_HEADER := <strong>Java GSS-API Utilities</strong>
 JGSS_BOTTOM := $(call CommonBottom,$(JGSS_FIRST_COPYRIGHT_YEAR))
-JGSS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/jgss/jgss-overview.html
+JGSS_OVERVIEW := $(JDK_TOPDIR)/src/java.security.jgss/share/classes/jgss-overview.html
 # JGSS_PKGS is located in NON_CORE_PKGS.gmk
 
 # The index.html, options, and packages files
@@ -913,12 +909,12 @@
 MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
 MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
 JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
-JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
+JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/jdk.snmp/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
 MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
 MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
 MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong>
 MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR))
-MGMT_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/management/mgmt-overview.html
+MGMT_OVERVIEW := $(JDK_TOPDIR)/src/java.management/share/classes/mgmt-overview.html
 # MGMT_PKGS is located in NON_CORE_PKGS.gmk
 
 # The index.html, options, and packages files
--- a/make/Jprt.gmk	Sun Aug 10 19:38:50 2014 -0700
+++ b/make/Jprt.gmk	Sun Aug 17 15:51:37 2014 +0100
@@ -52,7 +52,6 @@
 
 # This target must be called in the context of a SPEC file
 jprt_bundle: $(JPRT_ARCHIVE_BUNDLE)
-	@$(call CheckIfMakeAtEnd)
 
 # This target must be called in the context of a SPEC file
 $(JPRT_ARCHIVE_BUNDLE): bundles
@@ -66,8 +65,7 @@
 SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR)
 
 # Bundle up the images
-bundles: all bundles-only
-bundles-only: start-make
+bundles: all
 	@$(call TargetEnter)
 	$(MKDIR) -p $(BUILD_OUTPUT)/bundles
 	$(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
@@ -78,8 +76,7 @@
 	@$(call TargetExit)
 
 # Copy images to one unified location regardless of platform etc.
-final-images: all final-images-only
-final-images-only: start-make
+final-images: all
 	@$(call TargetEnter)
 	$(RM) -r $(BUILD_OUTPUT)/final-images
 	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)
@@ -97,4 +94,4 @@
 
 ###########################################################################
 # Phony targets
-.PHONY: jprt_bundle bundles bundles-only final-images final-images-only
+.PHONY: jprt_bundle bundles final-images
--- a/make/Main.gmk	Sun Aug 10 19:38:50 2014 -0700
+++ b/make/Main.gmk	Sun Aug 17 15:51:37 2014 +0100
@@ -23,165 +23,201 @@
 # questions.
 #
 
-### This is the main part of the Makefile, for the normal case with SPEC specifying a single existing spec.gmk file.
+################################################################################
+# This is the main makefile containing most actual top level targets. It needs
+# to be called with a SPEC file defined.
+
+# Declare default target
+default:
 
 # Now load the spec
 include $(SPEC)
 
+include $(SRC_ROOT)/make/MakeHelpers.gmk
+
 # Load the vital tools for all the makefiles.
 include $(SRC_ROOT)/make/common/MakeBase.gmk
 
+# Load common profile names definitions
+include $(JDK_TOPDIR)/make/ProfileNames.gmk
+
+# Declare ALL_TARGETS as an immediate variable. This variable is a list of all
+# valid top level targets. It's used to declare them all as PHONY and to 
+# generate the -only targets.
+ALL_TARGETS :=
+
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, , Main.gmk))
 
-### Clean up from previous run
+# All modules for the current target platform.
+# Manually add jdk.hotspot.agent for now.
+ALL_MODULES := $(call FindAllModules) jdk.hotspot.agent
 
-# Remove any build.log from a previous run, if they exist
-ifneq (,$(BUILD_LOG))
-  ifneq (,$(BUILD_LOG_PREVIOUS))
-    # Rotate old log
-    $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
-    $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
-  else
-    $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
-  endif
-  $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null)
-endif
-# Remove any javac server logs and port files. This
-# prevents a new make run to reuse the previous servers.
-ifneq (,$(SJAVAC_SERVER_DIR))
-  $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
+################################################################################
+################################################################################
+#
+# Recipes for all targets. Only recipes, dependencies are declared later.
+#
+################################################################################
+
+################################################################################
+# Interim/build tools targets, compiling tools used during the build
+
+interim-langtools:
+	+($(CD) $(LANGTOOLS_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterim.gmk)
+
+interim-corba:
+	+($(CD) $(CORBA_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileCorba.gmk)
+
+interim-rmic:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
+
+build-tools-jdk:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Tools.gmk java-tools)
+
+ALL_TARGETS += interim-langtools interim-corba build-tools-jdk
+
+################################################################################
+# Special targets for certain modules
+
+import-hotspot:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Import.gmk)
+
+unpack-sec:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UnpackSecurity.gmk)
+
+policy-jars:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreatePolicyJars.gmk)
+
+ALL_TARGETS += import-hotspot unpack-sec policy-jars
+
+################################################################################
+# Gensrc targets, generating source before java compilation can be done
+JDK_GENSRC_MODULES := $(call FindModulesWithMakefileFor, gensrc, Gensrc)
+LANGTOOLS_GENSRC_MODULES := jdk.compiler.tools
+CORBA_GENSRC_MODULES := java.corba
+GENSRC_MODULES := $(JDK_GENSRC_MODULES) $(LANGTOOLS_GENSRC_MODULES) \
+    $(CORBA_GENSRC_MODULES)
+JDK_GENSRC_TARGETS := $(addsuffix -gensrc, $(JDK_GENSRC_MODULES))
+LANGTOOLS_GENSRC_TARGETS := $(addsuffix -gensrc, $(LANGTOOLS_GENSRC_MODULES))
+CORBA_GENSRC_TARGETS := $(addsuffix -gensrc, $(CORBA_GENSRC_MODULES))
+GENSRC_TARGETS := $(addsuffix -gensrc, $(GENSRC_MODULES))
+
+jdk.compiler.tools-gensrc:
+	+($(CD) $(LANGTOOLS_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GensrcLangtools.gmk)
+
+java.corba-gensrc:
+	+($(CD) $(CORBA_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GensrcCorba.gmk)
+
+# Declare recipes for all jdk <module>-gensrc targets
+$(foreach m, $(JDK_GENSRC_MODULES), $(eval $(call DeclareRecipeForModuleMakefile, \
+    $m, gensrc, gensrc, Gensrc)))
+
+ALL_TARGETS += $(GENSRC_TARGETS)
+
+################################################################################
+# Generate data targets
+GENDATA_MODULES := $(call FindModulesWithMakefileFor, gendata, Gendata)
+GENDATA_TARGETS := $(addsuffix -gendata, $(GENDATA_MODULES))
+
+# Declare recipes for all <module>-gendata targets
+$(foreach m, $(GENDATA_MODULES), $(eval $(call DeclareRecipeForModuleMakefile, \
+    $m, gendata, gendata, Gendata)))
+
+$(foreach m, $(GENDATA_MODULES), $(eval $(call DeclareGendataRecipe,$m)))
+
+ALL_TARGETS += $(GENDATA_TARGETS)
+
+################################################################################
+# Copy files targets
+COPY_MODULES := $(call FindModulesWithMakefileFor, copy, Copy)
+COPY_TARGETS := $(addsuffix -copy, $(COPY_MODULES))
+
+# Declare recipes for all <module>-copy targets
+$(foreach m, $(COPY_MODULES), $(eval $(call DeclareRecipeForModuleMakefile, \
+    $m, copy, copy, Copy)))
+
+ALL_TARGETS += $(COPY_TARGETS)
+
+################################################################################
+# Targets for compiling all java modules. Nashorn is treated separately.
+JAVA_MODULES := $(call FindJavaModules)
+JAVA_TARGETS := $(addsuffix -java, $(JAVA_MODULES))
+
+define DeclareCompileJavaRecipe
+  $1-java:
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f CompileJavaModules.gmk \
+	    $1 JAVA_MODULES=$1)
+endef
+
+$(foreach m, $(filter-out jdk.scripting.nashorn, $(JAVA_MODULES)), \
+    $(eval $(call DeclareCompileJavaRecipe,$m)))
+
+# Build nashorn. Needs to be compiled separately from the rest of the modules
+# due to nasgen.
+jdk.scripting.nashorn-java:
+	+($(CD) $(NASHORN_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk compile)
+
+ALL_TARGETS += $(JAVA_TARGETS)
+
+################################################################################
+# Targets for running rmic.
+RMIC_MODULES := $(call FindModulesWithMakefileFor, rmic, Rmic)
+RMIC_TARGETS := $(addsuffix -rmic, $(RMIC_MODULES))
+
+# Declare recipes for all <module>-rmic targets
+$(foreach m, $(RMIC_MODULES), $(eval $(call DeclareRecipeForModuleMakefile, \
+    $m, rmic, rmic, Rmic)))
+
+ALL_TARGETS += $(RMIC_TARGETS)
+
+################################################################################
+# Targets for compiling native libraries
+ALL_LIB_MODULES := $(call FindModulesWithMakefileFor, lib, Lib)
+LIB_MODULES := $(filter $(ALL_MODULES), $(ALL_LIB_MODULES))
+LIB_TARGETS := $(addsuffix -libs, $(LIB_MODULES))
+
+# Declare recipes for all <module>-libs targets
+$(foreach m, $(LIB_MODULES), $(eval $(call DeclareRecipeForModuleMakefile, \
+    $m, libs, lib, Lib)))
+
+ALL_TARGETS += $(LIB_TARGETS)
+
+################################################################################
+# Targets for compiling native executables
+ALL_LAUNCHER_MODULES := $(call FindModulesWithMakefileFor, launcher, Launcher)
+LAUNCHER_MODULES := $(filter $(ALL_MODULES), $(ALL_LAUNCHER_MODULES))
+LAUNCHER_TARGETS := $(addsuffix -launchers, $(LAUNCHER_MODULES))
+
+# Declare recipes for all <module>-launchers targets
+$(foreach m, $(LAUNCHER_MODULES), $(eval $(call DeclareRecipeForModuleMakefile, \
+    $m, launchers, launcher, Launcher)))
+
+ALL_TARGETS += $(LAUNCHER_TARGETS)
+
+################################################################################
+# Build hotspot target
+
+ifeq ($(BUILD_HOTSPOT),true)
+  hotspot:
+	($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk)
 endif
 
-# Reset the build timers.
-$(eval $(call ResetAllTimers))
+ALL_TARGETS += hotspot
 
-# Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line,
-# hence this workaround.
-MAKE_ARGS:=$(MAKE_ARGS) -j$(JOBS)
+################################################################################
+# Build demos and samples targets
 
-### Main targets
+demos:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileDemos.gmk)
 
-default: jdk
-	@$(call CheckIfMakeAtEnd)
+samples:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopySamples.gmk)
 
-all: images docs
-	@$(call CheckIfMakeAtEnd)
+ALL_TARGETS += demos samples
 
-# Setup a rule for SPEC file that fails if executed. This check makes sure the configuration
-# is up to date after changes to configure
-$(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
-	@$(ECHO) "ERROR: $(SPEC) is not up to date."
-	@$(ECHO) "Please rerun configure! Easiest way to do this is by running"
-	@$(ECHO) "'make reconfigure'."
-	@if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
-
-start-make: $(SPEC)
-	@$(call AtMakeStart)
-
-langtools: langtools-only
-langtools-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(LANGTOOLS_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildLangtools.gmk)
-	@$(call TargetExit)
-
-corba: langtools corba-only
-corba-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(CORBA_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildCorba.gmk)
-	@$(call TargetExit)
-
-jaxp: langtools jaxp-only
-jaxp-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JAXP_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxp.gmk)
-	@$(call TargetExit)
-
-jaxws: langtools jaxp jaxws-only
-jaxws-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JAXWS_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxws.gmk)
-	@$(call TargetExit)
-
-ifeq ($(BUILD_HOTSPOT),true)
-  hotspot: hotspot-only
-  hotspot-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk)
-	@$(call TargetExit)
-endif
-
-jdk: langtools hotspot corba jaxp jaxws jdk-only
-jdk-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
-	@$(call TargetExit)
-
-nashorn: jdk nashorn-only
-nashorn-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(NASHORN_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk)
-	@$(call TargetExit)
-
-demos: jdk demos-only
-demos-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk demos)
-	@$(call TargetExit)
-
-# Note: This double-colon rule is intentional, to support
-# custom make file integration.
-images:: source-tips demos nashorn images-only
-images-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
-	@$(call TargetExit)
-
-overlay-images: source-tips demos overlay-images-only
-overlay-images-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
-	@$(call TargetExit)
-
-profiles: profiles-oscheck source-tips jdk hotspot profiles-only
-profiles-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles)
-	@$(call TargetExit)
-
-profiles-oscheck:
-        ifneq ($(OPENJDK_TARGET_OS), linux)
-	  @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1
-        endif
-
-install: images install-only
-install-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk install)
-	@$(call TargetExit)
-
-docs: jdk docs-only
-docs-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
-	@$(call TargetExit)
-
-sign-jars: jdk sign-jars-only
-sign-jars-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars)
-	@$(call TargetExit)
-
-bootcycle-images: images bootcycle-images-only
-bootcycle-images-only: start-make
-	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
-	@($(CD) $(SRC_ROOT) && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
-
-test: images test-only
-test-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
-	@$(call TargetExit)
+################################################################################
+# Image targets
 
 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be
 # used to track the exact sources used to build that image.
@@ -191,52 +227,313 @@
 	@$(RM) $@
 	@$(call GetSourceTips)
 
+security-jars:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateSecurityJars.gmk)
+
+nashorn-jar:
+	+($(CD) $(NASHORN_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk all)
+
+# Creates the jar files (rt.jar resources.jar etc)
+main-jars:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJars.gmk)
+
+# Creates the images (j2sdk-image j2re-image etc)
+images:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk)
+        ifeq ($(OPENJDK_TARGET_OS), macosx)
+	  +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk)
+        endif
+
+# Create Compact Profile jars
+PROFILE_JARS_TARGETS := $(addsuffix -jars, $(ALL_PROFILES))
+$(PROFILE_JARS_TARGETS):
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) PROFILE=$(@:%-jars=%) -f CreateJars.gmk)
+
+# Create Compact Profile images
+PROFILE_IMAGES_TARGETS := $(addsuffix -images, $(ALL_PROFILES))
+$(PROFILE_IMAGES_TARGETS):
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) PROFILE=$(@:%-images=%) \
+	    JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/j2re-$(word $(call profile_number,$(@:%-images=%)),$(PROFILE_NAMES))-image \
+	    -f Images.gmk profile-image)
+
+profiles-oscheck:
+        ifneq ($(OPENJDK_TARGET_OS), linux)
+	  @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1
+        endif
+
+bootcycle-images:
+	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
+	+$(MAKE) $(MAKE_ARGS) -f Main.gmk SPEC=$(dir $(SPEC))bootcycle-spec.gmk images
+
+ALL_TARGETS += source-tips security-jars nashorn-jar main-jars images \
+    $(PROFILE_JARS_TARGETS) $(PROFILE_IMAGES_TARGETS) profiles-oscheck \
+    bootcycle-images
+
+################################################################################
+# Docs targets
+
+docs-javadoc:
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
+
+docs-jvmtidoc:
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk jvmtidocs)
+
+ALL_TARGETS += docs-javadoc docs-jvmtidoc
+
+################################################################################
+# Test target
+
+test:
+	($(CD) $(SRC_ROOT)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \
+	    JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_OUTPUT_DIR) \
+	    ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
+
+test-make:
+	($(CD) $(SRC_ROOT)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET))
+
+ALL_TARGETS += test test-make
+
+################################################################################
+# Verification targets
+
+# generate modules.xml in the exploded image
+modules-xml:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ModulesXml.gmk gen-modules-xml)
+
+verify-modules:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ModulesXml.gmk checkdeps)
+
+ALL_TARGETS += modules-xml verify-modules
+
+################################################################################
+# Install targets
+
+install:
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Install.gmk)
+
+ALL_TARGETS += install
+
+################################################################################
+#
+# Dependency declarations between targets. 
+#
+# These are declared in two groups. First all dependencies between targets that 
+# have recipes above as these dependencies may be disabled. Then the aggregator
+# targets that do not have recipes of their own, which will never have their
+# dependencies disabled.
+#
+################################################################################
+# Targets with recipes above
+
+# If running an *-only target, parallel execution and dependencies between 
+# recipe targets are disabled. This makes it possible to run a select set of 
+# recipe targets in order. It's the responsibility of the user to make sure
+# all prerequisites are fulfilled. 
+ifneq ($(findstring -only, $(MAKECMDGOALS)), )
+  .NOTPARALLEL:
+else
+  interim-langtools: $(LANGTOOLS_GENSRC_TARGETS)
+
+  build-tools-jdk: interim-langtools
+
+  $(CORBA_GENSRC_TARGETS): interim-langtools
+
+  $(JDK_GENSRC_TARGETS): interim-langtools build-tools-jdk
+
+  interim-corba: $(CORBA_GENSRC_TARGETS)
+
+  $(GENDATA_TARGETS): interim-langtools build-tools-jdk
+
+  interim-rmic: interim-langtools
+
+  $(RMIC_TARGETS): interim-langtools interim-corba interim-rmic
+
+  import-hotspot: hotspot
+
+  $(LIB_TARGETS): import-hotspot
+
+  $(LAUNCHER_TARGETS): java.base-libs
+
+  demos: $(JAVA_TARGETS)
+
+  # Declare dependency from <module>-java to <module>-gensrc
+  $(foreach m, $(GENSRC_MODULES), $(eval $m-java: $m-gensrc))
+
+  # Declare dependencies between java modules
+  $(foreach m, $(JAVA_MODULES), \
+      $(eval $m-java: $(addsuffix -java, $(filter $(JAVA_MODULES), \
+      $(call FindDepsForModule,$m)))))
+
+  # Declare dependencies between <module>-rmic to <module>-java
+  $(foreach m, $(RMIC_MODULES), $(eval $m-rmic: $m-java))
+
+  # Declare dependencies from <module>-lib to <module>-java
+  # Skip jdk.jdwp.agent as it contains no java code.
+  $(foreach m, $(filter-out jdk.jdwp.agent, $(LIB_MODULES)), $(eval $m-libs: $m-java))
+
+  # Declare dependencies from all other <module>-lib to java.base-lib
+  $(foreach t, $(filter-out java.base-libs, $(LIB_TARGETS)), \
+      $(eval $t: java.base-libs))
+  # Declare the special case dependency for jdk.deploy.osx where libosx 
+  # links against libosxapp.
+  jdk.deploy.osx-libs: java.desktop-libs
+
+  # This dependency needs to be explicitly declared. jdk.jdi-gensrc generates a 
+  # header file used by jdk.jdwp libs.
+  jdk.jdwp-libs: jdk.jdi-gensrc
+
+  # Explicitly add dependencies for special targets
+  java.base-java: unpack-sec
+
+  security-jars: java
+
+  nashorn-jar: jdk.scripting.nashorn-java
+
+  main-jars: java rmic security-jars nashorn-jar policy-jars import-hotspot
+
+  # On windows, the jars target needs to wait for jgss libs to be built.
+  # Should ideally split out the sec-bin zip file generation to avoid
+  # this dependency.
+  ifeq ($(OPENJDK_TARGET_OS), windows)
+    main-jars: java.security.jgss-libs
+  endif
+
+  images: jars demos samples exploded-image source-tips
+
+  bootcycle-images: images
+
+  # Need to depend on jars as otherwise there will a race between all the
+  # invocations of CreateJars.gmk.
+  $(PROFILE_JARS_TARGETS): jars profiles-oscheck
+
+  $(PROFILE_IMAGES_TARGETS): demos samples exploded-image source-tips
+
+  # Declare dependencies from <profile>-images to <profile>-jars
+  $(foreach p, $(ALL_PROFILES), $(eval $p-images: $p-jars))
+
+  docs-javadoc: $(GENSRC_TARGETS) rmic
+
+  docs-jvmtidoc: hotspot
+
+  test: exploded-image
+
+  modules-xml: build-tools-jdk java
+
+  verify-modules: exploded-image modules-xml
+
+endif
+
+################################################################################
+# Virtual targets without recipes
+
+gensrc: $(GENSRC_TARGETS)
+
+gendata: $(GENDATA_TARGETS)
+
+copy: $(COPY_TARGETS)
+
+java: $(JAVA_TARGETS)
+
+rmic: $(RMIC_TARGETS)
+
+libs: $(LIB_TARGETS)
+
+launchers: $(LAUNCHER_TARGETS)
+
+# Explicitly add dependencies for these special targets
+java.base: import-hotspot policy-jars
+
+# Declare dependencies from <module> to all the individual targets specific
+# to that module <module>-*.
+$(foreach m, $(GENSRC_MODULES), $(eval $m: $m-gensrc))
+$(foreach m, $(JAVA_MODULES), $(eval $m: $m-java))
+$(foreach m, $(GENDATA_MODULES), $(eval $m: $m-gendata))
+$(foreach m, $(RMIC_MODULES), $(eval $m: $m-rmic))
+$(foreach m, $(LIB_MODULES), $(eval $m: $m-libs))
+$(foreach m, $(LAUNCHER_MODULES), $(eval $m: $m-launchers))
+$(foreach m, $(COPY_MODULES), $(eval $m: $m-copy))
+
+ALL_MODULE_TARGETS := $(sort $(GENSRC_MODULES) $(JAVA_MODULES) \
+    $(GENDATA_MODULES) $(LIB_MODULES) $(LAUNCHER_MODULES) $(COPY_MODULES))
+
+exploded-image: $(ALL_MODULE_TARGETS) modules-xml
+
+jars: main-jars nashorn-jar security-jars policy-jars
+
+# Make each profile name a target that depends on it's images target.
+$(foreach p, $(ALL_PROFILES), $(eval $(p): $(p)-images $(p)-jars))
+
+profiles: $(ALL_PROFILES)
+
+docs: docs-javadoc docs-jvmtidoc
+
+ALL_TARGETS += gensrc gendata copy java rmic libs launchers \
+    $(ALL_MODULE_TARGETS) exploded-image jars \
+    $(ALL_PROFILES) profiles docs
+
+################################################################################
+
+all: images docs verify-modules
+default: exploded-image
+
+ALL_TARGETS += default all
+
+################################################################################
+################################################################################
+#
+# Clean targets
+#
+################################################################################
+
+# If running a clean target, disable parallel execution
+ifneq ($(findstring clean, $(MAKECMDGOALS)), )
+  .NOTPARALLEL:
+endif
+
+CLEAN_COMPONENTS += langtools corba hotspot jdk nashorn images \
+    bootcycle-build docs docstemp test
+CLEAN_TARGETS := $(addprefix clean-, $(CLEAN_COMPONENTS))
 
 # Remove everything, except the output from configure.
-clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build clean-docs clean-test
-	@($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
-	@$(ECHO) Cleaned all build artifacts.
+clean: $(CLEAN_TARGETS)
+	($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
+	$(ECHO) Cleaned all build artifacts.
+
+$(CLEAN_TARGETS):
+	$(call CleanComponent,$(patsubst clean-%, %, $@))
+
+clean-docs: clean-docstemp
 
 # Remove everything, including configure configuration.
 # If the output directory was created by configure and now becomes empty, remove it as well.
-# FIXME: tmp should not be here, fix ResetTimers instead. And remove spec.sh!
 dist-clean: clean
-	@($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments Makefile compare.sh spec.sh tmp javacservers)
-	@$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
+	($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments \
+	    Makefile compare.sh spec.sh tmp javacservers)
+	$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
 	  if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
 	    $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \
 	  else \
-	    ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" && $(RM) -r $(OUTPUT_ROOT)) \
+	    ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" \
+	        && $(RM) -r $(OUTPUT_ROOT)) \
 	  fi \
 	)
-	@$(ECHO) Cleaned everything, you will have to re-run configure.
+	$(ECHO) Cleaned everything, you will have to re-run configure.
 
-clean-langtools:
-	$(call CleanComponent,langtools)
-clean-corba:
-	$(call CleanComponent,corba)
-clean-jaxp:
-	$(call CleanComponent,jaxp)
-clean-jaxws:
-	$(call CleanComponent,jaxws)
-clean-hotspot:
-	$(call CleanComponent,hotspot)
-clean-jdk:
-	$(call CleanComponent,jdk)
-clean-nashorn:
-	$(call CleanComponent,nashorn)
-clean-images:
-	$(call CleanComponent,images)
-clean-overlay-images:
-	$(call CleanComponent,overlay-images)
-clean-bootcycle-build:
-	$(call CleanComponent,bootcycle-build)
-clean-docs:
-	$(call CleanComponent,docs)
-	$(call CleanComponent,docstemp)
-clean-test:
-	$(call CleanComponent,testoutput)
-	
+ALL_TARGETS += clean dist-clean $(CLEAN_TARGETS)
+
+################################################################################
+
+# Setup a rule for SPEC file that fails if executed. This check makes sure the 
+# configuration is up to date after changes to configure. 
+ifeq ($(findstring reconfigure, $(MAKECMDGOALS)), )
+  $(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
+	@$(ECHO) "ERROR: $(SPEC) is not up to date."
+	@$(ECHO) "Please rerun configure! Easiest way to do this is by running"
+	@$(ECHO) "'make reconfigure'."
+	@$(ECHO) "It may also be ignored by setting IGNORE_OLD_CONFIG=true"
+	@if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
+endif
+
 reconfigure:
         ifneq ($(CONFIGURE_COMMAND_LINE), )
 	  @$(ECHO) "Re-running configure using arguments '$(CONFIGURE_COMMAND_LINE)'"
@@ -245,12 +542,18 @@
         endif
 	@( cd $(OUTPUT_ROOT) && $(BASH) $(TOPDIR)/configure $(CONFIGURE_COMMAND_LINE) )
 
-.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
-.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
-.PHONY: default all clean dist-clean bootcycle-images start-make
-.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
-.PHONY: profiles profiles-only profiles-oscheck
+ALL_TARGETS += reconfigure
 
-include $(root_dir)/make/Jprt.gmk
+################################################################################
+# Declare *-only targets for each normal target
+$(foreach t, $(ALL_TARGETS), $(eval $(t)-only: $(t)))
+
+ALL_TARGETS += $(addsuffix -only, $(ALL_TARGETS))
+
+################################################################################
+
+.PHONY: $(ALL_TARGETS)
+
+include $(SRC_ROOT)/make/Jprt.gmk
 
 FRC: # Force target
--- a/make/MakeHelpers.gmk	Sun Aug 10 19:38:50 2014 -0700
+++ b/make/MakeHelpers.gmk	Sun Aug 17 15:51:37 2014 +0100
@@ -40,7 +40,7 @@
 
 # Find out which variables were passed explicitely on the make command line. These
 # will be passed on to sub-makes, overriding spec.gmk settings.
-MAKE_ARGS=$(foreach var,$(subst =command,,$(filter %=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))),$(var)=$($(var)))
+MAKE_ARGS=$(foreach var,$(subst =command,,$(filter %=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))),$(var)="$($(var))")
 
 list_alt_overrides_with_origins=$(filter ALT_%=environment ALT_%=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))
 list_alt_overrides=$(subst =command,,$(subst =environment,,$(list_alt_overrides_with_origins)))
@@ -112,7 +112,8 @@
 
 # Do not indent this function, this will add whitespace at the start which the caller won't handle
 define GetRealTarget
-$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),default))
+$(strip $(if $(findstring main-wrapper, $(MAKECMDGOALS)), $(MAIN_TARGETS), \
+    $(if $(MAKECMDGOALS),$(MAKECMDGOALS),default)))
 endef
 
 # Do not indent this function, this will add whitespace at the start which the caller won't handle
@@ -131,24 +132,23 @@
 
 # Hook to be called when starting to execute a top-level target
 define TargetEnter
-	$(BUILD_LOG_WRAPPER) $(PRINTF) "## Starting $(patsubst %-only,%,$@)\n"
+	$(PRINTF) "## Starting $(patsubst %-only,%,$@)\n"
 	$(call RecordStartTime,$(patsubst %-only,%,$@))
 endef
 
 # Hook to be called when finish executing a top-level target
 define TargetExit
 	$(call RecordEndTime,$(patsubst %-only,%,$@))
-	$(BUILD_LOG_WRAPPER) $(PRINTF) "## Finished $(patsubst %-only,%,$@) (build time %s)\n\n" \
+	$(PRINTF) "## Finished $(patsubst %-only,%,$@) (build time %s)\n\n" \
 	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_$(patsubst %-only,%,$@) | $(CUT) -f 1 -d ' '`"
-	$(call CheckIfMakeAtEnd)
 endef
 
 # Hook to be called as the very first thing when running a normal build
 define AtMakeStart
 	$(if $(findstring --jobserver,$(MAKEFLAGS)),$(error make -j is not supported, use make JOBS=n))
 	$(call CheckEnvironment)
-	@$(PRINTF) $(LOG_INFO) "Running make as '$(MAKE) $(MFLAGS) $(MAKE_ARGS)'\n"
-	@$(PRINTF) "Building $(PRODUCT_NAME) for target '$(call GetRealTarget)' in configuration '$(CONF_NAME)'\n\n"
+	$(BUILD_LOG_WRAPPER) $(PRINTF) $(LOG_INFO) "Running make as '$(MAKE) $(MFLAGS) $(MAKE_ARGS)'\n"
+	$(BUILD_LOG_WRAPPER) $(PRINTF) "Building $(PRODUCT_NAME) for target '$(call GetRealTarget)' in configuration '$(CONF_NAME)'\n\n"
 	$(call StartGlobalTimer)
 endef
 
@@ -157,7 +157,7 @@
 	[ -f $(SJAVAC_SERVER_DIR)/server.port ] && echo Stopping sjavac server && $(TOUCH) $(SJAVAC_SERVER_DIR)/server.port.stop; true
 	$(call StopGlobalTimer)
 	$(call ReportBuildTimes)
-	@$(PRINTF) "Finished building $(PRODUCT_NAME) for target '$(call GetRealTarget)'\n"
+	@$(PRINTF) "\nFinished building $(PRODUCT_NAME) for target '$(call GetRealTarget)'\n"
 	$(call CheckEnvironment)
 endef
 
@@ -298,7 +298,7 @@
 
 # Cleans the component given as $1
 define CleanComponent
-	@$(PRINTF) "Cleaning $1 build artifacts ..."
+	@$(PRINTF) "Cleaning $(strip $1) build artifacts ..."
 	@($(CD) $(OUTPUT_ROOT) && $(RM) -r $1)
 	@$(PRINTF) " done\n"
 endef
--- a/make/common/JavaCompilation.gmk	Sun Aug 10 19:38:50 2014 -0700
+++ b/make/common/JavaCompilation.gmk	Sun Aug 17 15:51:37 2014 +0100
@@ -35,6 +35,9 @@
 # of removing duplicates. It is actually this side effect that is
 # desired whenever sort is used below!
 
+ifndef _JAVA_COMPILATION_GMK
+_JAVA_COMPILATION_GMK := 1
+
 ifeq (,$(_MAKEBASE_GMK))
   $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk)
 endif
@@ -105,8 +108,8 @@
   # On windows, a lot of includes/excludes risk making the command line too long, so
   # writing the grep patterns to files.
   ifneq (,$$($1_INCLUDES))
-    $1_GREP_INCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS), \
-        $$(addprefix $$(src)/,$$($1_INCLUDES)))
+    $1_GREP_INCLUDE_PATTERNS:=$$(call EscapeDollar, \
+        $$(foreach src,$$($1_SRCS), $$(addprefix $$(src)/,$$($1_INCLUDES))))
     # If there are a lot of include patterns, output to file to shorten command lines
     ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),)
       $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS))
@@ -118,8 +121,9 @@
     endif
   endif
   ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES))
-    $1_GREP_EXCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \
-        $$($1_EXCLUDES) $$($1_EXCLUDE_FILES)))
+    $1_GREP_EXCLUDE_PATTERNS:=$$(call EscapeDollar, \
+        $$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \
+        $$($1_EXCLUDES) $$($1_EXCLUDE_FILES))))
     # If there are a lot of include patterns, output to file to shorten command lines
     ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),)
       $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS))
@@ -154,9 +158,9 @@
     ifneq (,$$($1_GREP_EXCLUDE_PATTERNS))
       $1_DEPS:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPS))
     endif
-    # The subst of \ is needed because $ has to be escaped with \ in EXTRA_FILES for the command
-    # lines, but not here for use in make dependencies.
-    $1_DEPS+=$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
+    # Look for EXTRA_FILES in all SRCS dirs and as absolute paths.
+    $1_DEPS+=$$(wildcard $$(foreach src, $$($1_SRCS), \
+        $$(addprefix $$(src)/, $$($1_EXTRA_FILES))) $$($1_EXTRA_FILES))
     ifeq (,$$($1_SKIP_METAINF))
       $1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
     endif
@@ -168,44 +172,69 @@
 
   # Utility macros, to make the shell script receipt somewhat easier to decipher.
 
+  # Capture extra files is the same for both CAPTURE_CONTENTS and SCAPTURE_CONTENTS so
+  # only define it once to avoid duplication.
+  # The list of extra files might be long, so need to use ListPathsSafely to print
+  # them out to a separte file. Then process the contents of that file to rewrite
+  # into -C <dir> <file> lines.
+  # The EXTRA_FILES_RESOLVED varible must be set in the macro so that it's evaluated
+  # in the recipe when the files are guaranteed to exist.
+  $1_CAPTURE_EXTRA_FILES=\
+      $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents.extra $$(NEWLINE) \
+      $$(eval $1_EXTRA_FILES_RESOLVED:=$$(call DoubleDollar, $$(call DoubleDollar, \
+          $$(wildcard $$(foreach src, $$($1_SRCS), \
+          $$(addprefix $$(src)/, $$($1_EXTRA_FILES))) $$($1_EXTRA_FILES))))) \
+      $$(if $$($1_EXTRA_FILES_RESOLVED), \
+        $$(call ListPathsSafely,$1_EXTRA_FILES_RESOLVED,\n, \
+            >> $$($1_BIN)/_the.$$($1_JARNAME)_contents.extra) $$(NEWLINE) \
+        $(SED) $$(foreach src,$$($1_SRCS), -e 's|$$(src)/|-C $$(src) |g') \
+            $$($1_BIN)/_the.$$($1_JARNAME)_contents.extra \
+            >> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE))
+
   # The capture contents macro finds all files (matching the patterns, typically
   # .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar.
   # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
-  $1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      ( ( $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \
-          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
-      $(ECHO) $$(subst $$(src)/,,$$($1_EXTRA_FILES) ) ) > \
-      $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
+  $1_CAPTURE_CONTENTS=\
+      $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) \
+      $$(foreach src,$$($1_SRCS), \
+        $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \
+          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/|-C $$(src) |g' \
+        >> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)) \
+      $$($1_CAPTURE_EXTRA_FILES)
+
   # The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file.
   ifeq (,$$($1_SKIP_METAINF))
-    $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS),($(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/||g' >> $$(src)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE))
+    $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS), \
+        ( $(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/|-C $$(src) |g' >> \
+        $$($1_BIN)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE) )
   endif
   # The capture deletes macro finds all deleted files and concatenates them. The resulting file
   # tells us what to remove from the jar-file.
-  $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE))
+  $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ \
+      -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE))
   # The update contents macro updates the jar file with the previously capture contents.
   # Use 'wc -w' to see if the contents file is empty.
-  $1_UPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      (cd $$(src) && \
-       if [ "`$(WC) -w _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'`" -gt "0" ]; then \
-         $(ECHO) "  updating" `$(WC) -l _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
-         $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @_the.$$($1_JARNAME)_contents; \
-       fi) $$(NEWLINE))
+  $1_UPDATE_CONTENTS=\
+      if [ "`$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'`" -gt "0" ]; then \
+        $(ECHO) "  updating" `$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
+        $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents; \
+      fi $$(NEWLINE)
   # The s-variants of the above macros are used when the jar is created from scratch.
   # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
-  $1_SCAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      ( ( $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
-          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
-      $$(subst $$(src)/,,$(ECHO) $$($1_EXTRA_FILES) ) ) > \
-      $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
+  $1_SCAPTURE_CONTENTS=\
+      $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) \
+      $$(foreach src,$$($1_SRCS), \
+        $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
+            $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/|-C $$(src) |g' \
+            >> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)) \
+      $$($1_CAPTURE_EXTRA_FILES)
 
   ifeq (,$$($1_SKIP_METAINF))
     $1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS), \
-        ($(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/||g' >> \
-        $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
+        ( $(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/|-C $$(src) |g' >> \
+        $$($1_BIN)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
   endif
-  $1_SUPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      (cd $$(src) && $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
+  $1_SUPDATE_CONTENTS=$(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)
 
   # Use a slightly shorter name for logging, but with enough path to identify this jar.
   $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR))
@@ -327,14 +356,19 @@
   $2_TARGET:=$2
   # Remove the source prefix.
   $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
-  # Now we can setup the depency that will trigger the copying.
-  $$($1_BIN)$$($2_TARGET) : $2
+  # To allow for automatic overrides, do not create a rule for a target file that
+  # already has one
+  ifeq ($$(findstring $$($2_TARGET), $$($1_COPY_LIST)), )
+    $1_COPY_LIST += $$($2_TARGET)
+    # Now we can setup the depency that will trigger the copying.
+    $$($1_BIN)$$($2_TARGET) : $2
 	$(MKDIR) -p $$(@D)
 	$(CP) $$< $$@
 	$(CHMOD) -f ug+w $$@
 
-  # And do not forget this target
-  $1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET)
+    # And do not forget this target
+    $1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET)
+  endif
 endef
 
 
@@ -431,8 +465,9 @@
   # Add all source roots to the find cache since we are likely going to run find 
   # on these more than once. The cache will only be updated if necessary.
   $$(eval $$(call FillCacheFind,$$($1_SRC)))
-  # Find all files in the source trees.
-  $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(call CacheFind,$$($1_SRC)))
+  # Find all files in the source trees. Preserve order of source roots for overrides to
+  # work correctly. CacheFind does not preserve order so need to call it for each root.
+  $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(foreach s,$$($1_SRC),$$(call CacheFind,$$(s))))
   # Extract the java files.
   ifneq ($$($1_EXCLUDE_FILES),)
     $1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES))
@@ -462,10 +497,12 @@
     $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
   endif
 
+  # All files below META-INF are always copied.
+  $1_ALL_COPIES := $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS))
   # Find all files to be copied from source to bin.
   ifneq (,$$($1_COPY)$$($1_COPY_FILES))
     # Search for all files to be copied.
-    $1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
+    $1_ALL_COPIES += $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
     # Copy these explicitly
     $1_ALL_COPIES += $$($1_COPY_FILES)
     # Copy must also respect filters.
@@ -479,14 +516,12 @@
       $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES))
     endif
   endif
-  # All files below META-INF are always copied.
-  $1_ALL_COPIES += $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS))
-  ifneq (,$$($1_ALL_COPIES))
-    # Yep, there are files to be copied!
-    $1_ALL_COPY_TARGETS:=
-        $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
-    # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
-  endif
+    ifneq (,$$($1_ALL_COPIES))
+      # Yep, there are files to be copied!
+      $1_ALL_COPY_TARGETS:=
+          $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
+      # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
+    endif
 
   # Find all property files to be copied and cleaned from source to bin.
   ifneq (,$$($1_CLEAN)$$($1_CLEAN_FILES))
@@ -529,7 +564,7 @@
     endif
 
     # Using sjavac to compile.
-    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state
+    $1_COMPILE_TARGETS := $$($1_BIN)/javac_state
 
     # Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be
     # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main"
@@ -545,7 +580,7 @@
 	$(ECHO) Compiling $1
 	($$($1_JVM) $$($1_SJAVAC) \
 	    $$($1_REMOTE) \
-	    -j $(JOBS) \
+	    -j 1 \
 	    --permit-unidentified-artifacts \
 	    --permit-sources-without-package \
 	    --compare-found-sources $$($1_BIN)/_the.$1_batch.tmp \
@@ -555,9 +590,11 @@
 	    $$($1_HEADERS_ARG) \
 	    -d $$($1_BIN) && \
 	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
+        # sjavac doesn't touch this if nothing has changed
+	$(TOUCH) $$@
   else
     # Using plain javac to batch compile everything.
-    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.$1_batch
+    $1_COMPILE_TARGETS := $$($1_BIN)/_the.$1_batch
 
     # When building in batch, put headers in a temp dir to filter out those that actually
     # changed before copying them to the real header dir.
@@ -566,15 +603,18 @@
 
       $$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch
 		$(MKDIR) -p $$(@D)
-		for f in `ls $$($1_HEADERS).$1.tmp`; do \
-		  if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).$1.tmp/$$$$f`" != "" ]; then \
+		if [ -d "$$($1_HEADERS).$1.tmp" ]; then \
+		  for f in `ls $$($1_HEADERS).$1.tmp`; do \
+		    if [ ! -f "$$($1_HEADERS)/$$$$f" ] \
+		        || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).$1.tmp/$$$$f`" != "" ]; then \
 		    $(CP) -f $$($1_HEADERS).$1.tmp/$$$$f $$($1_HEADERS)/$$$$f; \
 		  fi; \
-		done
+		  done; \
+		fi
 		$(RM) -r $$($1_HEADERS).$1.tmp
 		$(TOUCH) $$@
 
-      $1 += $$($1_HEADERS)/_the.$1_headers
+      $1_HEADER_TARGETS := $$($1_HEADERS)/_the.$1_headers
     endif
 
     # When not using sjavac, pass along all sources to javac using an @file.
@@ -590,6 +630,10 @@
 
   endif
 
+  # Add all targets to main variable
+  $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_COMPILE_TARGETS) \
+      $$($1_HEADER_TARGETS)
+
   # Check if a jar file was specified, then setup the rules for the jar.
   ifneq (,$$($1_JAR))
     # If no suffixes was explicitly set for this jar file.
@@ -630,3 +674,14 @@
     $1 += $$($1_SRCZIP)
   endif
 endef
+
+# Use this macro to find the correct target to depend on when the original
+# SetupJavaCompilation is declared in a different makefile, to avoid having
+# to declare and evaluate it again.
+# param 1 is for example BUILD_MYPACKAGE
+# param 2 is the output directory (BIN)
+define SetupJavaCompilationCompileTarget
+  $(if $(findsring yes, $(ENABLE_SJAVAC)), $(strip $2)/javac_state, \
+      $(strip $2)/_the.$(strip $1)_batch)
+endef
+endif
--- a/make/common/MakeBase.gmk	Sun Aug 10 19:38:50 2014 -0700
+++ b/make/common/MakeBase.gmk	Sun Aug 17 15:51:37 2014 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -33,6 +33,18 @@
 ifndef _MAKEBASE_GMK
 _MAKEBASE_GMK := 1
 
+################################################################################
+# This macro translates $ into \$ to protect the $ from expansion in the shell.
+# To make this macro resilient against already escaped strings, first remove
+# any present escapes before escaping so that no double escapes are added.
+EscapeDollar = $(subst $$,\$$,$(subst \$$,$$,$(strip $1)))
+
+################################################################################
+# This macro translates $ into $$ to protect the string from make itself.
+DoubleDollar = $(subst $$,$$$$,$(strip $1))
+
+################################################################################
+
 # If the variable that you want to send to stdout for piping into a file or otherwise,
 # is potentially long, for example the a list of file paths, eg a list of all package directories.
 # Then you need to use ListPathsSafely, which optimistically splits the output into several shell
@@ -57,7 +69,7 @@
 
 define ListPathsSafely_Printf
 	$(if $(strip $($1_LPS$4)),$(if $(findstring $(LOG_LEVEL),trace),,@)printf \
-	    -- "$(strip $($1_LPS$4))\n" | $(decompress_paths) $3)
+	    -- "$(strip $(call EscapeDollar, $($1_LPS$4)))\n" | $(decompress_paths) $3)
 endef
 
 # Receipt example:
@@ -410,15 +422,19 @@
 	if [ -n "`$(XATTR) -l '$@'`" ]; then $(XATTR) -c '$@'; fi
   endef
 else
+  # Running mkdir and cp in the same shell speeds up copy intensive tasks in Cygwin
+  # significantly.
   define install-file
-	$(MKDIR) -p $(@D)
-	$(CP) -fP '$<' '$@'
+	$(MKDIR) -p $(@D) && $(CP) -fP '$<' '$@'
   endef
 endif
 
 # Convenience functions for working around make's limitations with $(filter ).
-containing = $(foreach v,$2,$(if $(findstring $1,$v),$v))
-not-containing = $(foreach v,$2,$(if $(findstring $1,$v),,$v))
+containing = $(strip $(foreach v,$(strip $2),$(if $(findstring $(strip $1),$v),$v)))
+not-containing = $(strip $(foreach v,$(strip $2),$(if $(findstring $(strip $1),$v),,$v)))
+
+# Filter out duplicate sub strings while preserving order. Keeps the first occurance.
+uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
 
 ifneq ($(DISABLE_CACHE_FIND), true)
   ################################################################################
@@ -457,6 +473,8 @@
   # Otherwise reverts to shell find. This is safe to call on all platforms, even if
   # cache is deactivated.
   #
+  # $1 can be either a directory or a file. If it's a directory, make
+  # sure we have exactly one trailing slash before the wildcard.
   # The extra - is needed when FIND_CACHE_DIRS is empty but should be harmless.
   #
   # Param 1 - Dirs to find in
@@ -464,8 +482,9 @@
   define CacheFind
     $(if $(filter-out $(addsuffix /%,- $(FIND_CACHE_DIRS)) $(FIND_CACHE_DIRS),$1), \
     $(shell $(FIND) $1 \( -type f -o -type l \) $2), \
-    $(filter $(addsuffix %,$1),$(FIND_CACHE)))
+    $(filter $(addsuffix /%,$(patsubst %/,%,$1)) $1,$(FIND_CACHE)))
   endef
+
 else
   # If CacheFind is disabled, just run the find command.
   # Param 1 - Dirs to find in
@@ -477,4 +496,110 @@
 
 ################################################################################
 
+define AddFileToCopy
+  # Helper macro for SetupCopyFiles
+  # 1 : Source file
+  # 2 : Dest file
+  # 3 : Variable to add targets to
+  # 4 : Macro to call for copy operation
+
+  $2: $1
+	$(ECHO) $(LOG_INFO) Copying $$(patsubst $(OUTPUT_ROOT)/%,%,$$@)
+	$$($$(strip $4))
+
+  $3 += $2
+endef
+
+define SetupCopyFiles
+  # param 1 is for example COPY_MYFILES
+  # param 2,3,4,5 are named args.
+  #   SRC   : Source root dir
+  #   DEST  : Dest root dir
+  #   FILES : List of files to copy with absolute paths, or path relative to SRC. Must be in SRC.
+  #   FLATTEN : Set to flatten the directory structure in the DEST dir.
+  #   MACRO : Optionally override the default macro used for making the copy. Default is 'install-file'
+  $(foreach i,2 3 4 5 6, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+  $(call LogSetupMacroEntry,SetupCopyFiles($1),$2,$3,$4,$5,$6)
+  $(if $(7),$(error Internal makefile error: Too many arguments to SetupCopyFiles))
+
+  ifeq ($$($1_MACRO), )
+    $1_MACRO := install-file
+  endif
+
+  $$(foreach f, $$(patsubst $$($1_SRC)/%,%,$$($1_FILES)), \
+      $$(eval $$(call AddFileToCopy, $$($1_SRC)/$$f, \
+      $$($1_DEST)/$$(if $$($1_FLATTEN),$$(notdir $$f),$$f), $1, $$($1_MACRO))))
+
+endef
+
+################################################################################
+# Module list macros
+
+ALL_TOP_SRC_DIRS := \
+    $(JDK_TOPDIR)/src \
+    $(LANGTOOLS_TOPDIR)/src \
+    $(CORBA_TOPDIR)/src \
+    $(JAXP_TOPDIR)/src \
+    $(JAXWS_TOPDIR)/src \
+    $(NASHORN_TOPDIR)/src \
+    #
+
+# There are snmp classes in the open but they are not included in OpenJDK
+JAVA_MODULES_FILTER := jdk.snmp
+
+# Find all modules with java sources by looking in the source dirs
+define FindJavaModules
+  $(filter-out $(JAVA_MODULES_FILTER), $(sort $(notdir \
+      $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir \
+      $(wildcard $(patsubst %,%/*/share/classes/*, $(ALL_TOP_SRC_DIRS)) \
+          $(patsubst %,%/*/$(OPENJDK_TARGET_OS_API_DIR)/classes/*, $(ALL_TOP_SRC_DIRS)) \
+          $(patsubst %,%/*/$(OPENJDK_TARGET_OS)/classes/*, $(ALL_TOP_SRC_DIRS))))))))))))
+endef
+
+MODULES_LIST_FILE := $(SRC_ROOT)/make/common/modules.list
+
+# Param 1: Module to find deps for
+define FindDepsForModule
+  $(if $(filter-out java.base, $1), java.base $(filter-out jdk.scripting.nashorn, $(filter-out java.base, $(wordlist 2, 100, $(shell $(GREP) '^$(strip $1):' $(MODULES_LIST_FILE))))))
+endef
+
+# Find all modules with source for the target platform.
+define FindAllModules
+  $(sort $(filter-out closed demo sample, $(notdir $(patsubst %/,%, $(dir \
+      $(wildcard $(patsubst %, %/*/share, $(ALL_TOP_SRC_DIRS)) \
+      $(patsubst %, %/*/$(OPENJDK_TARGET_OS), $(ALL_TOP_SRC_DIRS)) \
+      $(patsubst %, %/*/$(OPENJDK_TARGET_OS_API_DIR), $(ALL_TOP_SRC_DIRS))))))))
+endef
+
+################################################################################
+
+MAKE_DIR_LIST := $(JDK_TOPDIR)/make
+
+# Find all modules that has a makefile for a certain build phase
+# Param 1: Make subdir to look in
+# Param 2: File prefix to look for
+FindModulesWithMakefileFor = $(sort $(foreach d, $(MAKE_DIR_LIST), \
+    $(patsubst $d/$(strip $1)/$(strip $2)-%.gmk,%, \
+    $(wildcard $d/$(strip $1)/$(strip $2)-*.gmk))))
+
+# Declare a recipe for calling such a makefile
+# Param 1: Module name
+# Param 2: Suffix for rule
+# Param 3: Make subdir
+# Param 4: Makefile prefix
+define DeclareRecipeForModuleMakefile
+  $$(strip $1)-$$(strip $2):
+	+($(CD) $$(dir $$(firstword $$(wildcard $$(addsuffix /$$(strip $3)/$$(strip $4)-$$(strip $1).gmk, \
+	        $(MAKE_DIR_LIST))))) \
+	    && $(MAKE) $(MAKE_ARGS) \
+	    -f $$(strip $4)-$$(strip $1).gmk \
+	    $$(addprefix -I, $$(wildcard $(MAKE_DIR_LIST) \
+	        $$(addsuffix /$$(strip $3), $(MAKE_DIR_LIST)))))
+endef
+
+################################################################################
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, , common/MakeBase.gmk))
+
 endif # _MAKEBASE_GMK
--- a/make/common/NativeCompilation.gmk	Sun Aug 10 19:38:50 2014 -0700
+++ b/make/common/NativeCompilation.gmk	Sun Aug 17 15:51:37 2014 +0100
@@ -27,6 +27,9 @@
 # of removing duplicates. It is actually this side effect that is
 # desired whenever sort is used below!
 
+ifndef _NATIVE_COMPILATION_GMK
+_NATIVE_COMPILATION_GMK := 1
+
 ifeq (,$(_MAKEBASE_GMK))
   $(error You must include MakeBase.gmk prior to including NativeCompilation.gmk)
 endif
@@ -284,7 +287,8 @@
     $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
   endif
   ifneq ($$($1_EXCLUDES),)
-    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
+    $1_SRC_EXCLUDES := $$(addsuffix /%,$$($1_EXCLUDES))
+    $1_SRC_EXCLUDES += $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
     $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
   endif
 
@@ -549,3 +553,5 @@
 
   endif
 endef
+
+endif # _NATIVE_COMPILATION_GMK
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/common/SetupJava.gmk	Sun Aug 17 15:51:37 2014 +0100
@@ -0,0 +1,88 @@
+#
+# Copyright (c) 2011, 2014, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+ifndef _SETUP_GMK
+_SETUP_GMK := 1
+
+include JavaCompilation.gmk
+
+DISABLE_WARNINGS := -Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally
+
+# To build with all warnings enabled, do the following:
+# make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000"
+JAVAC_WARNINGS := -Xlint:all,-deprecation -Werror
+
+# Any java code executed during a JDK build to build other parts of the JDK must be 
+# executed by the bootstrap JDK (probably with -Xbootclasspath/p: ) and for this 
+# purpose must be built with -target PREVIOUS for bootstrapping purposes, which 
+# requires restricting to language level and api of previous JDK.
+#
+# The generate old bytecode javac setup uses the new compiler to compile for the
+# boot jdk to generate tools that need to be run with the boot jdk.
+# Thus we force the target bytecode to the previous JDK version.
+$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
+    JVM := $(JAVA_SMALL), \
+    JAVAC := $(NEW_JAVAC), \
+    FLAGS := $(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS), \
+    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
+    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
+
+# The generate new bytecode javac setup uses the new compiler to compile for the
+# new jdk. This new bytecode might only be possible to run using the new jvm.
+$(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \
+    JVM := $(JAVA), \
+    JAVAC := $(NEW_JAVAC), \
+    FLAGS := -source 9 -target 9 \
+        -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS) \
+        $(GENERATE_JDKBYTECODE_EXTRA_FLAGS), \
+    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
+    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
+
+# The generate new bytecode javac setup uses the new compiler to compile for the
+# new jdk. This new bytecode might only be possible to run using the new jvm.
+$(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \
+    JVM := $(JAVA), \
+    JAVAC := $(NEW_JAVAC), \
+    FLAGS := -source 9 -target 9 \
+        -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS) \
+        $(GENERATE_JDKBYTECODE_EXTRA_FLAGS), \
+    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
+    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
+
+JDK_BOOTCLASSPATH := $(subst $(SPACE),$(PATH_SEP),\
+    $(filter-out $(JDK_OUTPUTDIR)/modules/_%, $(wildcard $(JDK_OUTPUTDIR)/modules/*)))
+
+# After the jdk is built, we want to build demos using only the recently
+# generated jdk classes and nothing else, no jdk source, etc etc.
+# I.e. the rt.jar, but since rt.jar has not yet been generated
+# (it will be in "make images") therefore we use classes instead.
+$(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \
+    JVM := $(JAVA_SMALL), \
+    JAVAC := $(NEW_JAVAC), \
+    FLAGS := -bootclasspath "$(JDK_BOOTCLASSPATH)" $(DISABLE_WARNINGS), \
+    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
+    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
+
+endif # _SETUP_GMK
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/common/modules.list	Sun Aug 17 15:51:37 2014 +0100
@@ -0,0 +1,54 @@
+java.base: 
+java.logging: java.base
+java.security.sasl: java.logging java.base
+java.naming: java.security.sasl java.base
+java.security.acl: java.base
+jdk.charsets: java.base
+java.scripting: java.base
+java.xml: java.base
+java.sql: java.xml java.logging java.base
+jdk.scripting.nashorn: java.scripting java.logging java.base
+java.rmi: java.logging java.base
+java.prefs: java.xml java.base
+java.desktop: jdk.charsets java.prefs java.xml java.logging java.base
+java.corba: java.naming java.rmi java.desktop java.logging java.base
+java.compiler: java.logging java.base
+jdk.compiler: java.compiler java.base
+jdk.javadoc: java.compiler java.xml jdk.compiler java.base
+jdk.rmic: java.corba jdk.compiler jdk.javadoc java.base
+jdk.jvmstat: java.rmi java.base
+jdk.attach: jdk.jvmstat java.base
+jdk.jcmd: jdk.jvmstat jdk.attach java.base
+jdk.jdi: jdk.attach java.base
+jdk.hotspot.agent: java.rmi java.scripting java.desktop java.base jdk.jdi
+jdk.hprof.agent: java.base
+java.management: java.naming java.rmi java.logging java.base
+jdk.jconsole: java.management jdk.jvmstat java.rmi jdk.attach java.desktop java.logging java.base
+java.activation: java.desktop java.logging java.base
+java.xml.bind: java.activation java.compiler java.xml java.desktop java.logging java.base
+jdk.xml.bind: java.activation java.compiler java.xml.bind java.xml java.desktop java.logging jdk.compiler java.base
+jdk.httpserver: java.logging java.base
+java.annotations.common: java.base
+java.xml.soap: java.activation java.xml.bind java.xml java.desktop java.logging java.base
+java.xml.ws: java.activation java.management jdk.httpserver java.rmi java.annotations.common java.xml.bind java.xml java.desktop java.logging java.xml.soap java.base
+jdk.xml.ws: jdk.xml.bind java.compiler java.rmi java.xml.ws java.xml.bind java.xml java.logging java.base
+java.sql.rowset: java.naming java.sql java.xml java.logging java.base
+java.instrument: java.base
+java.security.jgss: java.naming java.security.sasl java.logging java.base
+java.xml.crypto: java.xml java.logging java.base
+jdk.localedata: java.base
+jdk.crypto.ec: java.base
+jdk.crypto.pkcs11: jdk.crypto.ec java.base
+jdk.crypto.mscapi: java.base
+jdk.naming.rmi: java.naming java.rmi java.base
+jdk.zipfs: java.base
+jdk.naming.dns: java.naming java.base
+java.smartcardio: java.base
+jdk.dev: jdk.xml.bind jdk.xml.ws java.scripting jdk.rmic java.xml jdk.compiler java.base
+jdk.snmp: java.management java.security.acl java.logging java.base
+jdk.jdwp.agent: java.base
+jdk.security.auth: java.naming java.security.jgss java.base
+jdk.sctp: java.base
+jdk.runtime: java.desktop java.base
+jdk.jfr: java.management java.xml java.base
+jdk.deploy.osx: java.scripting java.desktop java.base
--- a/make/common/support/ListPathsSafely-pre-compress.incl	Sun Aug 10 19:38:50 2014 -0700
+++ b/make/common/support/ListPathsSafely-pre-compress.incl	Sun Aug 17 15:51:37 2014 +0100
@@ -1,1 +1,1 @@
-$(subst com,X01,$(subst org,X02,$(subst sun,X03,$(subst java,X04,$(subst javax,X05,$(subst sun/io,X06,$(subst com/sun,X07,$(subst java/io,X08,$(subst org/omg,X09,$(subst org/w3c,X10,$(subst org/xml,X11,$(subst sun/awt,X12,$(subst sun/net,X13,$(subst sun/nio,X14,$(subst sun/rmi,X15,$(subst java/awt,X16,$(subst java/net,X17,$(subst java/nio,X18,$(subst java/rmi,X19,$(subst META-INF,X20,$(subst sun/font,X21,$(subst sun/misc,X22,$(subst sun/text,X23,$(subst sun/util,X24,$(subst java/lang,X25,$(subst java/math,X26,$(subst java/text,X27,$(subst java/util,X28,$(subst javax/jws,X29,$(subst javax/net,X30,$(subst javax/rmi,X31,$(subst javax/xml,X32,$(subst sun/corba,X33,$(subst sun/print,X34,$(subst sun/swing,X35,$(subst java/beans,X36,$(subst javax/lang,X37,$(subst sun/applet,X38,$(subst sun/java2d,X39,$(subst java/applet,X40,$(subst javax/print,X41,$(subst javax/sound,X42,$(subst javax/swing,X43,$(subst javax/tools,X44,$(subst jdk/classes,X45,$(subst org/relaxng,X46,$(subst sun/reflect,X47,$(subst javax/crypto,X48,$(subst javax/naming,X49,$(subst jaxp/classes,X50,$(subst sun/security,X51,$(subst corba/classes,X52,$(subst java/security,X53,$(subst javax/imageio,X54,$(subst jdk/btclasses,X55,$(subst javax/activity,X56,$(subst javax/security,X57,$(subst jdk/newclasses,X58,$(subst sun/instrument,X59,$(subst sun/management,X60,$(subst corba/btclasses,X61,$(subst jdk/democlasses,X62,$(subst javax/activation,X63,$(subst javax/annotation,X64,$(subst javax/management,X65,$(subst javax/transaction,X66,$(subst jaxws/jaf_classes,X67,$(subst langtools/classes,X68,$(subst META-INF/services,X69,$(subst jdk/newdemoclasses,X70,$(subst javax/accessibility,X71,$(subst jaxws/jaxws_classes,X72,
+$(subst share/classes,X01,$(subst internal,X02,$(subst com/sun/org,X03,$(subst java,X04,$(subst javax,X05,$(subst sun/io,X06,$(subst com/sun,X07,$(subst java/io,X08,$(subst org/omg,X09,$(subst org/w3c,X10,$(subst org/xml,X11,$(subst sun/awt,X12,$(subst sun/net,X13,$(subst sun/nio,X14,$(subst sun/rmi,X15,$(subst java/awt,X16,$(subst java/net,X17,$(subst java/nio,X18,$(subst java/rmi,X19,$(subst META-INF,X20,$(subst sun/font,X21,$(subst sun/misc,X22,$(subst sun/text,X23,$(subst sun/util,X24,$(subst java/lang,X25,$(subst java/math,X26,$(subst java/text,X27,$(subst java/util,X28,$(subst javax/jws,X29,$(subst javax/net,X30,$(subst javax/rmi,X31,$(subst javax/xml,X32,$(subst sun/corba,X33,$(subst sun/print,X34,$(subst sun/swing,X35,$(subst java/beans,X36,$(subst javax/lang,X37,$(subst sun/applet,X38,$(subst sun/java2d,X39,$(subst java/applet,X40,$(subst javax/print,X41,$(subst javax/sound,X42,$(subst javax/swing,X43,$(subst javax/tools,X44,$(subst jdk/classes,X45,$(subst org/relaxng,X46,$(subst sun/reflect,X47,$(subst javax/crypto,X48,$(subst javax/naming,X49,$(subst jaxp/classes,X50,$(subst sun/security,X51,$(subst corba/classes,X52,$(subst java/security,X53,$(subst javax/imageio,X54,$(subst jdk/btclasses,X55,$(subst javax/activity,X56,$(subst javax/security,X57,$(subst jdk/newclasses,X58,$(subst sun/instrument,X59,$(subst sun/management,X60,$(subst corba/btclasses,X61,$(subst jdk/democlasses,X62,$(subst javax/activation,X63,$(subst javax/annotation,X64,$(subst javax/management,X65,$(subst javax/transaction,X66,$(subst jaxws/jaf_classes,X67,$(subst langtools/classes,X68,$(subst META-INF/services,X69,$(subst jdk/newdemoclasses,X70,$(subst javax/accessibility,X71,$(subst jaxws/jaxws_classes,X72,
--- a/make/common/support/ListPathsSafely-uncompress.sed	Sun Aug 10 19:38:50 2014 -0700
+++ b/make/common/support/ListPathsSafely-uncompress.sed	Sun Aug 17 15:51:37 2014 +0100
@@ -1,6 +1,6 @@
-s|X01|com|g
-s|X02|org|g
-s|X03|sun|g
+s|X01|share/classes|g
+s|X02|internal|g
+s|X03|com/sun/org|g
 s|X04|java|g
 s|X05|javax|g
 s|X06|sun/io|g
--- a/make/jprt.properties	Sun Aug 10 19:38:50 2014 -0700
+++ b/make/jprt.properties	Sun Aug 17 15:51:37 2014 +0100
@@ -79,8 +79,9 @@
 # Configure args common to all builds
 # Also allows for additional, testset specific configure arguments to be set
 jprt.build.configure.args=						\
-    --with-boot-jdk=$ALT_BOOTDIR					\
-    --with-jobs=$ALT_PARALLEL_COMPILE_JOBS				\
+    --with-output-sync=recurse 						\
+    --with-boot-jdk=$ALT_BOOTDIR 					\
+    --with-jobs=$ALT_PARALLEL_COMPILE_JOBS 				\
     ${my.additional.build.configure.args.${jprt.test.set}}
 
 # i586 is often cross-compiled from 64-bit machines, so need to set target bits explicitly
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules.xml	Sun Aug 17 15:51:37 2014 +0100
@@ -0,0 +1,1816 @@
+<?xml version="1.0" encoding="us-ascii"?>
+
+<!--
+
+   Copyright (c) 2014 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
+   under the terms of the GNU General Public License version 2 only, as
+   published by the Free Software Foundation.  Oracle designates this
+   particular file as subject to the "Classpath" exception as provided
+   by Oracle in the LICENSE file that accompanied this code.
+
+   This code is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   version 2 for more details (a copy is included in the LICENSE file that
+   accompanied this code).
+
+   You should have received a copy of the GNU General Public License version
+   2 along with this work; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+   Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+   or visit www.oracle.com if you need additional information or have any
+   questions.
+
+  -->
+
+<!--
+
+   This document defines the modular structure of the JDK as described
+   in JEP 200: The Modular JDK (http://openjdk.java.net/jeps/200).
+
+   Changes to this file must be reviewed by a Project Jigsaw Committer
+   (http://openjdk.java.net/census#jigsaw).
+
+  -->
+
+<modules>
+  <module>
+    <name>java.activation</name>
+    <depend>java.base</depend>
+    <depend re-exports="true">java.desktop</depend>
+    <depend>java.logging</depend>
+    <export>
+      <name>javax.activation</name>
+    </export>
+  </module>
+  <module>
+    <name>java.annotations.common</name>
+    <depend>java.base</depend>
+    <export>
+      <name>javax.annotation</name>
+    </export>
+  </module>
+  <module>
+    <name>java.base</name>
+    <export>
+      <name>java.io</name>
+    </export>
+    <export>
+      <name>java.lang</name>
+    </export>
+    <export>
+      <name>java.lang.annotation</name>
+    </export>
+    <export>
+      <name>java.lang.invoke</name>
+    </export>
+    <export>
+      <name>java.lang.ref</name>
+    </export>
+    <export>
+      <name>java.lang.reflect</name>
+    </export>
+    <export>
+      <name>java.math</name>
+    </export>
+    <export>
+      <name>java.net</name>
+    </export>
+    <export>
+      <name>java.nio</name>
+    </export>
+    <export>
+      <name>java.nio.channels</name>
+    </export>
+    <export>
+      <name>java.nio.channels.spi</name>
+    </export>
+    <export>
+      <name>java.nio.charset</name>
+    </export>
+    <export>
+      <name>java.nio.charset.spi</name>
+    </export>
+    <export>
+      <name>java.nio.file</name>
+    </export>
+    <export>
+      <name>java.nio.file.attribute</name>
+    </export>
+    <export>
+      <name>java.nio.file.spi</name>
+    </export>
+    <export>
+      <name>java.security</name>
+    </export>
+    <export>
+      <name>java.security.cert</name>
+    </export>
+    <export>
+      <name>java.security.interfaces</name>
+    </export>
+    <export>
+      <name>java.security.spec</name>
+    </export>
+    <export>
+      <name>java.text</name>
+    </export>
+    <export>
+      <name>java.text.spi</name>
+    </export>
+    <export>
+      <name>java.time</name>
+    </export>
+    <export>
+      <name>java.time.chrono</name>
+    </export>
+    <export>
+      <name>java.time.format</name>
+    </export>
+    <export>
+      <name>java.time.temporal</name>
+    </export>
+    <export>
+      <name>java.time.zone</name>
+    </export>
+    <export>
+      <name>java.util</name>
+    </export>
+    <export>
+      <name>java.util.concurrent</name>
+    </export>
+    <export>
+      <name>java.util.concurrent.atomic</name>
+    </export>
+    <export>
+      <name>java.util.concurrent.locks</name>
+    </export>
+    <export>
+      <name>java.util.function</name>
+    </export>
+    <export>
+      <name>java.util.jar</name>
+    </export>
+    <export>
+      <name>java.util.regex</name>
+    </export>
+    <export>
+      <name>java.util.spi</name>
+    </export>
+    <export>
+      <name>java.util.stream</name>
+    </export>
+    <export>
+      <name>java.util.zip</name>
+    </export>
+    <export>
+      <name>javax.crypto</name>
+    </export>
+    <export>
+      <name>javax.crypto.interfaces</name>
+    </export>
+    <export>
+      <name>javax.crypto.spec</name>
+    </export>
+    <export>
+      <name>javax.net</name>
+    </export>
+    <export>
+      <name>javax.net.ssl</name>
+    </export>
+    <export>
+      <name>javax.security.auth</name>
+    </export>
+    <export>
+      <name>javax.security.auth.callback</name>
+    </export>
+    <export>
+      <name>javax.security.auth.login</name>
+    </export>
+    <export>
+      <name>javax.security.auth.spi</name>
+    </export>
+    <export>
+      <name>javax.security.auth.x500</name>
+    </export>
+    <export>
+      <name>javax.security.cert</name>
+    </export>
+    <export>
+      <name>jdk</name>
+    </export>
+    <export>
+      <name>jdk.net</name>
+    </export>
+    <export>
+      <name>com.sun.security.ntlm</name>
+      <to>java.security.sasl</to>
+    </export>
+    <export>
+      <name>jdk.internal.org.objectweb.asm</name>
+      <to>jdk.jfr</to>
+      <to>jdk.scripting.nashorn</to>
+    </export>
+    <export>
+      <name>jdk.internal.org.objectweb.asm.commons</name>
+      <to>jdk.jfr</to>
+      <to>jdk.scripting.nashorn</to>
+    </export>
+    <export>
+      <name>jdk.internal.org.objectweb.asm.signature</name>
+      <to>jdk.scripting.nashorn</to>
+    </export>
+    <export>
+      <name>jdk.internal.org.objectweb.asm.tree</name>
+      <to>jdk.jfr</to>
+    </export>
+    <export>
+      <name>jdk.internal.org.objectweb.asm.util</name>
+      <to>jdk.jfr</to>
+      <to>jdk.scripting.nashorn</to>
+    </export>
+    <export>
+      <name>sun.misc</name>
+      <to>java.corba</to>
+      <to>java.desktop</to>
+      <to>java.logging</to>
+      <to>java.management</to>
+      <to>java.naming</to>
+      <to>java.rmi</to>
+      <to>java.security.jgss</to>
+      <to>java.security.sasl</to>
+      <to>jdk.charsets</to>
+      <to>jdk.deploy.osx</to>
+      <to>jdk.dev</to>
+      <to>jdk.jconsole</to>
+      <to>jdk.jvmstat</to>
+      <to>jdk.runtime</to>
+      <to>jdk.security.auth</to>
+    </export>
+    <export>
+      <name>sun.net.dns</name>
+      <to>java.security.jgss</to>
+      <to>jdk.naming.dns</to>
+    </export>
+    <export>
+      <name>sun.net.spi.nameservice</name>
+      <to>jdk.naming.dns</to>
+    </export>
+    <export>
+      <name>sun.net.util</name>
+      <to>jdk.jconsole</to>
+      <to>jdk.naming.dns</to>
+    </export>
+    <export>
+      <name>sun.net.www</name>
+      <to>java.desktop</to>
+      <to>jdk.compiler</to>
+      <to>jdk.dev</to>
+    </export>
+    <export>
+      <name>sun.net.www.protocol.http</name>
+      <to>java.security.jgss</to>
+    </export>
+    <export>
+      <name>sun.nio.ch</name>
+      <to>java.management</to>
+      <to>jdk.crypto.pkcs11</to>
+      <to>jdk.crypto.ucrypto</to>
+      <to>jdk.sctp</to>
+    </export>
+    <export>
+      <name>sun.nio.cs</name>
+      <to>java.desktop</to>
+      <to>jdk.charsets</to>
+    </export>
+    <export>
+      <name>sun.reflect</name>
+      <to>java.corba</to>
+      <to>java.logging</to>
+      <to>java.sql</to>
+      <to>java.sql.rowset</to>
+      <to>jdk.scripting.nashorn</to>
+    </export>
+    <export>
+      <name>sun.reflect.annotation</name>
+      <to>jdk.compiler</to>
+    </export>
+    <export>
+      <name>sun.reflect.generics.reflectiveObjects</name>
+      <to>java.desktop</to>
+    </export>
+    <export>
+      <name>sun.reflect.misc</name>
+      <to>java.corba</to>
+      <to>java.desktop</to>
+      <to>java.management</to>
+      <to>java.rmi</to>
+      <to>java.sql.rowset</to>
+      <to>java.xml</to>
+    </export>
+    <export>
+      <name>sun.security.action</name>
+      <to>java.desktop</to>
+      <to>java.security.jgss</to>
+      <to>jdk.crypto.ec</to>
+      <to>jdk.crypto.pkcs11</to>
+      <to>jdk.crypto.ucrypto</to>
+    </export>
+    <export>
+      <name>sun.security.internal.interfaces</name>
+      <to>jdk.crypto.pkcs11</to>
+    </export>
+    <export>
+      <name>sun.security.internal.spec</name>
+      <to>jdk.crypto.pkcs11</to>
+      <to>jdk.crypto.ucrypto</to>
+    </export>
+    <export>
+      <name>sun.security.jca</name>
+      <to>java.smartcardio</to>
+      <to>java.xml.crypto</to>
+      <to>jdk.crypto.ec</to>
+      <to>jdk.crypto.pkcs11</to>
+      <to>jdk.naming.dns</to>
+    </export>
+    <export>
+      <name>sun.security.pkcs</name>
+      <to>jdk.crypto.ec</to>
+      <to>jdk.deploy.osx</to>
+      <to>jdk.dev</to>
+    </export>
+    <export>
+      <name>sun.security.provider</name>
+      <to>java.rmi</to>
+      <to>java.security.jgss</to>
+      <to>jdk.crypto.pkcs11</to>
+      <to>jdk.runtime</to>
+      <to>jdk.security.auth</to>
+    </export>
+    <export>
+      <name>sun.security.provider.certpath</name>
+      <to>java.naming</to>
+    </export>
+    <export>
+      <name>sun.security.rsa</name>
+      <to>jdk.crypto.mscapi</to>
+      <to>jdk.crypto.pkcs11</to>
+    </export>
+    <export>
+      <name>sun.security.ssl</name>
+      <to>java.security.jgss</to>
+    </export>
+    <export>
+      <name>sun.security.tools</name>
+      <to>jdk.dev</to>
+    </export>
+    <export>
+      <name>sun.security.util</name>
+      <to>java.desktop</to>
+      <to>java.naming</to>
+      <to>java.rmi</to>
+      <to>java.security.jgss</to>
+      <to>java.smartcardio</to>
+      <to>jdk.crypto.ec</to>
+      <to>jdk.crypto.mscapi</to>
+      <to>jdk.crypto.pkcs11</to>
+      <to>jdk.crypto.ucrypto</to>
+      <to>jdk.deploy.osx</to>
+      <to>jdk.dev</to>
+      <to>jdk.runtime</to>
+      <to>jdk.security.auth</to>
+    </export>
+    <export>
+      <name>sun.security.x509</name>
+      <to>java.naming</to>
+      <to>jdk.crypto.ec</to>
+      <to>jdk.crypto.pkcs11</to>
+      <to>jdk.deploy.osx</to>
+      <to>jdk.dev</to>
+      <to>jdk.security.auth</to>
+    </export>
+    <export>
+      <name>sun.text</name>
+      <to>java.desktop</to>
+    </export>
+    <export>
+      <name>sun.util</name>
+      <to>java.desktop</to>
+    </export>
+    <export>
+      <name>sun.util.locale.provider</name>
+      <to>java.desktop</to>
+      <to>jdk.localedata</to>
+    </export>
+    <export>
+      <name>sun.util.logging</name>
+      <to>java.desktop</to>
+      <to>java.logging</to>
+      <to>java.management</to>
+      <to>java.prefs</to>
+    </export>
+    <export>
+      <name>sun.util.resources</name>
+      <to>jdk.localedata</to>
+    </export>
+  </module>
+  <module>
+    <name>java.compact1</name>
+    <depend re-exports="true">java.base</depend>
+    <depend re-exports="true">java.logging</depend>
+    <depend re-exports="true">java.scripting</depend>
+  </module>
+  <module>
+    <name>java.compact2</name>
+    <depend re-exports="true">java.compact1</depend>
+    <depend re-exports="true">java.rmi</depend>
+    <depend re-exports="true">java.sql</depend>
+    <depend re-exports="true">java.xml</depend>
+  </module>
+  <module>
+    <name>java.compact3</name>
+    <depend re-exports="true">java.compact2</depend>
+    <depend re-exports="true">java.compiler</depend>
+    <depend re-exports="true">java.instrument</depend>
+    <depend re-exports="true">java.management</depend>
+    <depend re-exports="true">java.naming</depend>
+    <depend re-exports="true">java.prefs</depend>
+    <depend re-exports="true">java.security.acl</depend>
+    <depend re-exports="true">java.security.jgss</depend>
+    <depend re-exports="true">java.security.sasl</depend>
+    <depend re-exports="true">java.sql.rowset</depend>
+    <depend re-exports="true">java.xml.crypto</depend>
+  </module>
+  <module>
+    <name>java.compiler</name>
+    <depend>java.base</depend>
+    <depend>java.logging</depend>
+    <export>
+      <name>javax.annotation.processing</name>
+    </export>
+    <export>
+      <name>javax.lang.model</name>
+    </export>
+    <export>
+      <name>javax.lang.model.element</name>
+    </export>
+    <export>
+      <name>javax.lang.model.type</name>
+    </export>
+    <export>
+      <name>javax.lang.model.util</name>
+    </export>
+    <export>
+      <name>javax.tools</name>
+    </export>
+  </module>
+  <module>
+    <name>java.corba</name>
+    <depend>java.base</depend>
+    <depend re-exports="true">java.desktop</depend>
+    <depend>java.logging</depend>
+    <depend>java.naming</depend>
+    <depend re-exports="true">java.rmi</depend>
+    <export>
+      <name>javax.activity</name>
+    </export>
+    <export>
+      <name>javax.rmi</name>
+    </export>
+    <export>
+      <name>javax.rmi.CORBA</name>
+    </export>
+    <export>
+      <name>javax.transaction</name>
+    </export>
+    <export>
+      <name>org.omg.CORBA</name>
+    </export>
+    <export>
+      <name>org.omg.CORBA.DynAnyPackage</name>
+    </export>
+    <export>
+      <name>org.omg.CORBA.ORBPackage</name>
+    </export>
+    <export>
+      <name>org.omg.CORBA.TypeCodePackage</name>
+    </export>
+    <export>
+      <name>org.omg.CORBA.portable</name>
+    </export>
+    <export>
+      <name>org.omg.CORBA_2_3</name>
+    </export>
+    <export>
+      <name>org.omg.CORBA_2_3.portable</name>
+    </export>
+    <export>
+      <name>org.omg.CosNaming</name>
+    </export>
+    <export>
+      <name>org.omg.CosNaming.NamingContextExtPackage</name>
+    </export>
+    <export>
+      <name>org.omg.CosNaming.NamingContextPackage</name>
+    </export>
+    <export>
+      <name>org.omg.Dynamic</name>
+    </export>
+    <export>
+      <name>org.omg.DynamicAny</name>
+    </export>
+    <export>
+      <name>org.omg.DynamicAny.DynAnyFactoryPackage</name>
+    </export>
+    <export>
+      <name>org.omg.DynamicAny.DynAnyPackage</name>
+    </export>
+    <export>
+      <name>org.omg.IOP</name>
+    </export>
+    <export>
+      <name>org.omg.IOP.CodecFactoryPackage</name>
+    </export>
+    <export>
+      <name>org.omg.IOP.CodecPackage</name>
+    </export>
+    <export>
+      <name>org.omg.Messaging</name>
+    </export>
+    <export>
+      <name>org.omg.PortableInterceptor</name>
+    </export>
+    <export>
+      <name>org.omg.PortableInterceptor.ORBInitInfoPackage</name>
+    </export>
+    <export>
+      <name>org.omg.PortableServer</name>
+    </export>
+    <export>
+      <name>org.omg.PortableServer.CurrentPackage</name>
+    </export>
+    <export>
+      <name>org.omg.PortableServer.POAManagerPackage</name>
+    </export>
+    <export>
+      <name>org.omg.PortableServer.POAPackage</name>
+    </export>
+    <export>
+      <name>org.omg.PortableServer.ServantLocatorPackage</name>
+    </export>
+    <export>
+      <name>org.omg.PortableServer.portable</name>
+    </export>
+    <export>
+      <name>org.omg.SendingContext</name>
+    </export>
+    <export>
+      <name>org.omg.stub.java.rmi</name>
+    </export>
+    <export>
+      <name>com.sun.corba.se.impl.util</name>
+      <to>jdk.rmic</to>
+    </export>
+  </module>
+  <module>
+    <name>java.desktop</name>
+    <depend>java.base</depend>
+    <depend>java.logging</depend>
+    <depend>java.prefs</depend>
+    <depend re-exports="true">java.xml</depend>
+    <depend>jdk.charsets</depend>
+    <export>
+      <name>java.applet</name>
+    </export>
+    <export>
+      <name>java.awt</name>
+    </export>
+    <export>
+      <name>java.awt.color</name>
+    </export>
+    <export>
+      <name>java.awt.datatransfer</name>
+    </export>
+    <export>
+      <name>java.awt.dnd</name>
+    </export>
+    <export>
+      <name>java.awt.event</name>
+    </export>
+    <export>
+      <name>java.awt.font</name>
+    </export>
+    <export>
+      <name>java.awt.geom</name>
+    </export>
+    <export>
+      <name>java.awt.im</name>
+    </export>
+    <export>
+      <name>java.awt.im.spi</name>
+    </export>
+    <export>
+      <name>java.awt.image</name>
+    </export>
+    <export>
+      <name>java.awt.image.renderable</name>
+    </export>
+    <export>
+      <name>java.awt.print</name>
+    </export>
+    <export>
+      <name>java.beans</name>
+    </export>
+    <export>
+      <name>java.beans.beancontext</name>
+    </export>
+    <export>
+      <name>javax.accessibility</name>
+    </export>
+    <export>
+      <name>javax.imageio</name>
+    </export>
+    <export>
+      <name>javax.imageio.event</name>
+    </export>
+    <export>
+      <name>javax.imageio.metadata</name>
+    </export>
+    <export>
+      <name>javax.imageio.plugins.bmp</name>
+    </export>
+    <export>
+      <name>javax.imageio.plugins.jpeg</name>
+    </export>
+    <export>
+      <name>javax.imageio.spi</name>
+    </export>
+    <export>
+      <name>javax.imageio.stream</name>
+    </export>
+    <export>
+      <name>javax.print</name>
+    </export>
+    <export>
+      <name>javax.print.attribute</name>
+    </export>
+    <export>
+      <name>javax.print.attribute.standard</name>
+    </export>
+    <export>
+      <name>javax.print.event</name>
+    </export>
+    <export>
+      <name>javax.sound.midi</name>
+    </export>
+    <export>
+      <name>javax.sound.midi.spi</name>
+    </export>
+    <export>
+      <name>javax.sound.sampled</name>
+    </export>
+    <export>
+      <name>javax.sound.sampled.spi</name>
+    </export>
+    <export>
+      <name>javax.swing</name>
+    </export>
+    <export>
+      <name>javax.swing.border</name>
+    </export>
+    <export>
+      <name>javax.swing.colorchooser</name>
+    </export>
+    <export>
+      <name>javax.swing.event</name>
+    </export>
+    <export>
+      <name>javax.swing.filechooser</name>
+    </export>
+    <export>
+      <name>javax.swing.plaf</name>
+    </export>
+    <export>
+      <name>javax.swing.plaf.basic</name>
+    </export>
+    <export>
+      <name>javax.swing.plaf.metal</name>
+    </export>
+    <export>
+      <name>javax.swing.plaf.multi</name>
+    </export>
+    <export>
+      <name>javax.swing.plaf.nimbus</name>
+    </export>
+    <export>
+      <name>javax.swing.plaf.synth</name>
+    </export>
+    <export>
+      <name>javax.swing.table</name>
+    </export>
+    <export>
+      <name>javax.swing.text</name>
+    </export>
+    <export>
+      <name>javax.swing.text.html</name>
+    </export>
+    <export>
+      <name>javax.swing.text.html.parser</name>
+    </export>
+    <export>
+      <name>javax.swing.text.rtf</name>
+    </export>
+    <export>
+      <name>javax.swing.tree</name>
+    </export>
+    <export>
+      <name>javax.swing.undo</name>
+    </export>
+  </module>
+  <module>
+    <name>java.instrument</name>
+    <depend>java.base</depend>
+    <export>
+      <name>java.lang.instrument</name>
+    </export>
+  </module>
+  <module>
+    <name>java.logging</name>
+    <depend>java.base</depend>
+    <export>
+      <name>java.util.logging</name>
+    </export>
+  </module>
+  <module>
+    <name>java.management</name>
+    <depend>java.base</depend>
+    <depend>java.logging</depend>
+    <depend>java.naming</depend>
+    <depend re-exports="true">java.rmi</depend>
+    <export>
+      <name>com.sun.management</name>
+    </export>
+    <export>
+      <name>java.lang.management</name>
+    </export>
+    <export>
+      <name>javax.management</name>
+    </export>
+    <export>
+      <name>javax.management.loading</name>
+    </export>
+    <export>
+      <name>javax.management.modelmbean</name>
+    </export>
+    <export>
+      <name>javax.management.monitor</name>
+    </export>
+    <export>
+      <name>javax.management.openmbean</name>
+    </export>
+    <export>
+      <name>javax.management.relation</name>
+    </export>
+    <export>
+      <name>javax.management.remote</name>
+    </export>
+    <export>
+      <name>javax.management.remote.rmi</name>
+    </export>
+    <export>
+      <name>javax.management.timer</name>
+    </export>
+    <export>
+      <name>com.sun.jmx.defaults</name>
+      <to>jdk.snmp</to>
+    </export>
+    <export>
+      <name>com.sun.jmx.mbeanserver</name>
+      <to>jdk.snmp</to>
+    </export>
+    <export>
+      <name>sun.management</name>
+      <to>jdk.jconsole</to>
+      <to>jdk.snmp</to>
+    </export>
+  </module>
+  <module>
+    <name>java.naming</name>
+    <depend>java.base</depend>
+    <depend>java.security.sasl</depend>
+    <export>
+      <name>javax.naming</name>
+    </export>
+    <export>
+      <name>javax.naming.directory</name>
+    </export>
+    <export>
+      <name>javax.naming.event</name>
+    </export>
+    <export>
+      <name>javax.naming.ldap</name>
+    </export>
+    <export>
+      <name>javax.naming.spi</name>
+    </export>
+    <export>
+      <name>com.sun.jndi.toolkit.ctx</name>
+      <to>jdk.naming.dns</to>
+    </export>
+    <export>
+      <name>com.sun.jndi.toolkit.url</name>
+      <to>java.corba</to>
+      <to>jdk.naming.dns</to>
+      <to>jdk.naming.rmi</to>
+    </export>
+  </module>
+  <module>
+    <name>java.prefs</name>
+    <depend>java.base</depend>
+    <depend>java.xml</depend>
+    <export>
+      <name>java.util.prefs</name>
+    </export>
+  </module>
+  <module>
+    <name>java.rmi</name>
+    <depend>java.base</depend>
+    <depend>java.logging</depend>
+    <export>
+      <name>java.rmi</name>
+    </export>
+    <export>
+      <name>java.rmi.activation</name>
+    </export>
+    <export>
+      <name>java.rmi.dgc</name>
+    </export>
+    <export>
+      <name>java.rmi.registry</name>
+    </export>
+    <export>
+      <name>java.rmi.server</name>
+    </export>
+    <export>
+      <name>javax.rmi.ssl</name>
+    </export>
+    <export>
+      <name>sun.rmi.registry</name>
+      <to>java.management</to>
+    </export>
+    <export>
+      <name>sun.rmi.server</name>
+      <to>java.management</to>
+      <to>jdk.jconsole</to>
+    </export>
+    <export>
+      <name>sun.rmi.transport</name>
+      <to>java.management</to>
+      <to>jdk.jconsole</to>
+    </export>
+  </module>
+  <module>
+    <name>java.scripting</name>
+    <depend>java.base</depend>
+    <export>
+      <name>javax.script</name>
+    </export>
+  </module>
+  <module>
+    <name>java.se</name>
+    <depend re-exports="true">java.activation</depend>
+    <depend re-exports="true">java.compact3</depend>
+    <depend re-exports="true">java.corba</depend>
+    <depend re-exports="true">java.desktop</depend>
+    <depend re-exports="true">java.xml.bind</depend>
+    <depend re-exports="true">java.xml.soap</depend>
+    <depend re-exports="true">java.xml.ws</depend>
+  </module>
+  <module>
+    <name>java.security.acl</name>
+    <depend>java.base</depend>
+    <export>
+      <name>java.security.acl</name>
+    </export>
+  </module>
+  <module>
+    <name>java.security.jgss</name>
+    <depend>java.base</depend>
+    <depend>java.logging</depend>
+    <depend>java.naming</depend>
+    <depend>java.security.sasl</depend>
+    <export>
+      <name>com.sun.security.jgss</name>
+    </export>
+    <export>
+      <name>javax.security.auth.kerberos</name>
+    </export>
+    <export>
+      <name>org.ietf.jgss</name>
+    </export>
+    <export>
+      <name>sun.security.jgss.krb5</name>
+      <to>jdk.security.auth</to>
+    </export>
+    <export>
+      <name>sun.security.krb5</name>
+      <to>jdk.security.auth</to>
+    </export>
+    <export>
+      <name>sun.security.krb5.internal.ktab</name>
+      <to>jdk.security.auth</to>
+    </export>
+  </module>
+  <module>
+    <name>java.security.sasl</name>
+    <depend>java.base</depend>
+    <depend>java.logging</depend>
+    <export>
+      <name>javax.security.sasl</name>
+    </export>
+    <export>
+      <name>com.sun.security.sasl.util</name>
+      <to>java.security.jgss</to>
+    </export>
+  </module>
+  <module>
+    <name>java.smartcardio</name>
+    <depend>java.base</depend>
+    <export>
+      <name>javax.smartcardio</name>
+    </export>
+  </module>
+  <module>
+    <name>java.sql</name>
+    <depend>java.base</depend>
+    <depend re-exports="true">java.logging</depend>
+    <depend re-exports="true">java.xml</depend>
+    <export>
+      <name>java.sql</name>
+    </export>
+    <export>
+      <name>javax.sql</name>
+    </export>
+    <export>
+      <name>javax.transaction.xa</name>
+    </export>
+  </module>
+  <module>
+    <name>java.sql.rowset</name>
+    <depend>java.base</depend>
+    <depend re-exports="true">java.logging</depend>
+    <depend re-exports="true">java.naming</depend>
+    <depend re-exports="true">java.sql</depend>
+    <depend>java.xml</depend>
+    <export>
+      <name>javax.sql.rowset</name>
+    </export>
+    <export>
+      <name>javax.sql.rowset.serial</name>
+    </export>
+    <export>
+      <name>javax.sql.rowset.spi</name>
+    </export>
+  </module>
+  <module>
+    <name>java.xml</name>
+    <depend>java.base</depend>
+    <export>
+      <name>javax.xml</name>
+    </export>
+    <export>
+      <name>javax.xml.datatype</name>
+    </export>
+    <export>
+      <name>javax.xml.namespace</name>
+    </export>
+    <export>
+      <name>javax.xml.parsers</name>
+    </export>
+    <export>
+      <name>javax.xml.stream</name>
+    </export>
+    <export>
+      <name>javax.xml.stream.events</name>
+    </export>
+    <export>
+      <name>javax.xml.stream.util</name>
+    </export>
+    <export>
+      <name>javax.xml.transform</name>
+    </export>
+    <export>
+      <name>javax.xml.transform.dom</name>
+    </export>
+    <export>
+      <name>javax.xml.transform.sax</name>
+    </export>
+    <export>
+      <name>javax.xml.transform.stax</name>
+    </export>
+    <export>
+      <name>javax.xml.transform.stream</name>
+    </export>
+    <export>
+      <name>javax.xml.validation</name>
+    </export>
+    <export>
+      <name>javax.xml.xpath</name>
+    </export>
+    <export>
+      <name>org.w3c.dom</name>
+    </export>
+    <export>
+      <name>org.w3c.dom.bootstrap</name>
+    </export>
+    <export>
+      <name>org.w3c.dom.events</name>
+    </export>
+    <export>
+      <name>org.w3c.dom.ls</name>
+    </export>
+    <export>
+      <name>org.w3c.dom.views</name>
+    </export>
+    <export>
+      <name>org.xml.sax</name>
+    </export>
+    <export>
+      <name>org.xml.sax.ext</name>
+    </export>
+    <export>
+      <name>org.xml.sax.helpers</name>
+    </export>
+    <export>
+      <name>com.sun.org.apache.xerces.internal.dom</name>
+      <to>java.xml.soap</to>
+    </export>
+    <export>
+      <name>com.sun.org.apache.xerces.internal.jaxp</name>
+      <to>java.xml.soap</to>
+    </export>
+    <export>
+      <name>com.sun.org.apache.xerces.internal.util</name>
+      <to>java.xml.soap</to>
+    </export>
+    <export>
+      <name>com.sun.org.apache.xml.internal.dtm</name>
+      <to>java.xml.crypto</to>
+    </export>
+    <export>
+      <name>com.sun.org.apache.xml.internal.resolver</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+    </export>
+    <export>
+      <name>com.sun.org.apache.xml.internal.resolver.tools</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+    </export>
+    <export>
+      <name>com.sun.org.apache.xml.internal.utils</name>
+      <to>java.xml.crypto</to>
+    </export>
+    <export>
+      <name>com.sun.org.apache.xpath.internal</name>
+      <to>java.xml.crypto</to>
+    </export>
+    <export>
+      <name>com.sun.org.apache.xpath.internal.compiler</name>
+      <to>java.xml.crypto</to>
+    </export>
+    <export>
+      <name>com.sun.org.apache.xpath.internal.functions</name>
+      <to>java.xml.crypto</to>
+    </export>
+    <export>
+      <name>com.sun.org.apache.xpath.internal.objects</name>
+      <to>java.xml.crypto</to>
+    </export>
+    <export>
+      <name>com.sun.org.apache.xpath.internal.res</name>
+      <to>java.xml.crypto</to>
+    </export>
+  </module>
+  <module>
+    <name>java.xml.bind</name>
+    <depend re-exports="true">java.activation</depend>
+    <depend>java.base</depend>
+    <depend>java.compiler</depend>
+    <depend>java.desktop</depend>
+    <depend>java.logging</depend>
+    <depend re-exports="true">java.xml</depend>
+    <export>
+      <name>javax.xml.bind</name>
+    </export>
+    <export>
+      <name>javax.xml.bind.annotation</name>
+    </export>
+    <export>
+      <name>javax.xml.bind.annotation.adapters</name>
+    </export>
+    <export>
+      <name>javax.xml.bind.attachment</name>
+    </export>
+    <export>
+      <name>javax.xml.bind.helpers</name>
+    </export>
+    <export>
+      <name>javax.xml.bind.util</name>
+    </export>
+    <export>
+      <name>com.sun.istack.internal</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.istack.internal.localization</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.istack.internal.logging</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.annotation</name>
+      <to>jdk.xml.bind</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.api</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.api.impl</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.marshaller</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.unmarshaller</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.util</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.v2</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.v2.model.annotation</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.v2.model.core</name>
+      <to>jdk.xml.bind</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.v2.model.impl</name>
+      <to>jdk.xml.bind</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.v2.model.nav</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.v2.model.runtime</name>
+      <to>java.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.v2.model.util</name>
+      <to>jdk.xml.bind</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.v2.runtime</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.v2.runtime.unmarshaller</name>
+      <to>java.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.v2.schemagen</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.v2.schemagen.episode</name>
+      <to>jdk.xml.bind</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.v2.schemagen.xmlschema</name>
+      <to>java.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.bind.v2.util</name>
+      <to>jdk.xml.bind</to>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.fastinfoset.stax</name>
+      <to>java.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.fastinfoset.vocab</name>
+      <to>java.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.org.jvnet.fastinfoset</name>
+      <to>java.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.org.jvnet.mimepull</name>
+      <to>java.xml.soap</to>
+      <to>java.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.org.jvnet.staxex</name>
+      <to>java.xml.soap</to>
+      <to>java.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.org.jvnet.staxex.util</name>
+      <to>java.xml.soap</to>
+      <to>java.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.txw2</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.txw2.annotation</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.txw2.output</name>
+      <to>java.xml.ws</to>
+      <to>jdk.xml.bind</to>
+      <to>jdk.xml.ws</to>
+    </export>
+  </module>
+  <module>
+    <name>java.xml.crypto</name>
+    <depend>java.base</depend>
+    <depend>java.logging</depend>
+    <depend re-exports="true">java.xml</depend>
+    <export>
+      <name>javax.xml.crypto</name>
+    </export>
+    <export>
+      <name>javax.xml.crypto.dom</name>
+    </export>
+    <export>
+      <name>javax.xml.crypto.dsig</name>
+    </export>
+    <export>
+      <name>javax.xml.crypto.dsig.dom</name>
+    </export>
+    <export>
+      <name>javax.xml.crypto.dsig.keyinfo</name>
+    </export>
+    <export>
+      <name>javax.xml.crypto.dsig.spec</name>
+    </export>
+  </module>
+  <module>
+    <name>java.xml.soap</name>
+    <depend re-exports="true">java.activation</depend>
+    <depend>java.base</depend>
+    <depend>java.desktop</depend>
+    <depend>java.logging</depend>
+    <depend re-exports="true">java.xml</depend>
+    <depend>java.xml.bind</depend>
+    <export>
+      <name>javax.xml.soap</name>
+    </export>
+  </module>
+  <module>
+    <name>java.xml.ws</name>
+    <depend>java.activation</depend>
+    <depend>java.annotations.common</depend>
+    <depend>java.base</depend>
+    <depend>java.desktop</depend>
+    <depend>java.logging</depend>
+    <depend>java.management</depend>
+    <depend>java.rmi</depend>
+    <depend re-exports="true">java.xml</depend>
+    <depend re-exports="true">java.xml.bind</depend>
+    <depend re-exports="true">java.xml.soap</depend>
+    <depend>jdk.httpserver</depend>
+    <export>
+      <name>javax.jws</name>
+    </export>
+    <export>
+      <name>javax.jws.soap</name>
+    </export>
+    <export>
+      <name>javax.xml.ws</name>
+    </export>
+    <export>
+      <name>javax.xml.ws.handler</name>
+    </export>
+    <export>
+      <name>javax.xml.ws.handler.soap</name>
+    </export>
+    <export>
+      <name>javax.xml.ws.http</name>
+    </export>
+    <export>
+      <name>javax.xml.ws.soap</name>
+    </export>
+    <export>
+      <name>javax.xml.ws.spi</name>
+    </export>
+    <export>
+      <name>javax.xml.ws.spi.http</name>
+    </export>
+    <export>
+      <name>javax.xml.ws.wsaddressing</name>
+    </export>
+    <export>
+      <name>com.oracle.webservices.internal.api.databinding</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.addressing</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.addressing.v200408</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.api</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.api.addressing</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.api.databinding</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.api.model</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.api.server</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.api.streaming</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.api.wsdl.parser</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.api.wsdl.writer</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.binding</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.db</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.model</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.policy.sourcemodel.wspolicy</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.spi.db</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.streaming</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.util</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.util.exception</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.util.xml</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.wsdl.parser</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.ws.wsdl.writer</name>
+      <to>jdk.xml.ws</to>
+    </export>
+  </module>
+  <module>
+    <name>jdk.attach</name>
+    <depend>java.base</depend>
+    <depend>jdk.jvmstat</depend>
+    <export>
+      <name>com.sun.tools.attach</name>
+    </export>
+    <export>
+      <name>com.sun.tools.attach.spi</name>
+    </export>
+    <export>
+      <name>sun.tools.attach</name>
+      <to>jdk.jcmd</to>
+    </export>
+  </module>
+  <module>
+    <name>jdk.charsets</name>
+    <depend>java.base</depend>
+    <export>
+      <name>sun.nio.cs.ext</name>
+      <to>java.desktop</to>
+    </export>
+  </module>
+  <module>
+    <name>jdk.compact3</name>
+    <depend re-exports="true">java.compact3</depend>
+    <depend re-exports="true">java.smartcardio</depend>
+    <depend re-exports="true">jdk.httpserver</depend>
+    <depend re-exports="true">jdk.naming.dns</depend>
+    <depend re-exports="true">jdk.naming.rmi</depend>
+    <depend re-exports="true">jdk.sctp</depend>
+    <depend re-exports="true">jdk.security.auth</depend>
+  </module>
+  <module>
+    <name>jdk.compiler</name>
+    <depend>java.base</depend>
+    <depend re-exports="true">java.compiler</depend>
+    <export>
+      <name>com.sun.source.doctree</name>
+    </export>
+    <export>
+      <name>com.sun.source.tree</name>
+    </export>
+    <export>
+      <name>com.sun.source.util</name>
+    </export>
+    <export>
+      <name>com.sun.tools.javac</name>
+    </export>
+    <export>
+      <name>com.sun.tools.javah</name>
+    </export>
+    <export>
+      <name>com.sun.tools.javap</name>
+    </export>
+    <export>
+      <name>com.sun.tools.classfile</name>
+      <to>jdk.dev</to>
+    </export>
+    <export>
+      <name>com.sun.tools.doclint</name>
+      <to>jdk.javadoc</to>
+    </export>
+    <export>
+      <name>com.sun.tools.javac.api</name>
+      <to>jdk.javadoc</to>
+    </export>
+    <export>
+      <name>com.sun.tools.javac.code</name>
+      <to>jdk.javadoc</to>
+    </export>
+    <export>
+      <name>com.sun.tools.javac.comp</name>
+      <to>jdk.javadoc</to>
+    </export>
+    <export>
+      <name>com.sun.tools.javac.file</name>
+      <to>jdk.javadoc</to>
+    </export>
+    <export>
+      <name>com.sun.tools.javac.jvm</name>
+      <to>jdk.javadoc</to>
+    </export>
+    <export>
+      <name>com.sun.tools.javac.main</name>
+      <to>jdk.javadoc</to>
+    </export>
+    <export>
+      <name>com.sun.tools.javac.nio</name>
+      <to>jdk.javadoc</to>
+    </export>
+    <export>
+      <name>com.sun.tools.javac.sym</name>
+      <to>jdk.javadoc</to>
+    </export>
+    <export>
+      <name>com.sun.tools.javac.tree</name>
+      <to>jdk.javadoc</to>
+    </export>
+    <export>
+      <name>com.sun.tools.javac.util</name>
+      <to>jdk.javadoc</to>
+    </export>
+  </module>
+  <module>
+    <name>jdk.crypto.ec</name>
+    <depend>java.base</depend>
+    <export>
+      <name>sun.security.ec</name>
+      <to>jdk.crypto.pkcs11</to>
+    </export>
+  </module>
+  <module>
+    <name>jdk.crypto.pkcs11</name>
+    <depend>java.base</depend>
+    <depend>jdk.crypto.ec</depend>
+  </module>
+  <module>
+    <name>jdk.dev</name>
+    <depend>java.base</depend>
+    <depend>java.scripting</depend>
+    <depend>java.xml</depend>
+    <depend>jdk.compiler</depend>
+    <depend>jdk.rmic</depend>
+    <depend>jdk.xml.bind</depend>
+    <depend>jdk.xml.ws</depend>
+  </module>
+  <module>
+    <name>jdk.hotspot.agent</name>
+    <depend>java.base</depend>
+    <depend>java.desktop</depend>
+    <depend>java.rmi</depend>
+    <depend>java.scripting</depend>
+    <depend>jdk.jdi</depend>
+  </module>
+  <module>
+    <name>jdk.hprof.agent</name>
+    <depend>java.base</depend>
+  </module>
+  <module>
+    <name>jdk.httpserver</name>
+    <depend>java.base</depend>
+    <depend>java.logging</depend>
+    <export>
+      <name>com.sun.net.httpserver</name>
+    </export>
+    <export>
+      <name>com.sun.net.httpserver.spi</name>
+    </export>
+  </module>
+  <module>
+    <name>jdk.javadoc</name>
+    <depend>java.base</depend>
+    <depend re-exports="true">java.compiler</depend>
+    <depend>java.xml</depend>
+    <depend re-exports="true">jdk.compiler</depend>
+    <export>
+      <name>com.sun.javadoc</name>
+    </export>
+    <export>
+      <name>com.sun.tools.doclets</name>
+    </export>
+    <export>
+      <name>com.sun.tools.javadoc</name>
+    </export>
+  </module>
+  <module>
+    <name>jdk.jcmd</name>
+    <depend>java.base</depend>
+    <depend>jdk.attach</depend>
+    <depend>jdk.jvmstat</depend>
+  </module>
+  <module>
+    <name>jdk.jconsole</name>
+    <depend>java.base</depend>
+    <depend re-exports="true">java.desktop</depend>
+    <depend>java.logging</depend>
+    <depend re-exports="true">java.management</depend>
+    <depend>java.rmi</depend>
+    <depend>jdk.attach</depend>
+    <depend>jdk.jvmstat</depend>
+    <export>
+      <name>com.sun.tools.jconsole</name>
+    </export>
+  </module>
+  <module>
+    <name>jdk.jdi</name>
+    <depend>java.base</depend>
+    <depend>jdk.attach</depend>
+    <export>
+      <name>com.sun.jdi</name>
+    </export>
+    <export>
+      <name>com.sun.jdi.connect</name>
+    </export>
+    <export>
+      <name>com.sun.jdi.connect.spi</name>
+    </export>
+    <export>
+      <name>com.sun.jdi.event</name>
+    </export>
+    <export>
+      <name>com.sun.jdi.request</name>
+    </export>
+    <export>
+      <name>com.sun.tools.jdi</name>
+      <to>jdk.hotspot.agent</to>
+    </export>
+  </module>
+  <module>
+    <name>jdk.jdwp.agent</name>
+    <depend>java.base</depend>
+  </module>
+  <module>
+    <name>jdk.jvmstat</name>
+    <depend>java.base</depend>
+    <depend>java.rmi</depend>
+    <export>
+      <name>sun.jvmstat.monitor</name>
+      <to>jdk.attach</to>
+      <to>jdk.jcmd</to>
+      <to>jdk.jconsole</to>
+    </export>
+    <export>
+      <name>sun.jvmstat.monitor.event</name>
+      <to>jdk.jcmd</to>
+    </export>
+  </module>
+  <module>
+    <name>jdk.localedata</name>
+    <depend>java.base</depend>
+  </module>
+  <module>
+    <name>jdk.naming.dns</name>
+    <depend>java.base</depend>
+    <depend>java.naming</depend>
+  </module>
+  <module>
+    <name>jdk.naming.rmi</name>
+    <depend>java.base</depend>
+    <depend>java.naming</depend>
+    <depend>java.rmi</depend>
+  </module>
+  <module>
+    <name>jdk.rmic</name>
+    <depend>java.base</depend>
+    <depend>java.corba</depend>
+    <depend>jdk.compiler</depend>
+    <depend>jdk.javadoc</depend>
+  </module>
+  <module>
+    <name>jdk.runtime</name>
+    <depend>java.base</depend>
+    <depend>java.desktop</depend>
+    <depend>java.se</depend>
+    <depend>jdk.compact3</depend>
+  </module>
+  <module>
+    <name>jdk.scripting.nashorn</name>
+    <depend>java.base</depend>
+    <depend>java.logging</depend>
+    <depend>java.scripting</depend>
+  </module>
+  <module>
+    <name>jdk.sctp</name>
+    <depend>java.base</depend>
+    <export>
+      <name>com.sun.nio.sctp</name>
+    </export>
+  </module>
+  <module>
+    <name>jdk.security.auth</name>
+    <depend>java.base</depend>
+    <depend re-exports="true">java.naming</depend>
+    <depend>java.security.jgss</depend>
+    <export>
+      <name>com.sun.security.auth</name>
+    </export>
+    <export>
+      <name>com.sun.security.auth.callback</name>
+    </export>
+    <export>
+      <name>com.sun.security.auth.login</name>
+    </export>
+    <export>
+      <name>com.sun.security.auth.module</name>
+    </export>
+  </module>
+  <module>
+    <name>jdk.xml.bind</name>
+    <depend>java.activation</depend>
+    <depend>java.base</depend>
+    <depend>java.compiler</depend>
+    <depend>java.desktop</depend>
+    <depend>java.logging</depend>
+    <depend>java.xml</depend>
+    <depend>java.xml.bind</depend>
+    <depend>jdk.compiler</depend>
+    <export>
+      <name>com.sun.codemodel.internal</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.codemodel.internal.writer</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.istack.internal.tools</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.tools.internal.jxc.ap</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.tools.internal.jxc.model.nav</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.tools.internal.xjc</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.tools.internal.xjc.api</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.tools.internal.xjc.api.util</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.tools.internal.xjc.reader</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.tools.internal.xjc.reader.internalizer</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.tools.internal.xjc.util</name>
+      <to>jdk.xml.ws</to>
+    </export>
+    <export>
+      <name>com.sun.xml.internal.xsom.parser</name>
+      <to>jdk.xml.ws</to>
+    </export>
+  </module>
+  <module>
+    <name>jdk.xml.ws</name>
+    <depend>java.base</depend>
+    <depend>java.compiler</depend>
+    <depend>java.logging</depend>
+    <depend>java.rmi</depend>
+    <depend>java.xml</depend>
+    <depend>java.xml.bind</depend>
+    <depend>java.xml.ws</depend>
+    <depend>jdk.xml.bind</depend>
+  </module>
+  <module>
+    <name>jdk.zipfs</name>
+    <depend>java.base</depend>
+  </module>
+</modules>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/make/TestJavaCompilation.gmk	Sun Aug 17 15:51:37 2014 +0100
@@ -0,0 +1,218 @@
+#
+# Copyright (c) 2014, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+
+THIS_FILE := $(SRC_ROOT)/test/make/TestJavaCompilation.gmk
+DEPS := $(THIS_FILE) \
+    $(SRC_ROOT)/make/common/MakeBase.gmk \
+    $(SRC_ROOT)/make/common/JavaCompilation.gmk \
+    #
+
+OUTPUT_DIR := $(TESTMAKE_OUTPUTDIR)/java-compilation
+
+################################################################################
+# Test: jar1
+# Creates a simple jar file and unzips it to verify that the files have not
+# changed.
+
+JAR1_SRC_ROOT := $(OUTPUT_DIR)/jar1src
+JAR1_UNZIP := $(OUTPUT_DIR)/jar1unzip
+JAR1_FILE := $(OUTPUT_DIR)/jar1.jar
+JAR1_MANIFEST := $(OUTPUT_DIR)/jar1_manifest
+
+clean-jar1:
+	$(RM) -r $(OUTPUT_DIR)/_jar1* $(OUTPUT_DIR)/jar1*
+
+$(OUTPUT_DIR)/_jar1_created: $(DEPS)
+	$(RM) -r $(JAR1_SRC_ROOT)
+	$(RM) $(JAR1_FILE)
+	$(RM) -r $(JAR1_UNZIP)
+	$(MKDIR) -p $(JAR1_SRC_ROOT)
+	$(MKDIR) -p $(JAR1_SRC_ROOT)/dir1
+	$(MKDIR) -p $(JAR1_SRC_ROOT)/dir2
+	$(MKDIR) -p $(JAR1_SRC_ROOT)/META-INF
+	$(TOUCH) $(JAR1_SRC_ROOT)/dir1/file1.class
+	$(TOUCH) $(JAR1_SRC_ROOT)/dir2/file2.class
+	$(TOUCH) $(JAR1_SRC_ROOT)/META-INF/metafile
+	$(ECHO) "Test-Attribute: value" > $(JAR1_MANIFEST)
+	$(TOUCH) $@
+
+$(eval $(call SetupArchive,BUILD_JAR1, \
+    $(OUTPUT_DIR)/_jar1_created, \
+    SRCS := $(JAR1_SRC_ROOT), \
+    MANIFEST := $(JAR1_MANIFEST), \
+    JAR := $(JAR1_FILE)))
+
+$(OUTPUT_DIR)/_jar1_verified: $(BUILD_JAR1)
+	$(RM) -r $(JAR1_UNZIP)
+	$(MKDIR) -p $(JAR1_UNZIP)
+	$(CD) $(JAR1_UNZIP) && $(UNZIP) $(JAR1_FILE) $(LOG_DEBUG)
+	$(DIFF) -r $(JAR1_SRC_ROOT)/dir1 $(JAR1_UNZIP)/dir1
+	$(DIFF) -r $(JAR1_SRC_ROOT)/dir2 $(JAR1_UNZIP)/dir2
+	$(DIFF) -r $(JAR1_SRC_ROOT)/META-INF/metafile $(JAR1_UNZIP)/META-INF/metafile
+	if [ "`$(GREP) 'Test-Attribute: value' $(JAR1_MANIFEST)`" = "" ]; then \
+	  $(ECHO) "Could not find Test-Attribute in manifest of $(JAR1_FILE)"; \
+	  exit 1; \
+	fi
+	$(TOUCH) $@
+
+create-jar2: $(OUTPUT_DIR)/_jar1_verified
+TEST_TARGETS += $(OUTPUT_DIR)/_jar1_verified
+
+# Change a source file and call this makefile again to force the jar to be 
+# updated. 
+$(OUTPUT_DIR)_jar1_updated: $(OUTPUT_DIR)/_jar1_verified
+	$(ECHO) updated > $(JAR1_SRC_ROOT)/dir1/file1.class
+	$(ECHO) updated > $(JAR1_SRC_ROOT)/META-INF/metafile
+	$(TOUCH) $(OUTPUT_DIR)/_jar1_created
+	+$(MAKE) -f $(THIS_FILE) $(OUTPUT_DIR)/_jar1_verified
+	$(TOUCH) $@
+
+update-jar1: $(OUTPUT_DIR)_jar1_updated
+TEST_TARGETS += $(OUTPUT_DIR)_jar1_updated
+
+.PHONY: clean-jar1 create-jar1 update-jar1
+
+################################################################################
+# Test: jar2
+# Creates a jar file based on 2 source roots
+
+JAR2_SRC_ROOT1 := $(OUTPUT_DIR)/jar2src1
+JAR2_SRC_ROOT2 := $(OUTPUT_DIR)/jar2src2
+JAR2_UNZIP := $(OUTPUT_DIR)/jar2unzip
+JAR2_FILE := $(OUTPUT_DIR)/jar2.jar
+
+clean-jar2:
+	$(RM) -r $(OUTPUT_DIR)/_jar2* $(OUTPUT_DIR)/jar2*
+
+$(OUTPUT_DIR)/_jar2_created: $(DEPS)
+	$(RM) -r $(JAR2_SRC_ROOT1)
+	$(RM) -r $(JAR2_SRC_ROOT2)
+	$(RM) $(JAR2_FILE)
+	$(RM) -r $(JAR2_UNZIP)
+	$(MKDIR) -p $(JAR2_SRC_ROOT1)/dir1
+	$(MKDIR) -p $(JAR2_SRC_ROOT2)/dir2
+	$(TOUCH) $(JAR2_SRC_ROOT1)/dir1/file1.class
+	$(TOUCH) $(JAR2_SRC_ROOT2)/dir2/file2.class
+	$(TOUCH) $@
+
+$(eval $(call SetupArchive,BUILD_JAR2, \
+    $(OUTPUT_DIR)/_jar2_created, \
+    SRCS := $(JAR2_SRC_ROOT1) $(JAR2_SRC_ROOT2), \
+    JAR := $(JAR2_FILE)))
+
+$(OUTPUT_DIR)/_jar2_verified: $(BUILD_JAR2)
+	$(RM) -r $(JAR2_UNZIP)
+	$(MKDIR) -p $(JAR2_UNZIP)
+	$(CD) $(JAR2_UNZIP) && $(UNZIP) $(JAR2_FILE) $(LOG_DEBUG)
+	$(DIFF) -r $(JAR2_SRC_ROOT1)/dir1 $(JAR2_UNZIP)/dir1
+	$(DIFF) -r $(JAR2_SRC_ROOT2)/dir2 $(JAR2_UNZIP)/dir2
+	$(TOUCH) $@
+
+create-jar2: $(OUTPUT_DIR)/_jar2_verified
+TEST_TARGETS += $(OUTPUT_DIR)/_jar2_verified
+
+$(OUTPUT_DIR)_jar2_updated: $(OUTPUT_DIR)/_jar2_verified
+	$(ECHO) updated > $(JAR2_SRC_ROOT1)/dir1/file1.class
+	$(TOUCH) $(OUTPUT_DIR)/_jar2_created
+	+$(MAKE) -f $(THIS_FILE) $(OUTPUT_DIR)/_jar2_verified
+	$(TOUCH) $@
+
+update-jar2: $(OUTPUT_DIR)_jar2_updated
+TEST_TARGETS += $(OUTPUT_DIR)_jar2_updated
+
+.PHONY: clean-jar2 create-jar2 update-jar2
+
+################################################################################
+# Test: jar3
+# Creates a jar file based on 2 source roots with an extra file
+
+JAR3_SRC_ROOT1 := $(OUTPUT_DIR)/jar3src1
+JAR3_SRC_ROOT2 := $(OUTPUT_DIR)/jar3src2
+JAR3_UNZIP := $(OUTPUT_DIR)/jar3unzip
+JAR3_FILE := $(OUTPUT_DIR)/jar3.jar
+
+clean-jar3:
+	$(RM) -r $(OUTPUT_DIR)/_jar3* $(OUTPUT_DIR)/jar3*
+
+$(OUTPUT_DIR)/_jar3_created: $(DEPS)
+	$(RM) -r $(JAR3_SRC_ROOT1)
+	$(RM) -r $(JAR3_SRC_ROOT2)
+	$(RM) $(JAR3_FILE)
+	$(RM) -r $(JAR3_UNZIP)
+	$(MKDIR) -p $(JAR3_SRC_ROOT1)/dir1
+	$(MKDIR) -p $(JAR3_SRC_ROOT2)/dir2
+	$(TOUCH) $(JAR3_SRC_ROOT1)/dir1/file1\$$foo.class
+	$(TOUCH) $(JAR3_SRC_ROOT2)/dir2/file2.class
+	$(TOUCH) $(JAR3_SRC_ROOT2)/extra-file
+	$(TOUCH) $(JAR3_SRC_ROOT2)/extra-file-abs
+	$(TOUCH) $(JAR3_SRC_ROOT2)/dir2/file\$$foo.dollar
+	$(TOUCH) $@
+
+$(eval $(call SetupArchive,BUILD_JAR3, \
+    $(OUTPUT_DIR)/_jar3_created, \
+    SRCS := $(JAR3_SRC_ROOT1) $(JAR3_SRC_ROOT2), \
+    EXTRA_FILES := extra-file \
+        dir2/file$$$$foo.dollar \
+        $(JAR3_SRC_ROOT2)/extra-file-abs, \
+    EXCLUDE_FILES := dir1/file1$$$$foo.class, \
+    JAR := $(JAR3_FILE)))
+
+$(OUTPUT_DIR)/_jar3_verified: $(BUILD_JAR3)
+	$(RM) -r $(JAR3_UNZIP)
+	$(MKDIR) -p $(JAR3_UNZIP)
+	$(CD) $(JAR3_UNZIP) && $(UNZIP) $(JAR3_FILE) $(LOG_DEBUG)
+	if [ -d "$(JAR3_UNZIP)/dir1" ]; then \
+	  echo Should not be included $(JAR3_UNZIP)/dir1; \
+	  exit 1; \
+        fi
+	$(DIFF) -r $(JAR3_SRC_ROOT2)/dir2 $(JAR3_UNZIP)/dir2
+	$(DIFF) -r $(JAR3_SRC_ROOT2)/extra-file $(JAR3_UNZIP)/extra-file
+	$(TOUCH) $@
+
+create-jar3: $(OUTPUT_DIR)/_jar3_verified
+TEST_TARGETS += $(OUTPUT_DIR)/_jar3_verified
+
+$(OUTPUT_DIR)_jar3_updated: $(OUTPUT_DIR)/_jar3_verified
+	$(ECHO) updated > $(JAR3_SRC_ROOT2)/extra-file
+	$(TOUCH) $(OUTPUT_DIR)/_jar3_created
+	+$(MAKE) -f $(THIS_FILE) $(OUTPUT_DIR)/_jar3_verified
+	$(TOUCH) $@
+
+update-jar3: $(OUTPUT_DIR)_jar3_updated
+TEST_TARGETS += $(OUTPUT_DIR)_jar3_updated
+
+.PHONY: clean-jar3 create-jar3 update-jar3
+
+################################################################################
+
+all: $(TEST_TARGETS)
+
+.PHONY: default all
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/make/TestMake.gmk	Sun Aug 17 15:51:37 2014 +0100
@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2014, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+
+make-base:
+	+$(MAKE) -f TestMakeBase.gmk $(TEST_SUBTARGET)
+
+java-compilation:
+	+$(MAKE) -f TestJavaCompilation.gmk $(TEST_SUBTARGET)
+
+
+all: make-base java-compilation
+
+.PHONY: default all make-base java-compilation
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/make/TestMakeBase.gmk	Sun Aug 17 15:51:37 2014 +0100
@@ -0,0 +1,60 @@
+#
+# Copyright (c) 2014, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+THIS_FILE := $(SRC_ROOT)/test/make/TestMakeBase.gmk
+DEPS := $(THIS_FILE) \
+    $(SRC_ROOT)/make/common/MakeBase.gmk \
+    #
+
+OUTPUT_DIR := $(TESTMAKE_OUTPUTDIR)/make-base
+
+################################################################################
+# Escape $
+ifneq ($(call EscapeDollar, foo$$bar), foo\$$bar)
+  $(error EscapeDollar failed $(call EscapeDollar, foo$$bar) foo\$$bar)
+endif
+
+ESCAPE_DOLLAR_DIR := $(OUTPUT_DIR)/escape-dollar
+
+$(ESCAPE_DOLLAR_DIR)/_escape_dollar: $(DEPS)
+	$(RM) -r $(@D)
+	$(MKDIR) -p $(@D)
+	$(ECHO) foo\$$bar > $(@D)/file1
+	$(ECHO) $(call EscapeDollar, foo$$bar) > $(@D)/file2
+	$(ECHO) $(call EscapeDollar, foo\$$bar) > $(@D)/file3
+	$(DIFF) $(@D)/file1 $(@D)/file2
+	$(DIFF) $(@D)/file1 $(@D)/file3
+	$(TOUCH) $@
+
+TEST_TARGETS += $(ESCAPE_DOLLAR_DIR)/_escape_dollar
+
+################################################################################
+
+all: $(TEST_TARGETS)