[SCM] jigsaw packaging branch, master, updated. 5d30ff4690ba1aaadbe222264fa9006d03387e1e

Fri Jan 27 04:09:27 UTC 2012

The following commit has been merged in the master branch:
commit 5d30ff4690ba1aaadbe222264fa9006d03387e1e
Author: Mandy Chung <mandy.chung at oracle.com>
Date:   Fri Jan 27 05:03:12 2012 +0100

    Sync with lastest upstream.

diff --git a/hotspot/.hg/cache/branchheads b/hotspot/.hg/cache/branchheads
index 5c5284c..a88d535 100644
--- a/hotspot/.hg/cache/branchheads
+++ b/hotspot/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-fdd4ba16fb4bd20e2b5c7e1f6079b844c2bf8347 2889
-fdd4ba16fb4bd20e2b5c7e1f6079b844c2bf8347 default
+0daf3b6ab20c0bc3648231127270a3c42e8983f0 2890
+0daf3b6ab20c0bc3648231127270a3c42e8983f0 default
diff --git a/hotspot/.hg/dirstate b/hotspot/.hg/dirstate
index dc315b7..ac9f714 100644
Binary files a/hotspot/.hg/dirstate and b/hotspot/.hg/dirstate differ
diff --git a/hotspot/.hg/store/00changelog.d b/hotspot/.hg/store/00changelog.d
index 7fd8b4e..545e733 100644
Binary files a/hotspot/.hg/store/00changelog.d and b/hotspot/.hg/store/00changelog.d differ
diff --git a/hotspot/.hg/store/00changelog.i b/hotspot/.hg/store/00changelog.i
index 3e486d7..98d1698 100644
Binary files a/hotspot/.hg/store/00changelog.i and b/hotspot/.hg/store/00changelog.i differ
diff --git a/hotspot/.hg/store/00manifest.d b/hotspot/.hg/store/00manifest.d
index 6bc3e7d..e4e5ec6 100644
Binary files a/hotspot/.hg/store/00manifest.d and b/hotspot/.hg/store/00manifest.d differ
diff --git a/hotspot/.hg/store/00manifest.i b/hotspot/.hg/store/00manifest.i
index 415944c..f5b6a6f 100644
Binary files a/hotspot/.hg/store/00manifest.i and b/hotspot/.hg/store/00manifest.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/os.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/os.cpp.i
index 1e1c793..89c5144 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/os.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/os.cpp.i differ
diff --git a/hotspot/.hg/store/undo b/hotspot/.hg/store/undo
index 4b1c5b9..6071d0e 100644
Binary files a/hotspot/.hg/store/undo and b/hotspot/.hg/store/undo differ
diff --git a/hotspot/.hg/undo.desc b/hotspot/.hg/undo.desc
index f4d3096..67deb0a 100644
--- a/hotspot/.hg/undo.desc
+++ b/hotspot/.hg/undo.desc
@@ -1,3 +1,3 @@
-2779
+2890
 pull
 http://hg.openjdk.java.net/jigsaw/jigsaw/hotspot
diff --git a/hotspot/.hg/undo.dirstate b/hotspot/.hg/undo.dirstate
index 77c959c..dc315b7 100644
Binary files a/hotspot/.hg/undo.dirstate and b/hotspot/.hg/undo.dirstate differ
diff --git a/hotspot/src/share/vm/runtime/os.cpp b/hotspot/src/share/vm/runtime/os.cpp
index f966d9a..753bc6d 100644
--- a/hotspot/src/share/vm/runtime/os.cpp
+++ b/hotspot/src/share/vm/runtime/os.cpp
@@ -1141,10 +1141,7 @@ bool os::set_boot_path(char fileSep, char pathSep) {
 
         // ## TEMPORARY hack to keep the legacy launcher working when
         // ## only the boot module is installed (cf. j.l.ClassLoader)
-        "%/lib/modules/jdk.boot/8-ea/classes:"
-        "%/lib/modules/jdk.boot/8-ea/classes.jar:"
-        "%/lib/modules/jdk.boot/8-ea/resources:"
-        "%/lib/modules/jdk.boot/8-ea/resources.jar:"
+        "%/lib/modules/jdk.base/8-ea/classes:"
         "%/classes";
     char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep);
     if (sysclasspath == NULL) return false;
diff --git a/jdk/.hg/cache/branchheads b/jdk/.hg/cache/branchheads
index 5fd821b..d45d294 100644
--- a/jdk/.hg/cache/branchheads
+++ b/jdk/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-a22f65ac0b9a462bb7108595db720b4326d337a6 5001
-a22f65ac0b9a462bb7108595db720b4326d337a6 default
+71a6e9559cbb543a0e4f464eece40b680f196fa3 5003
+71a6e9559cbb543a0e4f464eece40b680f196fa3 default
diff --git a/jdk/.hg/dirstate b/jdk/.hg/dirstate
index 5f3dca8..a4ac688 100644
Binary files a/jdk/.hg/dirstate and b/jdk/.hg/dirstate differ
diff --git a/jdk/.hg/store/00changelog.d b/jdk/.hg/store/00changelog.d
index 7631017..c187def 100644
Binary files a/jdk/.hg/store/00changelog.d and b/jdk/.hg/store/00changelog.d differ
diff --git a/jdk/.hg/store/00changelog.i b/jdk/.hg/store/00changelog.i
index e7375d7..9cf9297 100644
Binary files a/jdk/.hg/store/00changelog.i and b/jdk/.hg/store/00changelog.i differ
diff --git a/jdk/.hg/store/00manifest.d b/jdk/.hg/store/00manifest.d
index 06c6f62..e405fd8 100644
Binary files a/jdk/.hg/store/00manifest.d and b/jdk/.hg/store/00manifest.d differ
diff --git a/jdk/.hg/store/00manifest.i b/jdk/.hg/store/00manifest.i
index b720b6f..cd85a83 100644
Binary files a/jdk/.hg/store/00manifest.i and b/jdk/.hg/store/00manifest.i differ
diff --git a/jdk/.hg/store/data/make/common/_defs-modules.gmk.i b/jdk/.hg/store/data/make/common/_defs-modules.gmk.i
index 302e93e..23a1761 100644
Binary files a/jdk/.hg/store/data/make/common/_defs-modules.gmk.i and b/jdk/.hg/store/data/make/common/_defs-modules.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_defs.gmk.i b/jdk/.hg/store/data/make/common/_defs.gmk.i
index e0b1874..52b5894 100644
Binary files a/jdk/.hg/store/data/make/common/_defs.gmk.i and b/jdk/.hg/store/data/make/common/_defs.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_modules.gmk.i b/jdk/.hg/store/data/make/common/_modules.gmk.i
index 3e86e6f..910b9ef 100644
Binary files a/jdk/.hg/store/data/make/common/_modules.gmk.i and b/jdk/.hg/store/data/make/common/_modules.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_rules.gmk.i b/jdk/.hg/store/data/make/common/_rules.gmk.i
index 2733ee0..b65d2de 100644
Binary files a/jdk/.hg/store/data/make/common/_rules.gmk.i and b/jdk/.hg/store/data/make/common/_rules.gmk.i differ
diff --git a/jdk/.hg/store/data/make/docs/_makefile.i b/jdk/.hg/store/data/make/docs/_makefile.i
index 649c3ae..e800ee7 100644
Binary files a/jdk/.hg/store/data/make/docs/_makefile.i and b/jdk/.hg/store/data/make/docs/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i b/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i
index d2951cb..c5c61cd 100644
Binary files a/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i and b/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i differ
diff --git a/jdk/.hg/store/data/make/modules/_makefile.i b/jdk/.hg/store/data/make/modules/_makefile.i
index b46ccd6..83dc25f 100644
Binary files a/jdk/.hg/store/data/make/modules/_makefile.i and b/jdk/.hg/store/data/make/modules/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/modules/jdk.depconfig.i b/jdk/.hg/store/data/make/modules/jdk.depconfig.i
index 1ef9c57..9c18ec2 100644
Binary files a/jdk/.hg/store/data/make/modules/jdk.depconfig.i and b/jdk/.hg/store/data/make/modules/jdk.depconfig.i differ
diff --git a/jdk/.hg/store/data/make/modules/modules.config.i b/jdk/.hg/store/data/make/modules/modules.config.i
index aaa220e..2595c7f 100644
Binary files a/jdk/.hg/store/data/make/modules/modules.config.i and b/jdk/.hg/store/data/make/modules/modules.config.i differ
diff --git a/jdk/.hg/store/data/make/modules/modules.group.i b/jdk/.hg/store/data/make/modules/modules.group.i
index ceb34f2..4c66917 100644
Binary files a/jdk/.hg/store/data/make/modules/modules.group.i and b/jdk/.hg/store/data/make/modules/modules.group.i differ
diff --git a/jdk/.hg/store/data/make/modules/modules.properties.i b/jdk/.hg/store/data/make/modules/modules.properties.i
index 6acb7e5..3b7cba9 100644
Binary files a/jdk/.hg/store/data/make/modules/modules.properties.i and b/jdk/.hg/store/data/make/modules/modules.properties.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/nbproject/project.properties.i b/jdk/.hg/store/data/make/tools/classanalyzer/nbproject/project.properties.i
index 9416bc4..d063924 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/nbproject/project.properties.i and b/jdk/.hg/store/data/make/tools/classanalyzer/nbproject/project.properties.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_annotated_dependency.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_annotated_dependency.java.i
index 0920fd5..a25ac6d 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_annotated_dependency.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_annotated_dependency.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_analyzer.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_analyzer.java.i
index d9c3d55..f02700d 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_analyzer.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_analyzer.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_list_writer.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_list_writer.java.i
index a3f395a..846e25c 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_list_writer.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_list_writer.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_path.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_path.java.i
index ef7631a..9348b58 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_path.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_path.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_dependence.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_dependence.java.i
new file mode 100644
index 0000000..646670e
Binary files /dev/null and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_dependence.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_jigsaw_module_builder.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_jigsaw_module_builder.java.i
index 017d87d..97caa2c 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_jigsaw_module_builder.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_jigsaw_module_builder.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module.java.i
index 03f9b92..b53a53b 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_builder.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_builder.java.i
index a53746d..56eca69 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_builder.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_builder.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_config.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_config.java.i
index 2c36918..01f730d 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_config.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_config.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_info.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_info.java.i
index dcc50df..943183e 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_info.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_info.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_package_info.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_package_info.java.i
index 5cccc79..b31dc91 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_package_info.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_package_info.java.i differ
diff --git a/jdk/.hg/store/data/src/share/bin/java.c.i b/jdk/.hg/store/data/src/share/bin/java.c.i
index f10a0d5..85382e4 100644
Binary files a/jdk/.hg/store/data/src/share/bin/java.c.i and b/jdk/.hg/store/data/src/share/bin/java.c.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/module/_dependence.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/module/_dependence.java.i
index 0e7c034..8c1fc52 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/module/_dependence.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/module/_dependence.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/module/_module_info.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/module/_module_info.java.i
index 2c37d69..bdf28fd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/module/_module_info.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/module/_module_info.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/module/_module_info_reader.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/module/_module_info_reader.java.i
index 2d054a5..ada72fa 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/module/_module_info_reader.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/module/_module_info_reader.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/module/_module_view.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/module/_module_view.java.i
new file mode 100644
index 0000000..94274e3
Binary files /dev/null and b/jdk/.hg/store/data/src/share/classes/java/lang/module/_module_view.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/module/_service_dependence.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/module/_service_dependence.java.i
new file mode 100644
index 0000000..5dfe74c
Binary files /dev/null and b/jdk/.hg/store/data/src/share/classes/java/lang/module/_service_dependence.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/module/_view_dependence.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/module/_view_dependence.java.i
new file mode 100644
index 0000000..ce8dd24
Binary files /dev/null and b/jdk/.hg/store/data/src/share/classes/java/lang/module/_view_dependence.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/reflect/_module.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/reflect/_module.java.i
index b790bf4..d8e6304 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/reflect/_module.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/reflect/_module.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/_resource_bundle.java.i b/jdk/.hg/store/data/src/share/classes/java/util/_resource_bundle.java.i
index 2b0e298..b0049e7 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/_resource_bundle.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/_resource_bundle.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_base_context.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_base_context.java.i
index 831cad1..64770e2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_base_context.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_base_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_boot_loader.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_boot_loader.java.i
index 64af6b5..6925dba 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_boot_loader.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_boot_loader.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_catalog.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_catalog.java.i
index 90e0cdb..83313f8 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_catalog.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_catalog.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_class_info.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_class_info.java.i
index 890db0e..362b484 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_class_info.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_class_info.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_configuration.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_configuration.java.i
index 86bec35..c36c954 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_configuration.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_configuration.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_configurator.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_configurator.java.i
index 81c7feb..963117a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_configurator.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_configurator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_context_builder.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_context_builder.java.i
index b8c80c8..6178af2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_context_builder.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_context_builder.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_context_set.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_context_set.java.i
index 4b2f10a..b76d6a8 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_context_set.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_context_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_hi.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_hi.java.i
index 209697c..8c61508 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_hi.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_hi.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_launcher.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_launcher.java.i
index cd10d03..314dd2c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_launcher.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_launcher.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_library.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_library.java.i
index 5722822..c571986 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_library.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_library.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_linker.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_linker.java.i
index 6efaae9..8559b58 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_linker.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_linker.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_linking_context.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_linking_context.java.i
index 174dd38..680b413 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_linking_context.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_linking_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_loader.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_loader.java.i
index 3caad1a..efcc490 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_loader.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_loader.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_loader_pool.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_loader_pool.java.i
index 9e93655..5250fe8 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_loader_pool.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_loader_pool.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_path_context.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_path_context.java.i
index ca164fa..05feac8 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_path_context.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_path_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_path_linker.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_path_linker.java.i
index 255c4df..f3af8a1 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_path_linker.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_path_linker.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_platform.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_platform.java.i
index c6ab0d2..ea34086 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_platform.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_platform.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_published_repository.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_published_repository.java.i
index 87880f6..fa4cd45 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_published_repository.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_published_repository.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_repository_catalog.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_repository_catalog.java.i
index 0b23b5a..6e85c4f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_repository_catalog.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_repository_catalog.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_resolution.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_resolution.java.i
index 4e7f542..7d38ed2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_resolution.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_resolution.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_resolver.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_resolver.java.i
index 027e263..bff6327 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_resolver.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_resolver.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i
index c3c3112..3102304 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_commands.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_commands.java.i
index 086a751..c95081f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_commands.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_commands.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i
index c7e9d7f..8d03a34 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/jca/_provider_config.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/jca/_provider_config.java.i
index 0870ca4..ca75877 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/jca/_provider_config.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/jca/_provider_config.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_main.java.i b/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_main.java.i
index 34a1db7..420247b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_main.java.i and b/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_main.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_module_info.java.i b/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_module_info.java.i
index 77233b2..67f2191 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_module_info.java.i and b/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_module_info.java.i differ
diff --git a/jdk/.hg/store/data/test/_makefile.i b/jdk/.hg/store/data/test/_makefile.i
index 5d4fade..0073108 100644
Binary files a/jdk/.hg/store/data/test/_makefile.i and b/jdk/.hg/store/data/test/_makefile.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/module/___module_info_reader.java.i b/jdk/.hg/store/data/test/java/lang/module/___module_info_reader.java.i
index 808c087..9417f60 100644
Binary files a/jdk/.hg/store/data/test/java/lang/module/___module_info_reader.java.i and b/jdk/.hg/store/data/test/java/lang/module/___module_info_reader.java.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/module/module-info-reader.sh.i b/jdk/.hg/store/data/test/java/lang/module/module-info-reader.sh.i
index 3e955ca..3deb890 100644
Binary files a/jdk/.hg/store/data/test/java/lang/module/module-info-reader.sh.i and b/jdk/.hg/store/data/test/java/lang/module/module-info-reader.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/___configurator.java.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/___configurator.java.i
index 8e3cd12..1cda5c1 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/___configurator.java.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/___configurator.java.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/___library.java.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/___library.java.i
index f8d6454..3e93878 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/___library.java.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/___library.java.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/___remote_repository.java.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/___remote_repository.java.i
index b1a2b49..685ada1 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/___remote_repository.java.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/___remote_repository.java.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/___remote_repository_list.java.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/___remote_repository_list.java.i
index b337d9a..b0cf9ca 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/___remote_repository_list.java.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/___remote_repository_list.java.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/___repository_catalog.java.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/___repository_catalog.java.i
index e1f0810..40d09d3 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/___repository_catalog.java.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/___repository_catalog.java.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/_configuration_builder.java.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/_configuration_builder.java.i
index 97d4acb..4356d85 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/_configuration_builder.java.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/_configuration_builder.java.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/_context_builder.java.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/_context_builder.java.i
index b1a7827..6d0865a 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/_context_builder.java.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/_context_builder.java.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/_mock_library.java.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/_mock_library.java.i
index 8ba0a9c..fefe7b1 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/_mock_library.java.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/_mock_library.java.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/_module_info_builder.java.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/_module_info_builder.java.i
index 8f249ed..9d4ef72 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/_module_info_builder.java.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/_module_info_builder.java.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/circular-deps.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/circular-deps.sh.i
index 6045807..c80140a 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/circular-deps.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/circular-deps.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/jmod-basic.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/jmod-basic.sh.i
index e00cacc..e94b890 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/jmod-basic.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/jmod-basic.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/signed-modular-jar.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/signed-modular-jar.sh.i
index b70c20e..0b0695c 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/signed-modular-jar.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/signed-modular-jar.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-jar.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-jar.sh.i
index 621ccf8..38479ce 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-jar.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-jar.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-native.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-native.sh.i
index 67405b1..272aae6 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-native.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-native.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-optional.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-optional.sh.i
index 5f23c29..b3e84a4 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-optional.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-optional.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-view.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-view.sh.i
new file mode 100644
index 0000000..421d63a
Binary files /dev/null and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-view.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello.sh.i
index 4e3a44e..fa5af0a 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/library.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/library.sh.i
index bbb9dcc..d718354 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/library.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/library.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/maze.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/maze.sh.i
index 8b2c0e4..9339479 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/maze.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/maze.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-base.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-base.sh.i
index 4069600..59dd8a3 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-base.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-base.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-deps.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-deps.sh.i
index 0c3c89e..ee76810 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-deps.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-deps.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-jaxp.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-jaxp.sh.i
index f6f4229..708bd31 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-jaxp.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-jaxp.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-reexport.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-reexport.sh.i
index 89c5ec0..972c697 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-reexport.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/optional-reexport.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/preinstall.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/preinstall.sh.i
index b9dce81..6b7c938 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/preinstall.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/preinstall.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/resolver.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/resolver.sh.i
index be2a7b8..0825eea 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/resolver.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/resolver.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/tester.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/tester.sh.i
index 1447c9a..c3e7dfe 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/tester.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/tester.sh.i differ
diff --git a/jdk/.hg/store/fncache b/jdk/.hg/store/fncache
index 76ebcc0..dd2dd7d 100644
--- a/jdk/.hg/store/fncache
+++ b/jdk/.hg/store/fncache
@@ -1,28 +1,27 @@
 data/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully_Stub.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_cs_CZ.properties.i
 data/test/sun/rmi/rmic/newrmic/equivalence/NotActivatableServerImpl.java.i
-data/test/java/nio/channels/FileChannel/Position.java.i
+data/test/java/lang/instrument/AInstrumentationTestCase.java.i
 data/src/share/classes/com/sun/tools/jdi/StratumLineInfo.java.i
 data/test/java/util/logging/LoggingNIOChange.java.i
 data/src/share/classes/sun/nio/cs/KOI8_U.java.i
 data/test/java/awt/FontClass/X11FontPathCrashTest.java.i
 data/src/share/classes/sun/nio/fs/Util.java.i
 data/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/Echo.java.i
-data/src/share/classes/sun/nio/cs/ext/MSISO2022JP.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthBorder.java.i
 data/src/share/native/common/verify_stub.c.i
 data/src/solaris/doc/sun/man/man1/tnameserv.1.i
 data/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java.i
-data/src/share/classes/sun/awt/EventQueueItem.java.i
+data/src/windows/classes/sun/nio/fs/WindowsUriSupport.java.i
 data/src/share/classes/java/nio/file/FileSystemAlreadyExistsException.java.i
 data/test/java/util/TimeZone/DaylightTimeTest.java.i
-data/test/sun/security/pkcs11/Provider/ConfigShortPath.java.i
+data/make/com/sun/java/browser/Makefile.i
 data/test/javax/script/E4XErrorTest.java.i
+data/src/share/classes/java/util/TreeMap.java.i
 data/src/share/classes/sun/misc/Launcher.java.i
+data/src/share/classes/java/lang/module/ServiceDependence.java.i
 data/test/java/rmi/transport/readTimeout/TestImpl.java.i
-data/test/sun/security/tools/policytool/UsePolicy.sh.i
-data/src/share/classes/sun/management/manifest.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ro_RO.properties.i
+data/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java.i
 data/test/java/beans/Statement/Test4530962.java.i
 data/test/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/OutputSink.java.i
@@ -30,7 +29,7 @@ data/src/share/sample/vm/clr-jvm/invoked.java.i
 data/src/share/classes/sun/tools/tree/AssignShiftRightExpression.java.i
 data/src/share/classes/java/security/Permission.java.i
 data/make/javax/swing/beaninfo/FILES.gmk.i
-data/src/solaris/native/sun/awt/awt_motif21.c.i
+data/src/share/instrument/JarFacade.c.i
 data/test/sun/security/tools/keytool/SecretKeyKS.jks.i
 data/test/java/rmi/server/RemoteObject/unrecognizedRefType/UnrecognizedRefType.java.i
 data/test/com/sun/jdi/Solaris32AndSolaris64Test.sh.i
@@ -48,24 +47,25 @@ data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properti
 data/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.sh.i
 data/src/share/classes/java/rmi/Naming.java.i
 data/make/java/nio/genCharsetProvider.sh.i
+data/src/share/classes/com/sun/media/sound/ModelStandardTransform.java.i
 data/test/sun/net/InetAddress/nameservice/dns/cname.sh.i
 data/test/java/io/pathNames/win32/bug6344646.java.i
-data/src/share/classes/sun/awt/image/ByteInterleavedRaster.java.i
-data/src/share/classes/javax/swing/JMenuBar.java.i
+data/src/share/native/sun/java2d/opengl/OGLBufImgOps.c.i
+data/test/javax/swing/MultiUIDefaults/4331767/bug4331767.java.i
 data/test/sun/security/x509/AlgorithmId/SHA256withECDSA.java.i
 data/src/share/classes/com/sun/tools/jdi/LockObject.java.i
 data/src/share/native/sun/font/layout/ThaiShaping.h.i
 data/test/com/sun/jdi/LocalVariableEqual.java.i
 data/test/com/sun/jdi/GetLocalVariables2Test.java.i
-data/src/share/classes/sun/net/www/protocol/http/InMemoryCookieStore.java.i
+data/src/share/classes/sun/font/FontFamily.java.i
+data/src/share/classes/javax/naming/ldap/UnsolicitedNotification.java.i
 data/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java.i
 data/test/tools/launcher/lib/i386/lib32/liblibrary.so.i
 data/src/share/classes/com/sun/tools/example/debug/gui/GUI.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libsoftokn3.so.i
 data/test/java/util/regex/POSIX_ASCII.java.i
 data/src/share/classes/javax/swing/text/LabelView.java.i
-data/src/share/classes/java/io/ObjectInput.java.i
-data/test/java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java.i
+data/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h.i
 data/src/share/classes/sun/tools/tree/BinaryEqualityExpression.java.i
 data/test/javax/swing/regtesthelpers/Util.java.i
 data/src/share/sample/jmx/jmx-scandir/src/etc/management.properties.i
@@ -75,20 +75,20 @@ data/src/share/classes/org/openjdk/jigsaw/BootLoader.java.i
 data/test/java/lang/Float/NaNInfinityParsing.java.i
 data/test/sun/security/krb5/tools/ktcheck.sh.i
 data/src/share/classes/org/relaxng/datatype/DatatypeStreamingValidator.java.i
-data/src/share/classes/javax/swing/ScrollPaneLayout.java.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ArgCheck.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_sv_SE.properties.i
 data/src/share/classes/sun/io/CharToByteCp1253.java.i
 data/make/netbeans/world/build.xml.i
 data/make/java/logging/Makefile.i
 data/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdSerialGC.sh.i
-data/test/java/beans/VetoableChangeSupport/1.6.0.ser.i
-data/src/windows/classes/sun/nio/fs/WindowsUriSupport.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapItem.java.i
+data/src/share/classes/sun/awt/EventQueueItem.java.i
 data/test/org/openjdk/jigsaw/cli/tsa-cert.pem.i
 data/src/share/classes/sun/java2d/loops/MaskFill.java.i
-data/src/share/classes/sun/tools/javac/resources/javac.properties.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java.i
-data/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java.i
+data/src/share/classes/sun/text/resources/CollationData_cs.java.i
+data/src/share/classes/sun/management/Util.java.i
 data/src/share/classes/com/sun/media/sound/ModelConnectionBlock.java.i
 data/src/share/classes/java/lang/doc-files/iota.gif.i
 data/src/share/classes/java/util/Collections.java.i
@@ -98,45 +98,46 @@ data/src/share/classes/javax/swing/text/html/HiddenTagView.java.i
 data/src/share/classes/sun/nio/ch/FileChannelImpl.java.i
 data/src/share/classes/javax/net/package.html.i
 data/make/tools/CharsetMapping/HKSCS_XP.map.i
-data/src/share/classes/sun/security/rsa/RSACore.java.i
+data/src/share/classes/sun/io/ByteToCharCp1147.java.i
 data/src/share/classes/sun/net/www/protocol/gopher/Handler.java.i
 data/test/java/net/URLClassLoader/HttpTest.java.i
+data/test/java/io/InputStreamReader/GrowAfterEOF.java.i
 data/test/demo/jvmti/hprof/HeapSitesTest.java.i
 data/src/share/classes/javax/xml/crypto/dsig/spec/package.html.i
 data/test/sun/net/www/protocol/file/FileURLTest.java.i
 data/src/share/classes/java/security/InvalidAlgorithmParameterException.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/HttpsURLConnectionLocalCertificateChain.java.i
+data/src/solaris/bin/ergo_i586.c.i
 data/src/share/classes/sun/tools/jstat/OutputFormatter.java.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java.i
 data/src/share/classes/java/awt/event/AdjustmentEvent.java.i
 data/src/share/sample/nio/server/DispatcherN.java.i
-data/src/share/native/sun/java2d/loops/FillParallelogram.c.i
 data/src/share/classes/sun/print/PrinterGraphicsConfig.java.i
+data/test/com/sun/security/auth/callback/DialogCallbackHandler/Default.java.i
 data/src/share/classes/com/sun/security/ntlm/Server.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S32Func.c.i
 data/src/share/classes/sun/io/CharToByteCp1254.java.i
 data/src/windows/native/sun/awt_common/awt_makecube.cpp.i
 data/make/tools/reorder/tools/util-sparcv9.il.i
+data/src/share/classes/sun/reflect/ConstructorAccessor.java.i
 data/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java.i
-data/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java.i
 data/src/share/classes/java/awt/doc-files/Button-1.gif.i
 data/src/solaris/instrument/EncodingSupport_md.c.i
 data/src/solaris/doc/sun/man/man1/ja/javap.1.i
 data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c.i
-data/src/windows/classes/sun/awt/windows/WTrayIconPeer.java.i
+data/src/share/native/sun/font/layout/GlyphPositionAdjustments.cpp.i
 data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties.i
 data/test/java/util/logging/LoggingMXBeanTest.java.i
 data/test/java/io/Serializable/nestedReplace/NestedReplace.java.i
 data/src/share/classes/com/sun/tracing/ProviderName.java.i
 data/src/share/classes/javax/sql/RowSetInternal.java.i
-data/src/share/classes/sun/text/resources/FormatData_hr_HR.java.i
-data/test/java/security/UnresolvedPermission/Equals.policy.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain0.txt.i
+data/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.storePass.i
 data/test/java/security/KeyRep/DESede.pre.1.5.key.i
 data/test/java/lang/module/module-info.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/EllipseShape.java.i
 data/src/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java.i
-data/src/share/classes/sun/tools/asm/StringExpressionConstantData.java.i
-data/test/java/nio/channels/DatagramChannel/ChangingAddress.java.i
+data/src/share/classes/com/sun/jdi/Mirror.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/ConstantPoolAnalyzer.java.i
 data/src/share/classes/com/sun/tracing/dtrace/FunctionName.java.i
 data/test/java/io/FileOutputStream/ManyFiles.java.i
 data/src/share/classes/java/awt/GradientPaint.java.i
@@ -148,11 +149,10 @@ data/src/share/native/sun/security/ec/ec2_aff.c.i
 data/test/sun/security/tools/keytool/StandardAlgName.sh.i
 data/src/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/GetPropertyAction.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java.i
 data/test/sun/tools/jps/jps-q_Output1.awk.i
 data/src/solaris/classes/sun/print/IPPPrintService.java.i
-data/src/share/classes/sun/tools/jconsole/resources/mbeanserverdelegate.gif.i
-data/test/java/net/URLClassLoader/closetest/CloseTest.java.i
+data/src/share/native/sun/java2d/loops/ByteBinary4Bit.c.i
+data/src/share/classes/java/net/Socket.java.i
 data/src/share/classes/sun/io/ByteToCharCp858.java.i
 data/src/share/classes/sun/awt/shell/DefaultShellFolder.java.i
 data/src/share/classes/javax/swing/text/html/CSS.java.i
@@ -161,7 +161,8 @@ data/test/java/rmi/reliability/benchmark/bench/serial/ShortArrays.java.i
 data/src/share/classes/java/lang/instrument/Instrumentation.java.i
 data/make/tools/CharsetMapping/IBM500.c2b.i
 data/test/javax/management/namespace/JMXNamespacesTest.java.i
-data/src/share/transport/shmem/shmemBase.h.i
+data/src/share/classes/java/util/prefs/NodeChangeEvent.java.i
+data/src/share/classes/sun/net/httpserver/HttpConnection.java.i
 data/src/share/classes/java/lang/Package.java.i
 data/make/tools/src/build/tools/fontchecker/FontChecker.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifSeparatorUI.java.i
@@ -172,12 +173,13 @@ data/src/share/classes/sun/security/provider/certpath/OCSP.java.i
 data/src/share/classes/javax/xml/crypto/XMLCryptoContext.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIColor.java.i
 data/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalMenuBarUI.java.i
 data/src/share/demo/jvmti/versionCheck/README.txt.i
 data/src/share/classes/sun/text/bidi/BidiBase.java.i
 data/src/share/classes/java/util/zip/InflaterOutputStream.java.i
+data/make/mkdemo/applets/SimpleGraph/Makefile.i
 data/src/share/classes/java/awt/PaintContext.java.i
 data/src/share/classes/java/awt/GridBagLayoutInfo.java.i
+data/src/share/classes/java/nio/Direct-X-Buffer.java.i
 data/src/share/classes/sun/rmi/rmic/Util.java.i
 data/test/com/sun/jdi/JITDebug.sh.i
 data/src/share/classes/javax/sql/rowset/spi/package.html.i
@@ -185,52 +187,48 @@ data/src/share/classes/java/net/ProtocolException.java.i
 data/test/java/awt/Mixing/OpaqueTest.java.i
 data/src/share/classes/javax/swing/text/html/Option.java.i
 data/src/share/classes/com/sun/tools/attach/AgentLoadException.java.i
+data/test/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html.i
 data/src/share/classes/javax/swing/colorchooser/ColorModelHSL.java.i
 data/src/windows/classes/sun/awt/windows/awtLocalization_pt_BR.properties.i
 data/test/java/rmi/activation/Activatable/downloadParameterClass/rmid.security.policy.i
 data/src/share/classes/java/lang/invoke/MemberName.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain1.txt.i
 data/src/share/classes/com/sun/rowset/internal/Row.java.i
 data/src/share/classes/java/beans/PropertyChangeListenerProxy.java.i
 data/test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientTimeout.java.i
+data/test/com/sun/jndi/ldap/ReadTimeoutTest.java.i
 data/src/share/classes/com/sun/management/ThreadMXBean.java.i
+data/test/java/io/Serializable/ClassCastExceptionDetail/Read.java.i
 data/src/share/native/sun/java2d/loops/IntRgbx.h.i
 data/make/tools/swing-beans/beaninfo/images/JSplitPaneMono16.gif.i
 data/make/javax/crypto/policy/unlimited/UNLIMITED.i
 data/src/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java.i
 data/src/share/classes/sun/util/resources/TimeZoneNames_es.java.i
 data/test/java/lang/invoke/PermuteArgsTest.java.i
-data/test/com/sun/crypto/provider/TLS/prfdata.txt.i
 data/src/share/classes/sun/nio/fs/NativeBuffer.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java.i
+data/src/share/native/sun/security/ec/mpprime.h.i
 data/src/solaris/classes/sun/awt/motif/MListPeer.java.i
-data/make/tools/winver/Makefile.i
-data/src/share/classes/sun/security/action/GetBooleanAction.java.i
-data/src/share/classes/sun/java2d/opengl/OGLBufImgOps.java.i
-data/test/java/lang/instrument/ExampleForClassPath.java.i
-data/test/java/io/Serializable/proxy/replace/ReadResolve.java.i
+data/test/sun/security/krb5/runNameEquals.sh.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleConfig.java.i
+data/test/java/util/concurrent/ExecutorCompletionService/LoopHelpers.java.i
 data/test/java/util/jar/JarInputStream/signed.jar.i
 data/test/java/util/BitSet/ImportExport.java.i
 data/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java.i
 data/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh.i
 data/src/share/native/com/sun/java/util/jar/pack/bands.h.i
-data/test/java/nio/channels/Selector/ConnectWrite.java.i
-data/test/java/rmi/activation/Activatable/restartLatecomer/rmid.security.policy.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S32Func.c.i
+data/test/java/lang/Boolean/Factory.java.i
 data/src/share/classes/sun/tools/jstat/HeaderClosure.java.i
-data/src/share/classes/java/io/LineNumberReader.java.i
 data/src/share/classes/sun/util/resources/CalendarData_ru.properties.i
-data/test/java/io/Serializable/superclassDataLoss/run.sh.i
 data/test/java/security/Signature/SignWithOutputBuffer.java.i
 data/test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html.i
 data/make/tools/CharsetMapping/IBM037.map.i
+data/test/com/sun/net/httpserver/bugs/B6744329.java.i
 data/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java.i
 data/make/tools/hasher_classes/Makefile.i
 data/make/jpda/back/Makefile.i
 data/src/share/classes/javax/naming/package.html.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments.java.i
 data/src/share/classes/sun/rmi/log/LogHandler.java.i
-data/make/java/nio/reorder-sparcv9.i
 data/src/share/classes/sun/util/resources/CurrencyNames_vi_VN.properties.i
 data/src/windows/classes/sun/awt/windows/WInputMethod.java.i
 data/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties.i
@@ -250,29 +248,31 @@ data/test/java/io/File/ListSpace.java.i
 data/test/javax/management/relation/RelationNotificationSeqNoTest.java.i
 data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemMono16.gif.i
 data/src/share/classes/com/sun/jmx/snmp/internal/SnmpMsgProcessingSubSystem.java.i
-data/src/share/classes/javax/sound/midi/Patch.java.i
+data/src/share/classes/javax/management/event/FetchingEventForwarder.java.i
 data/test/sun/tools/jstat/jstatPrintCompilationOutput1.sh.i
 data/src/solaris/native/sun/awt/awt_List.c.i
 data/test/javax/management/proxy/NotificationEmitterProxy.java.i
-data/src/share/classes/sun/text/resources/FormatData_ja_JP_JP.java.i
+data/src/share/classes/sun/rmi/transport/Transport.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java.i
 data/src/solaris/native/sun/awt/canvas.c.i
 data/src/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java.i
 data/src/share/sample/vm/jvm-clr/invokerExp.h.i
-data/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing_Stub.java.i
-data/src/windows/native/sun/windows/awt_TrayIcon.cpp.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorTypeException.java.i
+data/test/java/rmi/activation/Activatable/restartService/RestartService.java.i
 data/make/sun/headless/reorder-sparc.i
-data/make/sun/awt/mapfile-mawt-vers.i
+data/src/share/native/sun/font/layout/TibetanLayoutEngine.h.i
 data/src/share/classes/sun/security/krb5/KrbApReq.java.i
 data/test/java/nio/file/etc/Exceptions.java.i
 data/test/sun/nio/cs/OLD/IBM939_OLD.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/LayerContainer.java.i
 data/test/sun/security/krb5/auto/KDC.java.i
 data/make/templates/bsd-header.i
 data/src/share/classes/com/sun/jdi/Locatable.java.i
 data/test/sun/security/provider/PolicyFile/SomeExtensionClass.java.i
 data/src/share/classes/com/sun/tools/hat/internal/parser/ReadBuffer.java.i
+data/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java.i
-data/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h.i
+data/src/share/classes/sun/tools/jconsole/manifest.i
 data/src/share/classes/javax/swing/GroupLayout.java.i
 data/src/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java.i
@@ -283,19 +283,20 @@ data/test/java/nio/channels/FileChannel/Args.java.i
 data/src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java.i
 data/make/javax/sound/mapfile-vers.i
 data/src/share/classes/java/lang/annotation/Inherited.java.i
+data/test/java/lang/Class/forName/classes/3.class.i
+data/make/tools/jarsplit/Makefile.i
 data/test/javax/management/loading/ArrayClassTest.java.i
-data/test/sun/rmi/runtime/Log/6409194/logging.properties.i
-data/src/solaris/classes/sun/awt/X11/XDesktopPeer.java.i
+data/src/share/classes/javax/management/MXBean.java.i
 data/make/com/sun/org/apache/xml/Makefile.i
 data/src/share/classes/java/lang/reflect/ReflectAccess.java.i
-data/test/java/security/Provider/SupportsParameter.java.i
+data/make/tools/CharsetMapping/IBM970.map.i
 data/src/share/classes/java/security/SecureRandom.java.i
 data/test/com/sun/jdi/EvalArgs.sh.i
 data/test/java/io/etc/FailingFlushAndClose.java.i
 data/test/java/security/cert/CertificateFactory/openssl/pem.i
 data/src/share/classes/sun/security/validator/SimpleValidator.java.i
 data/src/share/native/sun/security/ec/secitem.c.i
-data/src/share/classes/com/sun/jmx/mbeanserver/DescriptorCache.java.i
+data/src/share/classes/java/util/concurrent/ForkJoinTask.java.i
 data/src/share/classes/javax/management/timer/TimerNotification.java.i
 data/src/share/classes/sun/text/resources/FormatData_es_BO.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ar_MA.properties.i
@@ -303,26 +304,21 @@ data/make/javax/crypto/policy/limited/default_local.policy.i
 data/src/share/native/java/lang/ResourceBundle.c.i
 data/src/share/classes/javax/print/attribute/AttributeSet.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/SignerOutputStream.java.i
-data/src/share/native/sun/awt/medialib/mlib.h.i
-data/make/tools/swing-beans/beaninfo/images/JScrollPaneColor32.gif.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputImageTests.java.i
 data/src/share/classes/sun/text/resources/CollationData_it.java.i
 data/src/share/classes/java/lang/invoke/MethodHandleNatives.java.i
 data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub_Stub.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvVersion.c.i
-data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java.i
+data/test/demo/jvmti/hprof/HeapDumpTest.java.i
 data/src/share/classes/sun/misc/resources/Messages_pt_BR.java.i
 data/src/share/classes/javax/crypto/interfaces/package.html.i
-data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.chk.i
-data/test/java/rmi/server/RMIClassLoader/spi/TestProvider.java.i
+data/src/share/classes/java/sql/DataTruncation.java.i
 data/src/share/classes/sun/text/ComposedCharIter.java.i
-data/test/java/net/Socket/AccurateTimeout.java.i
 data/test/java/net/ipv6tests/B6521014.java.i
-data/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.java.i
 data/src/share/classes/sun/launcher/resources/launcher_es.properties.i
 data/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java.i
 data/src/share/classes/sun/security/jca/ProviderList.java.i
-data/src/share/classes/sun/security/pkcs10/PKCS10Attributes.java.i
-data/test/java/util/AbstractMap/SimpleEntries.java.i
+data/src/share/classes/java/lang/TypeNotPresentException.java.i
 data/test/org/openjdk/jigsaw/hello-native.sh.i
 data/test/sun/security/provider/PolicyParser/ExtDirs2.policy.i
 data/test/java/util/ResourceBundle/Bug4168625Getter.java.i
@@ -331,11 +327,12 @@ data/src/share/demo/jvmti/hprof/README.txt.i
 data/test/javax/swing/JInternalFrame/Test6802868.java.i
 data/src/share/classes/javax/sql/rowset/spi/TransactionalWriter.java.i
 data/src/share/classes/sun/rmi/rmic/newrmic/Main.java.i
-data/test/javax/swing/MultiUIDefaults/4331767/bug4331767.java.i
+data/src/share/classes/sun/awt/image/ByteInterleavedRaster.java.i
 data/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java.i
 data/src/share/classes/java/util/concurrent/locks/AbstractOwnableSynchronizer.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_hi_IN.properties.i
+data/test/javax/swing/JTabbedPane/6670274/bug6670274.java.i
 data/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java.i
 data/make/com/sun/security/auth/module/FILES_java.gmk.i
 data/test/java/net/ipv6tests/ScopeTests.java.i
@@ -350,19 +347,16 @@ data/src/windows/native/java/io/FileInputStream_md.c.i
 data/test/com/sun/jndi/ldap/InvalidLdapFilters.java.i
 data/make/tools/src/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java.i
 data/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java.i
-data/test/javax/xml/crypto/dsig/data/signature.xml.i
+data/src/share/classes/sun/tools/tree/PreIncExpression.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/InputListener.java.i
 data/test/java/lang/invoke/6998541/Test6998541.java.i
-data/src/share/native/sun/awt/image/jpeg/jdhuff.h.i
+data/src/share/classes/javax/print/attribute/standard/Sides.java.i
 data/test/java/lang/StringCoding/locales.txt.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadZeroBytes.java.i
 data/test/sun/rmi/rmic/newrmic/equivalence/AppleUser.java.i
-data/test/java/awt/dnd/ImageDecoratedDnD/DnDTarget.java.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmThreadingMetaImpl.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplds4.so.i
 data/src/share/classes/sun/tools/jar/JarVerifierStream.java.i
-data/src/solaris/instrument/FileSystemSupport_md.c.i
 data/src/share/sample/scripting/scriptpad/build.properties.i
 data/src/share/classes/javax/imageio/stream/FileImageInputStream.java.i
 data/src/share/lib/cmm/lcms/PYCC.pf.i
@@ -374,28 +368,27 @@ data/make/mkdemo/jni/Poller/Makefile.i
 data/src/share/native/sun/awt/image/jpeg/jerror.h.i
 data/src/share/classes/sun/tools/tree/MethodExpression.java.i
 data/test/java/io/PipedWriter/WriteAfterReaderClose.java.i
+data/test/java/nio/charset/spi/charsetProvider.sp.i
 data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Solaris_Encoder.java.i
-data/test/java/util/PluggableLocale/CurrencyNameProviderTest.sh.i
 data/src/share/classes/com/sun/tools/jdi/ClassObjectReferenceImpl.java.i
-data/src/share/classes/sun/java2d/pipe/ParallelogramPipe.java.i
-data/test/java/util/ResourceBundle/Control/BadControlsTest.java.i
 data/src/share/classes/sun/font/FontManagerForSGE.java.i
 data/src/share/classes/overview-core.html.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java.i
 data/test/javax/imageio/plugins/jpeg/ReadingInterruptionTest.java.i
-data/test/javax/management/ObjectInstance/MBeanInfoFailTest.java.i
+data/src/share/classes/com/sun/jndi/toolkit/dir/ContainmentFilter.java.i
 data/test/sun/security/x509/GeneralName/Encode.java.i
 data/test/java/beans/Introspector/4168475/infos/ComponentBeanInfo.java.i
 data/test/java/rmi/MarshalledObject/compare/makeAnnotatedRef.i
 data/src/share/native/sun/awt/image/dither.h.i
 data/src/share/classes/com/sun/tools/hat/internal/util/Misc.java.i
-data/test/sun/net/www/httptest/AbstractCallback.java.i
+data/make/tools/swing-beans/beaninfo/images/JFileChooserColor16.gif.i
+data/src/windows/native/sun/jkernel/DownloadHelper.h.i
 data/make/com/sun/security/auth/module/mapfile-vers.i
-data/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java.i
-data/src/share/classes/sun/java2d/pipe/Region.java.i
-data/test/sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java.i
+data/make/tools/swing-beans/beaninfo/SwingBeanInfoBase.java.i
 data/src/share/classes/java/sql/SQLException.java.i
 data/src/windows/native/sun/windows/awt_Palette.h.i
-data/test/com/sun/jndi/cosnaming/CNNameParser.java.i
+data/src/share/classes/sun/management/counter/perf/ByteArrayCounterSnapshot.java.i
 data/src/share/classes/javax/naming/directory/Attributes.java.i
 data/test/com/sun/jdi/NativeInstanceFilter.java.i
 data/test/java/io/Serializable/enum/missingConstant/Write.java.i
@@ -404,78 +397,79 @@ data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Util.h.i
 data/src/share/classes/java/security/cert/CertPathValidatorResult.java.i
 data/test/sun/management/jmxremote/bootstrap/ssl/truststore.i
 data/src/share/classes/javax/xml/crypto/dsig/XMLObject.java.i
+data/test/com/sun/jdi/FieldWatchpoints.java.i
+data/src/solaris/classes/sun/awt/X11GraphicsConfig.java.i
 data/src/linux/doc/man/ja/java.1.i
 data/src/share/back/outStream.h.i
 data/test/java/rmi/activation/Activatable/inactiveGroup/group.security.policy.i
 data/src/share/classes/javax/swing/plaf/basic/icons/image-failed.png.i
 data/src/share/classes/com/sun/jdi/FloatValue.java.i
-data/test/sun/security/provider/PolicyParser/ExtDirsA.java.i
+data/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java.i
 data/test/java/nio/channels/Channels/ReadByte.java.i
 data/src/share/classes/sun/net/www/http/ChunkedOutputStream.java.i
 data/make/sun/image/vis/Makefile.i
 data/src/share/classes/java/security/interfaces/RSAPrivateKey.java.i
 data/src/share/classes/java/rmi/activation/ActivationMonitor.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthConstants.java.i
+data/src/share/classes/java/math/BigDecimal.java.i
 data/src/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java.i
 data/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java.i
 data/src/share/native/java/lang/fdlibm/src/e_remainder.c.i
 data/src/share/classes/javax/print/attribute/standard/Destination.java.i
+data/make/tools/CharsetMapping/IBM933.map.i
 data/src/share/classes/sun/nio/fs/PollingWatchService.java.i
 data/src/share/native/sun/awt/libpng/pngwrite.c.i
+data/test/javax/xml/crypto/dsig/data/certs/lugh.crt.i
 data/src/share/classes/javax/management/ManagedOperation.java.i
-data/test/sun/security/pkcs11/MessageDigest/ReinitDigest.java.i
-data/test/java/lang/ClassLoader/deadlock/SupAlice.java.i
-data/test/java/util/ServiceLoader/FooService.java.i
 data/src/share/classes/sun/security/x509/X509CRLImpl.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.dtd.i
 data/src/share/demo/jfc/TransparentRuler/README.txt.i
 data/src/share/classes/sun/audio/AudioStreamSequence.java.i
-data/test/com/sun/crypto/provider/Mac/HmacSaltLengths.java.i
 data/src/share/classes/sun/text/resources/FormatData_ar_EG.java.i
 data/test/java/lang/StringBuffer/Substring.java.i
 data/src/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java.i
-data/test/javax/management/remote/mandatory/passwordAccessFile/access.properties.i
-data/src/share/classes/sun/io/ByteToCharMacCyrillic.java.i
+data/src/share/classes/com/sun/jmx/remote/internal/package.html.i
+data/src/share/classes/java/util/AbstractSet.java.i
+data/src/share/native/sun/java2d/loops/DrawParallelogram.c.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIFont.java.i
 data/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher.i
 data/src/share/back/StackFrameImpl.c.i
 data/src/share/classes/java/util/concurrent/BlockingQueue.java.i
 data/src/share/doc/stub/java/rmi/activation/ActivationGroup_Stub.java.i
 data/src/share/classes/sun/tools/jstat/DescendingMonitorComparator.java.i
+data/src/solaris/classes/sun/nio/ch/NativeThread.java.i
 data/src/linux/doc/man/ja/rmid.1.i
 data/test/com/sun/crypto/provider/Cipher/PBE/PBEKeyTest.java.i
 data/src/solaris/native/sun/awt/awt_Event.c.i
 data/test/javax/imageio/plugins/gif/EncodeSubImageTest.java.i
+data/test/java/rmi/testlibrary/ActivationLibrary.java.i
 data/src/share/classes/sun/rmi/server/InactiveGroupException.java.i
 data/src/share/classes/javax/imageio/IIOImage.java.i
 data/src/share/classes/sun/nio/ch/DevPollSelectorProvider.java.i
 data/src/share/lib/security/java.security-windows.i
+data/test/java/awt/Modal/NpeOnClose/NpeOnCloseTest.java.i
 data/src/share/classes/sun/tools/asm/TryData.java.i
 data/make/modules/tools/src/com/sun/classanalyzer/DependencyConfig.java.i
 data/src/share/classes/javax/swing/AbstractButton.java.i
 data/test/java/util/zip/ZipFile/LargeZipFile.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_fr_CA.properties.i
+data/test/java/io/Reader/OpsAfterClose.java.i
 data/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java.i
 data/src/share/classes/sun/java2d/loops/BlitBg.java.i
 data/test/java/awt/Mixing/HWDisappear.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_tr.properties.i
 data/src/share/classes/java/awt/image/BufferedImageFilter.java.i
-data/src/share/classes/sun/invoke/util/BytecodeDescriptor.java.i
 data/src/share/classes/java/net/CacheResponse.java.i
 data/src/share/classes/sun/text/resources/CollationData_ar.java.i
-data/test/java/util/BitSet/StickySize.java.i
+data/src/share/classes/sun/tools/tree/Statement.java.i
 data/test/javax/swing/JFileChooser/6713352/bug6713352.java.i
 data/src/solaris/classes/sun/awt/X11/XIconWindow.java.i
-data/src/share/classes/sun/util/calendar/ImmutableGregorianDate.java.i
+data/src/share/classes/java/net/Inet4Address.java.i
+data/src/solaris/doc/sun/man/man1/pack200.1.i
 data/src/share/classes/com/sun/tools/jdi/EventQueueImpl.java.i
 data/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.html.i
-data/src/share/classes/sun/security/x509/IPAddressName.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ArgCheck.java.i
-data/test/java/util/concurrent/ConcurrentLinkedQueue/LoopHelpers.java.i
+data/src/share/classes/sun/util/locale/LocaleObjectCache.java.i
 data/make/tools/swing-beans/beaninfo/images/JDialogMono16.gif.i
-data/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html.i
-data/test/javax/management/eventService/UsingEventService.java.i
+data/src/share/instrument/PathCharsValidator.c.i
 data/src/share/classes/sun/misc/resources/Messages_ko.java.i
+data/make/netbeans/README.i
 data/src/share/classes/javax/swing/ActionMap.java.i
 data/src/solaris/classes/sun/awt/X11/XButtonPeer.java.i
 data/src/share/classes/javax/management/Notification.java.i
@@ -484,10 +478,8 @@ data/make/sun/font/reorder-sparc.i
 data/src/share/classes/sun/java2d/loops/DrawPolygons.java.i
 data/src/share/classes/sun/security/krb5/KrbAsRep.java.i
 data/src/share/classes/com/sun/rowset/internal/WebRowSetXmlReader.java.i
-data/test/java/text/Format/DateFormat/Bug6683975.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/package.html.i
 data/src/solaris/native/java/io/FileOutputStream_md.c.i
-data/test/java/awt/Graphics2D/DrawString/RotTransText.java.i
-data/test/javax/script/RhinoExceptionTest.java.i
 data/src/share/classes/javax/imageio/IIOParamController.java.i
 data/src/share/classes/java/lang/InheritableThreadLocal.java.i
 data/src/share/classes/javax/security/auth/Subject.java.i
@@ -500,9 +492,9 @@ data/src/share/classes/sun/reflect/generics/scope/ConstructorScope.java.i
 data/src/share/classes/javax/management/relation/RelationTypeNotFoundException.java.i
 data/make/sun/tracing/dtrace/Makefile.i
 data/src/share/classes/sun/reflect/UnsafeShortFieldAccessorImpl.java.i
+data/make/mkdemo/jvmti/mtrace/Makefile.i
 data/src/share/classes/sun/io/ByteToCharMacHebrew.java.i
-data/src/windows/native/sun/windows/awt_DataTransferer.cpp.i
-data/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c.i
+data/src/solaris/classes/sun/awt/X11/XKeySymConstants.java.i
 data/src/share/native/sun/java2d/loops/FourByteAbgrPre.c.i
 data/src/share/classes/sun/security/krb5/internal/Ticket.java.i
 data/src/solaris/native/sun/awt/wsutils.h.i
@@ -513,17 +505,17 @@ data/src/share/native/sun/awt/utility/rect.c.i
 data/test/java/io/InputStreamReader/ReadOffset.java.i
 data/src/share/classes/java/dyn/SwitchPoint.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.c.i
-data/src/share/classes/sun/tools/jconsole/Plotter.java.i
+data/src/share/classes/sun/print/CustomMediaTray.java.i
 data/src/share/classes/java/awt/FontMetrics.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/icons/Inform.gif.i
 data/src/share/classes/com/sun/crypto/provider/CipherWithWrappingSpi.java.i
-data/src/share/classes/sun/text/resources/FormatData_en.java.i
-data/test/java/security/KeyRep/SerialDSAPubKey.policy.i
-data/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet_Stub.java.i
+data/test/java/security/cert/CertPath/Serialize.java.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/upFolder.gif.i
+data/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java.i
+data/src/share/classes/com/sun/beans/decoder/DoubleElementHandler.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMBean.java.i
 data/src/share/classes/sun/management/HotspotMemory.java.i
-data/src/share/classes/javax/swing/plaf/basic/icons/image-delayed.png.i
+data/test/javax/management/remote/mandatory/connectorServer/ForwarderChainTest.java.i
 data/src/share/classes/sun/tools/tree/NotEqualExpression.java.i
 data/src/share/classes/java/util/zip/Checksum.java.i
 data/test/java/lang/Class/asSubclass/BasicUnit.java.i
@@ -535,29 +527,29 @@ data/src/share/classes/javax/swing/JTable.java.i
 data/src/share/demo/jfc/Metalworks/ContrastMetalTheme.java.i
 data/src/windows/hpi/include/threads_md.h.i
 data/src/share/classes/sun/io/CharToByteISO8859_13.java.i
-data/src/share/classes/com/sun/crypto/provider/DESedeKey.java.i
+data/src/share/classes/com/sun/media/sound/AuFileWriter.java.i
 data/src/share/classes/com/sun/beans/decoder/TrueElementHandler.java.i
 data/src/share/classes/sun/io/CharToByteCp1098.java.i
-data/test/sun/tools/jstat/gcOldCapacityOutput1.awk.i
+data/src/solaris/classes/sun/nio/fs/SolarisFileStore.java.i
 data/test/java/beans/XMLEncoder/javax_swing_border_SoftBevelBorder.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputImageTests.java.i
 data/test/sun/rmi/rmic/minimizeWrapperInstances/Test.java.i
 data/test/java/io/Serializable/subclass/AbstractObjectInputStream.java.i
 data/src/share/classes/sun/io/CharToByteASCII.java.i
 data/test/java/lang/Class/getMethod/Exceptions.java.i
 data/test/java/dyn/JavaDocExamples.java.i
-data/src/share/native/sun/awt/medialib/mlib_image.h.i
 data/src/share/classes/sun/text/normalizer/CharTrie.java.i
 data/make/tools/swing-beans/beaninfo/images/JTableColor16.gif.i
-data/src/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/Dependence.java.i
 data/src/share/classes/java/security/cert/CertPathBuilderResult.java.i
-data/src/share/classes/sun/io/CharToByteCp1381.java.i
+data/src/linux/doc/man/DO_NOT_EDIT--GENERATED_FILES.i
 data/src/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java.i
 data/src/share/classes/sun/util/resources/LocaleData.java.i
-data/src/share/classes/sun/rmi/log/ReliableLog.java.i
-data/make/modules/bootmodule.roots.i
 data/test/tools/pack200/pack200-verifier/data/golden.jar.d
 data/src/share/classes/javax/swing/text/InternationalFormatter.java.i
-data/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java.i
+data/src/share/native/sun/awt/libpng/pngwtran.c.i
+data/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java.i
+data/test/java/io/BufferedInputStream/CountUpdate.java.i
 data/test/javax/management/remote/mandatory/connection/GetConnectionTest.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties.i
 data/test/sun/misc/Hello.class.i
@@ -568,7 +560,7 @@ data/test/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.java.i
 data/test/java/nio/file/Path/Misc.java.i
 data/src/windows/classes/sun/java2d/windows/GDIBlitLoops.java.i
 data/src/share/native/com/sun/java/util/jar/pack/constants.h.i
-data/test/java/net/Socket/asyncClose/DatagramSocket_receive.java.i
+data/src/windows/native/sun/windows/awt_Cursor.cpp.i
 data/test/sun/java2d/GdiRendering/InsetClipping.java.i
 data/make/sun/javazic/tzdata/northamerica.i
 data/src/share/classes/javax/sound/sampled/LineUnavailableException.java.i
@@ -576,15 +568,14 @@ data/test/java/util/PriorityQueue/PriorityQueueSort.java.i
 data/src/share/native/sun/awt/image/jpeg/jdinput.c.i
 data/src/share/classes/java/security/Security.java.i
 data/src/share/classes/sun/nio/cs/ext/DBCS_ONLY_IBM_EBCDIC_Decoder.java.i
-data/src/share/classes/java/awt/doc-files/RadialGradientPaint-2.png.i
-data/test/com/sun/jdi/StepTest.java.i
+data/make/tools/README.txt.i
+data/src/share/native/sun/java2d/loops/AnyInt.c.i
 data/src/share/classes/sun/text/resources/FormatData_in.java.i
 data/test/java/rmi/server/UnicastRemoteObject/unexportObject/Ping.java.i
 data/src/share/classes/sun/security/jgss/spnego/SpNegoMechFactory.java.i
 data/src/share/classes/com/sun/tools/jconsole/JConsoleContext.java.i
 data/src/share/classes/javax/swing/BoundedRangeModel.java.i
-data/src/share/classes/com/sun/crypto/provider/HmacSHA1.java.i
-data/make/README.i
+data/src/share/classes/org/openjdk/internal/joptsimple/internal/Reflection.java.i
 data/src/share/classes/javax/naming/ldap/UnsolicitedNotificationEvent.java.i
 data/src/share/classes/javax/print/attribute/standard/Chromaticity.java.i
 data/src/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java.i
@@ -592,34 +583,34 @@ data/src/share/classes/sun/awt/WindowAccessor.java.i
 data/src/share/classes/sun/rmi/transport/proxy/RMIDirectSocketFactory.java.i
 data/src/share/classes/sun/font/FontManagerNativeLibrary.java.i
 data/src/share/classes/com/sun/security/auth/login/ConfigFile.java.i
-data/src/solaris/native/sun/awt/awt_Label.c.i
 data/src/share/classes/java/nio/Bits.java.i
 data/src/share/classes/sun/dyn/empty/Empty.java.i
-data/test/sun/nio/cs/LatinCharReplacementTWTest.java.i
+data/src/share/classes/sun/security/krb5/KrbKdcReq.java.i
 data/src/share/classes/javax/swing/text/SegmentCache.java.i
 data/test/java/lang/Runtime/exec/LotsOfDestroys.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ServerHandler.java.i
 data/make/java/nio/genBuffer.sh.i
-data/src/solaris/classes/sun/awt/X11/XMouseInfoPeer.java.i
+data/src/share/classes/com/sun/nio/sctp/InvalidStreamException.java.i
 data/src/windows/native/java/net/NetworkInterface_winXP.c.i
 data/test/java/nio/file/Files/TemporaryFiles.java.i
 data/src/share/classes/java/rmi/registry/package.html.i
 data/src/share/demo/applets/MoleculeViewer/Matrix3D.java.i
+data/test/java/beans/PropertyEditor/TestFloatTypeJava.java.i
 data/src/share/classes/sun/tools/tree/Vset.java.i
 data/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java.i
 data/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c.i
+data/src/share/native/sun/font/layout/GlyphDefinitionTables.h.i
 data/src/share/classes/sun/java2d/loops/XORComposite.java.i
 data/src/share/classes/javax/swing/DefaultBoundedRangeModel.java.i
-data/make/tools/swing-beans/beaninfo/images/JLabelColor16.gif.i
+data/test/java/util/concurrent/ConcurrentLinkedQueue/LoopHelpers.java.i
 data/test/javax/management/monitor/RuntimeExceptionTest.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_sk_SK.properties.i
-data/test/java/nio/file/attribute/PosixFileAttributeView/Basic.java.i
+data/src/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java.i
+data/make/modules/tools/src/com/sun/classanalyzer/CheckDeps.java.i
+data/src/share/classes/sun/text/resources/CollationData_bg.java.i
 data/test/sun/security/krb5/ktab/KeyString.java.i
 data/src/share/classes/javax/crypto/Cipher.java.i
 data/src/share/classes/sun/net/ConnectionResetException.java.i
 data/src/solaris/native/sun/awt/awt_MenuBar.h.i
 data/src/share/classes/sun/tools/java/ScannerInputReader.java.i
-data/test/javax/management/remote/mandatory/connectorServer/ForwarderChainTest.java.i
 data/src/windows/native/sun/windows/awt_AWTEvent.cpp.i
 data/src/share/classes/sun/swing/StringUIClientPropertyKey.java.i
 data/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java.i
@@ -628,41 +619,39 @@ data/src/share/classes/java/lang/doc-files/capupsil.gif.i
 data/src/share/native/sun/security/ec/impl/oid.c.i
 data/test/sun/net/www/protocol/http/SetChunkedStreamingMode.java.i
 data/src/share/bin/wildcard.h.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java.i
 data/src/share/classes/sun/nio/cs/ext/META-INF/services/java.nio.charset.spi.CharsetProvider.i
+data/src/share/classes/sun/tools/jconsole/inspector/IconManager.java.i
 data/src/share/classes/java/rmi/RemoteException.java.i
 data/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java.i
 data/src/share/native/sun/awt/image/jpeg/jmemnobs.c.i
 data/test/sun/util/resources/TimeZone/Bug4938846.java.i
 data/make/java/java_hprof_demo/mapfile-vers.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapInterestedHost.java.i
-data/src/solaris/doc/sun/man/man1/extcheck.1.i
 data/src/share/classes/com/sun/jdi/VMOutOfMemoryException.java.i
 data/test/com/sun/jdi/TwoThreadsTest.java.i
 data/test/java/net/Authenticator/AuthNPETest.java.i
 data/src/share/classes/java/awt/WaitDispatchSupport.java.i
-data/src/share/classes/sun/text/resources/FormatData_mk_MK.java.i
+data/src/share/classes/javax/swing/text/rtf/charsets/cpg850.txt.i
 data/src/share/classes/javax/net/ssl/X509ExtendedTrustManager.java.i
-data/test/java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java.i
+data/test/sun/net/www/protocol/http/WebGet.java.i
 data/src/solaris/classes/sun/awt/X11/WindowDimensions.java.i
-data/src/share/classes/com/sun/tools/script/shell/Main.java.i
+data/src/share/classes/javax/accessibility/Accessible.java.i
 data/test/java/util/zip/LargeZip.java.i
+data/make/tools/src/build/tools/generatecharacter/CharacterScript.java.i
 data/test/java/io/Reader/SkipInput.txt.i
 data/make/tools/CharsetMapping/MS950.nr.i
-data/test/com/sun/security/sasl/PropertiesFileCallbackHandler.java.i
 data/src/share/classes/javax/swing/plaf/metal/icons/Inform.gif.i
-data/test/java/rmi/reliability/juicer/OrangeEchoImpl.java.i
 data/src/share/classes/javax/xml/crypto/dsig/SignatureProperty.java.i
 data/src/solaris/sample/dtrace/hotspot/gc_time_stat.d.i
-data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSet.java.i
 data/test/java/io/Serializable/PutField/Read.java.i
 data/src/share/classes/sun/awt/FontDescriptor.java.i
+data/test/javax/crypto/Cipher/ByteBuffers.java.i
 data/src/share/native/sun/awt/libpng/pnggccrd.c.i
 data/src/solaris/native/sun/java2d/loops/mlib_ImageZoom.h.i
 data/src/solaris/classes/sun/awt/X11/XIconInfo.java.i
 data/test/java/lang/instrument/PremainClass/InheritAgent0001.java.i
 data/src/share/classes/sun/security/krb5/internal/crypto/Aes128.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java.i
+data/src/windows/native/sun/jkernel/graphics/bullet.bmp.i
 data/test/sun/tools/native2ascii/N2A_4636448.i
 data/src/share/native/java/lang/fdlibm/src/e_fmod.c.i
 data/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh.i
@@ -672,122 +661,131 @@ data/src/share/classes/java/awt/image/MultiPixelPackedSampleModel.java.i
 data/src/share/classes/java/awt/event/TextListener.java.i
 data/src/share/classes/com/sun/media/sound/MidiInDevice.java.i
 data/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Decoder.java.i
-data/test/javax/swing/GroupLayout/6613904/bug6613904.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties.i
 data/src/share/classes/sun/nio/cs/ext/IBM875.java.i
 data/src/share/classes/sun/security/pkcs/PKCS10Attributes.java.i
 data/src/share/demo/jfc/Metalworks/README.txt.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassAnalyzer.java.i
+data/src/share/native/sun/awt/image/gif/gifdecoder.c.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/TestRender1.java.i
 data/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c.i
 data/test/javax/swing/JTextArea/6940863/bug6940863.java.i
 data/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java.i
 data/make/tools/swing-beans/beaninfo/images/JAppletMono32.gif.i
 data/src/linux/doc/man/ja/javap.1.i
-data/src/share/classes/sun/misc/resources/Messages_it.java.i
+data/src/share/classes/sun/misc/Cache.java.i
 data/test/com/sun/net/httpserver/LogFilter.java.i
 data/src/share/demo/jfc/Metalworks/MetalworksInBox.java.i
 data/src/share/classes/sun/instrument/TransformerManager.java.i
-data/src/share/classes/javax/swing/JComponent.java.i
+data/make/tools/swing-beans/beaninfo/images/JPopupMenuMono16.gif.i
 data/src/share/classes/java/text/Normalizer.java.i
+data/src/share/classes/sun/misc/resources/Messages_fr.java.i
 data/test/sun/java2d/SunGraphics2D/PolyVertTest.java.i
-data/src/share/native/sun/awt/image/cvutils/img_noscale.h.i
+data/src/share/native/sun/java2d/cmm/lcms/LCMS.c.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java.i
 data/src/share/classes/javax/script/AbstractScriptEngine.java.i
 data/test/javax/management/ObjectName/ApplyWildcardTest.java.i
 data/src/share/classes/javax/swing/tree/ExpandVetoException.java.i
 data/test/java/lang/Thread/MainThreadTest.java.i
 data/src/share/demo/jfc/Notepad/ElementTreePanel.java.i
-data/src/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java.i
+data/src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM860.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-i586/libfreebl3.so.i
 data/src/share/demo/jvmti/hprof/hprof_table.c.i
 data/src/share/classes/com/sun/jmx/event/EventConnection.java.i
 data/src/share/back/outStream.c.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/NotificationMBeanSupport.java.i
 data/test/javax/management/Introspector/FeatureOrderTest.java.i
 data/test/java/util/concurrent/TimeUnit/Basic.java.i
-data/test/sun/java2d/cmm/ColorConvertOp/LRGB555.png.i
 data/src/share/classes/sun/security/pkcs11/P11Digest.java.i
 data/src/share/classes/java/sql/Time.java.i
-data/test/java/nio/channels/FileChannel/Transfers.java.i
+data/test/java/io/Serializable/defaulted/GetFieldWrite.java.i
 data/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableSupport.java.i
-data/test/javax/swing/JPopupMenu/6690791/bug6690791.java.i
 data/src/solaris/classes/sun/awt/motif/X11FontMetrics.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java.i
+data/test/sun/security/pkcs11/KeyStore/ClientAuthData/truststore.i
 data/test/java/rmi/activation/Activatable/createPrivateActivable/security.policy.i
 data/src/share/classes/sun/rmi/rmic/Constants.java.i
-data/src/share/back/ObjectReferenceImpl.h.i
+data/src/share/classes/sun/text/resources/FormatData_es_NI.java.i
+data/src/share/classes/org/openjdk/jigsaw/Hi.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java.i
 data/make/sun/jpeg/Makefile.i
-data/src/share/classes/sun/security/pkcs11/wrapper/Constants.java.i
+data/src/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java.i
+data/test/javax/management/loading/DocumentRootTest.java.i
 data/src/share/classes/sun/nio/ch/NativeThreadSet.java.i
 data/src/share/classes/java/util/zip/ZipConstants.java.i
 data/src/share/classes/javax/swing/plaf/nimbus/StateImpl.template.i
-data/test/sun/net/www/protocol/jar/getcontenttype.sh.i
+data/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/I18N.java.i
 data/test/org/openjdk/jigsaw/cli/ModuleFileTest.java.i
 data/test/java/net/URLClassLoader/closetest/README.i
-data/test/javax/management/namespace/SourceNamespaceTest.java.i
+data/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java.i
 data/test/sun/security/pkcs11/ec/certs/sunlabscerts.pem.i
 data/src/solaris/native/sun/awt/awt_DataTransferer.c.i
+data/test/java/beans/XMLEncoder/java_util_HashMap.java.i
 data/src/share/native/sun/font/layout/IndicLayoutEngine.h.i
 data/src/share/classes/sun/security/krb5/internal/KerberosTime.java.i
 data/src/share/classes/java/nio/file/StandardWatchEventKind.java.i
 data/test/java/security/cert/X509Certificate/EmptySubject.java.i
 data/src/share/classes/javax/swing/event/MouseInputAdapter.java.i
 data/src/share/classes/java/nio/file/attribute/GroupPrincipal.java.i
-data/test/java/lang/management/MemoryMXBean/LowMemoryTestConcMarkSweepGC.sh.i
+data/src/share/classes/com/sun/media/sound/FastSysexMessage.java.i
 data/test/java/beans/XMLEncoder/java_util_JumboEnumSet.java.i
 data/make/tools/CharsetMapping/IBM875.nr.i
-data/src/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmCompilationMeta.java.i
 data/src/share/classes/javax/swing/DefaultCellEditor.java.i
 data/src/share/classes/javax/management/MBeanParameterInfo.java.i
 data/src/share/classes/javax/crypto/AEADBadTagException.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/ModifiableClassLoaderRepository.java.i
 data/src/share/classes/javax/print/PrintServiceLookup.java.i
-data/src/share/classes/javax/swing/event/AncestorListener.java.i
 data/src/share/classes/sun/net/www/content/audio/basic.java.i
-data/test/sun/net/InetAddress/nameservice/dns/CanonicalName.java.i
 data/make/sun/image/generic/mapfile-vers.i
-data/test/sun/management/windows/revokeall.c.i
+data/src/share/classes/sun/awt/TracedEventQueue.java.i
 data/src/share/native/sun/java2d/cmm/lcms/cmscam97.c.i
 data/src/share/classes/sun/text/resources/FormatData_ar_LY.java.i
 data/src/share/classes/javax/swing/plaf/ActionMapUIResource.java.i
 data/src/share/classes/java/util/regex/Pattern.java.i
-data/test/java/util/prefs/PrefsSpi.sh.i
 data/src/share/classes/org/jcp/xml/dsig/internal/DigesterOutputStream.java.i
 data/src/share/classes/com/sun/crypto/provider/RC2Cipher.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java.i
 data/src/share/classes/sun/util/calendar/BaseCalendar.java.i
+data/test/sun/text/resources/Format/Bug4807540.java.i
 data/test/sun/net/www/http/HttpClient/IsKeepingAlive.policy.i
 data/src/solaris/native/sun/java2d/loops/mlib_ImageLogic_proto.h.i
-data/test/java/nio/channels/ServerSocketChannel/Basic.java.i
 data/src/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java.i
 data/src/share/classes/javax/security/sasl/SaslClientFactory.java.i
+data/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java.i
 data/src/share/classes/com/sun/jdi/request/ExceptionRequest.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/rsa/BrokenRSAPrivateCrtKey.java.i
+data/test/java/lang/Throwable/LegacyChainedExceptionSerialization.java.i
 data/test/sun/security/util/DerInputBuffer/Allow.policy.i
+data/src/share/classes/sun/security/x509/DNSName.java.i
 data/test/java/util/ResourceBundle/Control/StressOut_ja.properties.i
 data/make/common/Classes.gmk.i
+data/test/java/net/URL/OpenStream.java.i
+data/make/tools/src/build/tools/jdwpgen/BooleanTypeNode.java.i
 data/src/share/native/sun/security/ec/ecp_224.c.i
-data/src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties.i
+data/src/share/classes/sun/io/CharToByteCp277.java.i
+data/src/share/classes/java/security/CryptoPrimitive.java.i
 data/src/share/classes/javax/imageio/stream/FileImageOutputStream.java.i
 data/src/solaris/native/sun/java2d/loops/vis_ByteGray_Mask.c.i
 data/src/share/classes/com/sun/media/sound/SoftAudioProcessor.java.i
-data/src/solaris/classes/sun/awt/motif/MButtonPeer.java.i
+data/test/java/nio/channels/Selector/LotsOfUpdates.java.i
 data/test/java/rmi/activation/CommandEnvironment/Doctor.java.i
 data/test/java/util/PluggableLocale/LocaleNameProviderTest.java.i
+data/src/share/classes/java/awt/peer/MenuItemPeer.java.i
 data/src/share/classes/java/awt/image/ImageFilter.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/DropShadowEffect.java.i
 data/src/share/classes/java/net/SocketOutputStream.java.i
+data/src/share/classes/com/sun/jdi/Value.java.i
 data/test/java/util/ResourceBundle/Test4318520RB_de.properties.i
 data/src/share/classes/sun/print/PSPrinterJob.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy.i
-data/src/share/classes/com/sun/jmx/remote/internal/ClientListenerInfo.java.i
 data/test/tools/pack200/Utils.java.i
-data/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh.i
-data/test/java/lang/Class/IsSynthetic.java.i
+data/test/java/lang/ThreadLocal/TLRemoveTest.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_F32.c.i
+data/test/java/beans/Statement/Test6788531.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/LongCalls.java.i
 data/src/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java.i
+data/test/java/awt/TrayIcon/CtorTest/CtorTest.java.i
 data/src/share/classes/sun/rmi/transport/proxy/HttpReceiveSocket.java.i
 data/src/share/classes/com/sun/jmx/event/EventBuffer.java.i
 data/src/share/classes/com/sun/media/sound/MidiDeviceReceiver.java.i
@@ -802,14 +800,18 @@ data/src/share/classes/java/lang/StringCoding.java.i
 data/src/share/classes/sun/security/util/Resources.java.i
 data/make/org/openjdk/jigsaw/Makefile.i
 data/src/share/classes/java/sql/SQLRecoverableException.java.i
+data/src/share/classes/sun/audio/AudioData.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffineIndex_BC.c.i
 data/test/java/awt/Frame/DynamicLayout/DynamicLayout.java.i
 data/src/share/classes/sun/security/acl/AclImpl.java.i
-data/test/java/util/concurrent/LinkedBlockingQueue/OfferRemoveLoops.java.i
+data/src/share/classes/java/awt/datatransfer/FlavorEvent.java.i
+data/src/share/classes/javax/crypto/CryptoPermissions.java.i
 data/src/share/sample/jmx/jmx-scandir/src/etc/testconfig.xml.i
+data/src/share/native/sun/java2d/loops/IntArgbPre.c.i
 data/src/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java.i
 data/src/share/classes/java/net/NetPermission.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/AclImpl.java.i
+data/test/java/beans/EventHandler/Test6277246.java.i
+data/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java.i
 data/src/share/native/sun/security/ec/mplogic.c.i
 data/src/share/classes/java/lang/Math.java.i
 data/src/share/classes/java/net/StandardSocketOptions.java.i
@@ -818,57 +820,55 @@ data/src/share/classes/com/sun/security/ntlm/Version.java.i
 data/test/javax/management/Introspector/ClassLeakTest.java.i
 data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemColor16.gif.i
 data/src/share/classes/javax/imageio/package.html.i
+data/test/sun/security/pkcs11/rsa/TestCACerts.java.i
 data/src/windows/classes/sun/nio/fs/WindowsConstants.java.i
 data/src/share/classes/java/awt/Menu.java.i
 data/src/share/classes/javax/print/attribute/standard/CopiesSupported.java.i
 data/src/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-i586/libplc4.so.i
 data/src/share/classes/javax/sql/PooledConnection.java.i
-data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_CompoundBorderUIResource.java.i
+data/make/com/sun/security/auth/FILES_java.gmk.i
+data/src/share/demo/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml.i
 data/make/tools/CharsetMapping/MacIceland.map.i
-data/src/share/classes/javax/swing/text/TabSet.java.i
+data/src/share/classes/javax/swing/event/RowSorterEvent.java.i
 data/src/share/classes/sun/io/CharToByteCp1250.java.i
+data/test/javax/management/eventService/SharingThreadTest.java.i
 data/test/java/net/MulticastSocket/NoLoopbackPackets.java.i
-data/test/java/awt/Modal/LWModalTest/LWModalTest.java.i
-data/test/org/openjdk/jigsaw/cli/TimestampTest.java.i
+data/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html.i
+data/src/share/classes/javax/net/ssl/TrustManagerFactory.java.i
+data/src/windows/native/sun/java2d/d3d/D3DRuntimeTest.cpp.i
 data/src/share/classes/java/nio/Direct-X-Buffer.java.template.i
-data/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java.i
+data/src/share/classes/sun/print/resources/orientRevLandscape.png.i
 data/test/javax/swing/JInternalFrame/6647340/bug6647340.java.i
-data/make/sun/font/reorder-i586.i
+data/src/share/classes/com/sun/security/auth/LdapPrincipal.java.i
 data/src/share/classes/javax/naming/ldap/ExtendedResponse.java.i
 data/src/share/classes/java/awt/GridBagLayout.java.i
+data/src/solaris/native/sun/java2d/loops/vis_AlphaMacros.h.i
 data/src/share/native/sun/java2d/opengl/J2D_GL/gl.h.i
 data/src/share/classes/java/util/ComparableTimSort.java.i
-data/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java.i
 data/src/share/classes/sun/security/util/Resources_zh_CN.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java.i
-data/src/share/classes/javax/swing/Painter.java.i
+data/src/share/classes/sun/tools/jstat/ExpressionResolver.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java.i
 data/src/share/demo/jfc/Font2DTest/FontPanel.java.i
+data/test/java/nio/channels/SocketChannel/UnboundSocketTests.java.i
 data/src/share/classes/com/sun/security/auth/NTSid.java.i
-data/src/share/demo/jvmti/hprof/hprof_event.c.i
+data/make/sun/image/vis/FILES_c.gmk.i
 data/src/share/native/sun/awt/libpng/pngvcrd.c.i
+data/test/java/nio/charset/spi/FooProvider.java.i
 data/test/java/nio/file/Path/PathOps.java.i
-data/src/share/classes/sun/security/provider/certpath/ConstraintsChecker.java.i
-data/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java.i
-data/test/java/io/Serializable/subclass/Test.java.i
+data/test/java/util/Locale/data/deflocale.sol10.i
+data/src/solaris/native/java/lang/UNIXProcess_md.c.i
 data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmJITCompilerTimeMonitoring.java.i
 data/src/share/native/java/util/zip/zlib-1.1.3/inffast.c.i
 data/test/javax/management/remote/mandatory/subjectDelegation/policy32.i
-data/test/com/sun/crypto/provider/Cipher/CTR/CounterMode.java.i
-data/src/share/classes/sun/security/jgss/krb5/MicToken.java.i
-data/src/share/transport/socket/sysSocket.h.i
 data/test/javax/management/remote/mandatory/subjectDelegation/policy16.i
 data/test/sun/management/jmxremote/bootstrap/TestManager.java.i
-data/make/tools/src/build/tools/jdwpgen/ClassObjectTypeNode.java.i
+data/src/share/classes/javax/swing/table/TableColumnModel.java.i
 data/src/share/classes/java/util/XMLUtils.java.i
 data/src/share/classes/java/net/SocksSocketImpl.java.i
-data/src/windows/classes/sun/java2d/d3d/D3DContext.java.i
 data/src/share/classes/java/util/zip/InflaterInputStream.java.i
 data/src/share/classes/javax/imageio/plugins/bmp/package.html.i
 data/src/share/classes/sun/management/counter/perf/PerfStringCounter.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardMetaServer.java.i
 data/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java.i
 data/src/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java.i
 data/test/java/net/URL/win32_file_urls.i
@@ -885,7 +885,7 @@ data/make/tools/CharsetMapping/TIS_620.map.i
 data/src/share/native/sun/font/layout/DefaultCharMapper.h.i
 data/src/share/classes/sun/security/pkcs11/P11Key.java.i
 data/src/share/classes/sun/text/resources/FormatData_el_CY.java.i
-data/src/share/classes/sun/text/normalizer/UCharacterProperty.java.i
+data/src/share/classes/javax/security/auth/callback/CallbackHandler.java.i
 data/test/java/rmi/reliability/benchmark/bench/serial/RepeatObjs.java.i
 data/src/share/classes/com/sun/media/sound/Platform.java.i
 data/src/share/classes/sun/misc/MetaIndex.java.i
@@ -893,36 +893,44 @@ data/test/java/nio/charset/coders/BashCache.java.i
 data/src/share/classes/java/rmi/server/ServerCloneException.java.i
 data/src/windows/native/sun/windows/awt_dlls.cpp.i
 data/src/share/classes/com/sun/beans/finder/PropertyEditorFinder.java.i
+data/src/share/classes/javax/security/auth/callback/NameCallback.java.i
 data/src/share/classes/java/net/InterfaceAddress.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/icons/HomeFolder.gif.i
 data/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java.i
+data/src/share/classes/sun/util/resources/TimeZoneNames.java.i
 data/src/share/classes/sun/security/jgss/GSSExceptionImpl.java.i
 data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/jdk.xml.i
-data/src/share/instrument/EncodingSupport.c.i
 data/test/sun/nio/cs/ISO2022JP.trailEsc.i
 data/make/tools/CharsetMapping/IBM1381.c2b.i
 data/src/share/classes/sun/io/CharToByteCp33722.java.i
 data/src/share/demo/jvmti/hprof/hprof_tls.h.i
+data/test/tools/launcher/unresolvedExceptions.sh.i
+data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java.i
 data/src/share/classes/java/awt/geom/CubicIterator.java.i
 data/make/mksample/jmx/jmx-scandir/Makefile.i
-data/test/java/util/AbstractList/CheckForComodification.java.i
+data/src/share/classes/sun/io/CharToByteCp1047.java.i
 data/src/share/classes/java/lang/ref/Reference.java.i
-data/src/share/native/sun/security/ec/mp_gf2m-priv.h.i
-data/test/sun/jvmstat/testlibrary/utils.sh.i
+data/src/share/classes/java/lang/ClassCircularityError.java.i
+data/test/tools/pack200/TimeStamp.java.i
 data/src/share/classes/javax/swing/event/TreeSelectionEvent.java.i
 data/make/tools/CharsetMapping/SingleByte-X.java.template.i
 data/src/share/classes/javax/swing/event/ListDataEvent.java.i
+data/src/share/classes/javax/swing/plaf/FileChooserUI.java.i
 data/src/share/classes/sun/text/normalizer/Replaceable.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/ParserTokenManager.java.i
+data/src/windows/hpi/export/hpi_md.h.i
 data/test/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeImpl.java.i
 data/src/share/classes/java/awt/CheckboxMenuItem.java.i
 data/src/share/demo/nbproject/management/MemoryMonitor/build.properties.i
 data/test/java/beans/PropertyEditor/TestLongTypeJava.java.i
+data/test/java/lang/Math/WorstCaseTests.java.i
+data/test/java/net/SocketInputStream/SocketClosedException.java.i
 data/make/netbeans/swing/README.i
-data/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so.i
+data/test/java/lang/ThreadGroup/NullThreadName.java.i
 data/make/tools/swing-beans/beaninfo/images/JSpinnerMono16.gif.i
 data/test/javax/management/Introspector/IdenticalMBeanInfoTest.java.i
-data/src/solaris/classes/sun/print/services/javax.print.PrintServiceLookup.i
+data/src/windows/native/common/jlong_md.h.i
+data/src/share/classes/sun/net/www/ApplicationLaunchException.java.i
 data/test/tools/launcher/libraryCaller.c.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties.i
 data/make/java/npt/Makefile.i
@@ -932,6 +940,7 @@ data/src/share/classes/java/awt/font/LayoutPath.java.i
 data/test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java.i
 data/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java.i
 data/test/java/beans/XMLEncoder/Test4935607.java.i
+data/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java.i
 data/src/share/classes/sun/net/www/protocol/http/AuthCacheValue.java.i
 data/src/share/native/sun/java2d/loops/ByteBinary2Bit.h.i
 data/src/solaris/classes/sun/java2d/jules/IdleTileCache.java.i
@@ -944,12 +953,13 @@ data/test/javax/swing/JTable/6788484/bug6788484.java.i
 data/test/java/net/Socket/CloseAvailable.java.i
 data/src/share/classes/com/sun/tracing/dtrace/ArgsAttributes.java.i
 data/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/steve2tom.cer.i
+data/src/share/classes/javax/crypto/BadPaddingException.java.i
 data/test/java/io/Serializable/subclass/XObjectOutputStream.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_iw.properties.i
 data/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java.i
 data/src/share/classes/com/sun/java/browser/dom/DOMServiceProvider.java.i
 data/src/solaris/classes/sun/java2d/xr/GrowableRectArray.java.i
-data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/NonpublicInterface1.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardObjectServer.java.i
 data/src/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java.i
 data/test/sun/nio/cs/EucJpLinuxDecoderRecoveryTest.java.i
 data/src/share/classes/sun/nio/ch/FileDispatcher.java.i
@@ -957,11 +967,10 @@ data/src/share/classes/com/sun/tools/hat/internal/model/JavaThing.java.i
 data/src/share/classes/sun/nio/cs/ext/MacDingbat.java.i
 data/src/share/classes/java/util/concurrent/ArrayBlockingQueue.java.i
 data/src/share/classes/sun/security/krb5/internal/ASReq.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java.i
+data/make/netbeans/common/share-sources.ent.i
 data/make/tools/sharing/README.txt.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java.i
+data/src/share/classes/java/lang/annotation/package-info.java.i
 data/src/share/classes/javax/naming/ldap/Rfc2253Parser.java.i
 data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java.i
@@ -974,13 +983,14 @@ data/make/tools/CharsetMapping/IBM1112.nr.i
 data/test/com/sun/servicetag/JavaServiceTagTest.java.i
 data/make/modules/tools/build.xml.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties.i
-data/src/share/classes/sun/beans/editors/FontEditor.java.i
+data/src/share/classes/java/io/PushbackReader.java.i
 data/src/windows/native/sun/windows/awt_Canvas.cpp.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Question.gif.i
-data/test/java/net/URLDecoder/B6463990.java.i
+data/src/share/native/sun/java2d/loops/AnyShort.h.i
+data/src/share/classes/java/io/PrintStream.java.i
 data/test/sun/misc/URLClassPath/FileLoaderTest.java.i
 data/make/tools/CharsetMapping/IBM857.map.i
 data/src/share/classes/java/awt/event/AWTEventListener.java.i
+data/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh.i
 data/test/java/io/File/IsAbsolute.java.i
 data/src/share/classes/com/sun/jmx/snmp/EnumRowStatus.java.i
 data/src/share/classes/sun/management/resources/agent_pt_BR.properties.i
@@ -998,28 +1008,29 @@ data/test/java/util/ResourceBundle/TestResource_fr.java.i
 data/src/share/classes/sun/text/resources/CollationData_ja.java.i
 data/test/sun/security/pkcs11/KeyStore/BasicData/README.i
 data/src/share/native/sun/font/layout/CoverageTables.cpp.i
+data/src/share/classes/sun/reflect/UnsafeQualifiedStaticShortFieldAccessorImpl.java.i
 data/src/share/classes/com/sun/crypto/provider/AESConstants.java.i
-data/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java.i
+data/src/share/classes/sun/instrument/InstrumentationImpl.java.i
+data/src/windows/native/sun/java2d/windows/ddrawUtils.h.i
 data/test/java/beans/XMLEncoder/AbstractTest.java.i
 data/src/solaris/sample/dtrace/helpers/dtrace_helper.d.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html.i
 data/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java.i
-data/src/solaris/back/proc_md.h.i
 data/src/share/classes/javax/swing/plaf/synth/SynthUI.java.i
+data/src/share/classes/javax/swing/table/package.html.i
 data/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java.i
-data/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java.i
 data/make/mkdemo/applets/GraphLayout/Makefile.i
 data/make/tools/swing-beans/beaninfo/images/JFileChooserColor32.gif.i
 data/test/java/awt/print/PrinterJob/PageRanges.java.i
 data/make/tools/CharsetMapping/IBM1122.map.i
 data/src/share/classes/java/rmi/dgc/package.html.i
 data/src/share/classes/java/util/logging/PlatformLoggingMXBean.java.i
-data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java.i
 data/test/java/rmi/reliability/benchmark/bench/serial/ByteArrays.java.i
 data/make/tools/swing-beans/beaninfo/images/JMenuItemMono32.gif.i
 data/src/share/classes/sun/security/ec/ECKeyFactory.java.i
-data/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java.i
-data/src/share/classes/sun/java2d/loops/FillRect.java.i
+data/test/java/io/Serializable/class/run.sh.i
+data/src/share/classes/javax/swing/table/TableModel.java.i
+data/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java.i
 data/test/java/net/URLConnection/olympus.jpg.i
 data/src/share/classes/java/security/cert/X509CRLSelector.java.i
 data/src/share/classes/sun/swing/SwingAccessor.java.i
@@ -1027,15 +1038,17 @@ data/src/share/demo/nbproject/jfc/FileChooserDemo/build.properties.i
 data/src/share/classes/com/sun/beans/finder/InstanceFinder.java.i
 data/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java.i
 data/src/share/classes/sun/io/ByteToCharGB18030.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java.i
+data/src/share/classes/com/sun/media/sound/Printer.java.i
+data/make/sun/rmi/rmi/mapfile-vers.i
+data/src/share/classes/sun/rmi/rmic/newrmic/Resources.java.i
+data/src/share/classes/sun/security/ssl/Krb5Proxy.java.i
 data/src/share/classes/sun/io/CharToByteJIS0208.java.i
+data/src/share/classes/javax/xml/crypto/dsig/spec/TransformParameterSpec.java.i
 data/make/sun/splashscreen/FILES_c.gmk.i
 data/src/solaris/native/sun/jdga/jdgadevice.h.i
-data/src/share/classes/com/sun/jmx/event/ReceiverBuffer.java.i
 data/test/java/util/Locale/LocaleTest.java.i
 data/test/javax/security/auth/login/LoginContext/ModuleSubjectModule.java.i
 data/src/share/classes/com/sun/jndi/dns/NameNode.java.i
-data/test/java/io/PipedReader/Ready.java.i
 data/src/share/classes/javax/naming/NameNotFoundException.java.i
 data/src/share/classes/com/sun/beans/finder/FieldFinder.java.i
 data/src/share/classes/com/sun/tools/jdi/ObsoleteMethodImpl.java.i
@@ -1047,10 +1060,11 @@ data/src/share/native/sun/java2d/loops/Ushort555Rgbx.h.i
 data/make/tools/CharsetMapping/IBM285.nr.i
 data/src/windows/native/sun/nio/ch/DatagramChannelImpl.c.i
 data/make/jpda/transport/shmem/Makefile.i
+data/src/share/demo/jvmti/hprof/hprof_init.h.i
 data/src/share/classes/sun/util/locale/UnicodeLocaleExtension.java.i
+data/make/jprt.config.i
 data/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java.i
 data/make/sun/javazic/tzdata/backward.i
-data/make/sun/security/smartcardio/mapfile-vers.i
 data/src/solaris/classes/sun/tools/attach/SolarisAttachProvider.java.i
 data/src/share/classes/java/lang/Throwable.java.i
 data/test/sun/tools/jstatd/all.policy.i
@@ -1060,12 +1074,12 @@ data/src/share/classes/java/nio/file/TempFileHelper.java.i
 data/src/share/classes/javax/management/openmbean/package.html.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java.i
 data/src/share/sample/scripting/scriptpad/src/scripts/memmonitor.js.i
+data/test/javax/script/VersionTest.java.i
 data/src/share/classes/sun/awt/im/InputMethodLocator.java.i
-data/src/windows/classes/sun/nio/ch/DatagramDispatcher.java.i
-data/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java.i
 data/src/share/classes/sun/text/resources/FormatData_da_DK.java.i
 data/src/share/classes/java/awt/dnd/InvalidDnDOperationException.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgent.java.i
+data/test/java/security/cert/PolicyNode/speech2eve.i
 data/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java.i
 data/src/solaris/native/sun/awt/awt_GraphicsEnv.h.i
 data/test/java/util/zip/3GBZipFiles.sh.i
@@ -1074,10 +1088,8 @@ data/test/sun/security/ssl/javax/net/ssl/NewAPIs/KeyManagerTrustManager.java.i
 data/src/share/classes/javax/sound/sampled/Control.java.i
 data/make/tools/swing-beans/beaninfo/images/JTabbedPaneColor32.gif.i
 data/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java.i
-data/test/sun/security/ec/keystore.i
 data/src/share/classes/javax/xml/crypto/AlgorithmMethod.java.i
 data/src/windows/native/sun/windows/awt_DnDDS.cpp.i
-data/src/share/classes/sun/net/www/protocol/http/NegotiatorImpl.java.i
 data/test/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeInterface.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHost.java.i
 data/src/windows/native/sun/security/krb5/NativeCreds.c.i
@@ -1088,17 +1100,18 @@ data/src/share/classes/sun/io/CharacterEncoding.java.i
 data/src/share/classes/javax/swing/JList.java.i
 data/test/java/security/Security/ClassLoaderDeadlock/provider/HashProvider.java.i
 data/src/share/classes/sun/reflect/generics/visitor/Reifier.java.i
-data/src/solaris/classes/sun/awt/motif/MRobotPeer.java.i
+data/src/share/classes/java/awt/ScrollPane.java.i
 data/make/tools/swing-beans/beaninfo/images/JProgressBarMono32.gif.i
 data/test/java/lang/instrument/ManifestTest.sh.i
 data/src/share/classes/java/util/Iterator.java.i
-data/src/solaris/classes/sun/awt/motif/X11KSC5601.java.i
-data/src/share/classes/javax/swing/SwingUtilities.java.i
+data/src/share/classes/javax/naming/ldap/StartTlsRequest.java.i
+data/make/java/java/reorder-i586.i
 data/src/share/classes/java/rmi/registry/Registry.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java.i
 data/src/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java.i
-data/test/java/security/spec/ECCBasic.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/Module.java.i
 data/src/share/classes/java/net/InMemoryCookieStore.java.i
+data/src/share/classes/sun/text/resources/FormatData_lv_LV.java.i
 data/src/share/classes/sun/print/resources/serviceui_sv.properties.i
 data/src/share/classes/javax/swing/event/TableColumnModelEvent.java.i
 data/src/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java.i
@@ -1106,10 +1119,11 @@ data/src/share/classes/javax/security/auth/Policy.java.i
 data/src/share/classes/sun/security/jca/GetInstance.java.i
 data/test/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java.i
 data/make/tools/CharsetMapping/IBM1146.map.i
+data/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithoutRID.java.i
 data/src/solaris/native/sun/awt/awt_Mlib.c.i
 data/src/windows/native/sun/java2d/d3d/D3DPipelineManager.h.i
-data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/TruncateArray.java.i
-data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java.i
+data/src/share/classes/sun/security/provider/certpath/OCSPResponse.java.i
+data/src/share/classes/com/sun/beans/finder/ConstructorFinder.java.i
 data/src/share/native/java/lang/fdlibm/src/s_isnan.c.i
 data/test/java/lang/Class/getEnclosingClass/make_src.sh.i
 data/src/share/classes/javax/swing/plaf/multi/MultiLabelUI.java.i
@@ -1118,7 +1132,8 @@ data/make/java/redist/sajdi/Makefile.i
 data/src/share/classes/javax/xml/crypto/dsig/TransformService.java.i
 data/src/share/classes/java/lang/reflect/AccessibleObject.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_no_NO.properties.i
-data/test/java/io/PushbackInputStream/Available.java.i
+data/src/share/classes/sun/io/ByteToCharHKSCS_2001.java.i
+data/make/tools/GenerateCharacter/CharacterData02.java.template.i
 data/test/javax/crypto/KeyGenerator/TestGetInstance.java.i
 data/test/com/sun/crypto/provider/TLS/Utils.java.i
 data/src/share/classes/sun/security/krb5/internal/PAData.java.i
@@ -1136,60 +1151,60 @@ data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIIco
 data/test/java/util/Arrays/FloatDoubleOrder.java.i
 data/src/share/classes/javax/sql/RowSetEvent.java.i
 data/src/share/classes/sun/awt/UngrabEvent.java.i
-data/src/share/classes/sun/io/CharToByteCp930.java.i
+data/src/share/classes/javax/script/Invocable.java.i
 data/src/share/classes/sun/reflect/ByteVector.java.i
+data/make/tools/swing-beans/beaninfo/images/JButtonMono16.gif.i
 data/src/share/classes/java/sql/SQLXML.java.i
 data/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java.i
-data/test/java/util/jar/JarInputStream/EmptyJar.java.i
+data/make/tools/CharsetMapping/MS1250.map.i
 data/test/java/io/PipedOutputStream/ClosedWrite.java.i
 data/src/solaris/classes/sun/awt/X11/security-icon-bw24.png.i
 data/src/share/classes/sun/util/resources/CalendarData_ko.properties.i
 data/src/share/classes/java/util/zip/ZStreamRef.java.i
 data/src/share/classes/sun/io/ByteToCharISO8859_13.java.i
-data/test/sun/security/tools/keytool/emptysubject.sh.i
+data/src/share/classes/sun/nio/cs/MS1257.java.i
 data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java.i
 data/src/share/classes/java/beans/beancontext/BeanContext.java.i
 data/make/tools/swing-beans/beaninfo/images/JFrameColor16.gif.i
 data/src/linux/doc/man/jdb.1.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain2.txt.i
+data/test/java/security/UnresolvedPermission/DebugPermissionBad.java.i
 data/src/solaris/native/sun/java2d/loops/vis_Interp.c.i
 data/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java.i
-data/src/share/classes/sun/net/util/IPAddressUtil.java.i
+data/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevel.java.i
 data/test/java/lang/instrument/FromShutdownHook.java.i
 data/src/share/classes/javax/sql/rowset/RowSetWarning.java.i
 data/test/java/util/PluggableLocale/providersrc/BreakIteratorProviderImpl.java.i
 data/make/javax/swing/plaf/nimbus/Makefile.i
-data/test/sun/nio/cs/TestIBMBugs.java.i
+data/test/java/rmi/server/RMIClassLoader/spi/TestProvider2.java.i
 data/src/share/classes/sun/nio/cs/ISO_8859_1.java.i
 data/src/share/demo/management/VerboseGC/VerboseGC.java.i
-data/test/com/sun/jdi/sde/MangleTest.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_CO.java.i
+data/src/share/classes/sun/io/ByteToCharCp874.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/OptionParserState.java.i
 data/test/java/beans/XMLEncoder/java_awt_Cursor.java.i
-data/src/share/classes/java/awt/print/Paper.java.i
+data/src/share/classes/com/sun/beans/decoder/FloatElementHandler.java.i
 data/make/tools/swing-beans/GenDocletBeanInfo.java.i
 data/test/sun/security/tools/jarsigner/passtype.sh.i
 data/src/share/classes/sun/management/HotspotRuntimeMBean.java.i
 data/src/share/classes/sun/net/www/protocol/https/DelegateHttpsURLConnection.java.i
 data/test/sun/security/tools/policytool/Alias.sh.i
-data/src/share/classes/com/sun/rowset/CachedRowSetImpl.java.i
 data/test/sun/security/krb5/auto/KerberosHashEqualsTest.java.i
 data/src/share/classes/javax/management/modelmbean/ModelMBeanInfo.java.i
 data/src/solaris/native/sun/awt/awt_Font.h.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpRequestTree.java.i
-data/test/java/util/zip/ZipInputStream/Constructor.java.i
+data/test/java/beans/XMLDecoder/spec/TestClass.java.i
+data/src/share/classes/javax/security/sasl/RealmChoiceCallback.java.i
 data/make/tools/src/build/tools/jarreorder/JarReorder.java.i
+data/src/share/classes/java/lang/StringBuffer.java.i
 data/src/share/classes/org/openjdk/jigsaw/cli/Command.java.i
 data/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java.i
 data/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java.i
 data/test/tools/launcher/6842838/CreateBadJar.java.i
-data/src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java.i
 data/src/share/classes/com/sun/tools/hat/internal/parser/PositionInputStream.java.i
-data/test/java/nio/Buffer/CopyDirectMemory.java.i
+data/src/share/classes/sun/security/rsa/SunRsaSign.java.i
 data/src/share/classes/sun/rmi/server/resources/rmid_de.properties.i
 data/test/java/nio/channels/DatagramChannel/ConnectedSend.java.i
 data/src/share/classes/java/io/PushbackInputStream.java.i
-data/src/share/native/sun/security/ec/impl/ec2.h.i
-data/src/share/classes/sun/util/resources/TimeZoneNames_ko.java.i
+data/test/java/io/File/WinMaxPath.java.i
 data/src/share/classes/java/security/acl/NotOwnerException.java.i
 data/src/share/classes/com/sun/tracing/dtrace/StabilityLevel.java.i
 data/src/share/classes/sun/io/CharToByteMacCyrillic.java.i
@@ -1197,14 +1212,13 @@ data/src/share/classes/javax/swing/RootPaneContainer.java.i
 data/test/javax/management/mxbean/OverloadTest.java.i
 data/src/share/classes/java/awt/MenuShortcut.java.i
 data/make/java/java/Makefile.i
-data/test/java/net/BindException/Test.java.i
 data/src/share/native/sun/java2d/loops/AnyShort.c.i
 data/src/share/classes/sun/rmi/server/UnicastRef2.java.i
 data/src/share/classes/javax/swing/colorchooser/ColorChooserPanel.java.i
 data/src/share/classes/sun/awt/image/ShortBandedRaster.java.i
-data/src/share/native/sun/font/layout/LEGlyphStorage.cpp.i
+data/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp.i
 data/src/windows/native/sun/windows/WPrinterJob.cpp.i
-data/src/share/classes/sun/util/resources/LocaleNames_no_NO_NY.properties.i
+data/src/share/classes/sun/text/resources/FormatData_ar_KW.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/BadTSProvider.java.i
 data/src/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java.i
 data/make/tools/src/build/tools/generatebreakiteratordata/CharacterCategory.java.i
@@ -1215,40 +1229,37 @@ data/src/share/classes/javax/swing/InternalFrameFocusTraversalPolicy.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.java.i
 data/test/java/rmi/reliability/benchmark/bench/rmi/ShortCalls.java.i
 data/src/share/native/sun/awt/image/jpeg/jcprepct.c.i
+data/src/share/classes/javax/security/auth/login/Configuration.java.i
 data/test/com/sun/jdi/JITDebug.java.i
-data/test/java/util/logging/ParentLoggersTest.java.i
+data/src/windows/native/sun/windows/awt_PrintJob.cpp.i
 data/src/share/classes/javax/management/AttributeNotFoundException.java.i
 data/make/tools/src/build/tools/jdwpgen/InterfaceTypeNode.java.i
-data/src/share/classes/javax/print/CancelablePrintJob.java.i
+data/src/share/classes/java/lang/management/MemoryPoolMXBean.java.i
 data/src/share/classes/javax/print/attribute/PrintJobAttributeSet.java.i
-data/test/java/beans/Introspector/Test4634390.java.i
-data/test/java/beans/Beans/6669869/TestDesignTime.java.i
+data/src/share/classes/javax/swing/event/MenuEvent.java.i
 data/src/share/native/sun/java2d/loops/DrawPolygons.c.i
-data/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java.i
 data/src/share/classes/javax/sql/rowset/webrowset.xsd.i
-data/test/sun/nio/cs/OLD/GBK_OLD.java.i
+data/test/java/lang/management/MemoryMXBean/Pending.java.i
 data/src/share/classes/java/awt/color/ICC_ProfileGray.java.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_U16.c.i
 data/test/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java.i
 data/test/javax/management/Introspector/ExceptionsDescriptorTest.java.i
 data/src/share/classes/java/security/cert/CertPathBuilderSpi.java.i
 data/src/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java.i
-data/src/share/classes/sun/text/resources/CollationData_en.java.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedLongFieldAccessorImpl.java.i
 data/test/sun/security/pkcs11/Secmod/anchor.cer.i
 data/src/share/classes/sun/util/resources/CalendarData_bg.properties.i
-data/src/solaris/classes/sun/awt/X11/XWarningWindow.java.i
 data/test/sun/tools/jstat/jstatSnap1.sh.i
 data/src/share/classes/sun/text/normalizer/UBiDiProps.java.i
 data/src/share/native/com/sun/java/util/jar/pack/bytes.h.i
-data/src/share/classes/sun/text/normalizer/Trie.java.i
 data/src/share/classes/java/awt/dnd/DragGestureEvent.java.i
 data/src/share/instrument/JPLISAssert.h.i
 data/test/sun/security/pkcs11/Secmod/JksSetPrivateKey.java.i
 data/src/share/classes/java/awt/image/LookupTable.java.i
-data/test/java/beans/XMLEncoder/Test5023559.java.i
+data/src/share/classes/javax/management/JMException.java.i
+data/src/share/classes/javax/management/StandardEmitterMBean.java.i
 data/test/java/beans/XMLEncoder/6777487/TestCheckedRandomAccessList.java.i
-data/test/org/openjdk/jigsaw/security.sh.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTest.java.i
 data/src/share/classes/java/awt/font/CharArrayIterator.java.i
 data/src/windows/native/sun/windows/awt_Container.h.i
 data/test/javax/xml/crypto/dsig/data/signature-x509-crt-crl.xml.i
@@ -1256,11 +1267,13 @@ data/test/sun/security/provider/PolicyFile/AliasExpansion.policy.i
 data/test/java/nio/channels/SocketChannel/VectorParams.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM937.java.d
 data/src/share/classes/com/sun/tools/jdi/ThreadAction.java.i
+data/test/java/security/Security/signedfirst/Dyn.sh.i
+data/test/java/util/PluggableLocale/CollatorProviderTest.sh.i
 data/src/share/classes/sun/net/httpserver/AuthFilter.java.i
+data/src/solaris/classes/sun/nio/ch/Port.java.i
 data/test/java/util/Currency/CurrencyTest.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_et_EE.properties.i
 data/test/java/net/URL/normal_http_urls.i
-data/test/java/lang/invoke/CallSiteTest.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM937.java.i
 data/src/windows/classes/sun/security/provider/NativeSeedGenerator.java.i
 data/test/java/nio/file/PathMatcher/Basic.java.i
@@ -1268,31 +1281,30 @@ data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.prop
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java.i
 data/src/share/classes/java/lang/ref/Finalizer.java.i
 data/src/share/native/com/sun/media/sound/Utilities.c.i
+data/src/share/classes/sun/security/ssl/ServerHandshaker.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java.i
 data/make/tools/src/build/tools/compilefontconfig/CompileFontConfig.java.i
-data/src/windows/classes/java/lang/Terminator.java.i
-data/test/sun/security/krb5/runNameEquals.sh.i
-data/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java.i
+data/make/tools/winver/Makefile.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties.i
 data/make/tools/CharsetMapping/KOI8_U.map.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_test06_ok.password.in.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/ClassMapper.java.i
 data/src/windows/native/sun/windows/awt_DCHolder.h.i
 data/src/share/classes/sun/io/ByteToCharCp863.java.i
-data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemMono32.gif.i
 data/test/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java.i
 data/make/java/fdlibm/FILES_c.gmk.i
-data/src/share/classes/sun/security/util/DerOutputStream.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/image-delayed.png.i
 data/src/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpEngineParameters.java.i
 data/src/share/classes/java/util/concurrent/ConcurrentMap.java.i
 data/src/share/classes/sun/security/pkcs11/SunPKCS11.java.i
 data/test/sun/nio/cs/ZeroedByteArrayEUCTWTest.java.i
-data/test/java/util/concurrent/ExecutorCompletionService/LoopHelpers.java.i
-data/test/java/util/concurrent/BlockingQueue/LastElement.java.i
+data/test/java/io/Serializable/proxy/replace/ReadResolve.java.i
+data/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java.i
 data/src/share/native/sun/java2d/loops/GlyphImageRef.h.i
 data/test/java/lang/Thread/ThreadStateTest.java.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKConstants.java.i
 data/src/share/classes/com/sun/tools/jdi/LinkedHashMap.java.i
+data/src/share/classes/java/sql/SQLPermission.java.i
 data/src/share/classes/com/sun/jdi/event/StepEvent.java.i
 data/src/share/demo/jfc/Metalworks/DemoMetalTheme.java.i
 data/src/share/classes/java/util/concurrent/RunnableFuture.java.i
@@ -1304,18 +1316,18 @@ data/src/share/classes/javax/management/event/FetchingEventRelay.java.i
 data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/AbsoluteComponentCenterCalculator.java.i
 data/src/share/classes/com/sun/tools/example/trace/Trace.java.i
 data/src/share/classes/javax/print/attribute/standard/NumberUp.java.i
+data/test/java/rmi/activation/Activatable/checkActivateRef/security.policy.i
 data/src/share/classes/sun/java2d/loops/SurfaceType.java.i
 data/src/share/classes/javax/management/MBeanServerPermission.java.i
-data/src/share/native/sun/security/ec/impl/ecp.h.i
 data/src/share/classes/sun/nio/ch/CompletedFuture.java.i
 data/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java.i
 data/test/java/lang/instrument/appendToClassLoaderSearch/BasicTest.java.i
 data/src/share/classes/java/io/Externalizable.java.i
+data/test/java/awt/print/Dialog/DialogType.java.i
 data/src/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java.i
 data/src/share/classes/sun/awt/ComponentFactory.java.i
-data/test/java/nio/channels/SocketChannel/OutOfBand.java.i
-data/test/java/util/zip/Bounds.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/Question.gif.i
 data/test/java/nio/channels/Selector/HelperSlowToDie.java.i
 data/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java.i
 data/src/share/native/java/lang/fdlibm/src/w_gamma_r.c.i
@@ -1327,40 +1339,36 @@ data/test/javax/xml/crypto/dsig/data/signature-x509-is.xml.i
 data/make/mkdemo/applets/JumpingBox/Makefile.i
 data/src/share/native/sun/awt/image/cvutils/img_ordgray.h.i
 data/src/share/native/sun/java2d/loops/Ushort555Rgb.c.i
-data/src/share/classes/sun/io/ByteToCharCp949C.java.i
 data/make/LICENSE.i
-data/src/windows/classes/com/sun/tools/jdi/SharedMemoryAttachingConnector.java.i
 data/src/share/classes/java/util/zip/CheckedInputStream.java.i
 data/test/sun/security/tools/policytool/Alias.java.i
 data/src/share/classes/java/lang/Double.java.i
 data/src/share/classes/com/sun/jdi/IntegerValue.java.i
 data/src/share/classes/sun/misc/IOUtils.java.i
 data/test/java/security/Security/SynchronizedAccess.java.i
-data/src/share/classes/javax/swing/text/JTextComponent.java.i
-data/test/sun/security/pkcs11/ec/TestECDH.java.i
+data/src/share/classes/java/text/RuleBasedCollator.java.i
+data/test/java/rmi/server/useCustomRef/UseCustomRef.java.i
 data/test/javax/security/auth/login/Configuration/GetInstanceProvider.java.i
 data/src/share/classes/javax/sql/rowset/package.html.i
 data/test/java/util/zip/StreamConstructor.java.i
 data/src/share/classes/java/nio/Direct-X-Buffer-bin.java.template.i
 data/test/java/util/Locale/serialized/java6locale_ja_JP_JP.i
-data/test/java/lang/Boolean/Factory.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S32Func.c.i
 data/src/share/classes/sun/management/counter/Counter.java.i
 data/src/share/classes/com/sun/java/swing/plaf/nimbus/AbstractRegionPainter.java.i
 data/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java.i
 data/test/java/lang/annotation/loaderLeak/Main.java.i
-data/test/java/nio/channels/SocketChannel/GetChannel.java.i
 data/test/javax/management/remote/mandatory/notif/DiffHBTest.java.i
 data/src/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java.i
 data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipDirectoryStream.java.i
-data/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html.i
+data/src/share/classes/java/awt/dnd/DropTargetDragEvent.java.i
 data/test/java/beans/PropertyEditor/TestDoubleClassJava.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObject.java.i
 data/src/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java.i
-data/make/mkdemo/jvmti/gctest/Makefile.i
 data/make/mkdemo/jvmti/Makefile.i
 data/make/tools/swing-beans/beaninfo/images/JRadioButtonColor16.gif.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java.i
+data/src/share/demo/jfc/FileChooserDemo/resources/images/jpgIcon.jpg.i
 data/src/share/classes/com/sun/media/sound/EmergencySoundbank.java.i
 data/src/share/classes/sun/io/ByteToCharCp1124.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SocketCreation/SocketCreation.java.i
@@ -1373,18 +1381,18 @@ data/src/share/classes/javax/sql/CommonDataSource.java.i
 data/src/share/classes/javax/net/ssl/SSLKeyException.java.i
 data/src/linux/doc/man/ja/tnameserv.1.i
 data/test/javax/naming/Name/j2se13-name.ser.i
-data/test/java/rmi/server/RMIClassLoader/spi/security.policy.i
-data/test/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/JAVA2.DS.i
 data/src/share/classes/javax/sound/sampled/CompoundControl.java.i
 data/make/tools/swing-beans/beaninfo/images/JEditorPaneMono32.gif.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/OwnerImpl.java.i
+data/test/java/beans/PropertyEditor/TestBooleanTypeJava.java.i
+data/src/share/classes/javax/swing/JRadioButtonMenuItem.java.i
 data/src/share/classes/java/net/ConnectException.java.i
+data/src/share/classes/java/util/UUID.java.i
 data/src/share/classes/com/sun/accessibility/internal/resources/accessibility.properties.i
 data/src/windows/native/sun/windows/CmdIDList.h.i
-data/test/sun/security/pkcs11/SecureRandom/Basic.java.i
+data/src/share/classes/com/sun/media/sound/SoftPointResampler.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java.i
 data/src/share/classes/java/security/cert/CRLSelector.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/internal/Reflection.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/CksumType.java.i
+data/src/share/classes/sun/io/ByteToCharISO8859_8.java.i
 data/src/share/classes/java/lang/StrictMath.java.i
 data/src/share/sample/jmx/jmx-scandir/manifest.mf.i
 data/test/java/security/Provider/RemoveProvider.java.i
@@ -1393,40 +1401,39 @@ data/src/share/classes/java/nio/charset/spi/CharsetProvider.java.i
 data/src/share/classes/sun/util/resources/CalendarData_uk.properties.i
 data/src/share/classes/javax/sql/rowset/spi/SyncProvider.java.i
 data/src/share/classes/javax/naming/ContextNotEmptyException.java.i
+data/src/share/classes/java/nio/file/WatchKey.java.i
 data/src/solaris/classes/sun/java2d/xr/XRBackendNative.java.i
 data/test/com/sun/nio/sctp/SctpServerChannel/Util.java.i
 data/src/share/classes/javax/swing/plaf/synth/DefaultSynthStyleFactory.java.i
-data/test/sun/tools/jstat/jstatLineCounts3.sh.i
 data/test/sun/security/tools/policytool/UpdatePermissions.html.i
 data/src/share/classes/sun/font/GraphicComponent.java.i
 data/test/java/lang/Class/getEnclosingClass/EnclosingClassTest.java.i
-data/test/javax/management/remote/mandatory/loading/SingleClassLoader.java.i
-data/test/javax/security/auth/login/LoginContext/ResetConfigModule.java.i
 data/test/java/nio/channels/SocketChannel/SocketInheritance.java.i
 data/test/java/rmi/registry/emptyName/EmptyName.java.i
 data/src/share/classes/javax/naming/directory/InvalidAttributeIdentifierException.java.i
 data/test/javax/xml/crypto/dsig/data/xml-stylesheet.i
-data/src/share/classes/java/io/PipedOutputStream.java.i
-data/src/share/classes/com/sun/crypto/provider/JarVerifier.java.i
 data/src/share/classes/javax/crypto/package.html.i
 data/src/share/classes/com/sun/jdi/event/MethodEntryEvent.java.i
 data/src/windows/bin/ia64/jvm.cfg.i
 data/src/share/classes/java/util/TimSort.java.i
+data/make/tools/CharsetMapping/IBM939.c2b.i
 data/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java.i
 data/src/share/classes/sun/awt/SunDisplayChanger.java.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/Node.java.i
 data/src/share/classes/com/sun/tools/jconsole/JConsolePlugin.java.i
+data/src/share/classes/sun/nio/cs/UTF_16BE.java.i
 data/src/solaris/demo/jni/Poller/README.txt.i
 data/test/com/sun/nio/sctp/MessageInfoTests.java.i
 data/src/share/native/com/sun/media/sound/MidiInDeviceProvider.c.i
 data/src/share/native/sun/awt/image/cvutils/img_colors.c.i
 data/test/sun/net/www/protocol/jar/jarbug/src/test/TestBug4361044.java.i
-data/make/altclasses/Makefile.i
+data/test/java/lang/management/ThreadMXBean/ThreadExecutionSynchronizer.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/ParserTreeConstants.java.i
 data/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1.xml.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java.i
 data/src/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java.i
 data/src/share/classes/java/awt/doc-files/modal-example4.gif.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ar_TN.properties.i
 data/src/share/classes/sun/io/CharToByteCp1046.java.i
 data/src/share/classes/java/nio/file/attribute/package-info.java.i
 data/src/share/native/sun/awt/image/jpeg/jcomapi.c.i
@@ -1435,11 +1442,11 @@ data/src/share/native/sun/awt/image/cvutils/img_ordclrsgn.h.i
 data/src/share/classes/com/sun/jdi/event/MonitorWaitEvent.java.i
 data/test/java/util/Formatter/BasicShortObject.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libplc4.so.i
+data/test/java/util/Timer/DelayOverflow.java.i
 data/test/org/openjdk/jigsaw/optional-reexport.sh.i
-data/src/solaris/native/sun/awt/awt_Button.c.i
-data/src/share/classes/sun/text/resources/FormatData_ko_KR.java.i
-data/src/share/classes/java/awt/GraphicsEnvironment.java.i
-data/src/share/classes/sun/jkernel/Mutex.java.i
+data/src/share/classes/sun/font/SunFontManager.java.i
+data/test/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Decoder.java.i
+data/src/linux/doc/man/ja/javadoc.1.d
 data/src/share/classes/sun/security/provider/certpath/OCSPChecker.java.i
 data/src/solaris/native/sun/awt/X11Color.c.i
 data/src/share/classes/java/util/logging/MemoryHandler.java.i
@@ -1448,11 +1455,11 @@ data/test/javax/management/modelmbean/ModelMBeanInfoSupport/policy.i
 data/src/share/classes/sun/security/util/AuthResources_zh_CN.java.i
 data/test/java/util/Formatter/Basic-X.java.template.i
 data/src/share/classes/sun/util/resources/LocaleNames_es_US.properties.i
-data/make/netbeans/common/closed-share-view.ent.i
 data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties.i
-data/src/share/classes/sun/util/resources/LocaleNames_in.properties.i
+data/src/linux/doc/man/ja/javadoc.1.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S16Func.c.i
 data/make/tools/swing-beans/beaninfo/images/BoxMono32.gif.i
+data/src/share/classes/javax/imageio/metadata/package.html.i
 data/src/share/classes/com/sun/tools/hat/internal/model/ReachableExcludes.java.i
 data/src/share/classes/sun/misc/ExtensionDependency.java.i
 data/src/share/classes/com/sun/jndi/ldap/sasl/SaslInputStream.java.i
@@ -1471,14 +1478,16 @@ data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnspr4.so.d
 data/src/share/classes/sun/invoke/WrapperInstance.java.i
 data/src/share/demo/jvmti/versionCheck/sample.makefile.txt.i
 data/test/java/io/File/ListRoots.java.i
-data/test/sun/tools/jps/jps-l_Output1.awk.i
-data/src/share/classes/sun/security/util/BigInt.java.i
+data/src/share/native/java/util/zip/zlib-1.2.3/zadler32.c.i
+data/src/share/classes/java/util/MissingResourceException.java.i
+data/src/share/classes/sun/applet/AppletPanel.java.i
 data/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java.i
 data/src/share/native/java/util/zip/zlib-1.2.3/infback.c.i
 data/src/share/classes/java/lang/management/ThreadMXBean.java.i
 data/src/share/classes/sun/tools/asm/CatchData.java.i
 data/test/java/util/Collection/BiggernYours.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/config.xml.i
+data/src/share/classes/sun/java2d/FontSupport.java.i
 data/src/share/classes/javax/swing/SpinnerModel.java.i
 data/src/share/classes/com/sun/jmx/snmp/Enumerated.java.i
 data/test/sun/security/krb5/auto/PrincipalNameEquals.java.i
@@ -1486,14 +1495,13 @@ data/test/java/security/Security/signedfirst/keystore.jks.i
 data/src/share/classes/sun/rmi/rmic/Generator.java.i
 data/src/share/classes/com/sun/jndi/ldap/LdapClient.java.i
 data/src/share/classes/java/io/ObjectOutputStream.java.i
-data/src/share/classes/javax/swing/text/AsyncBoxView.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java.i
+data/src/share/classes/javax/swing/border/EtchedBorder.java.i
 data/src/share/demo/applets/WireFrame/example1.html.i
 data/make/sunw/Makefile.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java.i
 data/test/javax/management/namespace/NamespaceController.java.i
 data/make/mkdemo/jfc/FileChooserDemo/Makefile.i
-data/test/java/rmi/activation/ActivationSystem/activeGroup/security.policy.i
+data/src/share/classes/sun/util/resources/TimeZoneNames_de.java.i
 data/src/share/classes/java/text/StringCharacterIterator.java.i
 data/src/share/classes/sun/util/resources/CalendarData_da.properties.i
 data/test/java/lang/StringBuffer/SBBasher.java.i
@@ -1501,7 +1509,6 @@ data/src/share/classes/sun/misc/UCDecoder.java.i
 data/src/share/classes/sun/io/CharToByteISO2022JP.java.i
 data/test/java/security/cert/CertPathValidator/nameConstraints/generate.sh.i
 data/src/share/classes/java/io/FileNotFoundException.java.i
-data/test/sun/security/jgss/CtorTests2.java.i
 data/test/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream/BufferOverflowTest.java.i
 data/src/solaris/demo/jni/Poller/SimpleServer.java.i
 data/src/share/classes/javax/xml/crypto/dsig/XMLSignContext.java.i
@@ -1509,13 +1516,14 @@ data/test/javax/management/loading/LibraryLoader/jar_src/UseNativeLibMBean.java.
 data/src/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java.i
 data/test/java/lang/instrument/appendToClassLoaderSearch/A.2.i
 data/test/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java.i
+data/src/share/classes/sun/text/normalizer/ICUBinary.java.i
 data/src/share/classes/com/sun/media/sound/EventDispatcher.java.i
-data/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java.i
 data/src/windows/native/sun/jkernel/kernel.h.i
 data/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java.i
 data/test/java/security/Security/NoInstalledProviders.java.i
 data/test/java/io/charStreams/IntGenerator.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Matte.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpGenericMetaServer.java.i
 data/test/java/beans/XMLEncoder/java_util_EnumMap.java.i
 data/make/tools/CharsetMapping/IBM273.nr.i
 data/src/share/classes/javax/imageio/spi/ImageWriterSpi.java.i
@@ -1526,7 +1534,7 @@ data/src/share/classes/com/sun/jmx/snmp/SnmpPduRequestType.java.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormatResources.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_cs.properties.i
 data/src/share/classes/javax/security/auth/kerberos/package.html.i
-data/src/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java.i
+data/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.h.i
 data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java.i
 data/src/share/classes/sun/invoke/util/BytecodeName.java.i
 data/src/share/classes/java/security/UnresolvedPermission.java.i
@@ -1536,13 +1544,13 @@ data/src/windows/classes/sun/nio/fs/WindowsPathParser.java.i
 data/make/common/internal/Defs-langtools.gmk.i
 data/test/sun/security/tools/keytool/importreadall.sh.i
 data/make/tools/swing-beans/beaninfo/images/JSplitPaneColor32.gif.i
-data/src/share/classes/sun/tools/jconsole/ProxyClient.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedList.java.i
 data/make/tools/freetypecheck/freetypecheck.c.i
-data/test/java/net/URLConnection/HandleContentTypeWithAttrs.java.i
-data/make/java/util/FILES_properties.gmk.i
-data/test/sun/jvmstat/monitor/VmIdentifier/testcases.i
+data/src/share/native/sun/awt/medialib/mlib_ImageColormap.h.i
+data/src/share/classes/com/sun/jdi/event/ExceptionEvent.java.i
+data/test/java/security/KeyPairGenerator/SolarisShortDSA.java.i
 data/make/java/nio/reorder-i586.i
-data/test/com/sun/java/swing/plaf/gtk/Test6635110.java.i
+data/make/tools/CharsetMapping/SingleByte-X.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Canvas.java.i
 data/test/java/util/PluggableLocale/providersrc/NumberFormatProviderImpl.java.i
 data/test/sun/security/provider/PolicyFile/getinstance/NoArgPermission.java.i
@@ -1551,53 +1559,50 @@ data/test/java/beans/XMLEncoder/4741757/TestFieldAccess.java.i
 data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy.i
 data/src/share/classes/com/sun/tools/jdi/AbstractLauncher.java.i
 data/src/share/classes/sun/awt/geom/Order2.java.i
-data/src/share/classes/sun/text/resources/FormatData_el.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BlendingMode.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaInt.java.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/CodeAttributeParser.java.i
 data/test/java/beans/PropertyEditor/TestLongClassValue.java.i
 data/src/share/classes/com/sun/security/auth/NTDomainPrincipal.java.i
 data/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java.i
 data/test/java/rmi/activation/CommandEnvironment/rmid.security.policy.i
-data/src/share/classes/javax/crypto/JceSecurity.java.i
+data/test/java/lang/instrument/BootClassPath/AgentSupport.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_de.properties.i
 data/src/share/classes/com/sun/media/sound/SF2Region.java.i
+data/test/sun/tools/jstat/lineCounts4.awk.i
 data/test/java/security/cert/CertPath/cert_file.i
 data/src/share/classes/sun/awt/DesktopBrowse.java.i
 data/test/java/io/PipedReader/Constructors.java.i
 data/src/share/native/sun/security/ec/secoidt.h.i
 data/src/share/sample/nio/chatserver/MessageReader.java.i
-data/test/java/security/CodeSigner/Serialize.java.i
+data/test/javax/print/applet/applet4/Applet4PrintServiceLookup.java.i
 data/src/share/back/eventFilterRestricted.h.i
 data/src/share/classes/sun/nio/ch/Util.java.i
 data/test/sun/security/pkcs11/nss/lib/linux-i586/libnssckbi.so.i
-data/test/java/util/Collections/Ser.java.i
+data/src/share/classes/sun/text/resources/FormatData_zh_SG.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUIAccessor.java.i
 data/test/java/security/UnresolvedPermission/Debug.policy.i
 data/src/windows/classes/sun/awt/windows/WScrollbarPeer.java.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties.i
 data/src/share/classes/java/rmi/server/SkeletonMismatchException.java.i
-data/src/share/classes/com/sun/crypto/provider/PBECipherCore.java.i
-data/src/share/native/sun/java2d/loops/Ushort555Rgb.h.i
+data/src/share/classes/javax/management/MBeanFeatureInfo.java.i
 data/src/windows/native/sun/java2d/windows/WindowsFlags.cpp.i
-data/test/java/nio/channels/Selector/KeysReady.java.i
+data/src/share/classes/javax/swing/table/AbstractTableModel.java.i
 data/src/share/classes/java/security/KeyPairGeneratorSpi.java.i
-data/test/sun/security/pkcs11/ec/pkcs12/sect193r1server-rsa1024ca.p12.i
 data/test/sun/security/util/DerInputBuffer/DerInputBufferEqualsHashCode.java.i
 data/src/share/classes/java/rmi/UnmarshalException.java.i
-data/src/share/classes/java/awt/image/DataBufferByte.java.i
 data/src/share/classes/javax/management/PersistentMBean.java.i
 data/src/share/classes/com/sun/jmx/remote/internal/ArrayQueue.java.i
 data/src/share/classes/com/sun/beans/decoder/ObjectElementHandler.java.i
-data/test/javax/swing/ToolTipManager/Test6256140.java.i
-data/src/share/classes/javax/swing/colorchooser/ColorSelectionModel.java.i
+data/test/javax/security/auth/login/Configuration/GetInstanceConfigSpi.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java.i
 data/test/java/io/PrintStream/ClearErrorStream.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/ClassConverter.java.i
 data/src/share/classes/sun/io/CharToByteISO2022CN_CNS.java.i
-data/test/sun/security/pkcs11/fips/certs/anchor.cer.i
+data/src/solaris/classes/sun/awt/X11/XCustomCursor.java.i
 data/src/share/native/sun/security/pkcs11/j2secmod.c.i
 data/test/java/math/BigDecimal/IntegralDivisionTests.java.i
 data/src/share/native/sun/font/layout/Lookups.cpp.i
-data/src/share/classes/sun/security/action/PutAllAction.java.i
 data/src/windows/native/sun/windows/awt_Panel.cpp.i
 data/src/share/classes/java/lang/Enum.java.i
 data/src/share/classes/java/text/NumberFormat.java.i
@@ -1605,24 +1610,22 @@ data/test/java/text/Bidi/BidiSurrogateTest.java.i
 data/make/com/sun/nio/sctp/Makefile.i
 data/src/share/classes/javax/swing/text/html/parser/TagStack.java.i
 data/test/java/net/DatagramSocket/PortUnreachable.java.i
-data/test/com/sun/net/httpserver/Test13.java.i
-data/test/java/util/EnumSet/EnumSetBash.java.i
+data/src/share/classes/java/awt/peer/TrayIconPeer.java.i
 data/test/org/openjdk/jigsaw/hello-jar.sh.i
 data/src/solaris/doc/sun/man/man1/javaws.1.i
 data/test/java/lang/Class/TypeCheckMicroBenchmark.java.i
-data/src/share/classes/sun/io/ByteToCharCp852.java.i
-data/test/sun/misc/Cleaner/ExitOnThrow.java.i
+data/test/com/sun/awt/Translucency/TranslucentJAppletTest/TranslucentJAppletTest.java.i
+data/src/solaris/native/java/net/linux_close.c.i
 data/src/share/classes/sun/io/ByteToCharISO8859_4.java.i
 data/test/java/awt/TextField/ScrollSelectionTest/ScrollSelectionTest.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java.i
-data/make/sun/security/jgss/Makefile.i
 data/src/share/native/sun/java2d/Disposer.c.i
+data/src/share/classes/sun/security/x509/CertificateValidity.java.i
 data/src/share/classes/com/sun/net/httpserver/HttpsServer.java.i
 data/src/share/classes/java/nio/file/attribute/AttributeView.java.i
 data/test/java/net/URLConnection/Responses.java.i
-data/src/share/classes/sun/security/x509/CertException.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiViewportUI.java.i
-data/test/com/sun/servicetag/FindServiceTags.java.i
+data/src/solaris/classes/sun/java2d/xr/XRBackend.java.i
 data/src/share/bin/main.c.i
 data/make/tools/CharsetMapping/IBM930.map.i
 data/src/share/classes/java/awt/SequencedEvent.java.i
@@ -1631,6 +1634,7 @@ data/src/share/classes/sun/tools/java/ParserActions.java.i
 data/test/javax/management/Introspector/AnnotationSecurityTest.java.i
 data/test/java/io/BufferedReader/SkipNegative.java.i
 data/src/share/classes/java/awt/RadialGradientPaintContext.java.i
+data/src/share/classes/java/util/concurrent/atomic/AtomicLong.java.i
 data/test/javax/sound/midi/Gervill/SoftTuning/Load9.java.i
 data/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java.i
 data/src/share/classes/sun/security/krb5/internal/EncTGSRepPart.java.i
@@ -1639,24 +1643,27 @@ data/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java.i
 data/src/share/classes/sun/reflect/generics/tree/ShortSignature.java.i
 data/src/share/classes/com/sun/media/sound/DLSModulator.java.i
 data/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.login.i
-data/src/share/classes/javax/swing/InputVerifier.java.i
+data/src/share/classes/sun/security/krb5/internal/LastReq.java.i
+data/src/share/classes/java/util/concurrent/FutureTask.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java.i
 data/src/share/classes/java/security/KeyRep.java.i
 data/test/java/lang/Runtime/exec/BadEnvp.java.i
 data/src/share/classes/javax/swing/SpinnerNumberModel.java.i
+data/src/share/classes/org/openjdk/jigsaw/cli/Commands.java.i
 data/make/modules/tools/src/com/sun/classanalyzer/ClassFileParser.java.i
 data/src/share/classes/com/sun/pept/Delegate.java.i
 data/src/share/classes/javax/swing/plaf/basic/LazyActionMap.java.i
 data/test/java/rmi/activation/Activatable/inactiveGroup/ActivateMe.java.i
-data/src/share/classes/sun/security/tools/KeyStoreUtil.java.i
+data/src/share/classes/javax/print/FlavorException.java.i
 data/src/share/classes/sun/security/action/OpenFileInputStreamAction.java.i
 data/test/sun/security/tools/keytool/CloneKeyAskPassword.jks.i
-data/src/share/classes/sun/net/smtp/SmtpClient.java.i
 data/src/share/classes/java/awt/PrintGraphics.java.i
 data/test/java/util/concurrent/Phaser/FickleRegister.java.i
 data/test/java/net/URLConnection/contentHandler/UserContentHandler.java.i
-data/test/java/beans/Introspector/Test6528714.java.i
+data/test/lib/security/cacerts/VerifyCACerts.java.i
+data/test/java/io/LineNumberReader/Read.java.i
 data/src/share/classes/sun/tools/tree/AssignRemainderExpression.java.i
+data/test/java/lang/Runtime/exec/setcwd.sh.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java.i
 data/src/windows/classes/sun/security/mscapi/RSACipher.java.i
@@ -1668,12 +1675,12 @@ data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSo
 data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy.i
 data/src/share/classes/java/lang/invoke/MethodHandles.java.i
 data/src/share/sample/jmx/jmx-scandir/nbproject/project.xml.i
-data/src/share/instrument/Reentrancy.h.i
+data/make/tools/swing-beans/beaninfo/images/JToolBarColor16.gif.i
 data/src/share/classes/javax/swing/text/html/AccessibleHTML.java.i
 data/src/share/classes/javax/swing/text/StyledDocument.java.i
 data/src/share/classes/javax/swing/text/GapContent.java.i
 data/src/share/classes/sun/rmi/transport/proxy/HttpSendInputStream.java.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy24.i
+data/src/share/classes/java/awt/JobAttributes.java.i
 data/src/share/classes/javax/crypto/spec/PSource.java.i
 data/src/share/classes/java/beans/ChangeListenerMap.java.i
 data/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure_Stub.java.i
@@ -1681,37 +1688,36 @@ data/src/share/classes/com/sun/jarsigner/ContentSignerParameters.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java.i
 data/make/com/sun/tools/Makefile.i
 data/test/java/io/Serializable/unshared/Write.java.i
-data/test/java/rmi/activation/Activatable/nonExistentActivatable/group.security.policy.i
+data/test/java/net/URLClassLoader/getresourceasstream/test.sh.i
 data/test/java/awt/Component/Revalidate/Revalidate.java.i
-data/src/share/sample/nio/file/AclEdit.java.i
-data/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh.i
+data/src/share/classes/sun/security/x509/CertificateSerialNumber.java.i
+data/src/solaris/classes/sun/nio/ch/SctpSendFailed.java.i
 data/src/linux/doc/man/jmap.1.i
-data/test/sun/java2d/XRenderBlitsTest.java.i
+data/src/share/classes/sun/tools/jar/JarException.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java.i
 data/test/java/net/Authenticator/BasicTest3.java.i
 data/src/share/classes/sun/text/resources/CollationData_hi.java.i
 data/src/share/classes/java/awt/dnd/DropTargetDropEvent.java.i
+data/src/solaris/native/sun/nio/fs/genUnixConstants.c.i
 data/src/share/classes/sun/text/resources/FormatData_en_ZA.java.i
 data/test/javax/swing/JSlider/6923305/bug6923305.java.i
 data/src/windows/native/sun/windows/Devices.cpp.i
 data/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java.i
 data/make/tools/src/build/tools/jdwpgen/ThreadGroupObjectTypeNode.java.i
-data/test/sun/net/www/protocol/jar/jarbug/src/test/RunAllTests.java.i
 data/test/sun/nio/cs/SurrogateGB18030Test.java.i
 data/src/share/classes/java/util/spi/CurrencyNameProvider.java.i
-data/src/solaris/native/sun/java2d/loops/vis_ByteGray_FromRgb.c.i
 data/src/solaris/native/sun/java2d/loops/vis_FourByteAbgr.c.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java.i
 data/src/solaris/classes/sun/awt/motif/MPopupMenuPeer.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert_1.c.i
-data/src/share/classes/java/util/logging/Level.java.i
-data/test/javax/security/auth/Subject/Serial.java.i
+data/src/linux/doc/man/jsadebugd.1.i
 data/src/share/classes/javax/swing/JTextPane.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_HN.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java.i
 data/src/share/classes/javax/security/auth/AuthPermission.java.i
-data/src/share/classes/java/lang/InstantiationException.java.i
+data/make/netbeans/common/windows-sources.ent.i
+data/src/share/classes/sun/jkernel/StandaloneByteArrayAccess.java.i
 data/src/share/classes/sun/io/ByteToCharKOI8_R.java.i
-data/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java.i
+data/test/java/lang/Runtime/exec/StreamsSurviveDestroy.java.i
 data/test/java/lang/reflect/DefaultAccessibility.java.i
 data/src/share/classes/java/rmi/RMISecurityManager.java.i
 data/test/java/awt/regtesthelpers/AbstractPolicyTest.java.i
@@ -1721,15 +1727,17 @@ data/src/share/classes/sun/awt/image/VSyncedBSManager.java.i
 data/test/java/nio/channels/SocketChannel/LocalAddress.java.i
 data/src/share/native/sun/awt/image/awt_parseImage.h.i
 data/test/java/nio/channels/Selector/LotsOfChannels.java.i
-data/test/sun/text/resources/Collator/Bug4848897.java.i
+data/src/share/classes/java/io/InputStreamReader.java.i
+data/src/share/classes/sun/tools/javac/CompilerMember.java.i
 data/src/share/classes/sun/nio/fs/AbstractPoller.java.i
 data/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableCallbackHandler.java.i
-data/test/javax/imageio/plugins/jpeg/ConcurrentReadingTest.java.i
+data/test/javax/print/LookupServices.java.i
 data/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh.i
+data/src/share/classes/javax/management/event/EventConsumer.java.i
 data/src/share/classes/java/beans/beancontext/BeanContextChildSupport.java.i
 data/src/share/classes/sun/misc/SoftCache.java.i
 data/src/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java.i
-data/src/share/classes/sun/awt/image/OffScreenImageSource.java.i
+data/src/share/classes/java/nio/file/CopyMoveHelper.java.i
 data/src/share/classes/sun/rmi/rmic/newrmic/IndentingWriter.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java.i
@@ -1738,20 +1746,18 @@ data/src/share/classes/java/awt/dnd/DragSource.java.i
 data/test/sun/nio/cs/FindOneCharEncoderBugs.java.i
 data/src/share/classes/sun/tools/tree/CompoundStatement.java.i
 data/src/share/classes/java/security/acl/AclEntry.java.i
-data/test/com/sun/jdi/ClassesByName2Test.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_ru.properties.i
+data/src/share/classes/java/awt/event/MouseMotionAdapter.java.i
 data/make/org/ietf/jgss/Makefile.i
 data/src/share/classes/com/sun/jmx/mbeanserver/Repository.java.i
 data/make/javax/sql/Makefile.i
 data/src/windows/native/sun/jkernel/kernel_zh.rc.i
 data/src/share/native/sun/font/layout/SegmentArrayProcessor.h.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ar_DZ.properties.i
-data/src/share/native/sun/awt/image/cvutils/img_output8.h.i
-data/src/share/classes/sun/net/www/protocol/http/AuthScheme.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthCheckBoxUI.java.i
+data/test/javax/management/openmbean/EqualsTest.java.i
 data/src/share/classes/java/util/concurrent/RecursiveTask.java.i
 data/test/com/sun/java/swing/plaf/gtk/Test6963870.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.xsd.i
-data/src/share/classes/sun/security/krb5/internal/SeqNumber.java.i
 data/test/java/awt/Focus/RequestFocusAndHideTest/RequestFocusAndHideTest.java.i
 data/src/share/classes/sun/io/ByteToCharCp1142.java.i
 data/src/share/classes/javax/swing/colorchooser/ValueFormatter.java.i
@@ -1761,83 +1767,88 @@ data/src/share/native/sun/font/bidi/jbidi.h.i
 data/src/share/native/java/lang/fdlibm/src/w_log.c.i
 data/src/share/classes/sun/swing/DefaultLookup.java.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderResources.java.i
-data/src/share/native/sun/java2d/pipe/ShapeSpanIterator.c.i
 data/src/share/classes/java/net/URLEncoder.java.i
 data/test/java/lang/Runtime/exec/LotsOfOutput.java.i
-data/src/share/native/sun/java2d/loops/AnyByte.c.i
-data/test/java/lang/instrument/RedefineClassWithNativeMethod.sh.i
+data/src/share/classes/javax/xml/crypto/KeySelector.java.i
 data/src/share/classes/sun/awt/im/InputMethodJFrame.java.i
 data/test/com/sun/security/auth/callback/TextCallbackHandler/Password.java.i
 data/src/solaris/native/sun/java2d/opengl/J2D_GL/glxext.h.i
-data/src/share/classes/java/awt/geom/IllegalPathStateException.java.i
 data/src/share/classes/java/security/cert/CertificateParsingException.java.i
-data/test/java/util/ResourceBundle/RestrictedBundleTest.html.i
 data/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/IsSoundbankSupported.java.i
 data/src/share/classes/javax/accessibility/AccessibleAction.java.i
-data/test/java/awt/EventQueue/SecondaryLoopTest/SecondaryLoopTest.java.i
 data/make/tools/src/build/tools/javazic/Time.java.i
 data/src/share/classes/sun/io/ByteToCharCp861.java.i
 data/src/share/classes/sun/tools/tree/DoubleExpression.java.i
 data/test/java/net/InetAddress/ptr/Lookup.java.i
 data/src/share/native/sun/security/ec/ecl-curve.h.i
-data/test/sun/nio/cs/TestEUC_TW.java.i
+data/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java.i
+data/src/solaris/classes/sun/awt/X11/XHorizontalScrollbar.java.i
 data/make/sun/javazic/tzdata/southamerica.i
-data/test/org/openjdk/jigsaw/cli/ModuleFormatTest01.sh.i
+data/src/share/classes/java/security/spec/ECParameterSpec.java.i
+data/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c.i
 data/src/share/classes/java/lang/annotation/AnnotationFormatError.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java.i
 data/test/com/sun/jdi/JdbArgTest.sh.i
+data/src/share/classes/sun/rmi/registry/resources/rmiregistry.properties.i
 data/src/share/classes/sun/nio/cs/IBM858.java.i
 data/test/sun/tools/common/SleeperApplication.java.i
 data/make/tools/CharsetMapping/IBM280.c2b.i
-data/src/share/classes/org/openjdk/jigsaw/Resolution.java.i
+data/src/share/classes/sun/swing/AccumulativeRunnable.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java.i
 data/test/java/util/TreeMap/SubMapClear.java.i
 data/src/share/classes/java/io/SyncFailedException.java.i
-data/test/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java.i
+data/src/share/classes/sun/management/resources/agent_it.properties.i
 data/src/share/demo/nbproject/management/JTop/nbproject/netbeans-targets.xml.i
 data/src/share/classes/sun/awt/image/BufImgSurfaceManager.java.i
 data/test/java/net/URLClassLoader/sealing/manifest.i
 data/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java.i
-data/src/share/classes/sun/security/ssl/Alerts.java.i
-data/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java.i
+data/test/java/net/URLConnection/ResendPostBody.java.i
 data/src/windows/classes/sun/nio/fs/WindowsUserPrincipals.java.i
 data/src/share/classes/sun/text/resources/FormatData_fr_CH.java.i
 data/src/share/classes/java/security/acl/package.html.i
 data/src/solaris/classes/sun/awt/motif/MScrollbarPeer.java.i
 data/make/sun/serialver/Makefile.i
 data/test/tools/launcher/ClassPathWildCard.sh.i
+data/src/share/test/pack200/pack.conf.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.rng.i
 data/test/javax/management/interop/MBeanExceptionInteropTest.java.i
+data/src/share/classes/java/util/concurrent/AbstractExecutorService.java.i
 data/test/java/awt/Window/GrabSequence/GrabSequence.java.i
-data/src/share/demo/scripting/jconsole-plugin/src/scripts/verbose.js.i
+data/src/share/classes/javax/management/openmbean/TabularType.java.i
 data/src/share/classes/java/awt/TrayIcon.java.i
 data/test/com/sun/jdi/NotAField.sh.i
 data/test/java/net/URLEncoder/DecodeNonEncoded.java.i
+data/src/share/classes/sun/util/locale/LanguageTag.java.i
 data/src/share/classes/sun/rmi/transport/tcp/MultiplexInputStream.java.i
 data/make/tools/CharsetMapping/IBM866.map.i
 data/make/mkdemo/management/Makefile.i
+data/test/sun/security/mscapi/AccessKeyStore.sh.i
 data/test/java/net/ProxySelector/ProxyTest.java.i
 data/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh.i
+data/test/javax/management/MBeanInfo/TooManyFooTest.java.i
 data/src/share/classes/sun/awt/shell/ShellFolderColumnInfo.java.i
 data/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java.i
 data/make/sun/native2ascii/Makefile.i
 data/src/solaris/hpi/native_threads/src/mutex_md.c.i
+data/src/share/classes/sun/util/resources/CurrencyNames_de.properties.i
 data/src/share/classes/javax/swing/text/Highlighter.java.i
 data/test/java/io/Serializable/oldTests/ValidateClass.java.i
 data/test/java/io/Serializable/resolveClass/consTest/run.sh.i
 data/src/windows/classes/sun/awt/windows/WPrintDialog.java.i
-data/src/share/classes/sun/text/normalizer/Utility.java.i
-data/test/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java.i
+data/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html.i
 data/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java.i
 data/src/share/classes/java/net/URLDecoder.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S16Func.c.i
 data/src/share/classes/sun/security/ssl/SSLEngineImpl.java.i
+data/src/share/demo/jvmti/heapViewer/sample.makefile.txt.i
 data/test/java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java.i
 data/test/java/nio/channels/Selector/SelectAndCancel.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_is.properties.i
 data/src/share/classes/java/lang/Error.java.i
+data/src/share/classes/sun/text/resources/FormatData_sr_ME.java.i
+data/make/sun/security/smartcardio/Makefile.i
 data/src/share/classes/java/rmi/server/RemoteObject.java.i
 data/src/share/classes/javax/swing/plaf/basic/DesktopIconMover.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.so.d
@@ -1845,16 +1856,20 @@ data/src/share/classes/sun/beans/infos/ComponentBeanInfo.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.so.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments2.java.i
 data/src/share/classes/java/util/FormattableFlags.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM949C.java.i
+data/src/share/demo/jfc/TableExample/TableExample.java.i
 data/src/windows/native/sun/windows/awt_Pen.cpp.i
 data/src/share/classes/sun/security/x509/NameConstraintsExtension.java.i
+data/make/tools/CharsetMapping/IBM942.c2b.i
+data/src/share/classes/java/security/spec/ECField.java.i
 data/test/java/io/Serializable/evolution/AddedExternField/run.sh.i
+data/src/share/classes/sun/io/ByteToCharCp33722.java.i
 data/src/share/native/sun/java2d/loops/FillPath.c.i
 data/src/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java.i
 data/src/share/lib/colorname.properties.i
 data/src/share/classes/sun/tools/jconsole/Resources.java.i
 data/src/share/classes/java/lang/LinkageError.java.i
 data/test/java/rmi/activation/Activatable/inactiveGroup/security.policy.i
-data/test/javax/management/query/CustomQueryTest.java.i
 data/src/share/classes/java/nio/channels/spi/AbstractSelector.java.i
 data/src/share/classes/com/sun/jmx/snmp/daemon/ClientHandler.java.i
 data/src/share/native/sun/font/bidi/cmemory.h.i
@@ -1862,80 +1877,78 @@ data/src/share/classes/com/sun/crypto/provider/BlowfishKeyGenerator.java.i
 data/make/com/sun/Makefile.i
 data/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java.i
 data/test/javax/swing/SwingWorker/6880336/NestedWorkers.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHost.java.i
 data/src/share/classes/com/sun/java/util/jar/pack/intrinsic.properties.i
 data/src/share/classes/javax/swing/tree/package.html.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java.i
+data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java.i
 data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/PublicInterface1.java.i
 data/make/tools/swing-beans/beaninfo/images/JProgressBarColor32.gif.i
 data/test/java/net/URLConnection/jars/test.jar.i
-data/src/share/classes/javax/naming/LinkRef.java.i
+data/src/solaris/classes/sun/awt/motif/X11DropTargetContextPeer.java.i
 data/test/javax/management/namespace/WombatMBean.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalBumps.java.i
 data/make/netbeans/common/sample-sources.ent.i
 data/src/share/classes/javax/swing/LookAndFeel.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath.java.i
-data/test/sun/security/provider/PolicyParser/ExpansionErrorMisleading.java.i
+data/test/sun/security/pkcs11/Provider/Login.java.i
 data/src/share/classes/sun/beans/editors/EnumEditor.java.i
-data/test/java/beans/Beans/Test4080522.java.i
+data/src/windows/native/sun/windows/awt_Win32GraphicsConfig.h.i
 data/test/com/sun/net/httpserver/Test7.java.i
 data/make/tools/CharsetMapping/IBM277.map.i
-data/src/windows/native/sun/windows/awt_KeyEvent.cpp.i
 data/test/java/net/InetAddress/BadDottedIPAddress.java.i
+data/src/share/classes/java/security/AlgorithmParametersSpi.java.i
 data/make/sun/pisces/Makefile.i
 data/test/sun/nio/cs/OLD/MS949_OLD.java.i
 data/test/com/sun/nio/sctp/SctpChannel/SocketOptionTests.java.i
 data/src/share/classes/sun/misc/ASCIICaseInsensitiveComparator.java.i
 data/src/share/classes/java/security/BasicPermission.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/PainterImpl.template.i
+data/src/share/classes/sun/print/RasterPrinterJob.java.i
 data/test/java/security/KeyStore/EntryMethods.java.i
-data/test/java/util/concurrent/FutureTask/Customized.java.i
+data/test/java/io/Serializable/oldTests/ArrayFields.java.i
 data/src/share/classes/sun/font/ExtendedTextSourceLabel.java.i
 data/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java.i
 data/test/java/util/logging/LoggerSubclass.java.i
-data/src/share/classes/org/openjdk/jigsaw/LibraryPool.java.i
+data/src/linux/doc/man/policytool.1.i
 data/make/tools/CharsetMapping/IBM1383.nr.i
 data/src/share/classes/sun/misc/resources/Messages_de.java.i
 data/src/share/native/sun/font/layout/ArabicShaping.h.i
-data/test/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java.i
 data/src/share/classes/sun/management/counter/perf/LongArrayCounterSnapshot.java.i
 data/src/share/classes/javax/security/auth/Destroyable.java.i
-data/src/share/classes/javax/swing/AbstractCellEditor.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnssckbi.so.i
 data/src/share/classes/com/sun/jmx/namespace/JMXNamespaceUtils.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicPanelUI.java.i
 data/src/share/classes/sun/dyn/util/BytecodeName.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_GT.java.i
+data/make/netbeans/jmx/build.properties.i
 data/src/share/classes/sun/misc/FloatingDecimal.java.i
 data/src/share/classes/javax/print/attribute/standard/NumberUpSupported.java.i
+data/src/solaris/hpi/native_threads/include/condvar_md.h.i
 data/src/share/classes/java/beans/MethodDescriptor.java.i
 data/src/share/classes/sun/nio/cs/ext/MS932_0213.java.i
-data/test/java/nio/channels/FileChannel/TransferToNonWritable.java.i
+data/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java.i
 data/test/java/io/Serializable/checkModifiers/CheckModifiers.java.i
+data/test/javax/management/remote/mandatory/connectorServer/StandardForwardersTest.java.i
 data/test/java/lang/reflect/TypeVariable/TestAnnotatedElement.java.i
 data/src/share/classes/sun/security/x509/UniqueIdentity.java.i
-data/make/netbeans/jdwpgen/nbproject/sqe.properties.i
 data/src/share/classes/java/awt/doc-files/Label-1.gif.i
 data/src/share/classes/sun/security/util/Resources_pt_BR.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java.i
-data/test/java/lang/instrument/BootClassPath/Setup.java.i
+data/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java.i
 data/test/javax/security/auth/x500/X500Principal/InvalidConstructorInput.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java.i
-data/test/java/beans/PropertyEditor/TestEnumSubclassJava.java.i
+data/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM863.java.i
 data/src/share/classes/sun/dyn/anon/ConstantPoolParser.java.i
-data/src/share/sample/jmx/jmx-scandir/build.xml.i
 data/make/tools/CharsetMapping/IBM1147.c2b.i
 data/src/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java.i
-data/make/tools/src/build/tools/charsetmapping/GenerateMapping.java.i
 data/src/share/classes/java/lang/ExceptionInInitializerError.java.i
 data/src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java.i
 data/src/share/classes/sun/security/provider/DSA.java.i
 data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java.i
-data/src/share/native/sun/font/layout/MorphStateTables.h.i
+data/src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java.i
 data/test/java/awt/Toolkit/RealSync/RealSyncOnEDT.java.i
 data/src/share/classes/sun/nio/ch/ChannelInputStream.java.i
-data/src/share/classes/sun/nio/cs/SingleByteDecoder.java.i
+data/src/share/classes/sun/io/CharToByteCp285.java.i
 data/test/java/lang/Throwable/StackTraceSerialization.java.i
-data/test/javax/management/eventService/EventClientExecutorTest.java.i
 data/test/java/beans/PropertyEditor/TestBooleanType.java.i
 data/test/java/nio/channels/FileChannel/ClosedByInterrupt.java.i
 data/test/java/rmi/reliability/benchmark/bench/rmi/BenchServerImpl.java.i
@@ -1948,11 +1961,10 @@ data/test/java/lang/instrument/PremainClass/InheritAgent1101.java.i
 data/src/share/native/sun/font/layout/ArabicShaping.cpp.i
 data/test/javax/management/Introspector/ObjectNameTemplateTest.java.i
 data/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java.i
-data/test/java/util/ResourceBundle/Bug4177489_Resource_jf_JF.properties.i
-data/test/java/rmi/reliability/juicer/Apple.java.i
+data/src/share/classes/com/sun/java/browser/dom/DOMService.java.i
+data/test/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java.i
 data/test/java/util/prefs/RemoveUnregedListener.java.i
-data/test/com/sun/jdi/redefine/RedefineSubTarg.java.i
-data/test/javax/swing/text/GlyphView/6539700/bug6539700.java.i
+data/src/share/demo/jfc/CodePointIM/CodePointInputMethod.java.i
 data/src/share/classes/com/sun/jmx/snmp/internal/SnmpAccessControlSubSystem.java.i
 data/test/java/awt/Mixing/LWComboBox.java.i
 data/src/share/classes/java/security/cert/X509Extension.java.i
@@ -1961,12 +1973,10 @@ data/src/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java.i
 data/make/modules/modules.group.i
 data/make/jpda/jdwp/Makefile.i
 data/src/share/classes/java/security/cert/CertPathValidatorException.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif.i
 data/src/share/classes/java/lang/instrument/ClassDefinition.java.i
-data/test/java/math/BigInteger/ModPow.java.i
 data/src/share/classes/com/sun/media/sound/ModelTransform.java.i
 data/src/share/native/sun/font/bidi/utypes.h.i
-data/src/share/instrument/JPLISAgent.h.i
-data/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java.i
 data/test/java/lang/instrument/SingleTransformerTest.java.i
 data/test/java/io/Serializable/serialver/classpath/run.sh.i
 data/src/share/classes/java/security/spec/ECPublicKeySpec.java.i
@@ -1978,7 +1988,7 @@ data/test/java/awt/PrintJob/Security/policy.i
 data/make/tools/src/build/tools/jdwpgen/MethodTypeNode.java.i
 data/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java.i
 data/src/share/classes/sun/security/x509/KeyUsageExtension.java.i
-data/src/share/classes/sun/tools/jconsole/resources/mbean.gif.i
+data/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c.i
 data/test/java/awt/Focus/ShowFrameCheckForegroundTest/ShowFrameCheckForegroundTest.java.i
 data/src/share/classes/sun/tools/java/Imports.java.i
 data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain8.txt.i
@@ -1988,70 +1998,72 @@ data/test/com/sun/jdi/ThreadGroupTest.java.i
 data/src/share/classes/java/util/jar/JarException.java.i
 data/src/share/classes/sun/misc/BootClassLoaderHook.java.i
 data/test/java/beans/XMLEncoder/6777487/TestEnumSet.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java.i
 data/src/share/classes/javax/management/remote/SubjectDelegationPermission.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/GeneratorUtils.java.i
 data/src/share/classes/sun/reflect/UnsafeObjectFieldAccessorImpl.java.i
 data/test/sun/tools/jps/jps_Output1.awk.i
 data/src/share/native/java/util/zip/zlib-1.2.3/patches/ChangeLog_java.i
-data/src/share/native/sun/security/ec/impl/ecl_curve.c.i
+data/src/share/native/sun/java2d/loops/IntArgbBm.c.i
+data/test/javax/security/auth/login/Configuration/GetInstanceSecurity.grantedPolicy.i
 data/test/com/sun/servicetag/UpdateServiceTagTest.java.i
 data/src/share/classes/java/awt/LinearGradientPaint.java.i
 data/src/share/classes/com/sun/media/sound/ModelInstrument.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.so.d
 data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11.java.i
+data/src/share/classes/sun/security/x509/CertificateIssuerName.java.i
 data/src/share/classes/sun/io/CharToByteMS950.java.i
+data/src/share/classes/java/awt/peer/MenuBarPeer.java.i
 data/src/share/classes/sun/tools/jconsole/resources/expand-winlf.png.i
 data/src/share/classes/javax/xml/crypto/dsig/DigestMethod.java.i
 data/src/share/classes/sun/tools/tree/AssignShiftLeftExpression.java.i
+data/src/solaris/classes/sun/awt/motif/MInputMethodDescriptor.java.i
 data/src/share/classes/java/text/AttributedString.java.i
 data/src/share/classes/com/sun/tracing/dtrace/Attributes.java.i
 data/test/sun/nio/cs/TestMS5022X.java.i
+data/src/share/classes/sun/text/resources/FormatData_fi.java.i
 data/test/java/rmi/activation/Activatable/unregisterInactive/ActivateMe.java.i
-data/test/sun/rmi/rmic/newrmic/equivalence/batch.sh.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostTrap.java.i
 data/src/windows/native/sun/java2d/windows/dxInit.h.i
 data/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java.i
 data/src/share/classes/javax/swing/table/DefaultTableModel.java.i
 data/src/share/classes/java/lang/invoke/MethodTypeForm.java.i
-data/test/java/net/Socket/InheritTimeout.java.i
+data/src/share/classes/javax/xml/crypto/dsig/SignedInfo.java.i
 data/test/java/io/File/DeleteOnExitLong.java.i
 data/make/sun/jconsole/Makefile.i
 data/src/share/classes/com/sun/net/httpserver/HttpPrincipal.java.i
 data/src/share/classes/sun/java2d/pipe/DrawImage.java.i
 data/src/solaris/native/sun/awt/awt_TopLevel.c.i
-data/src/solaris/doc/sun/man/man1/ja/jdb.1.i
+data/src/share/classes/sun/awt/GlobalCursorManager.java.i
 data/src/share/classes/sun/security/timestamp/Timestamper.java.i
 data/test/java/io/readBytes/ReadBytesBounds.java.i
-data/src/share/classes/javax/sound/midi/spi/package.html.i
+data/src/windows/classes/sun/awt/windows/awtLocalization_ja.properties.i
 data/test/java/util/concurrent/locks/ReentrantReadWriteLock/RWMap.java.i
 data/test/javax/security/auth/kerberos/KerberosHashEqualsTest.java.i
 data/src/share/classes/sun/tools/asm/ConstantPoolData.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/LoopbackSSLSocket.java.i
 data/src/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties.i
+data/src/share/classes/javax/swing/text/html/HRuleView.java.i
 data/src/share/classes/com/sun/jndi/ldap/jndiprovider.properties.i
 data/src/share/classes/java/nio/file/ProviderNotFoundException.java.i
 data/src/share/classes/java/awt/image/BufferStrategy.java.i
-data/test/java/security/BasicPermission/EqualsImplies.java.i
-data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScanner.java.i
 data/src/share/classes/java/lang/management/ClassLoadingMXBean.java.i
-data/test/java/io/BufferedReader/Ready.java.i
+data/test/java/net/URLClassLoader/closetest/test2/com/foo/TestClass1.java.i
 data/src/share/classes/com/sun/jmx/namespace/HandlerInterceptor.java.i
 data/test/tools/launcher/UnicodeTest.sh.i
+data/src/share/classes/javax/swing/FocusManager.java.i
 data/src/share/classes/javax/swing/plaf/nimbus/Defaults.template.i
 data/src/share/classes/com/sun/crypto/provider/SslMacCore.java.i
 data/test/java/io/Serializable/skipWriteObject/Read.java.i
-data/src/share/classes/javax/management/remote/JMXConnectorFactory.java.i
+data/src/share/lib/audio/soundbank.gm.i
 data/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java.i
-data/src/share/classes/javax/print/attribute/standard/NumberOfDocuments.java.i
 data/src/share/classes/java/applet/AudioClip.java.i
-data/src/solaris/classes/sun/nio/ch/PipeImpl.java.i
+data/src/share/classes/sun/awt/CausedFocusEvent.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/SnmpAcl.java.i
 data/test/java/io/DataInputStream/OpsAfterClose.java.i
-data/test/java/lang/instrument/PremainClass/InheritAgent0101.java.i
+data/src/share/classes/sun/io/ByteToCharSJIS.java.i
 data/src/share/demo/nbproject/management/VerboseGC/nbproject/project.xml.i
 data/test/java/net/URLDecoder/URLDecoderArgs.java.i
 data/src/share/classes/java/awt/datatransfer/MimeTypeParameterList.java.i
-data/src/share/classes/javax/sound/midi/Receiver.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIBorder.java.i
 data/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java.i
 data/src/share/classes/sun/reflect/generics/factory/GenericsFactory.java.i
@@ -2059,68 +2071,66 @@ data/src/share/classes/sun/tools/tree/IntegerExpression.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java.i
 data/src/windows/native/java/net/TwoStacksPlainSocketImpl.c.i
 data/src/share/classes/sun/text/resources/FormatData_ja_JP.java.i
-data/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c.i
+data/src/share/classes/javax/naming/ldap/ControlFactory.java.i
 data/src/share/classes/com/sun/jmx/remote/protocol/iiop/ProxyInputStream.java.i
+data/test/java/nio/channels/DatagramChannel/EmptyBuffer.java.i
 data/src/share/classes/java/beans/Transient.java.i
 data/src/share/classes/java/io/FilterReader.java.i
 data/test/java/awt/image/mlib/mlib.security.policy.i
 data/src/share/classes/java/security/AlgorithmParameters.java.i
 data/test/sun/security/ec/TestEC.java.i
-data/test/javax/xml/crypto/dsig/data/certs/crl.i
+data/src/solaris/doc/sun/man/man1/jdb.1.i
+data/test/javax/swing/JSlider/4987336/box.gif.i
 data/test/sun/text/resources/Format/Bug4810032.java.i
 data/src/share/demo/jfc/CodePointIM/README.html.i
-data/make/tools/GenerateCharacter/CharacterDataLatin1.java.template.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Gradient.java.i
 data/src/share/classes/java/security/cert/Certificate.java.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java.i
 data/test/java/nio/channels/AsynchronousChannelGroup/PrivilegedThreadFactory.java.i
 data/test/javax/swing/JColorChooser/Test4759306.java.i
-data/test/sun/net/www/http/ChunkedInputStream/test.txt.d
 data/test/sun/java2d/cmm/ColorConvertOp/MTSafetyTest.java.i
-data/src/share/classes/sun/text/resources/FormatData_no_NO_NY.java.i
+data/src/share/classes/sun/security/smartcardio/PCSC.java.i
 data/test/sun/security/provider/PolicyFile/Comparator.Combined.Policy.i
 data/src/share/classes/java/lang/NoSuchMethodError.java.i
 data/src/share/demo/applets/BarChart/BarChart.java.i
 data/src/share/bin/manifest_info.h.i
-data/test/java/io/FileInputStream/OpsAfterClose.java.i
+data/src/share/classes/sun/management/snmp/util/SnmpCachedData.java.i
 data/test/sun/security/mscapi/RSAEncryptDecrypt.java.i
 data/test/javax/management/namespace/NullDomainObjectNameTest.java.i
 data/test/java/util/prefs/ExportNode.java.i
 data/src/share/classes/java/awt/event/ContainerListener.java.i
-data/src/share/demo/applets/WireFrame/Matrix3D.java.i
 data/src/solaris/classes/sun/awt/X11/XCanvasPeer.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java.i
-data/src/share/classes/sun/print/SunAlternateMedia.java.i
 data/test/com/sun/jdi/DataModelTest.java.i
-data/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java.i
+data/src/share/classes/sun/nio/cs/ext/MS932DB.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/ProxyTunnelServer.java.i
-data/test/java/rmi/reliability/benchmark/bench/Benchmark.java.i
 data/test/java/net/InetAddress/B6246242.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/FloatArrayCalls.java.i
 data/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp.i
-data/src/share/classes/sun/nio/cs/ext/HKSCS_2001.java.i
+data/test/java/awt/font/NumericShaper/EqualsTest.java.i
 data/test/java/rmi/transport/acceptLoop/CloseServerSocketOnTermination.java.i
 data/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java.i
 data/src/solaris/doc/sun/man/man1/servertool.1.i
 data/src/share/classes/javax/management/openmbean/MXBeanMappingFactory.java.i
 data/test/java/net/NetworkInterface/NetParamsTest.java.i
-data/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java.i
+data/test/sun/net/TelnetTest.java.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/hardDrive.gif.i
 data/test/java/beans/Introspector/Test4619792.java.i
 data/src/share/classes/sun/management/LockDataConverter.java.i
 data/test/java/net/InetAddress/IsHostReachableBug.java.i
 data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java.i
-data/src/share/native/sun/font/layout/HanLayoutEngine.cpp.i
 data/test/javax/management/remote/mandatory/subjectDelegation/policy12.i
 data/src/share/native/java/util/zip/zlib-1.1.3/zcrc32.c.i
 data/make/tools/swing-beans/beaninfo/images/JTextPaneColor16.gif.i
 data/test/tools/launcher/lib/sparc/lib64/liblibrary.so.i
-data/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh.i
+data/src/share/sample/nio/server/RequestServicer.java.i
 data/src/share/classes/java/util/ListResourceBundle.java.i
 data/src/share/classes/javax/naming/spi/ObjectFactoryBuilder.java.i
 data/src/share/classes/java/awt/ImageCapabilities.java.i
+data/src/share/classes/sun/tools/serialver/serialver_ja.properties.i
 data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/NextFramePositionCalculator.java.i
 data/src/share/classes/javax/swing/plaf/ScrollPaneUI.java.i
-data/src/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java.i
+data/src/share/classes/javax/management/relation/RelationType.java.i
+data/test/java/util/jar/JarFile/TurkCert.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiSeparatorUI.java.i
 data/src/share/transport/shmem/shmemBase.c.i
 data/test/javax/management/eventService/EventDelegateSecurityTest.java.i
@@ -2131,20 +2141,21 @@ data/src/share/classes/sun/text/resources/FormatData_tr_TR.java.i
 data/make/tools/CharsetMapping/MS950.map.i
 data/src/solaris/classes/sun/awt/X11/XlibUtil.java.i
 data/src/share/classes/java/lang/CharacterName.java.i
-data/test/java/beans/PropertyEditor/Test4968709.java.i
+data/make/sun/cmm/lcms/mapfile-vers.i
+data/src/share/classes/com/sun/media/sound/DLSRegion.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java.i
 data/src/share/classes/com/sun/tracing/Probe.java.i
-data/src/share/classes/java/net/JarURLConnection.java.i
-data/make/com/sun/security/Makefile.i
+data/make/launchers/Makefile.launcher.i
 data/src/share/classes/sun/jvmstat/monitor/AbstractMonitor.java.i
 data/src/share/classes/com/sun/crypto/provider/DHPublicKey.java.i
 data/src/share/classes/java/net/ContentHandlerFactory.java.i
 data/src/share/classes/javax/management/relation/InvalidRelationServiceException.java.i
+data/src/share/classes/com/sun/jmx/event/EventParams.java.i
+data/test/java/rmi/reliability/scripts/create_benchmark_jars.ksh.i
 data/src/share/demo/applets/Clock/Clock.java.i
 data/src/share/classes/java/awt/image/LookupOp.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java.i
+data/make/com/sun/org/Makefile.i
 data/src/share/classes/java/awt/Color.java.i
-data/src/share/classes/sun/io/ByteToCharCp970.java.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java.i
 data/src/share/demo/applets/MoleculeViewer/example3.html.i
 data/test/java/net/CookieHandler/B6277794.java.i
@@ -2152,7 +2163,7 @@ data/test/javax/swing/border/Test4856008.java.i
 data/test/java/net/MulticastSocket/Reuse.java.i
 data/src/share/classes/sun/io/CharToByteCp855.java.i
 data/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java.i
-data/src/share/classes/javax/swing/DebugGraphics.java.i
+data/src/share/classes/javax/print/attribute/standard/MediaSize.java.i
 data/src/share/classes/javax/swing/colorchooser/DefaultHSBChooserPanel.java.i
 data/make/tools/CharsetMapping/IBM939.map.i
 data/src/share/classes/sunw/util/EventObject.java.i
@@ -2161,22 +2172,22 @@ data/src/share/classes/javax/sql/rowset/RowSetProvider.java.i
 data/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java.i
 data/src/share/classes/java/nio/file/NoSuchFileException.java.i
 data/src/share/classes/sun/java2d/opengl/OGLMaskFill.java.i
-data/src/share/classes/javax/swing/ListCellRenderer.java.i
+data/make/jdk_generic_profile.sh.i
+data/src/share/classes/javax/print/ServiceUI.java.i
 data/src/share/classes/java/nio/file/StandardOpenOption.java.i
 data/test/com/sun/security/sasl/gsskerb/gsseg_jaas.conf.i
 data/src/share/classes/com/sun/media/sound/DLSSampleLoop.java.i
 data/src/share/native/java/lang/fdlibm/src/e_log10.c.i
 data/src/share/classes/javax/management/ServiceNotFoundException.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java.i
+data/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java.i
 data/test/java/util/Formatter/BasicInt.java.i
-data/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll.i
 data/src/windows/back/path_md.h.i
 data/test/java/security/testlibrary/ProvidersSnapshot.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/ReachableExcludesImpl.java.i
-data/test/java/util/zip/ZipFile/Available.java.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/Modifier.java.i
 data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/CanCreateStubs.java.i
 data/test/javax/swing/JMenuItem/6883341/bug6883341.java.i
+data/src/share/classes/sun/io/ByteToCharCp1258.java.i
 data/src/share/classes/sun/tools/jconsole/inspector/XTreeRenderer.java.i
 data/make/tools/swing-beans/beaninfo/images/JSliderColor16.gif.i
 data/src/solaris/classes/java/lang/Terminator.java.i
@@ -2186,42 +2197,40 @@ data/src/share/native/sun/java2d/cmm/lcms/lcms.h.i
 data/src/share/native/sun/misc/NativeSignalHandler.c.i
 data/test/java/beans/XMLEncoder/javax_swing_border_CompoundBorder.java.i
 data/src/solaris/native/sun/awt/awt_Component.c.i
-data/test/sun/nio/cs/FindDecoderBugs.java.i
-data/src/share/classes/sun/io/ByteToCharCp1097.java.i
+data/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java.i
+data/src/solaris/doc/sun/man/man1/extcheck.1.i
 data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/MultiSocketFactory.java.i
 data/src/share/classes/sun/print/PeekMetrics.java.i
 data/src/share/classes/com/sun/security/sasl/CramMD5Base.java.i
 data/src/share/classes/sun/security/ssl/krb5/KerberosPreMasterSecret.java.i
 data/test/javax/management/ObjectName/NullEmptyKeyValueTest.java.i
 data/src/share/classes/javax/imageio/metadata/IIOInvalidTreeException.java.i
+data/make/mksample/nbproject/Makefile.i
 data/src/share/classes/com/sun/jndi/ldap/NameClassPairWithControls.java.i
 data/src/share/classes/sun/io/ByteToCharTIS620.java.i
-data/src/share/classes/sun/net/httpserver/ServerImpl.java.i
-data/test/javax/sound/midi/Gervill/SF2SoundbankReader/ding.sf2.i
+data/src/share/classes/java/nio/Buffer.java.i
 data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java.i
 data/src/share/native/java/util/zip/zlib-1.2.3/trees.c.i
 data/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateMe.java.i
+data/src/share/classes/sun/font/TextLabelFactory.java.i
 data/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java.i
-data/src/share/classes/javax/management/NumericValueExp.java.i
-data/src/share/classes/sun/java2d/pipe/SpanClipRenderer.java.i
+data/make/tools/src/build/tools/jdwpgen/TypeNode.java.i
+data/test/java/util/ResourceBundle/Control/StressOut_ja_JP.properties.i
 data/test/java/nio/channels/spi/AsynchronousChannelProvider/META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider.i
-data/test/java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java.i
-data/src/share/back/util.c.i
-data/test/java/security/cert/pkix/policyChanges/ca.cer.i
-data/test/java/nio/charset/spi/Test.java.i
+data/src/share/classes/javax/management/relation/RelationNotification.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java.i
 data/make/mkdemo/jfc/SwingSet2/Makefile.i
 data/test/sun/security/tools/keytool/p11-nss.txt.i
 data/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java.i
-data/src/solaris/native/sun/awt/awt_ScrollPane.c.i
+data/src/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java.i
+data/src/share/classes/java/awt/color/ICC_ColorSpace.java.i
 data/src/share/classes/java/nio/file/attribute/Attributes.java.i
-data/src/share/classes/sun/net/www/content/text/plain.java.i
 data/src/share/classes/sun/management/snmp/util/SnmpTableCache.java.i
 data/src/share/classes/javax/naming/spi/DirStateFactory.java.i
-data/src/share/classes/sun/security/krb5/internal/TGSRep.java.i
+data/make/tools/CharsetMapping/ISO_8859_2.map.i
 data/src/share/classes/javax/net/ssl/KeyManager.java.i
-data/test/java/security/Security/ClassLoaderDeadlock/CreateSerialized.java.i
+data/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java.i
 data/src/share/classes/sun/io/ByteToCharCp930.java.i
 data/src/share/classes/sun/misc/FpUtils.java.i
 data/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider.i
@@ -2232,33 +2241,30 @@ data/test/sun/nio/cs/FindCanEncodeBugs.java.i
 data/test/sun/security/pkcs11/Secmod/nsscrypto.cfg.i
 data/test/javax/swing/Security/6657138/ComponentTest.java.i
 data/test/com/sun/crypto/provider/KeyGenerator/Test4628062.java.i
-data/test/sun/security/ssl/sun/net/www/httpstest/ClosedChannelList.java.i
 data/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.java.i
 data/src/share/classes/java/dyn/CallSite.java.i
 data/src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/PGPData.java.i
 data/src/share/classes/sun/text/resources/FormatData_sv_SE.java.i
 data/src/share/classes/javax/swing/plaf/nimbus/TableScrollPaneCorner.java.i
-data/test/java/awt/im/4490692/bug4490692.html.i
+data/test/java/util/PluggableLocale/providersrc/CollatorProviderImpl.java.i
 data/make/tools/src/build/tools/jdwpgen/FieldTypeNode.java.i
 data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServerMBean.java.i
-data/test/java/awt/regtesthelpers/Sysout.java.i
+data/test/java/dyn/ClassValueTest.java.i
 data/make/javax/others/Makefile.i
 data/src/share/classes/com/sun/script/javascript/META-INF/services/javax.script.ScriptEngineFactory.i
-data/make/netbeans/common/architectures/name-Linux.properties.i
 data/make/modules/image.boot.ls.i
-data/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html.i
 data/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java.i
 data/src/share/classes/sun/security/util/ResourcesMgr.java.i
 data/test/sun/security/tools/jarsigner/concise_jarsigner.sh.i
 data/test/java/beans/PropertyEditor/TestShortClassNull.java.i
+data/src/share/classes/java/awt/image/CropImageFilter.java.i
 data/src/share/classes/javax/naming/directory/InvalidAttributesException.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/Warn.gif.i
+data/test/java/lang/ClassLoader/findSystemClass/Loadee.java.i
 data/make/sun/jconsole/FILES.gmk.i
 data/test/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector.i
 data/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java.i
 data/src/share/classes/java/beans/PropertyVetoException.java.i
-data/test/java/io/LineNumberReader/SkipInput.txt.i
 data/src/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java.i
 data/src/solaris/doc/sun/man/man1/ja/rmid.1.i
 data/src/share/classes/sun/applet/AppletViewerPanel.java.i
@@ -2266,73 +2272,77 @@ data/src/share/classes/sun/management/snmp/jvminstr/JvmClassLoadingImpl.java.i
 data/src/share/classes/java/awt/SentEvent.java.i
 data/src/share/native/sun/awt/image/cvutils/img_nodither.h.i
 data/test/sun/security/pkcs11/KeyStore/BasicData/pk2.cert.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/Klass.java.i
 data/test/sun/nio/cs/OLD/DoubleByteEncoder.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java.i
 data/src/share/classes/java/awt/AWTException.java.i
 data/test/java/lang/Class/getMethods/NonPublicStaticInitializer.java.i
-data/src/solaris/back/util_md.h.i
+data/src/share/classes/java/security/cert/CertStoreParameters.java.i
 data/src/share/classes/sun/print/resources/orientPortrait.png.i
-data/src/share/classes/sun/management/snmp/util/SnmpTableHandler.java.i
+data/src/solaris/native/sun/awt/cursor.c.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmOSMeta.java.i
 data/src/share/classes/com/sun/jmx/interceptor/SingleMBeanForwarder.java.i
 data/src/share/classes/sun/print/SunPrinterJobService.java.i
 data/src/share/sample/nio/chatserver/ClientReader.java.i
 data/src/share/back/error_messages.c.i
-data/src/share/native/sun/security/ec/impl/mpi.c.i
-data/src/share/classes/javax/swing/DefaultListModel.java.i
+data/make/modules/jdk.boot.ls.i
+data/src/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java.i
+data/src/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java.i
+data/src/share/classes/sun/security/ec/ECDSASignature.java.i
 data/src/share/classes/javax/xml/crypto/dom/DOMURIReference.java.i
 data/src/share/classes/com/sun/pept/presentation/Stub.java.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Arrays.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/icons/UpFolder.gif.i
 data/src/share/classes/java/nio/file/ClosedDirectoryStreamException.java.i
 data/make/tools/reorder/tests/Sleep.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java.i
+data/src/share/classes/com/sun/jdi/request/MonitorWaitRequest.java.i
 data/src/share/classes/com/sun/jndi/dns/DnsNameParser.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/HasUIStyle.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java.i
 data/src/share/classes/java/util/prefs/BackingStoreException.java.i
-data/test/com/sun/servicetag/DuplicateNotFound.java.i
+data/src/share/classes/com/sun/jmx/interceptor/DispatchInterceptor.java.i
 data/test/java/util/Timer/NameConstructors.java.i
 data/src/share/classes/com/sun/inputmethods/internal/indicim/java.awt.im.spi.InputMethodDescriptor.i
+data/src/windows/classes/sun/awt/windows/WTextComponentPeer.java.i
 data/test/sun/security/tools/policytool/UsePolicy.java.i
 data/src/share/native/sun/font/layout/ArabicLayoutEngine.h.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java.i
-data/make/tools/src/build/tools/javazic/Gen.java.i
+data/src/windows/classes/sun/nio/ch/PipeImpl.java.i
+data/make/tools/swing-beans/beaninfo/images/JMenuMono16.gif.i
 data/src/share/classes/com/sun/tools/jdi/MonitorInfoImpl.java.i
 data/test/java/awt/dnd/ImageDecoratedDnD/DnDSource.java.i
 data/src/windows/native/sun/windows/awt_MMStub.cpp.i
-data/test/java/rmi/testlibrary/TestFailedException.java.i
+data/test/java/io/PrintStream/FailingConstructors.java.i
 data/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java.i
 data/src/share/classes/sun/text/resources/FormatData_es_EC.java.i
+data/src/share/classes/javax/imageio/spi/PartiallyOrderedSet.java.i
 data/test/java/beans/PropertyEditor/TestFontClassJava.java.i
 data/test/sun/java2d/pipe/MutableColorTest/MutableColorTest.java.i
 data/src/share/sample/scripting/scriptpad/src/scripts/mail.js.i
 data/src/share/classes/sun/text/resources/FormatData_be_BY.java.i
 data/src/share/classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java.i
-data/test/java/lang/Character/PropertyValueAliases.txt.i
-data/src/share/classes/com/sun/security/auth/NTUserPrincipal.java.i
+data/src/share/classes/java/beans/DesignMode.java.i
 data/src/share/classes/com/sun/jmx/snmp/agent/package.html.i
-data/src/solaris/native/common/jlong_md.h.i
 data/src/share/classes/javax/sound/sampled/TargetDataLine.java.i
 data/src/share/classes/sun/security/krb5/internal/EncTicketPart.java.i
-data/test/sun/security/pkcs11/fips/ImportKeyStore.java.i
+data/src/share/classes/javax/swing/doc-files/groupLayout.sequential.vertical.gif.i
 data/test/java/util/ResourceBundle/Bug4257318.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java.i
 data/test/sun/net/www/protocol/http/B6296310.java.i
-data/src/share/classes/sun/text/resources/FormatData_uk.java.i
+data/src/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java.i
 data/src/share/instrument/EncodingSupport.h.i
 data/src/share/classes/org/openjdk/jigsaw/JigsawVersion.java.i
 data/test/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form.i
 data/src/share/classes/com/sun/java/util/jar/pack/Histogram.java.i
-data/src/solaris/classes/sun/net/spi/SdpProvider.java.i
+data/test/javax/crypto/NullCipher/TestWithoutInit.java.i
 data/test/java/io/Serializable/evolution/AddedField/WriteAddedField.java.i
 data/test/sun/java2d/cmm/ColorConvertOp/ColCvtAlpha.java.i
 data/make/tools/CharsetMapping/Big5.nr.i
 data/src/share/classes/com/sun/jndi/ldap/LdapReferralContext.java.i
-data/src/windows/native/sun/windows/awt_Label.cpp.i
+data/src/solaris/native/sun/nio/ch/SctpNet.c.i
 data/src/windows/native/sun/java2d/windows/Win32SurfaceData.cpp.i
 data/test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy.i
 data/src/share/back/ArrayTypeImpl.h.i
+data/src/share/classes/sun/io/ByteToCharCp1143.java.i
 data/src/share/native/sun/java2d/loops/ByteGray.h.i
 data/make/tools/CharsetMapping/IBM852.map.i
 data/src/share/classes/java/io/Flushable.java.i
@@ -2345,14 +2355,14 @@ data/src/share/classes/sun/util/resources/LocaleNames_zh_HK.java.i
 data/src/share/classes/java/lang/Appendable.java.i
 data/src/share/classes/javax/management/ListenerNotFoundException.java.i
 data/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c.i
-data/src/share/classes/org/openjdk/jigsaw/Repository.java.i
 data/src/share/classes/sun/util/resources/CalendarData_fr_CA.properties.i
+data/src/share/native/sun/security/ec/impl/ec2_aff.c.i
 data/src/share/demo/jvmti/waiters/Thread.hpp.i
 data/test/java/beans/XMLEncoder/6380849/TestPersistenceDelegate.java.i
+data/src/share/classes/com/sun/jndi/url/rmi/rmiURLContextFactory.java.i
 data/make/netbeans/common/architectures/arch-sparc.properties.i
-data/src/share/classes/java/awt/package.html.i
-data/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java.i
-data/src/share/classes/sun/tools/tree/LocalMember.java.i
+data/src/solaris/native/sun/awt/awt_InputMethod.c.i
+data/make/templates/gpl-cp-header.i
 data/test/java/nio/charset/coders/CheckSJISMappingProp.sh.i
 data/make/mkdemo/management/VerboseGC/Makefile.i
 data/make/netbeans/common/demo-view.ent.i
@@ -2364,12 +2374,13 @@ data/test/java/lang/module/ModuleAnnotationTest.java.i
 data/make/sun/javazic/tzdata_jdk/jdk11_full_backward.i
 data/src/share/classes/java/awt/geom/Path2D.java.i
 data/src/share/classes/com/sun/crypto/provider/DESedeParameters.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/minimize.gif.i
 data/src/solaris/classes/com/sun/security/auth/module/README.i
 data/src/share/classes/sun/print/ServiceNotifier.java.i
 data/test/javax/swing/JLayer/SerializationTest/SerializationTest.java.i
 data/make/sun/jpeg/reorder-sparcv9.i
 data/test/com/sun/net/httpserver/bugs/B6526158.java.i
-data/src/share/classes/sun/text/resources/FormatData_et_EE.java.i
+data/test/java/awt/FontClass/CreateFont/fileaccess/FontFile.java.i
 data/src/solaris/native/java/net/NetworkInterface.c.i
 data/src/share/classes/sun/rmi/transport/DGCClient.java.i
 data/src/share/classes/javax/swing/text/SimpleAttributeSet.java.i
@@ -2381,40 +2392,38 @@ data/src/share/classes/javax/naming/AuthenticationException.java.i
 data/src/share/classes/javax/crypto/JarVerifier.java.i
 data/test/demo/jvmti/mtrace/TraceJFrame.java.i
 data/src/share/sample/scripting/scriptpad/src/scripts/memory.sh.i
+data/make/tools/GenerateCharacter/Character.c.template.i
 data/make/tools/src/build/tools/jdwpgen/ReplyNode.java.i
-data/test/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.Connector.i
 data/test/java/net/Inet6Address/serialize/serial-bge0.ser.i
 data/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java.i
 data/make/tools/src/build/tools/hasher/Hasher.java.i
 data/src/share/classes/com/sun/net/ssl/internal/ssl/Provider.java.i
+data/src/share/classes/javax/management/openmbean/InvalidKeyException.java.i
 data/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName.java.i
 data/src/share/classes/sun/awt/im/InputMethodWindow.java.i
 data/src/share/classes/javax/security/auth/login/package.html.i
 data/test/sun/rmi/rmic/newrmic/equivalence/Callback.java.i
 data/src/share/classes/com/sun/crypto/provider/ISO10126Padding.java.i
-data/test/java/lang/Runtime/exec/Space.java.i
+data/src/share/classes/java/security/cert/X509CertSelector.java.i
+data/test/java/awt/Toolkit/Headless/AWTEventListener/AWTListener.java.i
 data/test/java/lang/ClassLoader/Assert.sh.i
 data/test/sun/security/krb5/MicroTime.java.i
 data/src/share/classes/sun/net/www/content/image/gif.java.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/RetryHttps.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java.i
+data/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh.i
 data/make/mkdemo/applets/Fractal/Makefile.i
 data/src/share/classes/java/lang/reflect/Field.java.i
 data/src/share/classes/java/security/spec/InvalidParameterSpecException.java.i
-data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain10.txt.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SubjectName.java.i
-data/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp.i
-data/src/share/native/sun/awt/image/jpeg/jmemsys.h.i
+data/make/tools/src/build/tools/charsetmapping/Utils.java.i
 data/test/java/rmi/activation/Activatable/restartService/ActivateMe.java.i
 data/src/share/classes/java/rmi/ServerException.java.i
 data/src/windows/native/sun/java2d/d3d/D3DMaskCache.cpp.i
-data/test/com/sun/jdi/JdbMissStep.sh.i
 data/src/share/classes/sun/java2d/pipe/AlphaColorPipe.java.i
 data/src/share/native/com/sun/media/sound/Platform.c.i
 data/test/java/lang/Runtime/exec/SetCwd.java.i
 data/src/share/classes/java/util/IdentityHashMap.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties.i
-data/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java.i
 data/src/share/classes/sun/security/pkcs11/SessionManager.java.i
 data/src/share/native/sun/tracing/dtrace/jvm_symbols.h.i
 data/src/windows/native/sun/nio/ch/DatagramDispatcher.c.i
@@ -2424,18 +2433,15 @@ data/src/share/classes/com/sun/tools/example/debug/gui/ContextListener.java.i
 data/make/tools/CharsetMapping/IBM948.c2b.i
 data/src/share/classes/javax/swing/text/GlyphPainter1.java.i
 data/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java.i
-data/test/com/sun/security/sasl/digest/Privacy.java.i
 data/test/javax/script/JavaScriptScopeTest.java.i
 data/make/com/sun/security/auth/module/FILES_c_windows.gmk.i
 data/test/java/rmi/activation/Activatable/restartCrashedService/rmid.security.policy.i
 data/test/sun/security/pkcs11/SampleTest.java.i
-data/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java.i
 data/src/share/classes/sun/security/x509/OtherName.java.i
 data/make/java/hpi/native/mapfile-vers.i
-data/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java.i
 data/test/java/net/URLConnection/6212146/Test.java.i
 data/test/java/beans/XMLEncoder/java_lang_Class.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java.i
+data/src/share/classes/com/sun/tools/jdi/SocketTransportService.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java.i
 data/src/share/classes/sun/jvmstat/monitor/event/HostListener.java.i
 data/test/sun/java2d/cmm/ColorConvertOp/SRGB.png.i
@@ -2443,8 +2449,6 @@ data/src/share/classes/java/lang/management/LockInfo.java.i
 data/src/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java.i
 data/test/java/io/Serializable/clearHandleTable/ClearHandleTable.java.i
 data/test/javax/security/auth/PrivateCredentialPermission/CanonError.java.i
-data/src/windows/bin/i586/jvm.cfg.i
-data/src/share/classes/com/sun/jndi/toolkit/dir/ContextEnumerator.java.i
 data/src/share/native/sun/security/ec/impl/ecl.h.i
 data/src/share/classes/sun/font/PhysicalFont.java.i
 data/src/share/classes/sun/java2d/pipe/BufferedMaskFill.java.i
@@ -2452,8 +2456,6 @@ data/src/share/sample/scripting/scriptpad/src/scripts/insertfile.js.i
 data/test/java/lang/Runtime/exec/Duped.java.i
 data/src/share/demo/applets/SortDemo/SortAlgorithm.java.i
 data/test/java/util/PluggableLocale/providersrc/java.text.spi.DateFormatSymbolsProvider.i
-data/test/java/net/DatagramSocket/ChangingAddress.java.i
-data/src/solaris/classes/sun/font/NativeGlyphMapper.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_en_PH.properties.i
 data/test/java/awt/Frame/ShownOnPack/ShownOnPack.java.i
 data/make/mkdemo/applets/Makefile.i
@@ -2472,11 +2474,10 @@ data/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java.i
 data/test/java/nio/file/Files/SBC.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/MultipleArgumentsForOptionException.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java.i
-data/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java.i
+data/test/java/util/ResourceBundle/Control/StressOut_ko.properties.i
 data/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java.i
 data/src/share/classes/javax/xml/crypto/dsig/XMLSignature.java.i
 data/make/mkdemo/applets/SortDemo/Makefile.i
-data/src/windows/native/sun/windows/awt_Frame.h.i
 data/src/share/classes/java/util/jar/JarFile.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM1142.java.i
 data/src/linux/doc/man/ja/javah.1.i
@@ -2487,16 +2488,14 @@ data/src/share/classes/java/util/prefs/Base64.java.i
 data/test/java/io/Serializable/oldTests/ArraysOfArrays.java.i
 data/test/java/net/Socket/LingerTest.java.i
 data/make/java/instrument/mapfile-vers.i
-data/src/share/demo/applets/SpreadSheet/SpreadSheet.java.i
-data/src/solaris/doc/sun/man/man1/jstack.1.i
 data/test/java/lang/HashCode.java.i
 data/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOption.java.i
 data/src/share/classes/javax/management/package.html.i
 data/src/share/classes/sun/security/krb5/KrbAppMessage.java.i
 data/src/share/classes/java/net/Inet6AddressImpl.java.i
+data/test/java/util/Locale/Bug4184873_yi.i
 data/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java.i
 data/src/share/classes/sun/util/calendar/JulianCalendar.java.i
-data/test/com/sun/crypto/provider/TLS/TestPremaster.java.i
 data/src/solaris/classes/sun/nio/ch/SctpPeerAddrChange.java.i
 data/src/share/classes/javax/imageio/event/package.html.i
 data/src/share/classes/javax/management/event/EventRelay.java.i
@@ -2506,9 +2505,9 @@ data/test/org/openjdk/jigsaw/resolver.sh.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties.i
 data/test/java/awt/List/SetBackgroundTest/SetBackgroundTest.java.i
 data/src/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java.i
-data/test/java/io/pathNames/win32/SJIS.java.i
+data/src/share/classes/sun/io/ByteToCharCp933.java.i
 data/test/java/io/Serializable/skippedObjCNFException/Read.java.i
-data/src/solaris/native/sun/awt/awt_Window.h.i
+data/src/share/classes/javax/management/remote/rmi/RMIConnection.java.i
 data/src/solaris/native/sun/awt/awt_p.h.i
 data/src/windows/native/sun/java2d/windows/DDRenderer.cpp.i
 data/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties.i
@@ -2516,6 +2515,7 @@ data/src/windows/native/sun/windows/awt_TextArea.cpp.i
 data/src/share/classes/javax/swing/plaf/metal/package.html.i
 data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java.i
 data/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java.i
+data/test/javax/swing/GroupLayout/7071166/bug7071166.java.i
 data/src/share/classes/sun/tools/tree/ConvertExpression.java.i
 data/test/sun/net/www/protocol/http/B5017051.java.i
 data/test/java/net/URLConnection/GetContentType.java.i
@@ -2523,22 +2523,22 @@ data/test/java/rmi/activation/ActivateFailedException/activateFails/ShutdownThre
 data/test/java/nio/Buffer/CharAt.java.i
 data/make/jpda/transport/socket/Makefile.i
 data/src/share/classes/sun/tools/tree/CastExpression.java.i
+data/src/share/native/common/check_version.c.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties.i
 data/src/share/classes/java/security/PrivateKey.java.i
-data/test/java/lang/StackTraceElement/PublicConstructor.java.i
 data/src/share/native/sun/font/layout/CharSubstitutionFilter.h.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduPacket.java.i
 data/src/share/classes/javax/swing/GrayFilter.java.i
 data/src/share/classes/com/sun/tracing/dtrace/DependencyClass.java.i
 data/make/tools/compile_properties/Makefile.i
-data/make/tools/src/build/tools/generatenimbus/Generator.java.i
+data/src/share/classes/sun/tools/tree/LengthExpression.java.i
 data/src/linux/doc/man/ja/jhat.1.i
 data/test/java/rmi/server/useCustomRef/UseCustomRef_Skel.java.i
 data/src/share/classes/sun/reflect/UnsafeBooleanFieldAccessorImpl.java.i
 data/src/share/classes/javax/script/ScriptException.java.i
-data/test/java/awt/font/StyledMetrics/BoldSpace.java.i
+data/src/share/classes/java/awt/image/renderable/RenderContext.java.i
 data/make/sun/javazic/tzdata/iso3166.tab.i
-data/src/share/classes/sun/misc/JavaIOAccess.java.i
+data/src/share/classes/sun/io/ByteToCharCp935.java.i
 data/src/solaris/native/java/io/FileInputStream_md.c.i
 data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.properties.i
 data/test/com/sun/crypto/provider/Cipher/RC2ArcFour/CipherKAT.java.i
@@ -2551,32 +2551,26 @@ data/test/java/io/Serializable/packageAccess/run.sh.i
 data/src/share/classes/com/sun/media/sound/SoftChannel.java.i
 data/src/share/classes/java/util/zip/ZipError.java.i
 data/test/javax/swing/border/Test4129681.java.i
-data/src/share/classes/java/nio/Heap-X-Buffer.java.i
 data/test/java/net/InetAddress/GetLoopbackAddress.java.i
-data/src/share/classes/sun/util/locale/AsciiUtil.java.i
+data/src/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java.i
 data/src/solaris/classes/sun/java2d/xr/DirtyRegion.java.i
 data/test/javax/management/monitor/ThreadPoolTest.java.i
 data/src/share/native/sun/security/ec/impl/mp_gf2m-priv.h.i
 data/test/javax/management/loading/mlet2.html.i
 data/test/com/sun/security/sasl/digest/CheckNegotiatedQOPs.java.i
-data/test/sun/security/provider/PolicyFile/Comparator.java.i
 data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init6.java.i
 data/src/share/classes/java/text/MergeCollation.java.i
-data/src/solaris/doc/sun/man/man1/jsadebugd.1.i
-data/src/share/classes/sun/reflect/ClassFileAssembler.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/Commands.java.i
+data/src/share/classes/java/sql/Types.java.i
 data/src/share/native/sun/awt/image/jpeg/jdmerge.c.i
-data/test/tools/launcher/CreatePlatformFile.java.i
 data/test/com/sun/security/sasl/digest/Integrity.java.i
 data/src/share/classes/sun/invoke/util/VerifyAccess.java.i
-data/test/java/util/PluggableLocale/TimeZoneNameProviderTest.java.i
+data/make/com/sun/jndi/dns/Makefile.i
 data/src/share/classes/sun/net/www/content/audio/x_wav.java.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java.i
 data/src/share/classes/sun/text/resources/FormatData_es_UY.java.i
-data/test/javax/swing/border/Test6625450.java.i
-data/src/share/classes/com/sun/net/httpserver/package-info.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicMenuUI.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java.i
-data/test/java/io/etc/FileDescriptorSharing.java.i
 data/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.java.i
 data/src/share/classes/com/sun/jmx/remote/security/NotificationAccessController.java.i
 data/src/share/classes/sun/util/logging/LoggingSupport.java.i
@@ -2586,49 +2580,55 @@ data/src/share/native/java/lang/fdlibm/src/e_hypot.c.i
 data/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmac.java.i
 data/src/share/classes/java/util/logging/LogRecord.java.i
 data/src/windows/native/sun/windows/awt_Object.cpp.i
+data/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java.i
+data/src/share/classes/javax/swing/text/TabExpander.java.i
 data/src/share/classes/java/lang/management/BufferPoolMXBean.java.i
 data/src/share/classes/javax/xml/crypto/dsig/XMLSignatureFactory.java.i
 data/src/solaris/native/sun/awt/img_util_md.h.i
+data/test/java/util/regex/POSIX_Unicode.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageAffine.h.i
 data/src/solaris/doc/sun/man/man1/ja/jmap.1.i
+data/test/javax/management/ImplementationVersion/ImplVersionReader.java.i
 data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java.i
-data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java.i
-data/src/windows/classes/sun/java2d/windows/Win32OffScreenSurfaceData.java.i
+data/test/org/openjdk/jigsaw/cli/signer-prikey.pem.i
+data/src/share/classes/sun/tools/tree/NewInstanceExpression.java.i
 data/src/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java.i
 data/test/java/util/List/LockStep.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM865.java.i
 data/src/share/classes/com/sun/jndi/ldap/pool/ConnectionDesc.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_it_IT.properties.i
+data/src/share/classes/com/sun/jndi/ldap/LdapCtx.java.i
+data/test/java/nio/channels/Channels/Write.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java.i
 data/make/tools/GenerateCharacter/CharacterData00.java.template.i
-data/src/share/classes/sun/reflect/FieldAccessorImpl.java.i
+data/src/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java.i
 data/src/share/classes/java/io/StringWriter.java.i
-data/test/javax/crypto/JceSecurity/MyProvider.java.i
+data/src/share/classes/sun/management/CompilationImpl.java.i
+data/src/share/classes/java/lang/module/ViewDependence.java.i
+data/src/share/classes/sun/tools/tree/WhileStatement.java.i
 data/src/share/classes/javax/management/Impact.java.i
 data/src/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java.i
 data/src/share/classes/sun/java2d/loops/Blit.java.i
 data/test/java/nio/channels/AsynchronousFileChannel/LotsOfWrites.java.i
 data/make/tools/src/build/tools/fontchecker/FontFileFilter.java.i
-data/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java.i
+data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java.i
 data/src/solaris/classes/sun/security/provider/NativePRNG.java.i
 data/src/share/classes/sun/awt/WindowClosingSupport.java.i
+data/test/java/util/PluggableLocale/providersrc/java.text.spi.NumberFormatProvider.i
 data/src/solaris/native/sun/awt/multiVis.c.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/ShadowEffect.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_blk.s.i
 data/src/share/classes/java/lang/ThreadLocal.java.i
 data/src/share/classes/sun/tools/tree/CatchStatement.java.i
 data/src/share/classes/sun/awt/image/WritableRasterNative.java.i
-data/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java.i
-data/test/javax/crypto/Cipher/TestCipherMode.java.i
+data/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c.i
 data/test/java/io/Serializable/oldTests/SerializeWithException.java.i
 data/src/share/classes/sun/text/resources/FormatData_en_MT.java.i
-data/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java.i
 data/src/share/classes/com/sun/jndi/toolkit/url/GenericURLDirContext.java.i
 data/src/share/classes/sun/text/resources/FormatData_es_US.java.i
 data/test/java/security/KeyRep/DES.pre.1.5.key.i
-data/src/share/classes/org/ietf/jgss/ChannelBinding.java.i
+data/src/share/classes/sun/text/resources/CollationData_iw.java.i
 data/test/java/beans/VetoableChangeSupport/TestSerialization.java.i
-data/make/tools/swing-beans/beaninfo/images/JDialogColor16.gif.i
+data/src/share/classes/java/nio/file/StandardCopyOption.java.i
 data/src/share/classes/java/util/logging/ConsoleHandler.java.i
 data/src/share/classes/java/net/URLConnection.java.i
 data/test/java/util/zip/ZipFile/ReadZip.java.i
@@ -2636,48 +2636,43 @@ data/src/share/classes/javax/swing/plaf/metal/icons/Error.gif.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java.i
 data/src/share/classes/sun/awt/image/PixelConverter.java.i
 data/make/tools/src/build/tools/jdwpgen/AltNode.java.i
+data/src/share/classes/javax/accessibility/AccessibleEditableText.java.i
 data/src/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java.i
 data/test/java/rmi/reliability/benchmark/bench/serial/ExternObjTrees.java.i
 data/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java.i
 data/test/java/lang/Class/Cast.java.i
-data/src/share/classes/com/sun/jdi/InvalidTypeException.java.i
-data/src/share/classes/com/sun/media/sound/AiffFileFormat.java.i
 data/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VK.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/OptionParser.java.i
 data/src/share/classes/java/net/PortUnreachableException.java.i
 data/src/share/classes/sun/io/CharToByteCp280.java.i
 data/test/java/lang/StringBuffer/Replace.java.i
-data/src/share/demo/applets/SortDemo/BubbleSortAlgorithm.java.i
 data/src/share/classes/com/sun/jndi/dns/DnsContext.java.i
 data/test/javax/naming/ldap/LdapName/TrailingSpaceTest.java.i
 data/src/share/classes/com/sun/media/sound/PortMixer.java.i
 data/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java.i
-data/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml.i
+data/src/share/classes/org/openjdk/jigsaw/RemoteRepositoryList.java.i
 data/test/java/nio/channels/Selector/Close.java.i
 data/src/share/classes/sun/security/pkcs/ContentInfo.java.i
 data/src/share/classes/java/rmi/activation/ActivateFailedException.java.i
 data/src/share/classes/com/sun/jmx/snmp/defaults/DefaultPaths.java.i
 data/src/share/classes/sun/nio/cs/StreamDecoder.java.i
-data/test/java/io/Serializable/longString/LongString.java.i
 data/src/solaris/doc/sun/man/man1/javah.1.i
-data/src/share/classes/javax/management/modelmbean/package.html.i
+data/src/share/classes/sun/io/ByteToCharCp1123.java.i
+data/src/share/classes/sun/text/resources/CollationData_fr.java.i
 data/make/tools/swing-beans/beaninfo/images/JTreeColor16.gif.i
 data/src/share/classes/javax/xml/crypto/URIReference.java.i
 data/test/java/util/EnumSet/Range.java.i
 data/src/solaris/doc/sun/man/man1/ja/orbd.1.i
 data/src/share/classes/java/io/Reader.java.i
-data/test/sun/security/validator/samedn.sh.i
-data/src/share/native/sun/security/ec/impl/mp_gf2m.h.i
 data/test/java/rmi/reliability/benchmark/bench/serial/ProxyArrays.java.i
 data/src/solaris/doc/sun/man/man1/ja/idlj.1.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/config.dtd.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt.i
-data/test/java/security/KeyPairGenerator/GenerateKeypair.java.i
 data/test/java/lang/instrument/MakeJAR2.sh.i
 data/test/java/rmi/activation/CommandEnvironment/Retireable.java.i
 data/src/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java.i
 data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibRequestImpl.java.i
-data/src/solaris/classes/sun/awt/X11/Native.java.i
+data/make/com/sun/crypto/provider/Makefile.i
 data/test/java/lang/instrument/PremainClass/ZeroArgPremainAgent.sh.i
 data/src/share/classes/sun/io/ByteToCharEUC_CN.java.i
 data/src/share/classes/sun/text/resources/FormatData_ro_RO.java.i
@@ -2687,56 +2682,59 @@ data/src/share/classes/java/security/spec/ECPrivateKeySpec.java.i
 data/make/tools/CharsetMapping/IBM1364.c2b.i
 data/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityModel.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_de_DE.properties.i
-data/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval_Stub.java.i
+data/src/share/classes/com/sun/net/ssl/X509KeyManager.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java.i
+data/src/share/classes/sun/font/GlyphDisposedListener.java.i
 data/src/share/classes/com/sun/media/sound/SoftChannelProxy.java.i
+data/src/share/classes/sun/nio/ch/Interruptible.java.i
 data/src/share/classes/sun/nio/cs/ext/SJIS.java.i
 data/src/share/demo/jfc/Font2DTest/RangeMenu.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_CheckedMap.java.i
-data/src/share/classes/sun/security/jgss/GSSNameImpl.java.i
+data/src/solaris/native/sun/nio/ch/PollArrayWrapper.c.i
+data/src/share/classes/com/sun/tools/example/doc/index.html.i
 data/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN.c.i
-data/src/share/classes/javax/sql/package.html.i
+data/src/share/classes/com/sun/jmx/snmp/internal/SnmpModel.java.i
 data/make/tools/CharsetMapping/IBM935.map.i
-data/test/java/nio/file/Files/walkFileTree/grantAll.policy.i
-data/src/share/classes/sun/io/CharToByteCp850.java.i
+data/src/windows/native/sun/jkernel/graphics/masthead.bmp.i
+data/test/sun/net/www/ParseUtil_6274990.java.i
 data/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html.i
 data/src/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java.i
 data/test/com/sun/crypto/provider/Cipher/UTIL/StrongOrUnlimited.java.i
 data/test/java/io/File/EmptyPath.java.i
 data/src/share/classes/java/security/AlgorithmParameterGenerator.java.i
 data/test/java/lang/Class/getEnclosingClass/common/TestMe.java.i
-data/src/solaris/sample/dtrace/hotspot/README.txt.i
+data/test/java/rmi/transport/checkFQDN/CheckFQDNClient.java.i
 data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoService.java.i
 data/test/sun/nio/cs/TestTrailingEscapesISO2022JP.java.i
 data/src/share/classes/java/awt/SecondaryLoop.java.i
 data/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java.i
-data/test/sun/security/rsa/TestCACerts.java.i
+data/src/share/classes/java/awt/font/GlyphJustificationInfo.java.i
 data/test/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.html.i
 data/src/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java.i
 data/src/share/classes/javax/naming/ldap/BasicControl.java.i
 data/src/share/classes/sun/tools/tree/NotExpression.java.i
-data/src/share/classes/sun/io/CharToByteMacCentralEurope.java.i
+data/test/sun/nio/cs/FindASCIIRangeCodingBugs.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathEntryMeta.java.i
 data/src/share/classes/javax/swing/ViewportLayout.java.i
+data/src/share/native/sun/security/ec/impl/ecdecode.c.i
+data/test/java/net/DatagramSocketImpl/CheckDiscard.java.i
 data/src/linux/doc/man/serialver.1.i
 data/src/windows/native/sun/windows/awt_DesktopProperties.cpp.i
 data/test/java/lang/management/ThreadMXBean/ThreadCounts.java.i
-data/test/java/util/Collections/T5078378.java.i
+data/src/share/native/sun/java2d/opengl/OGLMaskFill.c.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmMemoryImpl.java.i
 data/test/java/io/Serializable/fieldTypeString/Write.java.i
-data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaObjectRef.java.i
 data/src/share/classes/java/beans/NameGenerator.java.i
 data/src/windows/classes/sun/nio/ch/FileDispatcher.java.i
 data/src/share/classes/javax/management/MBeanServerConnection.java.i
+data/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java.i
 data/src/share/sample/nio/server/N1.java.i
 data/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine.i
 data/src/windows/native/sun/windows/initIDs.cpp.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/MiscTests.java.i
 data/make/tools/CharsetMapping/ISO_8859_4.map.i
-data/test/sun/util/resources/TimeZone/Bug4858517.java.i
+data/make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java.i
 data/src/share/classes/sun/misc/SignalHandler.java.i
-data/test/java/io/File/FileMethods.java.i
 data/test/java/io/Serializable/skipWriteObject/Write.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java.i
 data/src/share/classes/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java.i
@@ -2745,25 +2743,22 @@ data/src/solaris/native/sun/java2d/x11/XRBackendNative.c.i
 data/test/java/util/Vector/SyncLastIndexOf.java.i
 data/src/share/classes/sun/nio/cs/ext/MacThai.java.i
 data/src/share/classes/java/net/InetAddressImpl.java.i
-data/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties.i
-data/src/share/classes/sun/rmi/rmic/Names.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java.i
+data/test/java/rmi/activation/Activatable/createPrivateActivable/group.security.policy.i
 data/make/common/Defs.gmk.i
 data/test/sun/security/x509/X500Name/EmailKeyword.java.i
-data/test/java/awt/image/ImagingOpsNoExceptionsTest/ImagingOpsNoExceptionsTest.java.i
+data/test/sun/security/pkcs11/fips/certs/ca.cer.i
 data/src/share/classes/sun/tools/tree/BinaryArithmeticExpression.java.i
 data/src/share/classes/com/sun/media/sound/ModelMappedInstrument.java.i
 data/test/com/sun/jdi/RedefineCrossEvent.java.i
 data/test/java/security/UnresolvedPermission/Debug.java.i
 data/src/share/native/sun/font/layout/ScriptAndLanguageTags.h.i
-data/test/java/util/EnumSet/SmallEnumIteratorRemoveResilience.java.i
 data/test/java/awt/font/TextLayout/VisibleAdvance.java.i
 data/src/share/classes/javax/naming/Reference.java.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl.java.i
 data/src/share/classes/javax/swing/event/InternalFrameListener.java.i
 data/test/java/nio/file/attribute/DosFileAttributeView/Basic.java.i
 data/src/share/classes/sun/tools/jconsole/MemoryTab.java.i
-data/src/share/classes/sun/security/ssl/Debug.java.i
-data/src/windows/classes/sun/awt/windows/WMenuPeer.java.i
 data/make/tools/CharsetMapping/IBM838.nr.i
 data/src/solaris/doc/sun/man/man1/jconsole.1.i
 data/test/java/beans/PropertyEditor/TestLongType.java.i
@@ -2773,67 +2768,70 @@ data/src/share/classes/javax/print/attribute/standard/JobImpressionsSupported.ja
 data/test/com/sun/crypto/provider/TLS/keymatdata.txt.i
 data/src/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java.i
 data/src/share/classes/com/sun/tools/jdi/resources/jdi.properties.i
-data/test/javax/print/applet/applet2/Applet2PrintServiceLookup.java.i
+data/src/share/classes/com/sun/jndi/dns/ResourceRecord.java.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/warning.png.i
 data/test/sun/nio/cs/OLD/IBM937_OLD.java.i
 data/test/sun/nio/cs/OLD/IBM937_OLD.java.d
 data/test/java/util/EnumSet/ComplementOf.java.i
 data/src/share/classes/sun/text/resources/FormatData_en_SG.java.i
-data/test/com/sun/jndi/ldap/NoWaitForReplyTest.java.i
+data/src/share/demo/jfc/Metalworks/BigContrastMetalTheme.java.i
+data/src/solaris/native/sun/awt/awt_PopupMenu.h.i
 data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableList.java.i
 data/src/share/classes/sun/security/validator/PKIXValidator.java.i
 data/src/share/classes/sun/misc/Version-template.java.i
 data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibSubRequest.java.i
-data/src/share/sample/nio/file/DiskUsage.java.i
+data/test/java/nio/file/WatchService/LotsOfEvents.java.i
 data/make/sun/security/tools/Makefile.i
 data/make/tools/jdwpgen/Makefile.i
 data/src/share/classes/java/nio/channels/SelectionKey.java.i
 data/src/share/classes/java/beans/beancontext/BeanContextServiceProvider.java.i
 data/make/com/sun/inputmethods/indicim/Makefile.i
+data/src/share/classes/org/openjdk/jigsaw/FilePaths.java.i
 data/test/sun/security/ssl/templates/SSLSocketTemplate.java.i
 data/test/javax/crypto/spec/RC2ParameterSpec/RC2AlgorithmParameters.java.i
-data/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-8-attack.xml.i
+data/src/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java.i
 data/test/sun/security/pkcs11/KeyStore/ProviderLoader.java.i
 data/src/share/classes/com/sun/crypto/provider/OAEPParameters.java.i
-data/test/tools/pack200/T7007157.java.i
 data/src/solaris/native/sun/awt/awt_dnd_dt.c.i
-data/src/solaris/native/java/io/FileSystem_md.c.i
+data/src/solaris/classes/sun/awt/motif/MFontConfiguration.java.i
 data/test/java/beans/PropertyEditor/TestIntegerClass.java.i
 data/test/sun/util/resources/TimeZone/Bug6317929.java.i
+data/test/java/awt/Robot/CtorTest/CtorTest.java.i
 data/src/share/classes/java/nio/BufferPoolMXBean.java.i
 data/src/share/back/MethodImpl.c.i
-data/test/java/nio/Buffer/genBasic.sh.i
-data/src/share/classes/sun/security/krb5/internal/Authenticator.java.i
+data/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh.i
+data/src/share/classes/java/sql/ClientInfoStatus.java.i
 data/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemColor32.gif.i
 data/src/share/classes/javax/naming/InvalidNameException.java.i
 data/src/share/native/java/io/io_util.c.i
 data/test/java/lang/Integer/ValueOf.java.i
 data/test/com/sun/jdi/redefineMethod/RedefineSubTarg.java.i
+data/test/java/beans/Statement/Test6224433.java.i
+data/test/java/io/StringWriter/NegativeBufferSize.java.i
 data/src/share/classes/sun/misc/URLClassPath.java.i
-data/test/sun/tools/jconsole/ResourceCheckTest.java.i
 data/src/share/classes/java/awt/Event.java.i
 data/src/share/classes/javax/management/MBeanRegistration.java.i
-data/test/java/io/Serializable/sanityCheck/SanityCheck.java.i
 data/src/share/classes/com/sun/jdi/VMCannotBeModifiedException.java.i
 data/src/share/classes/sun/io/CharToByteCp866.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java.i
 data/test/java/util/concurrent/ConcurrentLinkedQueue/ConcurrentQueueLoops.java.i
 data/test/java/io/PushbackInputStream/Skip.java.i
-data/src/share/classes/javax/imageio/plugins/jpeg/package.html.i
+data/make/sun/security/jgss/wrapper/mapfile-vers.i
 data/test/javax/crypto/spec/RC2ParameterSpec/RC2ParameterSpecEquals.java.i
 data/test/java/security/testlibrary/Providers.java.i
 data/test/sun/security/pkcs11/Provider/ConfigQuotedString-nss.txt.i
 data/src/share/classes/java/awt/KeyboardFocusManager.java.i
 data/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpEngineFactory.java.i
-data/test/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java.i
+data/src/share/classes/java/io/OutputStreamWriter.java.i
+data/test/java/net/URLConnection/DisconnectAfterEOF.java.i
 data/test/sun/net/www/protocol/http/B6369510.java.i
 data/src/share/classes/sun/security/jgss/GSSUtil.java.i
-data/src/share/classes/sun/nio/ch/ThreadPool.java.i
+data/src/share/classes/com/sun/jndi/ldap/BindingWithControls.java.i
 data/src/solaris/classes/sun/print/CUPSPrinter.java.i
 data/src/share/demo/applets/MoleculeViewer/example1.html.i
 data/src/solaris/native/sun/awt/gtk2_interface.c.i
-data/make/tools/src/build/tools/javazic/RuleDay.java.i
+data/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java.i
 data/test/java/security/Signature/ByteBuffers.java.i
 data/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java.i
 data/test/com/sun/jdi/FinalLocalsTest.java.i
@@ -2849,18 +2847,19 @@ data/src/solaris/native/sun/nio/ch/SctpChannelImpl.c.i
 data/make/tools/reorder/tools/MaxTime.java.i
 data/src/share/native/sun/awt/libpng/pngpriv.h.i
 data/test/java/lang/StringBuffer/AppendSB.java.i
-data/test/java/util/Formatter/Basic-X.java.i
-data/src/share/classes/java/rmi/activation/ActivationGroupID.java.i
+data/src/share/classes/sun/reflect/generics/tree/Tree.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpCounter64.java.i
 data/src/share/classes/java/awt/event/MouseAdapter.java.i
 data/src/share/classes/java/security/CodeSigner.java.i
 data/test/java/lang/instrument/PremainClass/InheritAgent0010.java.i
-data/src/share/classes/javax/swing/JFrame.java.i
+data/src/linux/doc/man/ja/xjc.1.i
 data/src/share/classes/sun/tools/tree/DoStatement.java.i
 data/src/share/classes/com/sun/jdi/connect/spi/Connection.java.i
 data/test/javax/management/remote/mandatory/connection/ReconnectTest.java.i
 data/src/share/classes/sun/tools/tree/CaseStatement.java.i
 data/make/README.html.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/TemplateWriter.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolTableMeta.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_es_NI.properties.i
 data/src/share/classes/sun/security/jgss/SunProvider.java.i
 data/test/java/beans/Introspector/Test4619536.java.i
@@ -2878,41 +2877,38 @@ data/src/solaris/classes/sun/java2d/xr/GrowablePointArray.java.i
 data/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfoSupport.java.i
 data/test/javax/print/applet/applet4/Applet4PrintService.java.i
 data/src/share/classes/sun/security/x509/README.i
-data/src/share/classes/javax/management/StandardMBean.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformInterestedHost.java.i
 data/src/share/classes/sun/io/CharToByteISO8859_9.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java.i
 data/src/share/classes/sun/io/UnknownCharacterException.java.i
 data/src/share/classes/java/util/zip/ZipConstants64.java.i
 data/src/solaris/npt/npt_md.h.i
+data/src/share/classes/sun/swing/plaf/synth/SynthUI.java.i
 data/src/share/classes/java/beans/ParameterDescriptor.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalTitlePane.java.i
 data/test/java/util/Locale/data/deflocale.winvista.i
-data/test/java/nio/channels/FileChannel/Transfer.java.i
 data/test/java/rmi/transport/pinLastArguments/PinLastArguments.java.i
 data/test/demo/jvmti/mtrace/JFrameCreateTime.java.i
 data/src/share/demo/nbproject/management/JTop/nbproject/file-targets.xml.i
 data/test/java/lang/instrument/redefineAgent.mf.i
+data/make/com/sun/java/pack/mapfile-vers.i
 data/make/modules/image.tools.ls.i
-data/test/java/rmi/reliability/benchmark/bench/serial/Chars.java.i
-data/src/share/sample/README.i
+data/src/share/modules/jdk.awt/module-info.java.i
 data/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VT.java.i
-data/test/sun/nio/cs/OLD/IBM970_OLD.java.i
 data/src/share/classes/java/net/ProxySelector.java.i
 data/test/java/util/AbstractList/FailFastIterator.java.i
-data/src/share/native/sun/font/FontInstanceAdapter.h.i
-data/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java.i
+data/src/share/classes/javax/swing/text/rtf/RTFParser.java.i
 data/src/share/classes/javax/swing/undo/CannotRedoException.java.i
 data/src/share/classes/com/sun/jdi/VirtualMachineManager.java.i
 data/src/share/classes/javax/management/MBeanServerBuilder.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageConv_D64nw.c.i
 data/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java.i
 data/src/share/classes/sun/security/x509/EDIPartyName.java.i
 data/src/share/classes/com/sun/rowset/internal/CachedRowSetReader.java.i
 data/src/share/classes/com/sun/rowset/providers/package.html.i
 data/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName_Stub.java.i
-data/test/java/net/InetSocketAddress/B6469803.java.i
-data/test/com/sun/jdi/sde/FilterMangleTest.java.i
+data/src/share/native/sun/font/layout/LigatureSubstProc.cpp.i
+data/make/java/main/java/mapfile-sparc.i
 data/src/share/classes/sun/util/resources/LocaleNames_zh_SG.properties.i
 data/test/javax/swing/JComboBox/7031551/bug7031551.java.i
 data/src/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingRequest.java.i
@@ -2923,12 +2919,11 @@ data/src/share/classes/java/util/Deque.java.i
 data/src/share/classes/java/awt/Desktop.java.i
 data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy.i
 data/src/share/native/sun/awt/medialib/awt_ImagingLib.h.i
-data/test/org/openjdk/jigsaw/tester.sh.i
 data/test/java/util/Collection/MOAT.java.i
 data/src/share/classes/com/sun/beans/TypeResolver.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S16Func.c.i
 data/src/share/classes/java/lang/ReflectiveOperationException.java.i
-data/src/windows/classes/sun/nio/ch/SctpChannelImpl.java.i
+data/test/java/security/KeyRep/AES.pre.1.5.key.i
 data/src/share/classes/java/nio/channels/GatheringByteChannel.java.i
 data/src/share/classes/com/sun/java/util/jar/pack/Driver.java.i
 data/test/javax/security/auth/PrivateCredentialPermission/Serial.policy.i
@@ -2936,31 +2931,28 @@ data/test/java/rmi/reliability/scripts/run_juicer.ksh.i
 data/make/tools/CharsetMapping/MacSymbol.map.i
 data/test/com/sun/jdi/SDENullTest.java.i
 data/src/share/demo/jvmti/hprof/hprof_stack.c.i
+data/test/java/net/Socket/reset/Test.java.i
 data/src/share/native/sun/awt/medialib/mlib_types.h.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xenc-schema.xsd.i
 data/src/share/classes/sun/io/CharToByteCp862.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509KeyManager.java.i
+data/make/tools/CharsetMapping/IBM1143.map.i
 data/test/com/sun/crypto/provider/Cipher/AES/Test4626070.java.i
-data/src/share/classes/java/awt/KeyEventPostProcessor.java.i
 data/src/solaris/classes/sun/awt/motif/AWTLockAccess.java.i
 data/make/tools/swing-beans/beaninfo/images/JTextAreaMono32.gif.i
-data/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c.i
+data/test/sun/text/resources/Format/Bug4395196.java.i
 data/src/share/classes/sun/io/ByteToCharPCK.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U8Func.c.i
 data/src/share/classes/sun/io/ByteToCharCp856.java.i
-data/test/java/security/cert/pkix/policyChanges/TestPolicy.java.i
 data/src/share/native/sun/awt/image/jpeg/jdcoefct.c.i
-data/test/java/util/Locale/bug4123285.html.i
 data/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak_Stub.java.i
 data/src/solaris/classes/sun/awt/motif/MEmbeddedFramePeer.java.i
-data/src/share/classes/java/awt/print/PrinterGraphics.java.i
-data/src/share/classes/sun/util/resources/CalendarData_iw.properties.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Texture.java.i
 data/make/tools/src/build/tools/jdwpgen/Node.java.i
 data/src/share/classes/javax/swing/plaf/IconUIResource.java.i
 data/src/share/classes/java/security/PrivilegedActionException.java.i
 data/src/share/classes/sun/text/resources/FormatData_es_AR.java.i
 data/make/tools/CharsetMapping/IBM1047.map.i
+data/test/java/io/Serializable/InvalidClassException/noargctor/Serialize/SamePackageCtor.java.i
 data/src/solaris/native/sun/awt/awt_dnd.c.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/NoAuthClientAuth.java.i
 data/test/com/sun/jdi/RedefineChangeClassOrder.sh.i
@@ -2968,28 +2960,29 @@ data/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BL.c.i
 data/src/share/native/java/net/DatagramPacket.c.i
 data/test/java/beans/XMLDecoder/spec/TestDouble.java.i
 data/make/java/verify/reorder-i586.i
-data/test/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java.i
+data/src/share/classes/com/sun/jdi/event/EventQueue.java.i
+data/src/share/classes/java/awt/datatransfer/FlavorMap.java.i
+data/src/share/classes/sun/text/resources/FormatData_sq.java.i
 data/src/share/classes/java/net/NoRouteToHostException.java.i
 data/src/share/classes/java/dyn/ClassValue.java.i
-data/src/share/classes/sun/tools/java/CompilerError.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaLong.java.i
-data/src/solaris/classes/sun/font/XRTextRenderer.java.i
+data/src/share/classes/sun/tools/jps/Arguments.java.i
 data/src/solaris/native/sun/java2d/loops/mlib_v_ImageLogic.h.i
 data/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java.i
 data/src/share/native/sun/awt/splashscreen/splashscreen_impl.c.i
 data/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp.i
-data/test/javax/management/namespace/ExportNamespaceTest.java.i
-data/src/solaris/native/sun/nio/ch/SocketChannelImpl.c.i
+data/src/share/native/sun/font/layout/CanonShaping.cpp.i
+data/src/share/classes/com/sun/tools/example/debug/event/JDIListener.java.i
 data/src/share/classes/com/sun/media/sound/ModelChannelMixer.java.i
-data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java.i
+data/make/sun/font/Makefile.i
 data/test/java/awt/im/6396526/IMLookAndFeel.java.i
 data/src/windows/native/java/net/NetworkInterface.c.i
-data/src/share/sample/nio/server/README.txt.i
+data/src/share/classes/sun/jvmstat/monitor/remote/package.html.i
+data/test/java/util/ResourceBundle/Test4300693RB.java.i
 data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_TitledBorderUIResource.java.i
 data/src/solaris/classes/sun/awt/motif/MPanelPeer.java.i
 data/src/solaris/classes/sun/awt/X11/XEmbedChildProxyPeer.java.i
 data/src/share/classes/java/lang/Integer.java.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleInfo.java.i
 data/test/java/lang/Throwable/ChainedExceptions.java.i
 data/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PrivateCtor.java.i
 data/test/com/sun/crypto/provider/Cipher/PBE/PKCS12CipherKAT.java.i
@@ -2997,80 +2990,83 @@ data/src/share/classes/com/sun/pept/ept/ContactInfoListIterator.java.i
 data/src/share/classes/com/sun/jmx/snmp/internal/SnmpOutgoingRequest.java.i
 data/src/share/classes/sun/management/counter/LongCounter.java.i
 data/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java.i
-data/src/share/classes/sun/io/ByteToCharCp1149.java.i
+data/test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java.i
 data/src/share/classes/sun/text/resources/FormatData_ar_YE.java.i
 data/src/share/classes/javax/net/ssl/SSLParameters.java.i
 data/src/share/classes/sun/java2d/pipe/BufferedPaints.java.i
-data/make/tools/javazic/Makefile.i
-data/test/java/util/Locale/data/deflocale.rhel4.i
+data/test/java/lang/instrument/ilib/ClassDump.java.i
 data/make/tools/CharsetMapping/Makefile.i
 data/make/java/text/Makefile.i
 data/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh.i
 data/src/share/classes/java/util/EventListener.java.i
-data/test/com/sun/jdi/BreakpointWithFullGC.sh.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathTableMetaImpl.java.i
-data/src/share/native/sun/java2d/opengl/OGLContext.h.i
+data/src/share/classes/java/lang/reflect/UndeclaredThrowableException.java.i
+data/src/share/classes/sun/awt/WindowClosingListener.java.i
 data/test/java/net/Socket/asyncClose/Socket_getOutputStream_write.java.i
 data/src/share/classes/sun/security/util/Resources_fr.java.i
 data/test/com/sun/jdi/RequestReflectionTest.java.i
 data/src/share/classes/java/util/Objects.java.i
+data/src/share/classes/java/lang/instrument/package.html.i
 data/src/share/classes/sun/text/Normalizer.java.i
 data/src/share/classes/sun/security/x509/CertificateX509Key.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libplds4.so.i
 data/src/share/classes/javax/swing/Renderer.java.i
 data/test/java/nio/channels/AsynchronousChannelGroup/Basic.java.i
 data/src/share/native/sun/font/layout/AnchorTables.h.i
-data/src/share/native/sun/awt/image/jpeg/jcinit.c.i
+data/src/share/classes/java/security/cert/CertStore.java.i
+data/test/sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java.i
 data/src/share/classes/javax/swing/text/html/parser/html32.bdtd.i
-data/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithUnexpectedRID.java.i
 data/test/java/util/jar/JarFile/Constructor.java.i
-data/test/com/sun/tools/attach/ProviderTests.sh.i
 data/test/java/lang/StringBuffer/Trim.java.i
 data/test/org/openjdk/jigsaw/cli/signer-cert.pem.i
 data/src/share/classes/sun/tools/tree/FieldUpdater.java.i
+data/make/java/jli/Makefile.i
 data/src/share/classes/sun/io/ByteToCharCp943C.java.i
-data/test/java/rmi/reliability/scripts/run_serialbench.ksh.i
+data/src/share/classes/sun/security/provider/IdentityDatabase.java.i
 data/src/share/classes/com/sun/jmx/snmp/agent/SnmpEntryOid.java.i
 data/src/share/classes/com/sun/crypto/provider/SunJCE.java.i
 data/test/javax/management/monitor/DerivedGaugeMonitorTest.java.i
-data/src/share/classes/java/security/Guard.java.i
 data/test/javax/management/eventService/SubscribeTest.java.i
 data/test/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow.i
 data/make/tools/swing-beans/beaninfo/images/JTextFieldMono32.gif.i
 data/src/share/classes/java/awt/Dialog.java.i
 data/test/sun/tools/jstat/jstatGcCapacityOutput1.sh.i
+data/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java.i
 data/test/javax/management/loading/mlet3.html.i
 data/make/tools/swing-beans/beaninfo/images/JComponentColor16.gif.i
-data/src/share/demo/jfc/Font2DTest/resources/TextResources_zh_CN.properties.i
+data/test/com/sun/crypto/provider/Mac/HmacSaltLengths.java.i
 data/src/share/classes/sun/text/resources/FormatData_iw.java.i
-data/src/share/classes/sun/util/calendar/CalendarSystem.java.i
+data/test/java/dyn/indify/Indify.java.i
 data/test/java/io/File/GetAbsolutePath.java.i
 data/src/share/classes/javax/naming/directory/SchemaViolationException.java.i
 data/make/tools/swing-beans/beaninfo/images/JOptionPaneColor32.gif.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy34.i
-data/src/share/native/sun/awt/debug/debug_assert.c.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java.i
+data/test/javax/swing/JColorChooser/Test4887836.java.i
+data/test/java/rmi/MarshalledObject/compare/annotatedRef.i
 data/src/share/classes/sun/security/x509/DistributionPointName.java.i
 data/src/share/native/sun/font/layout/IndicClassTables.cpp.i
 data/src/solaris/native/sun/awt/HPkeysym.h.i
+data/src/share/classes/java/lang/doc-files/theta.gif.i
 data/test/java/util/ResourceBundle/FakeTestResource.java.i
 data/test/java/lang/ProcessBuilder/SecurityManagerClinit.java.i
 data/src/share/demo/jfc/Font2DTest/Font2DTest.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_es_CR.properties.i
+data/test/javax/management/remote/mandatory/notif/DeadListenerTest.java.i
 data/test/java/util/zip/ZipFile/Constructor.java.i
 data/src/share/classes/sun/security/provider/certpath/LDAPCertStore.java.i
 data/src/share/classes/java/awt/LinearGradientPaintContext.java.i
-data/src/solaris/demo/jigsaw/basic/Makefile.i
+data/test/java/rmi/activation/Activatable/extLoadedImpl/security.policy.i
 data/src/share/classes/sun/security/provider/PolicyParser.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM1145.java.i
-data/test/java/beans/XMLDecoder/spec/TestVar.java.i
+data/src/share/classes/java/lang/invoke/InvokeGeneric.java.i
 data/test/java/security/UnresolvedPermission/AccessorMethods.ca.i
 data/src/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java.i
 data/test/javax/management/namespace/MXBeanRefTest.java.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ExtendedKeyEngine.java.i
+data/src/share/classes/javax/swing/text/rtf/RTFGenerator.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U8Func.c.i
 data/src/solaris/native/com/sun/management/LinuxOperatingSystem.c.i
-data/src/share/classes/javax/sql/ConnectionEvent.java.i
+data/src/share/classes/com/sun/beans/decoder/MethodElementHandler.java.i
 data/src/share/classes/javax/security/auth/spi/LoginModule.java.i
 data/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java.i
 data/src/share/classes/javax/sound/sampled/SourceDataLine.java.i
@@ -3089,7 +3085,7 @@ data/test/java/nio/channels/AsynchronousFileChannel/MyThreadFactory.java.i
 data/src/share/classes/javax/swing/filechooser/FileNameExtensionFilter.java.i
 data/test/java/nio/channels/SocketChannel/AdaptSocket.java.i
 data/src/share/classes/sun/security/krb5/internal/TGSReq.java.i
-data/src/share/classes/java/util/zip/ZipInputStream.java.i
+data/test/java/net/URL/Protocol.java.i
 data/src/share/classes/java/awt/AWTKeyStroke.java.i
 data/src/share/classes/javax/xml/crypto/KeySelectorException.java.i
 data/make/tools/CharsetMapping/IBM1025.nr.i
@@ -3097,18 +3093,20 @@ data/src/share/classes/javax/swing/plaf/synth/SynthLabelUI.java.i
 data/src/share/classes/javax/management/event/ListenerInfo.java.i
 data/test/com/sun/security/sasl/digest/NoQuoteParams.java.i
 data/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImpl.java.i
+data/src/share/classes/java/beans/MetaData.java.i
 data/src/windows/native/sun/java2d/d3d/D3DTextRenderer_md.cpp.i
-data/src/solaris/native/sun/awt/awt_Checkbox.c.i
+data/src/share/classes/javax/swing/SpinnerListModel.java.i
+data/src/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java.i
 data/test/sun/rmi/rmic/newrmic/equivalence/MyObjectImpl.java.i
-data/src/share/classes/com/sun/java/browser/dom/DOMAccessException.java.i
 data/test/javax/management/Introspector/AnnotationTest.java.i
-data/src/share/native/sun/font/layout/ExtensionSubtables.cpp.i
 data/src/share/classes/sun/management/resources/agent_fr.properties.i
+data/src/share/classes/java/rmi/dgc/Lease.java.i
 data/src/share/classes/java/lang/reflect/Method.java.i
 data/test/com/sun/net/httpserver/Test14.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicPasswordFieldUI.java.i
 data/make/tools/CharsetMapping/IBM1123.c2b.i
-data/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java.i
+data/src/share/classes/javax/crypto/spec/DHParameterSpec.java.i
+data/src/share/classes/java/security/cert/CertificateRevokedException.java.i
 data/test/java/lang/reflect/Generics/TestN1.java.i
 data/test/java/util/LinkedHashSet/Basic.java.i
 data/make/sun/image/generic/FILES_c.gmk.i
@@ -3121,21 +3119,24 @@ data/src/share/demo/jfc/CodePointIM/CodePointInputMethodDescriptor.java.i
 data/src/share/classes/javax/security/auth/kerberos/KeyTab.java.i
 data/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java.i
 data/test/java/net/InetAddress/policy.file.i
-data/test/java/util/logging/LoggingDeadlock.java.i
+data/src/share/classes/java/util/concurrent/ThreadFactory.java.i
 data/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java.i
 data/test/javax/xml/crypto/dsig/data/certs/badb.crt.i
 data/src/share/native/sun/awt/image/jpeg/jccoefct.c.i
 data/src/share/classes/sun/nio/cs/ext/IBM1097.java.i
 data/make/tools/src/build/tools/jdwpgen/ClassLoaderObjectTypeNode.java.i
-data/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java.i
+data/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java.i
+data/src/share/classes/sun/io/ByteToCharCp964.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryNotification.java.i
 data/src/share/classes/sun/net/ftp/FtpDirParser.java.i
 data/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java.i
 data/src/share/classes/javax/sound/sampled/LineEvent.java.i
 data/src/share/classes/java/util/UnknownFormatFlagsException.java.i
-data/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java.i
+data/src/solaris/native/java/net/SocketInputStream.c.i
 data/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java.i
-data/make/java/text/FILES_java.gmk.i
-data/src/share/classes/sun/security/x509/RDN.java.i
+data/test/java/lang/reflect/Generics/TestC2.java.i
+data/test/java/util/PluggableLocale/providersrc/java.util.spi.CurrencyNameProvider.i
+data/src/share/classes/sun/util/resources/CalendarData_fi.properties.i
 data/src/share/classes/java/io/FileFilter.java.i
 data/test/javax/swing/border/Test6910490.java.i
 data/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c.i
@@ -3143,59 +3144,58 @@ data/src/share/classes/sun/text/resources/FormatData_es.java.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageConv.h.i
 data/src/share/native/java/lang/Package.c.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/Effect.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHereContext.java.i
 data/test/sun/tools/jrunscript/jrunscriptTest.sh.i
 data/src/share/classes/sun/management/snmp/util/SnmpLoadedClassData.java.i
-data/make/com/sun/java/browser/dom/Makefile.i
+data/src/share/classes/com/sun/security/auth/SubjectCodeSource.java.i
 data/src/share/classes/java/text/ParseException.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalLabelUI.java.i
 data/src/share/classes/java/util/concurrent/RunnableScheduledFuture.java.i
-data/src/share/classes/sun/nio/ch/MembershipRegistry.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so.d
+data/src/share/classes/java/awt/TextComponent.java.i
+data/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java.i
+data/src/solaris/native/sun/awt/awt_LoadLibrary.c.i
 data/test/javax/swing/plaf/synth/Test6933784.java.i
 data/src/share/classes/sun/io/CharToByteCp737.java.i
-data/test/java/rmi/dgc/dgcImplInsulation/security.policy.i
+data/test/sun/rmi/rmic/newrmic/equivalence/ComputeServer.java.i
 data/test/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html.i
 data/test/java/util/Currency/ValidateISO4217.java.i
-data/test/sun/net/InetAddress/nameservice/CacheTest.java.i
+data/test/java/io/InputStream/OpsAfterClose.java.i
 data/src/share/native/sun/awt/debug/debug_trace.c.i
 data/src/share/classes/sun/rmi/server/Activation.java.i
-data/src/share/native/sun/awt/libpng/png.h.i
 data/src/share/classes/java/io/FileReader.java.i
 data/test/tools/pack200/badattr.jar.i
 data/make/tools/src/build/tools/generatecharacter/Utility.java.i
 data/src/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java.i
-data/src/share/classes/javax/print/package.html.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/expresso.mid.i
 data/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java.i
-data/src/share/demo/jvmti/hprof/hprof_tls.c.i
+data/src/share/classes/java/text/Bidi.java.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedStaticCharacterFieldAccessorImpl.java.i
 data/src/share/classes/sun/java2d/loops/RenderLoops.java.i
 data/src/share/classes/com/sun/jmx/namespace/serial/package.html.i
 data/test/sun/tools/common/CommonSetup.sh.i
-data/test/java/beans/PropertyEditor/TestByteClassJava.java.i
 data/test/java/util/Locale/HashCodeTest.java.i
 data/test/java/net/Socks/SocksProxyVersion.java.i
 data/test/java/beans/VetoableChangeSupport/TestMethods.java.i
-data/test/java/net/URI/RelativeEncoding.java.i
-data/src/share/classes/sun/security/util/AuthResources_ja.java.i
+data/src/share/classes/sun/applet/Main.java.i
 data/test/java/util/PriorityQueue/NoNulls.java.i
 data/src/share/classes/sun/misc/ExtensionInfo.java.i
 data/src/share/classes/javax/swing/JScrollBar.java.i
 data/test/java/lang/ref/ReferenceEnqueuePending.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java.i
-data/test/java/util/HashMap/ToString.java.i
+data/src/share/classes/sun/awt/resources/awt_ja.properties.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java.i
-data/test/java/util/Locale/Bug4152725.java.i
+data/test/java/beans/Introspector/Test4144543.java.i
 data/src/share/classes/sun/reflect/generics/tree/VoidDescriptor.java.i
 data/src/share/native/sun/java2d/loops/ScaledBlit.c.i
-data/src/share/native/sun/font/layout/PairPositioningSubtables.h.i
 data/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c.i
-data/test/java/net/ipv6tests/TcpTest.java.i
+data/src/share/classes/sun/text/resources/CollationData_de.java.i
 data/make/tools/src/build/tools/jdwpgen/SelectNode.java.i
 data/src/share/classes/java/util/GregorianCalendar.java.i
 data/src/share/classes/sun/text/resources/FormatData_de_AT.java.i
+data/src/share/classes/javax/swing/text/html/ObjectView.java.i
 data/src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java.i
 data/src/share/classes/com/sun/jdi/PrimitiveValue.java.i
+data/src/share/classes/sun/java2d/InvalidPipeException.java.i
 data/src/share/classes/java/security/cert/CertPathParameters.java.i
 data/src/share/classes/sun/tools/java/MemberDefinition.java.i
 data/test/java/lang/Appendable/Basic.java.i
@@ -3208,6 +3208,7 @@ data/src/share/classes/java/awt/Graphics.java.i
 data/src/share/classes/sun/nio/cs/ext/MS936.java.i
 data/test/sun/security/tools/jarsigner/TimestampCheck.java.i
 data/src/share/classes/sun/tracing/ProviderSkeleton.java.i
+data/src/share/classes/java/dyn/package-info.java.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormat.java.i
 data/test/javax/swing/text/html/Test4783068.java.i
 data/test/tools/launcher/Arrrghs.sh.i
@@ -3219,6 +3220,7 @@ data/test/java/io/Serializable/serialver/nested/run.sh.i
 data/src/share/classes/javax/swing/text/doc-files/Document-structure.gif.i
 data/src/share/classes/java/security/KeyStore.java.i
 data/src/share/classes/javax/management/relation/InvalidRelationIdException.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapResult.java.i
 data/src/share/classes/com/sun/jdi/LongValue.java.i
 data/src/share/classes/sun/net/www/content/audio/aiff.java.i
 data/test/java/rmi/reliability/benchmark/bench/rmi/LongArrayCalls.java.i
@@ -3226,7 +3228,7 @@ data/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java.i
 data/src/share/classes/java/net/SecureCacheResponse.java.i
 data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java.i
 data/test/java/beans/XMLEncoder/java_lang_String.java.i
-data/src/share/classes/javax/swing/plaf/TextUI.java.i
+data/make/tools/src/build/tools/generatenimbus/SynthModel.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedRandomAccessList.java.i
 data/make/tools/CharsetMapping/IBM871.map.i
 data/test/java/util/concurrent/ThreadPoolExecutor/SelfInterrupt.java.i
@@ -3234,6 +3236,7 @@ data/test/java/lang/ThreadLocal/ThreadId.java.i
 data/src/share/back/ThreadReferenceImpl.h.i
 data/test/org/openjdk/jigsaw/eg/com/foo/bar/Main.java.i
 data/src/share/classes/java/lang/reflect/GenericDeclaration.java.i
+data/test/com/sun/servicetag/servicetag4.properties.i
 data/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java.i
 data/test/java/beans/PropertyEditor/6380849/FirstBean.java.i
@@ -3246,39 +3249,42 @@ data/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java.i
 data/src/solaris/sample/dtrace/hotspot/object_allocation_stat.d.i
 data/make/tools/dtdbuilder/dtds/HTMLspecial.sgml.i
 data/src/share/classes/sun/nio/cs/ext/IBM277.java.i
-data/test/java/lang/management/ThreadMXBean/Semaphore.java.i
+data/src/share/back/stepControl.h.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathEntryImpl.java.i
-data/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java.i
+data/src/share/classes/sun/util/resources/CalendarData_th.properties.i
+data/src/share/classes/sun/security/provider/certpath/AdjacencyList.java.i
 data/test/java/awt/xembed/server/JavaClient.java.i
-data/src/share/native/sun/awt/image/DataBufferNative.c.i
 data/test/java/nio/Buffer/LimitDirectMemory.java.i
 data/src/windows/classes/sun/awt/windows/WDataTransferer.java.i
-data/src/share/classes/java/net/URISyntaxException.java.i
+data/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java.i
 data/test/com/sun/jdi/RedefineClearBreakpoint.sh.i
 data/make/jprt.gmk.i
-data/test/java/rmi/activation/Activatable/downloadParameterClass/security.policy.i
+data/src/share/classes/javax/management/loading/MLetObjectInputStream.java.i
 data/test/java/util/zip/ZipFile/ManyEntries.java.i
+data/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c.i
 data/src/share/classes/java/util/concurrent/Delayed.java.i
 data/test/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.html.i
 data/test/sun/java2d/cmm/ColorConvertOp/ImageFactory.java.i
 data/src/share/classes/javax/naming/CompoundName.java.i
-data/src/share/classes/java/sql/Clob.java.i
+data/make/tools/CharsetMapping/IBM1144.c2b.i
 data/src/share/classes/javax/script/ScriptEngineManager.java.i
 data/test/javax/swing/JFileChooser/4150029/bug4150029.java.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/Modularizer.java.i
 data/src/share/native/sun/management/GcInfoBuilder.c.i
 data/src/solaris/classes/sun/awt/X11/security-icon-yellow16.png.i
 data/src/share/classes/com/sun/crypto/provider/EncryptedPrivateKeyInfo.java.i
-data/test/java/util/ResourceBundle/Test4318520.java.i
+data/src/share/classes/javax/xml/crypto/dsig/spec/HMACParameterSpec.java.i
 data/src/share/classes/com/sun/jmx/snmp/BerException.java.i
 data/src/windows/classes/sun/nio/fs/WindowsPathType.java.i
-data/test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaObjectArray.java.i
 data/test/sun/security/tools/jarsigner/samename.sh.i
 data/test/java/awt/image/mlib/MlibOpsTest.java.i
 data/src/linux/doc/man/ja/apt.1.i
+data/src/share/classes/sun/util/resources/CurrencyNames_is_IS.properties.i
 data/src/share/classes/com/sun/tools/hat/internal/server/AllRootsQuery.java.i
 data/make/tools/CharsetMapping/IBM1122.nr.i
+data/test/java/lang/management/ManagementFactory/StateTestMBean.java.i
 data/src/share/classes/javax/swing/text/StateInvariantError.java.i
 data/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java.i
 data/test/java/util/Formatter/BasicDateTime.java.i
@@ -3292,23 +3298,22 @@ data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/Directory.gif.i
 data/src/windows/classes/sun/print/Win32PrintJob.java.i
 data/src/share/native/sun/font/sunfontids.h.i
 data/src/share/classes/sun/security/jgss/wrapper/GSSCredElement.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/Commands.java.i
 data/test/java/io/readBytes/input.txt.i
 data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/TargetPanel.java.i
 data/src/share/native/sun/font/layout/SubstitutionLookups.h.i
 data/src/share/classes/javax/swing/border/package.html.i
 data/src/share/classes/sun/awt/image/ByteArrayImageSource.java.i
 data/src/share/classes/sun/reflect/generics/tree/Signature.java.i
-data/test/java/lang/instrument/TransformMethodTest.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMeta.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java.i
 data/src/share/classes/java/net/SocketOption.java.i
 data/src/share/classes/java/awt/image/WritableRenderedImage.java.i
 data/src/share/classes/sun/java2d/pipe/SpanIterator.java.i
 data/test/java/awt/FontClass/BigMetrics.java.i
 data/src/share/classes/org/openjdk/jigsaw/Platform.java.i
-data/src/share/native/sun/java2d/cmm/lcms/lcms2.h.i
 data/src/share/classes/javax/naming/directory/InvalidAttributeValueException.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_sr_Latn.properties.i
+data/src/share/classes/sun/management/HotspotClassLoading.java.i
+data/src/share/native/sun/font/layout/MPreFixups.cpp.i
 data/src/share/classes/sun/reflect/generics/tree/TypeArgument.java.i
 data/src/share/classes/sun/net/www/content/audio/x_aiff.java.i
 data/test/java/beans/Beans/Test4343723.java.i
@@ -3323,10 +3328,8 @@ data/src/solaris/native/java/net/SocketOutputStream.c.i
 data/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c.i
 data/test/java/security/cert/pkix/nameConstraintsMinMax/sun2labs2.cer.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java.i
-data/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java.i
 data/src/share/native/sun/awt/libpng/pngtrans.c.i
 data/src/share/classes/sun/tracing/dtrace/DTraceProviderFactory.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/EffectUtils.java.i
 data/src/solaris/native/sun/awt/awt_MenuComponent.h.i
 data/test/java/util/ResourceBundle/ReferencesTest.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_pt_PT.properties.i
@@ -3336,51 +3339,47 @@ data/.hgignore.i
 data/src/share/classes/sun/text/resources/FormatData_fr_CA.java.i
 data/test/java/security/PermissionCollection/Concurrent.java.i
 data/src/share/native/sun/font/layout/ValueRecords.cpp.i
-data/make/tools/src/build/tools/javazic/Zoneinfo.java.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c.i
 data/src/share/classes/org/ietf/jgss/GSSManager.java.i
 data/test/java/nio/channels/Pipe/PipeChannel.java.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownModelException.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java.i
 data/test/java/util/TreeMap/HeadTailTypeError.java.i
 data/src/share/classes/java/lang/invoke/FromGeneric.java.i
 data/test/java/rmi/activation/Activatable/shutdownGracefully/rmid.security.policy.i
-data/src/windows/native/java/io/dirent_md.c.i
+data/src/share/classes/sun/awt/image/BufferedImageDevice.java.i
 data/src/share/classes/sun/tools/tree/InstanceOfExpression.java.i
 data/test/java/io/charStreams/RandomLineSource.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties.i
-data/test/java/nio/MappedByteBuffer/Truncate.java.i
 data/test/java/rmi/activation/Activatable/checkRegisterInLog/ActivateMe.java.i
 data/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java.i
 data/src/share/classes/sun/security/krb5/internal/EncKrbCredPart.java.i
-data/src/share/classes/com/sun/media/sound/ModelAbstractOscillator.java.i
 data/src/share/classes/sun/security/util/Resources_ja.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeClosed.gif.i
 data/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/KeyWrapping.java.i
+data/src/share/native/sun/awt/splashscreen/splashscreen_gfx.h.i
 data/src/share/classes/sun/text/resources/CollationData_zh_HK.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/XNodeInfo.java.i
-data/test/javax/swing/JInternalFrame/6726866/bug6726866.java.i
 data/src/share/classes/javax/naming/Referenceable.java.i
-data/test/java/beans/Beans/6669869/TestGuiAvailable.java.i
+data/test/javax/management/remote/mandatory/connection/RMIExitTest.java.i
+data/src/share/classes/javax/sql/rowset/JdbcRowSet.java.i
 data/test/sun/nio/cs/OLD/SimpleEUCDecoder.java.i
 data/src/share/classes/java/rmi/NoSuchObjectException.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/ToolBarSeparatorPainter.java.i
-data/src/share/classes/sun/java2d/pipe/BufferedOpCodes.java.i
+data/test/java/util/regex/SupplementaryTestCases.txt.i
 data/test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java.i
 data/test/java/util/Collections/BigBinarySearch.java.i
 data/src/share/classes/javax/print/attribute/standard/PresentationDirection.java.i
 data/src/share/classes/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java.i
-data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java.i
+data/src/solaris/native/sun/java2d/loops/vis_ThreeByteBgr.c.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLCtxAccessToSessCtx.java.i
+data/src/share/classes/sun/tools/asm/NameAndTypeData.java.i
 data/src/share/classes/java/nio/Heap-X-Buffer.java.template.i
-data/test/java/nio/channels/SocketChannel/CloseAfterConnect.java.i
+data/src/share/classes/java/awt/doc-files/CheckboxGroup-1.gif.i
+data/test/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.java.i
 data/src/share/classes/javax/sound/midi/package.html.i
 data/src/share/classes/javax/management/modelmbean/ModelMBean.java.i
-data/make/mkdemo/applets/TicTacToe/Makefile.i
-data/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h.i
 data/src/share/classes/javax/swing/Box.java.i
 data/test/java/util/Locale/data/deflocale.sol10.fmtasdefault.i
 data/src/share/native/java/lang/fdlibm/src/s_modf.c.i
+data/src/solaris/native/sun/java2d/loops/vis_AlphaMaskBlit.c.i
 data/test/java/util/Locale/Bug4184873Test.java.i
 data/make/tools/src/build/tools/fontchecker/FontCheckerConstants.java.i
 data/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java.i
@@ -3388,16 +3387,16 @@ data/test/sun/tools/jps/jps-m_Output1.awk.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/ControlPoint.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java.i
 data/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java.i
-data/make/tools/CharsetMapping/IBM970.map.i
+data/test/java/security/Provider/SupportsParameter.java.i
 data/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java.i
 data/src/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd.i
 data/src/share/classes/sun/print/resources/orientRevPortrait.png.i
 data/src/share/classes/sun/util/resources/CalendarData_es.properties.i
 data/src/share/classes/sun/util/resources/CurrencyNames_es_US.properties.i
 data/test/sun/security/pkcs11/nss/p11-nss.txt.i
-data/test/demo/jvmti/hprof/HeapAllTest.java.i
+data/make/java/util/FILES_java.gmk.i
 data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java.i
-data/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java.i
+data/src/share/demo/jfc/Font2DTest/resources/TextResources_ko.properties.i
 data/test/java/io/Serializable/recursiveClassDescLookup/Test.java.i
 data/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java.i
 data/test/javax/management/standardmbean/FindMethodTest.java.i
@@ -3406,20 +3405,21 @@ data/make/tools/CharsetMapping/MS874.map.i
 data/test/com/sun/security/auth/login/ConfigFile/Override.bad.config.i
 data/src/share/classes/com/sun/security/auth/module/NTLoginModule.java.i
 data/src/share/classes/javax/xml/crypto/dsig/keyinfo/X509IssuerSerial.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java.i
 data/src/share/classes/javax/management/relation/RelationService.java.i
 data/src/share/classes/java/util/regex/UnicodeProp.java.i
-data/test/com/sun/crypto/provider/Cipher/PBE/PKCS12Cipher.java.i
+data/src/share/classes/javax/naming/ldap/ManageReferralControl.java.i
 data/src/share/classes/java/security/InvalidKeyException.java.i
 data/test/javax/print/applet/applet3/Applet3.java.i
 data/src/share/classes/java/util/concurrent/locks/Condition.java.i
+data/src/share/classes/sun/management/MethodInfo.java.i
 data/src/share/classes/javax/sql/RowSetListener.java.i
 data/src/linux/doc/man/ja/policytool.1.i
 data/test/java/net/InetAddress/B4762344.java.i
-data/src/share/classes/javax/net/ssl/SSLSessionBindingListener.java.i
 data/test/com/sun/jdi/ArrayLengthDumpTest.sh.i
 data/test/sun/security/smartcardio/TestPresent.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_es_CO.properties.i
-data/src/share/back/stream.c.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_GT.properties.i
 data/test/com/sun/org/apache/xml/internal/security/transforms/MyTransform.java.i
 data/test/java/util/ServiceLoader/FooProvider3.java.i
 data/src/share/native/sun/awt/image/jpeg/jdmaster.c.i
@@ -3429,20 +3429,18 @@ data/src/share/classes/sun/reflect/generics/tree/TypeTree.java.i
 data/test/com/sun/jdi/VMConnection.java.i
 data/src/share/classes/sun/tools/tree/GreaterOrEqualExpression.java.i
 data/make/tools/generate_nimbus/Makefile.i
-data/src/share/classes/java/awt/geom/RectangularShape.java.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_test06_ok.password.in.i
 data/src/share/classes/javax/print/event/PrintJobAttributeListener.java.i
-data/src/linux/doc/man/DO_NOT_EDIT--GENERATED_FILES.i
-data/src/share/classes/sun/util/resources/CalendarData_ro.properties.i
+data/src/share/classes/sun/io/CharToByteCp1381.java.i
 data/test/sun/management/jmxremote/bootstrap/TestLogger.java.i
-data/test/sun/security/krb5/auto/Action.java.i
+data/src/windows/native/sun/jkernel/kernel_en.rc.i
 data/src/share/classes/java/awt/image/DirectColorModel.java.i
 data/src/share/classes/java/security/spec/X509EncodedKeySpec.java.i
 data/src/share/classes/javax/management/openmbean/SimpleType.java.i
-data/test/com/sun/jdi/GenericsTest.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/Root.java.i
 data/test/java/security/KeyRep/HmacMD5.pre.1.5.key.i
-data/test/java/beans/PropertyEditor/TestByteTypeNull.java.i
-data/test/sun/tools/jconsole/ResourceCheckTest.sh.i
+data/src/share/classes/java/awt/event/WindowFocusListener.java.i
+data/test/java/net/SocketPermission/Wildcard.java.i
 data/src/share/classes/java/io/TempFileHelper.java.i
 data/src/windows/native/sun/windows/awt_CustomPaletteDef.h.i
 data/src/share/classes/java/awt/event/HierarchyEvent.java.i
@@ -3456,9 +3454,10 @@ data/src/solaris/classes/java/io/UnixFileSystem.java.i
 data/src/share/classes/java/util/Hashtable.java.i
 data/test/java/lang/Double/Extrema.java.i
 data/test/java/io/Serializable/proxy/skipMissing/Handler.java.i
-data/test/sun/invoke/util/ValueConversionsTest.java.i
+data/src/share/classes/sun/font/FontLineMetrics.java.i
+data/test/java/io/Serializable/evolution/RenamePackage/run.sh.i
 data/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecInvalidEncoding.java.i
-data/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java.i
+data/test/java/net/Socket/setReuseAddress/Basic.java.i
 data/src/share/native/sun/awt/image/jpeg/jdphuff.c.i
 data/make/modules/tools/src/com/sun/classanalyzer/ModuleConfig.java.i
 data/test/sun/security/krb5/etype/ETypeOrder.java.i
@@ -3467,8 +3466,9 @@ data/src/solaris/classes/sun/nio/ch/SctpShutdown.java.i
 data/src/share/classes/java/dyn/MethodHandleNatives.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityRuntimeException.java.i
 data/src/share/classes/com/sun/jmx/remote/util/CacheMap.java.i
-data/src/share/classes/sun/java2d/loops/CustomComponent.java.i
+data/test/java/lang/String/Exceptions.java.i
 data/test/java/awt/Focus/FocusTraversalPolicy/LayoutFTPTest.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java.i
 data/src/share/classes/javax/swing/text/TextAction.java.i
 data/src/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java.i
 data/src/share/classes/javax/swing/UIManager.java.i
@@ -3476,11 +3476,12 @@ data/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActi
 data/test/sun/security/x509/AVA/DomainComponentEncoding.java.i
 data/make/sun/image/generic/Makefile.i
 data/test/java/net/URI/URItoURLTest.java.i
+data/src/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java.i
 data/src/windows/classes/sun/java2d/d3d/D3DBlitLoops.java.i
-data/src/share/classes/java/awt/Shape.java.i
-data/test/java/util/zip/ConstructDeflaterInput.java.i
+data/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java.i
 data/src/share/native/sun/font/layout/Lookups.h.i
+data/test/java/io/Serializable/cloneArray/CloneArray.java.i
 data/test/javax/management/MBeanServer/InstanceNotFoundExceptionTest.java.i
 data/test/java/util/Formatter/BasicLongObject.java.i
 data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Encoder.java.i
@@ -3492,16 +3493,16 @@ data/make/tools/CharsetMapping/MS949.map.i
 data/src/share/classes/javax/management/openmbean/MXBeanMappingClass.java.i
 data/test/java/io/DataOutputStream/CounterOverflow.java.i
 data/src/share/classes/com/sun/media/sound/SoftPerformer.java.i
+data/src/share/classes/java/awt/event/ComponentEvent.java.i
 data/src/share/native/sun/font/layout/AttachmentPosnSubtables.h.i
 data/src/share/native/sun/java2d/loops/Any4Byte.c.i
-data/src/share/classes/javax/swing/text/LayoutQueue.java.i
+data/test/java/beans/XMLEncoder/java_awt_MenuShortcut.java.i
 data/src/share/classes/com/sun/java/util/jar/pack/DriverResource.java.i
 data/src/share/classes/javax/xml/crypto/dsig/XMLValidateContext.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorStatus.java.i
-data/test/sun/security/provider/certpath/ReverseBuilder/prjM2mgrM.i
-data/test/tools/pack200/pack200-verifier/data/README.i
+data/src/share/classes/com/sun/tools/jdi/JNITypeParser.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/FontMapper.java.i
 data/test/java/util/Formatter/BasicFloatObject.java.i
-data/test/java/io/NegativeInitSize.java.i
 data/src/share/classes/sun/java2d/cmm/PCMM.java.i
 data/src/share/classes/java/rmi/ConnectIOException.java.i
 data/test/sun/security/pkcs11/nss/lib/linux-i586/libplc4.so.i
@@ -3509,45 +3510,43 @@ data/src/windows/classes/java/lang/ProcessEnvironment.java.i
 data/src/share/classes/javax/print/attribute/HashDocAttributeSet.java.i
 data/src/share/native/sun/java2d/opengl/OGLBlitLoops.c.i
 data/make/tools/swing-beans/beaninfo/images/JMenuBarColor16.gif.i
-data/test/com/sun/servicetag/DeleteServiceTag.java.i
+data/make/mkdemo/jfc/Notepad/Makefile.i
 data/src/share/classes/sun/security/provider/SystemIdentity.java.i
 data/test/javax/management/remote/mandatory/connection/ConnectionTest.java.i
 data/src/share/classes/sun/io/ByteToCharCp1252.java.i
 data/test/java/net/URLConnection/TimeoutTest.java.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed-rtl.gif.i
 data/test/java/math/BigDecimal/Constructor.java.i
-data/make/tools/src/build/tools/generatenimbus/UIStyle.java.i
 data/make/sun/font/FILES_c.gmk.i
 data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java.i
 data/src/share/classes/org/openjdk/jigsaw/Context.java.i
-data/test/sun/security/pkcs11/tls/masterdata.txt.i
+data/src/share/classes/javax/print/attribute/standard/JobKOctets.java.i
+data/test/java/awt/event/MouseEvent/AcceptExtraButton/AcceptExtraButton.java.i
 data/src/share/classes/sun/io/ByteToCharEUC.java.i
 data/test/sun/tools/jstat/jstatLineCounts2.sh.i
 data/test/com/sun/nio/sctp/SctpChannel/Send.java.i
 data/test/java/io/Serializable/userRWObjError/UserRWObjError.java.i
 data/src/solaris/native/sun/nio/ch/FileDispatcher.c.i
-data/test/java/nio/file/TestUtil.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java.i
-data/test/sun/security/krb5/auto/AcceptorSubKey.java.i
 data/test/java/awt/Component/UpdatingBootTime/UpdatingBootTime.html.i
-data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java.i
+data/src/share/demo/nbproject/management/VerboseGC/nbproject/file-targets.xml.i
+data/test/sun/java2d/DirectX/IAEforEmptyFrameTest/IAEforEmptyFrameTest.java.i
 data/src/share/classes/java/security/IdentityScope.java.i
 data/src/share/classes/sun/net/httpserver/SSLStreams.java.i
 data/src/share/classes/java/security/cert/CRLException.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/DoFinalReturnLen.java.i
+data/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java.i
 data/src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties.i
-data/src/share/classes/sun/io/ByteToCharISO8859_8.java.i
-data/src/share/classes/sun/tools/tree/NewArrayExpression.java.i
-data/src/solaris/hpi/native_threads/include/porting.h.i
+data/test/sun/security/tools/keytool/emptysubject.sh.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BezierControlPoint.java.i
+data/src/share/classes/com/sun/jdi/event/VMStartEvent.java.i
 data/src/share/classes/sun/security/ssl/ECDHCrypt.java.i
 data/test/java/net/Socket/SoTimeout.java.i
 data/src/share/classes/java/nio/channels/package.html.i
 data/src/share/classes/sun/misc/FloatConsts.java.i
-data/src/share/classes/java/beans/XMLEncoder.java.i
+data/test/sun/tools/jps/jps-Vvml_Output1.awk.i
 data/src/share/demo/nio/zipfs/README.txt.i
 data/src/share/sample/jmx/jmx-scandir/nbproject/jdk.xml.i
 data/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties.i
-data/src/share/lib/images/cursors/win32_MoveDrop32x32.gif.i
 data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressInputStream.java.i
 data/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java.i
@@ -3559,22 +3558,23 @@ data/test/javax/management/remote/mandatory/loading/MissingClassTest.java.i
 data/src/share/native/java/lang/fdlibm/src/s_sin.c.i
 data/src/share/classes/java/io/EOFException.java.i
 data/src/share/classes/com/sun/jmx/remote/util/ClassLogger.java.i
-data/src/share/classes/com/sun/tools/hat/internal/oql/OQLQuery.java.i
+data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Encoder.java.i
 data/test/java/nio/channels/SocketChannel/Shutdown.java.i
 data/test/java/lang/instrument/PremainClass/CreateFiles.java.i
 data/src/solaris/native/sun/java2d/loops/vis_DrawLine.c.i
 data/test/sun/security/krb5/OptionPADataInKDCReq.java.i
 data/test/javax/crypto/CryptoPermission/LowercasePermCheck.java.i
+data/src/share/classes/com/sun/servicetag/SunConnection.java.i
 data/test/java/beans/PropertyEditor/TestFontClassValue.java.i
 data/src/share/classes/com/sun/tools/hat/internal/parser/Reader.java.i
 data/test/java/security/cert/X509Certificate/emptyIssuerCert.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Basics.java.i
+data/src/share/classes/sun/security/jgss/wrapper/Krb5Util.java.i
 data/test/java/lang/reflect/Proxy/returnTypes/Test.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM280.java.i
 data/src/share/classes/sun/text/resources/CollationData_mk.java.i
 data/src/share/classes/sun/security/pkcs/PKCS10Attribute.java.i
 data/src/share/classes/sun/nio/cs/UnicodeEncoder.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html.i
+data/src/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java.i
 data/src/share/classes/javax/print/event/PrintServiceAttributeListener.java.i
 data/test/java/beans/PropertyEditor/TestEnumClassValue.java.i
 data/src/share/classes/org/openjdk/jigsaw/FileHeader.java.i
@@ -3582,35 +3582,36 @@ data/src/share/native/sun/font/layout/GlyphSubstitutionTables.cpp.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties.i
 data/src/share/classes/com/sun/tools/jdi/FloatValueImpl.java.i
 data/src/share/classes/sun/tools/jstat/Token.java.i
+data/src/share/classes/java/net/CookieStore.java.i
 data/make/tools/src/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java.i
 data/src/share/classes/com/sun/jdi/request/WatchpointRequest.java.i
 data/src/windows/back/exec_md.c.i
 data/src/solaris/doc/sun/man/man1/wsgen.1.i
 data/src/share/classes/sun/text/resources/FormatData_de_DE.java.i
 data/test/sun/security/x509/Extensions/BCNull.java.i
-data/test/java/lang/management/MemoryMXBean/MemoryUtil.java.i
 data/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException.java.i
-data/src/share/classes/sun/tools/tree/CommaExpression.java.i
+data/src/share/classes/sun/security/provider/DSAPrivateKey.java.i
 data/src/share/classes/com/sun/tools/hat/internal/util/VectorSorter.java.i
+data/src/share/classes/javax/management/namespace/MBeanServerConnectionWrapper.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_SingletonSet.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties.i
-data/src/windows/native/sun/windows/awt_BitmapUtil.cpp.i
 data/test/java/nio/channels/AsynchronousSocketChannel/DieBeforeComplete.java.i
 data/test/java/util/Formatter/BasicLong.java.i
 data/src/share/native/sun/security/ec/impl/ecp_jac.c.i
-data/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll.i
 data/src/share/classes/sun/security/krb5/KrbCred.java.i
-data/src/windows/native/sun/windows/awt_Desktop.cpp.i
-data/src/solaris/classes/sun/nio/fs/UnixMountEntry.java.i
+data/src/solaris/classes/sun/awt/XSettings.java.i
+data/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.html.i
+data/src/solaris/classes/sun/java2d/xr/GrowableIntArray.java.i
 data/src/solaris/hpi/src/interrupt.c.i
 data/src/share/native/sun/java2d/loops/BlitBg.c.i
 data/src/share/native/java/util/zip/zlib-1.1.3/trees.h.i
 data/test/java/rmi/server/RMIClassLoader/spi/Foo.java.i
 data/test/java/io/DataInputStream/SkipBytes.java.i
 data/src/share/classes/sun/font/EAttribute.java.i
-data/test/sun/nio/cs/OLD/X11KSC5601_OLD.java.i
-data/test/java/lang/instrument/BootClassPath/AgentSupport.java.i
+data/src/share/classes/javax/crypto/JceSecurity.java.i
 data/make/mkdemo/jfc/Stylepad/Makefile.i
+data/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java.i
 data/src/share/classes/sun/io/CharToByteCp942.java.i
 data/src/share/classes/sun/reflect/UnsafeStaticLongFieldAccessorImpl.java.i
 data/make/tools/CharsetMapping/MS1253.map.i
@@ -3622,108 +3623,104 @@ data/src/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java.i
 data/src/share/classes/com/sun/jndi/ldap/ManageReferralControl.java.i
 data/src/windows/native/sun/nio/ch/ServerSocketChannelImpl.c.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpUsmKeyHandler.java.i
-data/test/java/rmi/server/RemoteObject/notExtending/NotExtending_Stub.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableMap.java.i
-data/test/java/util/ResourceBundle/RestrictedBundleTest.java.i
+data/make/java/management/FILES_c.gmk.i
+data/test/java/util/zip/ReadLoc.java.i
 data/make/java/zip/FILES_java.gmk.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java.i
+data/src/share/classes/com/sun/jmx/namespace/RoutingServerProxy.java.i
 data/make/tools/swing-beans/beaninfo/images/JTextAreaColor16.gif.i
-data/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java.i
+data/make/jpda/Makefile.i
 data/make/common/shared/Defs-control.gmk.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ar_QA.properties.i
-data/src/share/classes/org/relaxng/datatype/DatatypeException.java.i
+data/make/java/zip/reorder-sparc.i
 data/src/share/classes/java/security/package.html.i
-data/test/java/lang/String/SBConstructor.java.i
+data/src/share/classes/javax/xml/crypto/dsig/dom/DOMSignContext.java.i
 data/src/share/classes/javax/security/cert/X509Certificate.java.i
 data/src/share/classes/sun/awt/util/IdentityArrayList.java.i
 data/src/share/classes/java/awt/image/ComponentSampleModel.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java.i
 data/src/share/classes/sun/text/resources/FormatData_is.java.i
-data/src/solaris/classes/sun/awt/motif/X11GB18030_1.java.i
+data/src/share/classes/com/sun/tools/jdi/CharTypeImpl.java.i
 data/src/share/demo/jfc/SampleTree/SampleData.java.i
 data/test/java/net/NetworkInterface/Test.java.i
-data/test/java/io/Reader/SkipNegative.java.i
 data/test/java/nio/Buffer/CopyDirectFloatMemory.java.i
-data/src/share/classes/sun/swing/AccumulativeRunnable.java.i
+data/src/share/classes/org/openjdk/jigsaw/Resolution.java.i
 data/make/com/sun/security/auth/module/FILES_export_solaris.gmk.i
 data/src/share/native/sun/font/layout/IndicReordering.h.i
-data/src/share/classes/sun/nio/cs/ext/IBM420.java.i
 data/src/share/classes/javax/xml/crypto/NoSuchMechanismException.java.i
 data/src/share/classes/com/sun/crypto/provider/CipherFeedback.java.i
 data/src/share/classes/sun/text/resources/CollationData_tr.java.i
-data/test/java/util/Collections/CheckedIdentityMap.java.i
-data/src/windows/native/sun/windows/awt_Button.cpp.i
+data/test/java/net/URL/ParseAuthority.java.i
 data/make/sun/jkernel/FILES_c_windows.gmk.i
-data/test/java/nio/Buffer/CopyDirectByteMemory.java.i
+data/src/share/classes/org/openjdk/jigsaw/RemoteRepository.java.i
 data/src/windows/classes/sun/nio/fs/WindowsFileSystem.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java.i
-data/test/java/io/Serializable/available/Available.java.i
 data/make/java/management/Exportedfiles.gmk.i
 data/src/share/classes/sun/nio/cs/ext/MS50220.java.i
 data/src/share/classes/java/util/concurrent/RecursiveAction.java.i
 data/src/solaris/classes/sun/awt/motif/MToolkit.java.i
+data/src/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java.i
 data/src/solaris/native/sun/awt/awt_dnd_ds.c.i
+data/src/share/classes/com/sun/tools/jdi/CharValueImpl.java.i
 data/make/launchers/Makefile.i
 data/src/share/demo/jvmti/hprof/debug_malloc.h.i
 data/src/share/classes/com/sun/tools/hat/internal/server/RootStackQuery.java.i
-data/src/windows/classes/sun/awt/windows/WCheckboxPeer.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties.i
 data/src/share/classes/java/rmi/server/RemoteStub.java.i
-data/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java.i
+data/test/java/nio/charset/coders/ResetISO2022JP.java.i
 data/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java.i
+data/src/share/classes/javax/accessibility/AccessibleExtendedText.java.i
 data/src/share/classes/com/sun/jdi/NativeMethodException.java.i
 data/test/java/net/URL/RelativeURLTest.java.i
 data/src/share/classes/java/sql/ResultSet.java.i
-data/src/share/classes/sun/awt/im/CompositionAreaHandler.java.i
 data/src/windows/classes/sun/awt/windows/WPanelPeer.java.i
-data/src/share/classes/java/lang/IncompatibleClassChangeError.java.i
 data/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java.i
 data/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java.i
 data/src/share/classes/java/util/zip/Inflater.java.i
 data/src/share/classes/javax/swing/text/rtf/AbstractFilter.java.i
 data/test/java/util/ResourceBundle/Control/PackagePrivateRB.java.i
+data/test/java/security/cert/CertPathBuilder/GetInstance.java.i
 data/src/share/classes/java/security/cert/CertificateFactorySpi.java.i
 data/src/share/native/sun/java2d/Trace.c.i
 data/src/share/classes/java/lang/StackTraceElement.java.i
-data/test/java/net/URLConnection/GetFileNameMap.java.i
 data/src/share/classes/sun/io/ByteToCharCp1250.java.i
-data/test/java/awt/dnd/Button2DragTest/Button2DragTest.java.i
 data/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll.i
-data/src/windows/native/sun/windows/ShellFolder2.cpp.i
+data/src/share/classes/sun/net/httpserver/HttpExchangeImpl.java.i
 data/src/share/classes/java/beans/FeatureDescriptor.java.i
 data/src/share/classes/javax/sound/sampled/spi/AudioFileWriter.java.i
 data/test/java/rmi/activation/Activatable/inactiveGroup/rmid.security.policy.i
 data/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java.i
 data/src/share/classes/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java.i
 data/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties.i
-data/test/java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java.i
 data/src/share/javavm/export/jvmti.h.i
-data/test/javax/swing/Security/6657138/bug6657138.java.i
-data/src/share/classes/sun/reflect/SignatureIterator.java.i
+data/test/java/awt/PrintJob/EdgeTest/EdgeTest.java.i
+data/make/tools/src/build/tools/javazic/GenDoc.java.i
 data/src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java.i
 data/src/share/classes/sun/text/resources/FormatData_es_VE.java.i
-data/test/sun/tools/jps/jps-lm_Output1.awk.i
+data/src/share/classes/javax/management/DefaultLoaderRepository.java.i
 data/src/share/native/sun/security/ec/ecp_256.c.i
 data/make/netbeans/jdwpgen/nbproject/build-impl.xml.i
 data/test/javax/swing/ToolTipManager/Test6657026.java.i
 data/src/share/lib/security/sunpkcs11-solaris.cfg.i
+data/src/share/classes/sun/security/x509/GeneralSubtrees.java.i
 data/src/share/classes/com/sun/java/util/jar/pack/Utils.java.i
 data/test/sun/security/tools/keytool/i18n.html.i
 data/test/java/beans/Introspector/6976577/test/Accessor.java.i
 data/src/share/classes/com/sun/tools/example/trace/StreamRedirectThread.java.i
 data/src/share/classes/com/sun/rowset/internal/BaseRow.java.i
+data/src/share/classes/sun/jkernel/BackgroundDownloader.java.i
 data/src/share/classes/org/openjdk/jigsaw/RepositoryCatalog.java.i
 data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java.i
 data/test/javax/management/monitor/MBeanServerBuilderImpl.java.i
 data/src/share/classes/javax/swing/JViewport.java.i
 data/test/java/util/AbstractMap/AbstractMapClone.java.i
-data/make/mkdemo/jfc/Metalworks/Makefile.i
+data/make/tools/swing-beans/beaninfo/images/JLabelColor16.gif.i
 data/src/share/hpi/export/bool.h.i
 data/src/share/classes/com/sun/tools/jdi/GenericListeningConnector.java.i
 data/test/tools/launcher/SolarisRunpath.sh.i
 data/make/com/sun/demo/jvmti/hprof/Makefile.i
 data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.html.i
-data/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/BitFile.java.i
 data/make/tools/CharsetMapping/IBM1112.c2b.i
 data/src/solaris/classes/sun/java2d/xr/XRDrawImage.java.i
 data/test/javax/management/mxbean/customtypes/CustomMXBean.java.i
@@ -3733,11 +3730,12 @@ data/src/share/classes/sun/security/timestamp/TimestampToken.java.i
 data/make/javax/sound/jsoundhs/FILES.gmk.i
 data/test/java/rmi/activation/ActivateFailedException/activateFails/rmid.security.policy.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/ResolutionInfo.java.i
-data/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java.i
+data/src/share/classes/sun/io/CharToByteUnicodeBigUnmarked.java.i
 data/src/share/lib/images/cursors/motif_CopyNoDrop32x32.gif.i
 data/src/share/demo/scripting/jconsole-plugin/README.txt.i
 data/make/tools/reorder/tools/util-sparc.il.i
 data/test/sun/security/pkcs11/nss/lib/linux-i586/libsoftokn3.so.d
+data/test/java/beans/PropertyEditor/TestByteType.java.i
 data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml.i
 data/src/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java.i
 data/test/sun/security/pkcs11/nss/lib/linux-i586/libsoftokn3.so.i
@@ -3751,17 +3749,16 @@ data/src/windows/native/sun/windows/Devices.h.i
 data/test/java/util/Collection/HotPotatoes.java.i
 data/test/com/sun/nio/sctp/SctpChannel/Shutdown.java.i
 data/src/solaris/native/sun/awt/awt_wm.h.i
-data/src/share/native/sun/java2d/opengl/OGLBlitLoops.h.i
-data/src/share/classes/sun/text/normalizer/NormalizerBase.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java.i
+data/src/share/classes/java/awt/event/FocusAdapter.java.i
 data/test/javax/script/Test3.java.i
 data/make/tools/CharsetMapping/MS1256.map.i
 data/src/linux/doc/man/ja/idlj.1.i
 data/src/share/classes/java/nio/file/NotDirectoryException.java.i
-data/src/share/sample/scripting/scriptpad/nbproject/netbeans-targets.xml.i
+data/src/share/classes/javax/swing/text/DefaultFormatter.java.i
 data/test/java/beans/PropertyEditor/MemoryClassLoader.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java.i
-data/test/java/io/Serializable/oldTests/CircularList.java.i
 data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties.i
+data/src/share/back/invoker.h.i
 data/src/share/classes/java/net/InetSocketAddress.java.i
 data/test/sun/security/acl/PermissionImpl/PermissionEqualsHashCode.java.i
 data/test/com/sun/jdi/sde/SourceDebugExtensionTarg.java.i
@@ -3771,69 +3768,69 @@ data/test/javax/security/auth/login/Configuration/GetInstance.bad.configURI.i
 data/src/share/classes/sun/tools/tree/IntExpression.java.i
 data/test/demo/jvmti/hprof/UseAllBytecodes.java.i
 data/src/share/classes/sun/security/x509/CertificateSubjectName.java.i
-data/src/share/classes/javax/swing/ProgressMonitorInputStream.java.i
 data/src/share/native/java/lang/fdlibm/src/e_atanh.c.i
+data/src/share/classes/java/util/ServiceLoader.java.i
 data/src/solaris/classes/sun/awt/X11/XDropTargetProtocolListener.java.i
-data/test/java/net/Authenticator/B6870935.java.i
-data/src/windows/native/sun/nio/ch/FileDispatcherImpl.c.i
+data/src/share/classes/sun/reflect/generics/scope/ClassScope.java.i
 data/src/share/native/java/util/zip/zlib-1.1.3/infcodes.h.i
 data/src/share/classes/java/nio/channels/NetworkChannel.java.i
-data/test/java/beans/XMLEncoder/java_sql_Timestamp.java.i
+data/src/share/classes/sun/nio/cs/IBM852.java.i
 data/src/share/native/java/lang/Compiler.c.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NewSocketMethods.java.i
 data/src/solaris/native/sun/font/X11TextRenderer.c.i
 data/src/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java.i
 data/test/java/util/concurrent/atomic/Lazy.java.i
-data/test/java/net/URLConnection/Connect.java.i
 data/src/share/classes/javax/swing/text/FieldView.java.i
 data/src/share/classes/com/sun/security/auth/UnixPrincipal.java.i
-data/test/java/net/B6499348.java.i
+data/src/share/classes/sun/invoke/util/ValueConversions.java.i
+data/test/java/security/KeyRep/SerialOld.policy.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/Application.java.i
 data/src/share/demo/jvmti/hprof/hprof_util.c.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/beans/AbstractBean.java.i
 data/src/share/classes/java/awt/image/MemoryImageSource.java.i
 data/make/tools/CharsetMapping/IBM1026.nr.i
 data/src/share/classes/java/awt/font/TextHitInfo.java.i
-data/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c.i
+data/test/javax/swing/plaf/nimbus/ColorCustomizationTest.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBufferPrologue.java.i
 data/test/javax/crypto/spec/IvParameterSpec/NullIV.java.i
-data/src/share/classes/sun/io/CharToByteCp1144.java.i
 data/src/share/classes/sun/nio/ch/SelectorProviderImpl.java.i
 data/test/java/util/Locale/LocaleCategory.java.i
 data/src/share/classes/com/sun/media/sound/AutoClosingClip.java.i
-data/test/sun/net/www/http/HttpClient/RetryPost.sh.i
-data/test/java/rmi/activation/Activatable/createPrivateActivable/ActivateMe.java.i
+data/src/share/classes/sun/security/x509/GeneralNameInterface.java.i
+data/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java.i
 data/src/share/classes/sun/awt/EventQueueDelegate.java.i
 data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.html.i
 data/src/share/classes/sun/net/RegisteredDomain.java.i
 data/src/share/classes/sun/nio/cs/ext/TIS_620.java.i
+data/src/share/classes/java/nio/channels/AsynchronousChannel.java.i
 data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirAgent.java.i
-data/src/share/classes/java/util/concurrent/ForkJoinPool.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM922.java.i
 data/src/solaris/classes/sun/awt/X11/security-icon-bw32.png.i
 data/src/share/classes/sun/java2d/pipe/RegionSpanIterator.java.i
 data/test/javax/swing/MultiUIDefaults/4300666/bug4300666.java.i
 data/make/tools/src/build/tools/addjsum/AddJsum.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java.i
 data/src/linux/doc/man/ja/jvisualvm.1.i
 data/src/share/demo/zipfs.i
 data/test/java/net/ProxySelector/B6737819.java.i
 data/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java.i
-data/test/javax/swing/JFileChooser/4847375/bug4847375.java.i
+data/src/solaris/native/sun/java2d/loops/vis_FourByteAbgrPre.c.i
 data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties.i
 data/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java.i
-data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.policy.i
+data/src/solaris/classes/sun/font/FcFontConfiguration.java.i
 data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirClient.java.i
 data/test/java/util/concurrent/LinkedBlockingQueue/LastElement.java.i
 data/src/share/classes/java/util/jar/Attributes.java.i
-data/test/sun/text/resources/Format/Bug4762201.java.i
-data/src/share/classes/java/lang/ThreadDeath.java.i
-data/src/windows/native/sun/windows/awt.h.i
+data/test/javax/management/namespace/NamespaceControllerMBean.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM1122.java.i
 data/src/share/classes/java/awt/image/SinglePixelPackedSampleModel.java.i
 data/test/com/sun/crypto/provider/Cipher/AES/TestISO10126Padding.java.i
 data/test/java/security/cert/CertPathBuilder/targetConstraints/anchor.cer.i
-data/src/solaris/doc/sun/man/man1/ja/apt.1.i
+data/test/java/beans/PropertyEditor/TestEnumSubclass.java.i
 data/test/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java.i
 data/src/windows/native/java/io/FileDescriptor_md.c.i
 data/src/share/classes/sun/security/pkcs/EncryptedPrivateKeyInfo.java.i
 data/src/share/classes/sun/java2d/pipe/PixelToShapeConverter.java.i
+data/src/share/classes/com/sun/servicetag/resources/register_ja.html.i
 data/src/share/classes/java/io/Writer.java.i
 data/test/sun/tools/jstat/jstatClassOutput1.sh.i
 data/src/solaris/native/sun/awt/awt_Menu.c.i
@@ -3843,47 +3840,44 @@ data/src/share/classes/sun/util/resources/TimeZoneNamesBundle.java.i
 data/src/solaris/hpi/native_threads/src/sys_api_td.c.i
 data/test/java/io/Serializable/parents/OriginalClass.java.i
 data/src/share/npt/npt.h.i
-data/test/java/nio/charset/Charset/default.sh.i
 data/src/share/classes/java/net/SocketImpl.java.i
 data/src/share/classes/sun/security/jgss/krb5/MessageToken.java.i
-data/test/sun/security/util/HostnameMatcher/cert2.crt.i
-data/src/share/classes/sun/tools/jps/Arguments.java.i
-data/src/share/classes/sun/tools/tree/BinaryLogicalExpression.java.i
+data/src/solaris/classes/sun/font/XRTextRenderer.java.i
 data/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java.i
-data/test/java/rmi/server/serverStackTrace/ServerStackTrace.java.i
+data/src/share/classes/java/nio/file/FileVisitor.java.i
 data/test/java/awt/font/TextLayout/KernCrash.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java.i
 data/src/share/classes/java/awt/font/TransformAttribute.java.i
-data/test/sun/security/krb5/auto/BadKdc.java.i
+data/src/solaris/classes/sun/nio/fs/UnixFileStore.java.i
 data/src/share/classes/sun/io/CharToByteCp838.java.i
 data/src/share/classes/java/awt/GraphicsDevice.java.i
+data/make/tools/CharsetMapping/IBM1025.c2b.i
 data/src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java.i
 data/src/windows/classes/sun/print/services/javax.print.PrintServiceLookup.i
 data/test/javax/print/attribute/autosense/PrintAutoSenseData.java.i
-data/test/java/security/Security/signedfirst/exp.jar.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties.i
 data/src/share/classes/java/util/zip/ZipFile.java.i
-data/src/solaris/native/sun/nio/ch/PollArrayWrapper.c.i
 data/src/share/classes/java/security/cert/PolicyNode.java.i
 data/src/share/classes/java/lang/IllegalAccessException.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/ListView.gif.i
+data/src/share/classes/sun/management/snmp/util/SnmpListTableCache.java.i
 data/src/share/classes/com/sun/jmx/event/DaemonThreadFactory.java.i
 data/src/share/classes/sun/io/CharToByteEUC_KR.java.i
 data/test/java/io/Serializable/classDescHooks/ExternLoopback.java.i
-data/src/solaris/native/java/net/SocketInputStream.c.i
+data/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java.i
 data/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java.i
 data/make/tools/CharsetMapping/ISO_8859_7.map.i
-data/src/share/classes/com/sun/rowset/RowSetFactoryImpl.java.i
+data/src/share/classes/sun/java2d/cmm/CMSManager.java.i
 data/src/share/classes/javax/sql/rowset/BaseRowSet.java.i
 data/test/javax/imageio/plugins/shared/BitDepth.java.i
-data/src/share/native/sun/security/ec/ecl.c.i
+data/test/java/awt/im/InputContext/InputContextTest.java.i
+data/src/share/classes/sun/net/ftp/FtpDirEntry.java.i
 data/src/share/classes/javax/swing/SwingWorker.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java.i
 data/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot_Stub.java.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/CheckDeps.java.i
 data/src/share/classes/javax/print/attribute/standard/ColorSupported.java.i
-data/test/java/io/Serializable/NoClassDefFoundErrorTrap/NoClassDefFoundErrorTrap.java.i
-data/make/tools/src/build/tools/javazic/Main.java.i
+data/src/share/native/sun/font/layout/MorphTables.h.i
 data/src/share/native/sun/font/layout/LEGlyphStorage.h.i
 data/src/share/classes/sun/tools/tree/SuperExpression.java.i
 data/test/java/util/Locale/data/deflocale.exe.i
@@ -3891,26 +3885,27 @@ data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCVerboseLevel.ja
 data/src/share/classes/javax/swing/doc-files/SizeSequence-1.gif.i
 data/test/java/beans/PropertyEditor/TestLongTypeNull.java.i
 data/test/com/sun/jdi/RedefineStep.sh.i
-data/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java.i
+data/src/share/classes/com/sun/media/sound/SoftResamplerStreamer.java.i
+data/src/windows/native/java/io/FileSystem_md.c.i
 data/src/share/classes/java/security/spec/PKCS8EncodedKeySpec.java.i
 data/src/share/classes/com/sun/jdi/event/ThreadDeathEvent.java.i
 data/test/com/sun/jdi/VMDeathLastTest.java.i
+data/test/javax/management/loading/MLetCLR/MLetCommand.java.i
 data/test/java/nio/Buffer/CopyDirectShortMemory.java.i
 data/test/javax/management/Introspector/ResourceInjectionTest.java.i
-data/src/share/classes/sun/print/PrintJob2D.java.i
 data/make/tools/classanalyzer/build.xml.i
 data/make/netbeans/common/architectures/arch-amd64.properties.i
-data/test/java/util/regex/SupplementaryTestCases.txt.i
-data/src/share/demo/java2d/J2DBench/resources/textdata/greek.ut8.txt.i
+data/src/share/classes/javax/swing/plaf/nimbus/ToolBarSeparatorPainter.java.i
 data/src/share/classes/sun/management/MemoryManagerImpl.java.i
 data/src/share/classes/com/sun/servicetag/Util.java.i
 data/src/share/classes/java/awt/EventQueue.java.i
-data/src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java.i
+data/test/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.html.i
 data/src/share/native/sun/java2d/loops/FourByteAbgr.h.i
 data/src/share/classes/sun/awt/geom/Curve.java.i
 data/src/share/classes/java/awt/event/KeyEvent.java.i
 data/make/tools/swing-beans/beaninfo/images/JInternalFrameMono32.gif.i
 data/src/solaris/classes/sun/font/X11TextRenderer.java.i
+data/src/share/classes/sun/security/action/LoadLibraryAction.java.i
 data/test/java/lang/management/MemoryMXBean/LowMemoryTest.java.i
 data/src/share/classes/javax/swing/filechooser/FileView.java.i
 data/src/share/classes/javax/management/InstanceAlreadyExistsException.java.i
@@ -3918,7 +3913,7 @@ data/src/share/classes/com/sun/tools/jdi/TargetVM.java.i
 data/test/java/util/logging/AnonLoggerWeakRefLeak.sh.i
 data/src/share/classes/com/sun/net/httpserver/HttpsParameters.java.i
 data/src/share/classes/java/text/MessageFormat.java.i
-data/src/share/classes/java/sql/ParameterMetaData.java.i
+data/src/share/classes/com/sun/jdi/ShortType.java.i
 data/make/java/sun_nio/FILES_java.gmk.i
 data/src/share/classes/javax/sql/rowset/WebRowSet.java.i
 data/src/share/classes/com/sun/media/sound/SoftChorus.java.i
@@ -3926,11 +3921,10 @@ data/src/share/classes/sun/nio/cs/ext/IBM870.java.i
 data/src/share/classes/java/lang/reflect/AnnotatedElement.java.i
 data/src/share/classes/sun/net/www/protocol/http/AuthCacheImpl.java.i
 data/test/java/io/RandomAccessFile/ReadLine.java.i
-data/test/java/security/KeyRep/AES.pre.1.5.key.i
 data/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java.i
 data/src/share/classes/sun/print/SunPageSelection.java.i
+data/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh.i
 data/src/share/classes/com/sun/tools/extcheck/Main.java.i
-data/src/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java.i
 data/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.java.i
 data/src/share/classes/javax/xml/crypto/NodeSetData.java.i
 data/src/share/classes/java/awt/datatransfer/StringSelection.java.i
@@ -3942,34 +3936,33 @@ data/src/share/classes/javax/swing/DropMode.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthToggleButtonUI.java.i
 data/make/tools/swing-beans/beaninfo/images/JDesktopPaneMono16.gif.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/Platform.java.i
+data/test/sun/security/validator/certreplace.sh.i
 data/test/sun/security/mscapi/KeytoolChangeAlias.sh.i
-data/test/java/net/URL/GetContent.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthBorder.java.i
 data/test/java/lang/module/_ModuleId.java.i
 data/src/share/classes/javax/print/event/PrintJobAttributeEvent.java.i
 data/test/javax/management/context/LocalizableTest.java.i
 data/src/share/classes/sun/dyn/BoundMethodHandle.java.i
-data/make/javax/print/Makefile.i
 data/test/com/sun/crypto/provider/Cipher/AES/Test4513830.java.i
-data/test/sun/security/provider/PolicyFile/TrustedCert.keystore.i
-data/test/java/nio/Buffer/SwapMicroBenchmark.java.i
+data/test/java/util/concurrent/Exchanger/LoopHelpers.java.i
+data/src/share/classes/java/io/DataInputStream.java.i
 data/test/java/io/FileDescriptor/Finalize.java.i
 data/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate_Stub.java.i
-data/src/share/demo/nbproject/scripting/jconsole-plugin/build.properties.i
-data/test/javax/management/descriptor/UnionTest.java.i
+data/src/share/classes/sun/net/TelnetProtocolException.java.i
+data/test/java/nio/file/Files/SkipSiblings.java.i
+data/src/share/classes/sun/reflect/ByteVectorFactory.java.i
 data/make/tools/CharsetMapping/IBM1140.c2b.i
-data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_sr_ME.properties.i
 data/test/java/beans/Introspector/Test6723447.java.i
 data/test/javax/management/remote/mandatory/notif/ServerNotifs.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java.i
-data/test/java/rmi/transport/readTimeout/ReadTimeoutTest.java.i
 data/src/share/classes/sun/rmi/server/UnicastServerRef.java.i
 data/test/java/util/zip/GZIP/Accordion.java.i
 data/src/share/classes/sun/tools/jconsole/MBeansTab.java.i
 data/src/share/classes/java/awt/image/ColorConvertOp.java.i
-data/src/share/classes/javax/accessibility/AccessibleExtendedComponent.java.i
 data/src/share/classes/sun/io/ByteToCharCp775.java.i
+data/src/share/classes/sun/reflect/generics/reflectiveObjects/NotImplementedException.java.i
 data/make/common/internal/ImportComponents.gmk.i
-data/src/share/classes/sun/nio/ch/PollSelectorProvider.java.i
 data/test/java/rmi/transport/dgcDeadLock/TestImpl.java.i
 data/src/share/classes/javax/net/ssl/X509TrustManager.java.i
 data/make/sun/rmi/rmid/Makefile.i
@@ -3979,35 +3972,34 @@ data/src/share/classes/com/sun/security/auth/jaas-overview.html.i
 data/test/javax/swing/UIDefaults/6795356/TableTest.java.i
 data/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageBlendTable.c.i
+data/src/share/classes/java/lang/RuntimePermission.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java.i
 data/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java.i
+data/src/windows/resource/version.rc.i
 data/test/javax/security/auth/PrivateCredentialPermission/Equals.java.i
-data/test/javax/swing/DataTransfer/6456844/bug6456844.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java.i
 data/test/sun/security/ec/pkcs12/secp256r1server-secp384r1ca.p12.i
 data/test/sun/security/util/HostnameMatcher/cert3.crt.i
-data/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template.i
+data/src/share/classes/sun/awt/image/BufImgVolatileSurfaceManager.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java.i
 data/src/share/classes/sun/print/PrinterGraphicsDevice.java.i
-data/test/javax/security/auth/login/LoginContext/DefaultHandlerImpl.java.i
 data/test/java/util/ResourceBundle/TestResource_de.java.i
 data/src/share/classes/java/util/logging/Formatter.java.i
 data/src/solaris/native/sun/awt/robot_common.h.i
 data/src/share/classes/javax/swing/text/FlowView.java.i
-data/test/java/beans/XMLEncoder/Bean.java.i
+data/test/java/net/URL/GetContent.java.i
 data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipUtils.java.i
-data/src/windows/native/sun/java2d/windows/dxCapabilities.cpp.i
+data/src/solaris/bin/jexec.c.i
 data/src/share/classes/sun/util/resources/TimeZoneNames_fr.java.i
-data/src/share/sample/vm/jvm-clr/invoker.h.i
+data/src/share/classes/javax/management/loading/MLetParser.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ar_SY.properties.i
 data/src/share/classes/java/util/concurrent/ForkJoinWorkerThread.java.i
-data/src/share/classes/javax/swing/plaf/multi/MultiTreeUI.java.i
 data/src/share/classes/com/sun/media/sound/InvalidFormatException.java.i
 data/src/share/classes/com/sun/media/sound/RIFFWriter.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherValue.java.i
-data/test/java/nio/file/WatchService/denyAll.policy.i
-data/test/java/net/URLConnection/xml/xml1.i
+data/src/share/classes/sun/text/normalizer/UCharacterIterator.java.i
 data/src/share/classes/sun/net/www/http/Hurryable.java.i
-data/src/windows/native/sun/jkernel/graphics/bullet.bmp.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java.i
 data/src/share/classes/com/sun/tools/jdi/StringReferenceImpl.java.i
 data/make/tools/CharsetMapping/IBM862.map.i
 data/src/share/classes/sun/audio/AudioDataStream.java.i
@@ -4017,7 +4009,6 @@ data/test/java/io/charStreams/CharGenerator.java.i
 data/test/com/sun/net/httpserver/bugs/HeadTest.java.i
 data/test/java/net/Authenticator/B4759514.java.i
 data/src/share/classes/com/sun/jdi/connect/TransportTimeoutException.java.i
-data/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java.i
 data/make/tools/CharsetMapping/IBM1145.map.i
 data/src/share/sample/scripting/scriptpad/src/resources/mm.js.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java.i
@@ -4026,40 +4017,39 @@ data/test/sun/security/util/DerValue/Indefinite.java.i
 data/test/java/util/PluggableLocale/DateFormatProviderTest.sh.i
 data/test/sun/net/InetAddress/nameservice/deadlock/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
 data/test/java/beans/PropertyEditor/TestBooleanTypeNull.java.i
-data/src/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java.i
+data/src/share/classes/sun/io/ByteToCharMacTurkish.java.i
 data/src/share/classes/sun/audio/AudioSecurityExceptionAction.java.i
-data/src/share/classes/javax/management/DynamicMBean.java.i
 data/src/solaris/native/sun/java2d/loops/java2d_Mlib.h.i
-data/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java.i
+data/make/java/nio/addNotices.sh.i
 data/test/java/io/Serializable/subclass/XObjectInputStream.java.i
 data/test/java/security/BasicPermission/PermClass.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java.i
-data/test/javax/swing/JOptionPane/6464022/bug6464022.java.i
 data/src/share/classes/org/openjdk/jigsaw/IdentityHashSet.java.i
 data/test/java/io/Serializable/stopCustomDeserialization/Write.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c.i
 data/src/share/classes/sun/java2d/pisces/PiscesMath.java.i
 data/test/java/util/zip/ZipEntry/Constructor.java.i
-data/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java.i
+data/src/share/classes/javax/management/event/NotificationManager.java.i
 data/src/share/classes/javax/xml/crypto/dom/DOMCryptoContext.java.i
 data/src/windows/native/sun/java2d/d3d/D3DPipeline.h.i
 data/src/share/classes/sun/io/CharToByteMS949.java.i
 data/src/share/native/sun/security/ec/ecdecode.c.i
-data/src/share/classes/sun/awt/resources/awt_de.properties.i
-data/test/java/io/PipedInputStream/CloseAndAvailableRC.java.i
-data/src/share/classes/javax/swing/JMenuItem.java.i
+data/test/javax/management/mxbean/ExceptionDiagnosisTest.java.i
+data/src/share/classes/com/sun/tools/jdi/ConnectorImpl.java.i
 data/src/share/classes/javax/management/remote/rmi/RMIConnector.java.i
-data/src/share/classes/java/awt/ModalEventFilter.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadBlocksClose.java.i
 data/src/share/classes/java/awt/dnd/DnDEventMulticaster.java.i
-data/src/share/native/sun/awt/medialib/mlib_sys.c.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java.i
+data/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh.i
 data/src/share/classes/sun/security/validator/ValidatorException.java.i
 data/src/share/classes/javax/print/attribute/standard/JobPriority.java.i
 data/make/tools/auto_multi/Makefile.i
 data/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh.i
-data/test/sun/java2d/pisces/Renderer/Test7019861.java.i
+data/src/share/classes/java/nio/X-Buffer-bin.java.template.i
 data/src/share/classes/javax/imageio/spi/ImageTranscoderSpi.java.i
 data/test/javax/xml/crypto/dsig/ValidationTests.java.i
 data/test/java/net/URLConnection/6212146/test.jar.i
+data/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html.i
 data/test/sun/security/krb5/auto/DupEtypes.java.i
 data/test/java/security/Provider/GetInstance.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties.i
@@ -4067,68 +4057,68 @@ data/test/java/beans/PropertyEditor/TestByteClass.java.i
 data/make/sun/awt/make.depend.i
 data/src/share/classes/sun/font/ExtendedTextLabel.java.i
 data/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java.i
+data/src/share/classes/javax/swing/event/DocumentListener.java.i
 data/test/javax/swing/border/Test4252164.html.i
-data/test/sun/security/pkcs11/ec/TestKeyFactory.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java.i
 data/test/com/sun/nio/sctp/SctpChannel/CommUp.java.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormatResources.java.i
 data/src/share/classes/java/security/spec/DSAParameterSpec.java.i
 data/src/share/classes/sun/font/TextRecord.java.i
-data/src/share/classes/sun/security/util/ByteArrayLexOrder.java.i
 data/test/java/lang/reflect/Constructor/Equals.java.i
+data/test/java/rmi/server/clientStackTrace/ClientStackTrace.java.i
 data/src/solaris/classes/sun/awt/motif/MInputMethod.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java.i
 data/src/share/classes/java/rmi/activation/ActivationDesc.java.i
 data/test/sun/security/smartcardio/TestControl.java.i
 data/src/share/classes/java/beans/beancontext/BeanContextSupport.java.i
 data/src/share/native/sun/java2d/cmm/lcms/cmscgats.c.i
+data/src/share/classes/java/lang/doc-files/captheta.gif.i
 data/src/share/classes/sun/net/httpserver/StreamClosedException.java.i
 data/test/sun/net/www/protocol/jar/resource.jar.i
 data/test/java/util/PluggableLocale/TimeZoneNameProviderTest.sh.i
 data/src/share/classes/com/sun/jdi/ShortValue.java.i
 data/src/share/classes/sun/nio/ch/Secrets.java.i
 data/src/windows/native/sun/java2d/d3d/D3DBlitLoops.cpp.i
-data/test/java/util/StringTokenizer/ResetPos.java.i
 data/src/share/classes/sun/security/krb5/internal/ktab/KeyTabConstants.java.i
 data/src/share/classes/java/beans/PropertyChangeListener.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM868.java.i
 data/src/share/classes/sun/print/PSStreamPrintService.java.i
 data/test/java/nio/file/spi/TestProvider.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/HelpFormatter.java.i
-data/src/share/classes/javax/script/ScriptEngineFactory.java.i
+data/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef_Stub.java.i
 data/test/sun/security/provider/PolicyParser/TokenStore.java.i
 data/make/tools/src/build/tools/automulti/AutoMulti.java.i
 data/src/solaris/native/sun/java2d/loops/vis_IntRgb.c.i
+data/src/solaris/native/com/sun/security/auth/module/Unix.c.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties.i
-data/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.html.i
+data/src/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java.i
 data/src/share/classes/java/io/StreamTokenizer.java.i
 data/src/share/classes/sun/io/ByteToCharCp278.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_WithComments.java.i
-data/src/share/classes/sun/security/ssl/SSLSessionImpl.java.i
-data/test/java/io/Serializable/skippedObjCNFException/Write.java.i
-data/src/share/native/java/lang/fdlibm/src/s_tan.c.i
+data/src/share/classes/sun/tools/jconsole/InternalDialog.java.i
 data/src/share/classes/com/sun/jdi/doc-files/signature.html.i
+data/src/share/classes/sun/io/ByteToCharCp1146.java.i
 data/src/share/native/java/lang/Double.c.i
 data/test/sun/security/tools/jarsigner/JarSigning.keystore.i
 data/src/share/classes/java/util/concurrent/ScheduledExecutorService.java.i
 data/src/share/classes/java/util/PropertyResourceBundle.java.i
 data/src/share/classes/java/awt/MenuContainer.java.i
-data/test/tools/pack200/TestExceptions.java.i
+data/src/share/classes/com/sun/rowset/internal/XmlErrorHandler.java.i
 data/src/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java.i
 data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Solaris_Decoder.java.i
 data/make/tools/CharsetMapping/IBM838.c2b.i
 data/src/share/classes/java/awt/image/RescaleOp.java.i
-data/src/share/native/java/lang/fdlibm/src/e_acosh.c.i
 data/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider.i
 data/src/share/classes/com/sun/script/util/BindingsBase.java.i
-data/test/java/rmi/reliability/benchmark/bench/Harness.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java.i
 data/test/java/util/Formatter/genBasic.sh.i
 data/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh.i
 data/test/java/nio/file/Path/temporary_files.sh.i
 data/src/share/classes/java/io/BufferedInputStream.java.i
 data/src/share/demo/jvmti/hprof/debug_malloc.c.i
-data/test/javax/management/MBeanServer/PreRegisterTest.java.i
 data/src/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java.i
-data/src/windows/classes/sun/security/mscapi/Key.java.i
+data/src/windows/native/sun/font/fontpath.c.i
+data/src/share/classes/javax/sound/sampled/FloatControl.java.i
 data/src/solaris/classes/sun/awt/X11/security-icon-interim32.png.i
 data/src/share/classes/javax/swing/plaf/FontUIResource.java.i
 data/test/java/awt/Modal/WsDisabledStyle/OverBlocker/OverBlocker.java.i
@@ -4138,6 +4128,7 @@ data/test/java/nio/Buffer/BasicInt.java.i
 data/test/java/io/Serializable/InvalidClassException/noargctor/Serialize/SubclassAcrossPackage.java.i
 data/test/java/lang/module/module-info-reader.sh.i
 data/test/java/net/URLClassLoader/B5077773.sh.i
+data/src/share/classes/sun/util/resources/LocaleNamesBundle.java.i
 data/src/share/classes/java/beans/BeanInfo.java.i
 data/test/java/beans/XMLDecoder/spec/TestObject.java.i
 data/test/sun/nio/cs/TestStringCodingUTF8.java.i
@@ -4146,16 +4137,21 @@ data/src/share/classes/com/sun/jndi/ldap/ClientId.java.i
 data/src/share/classes/java/net/SocketOptions.java.i
 data/src/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java.i
 data/src/share/classes/javax/naming/NoPermissionException.java.i
+data/src/share/classes/sun/applet/AppletIllegalArgumentException.java.i
 data/src/share/classes/sun/java2d/loops/DrawGlyphList.java.i
 data/src/share/classes/sun/net/www/HeaderParser.java.i
 data/src/share/classes/sun/tools/jstat/OptionOutputFormatter.java.i
+data/src/share/classes/com/sun/security/auth/SolarisPrincipal.java.i
 data/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot_Skel.java.i
 data/src/share/classes/com/sun/jdi/connect/Transport.java.i
 data/test/java/util/StringTokenizer/Supplementary.java.i
+data/test/javax/management/remote/mandatory/URLTest.java.i
 data/src/share/classes/sun/management/HotspotMemoryMBean.java.i
-data/test/java/dyn/InvokeGenericTest.java.i
+data/src/windows/native/java/io/Win32FileSystem_md.c.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclItem.java.i
 data/src/share/classes/com/sun/jdi/MonitorInfo.java.i
 data/test/java/io/Serializable/misplacedArrayClassDesc/MisplacedArrayClassDesc.java.i
+data/src/share/classes/java/lang/reflect/ParameterizedType.java.i
 data/test/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java.i
 data/src/share/classes/com/sun/media/sound/AudioFloatConverter.java.i
 data/test/javax/imageio/plugins/png/ShortHistogramTest.java.i
@@ -4167,132 +4163,124 @@ data/test/java/rmi/activation/Activatable/nestedActivate/group.security.policy.i
 data/src/share/classes/sun/net/www/http/HttpCaptureInputStream.java.i
 data/test/sun/security/util/Debug/MultiOptions.java.i
 data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressConstants.java.i
-data/test/java/lang/management/MemoryMXBean/LowMemoryTestSerialGC.sh.i
 data/src/share/classes/java/lang/InternalError.java.i
 data/src/share/classes/org/openjdk/jigsaw/ContextSet.java.i
 data/src/share/classes/com/sun/jmx/namespace/DomainInterceptor.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_RS.properties.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/IndicInputMethodImpl.java.i
 data/test/sun/net/www/protocol/mailto/HandlerParse.java.i
 data/make/tools/swing-beans/beaninfo/images/JViewportMono32.gif.i
 data/src/share/classes/sun/net/spi/nameservice/dns/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
 data/test/sun/security/pkcs11/KeyStore/BasicData/p11-solaris.txt.i
-data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java.i
 data/make/tools/src/build/tools/jdwpgen/ErrorSetNode.java.i
 data/src/share/classes/com/sun/jdi/request/MethodExitRequest.java.i
 data/test/java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java.i
 data/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldMono32.gif.i
 data/src/share/classes/java/awt/geom/Line2D.java.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsTableMetaImpl.java.i
-data/src/share/classes/java/awt/peer/TextAreaPeer.java.i
+data/src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiInputMethodDescriptor.java.i
 data/src/share/classes/javax/swing/event/MenuDragMouseEvent.java.i
 data/src/share/classes/com/sun/java/util/jar/pack/Coding.java.i
 data/src/share/classes/javax/imageio/spi/ServiceRegistry.java.i
 data/test/java/util/concurrent/SynchronousQueue/Fairness.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-i586/libfreebl3.so.d
+data/src/share/native/sun/awt/libpng/pnginfo.h.i
 data/src/share/bin/emessages.h.i
 data/test/java/util/Hashtable/SelfRef.java.i
 data/test/java/util/regex/BMPTestCases.txt.i
 data/test/com/sun/servicetag/newer-registry-version.xml.i
 data/src/share/classes/java/beans/VetoableChangeListener.java.i
-data/make/mkdemo/applets/GraphicsTest/Makefile.i
-data/src/share/native/sun/security/ec/ec.h.i
+data/src/share/classes/java/util/concurrent/locks/ReadWriteLock.java.i
+data/src/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java.i
+data/src/share/classes/sun/io/CharToByteCp870.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java.i
 data/src/share/classes/sun/io/ByteToCharMS874.java.i
 data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java.i
-data/src/share/classes/javax/print/attribute/standard/PrintQuality.java.i
-data/src/share/classes/java/sql/SQLTransactionRollbackException.java.i
+data/make/mkdemo/jvmti/versionCheck/Makefile.i
+data/src/share/classes/javax/swing/plaf/ComponentInputMapUIResource.java.i
 data/src/share/native/sun/misc/MessageUtils.c.i
-data/src/share/classes/javax/swing/text/TabableView.java.i
 data/src/solaris/native/sun/awt/awt_wm.c.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/DoubleBean.java.i
 data/src/share/classes/com/sun/beans/decoder/DocumentHandler.java.i
 data/src/share/classes/sun/nio/ch/MembershipKeyImpl.java.i
-data/src/share/classes/com/sun/media/sound/RIFFReader.java.i
+data/test/java/net/URLClassLoader/sealing/Makefile.i
+data/test/sun/nio/cs/NIOJISAutoDetectTest.java.i
 data/test/javax/management/openmbean/BadConstraintTest.java.i
-data/test/javax/management/mxbean/ExceptionDiagnosisTest.java.i
+data/src/share/classes/sun/awt/resources/awt_de.properties.i
 data/test/java/net/SocketPermission/B4414825.java.i
 data/src/share/demo/management/index.html.i
 data/src/share/classes/sun/util/locale/InternalLocaleBuilder.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_es.properties.i
 data/test/java/rmi/server/RemoteObject/notExtending/NotExtending_Skel.java.i
-data/make/java/nio/mxbean/Makefile.i
-data/test/sun/security/provider/PolicyFile/SelfWildcard.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ko.properties.i
+data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-result.jpg.i
+data/src/share/classes/java/awt/MenuBar.java.i
+data/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java.i
 data/src/share/demo/jvmti/hprof/hprof_md.h.i
-data/src/share/classes/sun/text/resources/CollationData_sk.java.i
+data/src/share/classes/sun/awt/image/ShortInterleavedRaster.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ru_RU.properties.i
 data/src/share/classes/java/awt/Robot.java.i
-data/src/solaris/native/java/io/canonicalize_md.c.i
-data/src/share/classes/sun/management/resources/agent_es.properties.i
 data/test/java/beans/Introspector/Test5063390.java.i
+data/src/share/classes/java/lang/ClassLoader.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties.i
 data/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext_Stub.java.i
 data/src/share/classes/sun/tools/java/BinaryCode.java.i
 data/test/java/util/PluggableLocale/CollatorProviderTest.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java.i
-data/test/java/util/PluggableLocale/ClasspathTest.java.i
+data/src/share/classes/javax/accessibility/AccessibleContext.java.i
 data/src/share/classes/sun/tools/jconsole/inspector/XObject.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/util/KeyValuePair.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java.i
 data/test/javax/management/modelmbean/DescriptorSupportSerialTest.java.i
 data/test/javax/swing/JFileChooser/7036025/bug7036025.java.i
 data/src/share/native/sun/awt/libpng/pngset.c.i
-data/src/share/classes/sun/swing/text/TextComponentPrintable.java.i
 data/src/share/classes/sun/text/normalizer/ICUData.java.i
 data/src/share/classes/javax/swing/text/html/parser/TagElement.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/XTextField.java.i
+data/src/share/classes/java/awt/image/BufferedImageOp.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM1098.java.i
-data/make/tools/CharsetMapping/GBK.map.i
-data/test/java/util/Random/NextIntPowerOfTwoMod.java.i
-data/src/windows/classes/com/sun/security/auth/module/README.i
+data/make/java/zip/mapfile-vers.i
+data/src/share/classes/sun/nio/cs/SingleByteEncoder.java.i
 data/src/share/classes/javax/sound/sampled/AudioFormat.java.i
+data/src/share/classes/javax/swing/plaf/DesktopPaneUI.java.i
 data/make/jpda/transport/Makefile.i
 data/src/share/classes/sun/util/resources/CurrencyNames_es_ES.properties.i
 data/test/com/sun/security/auth/login/ConfigFile/Override.good.config.i
+data/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java.i
 data/src/share/demo/nbproject/management/FullThreadDump/nbproject/jdk.xml.i
 data/make/tools/swing-beans/beaninfo/images/JSeparatorColor32.gif.i
 data/src/share/demo/jvmti/hprof/hprof_util.h.i
-data/src/windows/native/sun/jkernel/DownloadDialog.h.i
 data/src/share/classes/javax/smartcardio/CardNotPresentException.java.i
 data/test/java/util/jar/JarFile/Signed.jar.i
 data/src/share/classes/java/lang/ref/PhantomReference.java.i
 data/src/solaris/hpi/include/hpi_init.h.i
-data/src/share/classes/java/sql/package.html.i
 data/src/share/classes/sun/rmi/log/LogInputStream.java.i
 data/test/javax/swing/JFileChooser/6798062/bug6798062.html.i
 data/src/share/classes/sun/util/resources/CurrencyNames_sr_BA.properties.i
 data/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java.i
-data/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java.i
-data/src/share/classes/sun/io/CharToByteEUC_JP_LINUX.java.i
-data/test/java/beans/XMLEncoder/javax_swing_border_EtchedBorder.java.i
 data/test/javax/swing/JTable/6768387/bug6768387.java.i
-data/test/java/util/EnumSet/RetainAll.java.i
 data/test/java/lang/ClassLoader/getdotresource.sh.i
 data/test/sun/util/logging/SourceClassName.java.i
 data/src/share/classes/javax/print/event/PrintJobAdapter.java.i
 data/src/share/classes/sun/tools/javac/resources/javac_ja.properties.i
 data/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java.i
 data/src/share/classes/java/lang/System.java.i
-data/test/java/rmi/transport/checkFQDN/CheckFQDNClient.java.i
 data/test/java/beans/XMLEncoder/Test4631471.java.i
 data/test/java/net/PlainSocketImpl/SetOption.java.i
 data/src/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java.i
 data/src/share/classes/sun/tools/java/RuntimeConstants.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_en_MT.properties.i
-data/src/share/classes/sun/io/ByteToCharCp1098.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java.i
-data/src/share/classes/sun/reflect/UTF8.java.i
 data/test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java.i
 data/make/netbeans/common/architectures/arch-x86.properties.i
+data/src/share/classes/java/io/package.html.i
 data/src/share/classes/java/util/logging/LoggingPermission.java.i
 data/src/share/classes/sun/tools/jconsole/VMPanel.java.i
 data/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy.i
 data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManager.java.i
 data/test/java/awt/print/PrinterJob/PageFormatChange.java.i
 data/test/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.policy.i
+data/src/share/classes/sun/awt/SunHints.java.i
 data/make/tools/CharsetMapping/IBM937.nr.i
 data/test/java/awt/print/Dialog/DialogOrient.java.i
 data/test/sun/tools/jrunscript/repl.out.i
-data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java.i
 data/src/share/classes/java/io/Closeable.java.i
-data/test/javax/swing/RepaintManager/7013453/bug7013453.java.i
 data/test/java/security/AccessController/PreserveCombiner.java.i
 data/src/share/classes/sun/io/ByteToCharCp1257.java.i
 data/src/share/classes/sun/reflect/MagicAccessorImpl.java.i
@@ -4301,17 +4289,18 @@ data/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java.i
 data/test/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.html.i
 data/src/share/classes/javax/sql/rowset/serial/SerialBlob.java.i
 data/test/java/security/cert/CertPathBuilder/provider.policy.i
-data/src/share/classes/javax/naming/ldap/Rdn.java.i
-data/src/share/native/sun/font/layout/ThaiLayoutEngine.cpp.i
+data/src/share/classes/com/sun/jndi/ldap/LdapReferralException.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapCommunity.java.i
 data/test/javax/sound/midi/Gervill/SoftChannel/LocalControl.java.i
-data/test/java/util/zip/ReadLoc.java.i
+data/test/java/io/StreamTokenizer/ReadAhead.java.i
 data/test/javax/management/remote/mandatory/util/MapNullValuesTest.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/icons/TreeOpen.gif.i
 data/src/share/classes/sun/text/resources/FormatData_zh_TW.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_SingletonMap.java.i
+data/src/windows/classes/sun/java2d/windows/WinVolatileSurfaceManager.java.i
 data/test/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java.i
-data/src/share/demo/jvmti/heapViewer/README.txt.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/floppy.gif.i
 data/test/java/beans/PropertyEditor/TestStringClassValue.java.i
 data/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java.i
 data/src/share/classes/javax/management/InQueryExp.java.i
@@ -4323,18 +4312,16 @@ data/src/share/back/standardHandlers.c.i
 data/src/share/classes/java/math/RoundingMode.java.i
 data/src/share/classes/sun/beans/editors/NumberEditor.java.i
 data/src/solaris/native/sun/nio/ch/IOUtil.c.i
-data/src/share/classes/sun/security/krb5/internal/KrbApErrException.java.i
-data/test/javax/management/remote/mandatory/version/ImplVersionTest.java.i
+data/src/solaris/native/sun/awt/awt_Scrollbar.c.i
 data/test/java/rmi/reliability/juicer/AppleUserImpl.java.i
 data/src/share/classes/java/net/CacheRequest.java.i
 data/src/share/classes/javax/imageio/spi/DigraphNode.java.i
-data/src/solaris/native/sun/awt/swing_GTKEngine.c.i
 data/src/share/native/sun/awt/debug/debug_util.h.i
-data/src/share/classes/java/io/FilterInputStream.java.i
-data/test/com/sun/tools/attach/badagent.mf.i
 data/src/share/classes/java/io/ObjectStreamField.java.i
 data/src/share/classes/sun/net/httpserver/SelectorCache.java.i
+data/src/share/classes/javax/swing/text/html/HTMLFrameHyperlinkEvent.java.i
 data/test/java/util/PluggableLocale/providersrc/FooDateFormat.java.i
+data/src/share/classes/sun/reflect/generics/tree/BaseType.java.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java.i
 data/src/share/classes/sun/awt/image/FileImageSource.java.i
 data/make/java/zip/reorder-sparcv9.i
@@ -4345,55 +4332,54 @@ data/test/java/math/BigDecimal/ScaleByPowerOfTenTests.java.i
 data/src/share/native/sun/font/layout/OpenTypeUtilities.cpp.i
 data/src/share/classes/sun/tools/jconsole/inspector/XTextFieldEditor.java.i
 data/src/share/classes/java/beans/PropertyEditor.java.i
-data/test/java/lang/invoke/InvokeDynamicPrintArgs.java.i
 data/src/windows/native/sun/java2d/windows/Win32OffScreenSurfaceData.cpp.i
+data/src/share/classes/sun/security/util/DerEncoder.java.i
 data/test/sun/tools/jrunscript/jrunscript-cpTest.sh.i
 data/src/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIIcon.java.i
+data/test/java/rmi/reliability/benchmark/runRmiBench.sh.i
 data/src/linux/doc/man/ja/jsadebugd.1.i
 data/test/java/beans/XMLEncoder/Test4880633.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM285.java.i
 data/src/share/classes/java/awt/LayoutManager.java.i
 data/test/java/io/Serializable/InvalidClassException/noargctor/Test.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/SessionListener.java.i
 data/src/share/classes/java/lang/invoke/InvokeDynamic.java.i
-data/test/sun/security/provider/PolicyParser/ExtDirs.policy.i
+data/make/tools/CharsetMapping/IBM285.c2b.i
+data/src/share/classes/java/util/IllegalFormatPrecisionException.java.i
 data/src/share/classes/sun/tools/java/Parser.java.i
 data/test/javax/xml/crypto/dsig/data/certs/ca.crt.i
 data/src/share/classes/javax/swing/text/rtf/charsets/ansi.txt.i
-data/src/share/classes/java/awt/Choice.java.i
+data/src/share/classes/sun/text/resources/FormatData_de.java.i
 data/test/java/util/Formatter/BasicByte.java.i
 data/test/java/awt/Component/UpdatingBootTime/UpdatingBootTime.java.i
 data/src/share/demo/applets/CardTest/example1.html.i
-data/make/tools/CharsetMapping/MS932.map.i
 data/test/java/util/zip/StoredCRC.java.i
-data/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIInsets.java.i
-data/src/share/classes/java/util/concurrent/BlockingDeque.java.i
+data/src/share/classes/javax/swing/text/NavigationFilter.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java.i
-data/test/com/sun/crypto/provider/Mac/MacClone.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/PixelTests.java.i
-data/test/java/nio/channels/FileChannel/MapTest.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java.i
 data/src/solaris/hpi/native_threads/src/threads_md.c.i
 data/src/windows/classes/sun/nio/ch/FileKey.java.i
 data/src/solaris/native/sun/nio/ch/EPoll.c.i
 data/src/share/classes/sun/management/ManagementFactoryHelper.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanSupport.java.i
-data/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h.i
+data/test/java/lang/ThreadLocal/MemoryLeak.java.i
 data/src/share/classes/sun/nio/ch/Reflect.java.i
 data/src/share/classes/java/awt/image/ColorModel.java.i
-data/test/java/security/cert/CertificateFactory/ReturnStream.java.i
+data/test/java/rmi/activation/ActivationSystem/unregisterGroup/rmid.security.policy.i
 data/src/share/classes/org/openjdk/internal/joptsimple/NoArgumentOptionSpec.java.i
-data/src/share/classes/java/security/spec/MGF1ParameterSpec.java.i
 data/src/share/classes/com/sun/security/sasl/digest/FactoryImpl.java.i
 data/src/share/classes/java/sql/SQLClientInfoException.java.i
 data/test/java/util/ResourceBundle/Bug6572242.java.i
 data/test/sun/security/provider/certpath/ReverseBuilder/mgrM2prjM.i
 data/test/java/security/cert/X509Certificate/certextkeyusage.i
+data/src/share/classes/javax/swing/border/MatteBorder.java.i
 data/make/java/java/FILES_c.gmk.i
 data/src/share/classes/com/sun/net/httpserver/HttpServer.java.i
 data/src/share/classes/sun/font/GlyphList.java.i
 data/make/netbeans/jarzip/nbproject/project.xml.i
+data/src/share/classes/sun/reflect/UnsafeByteFieldAccessorImpl.java.i
 data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/group.security.policy.i
 data/src/share/classes/sun/tools/asm/Label.java.i
 data/src/share/classes/java/security/KeyFactory.java.i
@@ -4402,24 +4388,22 @@ data/test/sun/security/krb5/auto/LifeTimeInSeconds.java.i
 data/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h.i
 data/src/share/demo/jvmti/mtrace/Mtrace.java.i
 data/src/share/demo/jvmti/hprof/manual.html.i
-data/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties.i
 data/test/java/net/NetworkInterface/IndexTest.java.i
 data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java.i
 data/test/jprt.config.i
-data/src/share/classes/java/sql/Date.java.i
+data/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh.i
 data/src/share/native/common/check_format.c.i
 data/src/share/classes/javax/crypto/NoSuchPaddingException.java.i
 data/src/share/classes/sun/print/ProxyGraphics2D.java.i
 data/test/sun/net/InetAddress/nameservice/deadlock/ThrowingNameService.java.i
 data/make/tools/CharsetMapping/MacCroatian.map.i
-data/src/share/classes/java/security/cert/CertificateException.java.i
-data/src/share/native/sun/font/layout/ShapingTypeData.cpp.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java.i
+data/src/share/classes/sun/text/resources/FormatData_ca.java.i
 data/test/com/sun/security/auth/module/LdapLoginModule/CheckOptions.java.i
 data/src/share/classes/sun/tools/tree/ShiftRightExpression.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathTableMeta.java.i
-data/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java.i
+data/src/share/classes/com/sun/jmx/snmp/internal/SnmpModelLcd.java.i
 data/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java.i
-data/src/share/classes/javax/crypto/ExemptionMechanismSpi.java.i
 data/src/windows/native/sun/windows/awt_PrintDialog.h.i
 data/src/share/classes/com/sun/security/jgss/InquireType.java.i
 data/test/sun/rmi/rmic/minimizeWrapperInstances/P.java.i
@@ -4427,28 +4411,29 @@ data/src/share/classes/com/sun/tools/jdi/FieldImpl.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_fr_LU.properties.i
 data/src/share/classes/javax/management/NotificationInfo.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java.i
-data/src/share/classes/sun/awt/image/VolatileSurfaceManager.java.i
-data/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer_Stub.java.i
-data/src/share/classes/sun/tools/tree/AssignDivideExpression.java.i
-data/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh.i
-data/src/share/classes/java/awt/doc-files/GridBagLayout-1.gif.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/PaintModel.java.i
+data/test/java/net/InetAddress/HashSpread.java.i
+data/test/sun/security/util/Resources/Format.config.i
+data/src/share/classes/java/lang/invoke/MutableCallSite.java.i
+data/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh.i
+data/src/share/classes/java/awt/doc-files/GridBagLayout-1.gif.i
 data/src/share/classes/java/lang/management/MemoryNotificationInfo.java.i
 data/test/com/sun/net/httpserver/bugs/B6361557.java.i
 data/src/windows/classes/com/sun/tools/jdi/SharedMemoryListeningConnector.java.i
 data/src/solaris/native/sun/awt/utility/rect.h.i
-data/src/share/classes/java/util/logging/Logger.java.i
+data/src/share/classes/com/sun/java/util/jar/pack/Code.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll.i
 data/test/javax/swing/JSlider/6848475/bug6848475.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java.i
 data/src/solaris/doc/sun/man/man1/jhat.1.i
 data/src/share/classes/java/awt/peer/FramePeer.java.i
+data/test/sun/security/smartcardio/Utils.java.i
 data/test/java/rmi/server/RemoteObject/toStub/ToStub_Stub.java.i
-data/src/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingResponse.java.i
 data/src/share/classes/sun/reflect/FieldAccessor.java.i
-data/test/java/beans/XMLDecoder/spec/TestNull.java.i
 data/src/share/classes/sun/java2d/SurfaceManagerFactory.java.i
 data/src/solaris/native/sun/nio/ch/EPollArrayWrapper.c.i
-data/src/solaris/native/sun/java2d/loops/vis_IntBgr.c.i
 data/src/share/classes/sun/security/krb5/internal/crypto/NullEType.java.i
+data/src/share/classes/com/sun/rowset/WebRowSetImpl.java.i
 data/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java.i
 data/test/java/beans/XMLDecoder/Test6338070.java.i
 data/test/javax/swing/JFileChooser/6524424/bug6524424.html.i
@@ -4461,21 +4446,21 @@ data/src/share/classes/java/awt/event/InputMethodEvent.java.i
 data/src/share/classes/com/sun/crypto/provider/CipherBlockChaining.java.i
 data/test/java/beans/beancontext/Test4328406.java.i
 data/test/java/util/PluggableLocale/providersrc/Makefile.i
-data/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef_Stub.java.i
+data/src/share/classes/javax/script/ScriptEngineFactory.java.i
 data/src/solaris/native/java/net/net_util_md.c.i
 data/src/share/classes/javax/crypto/spec/DESedeKeySpec.java.i
 data/src/share/classes/java/net/IDN.java.i
 data/src/share/classes/sun/font/SunLayoutEngine.java.i
 data/src/share/classes/sun/security/provider/certpath/BasicChecker.java.i
+data/src/share/classes/sun/awt/image/ImageWatched.java.i
 data/make/sun/javazic/tzdata/factory.i
 data/src/share/classes/java/security/DigestException.java.i
 data/src/share/classes/java/awt/peer/TextFieldPeer.java.i
-data/src/solaris/native/sun/security/pkcs11/j2secmod_md.h.i
-data/src/share/classes/sun/tools/tree/LengthExpression.java.i
 data/src/share/sample/scripting/scriptpad/src/resources/gui.js.i
 data/src/share/classes/javax/management/NotificationListener.java.i
 data/src/share/classes/sun/io/CharToByteMacDingbat.java.i
 data/test/java/lang/reflect/Proxy/Boxing.java.i
+data/src/linux/doc/man/servertool.1.i
 data/test/sun/security/x509/AVA/EmailAddressEncoding.java.i
 data/src/solaris/hpi/native_threads/include/mutex_md.h.i
 data/make/tools/src/build/tools/generatecharacter/PropList.java.i
@@ -4483,21 +4468,17 @@ data/test/sun/tools/jrunscript/dash-e.out.i
 data/src/solaris/classes/sun/awt/X11/XEmbedHelper.java.i
 data/src/share/classes/sun/io/CharToByteBig5.java.i
 data/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh.i
-data/src/share/demo/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml.i
-data/src/solaris/native/sun/java2d/x11/X11SurfaceData.h.i
 data/src/share/classes/java/util/concurrent/CyclicBarrier.java.i
 data/src/share/classes/sun/security/krb5/internal/rcache/AuthTime.java.i
-data/src/share/classes/sun/rmi/server/Dispatcher.java.i
 data/src/share/native/sun/security/ec/impl/mplogic.c.i
 data/src/share/classes/sun/print/resources/tumble.png.i
 data/src/share/classes/java/awt/Button.java.i
 data/src/solaris/classes/sun/java2d/xr/XRUtils.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java.i
-data/src/share/classes/sun/java2d/pisces/Dasher.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/Load4.java.i
+data/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Compress.java.i
 data/test/javax/imageio/CachePremissionsTest/rw.policy.i
 data/src/share/classes/sun/tools/java/ClassNotFound.java.i
-data/src/share/classes/sun/print/PSStreamPrintJob.java.i
 data/src/share/classes/java/net/Inet6Address.java.i
 data/src/share/classes/com/sun/pept/presentation/TargetFinder.java.i
 data/src/solaris/classes/sun/awt/motif/MTextAreaPeer.java.i
@@ -4506,36 +4487,35 @@ data/src/share/classes/javax/swing/text/rtf/RTFEditorKit.java.i
 data/src/share/classes/javax/naming/directory/AttributeModificationException.java.i
 data/test/javax/xml/crypto/dsig/data/certs/balor.crt.i
 data/test/javax/print/applet/applet1/Applet1PrintServiceLookup.java.i
-data/test/java/nio/channels/Selector/Wakeup.java.i
 data/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.java.i
-data/src/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java.i
+data/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.html.i
 data/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c.i
+data/make/tools/classanalyzer/Makefile.i
 data/make/java/management/Makefile.i
 data/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java.i
-data/src/share/native/sun/java2d/loops/FourByteAbgr.c.i
+data/src/share/classes/com/sun/crypto/provider/DESCrypt.java.i
 data/src/share/classes/com/sun/net/httpserver/HttpsConfigurator.java.i
 data/src/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java.i
-data/src/share/classes/sun/security/pkcs10/PKCS10.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/Session.java.i
-data/src/share/native/sun/java2d/cmm/lcms/LCMS.c.i
-data/src/share/classes/com/sun/tools/example/debug/gui/ClassManager.java.i
+data/src/share/classes/java/lang/annotation/Documented.java.i
 data/src/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java.i
 data/test/javax/management/monitor/CounterMonitorDeadlockTest.java.i
-data/src/share/classes/javax/print/attribute/standard/DialogTypeSelection.java.i
+data/make/docs/Makefile.i
+data/src/share/classes/sun/util/resources/CurrencyNames_en_CA.properties.i
 data/src/share/classes/javax/naming/CompositeName.java.i
 data/test/java/io/File/isDirectory/Applet.java.i
-data/src/share/classes/javax/swing/table/TableCellRenderer.java.i
+data/src/linux/doc/man/ja/serialver.1.i
+data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java.i
 data/test/java/beans/PropertyEditor/6380849/SecondBean.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java.i
 data/test/java/lang/instrument/NullRedefineClassesTests.java.i
 data/test/java/beans/Introspector/Test6422403.java.i
-data/src/share/classes/javax/swing/DefaultDesktopManager.java.i
+data/test/java/beans/PropertyEditor/Test6397609.java.i
 data/test/java/util/AbstractMap/Equals.java.i
 data/src/share/classes/com/sun/media/sound/SF2Modulator.java.i
 data/make/tools/manifest.mf.i
 data/test/sun/net/www/http/HttpClient/B6726695.java.i
 data/test/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java.i
-data/test/java/dyn/indify/Indify.java.i
 data/src/share/classes/javax/swing/JCheckBox.java.i
 data/src/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMEnterprise.java.i
@@ -4544,47 +4524,48 @@ data/src/share/classes/com/sun/java/browser/dom/DOMUnsupportedException.java.i
 data/src/share/classes/java/lang/management/PlatformLoggingMXBean.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiFileChooserUI.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_bg_BG.properties.i
-data/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.policy.i
 data/src/share/classes/javax/swing/JDialog.java.i
 data/src/share/classes/javax/swing/text/html/parser/AttributeList.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java.i
 data/src/share/classes/javax/print/attribute/standard/JobImpressions.java.i
 data/src/solaris/native/sun/awt/awt_Cursor.c.i
 data/src/solaris/classes/sun/awt/X11/XMouseDragGestureRecognizer.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ar_AE.properties.i
-data/src/share/classes/com/sun/pept/ept/EPTFactory.java.i
+data/src/share/classes/com/sun/jdi/request/ThreadStartRequest.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java.i
 data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/JarFileCompare.java.i
 data/test/sun/security/krb5/TimeInCCache.java.i
 data/src/share/back/FieldImpl.c.i
+data/src/share/classes/com/sun/servicetag/resources/Putback-Notes.txt.i
+data/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties.i
 data/src/share/classes/com/sun/pept/protocol/MessageDispatcher.java.i
 data/src/share/classes/sun/security/util/AuthResources_it.java.i
 data/test/javax/management/loading/LibraryLoader/UseNativeLib0.html.i
+data/src/share/classes/sun/io/CharToByteCp857.java.i
 data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties.i
-data/src/share/classes/sun/text/resources/FormatData_bg_BG.java.i
+data/src/share/classes/sun/tools/tree/FinallyStatement.java.i
 data/src/linux/doc/man/ja/extcheck.1.i
 data/src/share/classes/sun/net/ProgressMonitor.java.i
-data/test/java/util/ResourceBundle/Test4300693RB.java.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/COMMarkerSegment.java.i
 data/test/java/lang/reflect/Generics/TestBadSignatures.java.i
 data/src/share/classes/sun/java2d/pipe/GlyphListPipe.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_vi.properties.i
-data/src/solaris/classes/sun/awt/UNIXToolkit.java.i
+data/src/share/classes/java/io/StreamCorruptedException.java.i
 data/make/com/sun/nio/sctp/FILES_java.gmk.i
-data/test/org/openjdk/jigsaw/cli/signed-modular-jar.sh.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U16Func.c.i
+data/src/share/classes/java/awt/doc-files/modal-example3.gif.i
 data/src/share/classes/com/sun/beans/decoder/LongElementHandler.java.i
 data/test/com/sun/net/httpserver/testkeys.i
 data/make/java/rmi/Makefile.i
-data/test/java/io/Serializable/enum/missingConstant/Read.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java.i
 data/test/java/nio/channels/Pipe/NonBlocking.java.i
 data/src/share/classes/javax/sound/sampled/EnumControl.java.i
-data/src/share/classes/java/rmi/server/ObjID.java.i
 data/test/java/util/Locale/bug6312358.java.i
 data/test/java/nio/channels/SocketChannel/Basic.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java.i
 data/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java.i
 data/test/java/util/PluggableLocale/fooprovider.jar.i
 data/src/share/classes/sun/text/normalizer/RuleCharacterIterator.java.i
-data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_EBCDIC_Encoder.java.i
+data/src/share/classes/sun/text/resources/CollationData_ko.java.i
 data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties.i
 data/src/share/native/sun/java2d/opengl/OGLTextRenderer.c.i
 data/test/org/openjdk/jigsaw/cli/ModuleFormatHeaderHashTest.java.i
@@ -4597,8 +4578,8 @@ data/src/share/classes/java/awt/doc-files/LinearGradientPaint.png.i
 data/src/share/classes/java/awt/FontFormatException.java.i
 data/src/share/classes/javax/imageio/ImageTypeSpecifier.java.i
 data/test/java/net/URLClassLoader/closetest/test2/com/foo/Resource2.i
-data/test/java/lang/Float/BitwiseConversion.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U16Func.c.i
+data/src/share/classes/java/awt/peer/FileDialogPeer.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiDesktopIconUI.java.i
 data/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java.i
 data/test/java/io/File/CompareTo.java.i
@@ -4608,8 +4589,8 @@ data/src/share/classes/sun/security/jgss/GSSToken.java.i
 data/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java.i
 data/test/javax/swing/plaf/nimbus/Test6741426.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/AclEntryImpl.java.i
-data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipCoder.java.i
-data/src/linux/doc/man/ja/rmic.1.i
+data/src/share/back/ClassObjectReferenceImpl.h.i
+data/test/java/rmi/reliability/benchmark/bench/Harness.java.i
 data/make/tools/winver/src/StdAfx.cpp.i
 data/test/javax/swing/text/WrappedPlainView/6857057/StubLeafElement.java.i
 data/test/java/awt/font/LineBreakMeasurer/FRCTest.java.i
@@ -4617,19 +4598,21 @@ data/test/java/rmi/activation/checkusage/CheckUsage.java.i
 data/make/javax/sound/jsoundalsa/mapfile-vers.i
 data/src/share/classes/org/relaxng/datatype/DatatypeBuilder.java.i
 data/src/linux/doc/man/rmid.1.i
+data/src/share/classes/com/sun/jndi/ldap/SimpleClientId.java.i
 data/src/share/classes/javax/sql/RowSetWriter.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCTableMetaImpl.java.i
 data/test/java/nio/file/Files/PrintFileTree.java.i
 data/test/sun/security/krb5/auto/NoInitNoKeytab.java.i
 data/src/share/classes/javax/swing/text/DefaultEditorKit.java.i
 data/test/sun/security/tools/keytool/AltProviderPath.sh.i
+data/src/share/classes/java/awt/peer/package.html.i
 data/src/share/classes/sun/net/www/MessageHeader.java.i
-data/src/solaris/native/sun/security/smartcardio/MUSCLE/COPYING.i
+data/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java.i
+data/src/share/demo/nbproject/jfc/TransparentRuler/build.xml.i
 data/test/com/sun/jdi/Exit0.java.i
 data/test/java/nio/charset/coders/Surrogates.java.i
 data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManagerMXBean.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_ar.properties.i
-data/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java.i
+data/src/solaris/native/sun/awt/medialib/vis_32.il.i
 data/test/java/io/Writer/Append.java.i
 data/test/sun/misc/URLClassPath/testclasses.jar.i
 data/src/share/bin/splashscreen.h.i
@@ -4641,40 +4624,33 @@ data/src/share/classes/sun/reflect/generics/tree/LongSignature.java.i
 data/test/javax/security/auth/login/LoginContext/ModuleSubject.config.i
 data/src/share/classes/sun/jvmstat/monitor/MonitoredVm.java.i
 data/test/java/beans/Statement/Test4653179.java.i
-data/test/javax/script/Test7.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapClientFactory.java.i
+data/src/share/classes/sun/print/PSPathGraphics.java.i
 data/test/java/io/OutputStreamWriter/WriteAfterClose.java.i
 data/src/windows/native/sun/windows/Hashtable.cpp.i
 data/src/share/classes/sun/io/ByteToCharCp1256.java.i
 data/src/share/classes/java/security/cert/CRLReason.java.i
-data/test/sun/security/pkcs11/Secmod/TrustAnchors.java.i
-data/make/org/Makefile.i
+data/make/common/Mapfile-vers.gmk.i
 data/src/share/classes/sun/security/acl/GroupImpl.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java.i
 data/src/share/native/sun/font/layout/ScriptAndLanguage.h.i
-data/src/share/native/sun/awt/image/cvutils/img_input8.h.i
-data/src/share/classes/java/security/PublicKey.java.i
+data/src/share/classes/sun/util/resources/CalendarData_in_ID.properties.i
 data/make/tools/CharsetMapping/MS932.c2b.i
 data/src/solaris/bin/sparc/jvm.cfg.i
 data/src/share/classes/sun/text/resources/FormatData.java.i
-data/test/javax/security/auth/PrivateCredentialPermission/Subset.policy.i
 data/src/share/classes/sun/misc/JavaSecurityAccess.java.i
-data/src/share/classes/sun/text/CollatorUtilities.java.i
-data/src/share/modules/jdk.swing/module-info.java.i
-data/src/share/native/sun/security/ec/impl/mpprime.h.i
 data/src/windows/native/sun/nio/ch/IOUtil.c.i
-data/test/java/security/cert/CertPathValidator/indirectCRL/generate.sh.i
+data/src/share/native/sun/java2d/loops/ImageData.h.i
 data/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java.i
 data/src/share/classes/javax/swing/text/html/FormSubmitEvent.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java.i
 data/src/share/demo/jfc/Font2DTest/resources/TextResources.properties.i
+data/src/share/classes/sun/misc/RegexpTarget.java.i
 data/test/com/sun/jdi/AcceptTimeout.java.i
 data/src/share/classes/javax/swing/text/View.java.i
-data/src/share/classes/com/sun/jmx/snmp/defaults/SnmpProperties.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpPduFactoryBER.java.i
 data/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java.i
 data/src/share/native/sun/security/ec/impl/ecl_gf.c.i
-data/src/share/classes/javax/swing/text/ZoneView.java.i
-data/test/java/rmi/activation/Activatable/nestedActivate/rmid.security.policy.i
+data/src/share/classes/com/sun/tools/hat/internal/model/StackTrace.java.i
+data/src/solaris/classes/sun/awt/X11/XScrollPanePeer.java.i
 data/src/share/classes/java/lang/management/MemoryMXBean.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM933.java.i
@@ -4682,17 +4658,17 @@ data/src/share/classes/sun/awt/image/IntegerInterleavedRaster.java.i
 data/src/share/classes/sun/launcher/resources/launcher_de.properties.i
 data/test/demo/jvmti/minst/MinstTest.java.i
 data/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java.i
-data/src/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java.i
 data/make/javax/sound/jsoundhs/mapfile-vers.i
+data/src/share/classes/sun/misc/DoubleConsts.java.i
 data/src/share/classes/java/util/PropertyPermission.java.i
 data/src/windows/classes/sun/awt/windows/WFramePeer.java.i
 data/src/share/classes/com/sun/security/sasl/util/PolicyUtils.java.i
+data/src/share/classes/com/sun/beans/decoder/ClassElementHandler.java.i
 data/src/share/classes/sun/java2d/DisposerTarget.java.i
 data/make/tools/CharsetMapping/IBM922.map.i
 data/src/share/classes/sun/text/resources/FormatData_tr.java.i
 data/test/java/io/LineNumberInputStream/SkipEOL.java.i
 data/src/share/classes/sun/nio/cs/ext/MacTurkish.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv.h.i
 data/src/share/classes/sun/text/resources/FormatData_nl_NL.java.i
 data/src/share/classes/sun/dyn/WrapperInstance.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/NotifySupport.java.i
@@ -4703,9 +4679,11 @@ data/src/solaris/native/sun/java2d/loops/mlib_v_ImageConstLogic.h.i
 data/src/share/classes/sun/text/resources/FormatData_sr_Latn_ME.java.i
 data/test/java/io/Serializable/maskSyntheticModifier/run.sh.i
 data/src/share/classes/sun/io/CharToByteEUC_JP_Solaris.java.i
+data/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java.i
 data/src/share/classes/javax/management/MBean.java.i
 data/src/share/classes/sun/print/PSStreamPrinterFactory.java.i
-data/test/java/util/Collections/EmptyIterator.java.i
+data/test/java/rmi/activation/Activatable/forceLogSnapshot/group.security.policy.i
+data/src/share/demo/jvmti/agent_util/agent_util.c.i
 data/src/share/classes/java/sql/SQLTransientConnectionException.java.i
 data/test/com/sun/nio/sctp/SctpMultiChannel/Util.java.i
 data/src/solaris/classes/sun/font/NativeStrike.java.i
@@ -4719,6 +4697,7 @@ data/test/tools/launcher/UnicodeTest.java.i
 data/src/share/classes/sun/io/ByteToCharCp1047.java.i
 data/test/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java.i
 data/src/share/classes/java/awt/TextArea.java.i
+data/src/share/native/common/jni_util.h.i
 data/test/java/lang/instrument/RetransformApp.java.i
 data/src/share/back/StringReferenceImpl.h.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties.i
@@ -4736,7 +4715,9 @@ data/src/share/classes/sun/security/krb5/internal/APRep.java.i
 data/src/share/classes/sun/security/acl/PermissionImpl.java.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownAccContrModelException.java.i
 data/test/java/util/Collections/BinarySearchNullComparator.java.i
+data/src/share/classes/javax/security/auth/login/CredentialNotFoundException.java.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java.i
+data/src/share/classes/java/awt/im/spi/InputMethod.java.i
 data/test/sun/security/pkcs11/sslecc/JSSEClient.java.i
 data/src/share/classes/javax/swing/JSpinner.java.i
 data/src/solaris/native/sun/awt/awt_MToolkit.c.i
@@ -4745,72 +4726,74 @@ data/src/share/classes/java/net/Proxy.java.i
 data/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html.i
 data/test/sun/security/pkcs11/KeyStore/loader.jar.i
 data/src/share/classes/sun/tools/tree/EqualExpression.java.i
-data/src/share/native/sun/font/layout/MirroredCharData.cpp.i
+data/src/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java.i
 data/src/share/back/VirtualMachineImpl.c.i
 data/src/share/classes/sun/font/CompositeGlyphMapper.java.i
 data/test/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.java.i
 data/src/share/classes/org/openjdk/jigsaw/ConfigurationException.java.i
 data/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls_Stub.java.i
-data/src/share/classes/sun/security/x509/RFC822Name.java.i
+data/src/share/classes/javax/sound/midi/spi/MidiFileReader.java.i
+data/make/tools/swing-beans/beaninfo/images/JRootPaneColor16.gif.i
 data/test/java/beans/PropertyEditor/TestDoubleTypeValue.java.i
 data/src/share/classes/java/sql/SQLDataException.java.i
 data/test/javax/management/namespace/JMXNamespaceSecurityTest.java.i
 data/src/share/classes/javax/naming/ldap/PagedResultsControl.java.i
-data/src/share/classes/sun/nio/cs/ext/MacHebrew.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.chk.i
-data/src/share/classes/sun/jvmstat/monitor/event/VmStatusChangeEvent.java.i
 data/src/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest11_ok.ssl.in.i
-data/src/windows/native/sun/jkernel/resource.h.i
+data/test/java/lang/Runtime/exec/ArgWithSpaceAndFinalBackslash.java.i
+data/src/share/classes/java/lang/invoke/Invokers.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadHandshake.java.i
 data/test/sun/tools/jps/jps-V_2.sh.i
 data/test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java.i
+data/src/share/classes/javax/sound/sampled/Clip.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiColorChooserUI.java.i
 data/src/share/classes/java/io/PipedInputStream.java.i
 data/src/share/classes/sun/nio/cs/ext/MS950.java.i
 data/make/modules/tools/src/com/sun/classanalyzer/CodeAttributeParser.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_en_PH.properties.i
 data/test/java/lang/annotation/Missing/C.java.i
 data/src/share/classes/java/sql/Savepoint.java.i
 data/src/share/classes/sun/tools/java/MethodSet.java.i
 data/src/share/classes/javax/print/ServiceUIFactory.java.i
 data/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java.i
 data/src/windows/native/sun/jkernel/kernel_zh_TW.rc.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/Test.java.i
-data/test/sun/rmi/rmic/defaultStubVersion/run.sh.i
+data/make/sun/font/mapfile-vers.openjdk.i
+data/src/windows/native/sun/security/smartcardio/pcsc_md.h.i
 data/src/share/classes/javax/security/auth/login/AccountExpiredException.java.i
-data/src/share/classes/sun/net/www/protocol/gopher/GopherClient.java.i
+data/test/java/lang/Double/ParseHexFloatingPoint.java.i
 data/src/solaris/native/sun/nio/ch/SolarisEventPort.c.i
 data/test/java/lang/Class/getDeclaredMethod/Exceptions.java.i
 data/src/share/classes/java/lang/reflect/GenericArrayType.java.i
 data/make/sun/javazic/javatz/java_us_ids.txt.i
-data/test/sun/net/www/ParseUtil_6274990.java.i
+data/src/share/classes/sun/security/ssl/DHClientKeyExchange.java.i
 data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c.i
 data/src/share/classes/sun/management/ThreadInfoCompositeData.java.i
 data/src/windows/classes/sun/nio/ch/WindowsSelectorProvider.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxReceivers.java.i
-data/src/share/classes/sun/nio/cs/ext/GB18030.java.i
+data/src/solaris/doc/sun/man/man1/ja/appletviewer.1.i
 data/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java.i
 data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipUtils.java.i
 data/src/share/classes/sun/management/HotSpotDiagnostic.java.i
+data/src/share/classes/com/sun/net/ssl/SSLPermission.java.i
+data/src/share/classes/com/sun/security/jgss/jgss-overview.html.i
 data/make/tools/swing-beans/beaninfo/images/JOptionPaneColor16.gif.i
 data/src/share/demo/jvmti/mtrace/mtrace.c.i
 data/src/share/classes/sun/tools/tree/OrExpression.java.i
+data/src/linux/doc/man/ja/jps.1.i
 data/src/share/demo/nbproject/management/FullThreadDump/build.properties.i
 data/test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java.i
 data/src/share/classes/java/awt/im/InputContext.java.i
 data/src/share/classes/java/text/package.html.i
 data/src/solaris/native/java/util/FileSystemPreferences.c.i
 data/src/share/classes/sun/net/www/MimeEntry.java.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/Functions.java.i
+data/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java.i
+data/src/share/classes/sun/nio/cs/US_ASCII.java.i
 data/test/javax/naming/spi/DirectoryManager/GetContDirCtx.java.i
 data/test/java/rmi/reliability/benchmark/bench/serial/ReplaceTrees.java.i
-data/test/java/io/Serializable/backRefCNFException/Write.java.i
+data/test/java/beans/PropertyChangeSupport/TestMethods.java.i
 data/src/share/classes/sun/java2d/pipe/BufferedContext.java.i
 data/src/share/classes/javax/swing/SwingHeavyWeight.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java.i
+data/src/share/classes/javax/crypto/spec/package.html.i
 data/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java.i
 data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/RemoteClass.java.i
 data/src/share/native/java/util/zip/zlib-1.1.3/infblock.h.i
@@ -4819,21 +4802,18 @@ data/src/share/sample/nio/server/Acceptor.java.i
 data/src/share/classes/sun/nio/cs/ext/Big5.java.i
 data/src/share/classes/java/util/concurrent/RejectedExecutionException.java.i
 data/src/share/classes/javax/naming/NoInitialContextException.java.i
-data/test/javax/swing/JComponent/6989617/bug6989617.java.i
 data/src/share/classes/com/sun/jdi/DoubleType.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMicrosecondPosition.java.i
 data/src/share/classes/javax/swing/ButtonGroup.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_EmptySet.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties.i
 data/src/windows/classes/sun/awt/windows/WComponentPeer.java.i
-data/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java.i
+data/src/share/classes/sun/management/CompilerThreadStat.java.i
 data/make/tools/swing-beans/beaninfo/images/JComboBoxColor16.gif.i
 data/src/share/classes/javax/swing/text/html/parser/ResourceLoader.java.i
 data/src/share/classes/javax/swing/plaf/TableHeaderUI.java.i
-data/src/windows/classes/sun/awt/windows/ThemeReader.java.i
+data/test/com/sun/crypto/provider/Cipher/RSA/TestOAEPWithParams.java.i
 data/src/windows/classes/sun/awt/windows/WFileDialogPeer.java.i
 data/README.i
-data/src/windows/classes/sun/awt/windows/fontconfig.98.properties.i
 data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java.i
 data/src/share/classes/com/sun/management/mgmt-overview.html.i
 data/src/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java.i
@@ -4845,7 +4825,6 @@ data/src/windows/classes/sun/nio/fs/WindowsFileCopy.java.i
 data/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java.i
 data/src/share/classes/com/sun/jdi/InternalException.java.i
 data/src/share/classes/sun/text/normalizer/TrieIterator.java.i
-data/src/share/classes/org/openjdk/jigsaw/RemoteRepositoryList.java.i
 data/src/share/classes/javax/management/MBeanException.java.i
 data/test/sun/tools/jhat/minimal.bin.i
 data/src/share/classes/java/awt/doc-files/BorderLayout-1.gif.i
@@ -4853,6 +4832,7 @@ data/src/share/classes/java/io/SequenceInputStream.java.i
 data/src/share/demo/jvmti/gctest/gctest.c.i
 data/test/java/lang/Class/getModifiers/StripACC_SUPER.java.i
 data/test/javax/sound/midi/Gervill/SoftTuning/GetName.java.i
+data/src/windows/npt/utf_md.h.i
 data/test/java/net/URL/B4148751.java.i
 data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManagerMXBean.java.i
 data/src/share/native/sun/management/management.h.i
@@ -4861,9 +4841,8 @@ data/src/share/classes/sun/security/util/Resources_de.java.i
 data/make/tools/CharsetMapping/MacHebrew.map.i
 data/src/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S32Func.c.i
-data/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java.i
-data/src/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java.i
 data/make/tools/UnicodeData/UnicodeData.txt.i
+data/src/share/classes/sun/util/resources/CurrencyNames_nl_BE.properties.i
 data/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java.i
 data/make/tools/UnicodeData/UnicodeData.txt.d
 data/src/share/classes/java/util/concurrent/ConcurrentHashMap.java.i
@@ -4886,28 +4865,25 @@ data/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java.i
 data/src/share/classes/com/sun/jndi/ldap/Obj.java.i
 data/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java.i
 data/src/share/native/sun/awt/image/cvutils/img_dcm.h.i
-data/test/java/net/URLConnection/GetLastModified.java.i
 data/test/java/nio/file/Files/probeContentType/ForceLoad.java.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/menu.gif.i
 data/src/share/classes/sun/tools/java/ClassFile.java.i
-data/src/share/classes/javax/swing/colorchooser/SlidingSpinner.java.i
 data/test/javax/sound/midi/Gervill/RiffReaderWriter/Close.java.i
 data/src/share/classes/javax/swing/doc-files/groupLayout.3.gif.i
 data/src/share/demo/jvmti/waiters/Monitor.hpp.i
 data/src/share/native/sun/awt/image/awt_parseImage.c.i
 data/src/share/classes/javax/xml/crypto/dsig/TransformException.java.i
-data/make/com/sun/servicetag/Makefile.i
 data/test/java/net/URLClassLoader/sealing/checksealed.sh.i
 data/src/share/classes/javax/management/monitor/CounterMonitor.java.i
 data/test/javax/management/context/localizable/MBeanDescriptions_fr.java.i
-data/src/share/classes/javax/print/attribute/PrintServiceAttributeSet.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Error.gif.i
 data/make/netbeans/jmx/nbproject/project.xml.i
 data/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java.i
-data/src/share/classes/sun/reflect/misc/MethodUtil.java.i
 data/src/share/native/sun/font/layout/HangulLayoutEngine.cpp.i
 data/src/linux/doc/man/rmiregistry.1.i
 data/test/com/sun/jdi/MethodEntryExitEvents.java.i
 data/src/share/classes/sun/security/smartcardio/ChannelImpl.java.i
+data/make/tools/src/build/tools/dtdbuilder/README.txt.i
 data/src/share/classes/sun/security/util/AuthResources_fr.java.i
 data/make/tools/CharsetMapping/MacCyrillic.map.i
 data/src/windows/lib/flavormap.properties.i
@@ -4915,13 +4891,13 @@ data/src/share/classes/sun/io/ByteToCharMacSymbol.java.i
 data/src/solaris/doc/sun/man/man1/wsimport.1.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java.i
 data/src/windows/classes/sun/java2d/d3d/D3DBufImgOps.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java.i
 data/test/com/sun/jdi/redefineMethod/RedefineSetUp.sh.i
 data/src/share/classes/sun/tools/tree/ThrowStatement.java.i
-data/src/share/classes/javax/net/ssl/SSLException.java.i
+data/src/solaris/doc/sun/man/man1/ja/native2ascii.1.i
 data/src/share/classes/java/util/Date.java.i
 data/src/share/classes/com/sun/script/util/BindingsImpl.java.i
 data/make/com/sun/org/apache/Makefile.i
-data/test/java/net/Socket/RST.java.i
 data/src/linux/doc/man/jstack.1.i
 data/src/share/back/EventRequestImpl.c.i
 data/src/share/classes/com/sun/tools/jdi/ShortValueImpl.java.i
@@ -4929,7 +4905,6 @@ data/test/sun/management/windows/revokeall.exe.i
 data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java.i
 data/src/share/classes/javax/management/RuntimeMBeanException.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java.i
-data/test/com/sun/jdi/connect/spi/GeneratedConnectors.java.i
 data/src/share/classes/java/net/StandardProtocolFamily.java.i
 data/src/share/classes/java/io/WriteAbortedException.java.i
 data/src/share/native/sun/java2d/loops/UshortIndexed.c.i
@@ -4940,12 +4915,14 @@ data/src/share/classes/javax/crypto/CipherSpi.java.i
 data/test/java/beans/XMLEncoder/javax_swing_BoxLayout.java.i
 data/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java.i
 data/test/java/beans/XMLEncoder/java_awt_geom_AffineTransform.java.i
+data/test/java/net/Socket/asyncClose/BrokenPipe.java.i
 data/make/sun/jkernel/Makefile.i
 data/src/share/classes/java/util/zip/Deflater.java.i
 data/src/share/classes/sun/io/ByteToCharCp950.java.i
-data/src/share/classes/sun/jvmstat/monitor/VmIdentifier.java.i
-data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_2.java.i
-data/test/java/util/ResourceBundle/Test4318520RB_en.properties.i
+data/src/share/classes/javax/swing/InputMap.java.i
+data/src/share/classes/com/sun/jndi/dns/DnsClient.java.i
+data/src/share/classes/sun/net/dns/ResolverConfiguration.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariInputMethodDescriptor.java.i
 data/make/tools/swing-beans/beaninfo/images/JPasswordFieldColor32.gif.i
 data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubRequestHandler.java.i
 data/make/mksample/webservices/Makefile.i
@@ -4953,11 +4930,12 @@ data/src/share/classes/sun/dyn/util/BytecodeSignature.java.i
 data/src/windows/native/sun/java2d/opengl/WGLSurfaceData.h.i
 data/src/share/classes/javax/swing/text/html/package.html.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c.i
-data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java.i
+data/src/share/native/java/util/zip/zlib-1.1.3/ChangeLog.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/PrincipalImpl.java.i
 data/src/share/classes/javax/management/relation/RoleInfoNotFoundException.java.i
 data/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/Result.java.i
+data/src/share/classes/sun/misc/resources/Messages_zh_CN.java.i
+data/src/share/classes/sun/management/MemoryPoolImpl.java.i
 data/src/share/back/FrameID.h.i
 data/test/java/lang/Runtime/exec/ExecEmptyString.java.i
 data/test/java/beans/XMLDecoder/spec/TestBoolean.java.i
@@ -4965,13 +4943,14 @@ data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMStructure.java.i
 data/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java.i
 data/src/share/classes/javax/management/remote/rmi/package.html.i
 data/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java.i
-data/test/sun/net/www/http/HttpClient/ProxyFromCache.java.i
+data/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java.i
 data/test/sun/tools/jhat/jmap.bin.d
-data/src/share/native/sun/java2d/opengl/OGLMaskBlit.c.i
 data/test/java/net/URLConnection/GetResponseCode.java.i
+data/src/share/classes/sun/java2d/pipe/hw/BufferedContextProvider.java.i
 data/src/share/classes/java/beans/Customizer.java.i
 data/test/java/lang/ref/EnqueueNullRef.java.i
 data/src/solaris/native/sun/awt/awt_xembed.h.i
+data/src/share/classes/javax/swing/text/html/ListView.java.i
 data/src/share/classes/java/rmi/activation/ActivationInstantiator.java.i
 data/src/share/classes/javax/naming/LimitExceededException.java.i
 data/test/java/security/cert/CertPathValidator/OCSP/AIACheck.java.i
@@ -4984,27 +4963,26 @@ data/src/share/native/sun/awt/medialib/mlib_image_types.h.i
 data/src/share/classes/sun/java2d/StateTrackable.java.i
 data/src/share/classes/javax/swing/text/html/IsindexView.java.i
 data/test/java/beans/PropertyEditor/TestIntegerClassJava.java.i
-data/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll.i
+data/make/tools/swing-beans/beaninfo/images/JFrameColor32.gif.i
 data/test/sun/misc/Encode/GetBytes.java.i
 data/src/share/classes/java/lang/invoke/SpreadGeneric.java.i
 data/src/share/classes/javax/management/relation/RelationException.java.i
-data/src/windows/native/sun/windows/awt_ole.h.i
+data/src/share/classes/sun/io/CharToByteCp437.java.i
 data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/FileMatch.java.i
-data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-config.jpg.i
-data/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.java.i
+data/src/solaris/classes/sun/java2d/xr/XIDGenerator.java.i
 data/src/share/classes/java/awt/dnd/DragSourceEvent.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java.i
-data/test/sun/nio/cs/OLD/DBCS_IBM_ASCII_Encoder.java.i
-data/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java.i
+data/test/java/util/concurrent/locks/Lock/FlakyMutex.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpEngineId.java.i
+data/test/java/lang/reflect/Proxy/Basic1.java.i
 data/src/share/classes/sun/net/httpserver/Event.java.i
 data/src/share/native/java/lang/fdlibm/src/s_lib_version.c.i
 data/src/share/classes/javax/swing/plaf/basic/BasicRootPaneUI.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/TMSchema.java.i
 data/src/solaris/native/java/io/FileDescriptor_md.c.i
 data/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java.i
-data/test/javax/management/ObjectName/ComparatorTest.java.i
 data/test/java/util/Collections/NCopies.java.i
-data/make/tools/CharsetMapping/IBM297.map.i
+data/src/share/classes/javax/imageio/ImageReadParam.java.i
 data/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java.i
 data/make/tools/sharing/classlist.linux.i
 data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/NullTest.java.i
@@ -5021,26 +4999,23 @@ data/test/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java.i
 data/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java.i
 data/test/java/io/OutputStreamWriter/TestWrite.java.i
 data/test/java/io/Serializable/NPEProvoker/NPEProvoker.java.i
-data/src/share/native/sun/font/layout/ContextualSubstSubtables.h.i
 data/test/java/io/Serializable/evolution/AddedExternField/WriteAddedField.java.i
 data/src/share/classes/sun/reflect/MethodAccessorImpl.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java.i
 data/src/share/classes/sun/misc/MessageUtils.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java.i
-data/src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiInputMethodDescriptor.java.i
+data/src/share/classes/sun/security/jgss/krb5/WrapToken.java.i
+data/src/share/classes/java/awt/peer/TextAreaPeer.java.i
 data/src/share/classes/sun/security/x509/PKIXExtensions.java.i
 data/test/java/net/URL/UppercaseScheme.java.i
 data/src/share/classes/javax/swing/text/rtf/charsets/NeXT.txt.i
 data/src/windows/native/java/net/DualStackPlainSocketImpl.c.i
 data/src/share/classes/javax/print/attribute/SupportedValuesAttribute.java.i
-data/test/java/nio/channels/FileChannel/MapAssertions.java.i
-data/src/windows/native/sun/nio/ch/SocketChannelImpl.c.i
 data/make/java/nio/Makefile.i
 data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/rmid.security.policy.i
 data/src/windows/native/sun/java2d/windows/dxCapabilities.h.i
 data/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java.i
 data/make/tools/swing-beans/beaninfo/images/JWindowColor32.gif.i
-data/test/java/lang/reflect/Method/InheritedMethods.java.i
 data/test/sun/java2d/OpenGL/DrawBufImgOp.java.i
 data/src/share/classes/java/awt/Paint.java.i
 data/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java.i
@@ -5051,28 +5026,29 @@ data/test/java/io/Reader/ReadParams.java.i
 data/src/share/classes/sun/awt/NativeLibLoader.java.i
 data/src/windows/native/java/io/canonicalize_md.c.i
 data/src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java.i
-data/src/share/classes/sun/tools/jconsole/VMInternalFrame.java.i
 data/src/share/classes/com/sun/nio/sctp/MessageInfo.java.i
 data/src/solaris/doc/sun/man/man1/ja/servertool.1.i
 data/src/share/classes/sun/tools/jconsole/SheetDialog.java.i
 data/src/share/classes/sun/security/ssl/JsseJce.java.i
 data/src/solaris/doc/sun/man/man1/jstatd.1.i
-data/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java.i
 data/src/share/classes/java/awt/doc-files/Choice-1.gif.i
 data/src/share/classes/sun/io/ByteToCharMS950.java.i
 data/src/share/classes/sun/java2d/loops/MaskBlit.java.i
 data/test/java/nio/channels/FileChannel/Release.java.i
 data/src/share/classes/javax/management/DescriptorFields.java.i
+data/src/share/classes/sun/util/locale/LocaleUtils.java.i
 data/src/share/classes/java/beans/beancontext/BeanContextContainerProxy.java.i
-data/src/share/classes/sun/text/normalizer/ReplaceableString.java.i
 data/src/share/demo/java2d/J2DBench/resources/textdata/arabic.ut8.txt.i
 data/src/share/native/sun/awt/medialib/mlib_SysMath.h.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java.i
 data/src/share/classes/javax/imageio/event/IIOReadProgressListener.java.i
+data/test/java/net/URLConnection/GetXmlContentType.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnspr4.so.i
 data/src/share/classes/sun/reflect/generics/factory/CoreReflectionFactory.java.i
 data/make/tools/CharsetMapping/IBM1149.c2b.i
 data/src/share/native/sun/awt/image/imageInitIDs.c.i
+data/src/share/classes/javax/print/attribute/standard/OrientationRequested.java.i
+data/src/share/classes/java/awt/event/ItemEvent.java.i
+data/test/java/nio/charset/Charset/EmptyCharsetName.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/AlternativeLongOptionSpec.java.i
 data/test/java/util/Collections/EmptySortedSet.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java.i
@@ -5080,10 +5056,10 @@ data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileStore.java.i
 data/make/tools/CharsetMapping/IBM874.map.i
 data/test/org/openjdk/jigsaw/ConfigurationBuilder.java.i
 data/src/share/native/com/sun/media/sound/DirectAudioDeviceProvider.c.i
-data/src/share/classes/sun/tools/jconsole/TimeComboBox.java.i
-data/test/java/util/Collections/AsLifoQueue.java.i
+data/src/share/native/sun/security/ec/ecl.c.i
 data/test/sun/java2d/pipe/RegionOps.java.i
-data/src/share/classes/sun/print/resources/orientRevLandscape.png.i
+data/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java.i
+data/src/share/classes/java/lang/IllegalStateException.java.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/SOSMarkerSegment.java.i
 data/src/share/classes/sun/io/CharToByteCp863.java.i
 data/make/sun/cmm/Makefile.i
@@ -5095,6 +5071,7 @@ data/test/sun/security/ec/pkcs12/sect193r1server-rsa1024ca.p12.i
 data/src/share/classes/javax/management/Attribute.java.i
 data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java.i
 data/test/sun/nio/cs/Test6392804.java.i
+data/src/share/classes/com/sun/jmx/namespace/serial/RoutingOnlyProcessor.java.i
 data/test/java/rmi/testlibrary/StreamPipe.java.i
 data/src/share/classes/javax/management/loading/DefaultLoaderRepository.java.i
 data/make/tools/src/build/tools/jdwpgen/AbstractSimpleTypeNode.java.i
@@ -5102,68 +5079,67 @@ data/src/share/classes/java/awt/GridBagConstraints.java.i
 data/test/javax/crypto/Cipher/InOutBuffers.java.i
 data/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear_f.h.i
 data/make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java.i
-data/test/java/lang/String/Split.java.i
+data/src/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java.i
 data/src/share/sample/jmx/jmx-scandir/docfiles/remote-connection-failed.jpg.i
 data/src/share/classes/java/security/Signature.java.i
 data/src/share/classes/sun/text/resources/FormatData_sv.java.i
 data/make/modules/Makefile.i
-data/src/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java.i
+data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java.i
 data/test/javax/swing/JComboBox/6607130/bug6607130.java.i
 data/src/share/classes/com/sun/jdi/Bootstrap.java.i
-data/src/share/classes/java/rmi/server/RMIClientSocketFactory.java.i
+data/src/share/classes/sun/rmi/transport/WeakRef.java.i
 data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Hello.java.i
+data/test/javax/management/mxbean/JMXServiceURLTest.java.i
 data/make/tools/dir_diff/Makefile.i
+data/src/share/native/sun/font/layout/KernTable.h.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java.i
 data/src/share/classes/com/sun/pept/ept/ContactInfoList.java.i
 data/src/share/classes/java/util/AbstractQueue.java.i
 data/test/java/io/Serializable/readObjectNoData/Read.java.i
-data/test/java/util/ResourceBundle/Bug4083270Test.properties.i
-data/make/mkdemo/jvmti/versionCheck/Makefile.i
+data/src/share/classes/sun/io/CharToByteMacRomania.java.i
+data/src/share/classes/javax/print/attribute/standard/PrintQuality.java.i
 data/src/share/classes/sun/nio/fs/MimeType.java.i
 data/src/share/classes/sun/net/www/http/KeepAliveStream.java.i
-data/test/sun/security/krb5/auto/ok-as-delegate-xrealm.sh.i
 data/src/share/classes/javax/swing/text/html/EditableView.java.i
-data/src/share/classes/javax/swing/plaf/ComponentInputMapUIResource.java.i
+data/src/share/classes/javax/management/DescriptorAccess.java.i
+data/src/share/classes/java/sql/SQLTransactionRollbackException.java.i
 data/src/share/classes/sun/launcher/LauncherHelper.java.i
 data/test/java/lang/instrument/StressGetObjectSizeApp.java.i
 data/src/share/classes/javax/swing/text/GlyphView.java.i
 data/test/java/beans/PropertyChangeSupport/1.6.0.ser.i
 data/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java.i
 data/src/share/classes/java/util/package.html.i
-data/test/sun/net/TelnetTest.java.i
 data/src/share/classes/sun/jkernel/BundleCheck.java.i
 data/src/share/native/sun/awt/image/cvutils/img_alpha.h.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain5.txt.i
-data/test/java/text/Format/MessageFormat/Bug7003643.java.i
-data/src/share/classes/java/util/prefs/NodeChangeListener.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapURL.java.i
+data/src/share/classes/com/sun/media/sound/ModelOscillator.java.i
+data/src/share/classes/javax/swing/JCheckBoxMenuItem.java.i
+data/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java.i
 data/src/share/classes/com/sun/servicetag/Registry.java.i
 data/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.spi.TransportService.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusiveWithComments.java.i
-data/src/share/classes/com/sun/jmx/namespace/NamespaceInterceptor.java.i
-data/src/share/classes/sun/tools/jstat/ExpressionResolver.java.i
+data/src/solaris/classes/sun/awt/X11/XFontPeer.java.i
+data/src/share/classes/javax/swing/Painter.java.i
 data/src/share/classes/javax/swing/plaf/ViewportUI.java.i
 data/test/com/sun/jndi/dns/CheckAccess.java.i
 data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java.i
+data/src/share/classes/javax/imageio/stream/ImageOutputStream.java.i
 data/src/share/classes/java/security/PrivilegedAction.java.i
 data/src/share/classes/sun/nio/fs/NativeBuffers.java.i
 data/src/windows/native/sun/jkernel/graphics/warningmasthead.bmp.i
 data/src/share/classes/com/sun/nio/sctp/package-info.java.i
-data/src/share/classes/java/awt/BufferCapabilities.java.i
-data/test/org/openjdk/jigsaw/repocat.sh.i
+data/test/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.html.i
 data/make/sun/jawt/make.depend.i
 data/test/java/util/ResourceBundle/Control/XmlRB.xml.i
 data/src/share/classes/sun/management/snmp/util/MibLogger.java.i
-data/src/share/classes/com/sun/tools/jdi/BooleanValueImpl.java.i
 data/test/java/nio/channels/Selector/Alias.java.i
-data/src/share/classes/javax/swing/event/RowSorterListener.java.i
-data/src/share/classes/sun/audio/AudioStream.java.i
-data/test/com/oracle/net/Sanity.java.i
+data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_EBCDIC_Decoder.java.i
 data/test/java/awt/Focus/AutoRequestFocusTest/TestHelper.java.i
 data/src/share/classes/sun/misc/JavaLangAccess.java.i
-data/src/solaris/classes/sun/awt/X11/security-icon-bw48.png.i
+data/make/javax/security/Makefile.i
 data/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java.i
 data/make/mkdemo/jfc/TableExample/Makefile.i
+data/src/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java.i
 data/test/com/sun/jdi/JdbReadTwiceTest.sh.i
 data/src/share/native/java/lang/StrictMath.c.i
 data/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c.i
@@ -5183,15 +5159,16 @@ data/src/share/classes/javax/xml/crypto/XMLStructure.java.i
 data/test/sun/security/tools/policytool/i18n.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java.i
 data/src/solaris/hpi/export/path_md.h.i
-data/src/share/demo/nbproject/jfc/Metalworks/nbproject/jdk.xml.i
+data/src/share/classes/org/openjdk/jigsaw/package-info.java.i
 data/src/share/classes/javax/print/attribute/standard/JobPrioritySupported.java.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties.i
 data/src/share/classes/java/lang/Number.java.i
 data/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.h.i
+data/src/share/classes/sun/text/resources/FormatData_th_TH.java.i
 data/test/javax/print/applet/AppletPrintLookup.html.i
 data/src/share/classes/com/sun/jmx/event/EventClientFactory.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java.i
-data/test/java/util/Locale/data/deflocale.sol10.i
+data/src/share/classes/sun/security/provider/certpath/ConstraintsChecker.java.i
 data/src/share/classes/java/util/EventListenerProxy.java.i
 data/src/share/classes/sun/rmi/rmic/newrmic/Generator.java.i
 data/test/sun/rmi/log/ReliableLog/Recovery.java.i
@@ -5216,67 +5193,62 @@ data/test/sun/nio/cs/SurrogateTestEUCTW.plane5.surrogates.i
 data/src/share/classes/sun/security/jgss/krb5/MessageToken_v2.java.i
 data/test/javax/swing/JColorChooser/Test4234761.java.i
 data/make/java/util/Makefile.i
-data/test/java/lang/instrument/IsModifiableClassAgent.java.i
+data/make/sun/security/pkcs11/mapfile-vers.i
 data/src/windows/resource/java.manifest.i
 data/src/share/classes/sun/text/resources/FormatData_sr.java.i
-data/test/javax/sound/midi/Sequencer/SequencerImplicitSynthOpen.java.i
+data/src/share/classes/sun/rmi/log/LogOutputStream.java.i
+data/src/share/classes/javax/swing/border/StrokeBorder.java.i
 data/src/share/classes/java/security/InvalidParameterException.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBufferPrologue.java.i
 data/src/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java.i
-data/src/windows/classes/sun/java2d/ScreenUpdateManager.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/Environment.java.i
 data/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionContextImpl/Timeout.java.i
+data/src/share/classes/sun/io/ByteToCharCp949C.java.i
 data/test/java/beans/PropertyEditor/TestIntegerClassValue.java.i
 data/test/tools/launcher/UglyPrintVersion.java.i
 data/test/java/lang/System/finalization/FinThreads.java.i
 data/test/java/util/ResourceBundle/Bug4165815Test.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java.i
-data/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ko.properties.i
 data/src/share/classes/sun/net/www/protocol/jar/JarURLConnection.java.i
-data/src/share/classes/sun/text/resources/FormatData_ar_IQ.java.i
+data/src/share/classes/java/nio/channels/MulticastChannel.java.i
 data/src/share/classes/com/sun/jmx/remote/internal/ProxyInputStream.java.i
-data/test/java/beans/PropertyEditor/TestShortTypeValue.java.i
 data/test/java/lang/RuntimePermission/ExitVM.java.i
 data/src/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java.i
-data/test/java/nio/channels/AsynchronousSocketChannel/Basic.java.i
-data/test/javax/print/PrintSE/PrintSE.sh.i
-data/src/share/classes/sun/io/ByteToCharEUC2.java.i
+data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/jdk.xml.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java.i
 data/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java.i
 data/src/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java.i
+data/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter.i
+data/src/share/classes/com/sun/jndi/rmi/registry/RegistryContextFactory.java.i
 data/src/share/classes/sun/dyn/MemberName.java.i
-data/test/java/io/Serializable/duplicateSerialFields/Setup.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.so.i
 data/src/share/native/java/lang/fdlibm/src/w_asin.c.i
-data/make/sun/tracing/dtrace/mapfile-vers.i
-data/src/share/classes/sun/awt/image/ShortInterleavedRaster.java.i
-data/src/share/classes/javax/management/MBeanFeatureInfo.java.i
+data/src/share/classes/com/sun/tools/jdi/LongValueImpl.java.i
+data/src/share/classes/sun/text/resources/CollationData_sk.java.i
 data/test/javax/management/descriptor/EqualsHashCodeTest.java.i
-data/make/sun/rmi/rmi/Makefile.i
+data/src/share/classes/com/sun/rowset/internal/XmlResolver.java.i
 data/test/java/io/Serializable/illegalHandle/tooHighHandle.ser.i
 data/test/java/nio/channels/DatagramChannel/Connect.java.i
 data/src/share/demo/jfc/Metalworks/MetalworksHelp.java.i
-data/src/share/classes/com/sun/crypto/provider/DESKey.java.i
+data/src/share/classes/sun/io/ByteToCharCp1149.java.i
 data/test/java/security/cert/CertificateFactory/slowstream.sh.i
 data/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java.i
 data/src/share/classes/sun/nio/cs/ext/MacIceland.java.i
 data/test/sun/net/www/protocol/http/6550798/TestCache.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM869.java.i
 data/src/solaris/doc/sun/man/man1/ja/policytool.1.i
 data/src/share/classes/java/awt/image/renderable/ParameterBlock.java.i
-data/test/javax/crypto/spec/DESKeySpec/CheckParity.java.i
 data/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java.i
 data/test/sun/security/mscapi/SignUsingSHA2withRSA.java.i
-data/src/windows/classes/sun/awt/windows/awtLocalization_ko.properties.i
+data/test/java/lang/ref/ReferenceEnqueue.java.i
+data/src/share/classes/sun/nio/cs/ext/JISAutoDetect.java.i
 data/src/share/classes/sun/net/www/content/image/x_xbitmap.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_es_AR.properties.i
-data/test/javax/script/Test4.js.i
 data/src/share/classes/sun/text/resources/FormatData_sr_RS.java.i
 data/test/java/beans/VetoableChangeSupport/Test4425885.java.i
+data/src/share/classes/sun/tracing/dtrace/DTraceProbe.java.i
 data/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java.i
 data/src/share/classes/sun/tools/jar/ModuleInfo.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpSecurityException.java.i
 data/src/share/classes/sun/awt/Graphics2Delegate.java.i
 data/make/tools/src/build/tools/generatenimbus/UIDefault.java.i
 data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/project.xml.i
@@ -5290,11 +5262,10 @@ data/test/java/beans/XMLEncoder/4741757/TestSecurityManager.java.i
 data/test/java/net/URLClassLoader/closetest/test1/com/foo/Resource2.i
 data/src/share/native/sun/font/layout/LookupTables.cpp.i
 data/test/java/lang/invoke/InvokeGenericTest.java.i
-data/src/share/classes/sun/net/NetProperties.java.i
+data/make/sun/rmi/oldtools/FILES_java.gmk.i
 data/src/share/classes/sun/nio/cs/ext/IBM970.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/DigesterOutputStream.java.i
 data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS932_Decoder.java.i
-data/src/share/classes/javax/management/ImmutableDescriptor.java.i
 data/src/share/classes/java/util/spi/package.html.i
 data/test/javax/swing/border/Test4247606.java.i
 data/make/java/npt/mapfile-vers.i
@@ -5302,18 +5273,18 @@ data/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleBuilder.java.i
 data/src/share/classes/java/nio/charset/UnmappableCharacterException.java.i
 data/src/share/classes/com/sun/media/sound/SF2Sample.java.i
 data/src/windows/classes/sun/security/mscapi/KeyStore.java.i
-data/src/share/native/java/lang/fdlibm/src/e_asin.c.i
-data/src/share/classes/javax/accessibility/AccessibleContext.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java.i
 data/src/share/classes/com/sun/jmx/namespace/ObjectNameRouter.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java.i
 data/test/org/openjdk/jigsaw/_RemoteRepositoryList.java.i
-data/test/sun/security/provider/certpath/speech2speech.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java.i
 data/src/share/classes/com/sun/media/sound/AuFileReader.java.i
 data/test/sun/net/www/protocol/jar/B4957695.java.i
 data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOff.java.i
 data/src/share/native/sun/font/layout/DeviceTables.cpp.i
 data/src/share/classes/sun/dyn/anon/InvalidConstantPoolFormatException.java.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/PlatformModuleBuilder.java.i
+data/src/share/classes/java/util/StringTokenizer.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM297.java.i
 data/test/java/rmi/activation/Activatable/restartLatecomer/group.security.policy.i
 data/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java.i
@@ -5322,37 +5293,40 @@ data/src/share/classes/sun/nio/cs/ext/IBM1124.java.i
 data/src/share/classes/sun/io/ByteToCharCp1006.java.i
 data/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template.i
 data/src/share/classes/sun/jvmstat/monitor/ByteArrayMonitor.java.i
+data/test/javax/naming/ldap/LdapName/LdapParserTests.java.i
 data/src/share/lib/images/cursors/motif_LinkNoDrop32x32.gif.i
 data/make/com/sun/net/ssl/Makefile.i
 data/test/sun/net/www/protocol/http/UserAuth.java.i
-data/test/javax/security/auth/Subject/Synch.java.i
-data/src/share/classes/javax/swing/border/LineBorder.java.i
+data/make/tools/GenerateCharacter/Makefile.i
+data/src/share/classes/sun/nio/cs/ext/MSISO2022JP.java.i
 data/src/share/classes/java/util/IllegalFormatFlagsException.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIStyle.java.i
+data/src/share/native/sun/font/layout/LigatureSubstitution.h.i
 data/src/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java.i
 data/src/solaris/classes/sun/awt/motif/MToolkitThreadBlockedHandler.java.i
 data/src/share/classes/sun/tools/asm/ClassConstantData.java.i
 data/src/windows/lib/plugin.properties.i
-data/src/share/classes/sun/reflect/misc/ReflectUtil.java.i
+data/src/share/sample/nio/server/Content.java.i
 data/src/share/classes/java/io/IOError.java.i
 data/src/share/classes/javax/security/sasl/RealmCallback.java.i
 data/src/share/native/sun/awt/image/BufImgSurfaceData.c.i
 data/src/share/classes/javax/swing/JApplet.java.i
 data/src/share/classes/javax/swing/text/html/CommentView.java.i
 data/src/solaris/classes/sun/awt/motif/X11Clipboard.java.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java.i
 data/src/share/classes/javax/net/ssl/HandshakeCompletedListener.java.i
 data/src/share/classes/sun/reflect/generics/repository/ClassRepository.java.i
 data/test/java/net/Socket/ProxyCons.java.i
 data/src/share/demo/jvmti/hprof/hprof_tracker.c.i
 data/test/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java.i
-data/src/share/back/classTrack.c.i
+data/src/share/classes/javax/naming/ldap/Rdn.java.i
 data/make/tools/UnicodeData/Scripts.txt.i
 data/src/solaris/native/sun/font/X11FontScaler.h.i
-data/test/java/util/jar/JarFile/SorryClosed.java.i
+data/src/share/classes/javax/sound/sampled/UnsupportedAudioFileException.java.i
 data/test/java/lang/Math/Log1pTests.java.i
 data/src/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java.i
 data/src/share/native/sun/awt/libpng/pngwutil.c.i
-data/src/share/classes/org/ietf/jgss/GSSCredential.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathTableMetaImpl.java.i
 data/test/java/rmi/activation/Activatable/extLoadedImpl/group.security.policy.i
 data/src/share/classes/sun/reflect/generics/tree/ByteSignature.java.i
 data/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java.i
@@ -5362,11 +5336,12 @@ data/test/javax/management/remote/mandatory/subjectDelegation/policy13.i
 data/src/share/classes/java/rmi/StubNotFoundException.java.i
 data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java.i
 data/src/share/classes/java/security/AccessControlContext.java.i
-data/src/share/classes/sun/java2d/loops/GeneralRenderer.java.i
-data/src/share/classes/sun/tools/java/Scanner.java.i
-data/src/share/classes/java/awt/image/BufferedImageOp.java.i
+data/make/modules/tools/src/com/sun/classanalyzer/AnnotationParser.java.i
+data/src/share/classes/javax/swing/text/Document.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XTextField.java.i
 data/src/share/classes/java/beans/beancontext/BeanContextServicesSupport.java.i
-data/test/java/math/BigInteger/CompareToTests.java.i
+data/src/share/classes/sun/tools/util/ModifierFilter.java.i
+data/src/share/classes/sun/nio/cs/ISO_8859_2.java.i
 data/test/java/rmi/server/RMIClassLoader/spi/java.rmi.server.RMIClassLoaderSpi.i
 data/src/share/classes/com/sun/script/javascript/ExternalScriptable.java.i
 data/src/share/classes/sun/security/ssl/CipherSuiteList.java.i
@@ -5375,12 +5350,12 @@ data/src/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java.i
 data/test/java/lang/reflect/Generics/getAnnotationTest.java.i
 data/src/share/classes/sun/tools/jar/resources/jar_sv.properties.i
 data/test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh.i
-data/src/share/classes/sun/security/provider/VerificationProvider.java.i
-data/make/java/zip/mapfile-vers.i
+data/make/tools/CharsetMapping/GBK.map.i
+data/src/share/classes/javax/swing/plaf/nimbus/ImageCache.java.i
 data/src/share/classes/java/awt/image/ShortLookupTable.java.i
 data/src/windows/native/java/net/InetAddressImplFactory.c.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1.h.i
-data/src/share/classes/javax/security/auth/login/LoginException.java.i
+data/src/share/classes/java/io/Bits.java.i
 data/test/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.java.i
 data/test/sun/security/mscapi/access.policy.i
 data/test/java/nio/charset/coders/BashStreams.java.i
@@ -5397,18 +5372,16 @@ data/src/share/classes/javax/crypto/CryptoPolicyParser.java.i
 data/src/share/classes/javax/swing/plaf/nimbus/State.java.i
 data/make/jpda/bdi/Makefile.i
 data/test/java/util/AbstractMap/ToString.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java.i
+data/src/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMBean.java.i
-data/test/sun/security/pkcs11/KeyStore/ClientAuthData/server.keystore.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmThreadingMeta.java.i
-data/test/java/math/BigDecimal/ZeroScalingTests.java.i
+data/test/java/util/AbstractSequentialList/AddAll.java.i
 data/src/share/classes/com/sun/tools/jdi/ThreadListener.java.i
+data/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java.i
 data/src/share/classes/com/sun/crypto/provider/CipherCore.java.i
-data/src/share/classes/javax/crypto/spec/DHPrivateKeySpec.java.i
-data/test/java/util/logging/LoggingDeadlock2.java.i
-data/test/java/beans/XMLEncoder/java_awt_Point.java.i
+data/src/share/classes/com/sun/media/sound/SF2LayerRegion.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_S32.c.i
+data/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c.i
 data/make/tools/swing-beans/beaninfo/images/JCheckBoxColor16.gif.i
-data/test/sun/net/www/http/HttpClient/IsKeepingAlive.java.i
 data/test/java/beans/PropertyEditor/TestColorClassJava.java.i
 data/src/solaris/back/exec_md.c.i
 data/test/javax/naming/ldap/LdapName/NameTests.java.i
@@ -5420,9 +5393,8 @@ data/src/share/classes/java/dyn/Invokers.java.i
 data/src/share/classes/sun/security/krb5/Asn1Exception.java.i
 data/src/share/classes/com/sun/crypto/provider/DESCipher.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java.i
-data/src/share/classes/sun/rmi/registry/RegistryImpl.java.i
 data/make/java/awt/Makefile.i
-data/make/tools/CharsetMapping/IBM1147.map.i
+data/src/share/classes/java/io/InputStream.java.i
 data/test/sun/security/pkcs11/Secmod/GetPrivateKey.java.i
 data/make/java/nio/mapfile-solaris.i
 data/test/sun/security/ec/p12passwords.txt.i
@@ -5431,33 +5403,33 @@ data/src/share/classes/sun/nio/cs/ext/EUC_CN.java.i
 data/src/windows/native/sun/windows/awt_Rectangle.cpp.i
 data/src/share/classes/sun/security/pkcs11/P11KeyStore.java.i
 data/test/com/sun/jdi/OnThrowTarget.java.i
-data/test/com/sun/tools/attach/PermissionTests.sh.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/ParseException.java.i
 data/src/share/classes/com/sun/jdi/DoubleValue.java.i
 data/src/share/classes/javax/swing/TablePrintable.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/package.html.i
 data/make/tools/CharsetMapping/IBM937.map.i
-data/test/java/io/Serializable/oldTests/AnnotateClass.java.i
-data/src/solaris/classes/sun/awt/X11/XToolkit.java.i
+data/src/share/demo/jvmti/hprof/hprof_io.c.i
+data/src/share/classes/java/security/AlgorithmConstraints.java.i
+data/src/share/classes/sun/tools/jstat/OptionFinder.java.i
 data/src/share/classes/javax/naming/ldap/StartTlsResponse.java.i
-data/src/share/classes/com/sun/security/auth/module/NTSystem.java.i
+data/test/sun/java2d/SunGraphics2D/DrawImageBilinear.java.i
 data/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.java.i
 data/src/solaris/native/sun/net/sdp/SdpSupport.c.i
 data/make/tools/CharsetMapping/IBM875.c2b.i
 data/src/share/classes/sun/nio/ch/Groupable.java.i
 data/test/javax/management/mxbean/StandardMBeanOverrideTest.java.i
+data/src/share/classes/java/net/CookiePolicy.java.i
 data/make/jpda/transport/shmem/mapfile-vers.i
 data/src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java.i
 data/test/java/security/cert/X509Certificate/emptySubjectCert.i
 data/make/sun/org/mozilla/javascript/Makefile.i
 data/src/windows/native/sun/nio/ch/Iocp.c.i
-data/src/share/classes/sun/security/krb5/Credentials.java.i
+data/src/share/classes/java/awt/dnd/DropTargetAdapter.java.i
 data/test/javax/script/Test1.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/icons/DesktopIcon.gif.i
-data/src/share/classes/sun/nio/ch/IOVecWrapper.java.i
-data/test/sun/security/ssl/sanity/pluggability/CheckSockFacExport2.java.i
-data/make/tools/swing-beans/beaninfo/images/JPanelColor16.gif.i
-data/src/solaris/doc/sun/man/man1/idlj.1.i
+data/src/share/classes/javax/swing/event/AncestorListener.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java.i
 data/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java.i
-data/src/share/classes/sun/nio/cs/ext/ISO2022_JP.java.i
 data/src/windows/hpi/include/monitor_md.h.i
 data/src/share/native/sun/security/jgss/wrapper/NativeUtil.h.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java.i
@@ -5467,9 +5439,11 @@ data/src/share/classes/javax/print/attribute/standard/MediaName.java.i
 data/test/com/sun/tools/attach/Shutdown.java.i
 data/src/share/classes/java/beans/IntrospectionException.java.i
 data/src/share/classes/sun/tools/tree/UnsignedShiftRightExpression.java.i
-data/src/share/classes/java/awt/image/RasterFormatException.java.i
+data/src/windows/native/sun/windows/awt_MMStub.h.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_de.properties.i
 data/test/javax/sound/midi/Gervill/SoftReceiver/Send_Controller.java.i
 data/src/share/classes/java/awt/image/BandedSampleModel.java.i
+data/test/sun/security/pkcs11/ec/pkcs12/secp256r1server-secp384r1ca.p12.i
 data/src/share/demo/scripting/jconsole-plugin/src/scripts/heapdump.js.i
 data/test/sun/net/www/http/KeepAliveStream/KeepAliveStreamClose.java.i
 data/src/share/classes/sun/security/ssl/EngineArgs.java.i
@@ -5477,19 +5451,19 @@ data/src/share/classes/sun/util/resources/TimeZoneNames_ja.java.i
 data/src/share/classes/sun/rmi/transport/ObjectTable.java.i
 data/make/tools/swing-beans/beaninfo/images/JAppletColor16.gif.i
 data/src/share/classes/sun/swing/plaf/synth/Paint9Painter.java.i
-data/src/share/classes/sun/java2d/pipe/OutlineTextRenderer.java.i
 data/src/share/classes/sun/util/resources/CalendarData_it.properties.i
 data/test/org/openjdk/jigsaw/TrivialWebServer.java.i
-data/test/java/security/cert/CertPathValidator/trustAnchor/ValidateNC.java.i
 data/src/share/classes/sun/text/resources/CollationData_el.java.i
-data/test/java/nio/file/Files/walkFileTree/MaxDepth.java.i
+data/test/java/security/UnresolvedPermission/AccessorMethods.signer1.i
 data/src/share/classes/java/lang/AutoCloseable.java.i
 data/test/java/nio/channels/Selector/WakeupEmpty.java.i
 data/src/share/native/sun/java2d/loops/LineUtils.h.i
 data/test/java/beans/XMLEncoder/java_lang_Character.java.i
-data/src/share/classes/sun/swing/SwingUtilities2.java.i
-data/src/share/classes/sun/util/resources/CalendarData_en_IE.properties.i
-data/test/javax/swing/JFileChooser/6520101/bug6520101.java.i
+data/src/share/classes/com/sun/jdi/ThreadGroupReference.java.i
+data/test/java/lang/management/MemoryMXBean/PendingAllGC.sh.i
+data/src/share/classes/java/awt/MenuItem.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S16Func.c.i
+data/src/share/classes/sun/tools/jstat/Arguments.java.i
 data/test/java/io/DataInputStream/ReadLinePushback.java.i
 data/src/share/classes/javax/swing/plaf/synth/Region.java.i
 data/src/share/classes/sun/misc/Unsafe.java.i
@@ -5497,9 +5471,8 @@ data/test/java/io/Serializable/nullArgExceptionOrder/Test.java.i
 data/test/java/awt/font/TextLayout/TextLayoutBounds.java.i
 data/src/share/classes/sun/net/ProgressListener.java.i
 data/src/share/classes/java/text/BreakIterator.java.i
-data/src/windows/native/sun/windows/awt_MenuBar.cpp.i
 data/src/share/classes/sun/nio/cs/ThreadLocalCoders.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java.i
+data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java.i
 data/src/share/classes/sun/management/ClassLoadingImpl.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/AsyncSSLSocketClose.java.i
 data/src/share/classes/sun/net/www/http/HttpCaptureOutputStream.java.i
@@ -5515,15 +5488,13 @@ data/src/share/classes/com/sun/jndi/url/ldaps/ldapsURLContextFactory.java.i
 data/src/share/classes/sun/launcher/LauncherHelp.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiToolBarUI.java.i
 data/src/share/demo/nbproject/management/JTop/build.properties.i
-data/test/java/beans/XMLEncoder/4741757/TestStackOverflow.java.i
-data/src/solaris/native/sun/awt/awt_DrawingSurface.h.i
-data/src/share/classes/sun/text/resources/FormatData_nl.java.i
+data/test/java/security/Policy/Dynamic/DynamicPolicy.java.i
 data/src/share/classes/java/util/zip/ZipCoder.java.i
 data/test/javax/script/Test5.js.i
 data/test/java/awt/Insets/CombinedTestApp1.java.i
 data/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes128CksumType.java.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so.i
 data/src/solaris/native/sun/security/smartcardio/pcsc_md.h.i
+data/src/share/classes/sun/swing/AccessibleMethod.java.i
 data/src/share/classes/javax/security/auth/kerberos/KeyImpl.java.i
 data/make/sun/jkernel/FILES_java.gmk.i
 data/src/share/classes/sun/dyn/FilterGeneric.java.i
@@ -5546,34 +5517,33 @@ data/src/share/classes/sun/management/RuntimeImpl.java.i
 data/test/java/lang/System/Versions.java.i
 data/src/share/classes/javax/xml/crypto/dsig/Transform.java.i
 data/test/java/awt/Robot/ManualInstructions/ManualInstructions.java.i
-data/src/share/native/sun/security/ec/ec.c.i
 data/src/share/classes/sun/io/CharToByteCp950.java.i
 data/make/tools/swing-beans/beaninfo/images/JLabelColor32.gif.i
 data/test/sun/security/pkcs11/nss/db/cert8.db.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/C14nHelper.java.i
+data/test/java/io/BufferedInputStream/SkipTest.java.i
 data/src/share/classes/sun/nio/cs/UTF_16LE_BOM.java.i
 data/src/share/classes/com/sun/servicetag/resources/javase_7_swordfish.properties.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureBaseRSA.java.i
 data/src/share/native/java/util/zip/zlib-1.1.3/compress.c.i
-data/test/com/sun/jdi/ConnectedVMs.java.i
 data/src/share/sample/nio/chatserver/ChatServer.java.i
-data/make/sun/nio/cs/Makefile.i
-data/test/java/util/Vector/IllegalConstructorArgs.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java.i
 data/make/sun/font/mapfile-vers.i
 data/src/share/classes/com/sun/jdi/ThreadReference.java.i
-data/src/share/classes/sun/security/x509/X500Name.java.i
 data/src/share/classes/sun/text/resources/CollationData_fi.java.i
+data/src/share/classes/sun/nio/ch/Invoker.java.i
 data/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp.i
 data/test/sun/net/www/protocol/http/Finalizer.java.i
 data/test/ProblemList.txt.i
-data/src/share/native/java/lang/fdlibm/src/s_rint.c.i
+data/test/javax/management/remote/mandatory/socketFactories/RMIClientFactory.java.i
+data/src/share/classes/java/awt/IllegalComponentStateException.java.i
 data/src/share/classes/java/net/Authenticator.java.i
 data/test/java/nio/file/Files/walkFileTree/TerminateWalk.java.i
-data/src/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java.i
-data/test/java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java.i
-data/test/java/util/Timer/KillThread.java.i
+data/test/java/lang/ClassLoader/deadlock/SupAlice.java.i
+data/src/share/sample/nio/server/ChannelIOSecure.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java.i
+data/test/java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java.i
 data/test/java/util/ResourceBundle/Test4314141B_fr_CH.properties.i
-data/src/share/demo/jvmti/hprof/hprof_tag.h.i
 data/src/share/classes/sun/text/resources/FormatData_vi_VN.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java.i
 data/src/linux/doc/man/keytool.1.i
@@ -5586,7 +5556,6 @@ data/test/java/rmi/reliability/benchmark/bench/rmi/ByteCalls.java.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelEntryImpl.java.i
 data/src/solaris/instrument/FileSystemSupport_md.h.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/NullCases.java.i
-data/src/share/sample/nio/multicast/MulticastAddress.java.i
 data/src/share/classes/javax/imageio/plugins/jpeg/JPEGQTable.java.i
 data/test/java/util/ResourceBundle/Bug6190861.java.i
 data/src/share/classes/sun/java2d/DestSurfaceProvider.java.i
@@ -5595,9 +5564,8 @@ data/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.j
 data/src/share/classes/java/net/doc-files/net-properties.html.i
 data/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java.i
 data/src/solaris/native/sun/java2d/loops/vis_UshortGray.c.i
-data/src/windows/native/sun/windows/awt_Scrollbar.cpp.i
-data/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java.i
-data/src/share/classes/sun/misc/FormattedFloatingDecimal.java.i
+data/test/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java.i
+data/src/windows/classes/sun/awt/windows/WDefaultFontCharset.java.i
 data/test/sun/security/pkcs11/KeyStore/ClientAuth.java.i
 data/src/solaris/native/java/io/RandomAccessFile_md.c.i
 data/src/share/classes/sun/nio/cs/ext/MacCyrillic.java.i
@@ -5619,18 +5587,14 @@ data/test/javax/management/openmbean/ConstraintTest.java.i
 data/src/windows/lib/content-types.properties.i
 data/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java.i
 data/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html.i
 data/src/share/classes/com/sun/jdi/request/ClassUnloadRequest.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathContainer.java.i
-data/src/share/classes/sun/text/CodePointIterator.java.i
 data/test/demo/jvmti/HeapUser.java.i
 data/make/common/shared/Sanity.gmk.i
-data/test/javax/print/StreamPrintingOrientation.java.i
 data/src/share/back/bag.h.i
 data/src/share/classes/sun/nio/ch/DirectBuffer.java.i
-data/test/java/beans/Introspector/Test5102804.java.i
-data/test/javax/management/ImplementationVersion/ImplVersionCommand.java.i
-data/test/java/beans/Introspector/Test4498236.java.i
+data/src/share/classes/javax/management/namespace/VirtualEventManager.java.i
+data/src/share/classes/java/rmi/UnknownHostException.java.i
 data/src/share/classes/javax/naming/spi/InitialContextFactoryBuilder.java.i
 data/src/share/classes/sun/misc/VMSupport.java.i
 data/src/windows/classes/sun/awt/Win32GraphicsConfig.java.i
@@ -5639,28 +5603,29 @@ data/make/tools/CharsetMapping/EUC_KR.map.i
 data/src/share/classes/sun/jkernel/ByteArrayToFromHexDigits.java.i
 data/src/solaris/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java.i
 data/src/share/classes/sun/management/counter/Variability.java.i
-data/src/share/back/standardHandlers.h.i
+data/src/share/classes/java/lang/module/package-info.java.i
 data/src/linux/doc/man/javaws.1.i
 data/src/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java.i
 data/src/share/native/java/util/zip/ZipFile.c.i
+data/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties.i
 data/src/share/classes/javax/swing/undo/StateEditable.java.i
 data/test/sun/net/www/protocol/jar/bar.jar.i
-data/make/tools/CharsetMapping/IBM420.c2b.i
-data/src/share/classes/javax/management/remote/rmi/RMIServerImpl.java.i
+data/make/sun/jar/Makefile.i
+data/src/solaris/bin/arm/jvm.cfg.i
 data/test/com/sun/jdi/MethodCallsReflection.java.i
 data/src/share/native/sun/font/layout/IndicRearrangement.h.i
 data/src/share/classes/java/nio/channels/ServerSocketChannel.java.i
 data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl_Stub.java.i
-data/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java.i
 data/test/com/sun/jdi/VarargsTest.java.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassPath.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java.i
 data/test/javax/crypto/Cipher/GetMaxAllowed.java.i
+data/src/share/classes/java/util/jar/Manifest.java.i
 data/src/share/classes/sun/io/CharToByteCp935.java.i
 data/test/sun/security/pkcs11/Provider/Login.policy.i
 data/src/share/classes/sun/management/snmp/jvminstr/NotificationTarget.java.i
 data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_sv.properties.i
-data/src/share/demo/nio/zipfs/Demo.java.i
+data/make/tools/CharsetMapping/MS1254.map.i
 data/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup_Stub.java.i
 data/test/java/lang/Math/RoundTests.java.i
 data/src/share/instrument/JPLISAssert.c.i
@@ -5683,8 +5648,7 @@ data/test/com/sun/jdi/RedefineTTYLineNumber.sh.i
 data/src/share/classes/javax/naming/ldap/Control.java.i
 data/src/share/classes/javax/sound/midi/ShortMessage.java.i
 data/src/share/classes/sun/tools/jconsole/resources/disconnected24.png.i
-data/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java.i
-data/test/javax/print/applet/applet2/Applet2.java.i
+data/src/share/native/sun/java2d/loops/ByteIndexed.c.i
 data/src/share/classes/sun/java2d/loops/FontInfo.java.i
 data/test/java/beans/XMLEncoder/6777487/TestBox.java.i
 data/src/share/classes/sun/misc/RegexpPool.java.i
@@ -5701,40 +5665,42 @@ data/src/share/demo/applets/MoleculeViewer/models/buckminsterfullerine.xyz.i
 data/src/share/classes/javax/swing/undo/CannotUndoException.java.i
 data/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/PerInterface.java.i
+data/src/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper.java.i
 data/src/share/classes/java/dyn/MethodTypeForm.java.i
 data/src/share/classes/javax/naming/ldap/SortKey.java.i
-data/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownMsgProcModelException.java.i
 data/make/tools/swing-beans/beaninfo/images/JEditorPaneColor32.gif.i
 data/src/share/classes/sun/security/x509/AccessDescription.java.i
+data/src/share/native/sun/awt/libpng/pngdebug.h.i
 data/src/share/classes/com/sun/jdi/connect/AttachingConnector.java.i
 data/src/share/classes/java/security/DigestInputStream.java.i
 data/src/share/classes/java/net/MalformedURLException.java.i
 data/src/share/classes/com/sun/jndi/ldap/SearchResultWithControls.java.i
-data/test/com/sun/management/OperatingSystemMXBean/GetTotalSwapSpaceSize.java.i
+data/src/solaris/classes/sun/nio/fs/UnixException.java.i
 data/src/windows/classes/sun/security/mscapi/SunMSCAPI.java.i
-data/make/common/Program.gmk.i
 data/test/java/util/PluggableLocale/providersrc/Utils.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java.i
 data/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java.i
 data/src/share/classes/java/lang/invoke/ToGeneric.java.i
-data/test/sun/security/ssl/sanity/interop/JSSEServer.java.i
 data/src/share/classes/java/security/cert/LDAPCertStoreParameters.java.i
 data/src/share/classes/javax/print/event/PrintJobListener.java.i
-data/test/javax/print/attribute/SidesPageRangesTest.java.i
+data/make/tools/UnicodeData/PropList.txt.i
 data/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak_Stub.java.i
 data/test/sun/pisces/StrokeShapeTest.java.i
-data/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java.i
+data/make/sun/font/reorder-sparcv9.i
 data/src/share/classes/java/lang/module/ModuleId.java.i
+data/src/share/classes/sun/nio/cs/ext/ISO_8859_3.java.i
 data/test/java/lang/Class/forName/classes/hyphen.class.i
-data/src/share/classes/java/text/RuleBasedBreakIterator.java.i
+data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties.i
 data/test/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java.i
+data/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java.i
 data/src/share/classes/com/sun/jmx/snmp/daemon/package.html.i
 data/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.c.i
 data/make/tools/swing-beans/GenSwingBeanInfo.java.i
 data/test/java/beans/VetoableChangeSupport/Test6630275.java.i
 data/test/javax/management/namespace/LeadingSeparatorsTest.java.i
-data/src/share/native/sun/security/ec/impl/secoidt.h.i
-data/src/share/classes/javax/naming/directory/BasicAttribute.java.i
+data/src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java.i
+data/test/org/openjdk/jigsaw/cli/tsa-prikey.pem.i
 data/src/solaris/classes/sun/awt/X11/XEventDispatcher.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ar_IQ.properties.i
 data/src/share/classes/sun/awt/SubRegionShowable.java.i
@@ -5743,21 +5709,19 @@ data/test/com/sun/security/sasl/gsskerb/ConfSecurityLayer.java.i
 data/test/com/sun/jdi/BacktraceFieldTest.java.i
 data/test/javax/swing/JPopupMenu/6694823/bug6694823.java.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/report/XMLHTMLReporter.java.i
-data/test/org/openjdk/jigsaw/remrepo.sh.i
 data/src/share/classes/java/lang/UnsupportedClassVersionError.java.i
 data/src/linux/doc/man/native2ascii.1.i
 data/src/windows/classes/sun/nio/fs/WindowsFileStore.java.i
 data/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java.i
-data/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c.i
 data/src/share/classes/sun/reflect/generics/tree/CharSignature.java.i
 data/src/share/classes/com/sun/jndi/dns/DnsName.java.i
 data/make/common/shared/Sanity-Settings.gmk.i
+data/src/share/classes/java/lang/ArrayStoreException.java.i
 data/test/java/rmi/server/useCustomRef/security.policy.i
 data/src/share/classes/com/sun/java/browser/net/ProxyService.java.i
 data/src/share/classes/sun/tools/jconsole/inspector/XOperations.java.i
-data/src/share/classes/sun/tools/jconsole/Version.java.template.i
 data/src/share/classes/java/nio/file/attribute/DosFileAttributes.java.i
-data/make/sun/headless/reorder-i586.i
+data/src/share/classes/java/sql/DatabaseMetaData.java.i
 data/src/share/classes/java/security/cert/CertificateExpiredException.java.i
 data/src/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java.i
 data/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java.i
@@ -5765,36 +5729,34 @@ data/test/java/io/BufferedReader/BigMark.java.i
 data/test/java/beans/PropertyEditor/TestBooleanTypeValue.java.i
 data/test/java/lang/Enum/ValueOf.java.i
 data/src/share/classes/sun/misc/resources/Messages_es.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/Load7.java.i
-data/src/share/native/sun/java2d/loops/ByteIndexed.h.i
+data/test/sun/net/www/protocol/jar/B5105410.sh.i
 data/src/share/classes/java/dyn/DirectMethodHandle.java.i
 data/src/windows/native/sun/security/smartcardio/pcsc_md.c.i
 data/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java.i
+data/test/java/util/TreeMap/NullPermissiveComparator.java.i
+data/test/java/io/Serializable/unnamedPackageSwitch/A.java.i
 data/src/share/demo/nbproject/jfc/Font2DTest/build.xml.i
 data/test/java/net/URLConnection/UnknownContentType.java.i
 data/test/sun/security/tools/keytool/autotest.sh.i
 data/src/share/classes/sun/nio/cs/IBM850.java.i
 data/src/solaris/native/sun/nio/fs/genSolarisConstants.c.i
-data/test/java/util/EnumMap/EnumMapBash.java.i
-data/test/javax/management/remote/mandatory/connection/AddressableTest.java.i
-data/src/solaris/classes/sun/awt/motif/MScrollPanePeer.java.i
-data/src/windows/classes/sun/awt/windows/WFontMetrics.java.i
+data/src/share/classes/sun/awt/ModalityListener.java.i
+data/test/java/io/Serializable/defaultDataEnd/DefaultDataEnd.java.i
 data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java.i
 data/src/share/classes/java/awt/image/Kernel.java.i
 data/src/windows/native/java/lang/ProcessEnvironment_md.c.i
-data/src/share/classes/sun/util/resources/LocaleNames_et.properties.i
 data/src/share/classes/sun/security/smartcardio/SunPCSC.java.i
-data/src/share/classes/sun/io/CharToByteISO8859_2.java.i
 data/src/share/classes/java/sql/SQLNonTransientConnectionException.java.i
+data/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java.i
 data/src/share/back/ClassLoaderReferenceImpl.h.i
 data/src/share/classes/javax/print/SimpleDoc.java.i
 data/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java.i
 data/test/vm/verifier/VerifyStackForExceptionHandlers.java.i
 data/test/javax/sound/midi/Gervill/SoftReceiver/Send_ResetAllControllers.java.i
 data/src/share/classes/javax/sql/rowset/sqlxml.xsd.i
-data/src/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java.i
+data/test/java/io/LineNumberReader/SkipInput.txt.i
 data/test/tools/pack200/pack200-verifier/src/xmlkit/InstructionSyntax.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/ImageTests.java.i
+data/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java.i
 data/src/linux/doc/man/javac.1.i
 data/make/tools/src/build/tools/jdwpgen/IntTypeNode.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java.i
@@ -5804,61 +5766,64 @@ data/test/java/nio/channels/SocketChannel/VectorIO.java.i
 data/src/share/classes/sun/security/pkcs/ParsingException.java.i
 data/test/sun/net/idn/nfsmxs.spp.i
 data/test/java/beans/PropertyEditor/TestLongClassJava.java.i
+data/make/tools/CharsetMapping/IBM860.map.i
 data/test/java/nio/channels/DatagramChannel/NoSender.java.i
 data/src/share/classes/javax/swing/text/TableView.java.i
-data/src/share/classes/javax/swing/LayoutStyle.java.i
-data/src/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java.i
 data/src/share/classes/sun/security/x509/CertificatePolicyId.java.i
-data/test/java/io/PrintWriter/FailingConstructors.java.i
+data/src/share/classes/sun/io/CharToByteCp858.java.i
 data/test/sun/tools/jstatd/jstatdServerName.sh.i
 data/src/share/classes/javax/crypto/MacSpi.java.i
 data/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java.i
 data/src/share/classes/sun/security/ssl/krb5/KerberosClientKeyExchangeImpl.java.i
 data/test/javax/swing/JList/6823603/bug6823603.java.i
-data/test/javax/crypto/Mac/NullMacSpi.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocket.java.i
 data/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh.i
+data/make/com/sun/tools/attach/FILES_java.gmk.i
 data/src/share/classes/sun/misc/RequestProcessor.java.i
 data/test/sun/pisces/ThinLineTest.java.i
 data/src/share/classes/java/lang/invoke/VolatileCallSite.java.i
+data/src/share/classes/javax/naming/spi/ContinuationDirContext.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java.i
 data/src/share/demo/jvmti/hprof/sample.makefile.txt.i
+data/test/java/beans/XMLEncoder/java_util_Collections_CheckedList.java.i
 data/test/tools/launcher/i18nTest.sh.i
-data/test/java/lang/instrument/PremainClass/InheritAgent0011.java.i
-data/src/share/native/sun/awt/image/jpeg/jfdctflt.c.i
+data/test/java/nio/Buffer/SwapMicroBenchmark.java.i
 data/test/java/nio/file/WatchService/OverflowEventIsLoner.java.i
 data/src/windows/native/sun/windows/awt_KeyEvent.h.i
 data/src/share/native/java/util/zip/zlib-1.1.3/doc/algorithm.doc.i
 data/src/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java.i
-data/src/share/classes/sun/text/resources/FormatData_ko.java.i
 data/make/tools/CharsetMapping/IBM918.c2b.i
 data/test/java/net/InetAddress/IPv4Formats.java.i
 data/test/javax/management/namespace/NullObjectNameTest.java.i
 data/src/share/classes/sun/tools/tree/BinaryCompareExpression.java.i
-data/src/share/classes/sun/font/NullFontScaler.java.i
-data/src/share/classes/sun/security/jca/ServiceId.java.i
+data/src/share/classes/javax/print/URIException.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java.i
 data/src/solaris/classes/sun/awt/X11/XFramePeer.java.i
 data/src/share/classes/javax/print/attribute/standard/MediaPrintableArea.java.i
 data/src/share/classes/javax/naming/ldap/LdapName.java.i
 data/src/share/classes/javax/crypto/IllegalBlockSizeException.java.i
 data/make/mkdemo/jvmti/hprof/Makefile.i
 data/src/share/classes/javax/swing/DefaultSingleSelectionModel.java.i
-data/test/java/net/URLEncoder/Decoder.java.i
+data/src/share/classes/com/sun/tools/jdi/NonConcreteMethodImpl.java.i
+data/src/share/classes/java/security/SecureRandomSpi.java.i
 data/src/share/classes/sun/net/util/URLUtil.java.i
 data/src/share/classes/javax/naming/ServiceUnavailableException.java.i
 data/src/share/transport/shmem/sysShmem.h.i
+data/src/share/classes/com/sun/tools/hat/internal/server/InstancesQuery.java.i
+data/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java.i
 data/src/share/classes/sun/io/ByteToCharCp921.java.i
 data/src/share/classes/sun/security/jgss/krb5/InitialToken.java.i
+data/test/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMeta.java.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java.i
-data/src/share/classes/javax/xml/crypto/URIDereferencer.java.i
-data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml.i
+data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScanner.java.i
 data/src/share/classes/java/security/KeyPairGenerator.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/ParserConstants.java.i
-data/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdParallelGC.sh.i
+data/src/share/classes/sun/tools/jconsole/resources/mbean.gif.i
 data/test/sun/security/krb5/etype/WeakCrypto.java.i
+data/test/sun/net/www/protocol/jar/foo.jar.i
 data/src/share/classes/com/sun/net/ssl/KeyManagerFactory.java.i
-data/src/share/demo/nio/zipfs/META-INF/services/java.nio.file.spi.FileSystemProvider.i
-data/test/java/security/SecureRandom/GetAlgorithm.java.i
+data/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java.i
 data/src/share/classes/com/sun/jmx/snmp/package.html.i
 data/test/javax/swing/MultiUIDefaults/4300666/bug4300666.html.i
 data/src/share/native/sun/security/ec/impl/mpi-config.h.i
@@ -5867,29 +5832,27 @@ data/test/sun/net/www/http/HttpClient/GetProxyPort.java.i
 data/test/sun/security/provider/PolicyFile/SelfWildcard.policy.i
 data/test/sun/tools/jps/jps-Defaults.sh.i
 data/src/share/classes/com/sun/tools/hat/build.xml.i
-data/src/windows/classes/java/io/FileDescriptor.java.i
 data/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh.i
 data/src/share/classes/javax/swing/plaf/basic/CenterLayout.java.i
 data/make/mksample/dtrace/Makefile.i
 data/src/share/classes/sun/nio/cs/ext/IBM1146.java.i
 data/src/share/classes/com/sun/jmx/snmp/internal/SnmpMsgProcessingModel.java.i
-data/src/share/classes/sun/launcher/resources/launcher_fr.properties.i
 data/src/share/classes/javax/print/DocFlavor.java.i
 data/src/solaris/classes/sun/nio/fs/DefaultFileTypeDetector.java.i
+data/src/solaris/bin/java-rmi.cgi.sh.i
 data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties.i
 data/test/java/beans/XMLDecoder/spec/TestFalse.java.i
 data/test/java/lang/reflect/Field/Set.java.i
 data/test/sun/java2d/loops/Bug7049339.java.i
 data/src/share/demo/jvmti/hprof/hprof.h.i
 data/src/share/classes/sun/security/smartcardio/TerminalImpl.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_be_BY.properties.i
-data/test/com/sun/net/httpserver/bugs/FixedLengthInputStream.java.i
+data/src/share/classes/java/awt/peer/FontPeer.java.i
+data/make/tools/swing-beans/SwingBeanInfo.template.i
 data/src/solaris/native/sun/java2d/loops/vis_AlphaMaskFill.c.i
 data/src/share/classes/sun/util/resources/CurrencyNames_en_AU.properties.i
-data/src/share/classes/java/awt/MultipleGradientPaint.java.i
+data/test/java/util/EnumMap/EnumMapBash.java.i
 data/src/share/classes/sun/misc/Resource.java.i
 data/src/share/native/sun/java2d/loops/Blit.c.i
-data/src/solaris/native/sun/java2d/loops/vis_GlyphListXor.c.i
 data/src/share/classes/java/io/OptionalDataException.java.i
 data/test/javax/swing/JFormattedTextField/Test6462562.java.i
 data/test/java/io/RandomAccessFile/skipBytes/SkipBytes.java.i
@@ -5903,23 +5866,27 @@ data/test/java/awt/Mixing/MixingOnDialog.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java.i
 data/src/share/classes/sun/applet/AppletResourceLoader.java.i
 data/src/share/classes/java/text/PatternEntry.java.i
-data/test/java/awt/font/TextLayout/TestSinhalaChar.java.i
+data/src/share/native/sun/awt/image/jpeg/imageioJPEG.c.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java.i
 data/src/solaris/doc/sun/man/man1/java.1.i
+data/test/java/io/charStreams/LineSink.java.i
 data/test/java/lang/ClassLoader/defineClass/TestClass.java.i
+data/src/share/classes/sun/text/resources/FormatData_it_CH.java.i
 data/test/java/security/cert/CertPathBuilder/StubProvider.java.i
 data/src/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties.i
 data/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java.i
 data/src/solaris/classes/sun/awt/X11/XEmbedChildProxy.java.i
-data/test/javax/swing/JLayer/6872503/bug6872503.java.i
+data/test/java/nio/channels/FileChannel/ReadToLimit.java.i
 data/make/sun/net/Makefile.i
 data/test/java/lang/reflect/Generics/HashCodeTest.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so.i
+data/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.cpp.i
+data/src/share/classes/javax/naming/event/package.html.i
+data/make/sun/cmm/lcms/Makefile.i
 data/test/javax/management/remote/mandatory/subjectDelegation/jmxremote.password.i
 data/test/java/lang/System/IHashCode.java.i
 data/test/sun/security/pkcs11/KeyStore/BasicData/pk2.key.i
 data/test/java/rmi/activation/Activatable/checkRegisterInLog/rmid.security.policy.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/spi/ProviderInit.java.i
 data/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c.i
 data/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java.i
 data/test/java/beans/XMLEncoder/6777487/TestCheckedSortedSet.java.i
@@ -5931,44 +5898,45 @@ data/make/java/jvm/Makefile.i
 data/src/solaris/native/sun/awt/awt_XmDnD.h.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeOpen.gif.i
 data/make/tools/swing-beans/beaninfo/images/JMenuMono32.gif.i
+data/src/share/classes/javax/swing/text/html/BlockView.java.i
 data/src/share/classes/sun/rmi/runtime/Log.java.i
 data/test/java/net/Socket/IDNTest.java.i
 data/src/share/native/common/jni_util.c.i
 data/src/solaris/native/sun/security/smartcardio/pcsc_md.c.i
 data/test/java/awt/Mouse/MouseModifiersUnitTest/ModifierPermutation.java.i
-data/test/com/sun/security/auth/login/ConfigFile/Override.props.i
+data/make/tools/src/build/tools/charsetmapping/DBCS.java.i
+data/test/java/util/ResourceBundle/Control/Chinese_zh.properties.i
 data/src/share/classes/sun/text/resources/FormatData_mt_MT.java.i
+data/test/javax/management/generified/ListTypeCheckTest.java.i
 data/test/com/sun/nio/sctp/SctpServerChannel/Accept.java.i
 data/test/java/util/zip/ZipFile/FinalizeZipFile.java.i
 data/src/share/classes/javax/swing/tree/TreeCellRenderer.java.i
 data/test/java/util/ResourceBundle/Bug6356571.properties.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTaskUtils.java.i
 data/src/solaris/native/java/io/io_util_md.c.i
-data/src/share/native/com/sun/java/util/jar/pack/bytes.cpp.i
+data/src/share/demo/nbproject/scripting/jconsole-plugin/build.properties.i
+data/src/share/classes/sun/io/ByteToCharUnicodeBigUnmarked.java.i
 data/make/mkdemo/jvmti/mapfile-vers.i
 data/src/share/classes/javax/swing/text/ViewFactory.java.i
 data/test/sun/security/ssl/sanity/interop/JSSEClient.java.i
+data/test/java/lang/ThreadGroup/Suspend.java.i
 data/src/share/classes/javax/swing/text/html/parser/ContentModel.java.i
 data/src/windows/native/sun/java2d/d3d/D3DBufImgOps.cpp.i
-data/src/share/classes/java/io/UTFDataFormatException.java.i
 data/test/java/io/Serializable/ClassCastExceptionDetail/Write.java.i
 data/src/share/classes/javax/crypto/KeyGeneratorSpi.java.i
 data/src/share/classes/sun/security/pkcs11/P11KeyFactory.java.i
 data/test/javax/management/Introspector/SqeDescriptorKey.java.i
 data/src/share/classes/java/lang/CharacterData.java.i
-data/test/java/util/zip/ZipFile/crash.jar.i
-data/src/windows/classes/sun/awt/windows/awtLocalization_es.properties.i
 data/src/share/classes/sun/io/CharToByteCp037.java.i
 data/make/tools/swing-beans/beaninfo/images/JTreeColor32.gif.i
-data/test/java/net/URLClassLoader/closetest/build2.sh.i
-data/src/windows/classes/java/util/prefs/WindowsPreferences.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java.i
 data/test/java/net/URL/Constructor.java.i
 data/make/sun/awt/CondenseRules.awk.i
 data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java.i
 data/src/share/classes/sun/io/ByteToCharJohab.java.i
 data/test/sun/security/provider/PolicyParser/ExtDirsChange.java.i
 data/src/share/classes/com/sun/jmx/snmp/UserAcl.java.i
-data/src/windows/native/sun/nio/ch/FileDispatcher.c.i
+data/test/java/io/File/SetLastModified.java.i
 data/src/share/classes/com/sun/naming/internal/VersionHelper12.java.i
 data/src/solaris/classes/sun/font/XRGlyphCacheEntry.java.i
 data/src/share/native/sun/font/bidi/uchardir.c.i
@@ -5976,19 +5944,16 @@ data/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java.i
 data/make/mksample/nio/server/Makefile.i
 data/test/java/nio/channels/DatagramChannel/Receive.java.i
 data/src/share/classes/javax/print/attribute/standard/NumberOfInterveningJobs.java.i
-data/src/share/classes/com/sun/crypto/provider/AESKeyGenerator.java.i
 data/src/share/classes/sun/net/www/http/PosterOutputStream.java.i
 data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_fr.properties.i
 data/src/share/native/sun/awt/image/jpeg/jdmarker.c.i
-data/test/sun/security/provider/certpath/DisabledAlgorithms/generate.sh.i
+data/make/java/math/Makefile.i
 data/src/solaris/sample/dtrace/hotspot_jni/hotspot_jni_calls_stat.d.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/MgmtData.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIB.java.i
 data/test/java/net/Socket/LinkLocal.java.i
-data/make/common/shared/Defs-windows.gmk.i
-data/test/java/awt/GraphicsEnvironment/PreferLocaleFonts.java.i
 data/make/sun/rmi/rmic/Makefile.i
-data/test/java/util/concurrent/locks/ReentrantLock/LoopHelpers.java.i
+data/src/solaris/classes/java/net/DefaultDatagramSocketImplFactory.java.i
 data/make/common/internal/Resources.gmk.i
 data/src/share/classes/org/openjdk/jigsaw/Linker.java.i
 data/test/sun/net/InetAddress/nameservice/chaining/Simple2NameServiceDescriptor.java.i
@@ -5997,44 +5962,45 @@ data/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java.i
 data/test/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Encoder.java.i
 data/src/share/classes/sun/io/ByteToCharCp939.java.i
 data/make/sun/usagetracker/Makefile.i
+data/make/tools/reorder/tests/LoadJFrame.java.i
 data/test/javax/security/auth/login/Configuration/GetInstance.configURI.i
+data/test/javax/swing/text/html/TableView/7030332/sample2.png.i
 data/test/com/sun/jdi/EarlyReturnTest.java.i
 data/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java.i
-data/src/share/bin/version_comp.c.i
+data/src/share/classes/java/awt/RenderingHints.java.i
 data/make/com/sun/image/Makefile.i
-data/src/share/lib/calendars.properties.i
+data/src/share/demo/jvmti/hprof/hprof_class.c.i
 data/src/share/classes/java/util/concurrent/Exchanger.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java.i
+data/test/java/io/File/WinSpecialFiles.java.i
 data/test/java/io/ByteArrayInputStream/Skip.java.i
-data/src/share/back/ClassObjectReferenceImpl.c.i
+data/src/share/classes/java/nio/file/FileSystem.java.i
 data/src/share/classes/java/util/ArrayList.java.i
 data/src/share/native/sun/awt/splashscreen/splashscreen_impl.h.i
+data/src/share/classes/sun/util/logging/resources/logging_ja.properties.i
 data/src/share/classes/java/nio/file/attribute/PosixFileAttributes.java.i
 data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest14_ko.ssl.in.i
 data/src/share/classes/sun/rmi/transport/proxy/RMIHttpToCGISocketFactory.java.i
 data/src/share/classes/sun/security/ssl/HandshakeHash.java.i
 data/src/share/classes/javax/management/timer/Timer.java.i
 data/src/solaris/hpi/src/linker_md.c.i
-data/src/share/classes/sun/tools/tree/ConditionalExpression.java.i
 data/test/sun/security/x509/equalNames/AltNamesEqualsTest.java.i
 data/make/tools/CharsetMapping/IBM424.map.i
-data/src/share/classes/java/sql/Driver.java.i
 data/src/share/classes/java/nio/channels/AsynchronousSocketChannel.java.i
 data/test/sun/tools/jstat/jstatGcCauseOutput1.sh.i
 data/src/solaris/doc/sun/man/man1/ja/jrunscript.1.i
-data/src/solaris/classes/sun/awt/X11/XGlobalCursorManager.java.i
+data/src/share/classes/javax/print/attribute/standard/Fidelity.java.i
+data/test/java/net/URLConnection/ChunkedEncoding.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java.i
 data/test/java/nio/channels/SocketChannel/Connect.java.i
-data/src/share/classes/javax/swing/text/html/default.css.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDefault.java.i
 data/src/solaris/native/sun/awt/awt_KeyboardFocusManager.h.i
 data/make/common/shared/Defs-linux.gmk.i
 data/src/share/native/com/sun/java/util/jar/pack/coding.cpp.i
 data/src/share/classes/javax/sql/rowset/rowset.properties.i
-data/src/share/demo/java2d/J2DBench/resources/images/photo.jpg.i
+data/src/share/classes/com/sun/beans/decoder/AccessorElementHandler.java.i
 data/src/share/classes/org/openjdk/jigsaw/ModuleFile.java.i
-data/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldColor32.gif.i
 data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties.i
-data/test/javax/sound/sampled/AudioFormat/Matches_NOT_SPECIFIED.java.i
+data/src/share/classes/java/dyn/BootstrapMethod.java.i
 data/src/windows/native/java/net/icmp.h.i
 data/test/java/net/InetSocketAddress/B4849451.java.i
 data/src/share/classes/javax/crypto/spec/DESKeySpec.java.i
@@ -6042,26 +6008,28 @@ data/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.
 data/test/java/awt/Mixing/OverlappingButtons.java.i
 data/test/sun/misc/URLClassPath/ClassnameCharTest.sh.i
 data/src/share/classes/javax/naming/event/EventContext.java.i
-data/src/solaris/classes/sun/awt/X11/XWM.java.i
-data/test/javax/management/remote/mandatory/version/ImplVersionCommand.java.i
+data/test/java/util/PluggableLocale/ClasspathTest.java.i
 data/test/javax/management/remote/mandatory/provider/provider/JMXConnectorProviderImpl.java.i
 data/test/java/net/URL/share_file_urls.i
-data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml.i
-data/src/share/native/sun/java2d/cmm/lcms/icc34.h.i
+data/src/share/classes/sun/rmi/rmic/RemoteClass.java.i
 data/test/javax/security/auth/login/Configuration/Synchronize.java.i
 data/src/share/classes/java/nio/channels/FileLock.java.i
+data/src/share/native/java/lang/fdlibm/src/s_frexp.c.i
 data/src/share/classes/sun/security/provider/certpath/Builder.java.i
 data/test/sun/security/tools/keytool/console.sh.i
 data/test/javax/swing/JPopupMenu/6675802/bug6675802.java.i
 data/src/share/back/stream.h.i
-data/make/tools/swing-beans/beaninfo/images/JLayeredPaneColor16.gif.i
 data/src/share/native/java/util/zip/zlib-1.1.3/inftrees.c.i
+data/src/share/classes/com/sun/media/sound/WaveFileReader.java.i
+data/test/java/lang/Character/PropList.txt.i
 data/test/sun/management/jmxremote/bootstrap/jmxremote_test04_ok.access.in.i
 data/src/share/classes/java/lang/ref/package.html.i
 data/src/share/classes/java/awt/doc-files/TextArea-1.gif.i
-data/test/java/security/cert/pkix/nameConstraintsMinMax/labs2isrg2.cer.i
 data/src/share/classes/com/sun/media/sound/SoftInstrument.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java.i
+data/test/java/beans/EventHandler/Test6277266.java.i
+data/test/java/security/cert/CertPathBuilder/targetConstraints/BuildOddSel.java.i
+data/src/share/sample/nio/server/ChannelIO.java.i
 data/test/sun/security/pkcs11/rsa/KeyWrap.java.i
 data/make/tools/swing-beans/beaninfo/images/JToolBarColor32.gif.i
 data/src/share/classes/sun/net/httpserver/ExchangeImpl.java.i
@@ -6072,20 +6040,22 @@ data/src/share/demo/jvmti/hprof/hprof_site.h.i
 data/test/javax/swing/plaf/synth/SynthToolBarUI/6739756/bug6739756.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java.i
 data/src/windows/classes/sun/security/krb5/internal/tools/Klist.java.i
-data/test/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java.i
+data/src/share/bin/parse_manifest.c.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownModelLcdException.java.i
 data/src/share/classes/javax/sql/rowset/spi/SyncProviderException.java.i
 data/test/java/net/URLClassLoader/closetest/test2/com/foo/TestClass.java.i
 data/src/share/classes/java/util/prefs/InvalidPreferencesFormatException.java.i
 data/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java.i
+data/src/share/classes/javax/print/attribute/standard/JobHoldUntil.java.i
 data/test/javax/print/applet/applet1/META-INF/services/javax.print.PrintServiceLookup.i
 data/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiPopupMenuUI.java.i
 data/src/share/classes/sun/text/resources/FormatData_en_CA.java.i
 data/make/com/sun/tools/attach/Exportedfiles.gmk.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngineResult/Deserialize.java.i
-data/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java.i
-data/src/share/classes/javax/management/BinaryRelQueryExp.java.i
+data/test/javax/swing/JLabel/6501991/bug6501991.java.i
+data/src/share/classes/sun/launcher/resources/launcher_fr.properties.i
+data/src/share/classes/com/sun/beans/decoder/FieldElementHandler.java.i
 data/src/share/classes/java/rmi/server/ServerRef.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/icons/Error.gif.i
 data/src/share/classes/com/sun/tools/example/doc/javadt.html.i
@@ -6096,7 +6066,7 @@ data/test/java/io/Serializable/subclassGC/SubclassGC.java.i
 data/src/share/classes/java/util/List.java.i
 data/src/share/classes/javax/swing/text/PasswordView.java.i
 data/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java.i
-data/test/sun/pisces/JoinMiterTest.java.i
+data/make/com/sun/demo/jvmti/Makefile.i
 data/src/share/classes/com/sun/tracing/ProviderFactory.java.i
 data/src/share/classes/sun/security/jgss/spnego/NegTokenInit.java.i
 data/src/share/classes/sun/nio/cs/KOI8_R.java.i
@@ -6104,21 +6074,19 @@ data/test/java/io/Serializable/arraySuidConflict/Foo.java.i
 data/src/share/native/sun/java2d/loops/Any3Byte.h.i
 data/test/java/awt/font/TextLayout/CombiningPerf.java.i
 data/src/share/classes/javax/print/attribute/standard/OutputDeviceAssigned.java.i
-data/test/java/util/Collections/AddAll.java.i
-data/make/com/sun/tracing/dtrace/Makefile.i
-data/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java.i
+data/src/share/classes/sun/io/CharToByteCp424.java.i
+data/src/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java.i
 data/src/share/classes/java/util/zip/package.html.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java.i
 data/src/share/classes/java/nio/channels/spi/package.html.i
 data/test/java/security/KeyRep/HmacSHA1.pre.1.5.key.i
 data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java.i
-data/test/java/util/concurrent/DelayQueue/Stress.java.i
+data/src/share/classes/com/sun/media/sound/ModelStandardDirector.java.i
 data/src/share/native/sun/font/layout/SubtableProcessor.h.i
 data/src/share/classes/java/lang/invoke/AdapterMethodHandle.java.i
 data/test/javax/management/context/ContextForwarderTest.java.i
-data/test/java/lang/invoke/ClassValueTest.java.i
-data/src/share/back/ThreadGroupReferenceImpl.h.i
-data/src/share/native/sun/java2d/loops/AlphaMacros.c.i
+data/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_BA.properties.i
+data/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c.i
 data/test/sun/rmi/runtime/Log/4504153/Test4504153.java.i
 data/src/share/back/log_messages.h.i
 data/test/java/rmi/activation/log/LogTest.java.i
@@ -6130,16 +6098,14 @@ data/test/javax/crypto/spec/RC5ParameterSpec/RC5ParameterSpecEquals.java.i
 data/test/java/util/Locale/Bug4316602.java.i
 data/src/share/classes/java/awt/image/ImagingOpException.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/EffectUtils.java.i
-data/src/share/classes/com/sun/security/sasl/ClientFactoryImpl.java.i
+data/src/share/native/java/util/zip/zlib-1.1.3/deflate.h.i
 data/src/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java.i
 data/src/share/classes/javax/print/attribute/IntegerSyntax.java.i
-data/test/javax/swing/JComponent/4337267/bug4337267.java.i
+data/src/share/classes/sun/io/CharToByteISO8859_7.java.i
 data/src/share/demo/applets/MoleculeViewer/models/water.xyz.i
-data/test/java/lang/reflect/Method/invoke/IllegalAccessInInvoke.java.i
+data/src/share/classes/sun/nio/cs/ext/SJIS_0213.java.i
 data/src/share/demo/nbproject/jfc/TableExample/build.properties.i
-data/src/share/classes/sun/tools/jstat/Scale.java.i
-data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.java.i
-data/test/java/io/Serializable/defaultReadObjectCNFException/DefaultReadObjectCNFException.java.i
+data/src/share/classes/sun/awt/im/CompositionArea.java.i
 data/test/java/util/ResourceBundle/Control/ExpirationTest.sh.i
 data/test/java/lang/instrument/AppendToClassPathSetUp.sh.i
 data/test/java/io/Reader/Skip.java.i
@@ -6148,38 +6114,36 @@ data/src/share/demo/management/MemoryMonitor/README.txt.i
 data/src/share/classes/java/awt/image/RenderedImage.java.i
 data/test/java/security/cert/CertPathBuilder/StubProviderImpl.java.i
 data/make/tools/swing-beans/beaninfo/images/JRadioButtonMono32.gif.i
-data/src/share/demo/jfc/Metalworks/KhakiMetalTheme.java.i
+data/src/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM964.java.d
 data/src/share/native/sun/java2d/pipe/BufferedMaskBlit.c.i
 data/test/java/nio/file/spi/SetDefaultProvider.java.i
+data/src/share/native/java/lang/Throwable.c.i
 data/src/share/classes/sun/management/HotspotCompilationMBean.java.i
-data/test/java/rmi/reliability/juicer/OrangeEcho.java.i
+data/src/share/classes/javax/swing/event/UndoableEditListener.java.i
 data/src/share/classes/com/sun/jndi/toolkit/url/Uri.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java.i
 data/src/share/classes/javax/swing/text/GlyphPainter2.java.i
 data/make/modules/ld.jdk.swing.i
 data/test/java/nio/charset/RemovingSunIO/TestUnmappableForLength.java.i
-data/test/java/math/BigDecimal/StrippingZerosTest.java.i
 data/src/share/classes/javax/swing/DefaultListCellRenderer.java.i
 data/src/share/classes/com/sun/net/httpserver/Authenticator.java.i
-data/test/sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java.i
+data/src/share/classes/javax/imageio/spi/IIORegistry.java.i
 data/src/solaris/native/sun/nio/ch/Sctp.h.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasUIDefaults.java.i
 data/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpec.java.i
-data/test/java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java.i
-data/test/sun/tools/jrunscript/jrunscript-argsTest.sh.i
 data/src/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java.i
 data/src/share/classes/sun/io/ByteToCharCp866.java.i
 data/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMBean.java.i
-data/test/java/util/Arrays/CopyMethods.java.i
+data/make/templates/gpl-header.i
 data/make/tools/spp/Makefile.i
 data/src/share/classes/sun/io/ByteToCharMacDingbat.java.i
 data/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java.i
 data/src/windows/classes/sun/io/Win32ErrorMode.java.i
 data/src/share/classes/javax/sound/midi/Instrument.java.i
-data/test/java/rmi/reliability/juicer/Orange.java.i
+data/test/sun/security/provider/PolicyFile/AliasExpansion.java.i
 data/src/solaris/native/sun/java2d/loops/mlib_ImageCopy.h.i
 data/test/javax/management/Introspector/AnnotatedNotificationInfoTest.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiOptionPaneUI.java.i
@@ -6187,17 +6151,14 @@ data/src/share/classes/sun/text/resources/FormatData_es_MX.java.i
 data/src/solaris/native/sun/awt/VDrawingArea.h.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.h.i
 data/src/solaris/native/sun/java2d/loops/vis_IntArgbPre_Mask.c.i
-data/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java.i
 data/test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java.i
 data/test/java/nio/channels/Selector/WakeupOverflow.java.i
 data/src/share/classes/sun/management/resources/agent_sv.properties.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java.i
-data/test/sun/security/krb5/auto/OkAsDelegate.java.i
+data/src/share/classes/sun/awt/image/ToolkitImage.java.i
+data/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java.i
 data/test/sun/security/pkcs11/fips/truststore.i
 data/test/java/rmi/activation/Activatable/unregisterInactive/security.policy.i
 data/test/java/lang/ProcessBuilder/BigFork.java.i
-data/src/share/classes/javax/print/attribute/TextSyntax.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMeta.java.i
 data/src/share/classes/sun/font/Decoration.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDefaultSoundbank.java.i
 data/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java.i
@@ -6210,18 +6171,21 @@ data/src/share/classes/javax/swing/text/EditorKit.java.i
 data/src/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java.i
 data/src/share/native/sun/security/ec/impl/ecp_192.c.i
 data/src/share/classes/sun/security/x509/CertificateIssuerExtension.java.i
+data/src/share/classes/java/awt/PopupMenu.java.i
+data/src/share/classes/sun/io/CharToByteCp964.java.i
 data/src/share/classes/sun/text/resources/FormatData_hi_IN.java.i
 data/src/share/classes/java/awt/dnd/DragGestureRecognizer.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_en_SG.properties.i
+data/src/share/classes/sun/io/CharToByteCp860.java.i
 data/src/share/classes/java/util/TimeZone.java.i
 data/src/share/native/sun/java2d/loops/Ushort4444Argb.c.i
 data/make/modules/tools/src/com/sun/classanalyzer/Klass.java.i
 data/src/solaris/classes/java/util/prefs/FileSystemPreferences.java.i
 data/src/share/classes/java/beans/EventHandler.java.i
-data/test/java/util/ServiceLoader/FooProvider2.java.i
+data/test/java/util/Hashtable/HashCode.java.i
 data/src/windows/native/java/lang/java_props_md.c.i
 data/test/java/rmi/reliability/benchmark/bench/serial/Shorts.java.i
-data/test/sun/misc/Version/Version.java.i
+data/src/windows/native/sun/windows/awt_dlls.h.i
+data/src/share/classes/sun/tools/tree/AssignExpression.java.i
 data/make/com/sun/jndi/toolkit/Makefile.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java.i
 data/test/java/awt/FileDialog/FileNameOverrideTest/FileNameOverrideTest.html.i
@@ -6229,19 +6193,20 @@ data/test/java/io/Serializable/proxy/replace/Test.java.i
 data/src/share/classes/com/sun/net/ssl/HttpsURLConnection.java.i
 data/test/javax/management/descriptor/DescriptorConstructorTest.java.i
 data/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneWarning.wav.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java.i
+data/src/share/classes/com/sun/media/sound/DLSInfo.java.i
 data/src/share/classes/java/awt/print/Pageable.java.i
-data/src/share/classes/com/sun/jndi/ldap/pool/ConnectionsWeakRef.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/FloatArrayCalls.java.i
 data/src/share/classes/sun/tools/tree/BinaryBitExpression.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageConv.h.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/ContentHandlerAlreadyRegisteredException.java.i
 data/src/share/classes/sun/reflect/UnsafeStaticObjectFieldAccessorImpl.java.i
+data/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template.i
 data/src/linux/doc/man/ja/native2ascii.1.i
 data/src/share/demo/jfc/SwingApplet/README.txt.i
 data/test/sun/util/resources/TimeZone/Bug6377794.java.i
 data/src/windows/classes/sun/java2d/d3d/D3DMaskBlit.java.i
 data/test/sun/misc/ClassLoaderUtil/test.jar.i
-data/test/sun/nio/cs/TestUTF8.java.i
+data/make/tools/CharsetMapping/IBM935.c2b.i
 data/src/solaris/classes/sun/awt/X11/XLayerProtocol.java.i
 data/src/share/classes/com/sun/jndi/ldap/ReferralEnumeration.java.i
 data/test/java/lang/instrument/RemoveTransformerTest.java.i
@@ -6249,6 +6214,7 @@ data/make/tools/classanalyzer/nbproject/project.properties.i
 data/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java.i
 data/test/sun/security/krb5/auto/TcpTimeout.java.i
 data/src/share/classes/javax/naming/ldap/UnsolicitedNotificationListener.java.i
+data/make/tools/src/build/tools/jdwpgen/ReferenceIDTypeNode.java.i
 data/src/share/demo/jfc/FileChooserDemo/resources/images/gifIcon.gif.i
 data/test/sun/management/jmxremote/bootstrap/linux-i586/launcher.i
 data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Decoder.java.i
@@ -6258,59 +6224,57 @@ data/src/share/classes/sun/reflect/generics/tree/BooleanSignature.java.i
 data/test/sun/security/pkcs11/tls/TestMasterSecret.java.i
 data/test/tools/pack200/pack200-verifier/src/xmlkit/XMLKit.java.i
 data/src/share/classes/sun/text/normalizer/UTF16.java.i
-data/src/share/classes/javax/swing/JSlider.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.h.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java.i
+data/src/share/classes/java/text/Collator.java.i
 data/src/share/classes/sun/security/x509/CRLNumberExtension.java.i
 data/test/org/openjdk/jigsaw/cli/ca-cert.pem.i
 data/test/java/util/Random/DistinctSeeds.java.i
 data/test/com/oracle/net/sanity.sh.i
 data/test/java/security/Provider/Equals.java.i
+data/test/java/rmi/Naming/legalRegistryNames/Legal.java.i
 data/src/share/classes/sun/net/www/protocol/jar/URLJarFileCallBack.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509ExtendedKeyManager.java.i
+data/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java.i
 data/src/share/classes/sun/reflect/generics/repository/FieldRepository.java.i
 data/test/java/lang/ClassLoader/deadlock/Bob.java.i
 data/src/share/classes/sun/awt/image/IntegerComponentRaster.java.i
 data/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java.i
 data/src/share/classes/sun/applet/resources/MsgAppletViewer_es.java.i
-data/src/share/sample/nio/chatserver/NameReader.java.i
+data/src/share/classes/java/util/concurrent/atomic/package-info.java.i
 data/src/share/classes/sun/security/krb5/internal/crypto/DesCbcCrcEType.java.i
 data/src/share/native/sun/font/layout/MultipleSubstSubtables.h.i
 data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties.i
 data/make/tools/dtdbuilder/dtds/html32.dtd.i
-data/src/share/sample/scripting/scriptpad/build.xml.i
 data/src/share/classes/javax/naming/spi/InitialContextFactory.java.i
 data/test/java/lang/instrument/PremainClass/InheritAgent1110.java.i
 data/test/java/io/File/isDirectory/Applet.html.i
-data/test/java/io/Serializable/concurrentClassDescLookup/ConcurrentClassDescLookup.java.i
+data/test/java/util/Locale/serialized/java6locale__US.i
 data/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java.i
 data/test/javax/script/Test6.js.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaField.java.i
-data/src/share/classes/sun/rmi/server/WeakClassHashMap.java.i
+data/test/java/nio/channels/FileChannel/Read.java.i
 data/src/share/native/sun/font/layout/KhmerLayoutEngine.cpp.i
 data/src/share/classes/javax/swing/plaf/metal/sounds/PopupMenuPopup.wav.i
 data/src/share/native/java/lang/fdlibm/src/s_ceil.c.i
 data/make/mksample/nio/chatserver/Makefile.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IgnoreAllErrorHandler.java.i
-data/test/java/beans/Introspector/TestTypeResolver.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformCommunity.java.i
 data/src/share/classes/com/sun/jndi/ldap/LdapNameParser.java.i
 data/test/java/util/Collections/WrappedNull.java.i
 data/test/java/beans/XMLDecoder/spec/AbstractTest.java.i
 data/test/java/nio/Buffer/BasicFloat.java.i
 data/src/share/classes/sun/io/CharToByteMacArabic.java.i
-data/src/share/classes/sun/tools/jstat/ExpressionExecuter.java.i
-data/test/java/net/InetAddress/ptr/lookup.sh.i
+data/src/share/classes/sun/security/acl/WorldGroupImpl.java.i
 data/src/solaris/classes/sun/nio/ch/SctpAssocChange.java.i
-data/src/windows/transport/shmem/shmem_md.h.i
+data/test/java/nio/channels/SocketChannel/GetChannel.java.i
 data/test/javax/xml/crypto/dsig/data/sign-spec.xml.i
 data/src/share/classes/sun/print/resources/orientLandscape.png.i
 data/src/share/classes/java/security/ProtectionDomain.java.i
 data/src/share/classes/com/sun/tools/jdi/IntegerTypeImpl.java.i
-data/test/java/nio/channels/SocketChannel/ConnectState.java.i
+data/test/java/io/Serializable/maskSyntheticModifier/Foo.java.i
+data/test/java/security/Policy/Dynamic/setpolicy.jp.i
 data/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java.i
 data/src/solaris/native/sun/awt/awt_MenuComponent.c.i
-data/test/java/lang/Thread/GenerifyStackTraces.java.i
 data/make/sun/audio/Makefile.i
-data/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java.i
 data/test/sun/security/provider/DSA/TestKeyPairGenerator.java.i
 data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Ports.c.i
 data/src/share/classes/java/lang/Deprecated.java.i
@@ -6318,8 +6282,8 @@ data/src/windows/native/sun/windows/awt_DnDDS.h.i
 data/src/share/back/eventHelper.c.i
 data/test/java/net/Socket/ShutdownInput.java.i
 data/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_lt.properties.i
 data/src/share/classes/sun/nio/cs/ext/ISCII91.java.i
-data/src/share/classes/sun/net/www/MimeLauncher.java.i
 data/src/share/classes/sun/nio/fs/AbstractFileStoreSpaceAttributeView.java.i
 data/src/share/classes/javax/script/ScriptEngine.java.i
 data/make/tools/CharsetMapping/IBM1098.map.i
@@ -6328,9 +6292,7 @@ data/src/solaris/classes/sun/awt/X11/XWindowAttributesData.java.i
 data/src/share/native/java/util/zip/zlib-1.2.3/zlib.h.i
 data/src/linux/doc/man/unpack200.1.i
 data/.jcheck/conf.i
-data/test/sun/tools/jrunscript/jrunscript-fTest.sh.i
 data/src/share/classes/com/sun/tools/script/shell/init.js.i
-data/src/share/classes/com/sun/java/util/jar/pack/Attribute.java.i
 data/make/java/main/Makefile.i
 data/src/share/back/FieldImpl.h.i
 data/src/share/classes/javax/sound/midi/MidiDevice.java.i
@@ -6338,44 +6300,43 @@ data/test/com/sun/security/auth/callback/TextCallbackHandler/NPE.java.i
 data/src/share/native/java/lang/fdlibm/src/w_acosh.c.i
 data/test/java/util/PluggableLocale/providersrc/CurrencyNameProviderImpl.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties.i
-data/src/share/modules/jdk/module-info.java.i
-data/src/share/native/sun/security/ec/ec2_233.c.i
-data/src/windows/back/util_md.h.i
-data/src/share/native/sun/awt/medialib/mlib_ImageConvMxN.c.i
+data/make/tools/CharsetMapping/HKSCS2008.c2b.i
+data/src/share/classes/sun/text/resources/FormatData_de_LU.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html.i
 data/src/share/native/common/jdk_util.h.i
 data/test/java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Disable.java.i
-data/test/javax/management/modelmbean/ExoticTargetTypeTest.java.i
 data/src/share/classes/javax/swing/SortOrder.java.i
+data/src/solaris/native/sun/awt/awt_KeyboardFocusManager.c.i
 data/src/share/classes/sun/launcher/resources/launcher_ko.properties.i
 data/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemColor16.gif.i
 data/src/share/demo/nbproject/jfc/SampleTree/nbproject/project.xml.i
 data/test/sun/security/pkcs11/MessageDigest/DigestKAT.java.i
-data/src/share/classes/org/openjdk/jigsaw/cli/Librarian.java.i
 data/src/share/classes/sun/text/resources/FormatData_bg.java.i
 data/make/java/text/bidi/Makefile.i
 data/src/share/classes/java/lang/Class.java.i
 data/src/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.java.i
-data/src/share/native/sun/nio/ch/nio.h.i
-data/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp.i
+data/src/share/demo/jvmti/hprof/hprof_reference.h.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java.i
+data/make/java/java/mapfile-vers.i
 data/src/share/classes/java/rmi/dgc/DGC.java.i
 data/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh.i
 data/src/share/classes/javax/swing/plaf/multi/MultiSliderUI.java.i
 data/test/java/awt/xembed/server/TesterClient.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java.i
 data/test/java/awt/geom/CubicCurve2D/IntersectsTest.java.i
-data/src/share/classes/javax/sql/rowset/RowSetFactory.java.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java.i
+data/src/share/classes/sun/reflect/generics/tree/BottomSignature.java.i
 data/test/java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass2.java.i
 data/test/com/sun/jdi/ExceptionEvents.java.i
 data/test/java/lang/instrument/BufferClassLoader.java.i
 data/src/share/classes/sun/io/ByteToCharCp1251.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java.i
-data/test/java/rmi/reliability/benchmark/bench/HtmlReporter.java.i
+data/make/tools/CharsetMapping/IBM970.c2b.i
 data/make/tools/CharsetMapping/sjis0213.map.i
 data/make/tools/GenerateCharacter/CharacterData0E.java.template.i
 data/test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java.i
 data/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties.i
-data/test/java/util/TimeZone/OldIDMappingTest.sh.i
 data/make/mkdemo/jpda/Makefile.i
 data/test/java/beans/PropertyEditor/TestLongClassNull.java.i
 data/test/java/nio/channels/Selector/SelectAfterRead.java.i
@@ -6384,58 +6345,56 @@ data/test/javax/swing/JEditorPane/4492274/bug4492274.java.i
 data/test/sun/java2d/cmm/ProfileOp/ReadProfileTest.java.i
 data/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java.i
 data/src/share/classes/sun/reflect/UnsafeIntegerFieldAccessorImpl.java.i
-data/test/javax/management/descriptor/ImmutableArrayFieldTest.java.i
+data/test/com/sun/jdi/ShutdownDebuggee.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java.i
 data/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java.i
 data/test/java/util/regex/TestCases.txt.i
 data/make/README-builds.html.i
 data/src/share/classes/java/security/spec/DSAPrivateKeySpec.java.i
 data/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java.i
-data/src/share/classes/sun/beans/editors/ByteEditor.java.i
+data/src/windows/native/sun/windows/awt_MenuBar.cpp.i
 data/test/sun/security/krb5/auto/MaxRetries.java.i
 data/src/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java.i
 data/src/share/classes/java/awt/doc-files/FontMetrics-1.gif.i
 data/test/java/rmi/server/RMIClassLoader/spi/ServiceConfiguration.java.i
 data/src/share/classes/com/sun/jdi/VoidValue.java.i
+data/src/share/classes/com/sun/imageio/stream/StreamCloser.java.i
 data/src/share/classes/java/lang/ArrayIndexOutOfBoundsException.java.i
 data/src/share/native/sun/awt/image/cvutils/img_opaque.h.i
 data/src/share/native/java/util/zip/Inflater.c.i
 data/test/java/awt/FullScreen/BufferStrategyExceptionTest/BufferStrategyExceptionTest.java.i
+data/test/java/net/URLClassLoader/getresourceasstream/Test.java.i
 data/test/javax/management/monitor/ReflectionExceptionTest.java.i
 data/src/share/classes/sun/reflect/generics/repository/AbstractRepository.java.i
-data/make/tools/src/build/tools/automulti/README.txt.i
+data/src/share/classes/java/lang/IllegalMonitorStateException.java.i
 data/make/java/main/java/mapfile-i586.i
-data/test/sun/security/provider/certpath/ReverseBuilder/mgrMcrl.i
 data/test/java/util/Currency/tablea1.txt.i
 data/src/share/native/sun/security/ec/impl/ecp_256.c.i
 data/src/share/classes/javax/sql/StatementEventListener.java.i
 data/test/sun/security/provider/PolicyFile/Comparator.Comparator.Policy.i
+data/src/share/native/java/lang/fdlibm/src/e_lgamma_r.c.i
 data/src/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java.i
-data/test/sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XTree.java.i
 data/test/java/net/URLClassLoader/closetest/serverRoot/Test.java.i
 data/make/tools/swing-beans/beaninfo/images/JDesktopPaneColor16.gif.i
 data/test/java/util/EnumSet/BogusEnumSet.java.i
-data/src/share/classes/java/io/ByteArrayInputStream.java.i
-data/test/java/io/Serializable/corruptedUTFConsumption/CorruptedUTFConsumption.java.i
-data/make/sun/launcher/Makefile.i
-data/test/sun/net/www/protocol/jar/jarbug/src/jar1/GetResource.java.i
-data/test/tools/launcher/ExecutionEnvironment.java.i
-data/src/solaris/classes/sun/awt/X11/XInputMethod.java.i
-data/test/java/lang/ClassLoader/deadlock/Alice.java.i
-data/test/javax/xml/crypto/dsig/data/signature-x509-sn.xml.i
+data/src/share/classes/java/security/spec/MGF1ParameterSpec.java.i
+data/src/share/classes/com/sun/security/auth/module/UnixSystem.java.i
+data/src/share/classes/javax/smartcardio/package.html.i
+data/src/share/native/java/lang/fdlibm/src/w_hypot.c.i
+data/test/java/lang/ClassLoader/deadlock/Alice.java.i
+data/test/javax/xml/crypto/dsig/data/signature-x509-sn.xml.i
 data/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java.i
 data/test/java/io/StringReader/Skip.java.i
 data/test/java/io/PrintStream/OversynchronizedTest.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneDivider.java.i
-data/src/share/classes/sun/net/NetworkServer.java.i
+data/src/share/classes/sun/management/counter/perf/PerfDataType.java.i
 data/src/share/classes/java/lang/ClassNotFoundException.java.i
-data/src/share/classes/java/beans/SimpleBeanInfo.java.i
 data/test/javax/print/attribute/SupportedPrintableAreas.java.i
 data/test/java/nio/Buffer/CopyDirectDoubleMemory.java.i
 data/test/com/sun/jdi/CatchCaughtTest.sh.i
 data/src/windows/classes/sun/print/services/javax.print.StreamPrintServiceFactory.i
-data/test/java/net/URL/SpecifyHandler.java.i
-data/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java.i
+data/src/share/classes/javax/swing/text/TabStop.java.i
 data/src/share/classes/java/nio/channels/CompletionHandler.java.i
 data/src/share/classes/sun/awt/VerticalBagLayout.java.i
 data/test/javax/swing/JFileChooser/6868611/bug6868611.java.i
@@ -6446,13 +6405,14 @@ data/test/java/rmi/server/RemoteServer/SetLogNull.java.i
 data/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh.i
 data/src/solaris/native/java/nio/MappedByteBuffer.c.i
 data/src/share/classes/sun/tools/tree/LessOrEqualExpression.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java.i
 data/src/share/classes/com/sun/tools/jdi/InternalEventHandler.java.i
 data/test/com/sun/crypto/provider/Mac/HmacMD5.java.i
 data/src/share/native/java/lang/fdlibm/src/e_jn.c.i
 data/src/linux/doc/man/ja/wsgen.1.i
 data/test/java/beans/XMLEncoder/java_awt_Component.java.i
 data/src/share/native/java/util/zip/zlib-1.2.3/patches/inflate.c.diff.i
-data/src/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpErrorHandlerAgent.java.i
 data/src/share/sample/nio/file/Chmod.java.i
 data/src/share/classes/sun/rmi/server/resources/rmid_it.properties.i
 data/src/share/back/inStream.h.i
@@ -6462,48 +6422,47 @@ data/test/java/lang/StringBuffer/GetCharsSrcEndLarger.java.i
 data/test/sun/pisces/DashStrokeTest.java.i
 data/test/com/sun/jdi/MethodExitReturnValuesTest.java.i
 data/src/share/classes/com/sun/crypto/provider/Padding.java.i
+data/src/share/classes/java/security/interfaces/DSAParams.java.i
 data/src/share/native/sun/java2d/loops/IntBgr.c.i
 data/src/share/demo/applets/DrawTest/DrawTest.java.i
 data/src/share/classes/java/awt/dnd/SerializationTester.java.i
+data/test/java/nio/charset/CharsetEncoder/CanEncode.java.i
 data/src/share/classes/java/rmi/ConnectException.java.i
 data/make/sun/javazic/tzdata/europe.i
-data/src/share/classes/sun/io/CharToByteUnicodeBig.java.i
 data/src/share/classes/javax/swing/SortingFocusTraversalPolicy.java.i
 data/test/javax/management/loading/LibraryLoader/native.jar.i
+data/src/solaris/lib/flavormap.properties.i
 data/src/share/back/vm_interface.h.i
-data/src/share/classes/sun/misc/PerformanceLogger.java.i
+data/src/share/classes/sun/security/x509/CertificateAlgorithmId.java.i
 data/src/share/demo/jfc/TransparentRuler/transparentruler/Ruler.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java.i
 data/src/solaris/native/sun/tools/attach/SolarisVirtualMachine.c.i
-data/test/javax/management/Introspector/UnDescribed.java.i
-data/src/share/classes/sun/security/util/ByteArrayTagOrder.java.i
-data/test/org/openjdk/jigsaw/cli/prikey.pem.i
-data/test/java/awt/FontClass/CreateFont/DeleteFont.sh.i
+data/src/share/classes/java/awt/package.html.i
+data/src/share/classes/javax/swing/plaf/TreeUI.java.i
 data/src/share/classes/javax/management/OrQueryExp.java.i
 data/src/share/classes/com/sun/script/javascript/JSAdapter.java.i
 data/test/java/util/TreeMap/ContainsValue.java.i
+data/test/java/nio/file/WatchService/grantDirOnly.policy.i
 data/test/java/io/SystemInAvailable.java.i
 data/src/share/classes/com/sun/tools/example/doc/jdb.html.i
 data/test/java/security/cert/CertificateFactory/openssl/open.i
 data/src/share/classes/sun/nio/cs/ext/EUC_JP.java.i
-data/make/sun/jdbc/Makefile.i
+data/src/share/classes/java/util/logging/Level.java.i
 data/src/share/classes/sun/reflect/NativeConstructorAccessorImpl.java.i
-data/test/java/net/URL/HandlerLoop.java.i
-data/src/share/classes/com/sun/media/sound/AbstractLine.java.i
+data/src/share/classes/java/awt/geom/IllegalPathStateException.java.i
 data/test/java/util/ResourceBundle/Test4314141B_es_ES.java.i
-data/test/java/io/Serializable/badSerialPersistentField/BadSerialPersistentField.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/internal/ValueConverter.java.i
 data/test/java/lang/ClassLoader/deadlock/Starter.java.i
 data/test/java/math/BigInteger/UnicodeConstructor.java.i
 data/test/javax/management/namespace/LazyDomainTest.java.i
-data/src/share/classes/java/util/EnumSet.java.i
 data/src/share/classes/javax/naming/StringRefAddr.java.i
-data/src/share/classes/sun/management/MemoryImpl.java.i
 data/test/javax/swing/text/Utilities/bug7045593.java.i
 data/make/sun/security/util/Makefile.i
 data/src/share/demo/jvmti/hprof/hprof_ioname.c.i
-data/test/sun/net/www/protocol/jar/B5105410.java.i
+data/test/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/OriginServer.java.i
 data/src/share/classes/com/sun/java/browser/net/ProxyServiceProvider.java.i
+data/test/java/util/jar/JarEntry/test.jar.i
 data/test/java/util/ResourceBundle/Bug4168625Resource.java.i
 data/test/java/nio/MappedByteBuffer/ZeroMap.java.i
 data/src/windows/native/sun/windows/awt_Palette.cpp.i
@@ -6513,7 +6472,6 @@ data/make/tools/CharsetMapping/Big5.c2b.i
 data/src/solaris/classes/sun/awt/X11/XStateProtocol.java.i
 data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties.i
 data/test/java/security/KeyPairGenerator/Failover.java.i
-data/src/share/classes/sun/security/krb5/KrbCryptoException.java.i
 data/src/share/classes/com/sun/jmx/remote/protocol/iiop/ServerProvider.java.i
 data/test/java/lang/ClassLoader/deadlock/GetResource.java.i
 data/src/solaris/native/sun/awt/awt_TextField.c.i
@@ -6524,49 +6482,49 @@ data/src/share/classes/sun/nio/cs/ext/ISO2022_KR.java.i
 data/make/tools/swing-beans/beaninfo/images/JPanelMono32.gif.i
 data/src/share/classes/java/security/cert/X509CRLEntry.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseEngineException.java.i
-data/src/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java.i
 data/test/sun/net/www/ftptest/FtpAuthHandler.java.i
 data/test/java/nio/channels/Selector/BasicConnect.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_hr_HR.properties.i
 data/test/java/lang/Class/EnumPoseur.class.i
 data/test/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.html.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java.i
-data/make/com/sun/security/auth/module/FILES_export_unix.gmk.i
+data/src/share/classes/javax/accessibility/AccessibleExtendedComponent.java.i
 data/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java.i
 data/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java.i
-data/src/share/classes/sun/reflect/UnsafeStaticCharacterFieldAccessorImpl.java.i
+data/src/share/classes/java/util/Observable.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_en_ZA.properties.i
 data/src/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java.i
 data/test/java/nio/channels/AsynchronousChannelGroup/BadProperties.java.i
 data/test/java/lang/Short/Decode.java.i
 data/src/share/classes/java/awt/peer/SystemTrayPeer.java.i
-data/src/share/classes/java/math/SignedMutableBigInteger.java.i
+data/test/javax/management/remote/mandatory/loading/SingleClassLoader.java.i
 data/src/share/classes/javax/crypto/spec/PBEParameterSpec.java.i
-data/test/sun/net/idn/nfscss.spp.i
+data/test/com/sun/crypto/provider/Cipher/PBE/DecryptWithoutParameters.java.i
 data/test/java/io/Serializable/evolution/AddedField/run.i
-data/src/share/classes/javax/naming/ldap/PagedResultsResponseControl.java.i
 data/test/java/net/URL/TestIPv6Addresses.java.i
-data/test/java/lang/Character/Scripts.txt.i
+data/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java.i
+data/src/share/classes/sun/io/ByteToCharDBCS_ASCII.java.i
 data/src/share/classes/javax/swing/plaf/metal/sounds/FrameMaximize.wav.i
 data/make/netbeans/common/java-data-no-native.ent.i
 data/src/share/native/sun/awt/giflib/gifalloc.c.i
 data/src/share/classes/sun/awt/image/GifImageDecoder.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasPath.java.i
+data/src/windows/native/com/sun/management/OperatingSystem_md.c.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/Destinations.java.i
 data/src/share/native/sun/awt/image/cvutils/img_output24.h.i
 data/src/share/classes/sun/io/ByteToCharMacRoman.java.i
 data/src/share/classes/com/sun/crypto/provider/ai.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ar_BH.properties.i
+data/src/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java.i
 data/src/share/classes/sun/io/CharToByteCp284.java.i
-data/src/windows/classes/sun/nio/ch/PipeImpl.java.i
+data/test/java/net/Socket/asyncClose/DatagramSocket_receive.java.i
 data/test/java/io/Serializable/enum/basic/Test.java.i
 data/src/windows/classes/sun/security/mscapi/PRNG.java.i
 data/test/java/lang/Class/getEnclosingClass/T4992170.java.i
 data/src/share/classes/sun/io/CharToByteCp1256.java.i
-data/src/share/classes/java/awt/image/BufferedImage.java.i
+data/test/java/text/BreakIterator/ExceptionTest.java.i
 data/src/share/classes/sun/net/www/protocol/file/FileURLConnection.java.i
-data/src/windows/native/sun/windows/ThemeReader.cpp.i
-data/test/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java.i
+data/src/solaris/back/proc_md.h.i
+data/src/share/classes/sun/util/resources/CalendarData_es_US.properties.i
 data/src/share/classes/javax/swing/text/Position.java.i
 data/src/solaris/classes/sun/nio/ch/SctpSocketDispatcher.java.i
 data/src/share/classes/sun/net/httpserver/HttpContextImpl.java.i
@@ -6575,13 +6533,13 @@ data/src/share/classes/sun/security/ssl/KerberosPreMasterSecret.java.i
 data/src/share/classes/java/security/Identity.java.i
 data/make/tools/src/build/tools/jdwpgen/TaggedObjectTypeNode.java.i
 data/test/java/io/readBytes/MemoryLeak.java.i
+data/make/sun/motif12/reorder-i586.i
 data/src/solaris/classes/java/io/FileDescriptor.java.i
 data/test/java/io/Serializable/defaulted/GetFieldRead.java.i
 data/test/java/util/Currency/PropertiesTest.java.i
-data/test/com/sun/jdi/ExclusiveBind.java.i
+data/src/share/classes/sun/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java.i
 data/src/share/classes/java/awt/geom/RoundRectIterator.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java.i
-data/test/java/lang/instrument/BootClassPath/Agent.java.i
 data/test/javax/security/auth/x500/X500Principal/OIDMap.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/Handler.java.i
 data/src/share/native/sun/java2d/loops/ProcessPath.c.i
@@ -6590,7 +6548,7 @@ data/src/share/classes/javax/crypto/spec/SecretKeySpec.java.i
 data/src/share/classes/org/openjdk/jigsaw/ModuleFileWriter.java.i
 data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/file-targets.xml.i
 data/src/share/classes/sun/jkernel/StandaloneMessageDigest.java.i
-data/src/share/classes/com/sun/tools/jdi/PrimitiveValueImpl.java.i
+data/src/windows/native/sun/windows/awt_KeyEvent.cpp.i
 data/src/share/native/sun/awt/libpng/png.c.i
 data/test/java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM921.java.i
@@ -6598,62 +6556,62 @@ data/src/share/classes/java/nio/file/ClosedFileSystemException.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/icons/image-failed.png.i
 data/src/solaris/classes/sun/awt/motif/X11Johab.java.i
 data/src/share/classes/javax/swing/text/Style.java.i
+data/make/mkdemo/management/MemoryMonitor/Makefile.i
 data/test/java/net/Socks/SocksServer.java.i
 data/test/sun/security/smartcardio/apdu.log.i
-data/src/share/classes/sun/java2d/pipe/hw/ExtendedBufferCapabilities.java.i
+data/src/share/classes/java/util/logging/Logger.java.i
 data/src/share/classes/sun/audio/AudioDevice.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalScrollButton.java.i
-data/src/share/classes/javax/management/AttributeChangeNotification.java.i
+data/src/share/classes/javax/swing/JLayeredPane.java.i
 data/src/share/classes/java/util/Currency.java.i
 data/src/share/classes/sun/security/pkcs11/P11Cipher.java.i
-data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties.i
 data/test/java/awt/font/FontNames/LocaleFamilyNames.java.i
 data/src/share/classes/sun/text/resources/FormatData_ar_SY.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_sl_SI.properties.i
 data/src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java.i
-data/src/share/classes/sun/tools/jinfo/JInfo.java.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java.i
 data/src/share/classes/javax/swing/colorchooser/DefaultRGBChooserPanel.java.i
 data/src/share/native/java/lang/fdlibm/src/e_rem_pio2.c.i
 data/src/share/native/sun/security/ec/impl/ecl-exp.h.i
 data/src/share/classes/com/sun/jndi/dns/DnsUrl.java.i
-data/test/java/nio/channels/Selector/TemporarySelector.java.i
+data/src/share/classes/sun/tools/tree/Context.java.i
 data/src/share/classes/sun/security/util/Resources_ko.java.i
+data/test/java/rmi/registry/checkusage/CheckUsage.java.i
 data/src/share/classes/sun/dyn/Invokers.java.i
 data/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java.i
+data/src/share/classes/sun/io/CharToByteCp1025.java.i
 data/src/share/classes/javax/swing/plaf/UIResource.java.i
 data/src/share/classes/sun/management/counter/AbstractCounter.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/README.update.i
 data/make/sun/javazic/javatz/java_11_ids.txt.i
 data/test/java/lang/instrument/BootClassPath/Cleanup.java.i
 data/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt.i
 data/src/share/classes/java/awt/event/ItemListener.java.i
 data/test/com/sun/jdi/TargetAdapter.java.i
 data/test/javax/script/Test1.js.i
-data/test/java/beans/PropertyEditor/TestByteTypeValue.java.i
+data/test/com/sun/tools/attach/ProviderTests.sh.i
 data/src/share/classes/java/io/DataOutputStream.java.i
-data/src/share/lib/images/cursors/motif_MoveDrop32x32.gif.i
 data/src/share/classes/com/sun/nio/sctp/IllegalUnbindException.java.i
 data/src/share/classes/java/security/KeyPair.java.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/TunnelProxy.java.i
 data/src/share/classes/javax/swing/doc-files/groupLayout.sequential.gif.i
-data/src/solaris/classes/sun/nio/ch/PollSelectorImpl.java.i
+data/make/common/Rules-SCCS.gmk.i
 data/src/share/classes/sun/tools/jmap/JMap.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java.i
+data/test/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.java.i
 data/make/tools/CharsetMapping/IBM278.c2b.i
-data/src/share/instrument/JarFacade.c.i
+data/src/solaris/native/sun/awt/awt_motif21.c.i
 data/make/java/management/mapfile-vers.i
-data/test/java/nio/file/Files/walkFileTree/WalkWithSecurity.java.i
 data/src/share/classes/javax/management/StringValueExp.java.i
 data/src/share/classes/sun/tools/jconsole/Worker.java.i
 data/src/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java.i
-data/test/java/security/SecureRandom/Serialize.java.i
 data/src/share/back/JDWP.h.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java.i
-data/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h.i
+data/test/java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java.i
+data/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java.i
 data/src/share/classes/javax/imageio/spi/package.html.i
 data/src/share/classes/sun/management/snmp/util/JvmContextFactory.java.i
-data/src/share/classes/sun/management/Util.java.i
+data/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java.i
 data/src/share/classes/com/sun/jndi/ldap/pool/Connections.java.i
 data/test/java/util/jar/JarFile/bogus-signerinfo-attr.jar.i
 data/src/share/classes/javax/swing/plaf/synth/SynthRadioButtonUI.java.i
@@ -6663,12 +6621,11 @@ data/test/sun/security/pkcs11/KeyStore/BasicData/p11-nss.txt.i
 data/src/share/classes/javax/swing/text/doc-files/View-flexibility.jpg.i
 data/test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java.i
 data/src/share/classes/javax/swing/event/MouseInputListener.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIState.java.i
+data/test/com/sun/net/httpserver/bugs/6725892/Test.java.i
 data/src/solaris/doc/sun/man/man1/jps.1.i
-data/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java.i
 data/src/share/classes/javax/print/attribute/standard/SheetCollate.java.i
 data/test/sun/security/pkcs11/Provider/Absolute.cfg.i
-data/src/share/classes/sun/net/www/protocol/http/BasicAuthentication.java.i
+data/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java.i
 data/src/share/classes/sun/text/normalizer/VersionInfo.java.i
 data/src/share/classes/sun/security/krb5/internal/crypto/Aes128CtsHmacSha1EType.java.i
 data/src/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java.i
@@ -6676,115 +6633,118 @@ data/test/java/lang/reflect/Method/Equals.java.i
 data/test/java/nio/charset/Charset/Contains.java.i
 data/src/share/classes/java/awt/Insets.java.i
 data/test/com/sun/jdi/AccessSpecifierTest.java.i
-data/src/share/native/sun/security/ec/mpprime.h.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/config.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java.i
 data/src/share/classes/sun/tools/asm/Cover.java.i
 data/src/share/classes/java/dyn/Switcher.java.i
 data/src/share/classes/javax/sql/rowset/spi/SyncFactory.java.i
 data/src/share/classes/java/awt/FocusTraversalPolicy.java.i
 data/test/java/lang/reflect/Proxy/NullClassLoader.java.i
 data/test/java/nio/channels/AsynchronousFileChannel/Basic.java.i
-data/test/javax/naming/spi/DirectoryManager/DummyContext.java.i
+data/src/share/classes/java/util/jar/JarOutputStream.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM1381.java.i
 data/src/share/classes/com/sun/jmx/namespace/serial/JMXNamespaceContext.java.i
-data/src/share/classes/sun/tools/jconsole/manifest.i
+data/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h.i
 data/src/solaris/hpi/native_threads/src/threads_solaris.c.i
 data/test/com/sun/jdi/CountEvent.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java.i
-data/src/share/classes/sun/reflect/MethodAccessor.java.i
-data/src/share/classes/java/util/concurrent/ForkJoinTask.java.i
-data/src/share/native/sun/java2d/loops/IntDcm.h.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputImageTests.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/DescriptorCache.java.i
+data/test/javax/swing/plaf/synth/7032791/bug7032791.java.i
+data/src/share/native/sun/awt/medialib/mlib.h.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyAuthTest.java.i
-data/src/share/classes/java/sql/DataTruncation.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.chk.i
 data/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java.i
 data/src/solaris/classes/sun/awt/motif/MInputMethodControl.java.i
 data/src/share/native/sun/awt/image/cvutils/img_input8_32.h.i
+data/make/tools/swing-beans/beaninfo/images/JToggleButtonColor32.gif.i
 data/src/share/classes/sun/java2d/pipe/AATextRenderer.java.i
-data/test/java/net/CookieHandler/NullUriCookieTest.java.i
+data/test/java/awt/font/TextLayout/TestTibetan.java.i
 data/src/share/native/sun/security/ec/impl/ecl.c.i
 data/test/sun/management/jmxremote/bootstrap/TestApplication.java.i
 data/src/windows/classes/sun/nio/ch/SocketDispatcher.java.i
 data/src/share/classes/javax/xml/crypto/dsig/spec/DigestMethodParameterSpec.java.i
 data/test/java/util/TimSort/ArrayBuilder.java.i
-data/src/share/classes/sun/applet/AppletEvent.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java.i
-data/test/java/lang/instrument/RedefineSetUp.sh.i
 data/src/share/classes/sun/io/ByteToCharCp870.java.i
 data/test/java/io/PushbackReader/Skip.java.i
 data/src/share/classes/sun/util/resources/TimeZoneNames_zh_HK.java.i
-data/src/share/classes/sun/management/counter/perf/ByteArrayCounterSnapshot.java.i
+data/test/com/sun/jndi/cosnaming/CNNameParser.java.i
 data/src/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java.i
 data/src/share/classes/sun/util/logging/LoggingProxy.java.i
-data/test/java/lang/ClassLoader/Assert.java.i
 data/make/tools/CharsetMapping/IBM933.c2b.i
 data/test/java/lang/reflect/Proxy/CharType.java.i
-data/src/share/classes/com/sun/jmx/remote/internal/package.html.i
+data/test/javax/management/remote/mandatory/passwordAccessFile/access.properties.i
 data/test/sun/net/www/httptest/HttpTransaction.java.i
 data/src/share/classes/com/sun/tools/example/debug/expr/LValue.java.i
-data/test/java/io/CharArrayReader/Constructor.java.i
-data/test/java/io/Reader/OpsAfterClose.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM424.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_fr_CA.properties.i
 data/test/sun/text/resources/Format/Bug4685470.java.i
 data/src/share/classes/java/dyn/MutableCallSite.java.i
-data/src/solaris/doc/sun/man/man1/native2ascii.1.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/package.html.i
+data/src/linux/doc/man/jinfo.1.i
+data/test/java/text/Format/DateFormat/Bug6683975.java.i
 data/test/java/beans/Introspector/Test4168833.java.i
-data/test/java/lang/Class/getEnclosingMethod/EnclosingMethodTests.java.i
+data/test/sun/management/jmxremote/bootstrap/management_ssltest13_ko.properties.in.i
+data/src/share/classes/java/awt/AlphaComposite.java.i
 data/test/java/util/Locale/LocaleTestFmwk.java.i
 data/src/share/classes/sun/misc/resources/Messages_ja.java.i
 data/src/share/classes/java/lang/doc-files/chi.gif.i
 data/test/sun/security/pkcs11/Secmod/AddPrivateKey.java.i
-data/test/java/net/URLConnection/xml/xml3.i
 data/test/javax/rmi/ssl/SocketFactoryTest.java.i
+data/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java.i
+data/make/tools/CharsetMapping/IBM930.nr.i
 data/src/solaris/sample/dtrace/hotspot/hotspot_calls_tree.d.i
-data/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java.i
+data/make/netbeans/common/standard-bindings.ent.i
+data/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java.i
 data/src/share/classes/sun/security/rsa/SunRsaSignEntries.java.i
 data/src/share/classes/com/sun/jndi/ldap/Connection.java.i
+data/src/share/native/sun/font/layout/MarkToBasePosnSubtables.h.i
 data/src/share/classes/sun/security/provider/Sun.java.i
 data/src/windows/native/sun/windows/ObjectList.cpp.i
 data/src/share/classes/sun/security/jgss/krb5/Krb5Context.java.i
 data/test/sun/management/HotspotClassLoadingMBean/ClassToLoad0.java.i
 data/test/java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java.i
-data/make/tools/src/build/tools/jdwpgen/TypeNode.java.i
-data/src/share/lib/security/java.policy.i
+data/src/share/classes/javax/management/Query.java.i
 data/test/javax/management/descriptor/SerializedInfo.java.i
-data/test/java/util/EnumSet/AllOf.java.i
-data/src/share/classes/javax/accessibility/Accessible.java.i
-data/src/share/classes/sun/font/CoreMetrics.java.i
+data/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh.i
+data/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java.i
+data/src/share/classes/com/sun/tools/script/shell/Main.java.i
+data/test/sun/security/pkcs/EncryptedPrivateKeyInfo/EncryptedPKInfoEqualsHashCode.java.i
 data/test/java/nio/channels/SocketChannel/Open.java.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/JigsawModuleBuilder.java.i
 data/test/javax/management/descriptor/DefaultDescriptorTest.java.i
-data/src/share/classes/sun/security/acl/OwnerImpl.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java.i
+data/src/share/classes/java/awt/geom/QuadIterator.java.i
+data/src/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java.i
+data/src/share/classes/com/sun/java/browser/net/ProxyInfo.java.i
 data/src/share/classes/sun/print/PeekGraphics.java.i
 data/test/javax/management/mxbean/customtypes/CustomLongMXBean.java.i
 data/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-0-attack.xml.i
-data/src/share/classes/sun/text/resources/FormatData_es_NI.java.i
+data/src/windows/native/sun/jkernel/DownloadDialog.h.i
 data/src/windows/native/sun/java2d/d3d/D3DMaskFill.h.i
-data/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java.i
+data/test/javax/management/namespace/SourceNamespaceTest.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java.i
-data/make/java/hpi/windows/Makefile.i
-data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Main.java.i
-data/test/sun/security/tools/keytool/file-in-help.sh.i
+data/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter.i
+data/make/tools/swing-beans/beaninfo/images/JRootPaneMono32.gif.i
 data/src/share/classes/sun/dyn/MethodTypeImpl.java.i
 data/test/javax/print/applet/applet2/Applet2PrintService.java.i
-data/src/share/classes/java/security/CryptoPrimitive.java.i
+data/src/share/classes/sun/text/resources/FormatData_ga_IE.java.i
+data/src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties.i
 data/test/java/util/WeakHashMap/Iteration.java.i
 data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java.i
 data/src/share/classes/com/sun/java/browser/dom/DOMAccessor.java.i
-data/test/java/lang/ThreadLocal/TLRemoveTest.java.i
+data/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh.i
 data/test/java/io/pathNames/win32/DriveOnly.java.i
-data/src/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java.i
+data/make/com/sun/security/sasl/Makefile.i
 data/test/com/sun/net/httpserver/Test9a.java.i
-data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_MatteBorderUIResource.java.i
-data/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java.i
+data/src/share/demo/jvmti/gctest/README.txt.i
+data/src/share/classes/sun/security/x509/CertException.java.i
 data/src/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties.i
 data/test/sun/management/jmxremote/bootstrap/management_test05_ko.properties.in.i
+data/src/share/classes/com/sun/pept/presentation/MessageStruct.java.i
 data/src/solaris/npt/utf_md.c.i
 data/test/javax/management/Introspector/DescribedMXBean.java.i
 data/src/share/classes/com/sun/rowset/internal/InsertRow.java.i
-data/src/share/classes/sun/text/resources/FormatData_sr_CS.java.i
-data/test/java/util/zip/ZipFile/ManyZipFiles.java.i
+data/make/tools/CharsetMapping/IBM937.c2b.i
+data/make/netbeans/awt2d/nbproject/project.xml.i
+data/test/java/util/LinkedList/Clone.java.i
 data/src/share/classes/org/relaxng/datatype/DatatypeLibraryFactory.java.i
 data/test/sun/rmi/rmic/newrmic/equivalence/Server.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_in_ID.properties.i
@@ -6793,83 +6753,86 @@ data/src/share/classes/sun/management/VMOptionCompositeData.java.i
 data/src/windows/instrument/EncodingSupport_md.c.i
 data/test/java/io/InputStream/ReadParams.java.i
 data/test/java/net/ProxySelector/B6563259.java.i
-data/test/java/lang/ThreadGroup/NullThreadName.java.i
+data/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so.i
 data/test/java/nio/channels/Selector/SelectorLimit.java.i
 data/src/windows/native/java/net/Inet4AddressImpl.c.i
+data/test/javax/print/applet/applet2/META-INF/services/javax.print.PrintServiceLookup.i
+data/test/java/beans/XMLEncoder/EnumPrivate.java.i
 data/src/share/classes/java/awt/FileDialog.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java.i
+data/src/share/classes/java/security/URIParameter.java.i
 data/test/java/beans/PropertyEditor/TestShortClassValue.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardObjectServer.java.i
+data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/NonpublicInterface1.java.i
 data/make/sun/javazic/javatz/fullset.txt.i
-data/test/java/util/ResourceBundle/Bug4396021.java.i
+data/src/share/classes/java/lang/ThreadDeath.java.i
 data/src/share/classes/com/sun/tracing/package-info.java.i
 data/test/sun/tools/jmap/Basic.sh.i
 data/src/share/classes/java/lang/Runnable.java.i
 data/make/tools/CharsetMapping/ISO_8859_9.map.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.policy.i
 data/test/java/lang/Class/forName/InvalidNameWithSlash.java.i
 data/src/share/classes/com/sun/java/util/jar/pack/Constants.java.i
-data/test/java/io/Serializable/class/run.sh.i
-data/test/java/util/Locale/serialized/java6locale_ROOT.i
+data/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java.i
 data/src/solaris/hpi/src/system_md.c.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvCopyEdge.c.i
 data/src/share/classes/java/awt/Window.java.i
 data/src/share/classes/sun/security/provider/DSAPublicKeyImpl.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/package.html.i
-data/test/java/nio/channels/FileChannel/AtomicAppend.java.i
+data/src/share/classes/com/sun/jarsigner/ContentSigner.java.i
 data/src/share/classes/java/lang/String.java.i
 data/test/sun/tools/native2ascii/resources/ImmutableResourceTest.java.i
 data/test/java/lang/instrument/RedefineMethodAddInvoke.sh.i
-data/src/share/native/sun/awt/medialib/mlib_sys.h.i
+data/src/share/classes/javax/swing/event/MenuListener.java.i
 data/test/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java.i
 data/src/share/native/sun/java2d/loops/ProcessPath.h.i
 data/src/share/classes/sun/misc/REException.java.i
 data/test/java/rmi/transport/checkLeaseInfoLeak/LeaseLeakClient.java.i
 data/src/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java.i
-data/make/tools/CharsetMapping/MS1250.map.i
+data/test/sun/security/provider/KeyStore/CaseSensitiveAliases.java.i
+data/test/java/util/jar/JarInputStream/EmptyJar.java.i
+data/src/share/lib/security/java.security-solaris.i
 data/src/share/classes/javax/accessibility/AccessibleTableModelChange.java.i
 data/src/share/classes/sun/awt/SunToolkit.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/OptionParserState.java.i
+data/src/share/classes/sun/text/resources/FormatData_es_CO.java.i
 data/src/share/classes/java/lang/doc-files/javalang.doc.anc40.gif.i
 data/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException2.java.i
 data/src/share/classes/java/nio/X-Buffer.java.template.i
 data/test/java/text/Bidi/Bug6665028.java.i
-data/src/share/classes/javax/swing/tree/VariableHeightLayoutCache.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java.i
 data/test/sun/nio/cs/TestJIS0212Decoder.java.i
 data/src/share/classes/sun/util/resources/CalendarData_sk.properties.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java.i
 data/src/share/classes/sun/net/ProgressSource.java.i
-data/src/windows/native/sun/windows/awt_PrintJob.cpp.i
+data/test/java/util/logging/ParentLoggersTest.java.i
 data/src/share/classes/sun/management/snmp/jvminstr/NotificationTargetImpl.java.i
 data/make/tools/swing-beans/beaninfo/images/JTabbedPaneMono16.gif.i
-data/src/share/classes/javax/swing/event/ListDataListener.java.i
 data/src/share/classes/java/awt/image/PackedColorModel.java.i
 data/src/solaris/doc/sun/man/man1/ja/java.1.i
 data/src/windows/classes/sun/tools/attach/WindowsVirtualMachine.java.i
 data/test/java/beans/VetoableChangeSupport/1.5.0_10.ser.i
 data/src/share/classes/sun/management/GarbageCollectorImpl.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties.i
+data/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java.i
 data/src/share/native/sun/font/layout/TibetanLayoutEngine.cpp.i
 data/src/share/native/sun/security/ec/ec2.h.i
-data/src/windows/native/sun/windows/awt_Panel.h.i
-data/make/tools/CharsetMapping/IBM855.map.i
+data/src/share/demo/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml.i
+data/test/java/util/concurrent/BlockingQueue/LastElement.java.i
 data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownMonitor.java.i
-data/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/Question.gif.i
+data/test/java/nio/channels/SocketChannel/OutOfBand.java.i
 data/src/linux/doc/man/jvisualvm.1.i
 data/test/sun/security/krb5/auto/BadKdc1.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMBean.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM1147.java.i
-data/src/share/classes/java/text/RuleBasedCollator.java.i
+data/src/share/classes/javax/swing/text/JTextComponent.java.i
 data/make/tools/src/build/tools/jdwpgen/AbstractGroupNode.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ar_TN.properties.i
+data/test/sun/security/jgss/CtorTests2.java.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedStaticObjectFieldAccessorImpl.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java.i
+data/src/share/classes/javax/imageio/ImageWriteParam.java.i
+data/test/java/rmi/activation/Activatable/checkActivateRef/ActivateMe.java.i
 data/make/tools/swing-beans/beaninfo/images/JFrameMono16.gif.i
 data/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.html.i
 data/test/java/nio/file/Files/CheckPermissions.java.i
 data/test/java/awt/im/JTextFieldTest.java.i
-data/src/share/classes/sun/security/krb5/internal/AuthContext.java.i
 data/src/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java.i
 data/src/share/classes/javax/crypto/KeyAgreementSpi.java.i
 data/src/share/classes/sun/tools/jconsole/BorderedComponent.java.i
@@ -6877,51 +6840,55 @@ data/test/java/awt/event/InputEvent/ButtonArraysEquality/ButtonArraysEquality.ja
 data/src/share/classes/java/nio/charset/CoderResult.java.i
 data/src/solaris/hpi/export/io_md.h.i
 data/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup_Stub.java.i
-data/test/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Decoder.java.i
+data/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp.i
+data/src/share/classes/java/awt/GraphicsEnvironment.java.i
 data/test/java/rmi/activation/ActivationSystem/unregisterGroup/CallbackInterface.java.i
 data/test/java/security/UnresolvedPermission/Equals.java.i
-data/test/com/sun/crypto/provider/Cipher/KeyWrap/NISTWrapKAT.java.i
+data/src/share/classes/java/lang/management/package.html.i
 data/make/tools/CharsetMapping/MS932.nr.i
 data/src/share/classes/sun/security/x509/InvalidityDateExtension.java.i
 data/src/share/classes/java/text/RBTableBuilder.java.i
 data/src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java.i
-data/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh.i
+data/src/share/classes/sun/awt/image/ImageFetcher.java.i
+data/src/share/classes/sun/security/tools/JarSignerResources_ja.java.i
 data/src/windows/native/sun/windows/awt_FileDialog.cpp.i
 data/src/share/classes/com/sun/rowset/RowSetResourceBundle.properties.i
-data/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.h.i
+data/src/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java.i
 data/src/windows/native/java/net/SocketOutputStream.c.i
 data/src/share/classes/sun/security/krb5/internal/KRBError.java.i
-data/src/share/classes/com/sun/jarsigner/ContentSigner.java.i
+data/src/share/classes/sun/security/util/ByteArrayLexOrder.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_be.properties.i
-data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/rmid.security.policy.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest12_ok.ssl.in.i
+data/src/share/classes/com/sun/jmx/remote/util/ClassLoaderWithRepository.java.i
 data/src/share/classes/java/net/SocksConsts.java.i
 data/test/com/sun/jdi/WatchFramePop.sh.i
-data/src/solaris/classes/sun/awt/X11/XException.java.i
+data/make/mkdemo/applets/SpreadSheet/Makefile.i
+data/src/share/classes/javax/management/remote/JMXPrincipal.java.i
 data/test/sun/tools/jstat/gcNewOutput1.awk.i
 data/src/share/classes/com/sun/net/ssl/X509TrustManager.java.i
 data/make/tools/src/build/tools/charsetmapping/SBCS.java.i
-data/src/share/classes/java/awt/peer/TrayIconPeer.java.i
-data/src/solaris/native/java/net/linux_close.c.i
+data/test/com/sun/net/httpserver/Test13.java.i
+data/test/sun/misc/Cleaner/ExitOnThrow.java.i
 data/src/solaris/sample/dtrace/README.txt.i
-data/src/solaris/classes/sun/java2d/xr/XRBackend.java.i
-data/test/java/util/PluggableLocale/providersrc/CollatorProviderImpl.java.i
+data/test/com/sun/servicetag/FindServiceTags.java.i
+data/src/share/classes/sun/io/CharToByteUnicodeBig.java.i
 data/src/share/classes/sun/audio/NativeAudioStream.java.i
-data/src/share/classes/javax/print/FlavorException.java.i
+data/src/share/native/sun/awt/image/cvutils/README.i
+data/src/share/classes/sun/security/tools/KeyStoreUtil.java.i
 data/test/sun/security/pkcs11/KeyStore/Basic.java.i
 data/src/share/classes/javax/naming/directory/Attribute.java.i
 data/test/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.java.i
-data/make/tools/swing-beans/beaninfo/images/JToolBarColor16.gif.i
-data/test/sun/net/www/protocol/http/UserCookie.java.i
+data/src/share/instrument/Reentrancy.h.i
+data/test/java/beans/XMLEncoder/6777487/TestCheckedCollection.java.i
+data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java.i
-data/src/share/classes/sun/tools/jar/JarException.java.i
+data/test/sun/java2d/XRenderBlitsTest.java.i
 data/test/sun/nio/cs/TestSJIS0213.java.i
-data/src/share/classes/sun/text/resources/FormatData_fr_BE.java.i
-data/make/netbeans/common/windows-sources.ent.i
+data/src/share/classes/sun/util/resources/CalendarData_vi.properties.i
+data/src/share/classes/java/lang/InstantiationException.java.i
 data/test/java/lang/ClassLoader/findSystemClass/Loadee.resource.i
 data/src/windows/classes/sun/java2d/windows/Win32SurfaceData.java.i
 data/src/share/classes/sun/security/jgss/wrapper/GSSNameElement.java.i
-data/src/share/classes/java/nio/file/CopyMoveHelper.java.i
+data/src/share/classes/sun/awt/image/OffScreenImageSource.java.i
 data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanDirConfigTest.java.i
 data/src/share/native/sun/font/layout/LEInsertionList.cpp.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java.i
@@ -6931,37 +6898,34 @@ data/src/solaris/doc/sun/man/man1/ja/xjc.1.i
 data/src/share/classes/java/nio/file/FileAction.java.i
 data/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties.i
 data/test/java/io/Serializable/classDescHooks/Foo.ser.i
-data/src/share/native/sun/font/layout/StateTableProcessor.cpp.i
+data/src/share/classes/com/sun/security/jgss/GSSUtil.java.i
 data/make/netbeans/swing/build.xml.i
-data/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java.i
-data/test/java/util/Vector/SimpleSerialization.java.i
+data/src/share/classes/javax/swing/event/ListDataListener.java.i
 data/test/java/util/TimeZone/ListTimeZones.java.i
 data/src/solaris/native/sun/awt/awt_DrawingSurface.c.i
 data/src/share/classes/java/text/CharacterIteratorFieldDelegate.java.i
-data/src/share/classes/javax/management/openmbean/TabularType.java.i
-data/test/com/sun/crypto/provider/Cipher/RSA/TestOAEP_KAT.java.i
-data/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html.i
+data/src/share/demo/scripting/jconsole-plugin/src/scripts/verbose.js.i
+data/src/solaris/classes/sun/awt/X11/UnsafeXDisposerRecord.java.i
+data/src/share/classes/sun/text/normalizer/Utility.java.i
 data/test/tools/launcher/UnicodeTest.jar.i
 data/test/java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java.i
 data/src/windows/classes/sun/awt/windows/WCanvasPeer.java.i
 data/test/java/io/pathNames/General.java.i
-data/src/share/classes/com/sun/java/util/jar/pack/Package.java.i
+data/test/java/net/ipv6tests/UdpTest.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_es.properties.i
 data/src/share/classes/sun/security/krb5/ServiceName.java.i
-data/test/sun/tools/jstat/jstatSnap2.sh.i
-data/src/windows/native/sun/windows/awt_Win32GraphicsConfig.h.i
-data/test/sun/security/x509/AVA/AVAEqualsHashCode.java.i
+data/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java.i
+data/test/java/beans/Beans/Test4080522.java.i
+data/test/java/beans/PropertyEditor/TestIntegerClassNull.java.i
 data/src/share/classes/sun/util/LocaleServiceProviderPool.java.i
-data/test/java/net/Inet6Address/IPv6Numeric.java.i
-data/test/java/io/Serializable/oldTests/ArrayFields.java.i
-data/src/share/classes/sun/security/jgss/krb5/SubjectComber.java.i
+data/test/java/util/concurrent/FutureTask/Customized.java.i
 data/test/sun/net/www/protocol/http/StreamingOutputStream.java.i
 data/src/share/classes/javax/net/ssl/KeyManagerFactory.java.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/report/IIOComparator.java.i
+data/src/share/classes/java/util/NavigableSet.java.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathTableMetaImpl.java.i
 data/src/share/native/sun/awt/image/cvutils/img_fscolor.h.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so.i
-data/test/java/util/Timer/DelayOverflow.java.i
+data/src/share/native/sun/font/layout/HanLayoutEngine.cpp.i
 data/src/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanMapping.java.i
 data/src/share/classes/sun/management/LockDataConverterMXBean.java.i
@@ -6972,74 +6936,74 @@ data/test/java/nio/channels/ServerSocketChannel/AcceptAddress.java.i
 data/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader.i
 data/test/java/util/ResourceBundle/RB4353454_en.properties.i
 data/test/java/security/Security/ClassLoaderDeadlock/Deadlock.jar.i
-data/src/windows/native/sun/windows/awt_Cursor.h.i
-data/src/share/classes/sun/awt/GlobalCursorManager.java.i
-data/test/tools/pack200/MemoryAllocatorTest.java.i
+data/src/solaris/doc/sun/man/man1/ja/jdb.1.i
 data/src/share/native/sun/misc/GC.c.i
+data/test/sun/net/InetAddress/nameservice/B6442088.java.i
 data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_ASCII_Encoder.java.i
 data/src/share/classes/sun/net/www/content/audio/wav.java.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputStreamTests.java.i
-data/test/java/io/RandomAccessFile/skipBytes/input.txt.i
+data/src/solaris/native/sun/awt/awt_Component.h.i
 data/src/windows/classes/sun/java2d/SurfaceManagerFactory.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmspack.c.i
 data/src/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java.i
 data/make/mkdemo/applets/ArcTest/Makefile.i
 data/test/java/beans/PropertyEditor/TestEnumClass.java.i
-data/src/share/classes/sun/security/smartcardio/PCSC.java.i
+data/src/share/classes/sun/text/resources/FormatData_no_NO_NY.java.i
 data/src/share/classes/com/sun/jdi/Type.java.i
-data/src/share/classes/sun/management/snmp/util/SnmpCachedData.java.i
-data/src/share/native/com/sun/media/sound/Utilities.h.i
+data/test/java/io/FileInputStream/OpsAfterClose.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMeta.java.i
 data/src/share/classes/sun/security/krb5/internal/KrbErrException.java.i
-data/src/share/classes/sun/nio/cs/ext/MS932DB.java.i
+data/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java.i
 data/src/windows/native/sun/awt/utility/rect.h.i
 data/src/share/lib/management/snmp.acl.template.i
 data/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java.i
 data/src/share/classes/java/io/NotActiveException.java.i
-data/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java.i
+data/make/com/sun/tools/attach/FILES_c.gmk.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/ClientHelloRead.java.i
-data/src/share/classes/sun/misc/Compare.java.i
-data/test/tools/launcher/VerifyExceptions.java.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest13_ok.ssl.in.i
+data/src/share/classes/java/lang/reflect/InvocationHandler.java.i
+data/src/share/classes/java/security/GuardedObject.java.i
 data/test/java/security/Permission/NullName.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java.i
+data/src/share/classes/sun/tools/jstat/resources/jstat_unsupported_options.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIProperty.java.i
-data/src/share/classes/javax/print/attribute/standard/MediaSize.java.i
+data/src/share/classes/javax/swing/DebugGraphics.java.i
 data/src/share/classes/javax/naming/PartialResultException.java.i
 data/test/TEST.ROOT.i
 data/src/share/classes/sun/security/pkcs/PKCS10.java.i
 data/test/com/sun/jdi/JDIScaffold.java.i
 data/test/java/util/zip/Available.java.i
 data/src/share/classes/sun/io/CharToByteEUC_TW.java.i
-data/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java.i
+data/src/share/classes/sun/rmi/server/ActivatableRef.java.i
 data/test/com/sun/jdi/ProcessAttachDebugger.java.i
 data/src/share/classes/sun/io/CharToByteISO8859_15.java.i
 data/test/com/sun/net/httpserver/Test6a.java.i
-data/src/share/native/sun/font/DrawGlyphList.c.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U16Func.c.i
+data/src/share/classes/sun/print/ProxyGraphics.java.i
 data/test/java/beans/PropertyEditor/TestIntegerType.java.i
+data/src/windows/lib/tzmappings.i
 data/src/share/classes/com/sun/nio/sctp/ShutdownNotification.java.i
 data/src/share/classes/javax/sound/sampled/Mixer.java.i
-data/src/share/classes/java/security/cert/CertStoreParameters.java.i
-data/src/share/classes/sun/management/MemoryUsageCompositeData.java.i
+data/src/share/classes/sun/awt/ScrollPaneWheelScroller.java.i
+data/src/solaris/back/util_md.h.i
 data/test/java/io/pathNames/win32/RenameDelete.java.i
 data/test/java/lang/ref/Basic.java.i
 data/test/java/awt/Focus/NonFocusableWindowTest/NoEventsTest.java.i
 data/src/share/native/sun/java2d/opengl/OGLRenderQueue.h.i
-data/make/tools/swing-beans/beaninfo/images/JMenuMono16.gif.i
+data/make/tools/src/build/tools/javazic/Gen.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/OriginServer.java.i
 data/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java.i
+data/src/windows/native/sun/java2d/d3d/D3DRuntimeTest.h.i
 data/test/javax/swing/JInternalFrame/Test6325652.java.i
 data/test/javax/xml/crypto/dsig/data/certs/test.jks.i
 data/make/javax/accessibility/Makefile.i
 data/src/share/classes/java/security/spec/KeySpec.java.i
 data/test/java/util/PluggableLocale/CurrencyNameProviderTest.java.i
-data/src/share/classes/sun/jvmstat/monitor/StringMonitor.java.i
 data/make/tools/winver/src/StdAfx.h.i
+data/src/share/classes/sun/font/CompositeFont.java.i
 data/test/sun/net/InetAddress/nameservice/deadlock/ThrowingNameServiceDescriptor.java.i
-data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Encoder.java.i
 data/src/solaris/classes/sun/awt/X11/XScrollbarClient.java.i
-data/src/share/classes/java/security/cert/X509CertSelector.java.i
+data/test/java/lang/Runtime/exec/Space.java.i
 data/test/java/security/AccessControlContext/CheckNullPermission.java.i
-data/make/tools/src/build/tools/charsetmapping/Utils.java.i
+data/src/share/native/sun/awt/image/jpeg/jmemsys.h.i
 data/src/solaris/lib/images/cursors/cursors.properties.i
 data/src/share/classes/java/net/UnknownHostException.java.i
 data/src/share/demo/scripting/jconsole-plugin/src/resources/jconsole.js.i
@@ -7047,129 +7011,127 @@ data/src/share/classes/sun/io/ByteToCharMacCentralEurope.java.i
 data/src/share/classes/java/rmi/AlreadyBoundException.java.i
 data/src/share/classes/javax/swing/plaf/nimbus/ShadowEffect.java.i
 data/src/windows/native/sun/jkernel/kernel_es.rc.i
-data/test/com/sun/security/sasl/pw.properties.i
 data/test/java/io/charStreams/UTF16.java.i
 data/test/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java.i
 data/make/tools/swing-beans/beaninfo/images/JDialogMono32.gif.i
-data/test/java/util/ResourceBundle/Control/StressOut_ko.properties.i
-data/test/java/rmi/reliability/benchmark/bench/serial/Doubles.java.i
-data/test/java/nio/channels/Selector/ReadAfterConnect.java.i
+data/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java.i
+data/src/share/demo/applets/SortDemo/example1.html.i
 data/test/sun/security/pkcs11/nss/lib/linux-amd64/libnssckbi.so.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EmptyExtensionData.java.i
 data/test/java/util/logging/LoggerResourceBundleRace.java.i
 data/test/sun/security/ssl/javax/net/ssl/Fix5070632.java.i
-data/src/share/classes/sun/util/logging/resources/logging_de.properties.i
+data/src/share/classes/com/sun/jndi/ldap/LdapSchemaCtx.java.i
 data/src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java.i
 data/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java.i
-data/src/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java.i
-data/src/share/classes/com/sun/jdi/event/ExceptionEvent.java.i
-data/src/share/classes/java/sql/Types.java.i
-data/test/java/lang/Thread/NullStackTrace.java.i
+data/src/share/classes/sun/util/locale/AsciiUtil.java.i
+data/src/share/classes/sun/reflect/ClassFileAssembler.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/Util.java.i
+data/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java.i
 data/test/javax/management/openmbean/ArrayTypeTest.java.i
-data/test/java/net/DatagramPacket/CheckBoundaries.java.i
 data/src/share/classes/java/util/InputMismatchException.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapCtx.java.i
-data/src/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_it_IT.properties.i
+data/src/share/classes/sun/reflect/FieldAccessorImpl.java.i
 data/test/sun/rmi/rmic/newrmic/equivalence/Apple.java.i
 data/test/java/util/zip/ZipFile/ReadAfterClose.java.i
 data/src/windows/native/sun/windows/awt_ole.cpp.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassListReader.java.i
 data/test/java/net/Socket/Timeout.java.i
-data/src/share/classes/java/nio/file/StandardCopyOption.java.i
+data/make/tools/swing-beans/beaninfo/images/JDialogColor16.gif.i
+data/src/solaris/native/sun/jdga/dgalock.c.i
+data/src/share/classes/sun/security/provider/PolicySpiFile.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java.i
 data/src/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathEntryImpl.java.i
 data/src/share/classes/java/security/interfaces/RSAKey.java.i
 data/src/share/classes/java/nio/StringCharBuffer.java.i
-data/make/com/sun/crypto/provider/Makefile.i
-data/src/share/classes/com/sun/net/ssl/X509KeyManager.java.i
+data/src/solaris/classes/sun/awt/X11/Native.java.i
+data/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval_Stub.java.i
 data/test/sun/text/resources/LocaleData.i
-data/src/share/classes/com/sun/jmx/snmp/internal/SnmpModel.java.i
+data/src/share/classes/javax/sql/package.html.i
 data/test/sun/security/mscapi/PublicKeyInterop.sh.i
 data/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5DesCksumType.java.i
 data/test/sun/java2d/DirectX/SwingOnScreenScrollingTest/SwingOnScreenScrollingTest.java.i
-data/test/sun/nio/cs/FindASCIIRangeCodingBugs.java.i
-data/src/share/native/sun/java2d/opengl/OGLMaskFill.c.i
+data/src/share/classes/sun/io/CharToByteMacCentralEurope.java.i
+data/test/java/util/Collections/T5078378.java.i
 data/src/share/classes/javax/security/sasl/SaslServer.java.i
 data/test/java/nio/channels/FileChannel/Force.java.i
-data/src/share/classes/javax/sound/midi/Track.java.i
+data/src/share/classes/sun/text/resources/CollationData_es.java.i
 data/test/org/openjdk/jigsaw/cli/keystore.jks.i
-data/src/share/classes/java/awt/CardLayout.java.i
+data/make/tools/CharsetMapping/IBM921.map.i
 data/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java.i
 data/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java.i
 data/make/netbeans/j2se/build.properties.i
-data/src/share/native/java/util/zip/zlib-1.1.3/inffast.h.i
-data/test/java/security/cert/CertificateFactory/invalidEncodedCerts/invalidcert.pem.i
+data/src/share/demo/nbproject/project.xml.i
 data/src/share/classes/java/awt/geom/Point2D.java.i
 data/src/share/native/com/sun/media/sound/DirectAudio.h.i
-data/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive_Stub.java.i
+data/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java.i
+data/src/solaris/doc/sun/man/man1/ja/jhat.1.i
 data/src/share/classes/com/sun/media/sound/FastShortMessage.java.i
 data/src/share/classes/java/security/cert/X509CRL.java.i
 data/src/share/classes/java/rmi/server/LogStream.java.i
-data/make/sun/security/jgss/wrapper/mapfile-vers.i
+data/src/share/classes/javax/imageio/plugins/jpeg/package.html.i
 data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileSystem.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java.i
-data/src/share/classes/sun/java2d/cmm/ProfileDeferralMgr.java.i
+data/src/share/demo/jvmti/heapViewer/heapViewer.c.i
 data/test/java/beans/VetoableChangeSupport/Test4092906.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpCounter64.java.i
-data/src/linux/doc/man/ja/xjc.1.i
+data/src/share/classes/java/rmi/activation/ActivationGroupID.java.i
+data/src/share/classes/javax/swing/JFrame.java.i
 data/make/sun/rmi/registry/Makefile.i
 data/test/java/security/cert/CertPathValidator/targetConstraints/sun2labs1.cer.i
 data/test/java/util/Formatter/BasicByteObject.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformInterestedHost.java.i
+data/src/share/classes/javax/management/StandardMBean.java.i
 data/src/share/classes/sun/text/resources/FormatData_en_US.java.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/file.gif.i
 data/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt.i
-data/test/com/sun/jdi/ArrayRangeTest.java.i
-data/src/share/classes/com/sun/jdi/Field.java.i
 data/src/share/demo/applets/WireFrame/models/cube.obj.i
 data/test/java/awt/Focus/NonFocusableWindowTest/Test.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmMemoryMBean.java.i
-data/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.java.i
+data/make/tools/CharsetMapping/MacDingbat.map.i
 data/test/java/io/Serializable/GetField/Write.java.i
 data/src/share/classes/javax/management/NotificationFilter.java.i
-data/test/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorProvider.i
 data/src/share/classes/sun/print/resources/serviceui_fr.properties.i
 data/make/tools/CharsetMapping/MacThai.map.i
-data/test/sun/security/util/DerOutputStream/LocaleInTime.java.i
+data/src/share/sample/nio/server/README.txt.i
 data/test/java/io/Serializable/proxy/replace/Resolved.java.i
 data/src/solaris/classes/sun/awt/X11FontManager.java.i
-data/test/java/lang/instrument/ilib/ClassDump.java.i
-data/src/share/classes/com/sun/tools/jdi/ConnectorImpl.java.i
+data/test/java/util/Locale/data/deflocale.rhel4.i
+data/src/share/classes/javax/swing/colorchooser/SlidingSpinner.java.i
+data/src/share/native/java/lang/fdlibm/src/s_cbrt.c.i
 data/src/share/classes/sun/java2d/opengl/OGLRenderer.java.i
 data/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java.i
 data/test/javax/sound/midi/Gervill/SoftReceiver/Close.java.i
 data/test/sun/net/www/protocol/jar/foo2.jar.i
 data/test/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java.i
-data/test/java/security/KeyRep/RSA.pre.1.5.key.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy34.i
 data/test/java/util/ResourceBundle/Bug6287579.java.i
 data/test/javax/management/modelmbean/ModelMBeanInfoSupport/logging.properties.i
-data/src/share/classes/com/sun/beans/decoder/MethodElementHandler.java.i
+data/src/share/classes/javax/sql/ConnectionEvent.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.h.i
 data/test/java/util/TimeZone/TimeZoneDatePermissionCheck.java.i
-data/test/java/io/Serializable/superclassDataLoss/A.java.i
+data/src/share/demo/jvmti/waiters/waiters.cpp.i
 data/test/javax/swing/JComboBox/6632953/bug6632953.java.i
 data/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java.i
 data/test/java/nio/charset/Charset/NullCharsetName.java.i
-data/src/share/classes/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java.i
+data/make/modules/tools/src/com/sun/classanalyzer/Module.java.i
 data/test/java/rmi/reliability/benchmark/bench/TextReporter.java.i
-data/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java.i
+data/src/share/classes/java/text/DontCareFieldPosition.java.i
+data/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java.i
+data/make/java/net/Makefile.i
 data/src/share/classes/sun/util/resources/CalendarData_zh.properties.i
 data/src/share/classes/java/security/cert/PKIXCertPathChecker.java.i
 data/make/java/hpi/hpi_common.gmk.i
 data/test/javax/swing/SwingWorker/6432565/bug6432565.java.i
-data/test/java/beans/Introspector/Test4144543.java.i
-data/src/share/classes/sun/text/resources/CollationData_de.java.i
+data/test/java/awt/Graphics2D/DrawString/EmptyAttrString.java.i
+data/test/java/util/Locale/Bug4152725.java.i
+data/test/java/net/ipv6tests/TcpTest.java.i
 data/src/share/classes/javax/crypto/CryptoPermission.java.i
-data/src/share/classes/com/sun/crypto/provider/DESKeyGenerator.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java.i
 data/src/windows/native/sun/java2d/d3d/D3DVertexCacher.h.i
 data/src/share/classes/sun/awt/SunGraphicsCallback.java.i
-data/src/solaris/native/sun/awt/Xrandr.h.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ja.properties.i
-data/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java.i
-data/test/java/util/WeakHashMap/ZeroInitCap.java.i
-data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java.i
+data/src/share/classes/javax/naming/InitialContext.java.i
+data/src/solaris/sample/dtrace/hotspot/class_loading_stat.d.i
+data/make/tools/CharsetMapping/EUC_CN.map.i
+data/test/sun/net/sdp/ProbeIB.java.i
 data/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericStreamCipher.java.i
 data/src/share/demo/nbproject/jfc/SwingApplet/build.properties.i
 data/src/share/native/java/lang/fdlibm/src/e_scalb.c.i
@@ -7180,85 +7142,92 @@ data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.propertie
 data/test/java/nio/file/WatchService/grantDirAndTree.policy.i
 data/test/java/beans/PropertyEditor/TestShortType.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM864.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java.i
 data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java.i
+data/src/share/native/sun/management/GarbageCollectorImpl.c.i
 data/make/sun/cmm/lcms/FILES_c_unix.gmk.i
 data/src/share/classes/java/awt/image/renderable/RenderedImageFactory.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/CheckMyTrustedKeystore.java.i
 data/make/netbeans/common/jtreg-sources.ent.i
 data/src/share/classes/sun/nio/cs/HistoricallyNamedCharset.java.i
 data/test/java/net/URL/RestoreURL.java.i
 data/src/share/classes/com/sun/jdi/LocalVariable.java.i
 data/src/share/classes/sun/text/resources/FormatData_ro.java.i
 data/test/java/awt/Graphics2D/DrawString/DrawStrSuper.java.i
-data/src/share/native/sun/java2d/loops/IntArgbBm.c.i
+data/src/share/classes/sun/tools/jconsole/Version.java.template.i
 data/src/share/classes/java/lang/NoSuchFieldException.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ar_KW.properties.i
 data/test/javax/management/MBeanServerFactory/NamedMBeanServerTest.java.i
-data/make/java/util/FILES_java.gmk.i
+data/test/demo/jvmti/hprof/HeapAllTest.java.i
 data/src/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java.i
 data/make/sun/jpeg/FILES_c.gmk.i
 data/src/solaris/classes/sun/awt/X11GraphicsDevice.java.i
 data/src/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java.i
 data/test/java/beans/XMLEncoder/javax_swing_border_StrokeBorder.java.i
 data/src/share/classes/com/sun/beans/decoder/JavaElementHandler.java.i
+data/test/javax/management/openmbean/MBeanFeatureInfoSerialStore.java.i
 data/src/share/native/sun/security/ec/impl/mp_gf2m.c.i
 data/test/java/lang/String/RegionMatches.java.i
 data/src/share/classes/com/sun/crypto/provider/BlowfishCipher.java.i
-data/test/java/io/Serializable/evolution/RenamePackage/run.sh.i
+data/test/sun/invoke/util/ValueConversionsTest.java.i
 data/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java.i
 data/test/java/math/BigInteger/TestValueExact.java.i
-data/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java.i
-data/test/java/beans/XMLEncoder/java_awt_MenuShortcut.java.i
+data/src/share/classes/java/awt/Shape.java.i
+data/src/share/classes/java/nio/charset/CoderMalfunctionError.java.i
+data/src/share/classes/javax/swing/text/LayoutQueue.java.i
+data/src/share/classes/sun/tools/tree/BreakStatement.java.i
 data/src/share/classes/java/rmi/activation/package.html.i
 data/test/java/security/BasicPermission/MixedBasicPermissions.java.i
-data/src/share/classes/javax/print/attribute/standard/JobKOctets.java.i
-data/src/share/classes/sun/io/CharToByteJIS0208_Solaris.java.i
+data/test/sun/security/pkcs11/tls/masterdata.txt.i
+data/src/share/classes/com/sun/tracing/dtrace/ProviderAttributes.java.i
 data/test/sun/tools/jstat/lineCounts3.awk.i
-data/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BezierControlPoint.java.i
-data/src/share/classes/sun/applet/AppletImageRef.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/DoFinalReturnLen.java.i
+data/src/share/classes/sun/tools/tree/NewArrayExpression.java.i
+data/make/mkdemo/jvmti/heapViewer/Makefile.i
 data/src/share/classes/com/sun/jdi/VirtualMachine.java.i
-data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Encoder.java.i
-data/src/share/classes/com/sun/servicetag/SunConnection.java.i
-data/src/share/classes/sun/security/jgss/wrapper/Krb5Util.java.i
-data/src/share/native/sun/java2d/loops/IntArgbBm.h.i
+data/src/share/native/sun/java2d/cmm/lcms/lcms2.h.i
+data/src/share/classes/sun/text/resources/FormatData_fr_BE.java.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Basics.java.i
+data/test/com/sun/crypto/provider/TLS/TestPRF12.java.i
 data/src/share/classes/sun/io/ByteToCharMS936.java.i
 data/src/share/classes/javax/swing/text/AttributeSet.java.i
 data/src/share/classes/sun/misc/Regexp.java.i
 data/test/javax/management/MBeanServer/MBeanExceptionTest.java.i
-data/make/tools/src/build/tools/generatenimbus/SynthModel.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames.properties.i
 data/test/java/awt/font/Threads/FontThread.java.i
 data/src/share/classes/java/util/logging/Filter.java.i
-data/make/jpda/Makefile.i
+data/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java.i
 data/src/windows/native/sun/java2d/d3d/D3DContext.cpp.i
+data/src/share/classes/sun/util/resources/LocaleNames_pl.properties.i
 data/make/sun/jdga/mapfile-vers.i
 data/src/share/classes/javax/swing/text/StyledEditorKit.java.i
 data/make/tools/CharsetMapping/MacUkraine.map.i
+data/src/share/classes/javax/print/Doc.java.i
+data/src/share/classes/java/io/InterruptedIOException.java.i
 data/src/share/classes/javax/management/openmbean/ArrayType.java.i
-data/src/share/classes/javax/sound/midi/spi/MidiFileWriter.java.i
-data/make/tools/src/build/tools/javazic/GenDoc.java.i
+data/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java.i
+data/src/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java.i
+data/src/share/classes/sun/jvmstat/monitor/StringMonitor.java.i
 data/src/share/classes/sun/security/ssl/ProtocolVersion.java.i
-data/src/share/classes/com/sun/imageio/plugins/common/BitFile.java.i
-data/test/java/util/Locale/Bug4184873_id.i
+data/src/share/classes/sun/io/CharToByteCp1145.java.i
+data/src/share/classes/com/sun/jdi/request/EventRequest.java.i
+data/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java.i
 data/make/netbeans/j2se/README.i
-data/src/share/classes/sun/io/CharToByteUnicodeBigUnmarked.java.i
+data/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java.i
 data/test/java/io/Serializable/survivePrematureClose/SurvivePrematureClose.java.i
 data/make/tools/CharsetMapping/ISO_8859_5.map.i
-data/src/share/classes/java/lang/AssertionStatusDirectives.java.i
+data/src/share/classes/java/util/zip/CRC32.java.i
 data/test/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.html.i
-data/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.9.properties.i
 data/src/share/classes/java/nio/charset/CodingErrorAction.java.i
 data/src/share/classes/sun/security/krb5/internal/crypto/crc32.java.i
+data/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java.i
 data/src/share/classes/com/sun/crypto/provider/OutputFeedback.java.i
 data/test/java/awt/List/ScrollOutside/ScrollOut.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/ByteArrayCalls.java.i
 data/make/tools/CharsetMapping/IBM1142.c2b.i
 data/src/windows/native/sun/windows/awt_DrawingSurface.h.i
-data/src/share/classes/sun/misc/JarIndex.java.i
+data/src/share/classes/java/security/spec/ECFieldF2m.java.i
 data/src/share/native/java/lang/fdlibm/src/e_atan2.c.i
-data/src/share/classes/sun/nio/cs/ext/IBM1122.java.i
+data/src/windows/native/sun/windows/awt.h.i
 data/make/tools/CharsetMapping/IBM280.nr.i
 data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultLogConfig.java.i
 data/src/share/classes/java/nio/charset/spi/package.html.i
@@ -7268,72 +7237,70 @@ data/src/windows/classes/sun/nio/ch/Iocp.java.i
 data/src/share/classes/com/sun/jmx/snmp/ThreadContext.java.i
 data/src/share/classes/java/security/Certificate.java.i
 data/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java.i
-data/src/share/classes/com/sun/media/sound/SoftResamplerStreamer.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java.i
 data/test/java/nio/file/Path/delete_on_close.sh.i
-data/src/share/classes/sun/security/ssl/MAC.java.i
-data/test/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.html.i
+data/src/share/classes/javax/naming/spi/package.html.i
+data/src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java.i
 data/test/com/sun/jdi/sde/onion/pickle/Mangle.java.i
 data/src/share/native/sun/awt/medialib/mlib_image_blend_proto.h.i
-data/src/share/classes/com/sun/jdi/ShortType.java.i
-data/test/java/lang/reflect/Method/InheritedInterfaceMethods.java.i
+data/src/share/classes/java/sql/ParameterMetaData.java.i
 data/src/share/native/sun/java2d/cmm/lcms/cmsio1.c.i
 data/test/javax/security/auth/kerberos/ServicePermissionTest.java.i
 data/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties.i
-data/test/java/awt/dnd/URIListBetweenJVMsTest/SourceFileListFrame.java.i
 data/test/java/io/Serializable/classDescFlagConflict/Foo.java.i
-data/src/share/classes/com/oracle/net/Sdp.java.i
 data/src/share/native/java/lang/fdlibm/include/fdlibm.h.i
 data/src/share/classes/sun/font/PhysicalStrike.java.i
 data/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java.i
 data/src/share/classes/sun/jkernel/DownloadManager.java.i
 data/src/share/native/java/net/Inet6Address.c.i
-data/test/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.java.i
+data/src/share/classes/sun/font/FontUtilities.java.i
+data/test/java/beans/Introspector/memory/SimpleClassLoader.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java.i
 data/test/java/nio/channels/DatagramChannel/SRTest.java.i
 data/src/solaris/doc/sun/man/man1/jvisualvm.1.i
 data/src/share/classes/javax/swing/BoxLayout.java.i
-data/src/share/classes/sun/io/ByteToCharMacTurkish.java.i
-data/make/java/nio/addNotices.sh.i
-data/test/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.html.i
+data/src/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java.i
+data/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java.i
+data/src/share/classes/com/sun/imageio/stream/StreamFinalizer.java.i
 data/src/share/classes/java/security/spec/AlgorithmParameterSpec.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java.i
-data/src/share/demo/jfc/Metalworks/Metalworks.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ServerIdentityTest.java.i
+data/src/share/native/sun/awt/medialib/mlib_sys.c.i
+data/src/share/classes/java/io/LineNumberReader.java.i
+data/test/sun/util/resources/Locale/Bug4965260.java.i
 data/make/tools/CharsetMapping/IBM500.nr.i
 data/test/java/util/zip/DeflateIn_InflateOut.java.i
 data/test/sun/security/provider/PolicyFile/CanonPath.java.i
 data/src/share/classes/java/security/MessageDigestSpi.java.i
 data/test/sun/security/provider/SecureRandom/SelfSeed.java.i
 data/src/share/classes/sun/font/CreatedFontTracker.java.i
-data/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java.i
-data/src/share/classes/sun/tools/jconsole/InternalDialog.java.i
+data/src/share/native/java/lang/fdlibm/src/s_tan.c.i
 data/test/javax/management/notification/BroadcasterSupportDeadlockTest.java.i
 data/src/share/native/sun/awt/debug/debug_mem.c.i
-data/test/java/net/Socket/TestClose.java.i
+data/src/share/classes/sun/io/CharToByteJIS0212.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadCpuTimeMonitoring.java.i
-data/test/java/awt/PrintJob/PrintCheckboxTest/PrintCheckboxManualTest.java.i
 data/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ReferenceNotInitializedException.java.i
 data/src/solaris/classes/sun/awt/X11/XMenuPeer.java.i
 data/src/share/classes/sun/security/jgss/spi/GSSCredentialSpi.java.i
 data/src/share/classes/sun/tools/tree/AssignMultiplyExpression.java.i
 data/src/share/native/sun/java2d/loops/TransformHelper.c.i
+data/src/share/demo/jvmti/hprof/hprof_frame.c.i
 data/test/com/sun/jdi/connect/spi/ListConnectors.java.i
 data/test/sun/java2d/cmm/ColorConvertOp/SRGB555.png.i
-data/src/share/classes/sun/nio/cs/Unicode.java.i
+data/test/java/lang/instrument/IsModifiableClassApp.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpUserDataFactory.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java.i
 data/src/windows/native/java/net/SocketInputStream.c.i
 data/src/share/classes/com/sun/tracing/dtrace/NameAttributes.java.i
 data/src/share/classes/java/security/SignatureSpi.java.i
-data/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java.i
-data/src/share/classes/javax/sound/sampled/AudioFileFormat.java.i
+data/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine.i
+data/src/share/classes/com/sun/media/sound/ModelOscillatorStream.java.i
 data/src/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java.i
 data/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java.i
 data/src/share/native/sun/awt/image/jpeg/jfdctfst.c.i
 data/src/share/classes/javax/management/InvalidAttributeValueException.java.i
-data/test/java/util/Locale/data/deflocale.input.i
 data/src/share/classes/javax/print/attribute/standard/package.html.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java.i
+data/src/share/classes/java/lang/reflect/package-info.java.i
+data/test/java/security/cert/CertificateFactory/SlowStream.java.i
 data/test/java/awt/Focus/FrameJumpingToMouse/FrameJumpingToMouse.java.i
 data/src/share/classes/com/sun/java/util/jar/pack/Fixups.java.i
 data/test/java/awt/regtesthelpers/process/ProcessCommunicator.java.i
@@ -7341,10 +7308,11 @@ data/src/share/native/java/util/zip/zip_util.h.i
 data/src/share/classes/javax/smartcardio/TerminalFactory.java.i
 data/src/share/classes/java/security/AllPermission.java.i
 data/src/share/classes/java/lang/management/RuntimeMXBean.java.i
-data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipInfo.java.i
+data/src/share/classes/javax/security/auth/login/AccountLockedException.java.i
 data/src/windows/native/sun/net/www/protocol/http/NTLMAuthSequence.c.i
 data/src/share/back/StackFrameImpl.h.i
 data/src/share/classes/com/sun/beans/decoder/ShortElementHandler.java.i
+data/src/solaris/classes/sun/awt/X11/XWrapperBase.java.i
 data/src/share/classes/com/sun/media/sound/SoftAudioPusher.java.i
 data/make/tools/classanalyzer/nbproject/project.xml.i
 data/src/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java.i
@@ -7353,55 +7321,54 @@ data/make/tools/swing-beans/beaninfo/images/JFrameMono32.gif.i
 data/src/share/classes/java/awt/datatransfer/DataFlavor.java.i
 data/test/java/util/Collections/ReplaceAll.java.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java.i
-data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Util.c.i
-data/test/java/lang/Class/forName/classes/right-square.class.i
+data/src/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java.i
 data/test/com/sun/jdi/MonitorFrameInfo.java.i
-data/test/java/nio/channels/SocketChannel/Open.sh.i
+data/test/java/security/BasicPermission/SerialVersion.1.2.1.i
 data/src/share/classes/sun/java2d/pipe/hw/AccelDeviceEventListener.java.i
 data/test/sun/security/tools/keytool/KeyToolTest.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_43.c.i
 data/src/share/classes/sun/reflect/AccessorGenerator.java.i
-data/src/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java.i
+data/src/share/classes/javax/print/event/PrintEvent.java.i
 data/test/sun/net/www/http/HttpClient/OpenServer.policy.i
 data/src/share/native/java/util/zip/zlib-1.2.3/zconf.h.i
 data/test/com/sun/jdi/ZZZcleanup.sh.i
-data/test/java/lang/reflect/Proxy/returnTypes/GetCloneable.java.i
+data/src/share/classes/com/sun/beans/decoder/ValueObjectImpl.java.i
 data/src/share/classes/javax/swing/text/html/HTML.java.i
 data/make/java/zip/FILES_c.gmk.i
 data/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java.i
 data/src/solaris/classes/sun/awt/X11/XConstants.java.i
-data/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java.i
-data/test/java/lang/Runtime/exec/ConcurrentRead.java.i
-data/make/docs/Makefile.i
-data/src/linux/doc/man/ja/serialver.1.i
+data/src/share/classes/sun/java2d/pisces/Dasher.java.i
+data/src/solaris/classes/sun/awt/X11/InfoWindow.java.i
+data/src/share/classes/javax/print/attribute/standard/DialogTypeSelection.java.i
+data/src/share/classes/javax/swing/table/TableCellRenderer.java.i
+data/src/share/classes/sun/nio/ch/SctpMessageInfoImpl.java.i
 data/src/share/classes/javax/swing/event/HyperlinkListener.java.i
 data/src/solaris/doc/sun/man/man1/ja/javah.1.i
-data/make/sun/font/reorder-sparcv9.i
 data/src/share/classes/java/util/EmptyStackException.java.i
-data/src/share/classes/java/awt/doc-files/modal-example3.gif.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U16Func.c.i
+data/test/java/io/Serializable/enum/missingConstant/Read.java.i
 data/src/share/classes/javax/print/PrintService.java.i
-data/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java.i
-data/src/share/classes/com/sun/jndi/ldap/SimpleClientId.java.i
+data/src/share/demo/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml.i
+data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedMap.java.i
+data/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html.i
 data/make/tools/swing-beans/beaninfo/images/JColorChooserColor32.gif.i
-data/src/share/demo/nbproject/jfc/TransparentRuler/build.xml.i
+data/src/solaris/native/sun/security/smartcardio/MUSCLE/COPYING.i
 data/src/share/classes/com/sun/beans/finder/MethodFinder.java.i
 data/src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributes.java.i
 data/src/share/classes/sun/management/ThreadImpl.java.i
+data/src/share/classes/sun/tools/java/BinaryMember.java.i
 data/src/share/native/sun/font/layout/OpenTypeLayoutEngine.h.i
-data/src/share/classes/org/openjdk/jigsaw/cli/Signer.java.i
 data/test/java/net/ResponseCache/file2.1.i
-data/test/java/io/charStreams/StringConvert.java.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java.i
 data/src/share/classes/sun/tools/jconsole/ThreadTab.java.i
 data/test/java/net/URLConnection/RedirectLimit.java.i
 data/make/mkdemo/jfc/Java2D/Makefile.i
-data/src/share/classes/sun/tools/jstat/SyntaxException.java.i
+data/test/java/awt/Multiscreen/WPanelPeerPerf/WPanelPeerPerf.java.i
 data/test/sun/java2d/cmm/ColorConvertOp/ColorSpaceCvtCrashTest/ColorSpaceCvtCrashTest.java.i
 data/test/java/math/BigInteger/ExtremeShiftingTests.java.i
 data/src/share/demo/applets/MoleculeViewer/models/benzene.xyz.i
-data/src/share/native/java/lang/fdlibm/src/w_acos.c.i
-data/src/linux/doc/man/ja/jinfo.1.i
-data/src/share/classes/com/sun/media/sound/SimpleSoundbank.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ko_KR.properties.i
+data/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh.i
 data/src/share/classes/com/sun/jndi/ldap/LdapRequest.java.i
 data/src/share/classes/java/awt/font/TextLayout.java.i
 data/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c.i
@@ -7412,58 +7379,59 @@ data/test/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCorePoolSize.java
 data/test/sun/java2d/DirectX/InfiniteValidationLoopTest/InfiniteValidationLoopTest.java.i
 data/src/share/classes/sun/awt/resources/awt_zh_CN.properties.i
 data/src/share/classes/sun/text/resources/FormatData_es_DO.java.i
-data/test/java/beans/XMLEncoder/java_sql_Time.java.i
 data/src/share/classes/java/rmi/MarshalException.java.i
-data/src/share/classes/javax/crypto/spec/package.html.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/TestEnvironment.java.i
 data/src/share/classes/java/util/ServiceConfigurationError.java.i
-data/src/share/classes/sun/management/CompilerThreadStat.java.i
+data/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java.i
 data/src/share/classes/sun/io/CharToByteCp1122.java.i
 data/src/share/classes/sun/net/www/protocol/https/Handler.java.i
 data/make/tools/swing-beans/beaninfo/images/BorderColor16.gif.i
-data/src/share/classes/javax/imageio/spi/ImageReaderSpi.java.i
 data/src/share/classes/sun/security/pkcs11/Session.java.i
 data/src/share/classes/sun/security/krb5/internal/crypto/Des.java.i
 data/test/com/sun/crypto/provider/KeyAgreement/DHGenSecretKey.java.i
-data/test/java/lang/ThreadLocal/Basic.java.i
+data/test/java/util/zip/pkware123456789012345.zip.i
 data/src/windows/native/java/io/WinNTFileSystem_md.c.i
+data/src/share/classes/javax/security/auth/callback/ConfirmationCallback.java.i
 data/test/java/rmi/server/serverStackTrace/Impl1_Stub.java.i
-data/src/share/classes/java/beans/Introspector.java.i
+data/src/share/classes/com/sun/security/sasl/CramMD5Server.java.i
+data/src/share/classes/sun/net/www/protocol/http/NegotiateCallbackHandler.java.i
 data/test/java/util/concurrent/locks/ReentrantReadWriteLock/Bug6571733.java.i
 data/test/java/net/URLConnection/ZeroContentLength.java.i
 data/test/javax/swing/JColorChooser/Test6559154.java.i
-data/test/sun/security/mscapi/KeyStoreCompatibilityMode.java.i
-data/test/javax/script/ProviderTest.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/UnrecognizedOptionException.java.i
 data/src/share/classes/java/io/StringReader.java.i
+data/src/share/back/eventFilter.c.i
 data/src/share/classes/sun/io/ByteToCharJIS0201.java.i
 data/test/com/sun/jdi/RepStep.java.i
-data/src/share/classes/javax/swing/InputMap.java.i
+data/src/share/classes/sun/jvmstat/monitor/VmIdentifier.java.i
 data/src/share/classes/javax/management/MBeanAttributeInfo.java.i
 data/src/windows/classes/sun/nio/ch/FileDispatcherImpl.java.i
 data/src/share/native/sun/awt/image/jpeg/jdtrans.c.i
-data/src/share/classes/sun/misc/resources/Messages_zh_CN.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/Result.java.i
 data/src/share/classes/javax/sql/DataSource.java.i
 data/src/share/classes/javax/swing/text/doc-files/paragraph.gif.i
 data/src/share/classes/javax/net/ssl/ManagerFactoryParameters.java.i
 data/src/share/classes/sun/awt/image/ImageFetchable.java.i
-data/src/share/classes/sun/io/CharToByteCp437.java.i
-data/src/solaris/classes/sun/java2d/xr/XIDGenerator.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpEngineId.java.i
+data/src/windows/native/sun/windows/awt_ole.h.i
+data/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.java.i
+data/test/sun/nio/cs/OLD/DBCS_IBM_ASCII_Encoder.java.i
 data/test/sun/security/provider/certpath/CertId/interCA.der.i
-data/src/share/classes/javax/imageio/ImageReadParam.java.i
+data/make/tools/CharsetMapping/IBM297.map.i
 data/src/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java.i
 data/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java.i
 data/test/java/net/URLClassLoader/closetest/test1/com/foo/TestClass.java.i
 data/test/java/beans/XMLDecoder/spec/TestJava.java.i
 data/src/share/classes/com/sun/tools/jconsole/package.html.i
-data/test/java/io/Serializable/oldTests/ArrayOpsTest.java.i
+data/test/sun/nio/cs/OLD/X11GB2312_OLD.java.i
 data/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java.i
 data/test/sun/security/pkcs11/PKCS11Test.java.i
 data/make/sun/text/FILES_java.gmk.i
 data/test/java/awt/dnd/ImageDecoratedDnDInOut/DnDSource.java.i
 data/test/javax/management/eventService/PublishTest.java.i
-data/src/windows/native/sun/windows/awt_Brush.cpp.i
+data/test/java/io/Serializable/subclass/Allow.policy.i
 data/src/share/classes/sun/io/ByteToCharCp1383.java.i
-data/test/java/awt/Component/isLightweightCrash/StubPeerCrash.java.i
 data/test/sun/misc/Cleaner/exitOnThrow.sh.i
 data/test/com/sun/jdi/ModificationWatchpoints.java.i
 data/test/java/lang/management/ManagementFactory/StateTest.java.i
@@ -7480,53 +7448,48 @@ data/src/share/classes/com/sun/jndi/ldap/LdapAttribute.java.i
 data/src/share/classes/com/sun/nio/sctp/Association.java.i
 data/test/sun/security/tools/jarsigner/AlgOptions.jar.i
 data/test/java/lang/Runtime/shutdown/ShutdownHooks.java.i
-data/src/share/classes/org/openjdk/jigsaw/package-info.java.i
+data/src/share/demo/nbproject/jfc/Metalworks/nbproject/jdk.xml.i
 data/test/sun/security/pkcs11/rsa/TestKeyFactory.java.i
-data/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java.i
 data/test/java/beans/PropertyChangeSupport/TestEquals.java.i
-data/src/share/native/sun/awt/image/jpeg/jidctfst.c.i
 data/src/solaris/classes/sun/awt/X11/XAWTLookAndFeel.java.i
 data/test/javax/management/ObjectName/ValueOfTest.java.i
-data/src/share/classes/java/nio/channels/MulticastChannel.java.i
-data/src/share/classes/com/sun/tools/jdi/LongValueImpl.java.i
-data/src/share/classes/com/sun/rowset/internal/XmlResolver.java.i
-data/src/share/classes/javax/print/attribute/standard/PDLOverrideSupported.java.i
+data/src/share/classes/sun/text/resources/FormatData_ar_IQ.java.i
+data/test/java/lang/instrument/RedefineMethodAddInvokeTarget_1.java.i
+data/make/netbeans/common/shared.xml.i
+data/make/sun/tracing/dtrace/mapfile-vers.i
+data/make/sun/rmi/rmi/Makefile.i
+data/make/docs/CORE_PKGS.gmk.i
 data/test/java/nio/charset/Charset/RegisteredCharsets.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/DimensionMapper.java.i
-data/src/share/classes/sun/nio/cs/ext/JISAutoDetect.java.i
+data/src/windows/classes/sun/awt/windows/awtLocalization_ko.properties.i
 data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread_Stub.java.i
 data/src/share/classes/javax/sql/ConnectionPoolDataSource.java.i
 data/src/share/native/sun/security/ec/impl/mpi.h.i
-data/make/sun/rmi/oldtools/FILES_java.gmk.i
-data/src/share/classes/sun/misc/ExtensionInstallationException.java.i
+data/src/share/classes/sun/net/NetProperties.java.i
 data/src/share/classes/java/awt/event/HierarchyBoundsListener.java.i
 data/make/java/redist/Makefile.i
 data/src/share/demo/applets/SortDemo/SortItem.java.i
-data/src/share/classes/com/sun/media/sound/RealTimeSequencer.java.i
-data/make/tools/GenerateCharacter/Makefile.i
-data/test/java/io/DataInputStream/ReadFully.java.i
-data/test/java/rmi/activation/ActivateFailedException/activateFails/group.security.policy.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html.i
+data/test/javax/security/auth/Subject/Synch.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java.i
 data/test/java/io/Serializable/illegalHandle/Test.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathTableMetaImpl.java.i
+data/src/share/classes/org/ietf/jgss/GSSCredential.java.i
 data/test/javax/management/notification/NotifInfoTest.java.i
 data/test/java/security/KeyRep/RSA.1.5.key.i
-data/src/share/classes/sun/nio/cs/ISO_8859_2.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java.i
+data/test/java/math/BigInteger/CompareToTests.java.i
 data/src/share/classes/javax/swing/text/Segment.java.i
-data/test/sun/nio/cs/ISCIITest.java.i
-data/test/java/nio/file/Path/FileAttributes.java.i
-data/test/sun/util/calendar/Bug6653944.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/Token.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java.i
 data/test/com/sun/net/httpserver/bugs/B6529200.java.i
-data/src/share/classes/com/sun/media/sound/SF2LayerRegion.java.i
+data/src/share/classes/javax/crypto/spec/DHPrivateKeySpec.java.i
 data/src/share/classes/javax/swing/plaf/metal/icons/sortDown.png.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/ParseException.java.i
-data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy.i
+data/test/com/sun/tools/attach/PermissionTests.sh.i
+data/make/tools/CharsetMapping/IBM1383.map.i
 data/src/share/native/java/lang/fdlibm/src/s_finite.c.i
-data/src/share/classes/javax/print/event/package.html.i
-data/src/solaris/classes/sun/nio/fs/UnixPath.java.i
+data/src/share/classes/com/sun/tracing/ProbeName.java.i
+data/src/solaris/native/sun/java2d/loops/mlib_v_ImageXor.c.i
 data/src/share/demo/jfc/TableExample/JDBCAdapter.java.i
+data/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java.i
 data/src/share/classes/javax/swing/BorderFactory.java.i
 data/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java.i
 data/make/common/Defs-windows.gmk.i
@@ -7535,55 +7498,54 @@ data/src/share/classes/sun/management/GcInfoBuilder.java.i
 data/make/tools/src/build/tools/dtdbuilder/DTDParser.java.i
 data/src/share/classes/sun/io/CharToByteMS950_HKSCS.java.i
 data/src/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM930.java.i
-data/src/share/classes/java/awt/MenuItem.java.i
+data/src/share/native/sun/java2d/loops/ByteIndexed.h.i
+data/src/share/classes/sun/util/resources/CalendarData_en_IE.properties.i
 data/test/java/nio/channels/SocketChannel/Write.java.i
 data/make/tools/CharsetMapping/IBM1097.map.i
-data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM284.java.i
 data/src/share/native/sun/font/layout/SubstitutionLookups.cpp.i
 data/test/com/sun/jdi/sde/TemperatureTable.sde.i
 data/src/share/classes/java/awt/MultipleGradientPaintContext.java.i
 data/test/sun/security/x509/AVA/BadName.java.i
 data/src/share/classes/javax/naming/Name.java.i
-data/test/sun/management/windows/README.i
+data/test/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java.i
 data/src/share/demo/jvmti/hprof/hprof_monitor.h.i
-data/test/org/openjdk/jigsaw/ModuleInfoBuilder.java.i
-data/test/java/lang/Throwable/LocalizedMessage.java.i
+data/src/share/demo/java2d/J2DBench/README.i
+data/src/share/classes/javax/swing/text/rtf/RTFAttributes.java.i
 data/src/share/classes/javax/swing/JTextArea.java.i
-data/test/com/sun/jdi/RefTypes.java.i
 data/src/share/classes/sun/applet/resources/MsgAppletViewer.java.i
 data/test/java/beans/Introspector/4520754/FooBar.java.i
-data/src/share/native/sun/awt/libpng/pngwio.c.i
+data/src/share/classes/sun/security/provider/certpath/X509CertPath.java.i
 data/src/share/classes/sun/java2d/DisposerRecord.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-delayed.png.i
+data/src/share/classes/java/rmi/package.html.i
 data/test/javax/swing/JPopupMenu/6495920/bug6495920.java.i
 data/src/share/demo/jvmti/compiledMethodLoad/compiledMethodLoad.c.i
 data/test/com/sun/servicetag/TestLoadFromXML.java.i
 data/test/javax/swing/JViewport/6953396/bug6953396.java.i
 data/src/share/classes/com/sun/crypto/provider/PBEParameters.java.i
 data/src/share/classes/javax/crypto/KeyGenerator.java.i
-data/src/share/classes/sun/misc/ProxyGenerator.java.i
-data/src/share/classes/sun/security/provider/SystemSigner.java.i
+data/test/java/security/UnresolvedPermission/Equals.policy.i
 data/src/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java.i
 data/test/java/nio/channels/DatagramChannel/IsBound.java.i
 data/test/java/awt/Component/F10TopToplevel/F10TopToplevel.html.i
 data/src/share/classes/javax/security/auth/login/LoginContext.java.i
-data/make/sun/jar/Makefile.i
-data/src/share/classes/javax/swing/event/PopupMenuListener.java.i
+data/make/tools/CharsetMapping/IBM420.c2b.i
+data/test/java/util/Vector/LastIndexOf.java.i
 data/src/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedMap.java.i
 data/src/share/classes/sun/util/resources/CalendarData_sv.properties.i
-data/test/sun/security/provider/PolicyParser/ExtDirs1.policy.i
-data/make/tools/CharsetMapping/IBM856.map.i
+data/test/com/sun/jdi/SuspendNoFlagTest.sh.i
 data/test/java/security/AccessControlContext/FailureDebugOption.java.i
+data/src/share/classes/com/sun/management/UnixOperatingSystemMXBean.java.i
 data/src/solaris/classes/sun/awt/X11/XDataTransferer.java.i
 data/test/com/sun/crypto/provider/Cipher/PBE/PBEParametersTest.java.i
 data/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java.i
 data/test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java.i
 data/make/org/ietf/jgss/FILES_java.gmk.i
-data/src/solaris/doc/sun/man/man1/ja/serialver.1.i
+data/src/share/classes/sun/security/krb5/internal/UDPClient.java.i
+data/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java.i
 data/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java.i
 data/test/javax/security/auth/SubjectDomainCombiner/Regression.policy.i
 data/test/sun/nio/cs/OLD/X11GBK_OLD.java.i
@@ -7594,14 +7556,17 @@ data/src/share/classes/sun/awt/AWTAutoShutdown.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Fp.c.i
 data/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/jane2steve.cer.i
 data/test/java/beans/Introspector/Test4896879.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_en_US.properties.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java.i
+data/src/share/classes/com/sun/media/sound/JSSecurityManager.java.i
+data/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form.i
+data/test/com/sun/jdi/PopSynchronousTest.java.i
 data/src/share/classes/sun/java2d/opengl/OGLDrawImage.java.i
-data/test/sun/tools/jstat/lineCounts2.awk.i
 data/test/com/sun/net/httpserver/Test11.java.i
 data/test/sun/security/provider/PolicyParser/BogusGrants.java.i
-data/src/share/demo/applets/SortDemo/example1.html.i
-data/test/java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java.i
+data/src/share/native/sun/font/layout/LELanguages.h.i
+data/test/com/sun/crypto/provider/TLS/prfdata.txt.i
+data/src/share/classes/sun/io/ByteToCharCp1097.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java.i
+data/src/windows/native/sun/java2d/d3d/D3DPaints.cpp.i
 data/test/java/util/Locale/data/deflocale.jds3.i
 data/src/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java.i
 data/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java.i
@@ -7612,386 +7577,368 @@ data/test/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java.
 data/src/share/classes/java/rmi/RMISecurityException.java.i
 data/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java.i
 data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfigMXBean.java.i
-data/make/tools/swing-beans/SwingBeanInfo.template.i
+data/src/share/classes/sun/util/resources/CurrencyNames_be_BY.properties.i
 data/make/tools/swing-beans/beaninfo/images/JRootPaneColor32.gif.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java.i
+data/test/java/io/Serializable/available/Available.java.i
 data/test/javax/management/remote/mandatory/subjectDelegation/policy31.i
 data/test/sun/security/tools/jarsigner/checkusage.sh.i
-data/src/share/native/sun/awt/libpng/pngrutil.c.i
+data/src/share/classes/sun/java2d/Surface.java.i
 data/test/java/lang/Double/NaNInfinityParsing.java.i
-data/src/share/classes/com/sun/jmx/namespace/serial/RoutingOnlyProcessor.java.i
+data/test/java/awt/Component/isLightweightCrash/StubPeerCrash.java.i
 data/test/java/security/ProtectionDomain/Recursion.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/RSAExport.java.i
+data/src/share/classes/javax/management/event/EventReceiver.java.i
 data/test/java/net/MulticastSocket/TestDefaults.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/GoodProvider.java.i
+data/src/share/classes/sun/rmi/rmic/IndentingWriter.java.i
 data/test/com/sun/security/auth/login/ConfigFile/IllegalURL.java.i
-data/test/java/lang/String/IndexOfEmptyInEmpty.java.i
+data/src/share/classes/sun/security/util/DerInputBuffer.java.i
 data/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.keystore.i
-data/src/share/classes/java/util/concurrent/CancellationException.java.i
-data/test/java/io/File/SetLastModified.java.i
+data/src/linux/doc/man/schemagen.1.i
+data/src/windows/native/sun/nio/ch/FileDispatcher.c.i
 data/src/share/classes/sun/print/BackgroundServiceLookup.java.i
-data/src/share/classes/javax/swing/text/rtf/package.html.i
+data/make/netbeans/common/file-view.ent.i
 data/test/javax/xml/crypto/dsig/data/signature-x509-crt.xml.i
-data/src/solaris/classes/java/net/DefaultDatagramSocketImplFactory.java.i
+data/test/java/util/concurrent/locks/ReentrantLock/LoopHelpers.java.i
 data/src/windows/classes/sun/font/NativeFont.java.i
-data/test/javax/xml/crypto/dsig/data/signature-external-b64-dsa.xml.i
 data/src/share/classes/javax/management/namespace/JMXNamespaceMBean.java.i
 data/test/java/nio/channels/SocketChannel/CloseRegisteredChannel.java.i
 data/make/tools/swing-beans/beaninfo/images/JColorChooserColor16.gif.i
 data/test/java/security/ProtectionDomain/CheckWhatYouGet.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppOutputStream/NoExceptionOnClose.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java.i
-data/src/share/classes/java/net/Inet4AddressImpl.java.i
-data/test/java/awt/PrintJob/Text/StringWidth.java.i
+data/test/sun/security/krb5/NegativeNonce.java.i
+data/src/share/classes/java/nio/file/WatchEvent.java.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputTests.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java.i
 data/src/solaris/classes/sun/awt/motif/MGlobalCursorManager.java.i
 data/make/sun/jpeg/reorder-i586.i
-data/test/java/awt/FullScreen/SetFSWindow/FSFrame.java.i
+data/src/share/native/sun/security/ec/mp_gf2m.h.i
 data/make/com/sun/jndi/rmi/Makefile.i
 data/test/java/math/BigDecimal/EqualsTests.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathTableMeta.java.i
-data/test/java/security/Security/removing/RemoveStaticProvider.java.i
 data/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh.i
 data/src/share/classes/sun/util/resources/LocaleNames_pt_BR.properties.i
 data/src/solaris/classes/sun/awt/motif/MChoicePeer.java.i
-data/make/com/sun/demo/jvmti/Makefile.i
-data/test/javax/xml/crypto/dsig/data/envelope.xml.i
-data/src/share/classes/sun/io/CharToByteCp424.java.i
+data/test/sun/pisces/JoinMiterTest.java.i
+data/test/java/lang/System/Available.java.i
+data/test/java/util/Collections/AddAll.java.i
 data/test/java/io/Serializable/oldTests/ArrayTest.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c.i
+data/src/share/native/sun/java2d/loops/AlphaMacros.c.i
 data/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java.i
-data/src/share/bin/defines.h.i
 data/src/share/classes/sun/security/util/AuthResources_zh_TW.java.i
 data/src/share/native/org/openjdk/jigsaw/BootLoader.c.i
 data/src/share/demo/jfc/Font2DTest/resources/resource.data.i
 data/src/share/classes/sun/net/TelnetOutputStream.java.i
 data/src/share/classes/sun/net/www/protocol/netdoc/Handler.java.i
 data/test/java/rmi/reliability/benchmark/bench/rmi/RemoteObjArrayCalls.java.i
-data/src/share/classes/javax/imageio/spi/IIORegistry.java.i
+data/test/sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java.i
 data/src/share/classes/java/util/jar/JarInputStream.java.i
+data/test/java/io/Serializable/oldTests/WritePrimitive.java.i
 data/src/share/demo/jvmti/hprof/hprof_frame.h.i
-data/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java.i
+data/test/sun/security/krb5/auto/OkAsDelegate.java.i
 data/src/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java.i
 data/test/java/text/BreakIterator/MirroredBreakIterator.java.i
 data/src/solaris/classes/sun/awt/windows/ThemeReader.java.i
-data/src/share/classes/sun/io/CharToByteCp860.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_en_SG.properties.i
+data/test/com/sun/jdi/connect/spi/NullTransportService.java.i
 data/src/share/sample/scripting/scriptpad/src/resources/Main.js.i
+data/test/sun/nio/cs/StrCodingBenchmark.java.i
 data/test/sun/management/jmxremote/bootstrap/management_ssltest08_ko.properties.in.i
-data/make/tools/CharsetMapping/IBM935.c2b.i
+data/test/sun/nio/cs/TestUTF8.java.i
 data/test/javax/naming/ldap/LdapName/CompareToEqualsTests.java.i
 data/src/share/classes/java/awt/doc-files/AWTThreadIssues.html.i
-data/src/share/classes/java/text/Collator.java.i
-data/src/solaris/classes/sun/awt/motif/MWindowPeer.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.h.i
+data/make/modules/modules.config.i
 data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor_Stub.java.i
 data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileSystemProvider.java.i
 data/src/share/classes/sun/security/ssl/AppOutputStream.java.i
 data/test/com/sun/jdi/LineNumberOnBraceTest.java.i
 data/test/sun/security/provider/certpath/ReverseBuilder/prjMcrl.i
-data/test/javax/management/remote/mandatory/notif/RMINotifTest.java.i
-data/src/share/native/sun/java2d/SurfaceData.c.i
+data/test/sun/tools/jhat/jmap.bin.i
 data/test/javax/management/mxbean/GenericArrayTypeTest.java.i
 data/src/share/classes/sun/awt/im/InputMethodPopupMenu.java.i
 data/make/sun/rmi/oldtools/Makefile.i
 data/src/share/classes/java/awt/TexturePaintContext.java.i
 data/test/java/nio/charset/coders/Util.java.i
-data/test/java/io/File/GetParent.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpGauge.java.i
+data/src/share/native/sun/nio/ch/nio.h.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java.i
 data/test/demo/jvmti/gctest/Gctest.java.i
-data/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageConv_D64nw.c.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png.i
-data/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java.i
-data/src/share/native/sun/awt/libpng/pngdebug.h.i
+data/src/share/classes/sun/swing/SwingUtilities2.java.i
+data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall_Stub.java.i
+data/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithUnexpectedRID.java.i
 data/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecuritySubSystem.java.i
 data/src/share/classes/javax/xml/crypto/dsig/Reference.java.i
-data/test/java/nio/channels/DatagramChannel/Sender.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/XTree.java.i
+data/test/sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java.i
 data/test/tools/pack200/pack200-verifier/src/xmlkit/ClassWriter.java.i
-data/test/sun/security/tools/jarsigner/Test4431684.java.i
-data/src/windows/native/sun/windows/security_warning_bw.ico.i
-data/src/share/classes/javax/swing/text/TabStop.java.i
+data/test/tools/launcher/ExecutionEnvironment.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java.i
+data/test/java/net/URL/SpecifyHandler.java.i
 data/test/org/openjdk/jigsaw/_PublishedRepository.java.i
-data/test/java/rmi/reliability/juicer/ApplicationServer.java.i
+data/test/sun/security/provider/certpath/ReverseBuilder/mgrMcrl.i
 data/src/linux/doc/man/ja/appletviewer.1.i
 data/src/share/classes/javax/swing/undo/doc-files/UndoManager-1.gif.i
 data/test/java/awt/Focus/FrameMinimizeTest/FrameMinimizeTest.java.i
-data/test/java/nio/charset/CharsetEncoder/CanEncode.java.i
+data/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java.i
 data/test/java/lang/Integer/BitTwiddle.java.i
 data/make/com/sun/nio/sctp/FILES_c.gmk.i
-data/test/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java.i
-data/make/tools/generate_break_iterator/Makefile.i
+data/test/sun/net/www/protocol/jar/B5105410.java.i
 data/test/java/io/Serializable/resolveClass/deserializeButton/Test.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiSplitPaneUI.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/PerThreadGroupPool.java.i
 data/test/sun/security/krb5/auto/IgnoreChannelBinding.java.i
-data/src/share/classes/java/util/Observable.java.i
+data/src/share/classes/sun/reflect/UnsafeStaticCharacterFieldAccessorImpl.java.i
 data/test/java/awt/Focus/ChoiceFocus/ChoiceFocus.java.i
 data/make/com/sun/net/httpserver/Makefile.i
-data/src/share/classes/sun/io/ByteToCharDBCS_ASCII.java.i
-data/src/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java.i
+data/test/java/lang/Character/Scripts.txt.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ar_BH.properties.i
 data/src/share/sample/scripting/scriptpad/src/scripts/memory.bat.i
-data/src/share/classes/sun/util/resources/CalendarData_es_US.properties.i
+data/test/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java.i
 data/test/sun/nio/cs/X11CNS11643P1.java.i
 data/test/java/lang/annotation/package-info.java.i
-data/src/share/classes/sun/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java.i
+data/test/com/sun/jdi/ExclusiveBind.java.i
 data/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java.i
-data/src/share/classes/javax/swing/event/EventListenerList.java.i
-data/src/share/classes/java/rmi/server/Unreferenced.java.i
-data/src/share/classes/sun/rmi/transport/Endpoint.java.i
+data/src/share/classes/java/util/Queue.java.i
+data/src/windows/resource/icons/awt.ico.i
+data/test/java/io/Serializable/defaultReadObjectCNFException/DefaultReadObjectCNFException.java.i
 data/test/com/sun/jdi/EarlyReturnNegativeTest.java.i
-data/src/share/classes/sun/misc/SharedSecrets.java.i
-data/src/share/classes/javax/swing/JLayeredPane.java.i
+data/src/share/classes/javax/management/AttributeChangeNotification.java.i
 data/test/sun/security/util/HostnameMatcher/cert1.crt.i
 data/src/share/classes/sun/security/ssl/HandshakeOutStream.java.i
 data/test/java/util/prefs/RemoveReadOnlyNode.java.i
-data/src/windows/native/java/net/net_util_md.h.i
 data/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java.i
 data/src/share/classes/javax/swing/plaf/TableUI.java.i
 data/src/linux/doc/man/jar.1.i
-data/test/java/security/cert/CertificateFactory/GenerateCertificatesEmptyCollection.java.i
 data/src/share/classes/sun/security/krb5/internal/KDCReqBody.java.i
 data/src/share/classes/java/awt/color/ICC_Profile.java.i
 data/src/solaris/native/sun/java2d/loops/vis_SrcOverMaskFill.c.i
 data/src/share/classes/com/sun/tools/jdi/DoubleValueImpl.java.i
 data/make/tools/GenerateCharacter/CharacterData01.java.template.i
-data/src/share/classes/java/util/jar/Pack200.java.i
-data/test/javax/swing/plaf/synth/7032791/bug7032791.java.i
-data/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java.i
-data/test/java/awt/font/TextLayout/TestTibetan.java.i
+data/src/share/native/sun/java2d/loops/IntDcm.h.i
+data/test/com/sun/crypto/provider/Cipher/CTR/CounterMode.java.i
+data/test/java/net/CookieHandler/NullUriCookieTest.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_zh_CN.properties.i
-data/src/share/classes/sun/nio/cs/ext/IBM424.java.i
-data/src/linux/doc/man/jinfo.1.i
-data/src/share/classes/java/awt/AlphaComposite.java.i
+data/src/share/classes/javax/swing/text/TextLayoutStrategy.java.i
+data/src/share/classes/com/sun/management/package.html.i
+data/test/org/openjdk/jigsaw/remrepo.sh.i
+data/src/solaris/doc/sun/man/man1/native2ascii.1.i
+data/test/java/lang/Class/getEnclosingMethod/EnclosingMethodTests.java.i
 data/src/share/classes/com/sun/crypto/provider/CounterMode.java.i
 data/src/share/classes/sun/net/www/MimeTable.java.i
-data/test/sun/security/krb5/ParseConfig.java.i
-data/test/sun/security/pkcs/EncryptedPrivateKeyInfo/EncryptedPKInfoEqualsHashCode.java.i
-data/src/share/classes/java/awt/geom/QuadIterator.java.i
-data/make/tools/CharsetMapping/IBM933.map.i
+data/src/share/classes/javax/swing/undo/CompoundEdit.java.i
+data/src/share/classes/sun/font/CoreMetrics.java.i
+data/src/share/classes/sun/security/acl/OwnerImpl.java.i
+data/src/share/classes/sun/java2d/loops/CustomComponent.java.i
 data/test/sun/tools/jps/vmflags.i
-data/src/share/demo/jvmti/gctest/README.txt.i
+data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_MatteBorderUIResource.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageClipping.c.i
 data/make/tools/CharsetMapping/IBM948.map.i
-data/src/share/classes/javax/print/attribute/Attribute.java.i
 data/src/share/classes/sun/tools/tree/DeclarationStatement.java.i
+data/test/java/rmi/activation/rmidViaInheritedChannel/rmid.security.policy.i
 data/src/share/classes/javax/management/QueryParser.java.i
 data/test/sun/rmi/rmic/newrmic/equivalence/CountInterface.java.i
-data/src/share/classes/sun/text/resources/FormatData_sl.java.i
-data/make/java/math/Makefile.i
+data/src/share/classes/javax/swing/AbstractListModel.java.i
+data/test/java/beans/PropertyEditor/TestDoubleClassValue.java.i
 data/test/java/lang/ClassLoader/GetDotResource.java.i
 data/src/share/classes/com/sun/media/sound/SoftResampler.java.i
-data/test/sun/security/pkcs11/Cipher/ReinitCipher.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java.i
+data/test/sun/management/jmxremote/bootstrap/management_test06_ok.properties.in.i
+data/src/share/classes/javax/swing/tree/VariableHeightLayoutCache.java.i
 data/src/share/classes/sun/misc/Service.java.i
 data/test/sun/nio/cs/StrCodingBenchmarkUTF8.java.i
 data/src/share/native/sun/java2d/cmm/lcms/cmsopt.c.i
 data/src/share/classes/sun/misc/JavaNetAccess.java.i
-data/test/java/security/Security/Nulls.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/BooleanCalls.java.i
+data/test/sun/security/ssl/etc/unknown_keystore.i
 data/src/share/classes/sun/nio/ch/SocketAdaptor.java.i
 data/src/share/demo/nbproject/jfc/SampleTree/nbproject/jdk.xml.i
 data/test/java/util/PluggableLocale/BreakIteratorProviderTest.sh.i
 data/test/javax/management/modelmbean/DefaultDescriptorFieldTest.java.i
 data/src/share/demo/nbproject/scripting/jconsole-plugin/build.xml.i
-data/src/solaris/classes/sun/awt/motif/MDropTargetContextPeer.java.i
+data/test/sun/security/krb5/auto/Context.java.i
 data/test/java/net/Inet6Address/B6214234.java.i
 data/src/share/demo/nbproject/jfc/FileChooserDemo/build.xml.i
 data/src/share/classes/javax/swing/text/package.html.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/ca.key.i
-data/src/share/classes/com/sun/security/jgss/GSSUtil.java.i
+data/src/share/classes/javax/script/ScriptContext.java.i
+data/src/share/native/sun/font/layout/StateTableProcessor.cpp.i
 data/src/share/classes/javax/security/auth/callback/ChoiceCallback.java.i
 data/src/share/classes/com/sun/security/jgss/ExtendedGSSContext.java.i
 data/src/share/classes/java/text/spi/package.html.i
 data/src/share/classes/sun/security/tools/TimestampedSigner.java.i
-data/test/sun/security/provider/PolicyFile/nullDomain.java.i
-data/src/share/classes/com/sun/media/sound/SoftLimiter.java.i
-data/src/solaris/native/sun/awt/awt_Component.h.i
+data/src/windows/classes/sun/awt/windows/WScrollPanePeer.java.i
+data/src/share/classes/java/util/SortedSet.java.i
+data/test/java/io/RandomAccessFile/skipBytes/input.txt.i
 data/test/java/io/Serializable/evolution/AddedSuperClass/WriteAddedSuperClass.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMeta.java.i
+data/src/share/native/com/sun/media/sound/Utilities.h.i
 data/src/share/classes/sun/util/resources/CalendarData_ar.properties.i
-data/test/java/lang/Double/ToHexString.java.i
 data/src/share/classes/java/util/regex/MatchResult.java.i
 data/test/sun/security/krb5/ServiceNameClone.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/DoubleCalls.java.i
 data/test/java/nio/Buffer/Basic-X.java.i
-data/src/share/classes/javax/swing/plaf/ScrollBarUI.java.i
 data/make/com/sun/rowset/Makefile.i
 data/src/solaris/classes/sun/awt/motif/MFramePeer.java.i
 data/src/solaris/classes/sun/print/UnixPrintService.java.i
 data/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp.i
-data/make/common/shared/Defs-versions.gmk.i
+data/make/common/shared/Compiler.gmk.i
 data/src/share/classes/sun/util/resources/LocaleNames_hi.properties.i
-data/test/java/lang/System/SecurityRace.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ar_LB.properties.i
+data/src/share/classes/javax/swing/text/doc-files/Document-remove.gif.i
+data/src/share/classes/sun/rmi/server/resources/rmid_sv.properties.i
 data/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java.i
 data/src/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java.i
-data/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java.i
-data/make/tools/CharsetMapping/IBM921.map.i
+data/make/tools/CharsetMapping/IBM949.map.i
+data/src/share/classes/java/awt/CardLayout.java.i
 data/src/share/native/sun/java2d/loops/AlphaMath.h.i
 data/test/java/security/Policy/GetInstance/GetInstance.java.i
-data/test/java/io/Serializable/superclassDataLoss/B.java.i
+data/src/share/classes/sun/io/ByteToCharJIS0212_Solaris.java.i
 data/src/share/classes/sun/tools/jconsole/resources/disconnected16.png.i
 data/src/solaris/classes/sun/java2d/jules/JulesTile.java.i
 data/test/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java.i
 data/test/java/net/NetworkInterface/Equals.java.i
 data/src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c.i
 data/src/share/classes/sun/io/ByteToCharMacUkraine.java.i
-data/src/share/classes/sun/io/CharToByteHKSCS.java.i
+data/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java.i
 data/test/java/net/ProxySelector/SystemProxies.java.i
-data/make/modules/tools/src/com/sun/classanalyzer/Module.java.i
+data/src/share/classes/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java.i
 data/src/share/classes/javax/management/monitor/GaugeMonitor.java.i
 data/src/share/demo/jfc/Notepad/resources/open.gif.i
 data/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java.i
-data/src/share/classes/javax/print/attribute/standard/RequestingUserName.java.i
-data/src/share/classes/javax/sound/midi/MidiFileFormat.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvClearEdge.c.i
+data/src/share/classes/javax/net/ssl/SSLContext.java.i
 data/test/sun/security/provider/PolicyFile/getinstance/TwoArgPermission.java.i
-data/src/share/classes/com/sun/tracing/dtrace/ProviderAttributes.java.i
+data/src/share/classes/sun/io/CharToByteJIS0208_Solaris.java.i
 data/test/sun/net/InetAddress/nameservice/simple/SimpleNameServiceDescriptor.java.i
 data/src/windows/native/sun/jkernel/kernel_de.rc.i
-data/src/share/native/sun/font/layout/LigatureSubstitution.h.i
+data/src/share/classes/java/io/UTFDataFormatException.java.i
 data/test/java/util/Map/LockStep.java.i
 data/src/share/native/java/util/zip/zlib-1.2.3/patches/crc32.c.diff.i
-data/test/java/beans/PropertyEditor/TestFloatType.java.i
-data/src/share/classes/java/security/spec/ECFieldF2m.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/OuterGlowEffect.java.i
-data/src/share/classes/javax/naming/spi/package.html.i
+data/test/com/sun/security/auth/login/ConfigFile/EmptyOption.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/font/Typeface.java.i
+data/src/share/classes/sun/security/krb5/Realm.java.i
+data/src/share/classes/sun/misc/JarIndex.java.i
+data/make/tools/CharsetMapping/IBM864.map.i
+data/src/share/classes/sun/security/ssl/MAC.java.i
 data/test/demo/zipfs/PathOps.java.i
 data/src/windows/classes/sun/awt/windows/WColor.java.i
-data/test/sun/util/resources/Locale/Bug4965260.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ServerIdentityTest.java.i
 data/test/com/sun/net/httpserver/TestLogging.java.i
-data/src/share/classes/sun/io/CharToByteJIS0212.java.i
+data/test/java/net/Socket/TestClose.java.i
 data/test/org/openjdk/jigsaw/install-files.sh.i
-data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java.i
-data/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java.i
-data/test/java/security/KeyRep/SerialDSAPubKey.java.i
+data/src/windows/native/sun/windows/awt_Insets.cpp.i
 data/src/share/classes/sun/awt/image/ShortComponentRaster.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapEntry.java.i
-data/test/demo/jvmti/hprof/HelloWorld.java.i
+data/src/share/classes/java/dyn/ToGeneric.java.i
 data/test/sun/net/www/ParseUtil_4922813.java.i
 data/src/share/classes/sun/io/ByteToCharMS949.java.i
 data/src/solaris/classes/sun/java2d/jules/TrapezoidList.java.i
 data/src/share/classes/sun/jkernel/Bundle.java.i
 data/test/java/lang/Math/Log10Tests.java.i
-data/test/java/lang/Throwable/NewChainedExceptions.java.i
-data/src/share/classes/org/openjdk/jigsaw/ModuleFileFormat.java.i
+data/src/windows/native/sun/windows/awt_Cursor.h.i
+data/test/javax/swing/Security/6657138/bug6657138.java.i
 data/src/share/classes/sun/jvmstat/monitor/event/HostEvent.java.i
-data/src/share/native/sun/font/layout/ICUFeatures.h.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ko_KR.properties.i
+data/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java.i
+data/src/share/native/java/lang/fdlibm/src/w_acos.c.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/testEnabledProtocols.java.i
-data/src/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java.i
 data/src/share/classes/java/lang/module/VersionQuery.java.i
 data/src/share/classes/java/lang/module/Version.java.i
-data/src/share/classes/sun/net/www/protocol/http/NegotiateCallbackHandler.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/UnrecognizedOptionException.java.i
+data/src/share/classes/java/beans/Introspector.java.i
+data/test/javax/script/ProviderTest.java.i
 data/src/share/classes/javax/print/attribute/package.html.i
 data/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java.i
 data/src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java.i
-data/test/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJobHeadless.java.i
-data/src/share/classes/sun/security/pkcs12/MacData.java.i
 data/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll.i
 data/src/share/classes/sun/security/x509/certAttributes.html.i
-data/make/tools/GenerateCharacter/check_class.c.template.i
+data/test/javax/swing/text/GlyphView/6539700/bug6539700.java.i
 data/src/share/classes/sun/text/resources/FormatData_sr_Latn_RS.java.i
-data/test/java/io/LineNumberReader/Read.java.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedDoubleFieldAccessorImpl.java.i
+data/src/share/classes/sun/security/pkcs11/JarVerifier.java.i
 data/src/share/classes/com/sun/media/sound/SimpleInstrument.java.i
-data/test/java/beans/XMLDecoder/spec/TestNew.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java.i
+data/src/linux/doc/man/jstatd.1.i
 data/src/share/classes/java/awt/image/AreaAveragingScaleFilter.java.i
+data/test/javax/swing/JColorChooser/Test4461329.java.i
 data/src/share/classes/sun/invoke/anon/ConstantPoolParser.java.i
 data/src/share/classes/sun/tools/jconsole/inspector/XSheet.java.i
 data/src/share/classes/com/sun/media/sound/SoftLinearResampler2.java.i
-data/src/share/native/sun/font/layout/MorphTables.cpp.i
+data/make/tools/src/build/tools/javazic/BackEnd.java.i
 data/test/java/net/InetAddress/B6296240.java.i
-data/test/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java.i
+data/test/sun/management/windows/README.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/SourceListener.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java.i
-data/test/com/sun/jdi/SuspendNoFlagTest.sh.i
-data/test/java/lang/Class/forName/classes/Z.class.i
+data/make/tools/CharsetMapping/IBM856.map.i
 data/src/solaris/native/sun/nio/fs/LinuxWatchService.c.i
 data/src/solaris/doc/sun/man/man1/orbd.1.i
-data/src/share/classes/com/sun/security/ntlm/Client.java.i
 data/src/share/native/sun/font/bidi/ubidiln.c.i
-data/make/tools/CharsetMapping/IBM1144.map.i
 data/test/tools/launcher/TestHelper.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java.i
 data/src/share/classes/sun/text/resources/FormatData_pl_PL.java.i
-data/src/share/classes/java/nio/file/WatchEvent.java.i
+data/test/java/awt/PrintJob/Text/StringWidth.java.i
 data/src/share/native/sun/security/ec/impl/ecp_384.c.i
-data/test/java/lang/System/Available.java.i
+data/test/javax/xml/crypto/dsig/data/envelope.xml.i
+data/src/share/native/sun/awt/image/jpeg/jdcolor.c.i
 data/test/com/sun/security/auth/login/ConfigFile/InnerClassConfig.java.i
 data/src/share/native/java/util/zip/zlib-1.1.3/uncompr.c.i
-data/make/modules/modules.config.i
+data/src/solaris/classes/sun/awt/motif/MWindowPeer.java.i
 data/src/share/classes/com/sun/tools/jdi/ValueContainer.java.i
 data/src/share/classes/sun/text/normalizer/NormalizerImpl.java.i
-data/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java.i
+data/src/share/classes/sun/text/resources/FormatData_fr_LU.java.i
 data/test/sun/security/ssl/sanity/pluggability/MySSLSocketFacImpl.java.i
-data/test/java/io/Reader/NullLock.java.i
 data/test/sun/security/krb5/auto/BadKdc2.java.i
 data/src/share/sample/vm/jvm-clr/invoked.cs.i
 data/src/windows/native/sun/windows/security_warning.ico.i
-data/test/com/sun/net/httpserver/bugs/B6433018.java.i
+data/make/netbeans/common/share-view.ent.i
 data/src/share/classes/javax/swing/Popup.java.i
-data/src/share/classes/java/util/Queue.java.i
+data/src/share/classes/javax/swing/event/EventListenerList.java.i
 data/test/java/security/KeyFactory/GenerateRSAPrivateCrtKey.java.i
 data/src/share/sample/scripting/scriptpad/src/com/sun/sample/scriptpad/Main.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/IntArrayCalls.java.i
 data/src/share/classes/sun/io/CharToByteKOI8_R.java.i
-data/test/java/rmi/activation/Activatable/restartCrashedService/ActivateMe.java.i
-data/src/share/classes/javax/swing/AbstractListModel.java.i
+data/src/share/classes/sun/text/resources/FormatData_sl.java.i
 data/src/share/classes/sun/tools/tree/AssignBitOrExpression.java.i
 data/src/share/classes/sun/io/ByteToCharCp420.java.i
 data/make/modules/tools/src/com/sun/classanalyzer/BootAnalyzer.java.i
 data/src/share/classes/java/util/IllegalFormatConversionException.java.i
 data/src/linux/doc/man/java.1.i
 data/src/share/classes/sun/io/CharToByteISO8859_4.java.i
-data/test/java/util/EnumMap/DistinctEntrySetElements.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java.i
-data/make/tools/CharsetMapping/IBM949.map.i
-data/src/share/classes/sun/io/ByteToCharJIS0212_Solaris.java.i
+data/test/sun/security/provider/PolicyParser/PrincipalExpansionErrorAction.java.i
+data/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java.i
+data/test/java/io/Serializable/superclassDataLoss/B.java.i
 data/test/java/util/Locale/data/deflocale.win7.i
 data/test/com/sun/jdi/ImmutableResourceTest.sh.i
-data/test/java/security/Provider/CertStoreConstructorParam.java.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/close.gif.i
-data/src/share/classes/sun/security/krb5/Realm.java.i
+data/test/java/beans/PropertyEditor/TestFloatType.java.i
 data/test/java/beans/PropertyEditor/TestIntegerTypeJava.java.i
-data/src/share/classes/java/dyn/ToGeneric.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapEntry.java.i
 data/src/share/demo/jvmti/heapTracker/heapTracker.c.i
 data/src/share/classes/sun/security/smartcardio/CardImpl.java.i
 data/test/java/rmi/server/UnicastRemoteObject/useDynamicProxies/security.policy.i
+data/src/share/native/sun/awt/image/jpeg/jidctred.c.i
 data/src/share/classes/java/awt/event/NativeLibLoader.java.i
-data/test/java/nio/channels/SelectionKey/AtomicAttachTest.java.i
-data/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java.i
-data/test/javax/swing/JInternalFrame/6725409/bug6725409.java.i
+data/test/java/io/FileOutputStream/FileOpenPos.java.i
+data/src/solaris/bin/java_md.h.i
 data/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java.i
 data/src/share/classes/sun/reflect/UnsafeLongFieldAccessorImpl.java.i
 data/test/java/rmi/transport/checkFQDN/TellServerName.java.i
 data/src/share/native/sun/font/layout/KernTable.cpp.i
-data/make/tools/swing-beans/beaninfo/images/JTextPaneMono32.gif.i
 data/test/sun/security/pkcs11/sslecc/keystore.i
-data/src/share/classes/java/awt/font/OpenType.java.i
-data/test/java/io/FileOutputStream/FileOpenPos.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-i586/libplds4.so.i
+data/test/java/nio/channels/SelectionKey/AtomicAttachTest.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthComboPopup.java.i
+data/src/share/classes/com/sun/media/sound/JavaSoundAudioClip.java.i
 data/make/sun/rmi/Makefile.i
 data/src/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java.i
-data/src/share/classes/javax/swing/plaf/multi/package.html.i
+data/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/PaintedShape.java.i
-data/src/share/classes/sun/text/resources/thai_dict.d
+data/src/share/classes/java/awt/ComponentOrientation.java.i
 data/src/share/classes/sun/text/SupplementaryCharacterData.java.i
 data/test/java/io/Serializable/verifyDynamicObjHandleTable/VerifyDynamicObjHandleTable.java.i
 data/test/sun/security/provider/certpath/ReverseBuilder/mgrM2mgrM.i
-data/test/java/util/PriorityQueue/RemoveContains.java.i
 data/src/windows/native/sun/security/krb5/WindowsDirectory.c.i
 data/src/share/classes/javax/imageio/event/IIOReadUpdateListener.java.i
-data/src/share/javavm/export/jvmticmlr.h.i
+data/src/share/classes/sun/net/httpserver/ContextList.java.i
 data/test/sun/security/krb5/PAData.java.i
-data/test/java/rmi/MarshalledObject/compare/Compare.java.i
+data/src/share/classes/java/io/CharArrayWriter.java.i
 data/make/tools/swing-beans/beaninfo/images/JScrollPaneMono16.gif.i
 data/src/solaris/classes/sun/awt/X11/XProtocolConstants.java.i
+data/src/share/classes/sun/security/acl/AllPermissionsImpl.java.i
 data/src/share/classes/sun/security/krb5/KerberosSecrets.java.i
 data/src/windows/native/sun/windows/awt_Choice.cpp.i
 data/make/java/verify/Makefile.i
+data/src/share/classes/java/lang/InstantiationError.java.i
 data/src/share/classes/java/awt/peer/ChoicePeer.java.i
 data/make/com/oracle/net/Makefile.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/OuterGlowEffect.java.i
@@ -7999,22 +7946,18 @@ data/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.
 data/test/tools/launcher/deleteI18n.sh.i
 data/make/tools/src/build/tools/generatenimbus/ObjectFactory.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM037.java.i
-data/src/share/classes/java/awt/im/spi/InputMethodContext.java.i
-data/test/sun/rmi/rmic/manifestClassPath/run.sh.i
+data/test/sun/security/mscapi/PublicKeyInterop.java.i
 data/test/demo/jvmti/heapTracker/HeapTrackerTest.java.i
 data/src/share/classes/java/beans/PersistenceDelegate.java.i
 data/test/com/sun/security/sasl/digest/names.properties.i
 data/src/windows/native/sun/nio/fs/RegistryFileTypeDetector.c.i
 data/src/share/classes/sun/awt/WindowIDProvider.java.i
 data/test/javax/script/DummyScriptEngineFactory.java.i
-data/src/share/classes/java/util/LinkedHashSet.java.i
 data/make/com/sun/script/Makefile.i
 data/src/share/classes/sun/security/provider/MD2.java.i
 data/test/java/beans/XMLEncoder/java_awt_Font.java.i
-data/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java.i
-data/test/java/net/MulticastSocket/JoinGroup.java.i
+data/src/share/native/java/lang/Thread.c.i
 data/src/share/classes/sun/security/x509/GeneralSubtree.java.i
-data/src/share/classes/sun/security/util/DerInputStream.java.i
 data/test/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.password.in.i
 data/test/tools/pack200/pack200-verifier/make/build.xml.i
 data/test/java/util/Formatter/Close.java.i
@@ -8024,27 +7967,27 @@ data/src/share/classes/java/rmi/server/Operation.java.i
 data/src/share/native/sun/security/ec/impl/logtab.h.i
 data/src/share/classes/sun/net/idn/StringPrep.java.i
 data/src/share/classes/sun/io/CharToBytePCK.java.i
-data/test/javax/management/modelmbean/SimpleModelMBean/logging.properties.i
+data/test/java/nio/file/DirectoryStream/Basic.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/icons/File.gif.i
 data/test/java/security/Policy/Root/Root.java.i
 data/src/share/classes/com/sun/jndi/url/dns/dnsURLContext.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java.i
 data/test/sun/java2d/cmm/ColorConvertOp/SRGB565.png.i
 data/test/java/util/ResourceBundle/Bug4179766Getter.java.i
 data/src/share/classes/sun/reflect/UnsafeStaticDoubleFieldAccessorImpl.java.i
-data/test/java/util/ResourceBundle/Test4314141A_de_.properties.i
 data/test/java/beans/XMLEncoder/java_awt_BorderLayout.java.i
-data/test/javax/management/namespace/VirtualMBeanNotifTest.java.i
 data/src/share/classes/sun/text/resources/FormatData_ar_QA.java.i
 data/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java.i
 data/src/windows/native/sun/nio/ch/FileKey.c.i
 data/test/java/security/cert/CertPathValidator/trustAnchor/labs2isrg2.cer.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolTableMetaImpl.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_th.properties.i
 data/src/share/classes/sun/swing/MenuItemLayoutHelper.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpMask.java.i
 data/src/share/native/com/sun/java/util/jar/pack/coding.h.i
 data/src/share/classes/sun/java2d/pipe/hw/AccelGraphicsConfig.java.i
 data/src/share/classes/sun/io/CharToByteCp1006.java.i
+data/src/solaris/native/sun/java2d/loops/mlib_v_ImageLogic_proto.h.i
+data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java.i
 data/test/com/sun/jdi/NoLocInfoTest.java.i
 data/test/java/nio/channels/FileChannel/TransferToChannel.java.i
 data/src/share/classes/javax/naming/directory/package.html.i
@@ -8056,17 +7999,16 @@ data/src/share/classes/sun/font/StandardGlyphVector.java.i
 data/make/tools/swing-beans/beaninfo/images/JTabbedPaneColor16.gif.i
 data/src/share/classes/javax/management/openmbean/OpenDataException.java.i
 data/src/share/classes/javax/management/AttributeList.java.i
+data/src/share/classes/java/dyn/AdapterMethodHandle.java.i
 data/src/share/classes/sun/jkernel/StandaloneSHA.java.i
 data/src/share/classes/sun/nio/cs/IBM862.java.i
+data/make/java/java/reorder-sparc.i
 data/test/java/util/Locale/serialized/java6locale_en_US.i
-data/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties.i
-data/test/java/util/Collections/RotateEmpty.java.i
 data/test/java/rmi/reliability/juicer/security.policy.i
 data/make/sun/javazic/javatz/java_win_ids.txt.i
 data/src/windows/native/sun/windows/awt_InputTextInfor.h.i
 data/src/share/native/sun/java2d/cmm/lcms/cmsps2.c.i
 data/src/share/classes/org/openjdk/jigsaw/PublishedRepository.java.i
-data/src/windows/native/sun/windows/img_util_md.h.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/icons/Question.gif.i
 data/src/share/classes/javax/crypto/spec/DHGenParameterSpec.java.i
 data/src/share/classes/sun/nio/cs/IBM775.java.i
@@ -8075,13 +8017,14 @@ data/make/common/shared/Defs-javadoc.gmk.i
 data/src/share/classes/javax/print/attribute/standard/PrinterLocation.java.i
 data/src/share/classes/com/sun/jdi/event/EventIterator.java.i
 data/make/tools/CharsetMapping/IBM500.map.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html.i
 data/test/tools/launcher/SomeException.java.i
 data/src/share/classes/sun/nio/cs/ext/EUC_TW.java.i
 data/test/java/util/zip/DataDescriptor.java.i
 data/test/java/util/jar/JarFile/VerifySignedJar.java.i
 data/src/share/classes/java/awt/print/Book.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/GradientStop.java.i
+data/src/share/classes/javax/swing/plaf/multi/MultiInternalFrameUI.java.i
 data/src/share/classes/java/util/UnknownFormatConversionException.java.i
 data/src/share/classes/sun/nio/cs/ext/EUC_TW.java.d
 data/make/tools/src/build/tools/javazic/Zone.java.i
@@ -8095,40 +8038,35 @@ data/src/share/demo/java2d/J2DBench/src/j2dbench/ui/EnableButton.java.i
 data/src/share/classes/javax/xml/crypto/dsig/SignatureProperties.java.i
 data/test/java/lang/management/ThreadMXBean/FindDeadlocks.java.i
 data/src/share/classes/sun/text/resources/FormatData_pt_PT.java.i
-data/src/share/classes/javax/swing/text/MaskFormatter.java.i
+data/src/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java.i
 data/src/share/lib/management/jmxremote.access.i
 data/src/share/classes/sun/awt/ComponentAccessor.java.i
 data/src/share/native/sun/font/bidi/ubidiimp.h.i
 data/src/share/classes/sun/text/resources/FormatData_ar_AE.java.i
 data/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java.i
-data/src/share/classes/javax/management/openmbean/TabularDataSupport.java.i
 data/make/tools/src/build/tools/generatecharacter/PrintCharacterRanges.java.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmCompilationImpl.java.i
-data/test/java/net/MulticastSocket/B6427403.java.i
+data/src/windows/classes/sun/java2d/windows/WindowsFlags.java.i
 data/src/share/classes/sun/tools/asm/Instruction.java.i
 data/src/share/classes/com/sun/security/auth/UserPrincipal.java.i
-data/test/java/lang/StrictMath/HyperbolicTests.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/File.gif.i
 data/test/java/util/PluggableLocale/barprovider.jar.i
-data/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/Dummy.java.i
+data/src/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java.i
 data/src/share/classes/java/nio/channels/Pipe.java.i
-data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java.i
-data/test/tools/launcher/Test7029048.java.i
+data/test/sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_S16.c.i
-data/test/sun/security/pkcs11/Cipher/TestRSACipherWrap.java.i
+data/src/share/javavm/export/jawt.h.i
 data/test/java/awt/Mixing/ValidBounds.java.i
 data/src/solaris/classes/sun/print/services/javax.print.StreamPrintServiceFactory.i
 data/src/share/classes/sun/management/VMManagementImpl.java.i
 data/src/share/classes/java/nio/file/FileStore.java.i
-data/src/share/classes/sun/tools/java/Environment.java.i
 data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/Foo.java.i
 data/src/share/native/java/lang/reflect/Array.c.i
 data/test/java/lang/String/IsEmpty.java.i
 data/test/java/lang/instrument/PremainClass/InheritAgent1111.java.i
 data/src/share/classes/javax/crypto/spec/OAEPParameterSpec.java.i
-data/src/share/classes/sun/nio/cs/ext/Johab.java.i
-data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly_Stub.java.i
+data/src/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java.i
 data/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java.i
-data/test/java/nio/file/WatchService/WithSecurityManager.java.i
 data/test/sun/security/krb5/tools/onlythree.conf.i
 data/src/share/classes/sun/security/x509/GeneralNames.java.i
 data/src/windows/native/sun/windows/awt_Clipboard.h.i
@@ -8136,10 +8074,11 @@ data/src/share/classes/java/util/NoSuchElementException.java.i
 data/make/javax/sound/jsoundds/Makefile.i
 data/test/javax/management/monitor/NullAttributeValueTest.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java.i
-data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c.i
+data/src/share/classes/sun/swing/WindowsPlacesBar.java.i
 data/make/tools/CharsetMapping/sbcs.i
 data/src/share/native/sun/awt/image/jpeg/jcmainct.c.i
-data/make/tools/classanalyzer/Makefile.i
+data/src/share/classes/javax/swing/KeyboardManager.java.i
+data/src/share/classes/sun/applet/AppletEvent.java.i
 data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/StubSkeletonWriter.java.i
 data/src/share/classes/java/nio/file/FileSystemLoopException.java.i
 data/test/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java.i
@@ -8148,34 +8087,35 @@ data/src/share/classes/javax/sound/sampled/BooleanControl.java.i
 data/test/java/util/PluggableLocale/GenericTest.java.i
 data/test/java/beans/XMLEncoder/6777487/TestCheckedList.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java.i
-data/test/java/util/logging/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java.i
-data/test/sun/security/util/DerValue/EmptyValue.java.i
+data/test/java/util/IdentityHashMap/ToArray.java.i
+data/src/share/classes/sun/tools/tree/CommaExpression.java.i
 data/src/solaris/classes/sun/nio/ch/FileDispatcher.java.i
 data/test/java/io/Serializable/getSuidClinitError/GetSuidClinitError.java.i
 data/test/java/beans/XMLEncoder/javax_swing_Box.java.i
 data/src/share/native/java/lang/fdlibm/src/s_fabs.c.i
 data/test/com/sun/jdi/CommandCommentDelimiter.sh.i
-data/test/sun/rmi/rmic/newrmic/equivalence/Agent.java.i
-data/src/share/classes/java/io/FilterOutputStream.java.i
+data/test/javax/management/Introspector/DescribedMX.java.i
+data/test/java/lang/instrument/BootClassPath/Agent.java.i
 data/test/sun/security/krb5/ConfPlusProp.java.i
 data/src/share/classes/java/lang/EnumConstantNotPresentException.java.i
 data/src/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java.i
 data/src/share/classes/java/awt/dnd/peer/DropTargetContextPeer.java.i
 data/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java.i
 data/make/tools/CharsetMapping/IBM861.map.i
-data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml.i
+data/src/share/classes/com/sun/jndi/ldap/LdapName.java.i
+data/test/java/awt/Graphics2D/DrawString/AlphaSurfaceText.java.i
+data/src/share/classes/java/lang/Readable.java.i
 data/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java.i
 data/test/java/security/cert/CertPathValidator/trustAnchor/sun2labs2.cer.i
 data/src/share/native/java/lang/String.c.i
 data/test/java/beans/XMLEncoder/java_net_URI.java.i
 data/src/share/classes/sun/awt/geom/PathConsumer2D.java.i
 data/src/share/instrument/Utilities.c.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/PreferredKey.java.i
-data/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java.i
 data/test/javax/swing/JSlider/6794836/bug6794836.java.i
 data/src/windows/classes/sun/net/www/protocol/http/NTLMAuthentication.java.i
 data/test/java/io/Serializable/enum/unshared/Test.java.i
-data/test/java/net/URLConnection/RequestProperties.java.i
+data/test/java/rmi/reliability/benchmark/bench/HtmlReporter.java.i
 data/test/java/awt/event/InvocationEvent/InvocationEventTest.java.i
 data/test/com/sun/crypto/provider/Cipher/AES/Test4511676.java.i
 data/src/share/classes/javax/swing/border/EmptyBorder.java.i
@@ -8183,13 +8123,13 @@ data/test/javax/script/Test4.java.i
 data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/package.html.i
 data/make/tools/swing-beans/beaninfo/images/JCheckBoxMono32.gif.i
 data/test/java/nio/file/Files/FileAttributes.java.i
-data/src/solaris/native/common/jdk_util_md.h.i
+data/src/share/native/sun/font/FontInstanceAdapter.h.i
 data/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java.i
+data/src/share/native/sun/security/ec/impl/ec.h.i
 data/src/share/classes/java/text/RuleBasedCollationKey.java.i
-data/src/share/classes/sun/tools/tree/ShortExpression.java.i
 data/test/sun/tools/jstat/timeStamp1.awk.i
+data/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java.i
 data/test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy.i
-data/src/solaris/classes/sun/awt/motif/X11Selection.java.i
 data/test/javax/crypto/JceSecurity/MyCertificateFactory.java.i
 data/src/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java.i
 data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/PoisonPill.java.i
@@ -8204,40 +8144,44 @@ data/src/windows/native/sun/nio/ch/SocketDispatcher.c.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelTableMeta.java.i
 data/src/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java.i
 data/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java.i
-data/test/sun/security/mscapi/RSAEncryptDecrypt.sh.i
+data/test/java/nio/charset/coders/ref.windows-31j.i
 data/src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java.i
+data/src/windows/native/sun/windows/awt_Event.cpp.i
 data/src/share/classes/javax/crypto/SecretKeyFactorySpi.java.i
+data/make/common/internal/Defs-corba.gmk.i
 data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java.i
 data/test/java/rmi/reliability/benchmark/bench/serial/config.i
 data/src/share/classes/sun/io/CharToByteCp1146.java.i
+data/test/com/sun/net/httpserver/bugs/B6431193.java.i
 data/src/share/classes/sun/text/resources/CollationData_pt.java.i
-data/src/windows/back/proc_md.h.i
+data/src/share/native/sun/font/layout/TrimmedArrayProcessor.cpp.i
 data/src/share/classes/sun/io/ByteToCharCp1254.java.i
 data/make/tools/CharsetMapping/MS1255.map.i
 data/src/share/classes/java/nio/file/FileSystems.java.i
 data/src/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties.i
-data/src/share/native/sun/awt/libpng/README.i
+data/test/javax/swing/JTextArea/7049024/bug7049024.java.i
 data/src/share/classes/com/sun/jdi/Accessible.java.i
-data/src/solaris/classes/sun/java2d/xr/XRMaskFill.java.i
+data/src/share/native/sun/security/ec/impl/ec2_193.c.i
 data/src/share/classes/java/lang/NoSuchFieldError.java.i
+data/src/share/classes/sun/tools/tree/SubtractExpression.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_es_HN.properties.i
 data/test/sun/tools/jstat/jstatLineCounts4.sh.i
 data/test/java/lang/Class/getDeclaredClasses/Sanity.java.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1_U8.c.i
-data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/Receiver.java.i
+data/test/java/io/InputStream/Skip.java.i
 data/test/java/beans/XMLEncoder/java_awt_GridBagConstraints.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java.i
-data/src/share/classes/sun/net/www/protocol/http/Negotiator.java.i
-data/test/java/rmi/activation/ActivationSystem/unregisterGroup/Callback_Stub.java.i
+data/src/share/native/sun/awt/giflib/gif_err.c.i
+data/make/tools/src/build/tools/dtdbuilder/PublicMapping.java.i
 data/test/sun/security/krb5/auto/HttpNegotiateServer.java.i
 data/src/share/classes/javax/net/ssl/SSLContextSpi.java.i
 data/test/com/sun/jdi/NativeInstanceFilterTarg.java.i
 data/test/java/beans/Introspector/6380849/beans/FirstBeanBeanInfo.java.i
+data/src/share/classes/sun/beans/editors/ColorEditor.java.i
 data/test/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.html.i
 data/make/tools/src/build/tools/generatebreakiteratordata/CharSet.java.i
 data/src/share/classes/sun/nio/ch/OptionAdaptor.java.i
-data/test/java/util/Collections/Enum.java.i
+data/src/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java.i
 data/src/share/native/sun/java2d/loops/Ushort555Rgbx.c.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java.i
 data/test/tools/launcher/UnresolvedExceptions.java.i
@@ -8247,47 +8191,48 @@ data/src/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane
 data/make/tools/CharsetMapping/IBM950.c2b.i
 data/test/java/util/TimSort/SortPerf.java.i
 data/src/share/classes/sun/io/ByteToCharCp1148.java.i
-data/test/javax/management/loading/LibraryLoader/UseNativeLib1.html.i
+data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnUnmarshal.java.i
 data/test/java/util/ResourceBundle/Bug4177489_Resource.java.i
 data/src/share/classes/javax/sound/sampled/AudioPermission.java.i
 data/src/share/classes/com/sun/pept/encoding/Encoder.java.i
 data/src/windows/native/com/sun/security/auth/module/nt.c.i
 data/src/share/classes/com/sun/media/sound/SunCodec.java.i
 data/test/javax/management/eventService/MyFetchingEventForwarder.java.i
+data/src/share/classes/org/ietf/jgss/GSSName.java.i
 data/test/java/beans/README.i
 data/test/java/awt/Component/PaintAll/PaintAll.java.i
 data/test/sun/nio/cs/OLD/IBM1383_OLD.java.i
 data/src/share/sample/scripting/scriptpad/src/scripts/browse.js.i
-data/src/share/classes/sun/nio/fs/AbstractWatchService.java.i
 data/src/share/classes/com/sun/jndi/ldap/Filter.java.i
-data/make/tools/CharsetMapping/SingleByte-X.java.i
 data/test/java/beans/XMLEncoder/Test6963811.java.i
 data/test/sun/net/www/http/HttpClient/MultiThreadTest.java.i
 data/src/share/classes/java/awt/font/NumericShaper.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_da_DK.properties.i
 data/src/windows/classes/java/lang/ProcessImpl.java.i
-data/src/share/demo/jfc/Font2DTest/resources/TextResources_en.properties.i
+data/src/share/classes/java/util/zip/DeflaterInputStream.java.i
 data/src/share/classes/javax/accessibility/package.html.i
 data/test/com/sun/security/sasl/digest/PropertiesFileCallbackHandler.java.i
 data/test/sun/security/mscapi/noaccess.policy.i
-data/test/sun/tools/jstat/printCompilationOutput1.awk.i
 data/test/java/nio/Buffer/AllocateDirectInit.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/RehandshakeFinished.java.i
 data/test/sun/tools/jps/jps-v_1.sh.i
 data/src/share/classes/java/lang/AssertionError.java.i
 data/src/share/classes/sun/io/CharToByteUTF16.java.i
 data/test/java/lang/instrument/ASimpleInstrumentationTestCase.java.i
-data/make/tools/swing-beans/beaninfo/images/JTreeMono16.gif.i
+data/src/share/sample/nio/multicast/MulticastAddress.java.i
 data/src/windows/native/sun/jkernel/kernel.cpp.i
+data/make/sun/awt/Depend.sed.i
 data/test/tools/launcher/Arrrghs.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.c.i
+data/src/share/classes/javax/security/auth/x500/X500Principal.java.i
 data/src/share/classes/sun/io/ByteToCharISO2022JP.java.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ReadTimeout.java.i
-data/src/share/classes/javax/sql/rowset/serial/SerialRef.java.i
+data/src/share/classes/java/io/PipedOutputStream.java.i
 data/src/share/classes/com/sun/media/sound/ModelDirector.java.i
+data/src/share/classes/java/io/ObjectInputValidation.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_hu.properties.i
 data/src/share/classes/sun/io/ByteToCharEUC_TW.java.i
 data/src/share/classes/com/sun/jndi/ldap/pool/PoolCleaner.java.i
-data/src/windows/javavm/export/jni_md.h.i
+data/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java.i
 data/test/org/openjdk/jigsaw/cli/ModuleFormatTestLeftOverBytes.java.i
 data/test/java/beans/beancontext/Test4233980.java.i
 data/make/sun/jawt/Depend.sed.i
@@ -8295,64 +8240,64 @@ data/src/share/classes/javax/swing/border/Border.java.i
 data/test/java/lang/Class/getModifiers/ForInnerClass.java.i
 data/src/solaris/native/sun/nio/ch/FileChannelImpl.c.i
 data/src/share/classes/java/security/acl/Acl.java.i
-data/src/share/demo/nbproject/jfc/Notepad/nbproject/jdk.xml.i
-data/src/share/native/sun/security/ec/impl/ecl-curve.h.i
+data/src/share/classes/sun/util/resources/LocaleNames_ro.properties.i
 data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/group.security.policy.i
 data/src/share/classes/java/nio/file/spi/AbstractPath.java.i
 data/test/java/beans/PropertyEditor/6380849/editors/ThirdBeanEditor.java.i
-data/test/java/beans/XMLDecoder/spec/TestMethod.java.i
+data/src/share/classes/sun/java2d/pipe/ParallelogramPipe.java.i
 data/src/share/classes/javax/naming/spi/ObjectFactory.java.i
-data/test/javax/script/MyContext.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U16Func.c.i
 data/src/share/classes/sun/nio/cs/ext/IBM1025.java.i
-data/src/windows/native/sun/windows/jawt.cpp.i
 data/src/share/classes/sun/io/CharToByteDBCS_EBCDIC.java.i
 data/make/tools/CharsetMapping/IBM950.map.i
 data/src/share/classes/sun/security/acl/AclEntryImpl.java.i
-data/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh.i
+data/src/share/classes/com/sun/jdi/InvalidTypeException.java.i
+data/src/share/classes/com/sun/jmx/snmp/tasks/TaskServer.java.i
 data/make/tools/CharsetMapping/IBM1124.map.i
 data/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c.i
 data/src/share/demo/jfc/Notepad/resources/Notepad_sv.properties.i
-data/src/share/classes/sun/rmi/transport/proxy/RMIHttpToPortSocketFactory.java.i
+data/src/share/classes/javax/net/ssl/SSLEngineResult.java.i
 data/src/share/classes/java/util/LinkedList.java.i
 data/src/share/classes/javax/management/relation/package.html.i
+data/test/java/rmi/activation/Activatable/downloadParameterClass/manual.security.policy.i
 data/test/com/sun/security/sasl/ClientCallbackHandler.java.i
 data/src/share/classes/sun/io/CharToByteCp852.java.i
 data/src/share/native/java/util/zip/Adler32.c.i
 data/src/share/classes/sun/tools/javac/ErrorMessage.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanProxy.java.i
-data/src/share/classes/java/io/InvalidObjectException.java.i
+data/src/windows/native/sun/windows/awt_InputEvent.h.i
 data/src/share/native/sun/java2d/loops/ByteBinary1Bit.c.i
 data/test/java/net/URLConnection/HttpContinueStackOverflow.java.i
 data/test/javax/swing/JColorChooser/Test6524757.java.i
-data/src/share/native/sun/security/ec/ecp_521.c.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCTableMetaImpl.java.i
 data/test/sun/nio/cs/TestISO2022JPEncoder.java.i
 data/test/com/sun/security/sasl/digest/AuthOnly.java.i
 data/src/share/classes/sun/tools/java/Type.java.i
-data/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java.i
 data/src/share/classes/sun/net/ftp/FtpReplyCode.java.i
 data/test/com/sun/jdi/RunToExit.java.i
 data/src/share/classes/sun/security/jgss/spi/GSSNameSpi.java.i
-data/src/share/classes/sun/io/ByteToCharCp1112.java.i
+data/src/share/classes/java/nio/channels/ScatteringByteChannel.java.i
 data/src/share/classes/com/sun/jmx/interceptor/package.html.i
 data/src/share/native/sun/security/ec/ec2_mont.c.i
 data/test/javax/management/MBeanInfo/EqualExceptionTest.java.i
 data/src/share/classes/sun/font/ScriptRunData.java.i
 data/test/sun/net/www/protocol/file/FileMap.java.i
-data/test/com/sun/net/httpserver/bugs/B6424196.java.i
 data/test/demo/zipfs/ZipFSTester.java.i
 data/test/java/util/Formatter/BasicFloat.java.i
+data/make/tools/CharsetMapping/MacRomania.map.i
 data/src/share/classes/sun/security/krb5/KrbServiceLocator.java.i
 data/test/sun/security/pkcs11/rsa/rsakeys.ks.i
 data/make/javax/crypto/Makefile.i
-data/test/sun/nio/cs/LeftOverSurrogate.java.i
+data/test/javax/imageio/plugins/png/MergeStdCommentTest.java.i
 data/src/share/native/sun/java2d/loops/Ushort565Rgb.c.i
 data/test/sun/tools/jstat/options2.out.i
 data/src/solaris/native/java/util/TimeZone_md.c.i
 data/src/share/classes/sun/misc/ClassLoaderUtil.java.i
+data/src/share/classes/sun/util/resources/CalendarData_be.properties.i
 data/test/java/beans/PropertyChangeSupport/Test4353056.java.i
 data/src/windows/native/sun/windows/CmdIDList.cpp.i
-data/test/sun/security/pkcs11/KeyStore/Basic.policy.i
-data/test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so.i
+data/src/share/demo/applets/WireFrame/models/hughes_500.obj.i
+data/src/windows/native/common/gdefs_md.h.i
 data/make/java/java/localegen.sh.i
 data/src/share/classes/javax/swing/plaf/InternalFrameUI.java.i
 data/make/tools/swing-beans/beaninfo/images/JLayeredPaneColor32.gif.i
@@ -8374,11 +8319,9 @@ data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java.i
 data/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java.i
 data/src/share/classes/sun/security/pkcs11/P11Util.java.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/Trace.java.i
-data/test/java/util/TreeMap/EmptyMapAndNulls.java.i
 data/src/share/classes/sun/security/krb5/internal/APOptions.java.i
-data/test/java/lang/instrument/PremainClass/DummyMain.java.i
+data/src/share/classes/sun/security/provider/SystemSigner.java.i
 data/src/share/classes/java/lang/NoClassDefFoundError.java.i
-data/test/java/util/concurrent/DelayQueue/Iterate.java.i
 data/test/java/rmi/activation/Activatable/checkAnnotations/MyRMI.java.i
 data/test/javax/sound/sampled/FileWriter/WriterCloseInput.java.i
 data/test/java/math/BigDecimal/PrecisionTests.java.i
@@ -8388,9 +8331,10 @@ data/src/share/classes/sun/security/x509/X500Signer.java.i
 data/src/share/classes/javax/sound/midi/MidiChannel.java.i
 data/src/share/classes/java/util/zip/Adler32.java.i
 data/test/java/rmi/testlibrary/TestLibrary.java.i
+data/src/share/native/sun/awt/image/jpeg/jquant2.c.i
 data/src/share/classes/com/sun/jmx/snmp/internal/SnmpLcd.java.i
 data/src/share/classes/com/sun/media/sound/SoftReverb.java.i
-data/make/tools/buildmetaindex/Makefile.i
+data/test/java/net/URLEncoder/Decoder.java.i
 data/test/com/sun/security/sasl/digest/PrivacyRc4.java.i
 data/test/javax/crypto/SecretKeyFactory/FailOverTest.sh.i
 data/src/share/classes/java/nio/file/WatchService.java.i
@@ -8405,34 +8349,37 @@ data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientMode
 data/test/sun/net/www/protocol/http/spnegoReadme.i
 data/src/share/classes/sun/text/resources/FormatData_es_PY.java.i
 data/src/share/classes/javax/swing/text/doc-files/Document-notification.gif.i
+data/test/java/beans/EventHandler/Test6179222.java.i
 data/src/share/classes/sun/io/ByteToCharJIS0208_Solaris.java.i
 data/test/java/nio/file/Path/InterruptCopy.java.i
 data/test/sun/security/krb5/tools/ktarg.sh.i
 data/src/share/classes/sun/security/ec/ECParameters.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java.i
 data/src/share/classes/sun/management/resources/agent_ko.properties.i
 data/test/javax/management/namespace/JMXNamespaceTest.java.i
 data/test/java/util/UUID/Serial.java.i
 data/test/javax/sound/midi/Gervill/SoftReceiver/Send_ChannelPressure.java.i
-data/src/solaris/classes/sun/awt/X11/XListPeer.java.i
+data/test/sun/security/krb5/auto/BadKdc4.java.i
+data/src/share/classes/sun/io/CharToByteCp943.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Bit.c.i
-data/test/com/sun/jdi/redefine/SchemaChange_RedefineSubTarg.java.i
+data/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ms_MY.properties.i
 data/test/javax/sound/midi/Gervill/SoftChannel/PitchBend.java.i
 data/src/share/classes/sun/security/ssl/RSASignature.java.i
+data/make/sun/security/action/Makefile.i
 data/src/share/classes/com/sun/crypto/provider/RSACipher.java.i
 data/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java.i
 data/test/javax/management/mxbean/MiscTest.java.i
-data/src/share/native/java/lang/fdlibm/src/k_sin.c.i
+data/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java.i
 data/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java.i
-data/src/share/native/sun/java2d/loops/LoopMacros.h.i
+data/src/share/classes/java/awt/geom/RectangularShape.java.i
 data/test/com/sun/jdi/InterruptHangTest.java.i
 data/src/share/classes/sun/nio/cs/UTF_32Coder.java.i
-data/test/java/awt/Frame/FrameLocation/FrameLocation.java.i
+data/test/java/io/Serializable/superclassDataLoss/A.java.i
 data/src/share/classes/java/util/WeakHashMap.java.i
 data/src/share/classes/sun/reflect/UnsafeFloatFieldAccessorImpl.java.i
 data/test/javax/management/Introspector/UnDescribedMBean.java.i
-data/test/java/io/Serializable/InvalidClassException/noargctor/DefaultPackage.java.i
 data/test/com/sun/jdi/UTF8Test.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageCreate.c.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceEntryMeta.java.i
@@ -8448,31 +8395,33 @@ data/test/javax/crypto/JceSecurity/MyX509CertImpl.java.i
 data/src/solaris/native/sun/java2d/x11/X11Renderer.c.i
 data/src/share/classes/javax/swing/event/UndoableEditEvent.java.i
 data/src/share/classes/sun/awt/ModalExclude.java.i
+data/src/share/classes/sun/security/tools/JarSignerResources.java.i
 data/src/share/classes/com/sun/jmx/remote/internal/RMIExporter.java.i
-data/src/share/classes/com/sun/net/httpserver/HttpsExchange.java.i
 data/test/java/nio/channels/Selector/WakeupNow.java.i
 data/src/share/classes/sun/nio/ByteBuffered.java.i
 data/test/sun/security/ssl/sanity/pluggability/CheckSockFacExport1.java.i
 data/test/java/util/jar/JarFile/thawjar.jar.i
 data/src/share/classes/com/sun/jdi/ClassNotPreparedException.java.i
+data/test/sun/security/rsa/GenKeyStore.java.i
 data/test/sun/net/www/protocol/jar/foo1.jar.d
-data/src/linux/doc/man/apt.1.i
+data/src/share/classes/javax/imageio/ImageReader.java.i
 data/src/share/native/com/sun/java/util/jar/pack/utils.cpp.i
+data/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java.i
 data/src/solaris/classes/sun/awt/motif/X11CNS11643.java.i
 data/src/share/classes/javax/swing/event/TreeExpansionListener.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiTextUI.java.i
-data/src/share/classes/sun/nio/cs/ext/HKSCS.java.i
+data/src/share/classes/sun/invoke/empty/Empty.java.i
 data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_LineBorderUIResource.java.i
 data/make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java.i
 data/test/sun/tools/native2ascii/A2N_4701617.expected.i
-data/src/share/classes/sun/io/ByteToCharEUC_KR.java.i
+data/src/share/classes/sun/io/ByteToCharCp942C.java.i
 data/test/java/lang/invoke/MethodTypeTest.java.i
 data/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java.i
 data/src/share/classes/java/lang/management/MonitorInfo.java.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties.i
 data/src/share/classes/javax/management/relation/RoleUnresolved.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java.i
-data/test/java/beans/Introspector/Test6277246.java.i
+data/src/share/classes/com/sun/media/sound/ModelAbstractOscillator.java.i
+data/src/share/classes/sun/reflect/UTF8.java.i
 data/src/solaris/classes/java/lang/ProcessImpl.java.i
 data/test/java/util/Collections/Rotate.java.i
 data/src/share/classes/java/util/concurrent/TransferQueue.java.i
@@ -8484,22 +8433,24 @@ data/make/common/shared/Platform.gmk.i
 data/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java.i
 data/src/share/classes/com/sun/tools/jdi/VMModifiers.java.i
 data/src/share/classes/javax/swing/colorchooser/ColorModel.java.i
+data/src/share/classes/java/awt/KeyEventDispatcher.java.i
 data/src/share/classes/sun/reflect/generics/parser/SignatureParser.java.i
 data/test/sun/security/pkcs11/KeyAgreement/TestShort.java.i
 data/test/sun/security/provider/PolicyFile/TokenStore.keystore.i
-data/src/share/classes/javax/script/package.html.i
+data/src/share/demo/nio/zipfs/META-INF/services/java.nio.file.spi.FileSystemProvider.i
 data/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.i
-data/src/share/transport/socket/socketTransport.c.i
+data/test/java/util/Vector/IllegalConstructorArgs.java.i
 data/test/javax/print/applet/AppletPrintLookup.sh.i
-data/src/share/demo/jfc/FileChooserDemo/ExampleFileView.java.i
+data/src/share/classes/sun/awt/NullComponentPeer.java.i
 data/make/tools/swing-beans/beaninfo/images/JMenuColor32.gif.i
 data/test/sun/net/www/protocol/file/GetLastModified.java.i
 data/src/solaris/classes/sun/nio/fs/LinuxFileStore.java.i
 data/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdConcMarkSweepGC.sh.i
 data/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStoreHelper.java.i
 data/src/share/classes/sun/nio/cs/ext/DBCSDecoderMapping.java.i
+data/src/share/classes/sun/font/FontAccess.java.i
 data/src/share/classes/sun/security/util/AuthResources_es.java.i
-data/src/share/classes/com/sun/media/sound/SoftShortMessage.java.i
+data/src/share/classes/com/sun/media/sound/SF2Instrument.java.i
 data/src/share/classes/sun/management/NotificationEmitterSupport.java.i
 data/src/share/classes/sun/rmi/transport/proxy/HttpSendOutputStream.java.i
 data/src/solaris/classes/sun/awt/X11/security-icon-interim16.png.i
@@ -8507,23 +8458,25 @@ data/make/tools/CharsetMapping/IBM280.map.i
 data/src/share/classes/sun/audio/InvalidAudioFormatException.java.i
 data/test/sun/rmi/rmic/oldjavacRemoved/Foo.java.i
 data/test/java/net/DatagramPacket/Offset.java.i
-data/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh.i
-data/src/share/classes/sun/java2d/loops/DrawRect.java.i
+data/make/sun/nio/cs/Makefile.i
 data/src/share/classes/javax/xml/crypto/dsig/spec/C14NMethodParameterSpec.java.i
-data/src/solaris/native/sun/awt/awt_mgrsel.c.i
 data/test/java/lang/StrictMath/Expm1Tests.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_en_IE.properties.i
 data/test/com/sun/jdi/redefine/RedefineSetUp.sh.i
 data/test/com/sun/jdi/PopAndStepTest.java.i
 data/src/share/classes/java/awt/image/WritableRaster.java.i
+data/src/share/classes/java/net/CookieManager.java.i
 data/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java.i
-data/src/share/classes/sun/print/ServiceDialog.java.i
+data/src/solaris/classes/sun/awt/motif/X11DragSourceContextPeer.java.i
 data/src/share/classes/sun/security/jgss/TokenTracker.java.i
 data/src/share/classes/javax/naming/OperationNotSupportedException.java.i
 data/make/tools/swing-beans/beaninfo/images/JCheckBoxMono16.gif.i
 data/test/sun/security/tools/policytool/ChangeUI.sh.i
 data/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java.i
-data/src/solaris/native/sun/net/spi/SdpProvider.c.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java.i
+data/src/share/classes/sun/nio/fs/AbstractWatchKey.java.i
+data/src/share/classes/com/sun/jdi/ObjectCollectedException.java.i
+data/test/com/sun/jdi/Redefine-g.sh.i
+data/src/share/demo/jvmti/waiters/Agent.hpp.i
 data/src/share/classes/sun/tools/tree/PostIncExpression.java.i
 data/test/java/io/LineNumberInputStream/Available.java.i
 data/test/sun/nio/cs/EncodingNothing.java.i
@@ -8531,17 +8484,15 @@ data/src/share/native/sun/java2d/loops/IntArgbPre.h.i
 data/test/java/nio/channels/Pipe/SelectPipe.java.i
 data/make/jpda/back/mapfile-vers.i
 data/src/share/native/java/util/zip/zlib-1.2.3/patches/zlib.h.diff.i
-data/test/java/util/ResourceBundle/Test4314141.java.i
-data/src/share/classes/java/nio/charset/StandardCharset.java.i
+data/src/share/classes/java/util/concurrent/RejectedExecutionHandler.java.i
 data/test/sun/nio/cs/CheckHistoricalNames.java.i
 data/src/share/classes/sun/security/util/Resources_sv.java.i
 data/test/sun/tools/jps/jps-Vvm.sh.i
-data/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java.i
-data/src/share/classes/sun/io/ByteToCharUnicodeBig.java.i
+data/src/share/native/sun/java2d/opengl/OGLContext.h.i
+data/make/sun/text/FILES_properties.gmk.i
 data/src/share/native/sun/java2d/loops/IntArgb.h.i
-data/test/sun/java2d/OpenGL/GradientPaints.java.i
+data/src/share/classes/java/awt/Transparency.java.i
 data/src/share/classes/sun/misc/VM.java.i
-data/make/common/Defs-embedded.gmk.i
 data/test/java/security/cert/CertPathValidator/indirectCRL/openssl.cnf.i
 data/test/java/rmi/activation/Activatable/extLoadedImpl/rmid.security.policy.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_S16.c.i
@@ -8552,13 +8503,13 @@ data/test/java/dyn/InvokeDynamicPrintArgs.java.i
 data/src/solaris/classes/sun/awt/motif/X11CNS11643P1.java.i
 data/src/share/classes/sun/swing/plaf/GTKKeybindings.java.i
 data/src/windows/classes/sun/awt/windows/WBufferStrategy.java.i
-data/test/java/lang/InheritableThreadLocal/ITLRemoveTest.java.i
 data/test/java/awt/GraphicsDevice/CloneConfigsTest.java.i
 data/test/java/lang/Math/HypotTests.java.i
-data/make/sun/net/spi/nameservice/Makefile.i
 data/src/share/classes/sun/security/jgss/spnego/SpNegoToken.java.i
 data/test/javax/swing/text/html/TableView/7030332/sample3.png.i
+data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/file-targets.xml.i
 data/make/netbeans/jdwpgen/nbproject/findbugs.settings.i
+data/make/tools/CharsetMapping/IBM1026.c2b.i
 data/make/com/sun/tools/attach/mapfile-linux.i
 data/src/share/native/sun/java2d/Disposer.h.i
 data/src/share/classes/sun/tools/tree/TypeExpression.java.i
@@ -8571,31 +8522,33 @@ data/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java.i
 data/src/share/classes/sun/io/CharToByteCp933.java.i
 data/src/share/classes/sun/net/httpserver/ServerConfig.java.i
 data/src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java.i
+data/src/share/classes/java/util/prefs/PreferenceChangeListener.java.i
 data/src/share/classes/java/rmi/ServerRuntimeException.java.i
 data/test/sun/security/provider/PolicyFile/TokenStore.pwd.i
 data/src/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java.i
+data/src/share/classes/javax/sound/midi/Sequence.java.i
 data/src/share/classes/sun/applet/AppletViewer.java.i
-data/test/sun/security/x509/X500Name/AllAttribs.java.i
+data/make/java/sql/Makefile.i
 data/src/share/classes/sun/nio/cs/ext/PCK.java.i
 data/test/java/net/ProxySelector/LoopbackAddresses.java.i
-data/src/share/classes/sun/awt/CharsetString.java.i
+data/src/share/classes/java/rmi/server/Unreferenced.java.i
 data/test/sun/security/util/DerValue/BadValue.java.i
 data/test/java/security/cert/CertificateRevokedException/Basic.java.i
 data/test/java/io/PrintWriter/SubClass.java.i
 data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java.i
 data/make/javax/crypto/Defs-jce.gmk.i
-data/src/linux/doc/man/ja/jarsigner.1.i
 data/test/java/rmi/activation/Activatable/extLoadedImpl/CheckLoader.java.i
-data/src/share/classes/javax/swing/plaf/basic/ComboPopup.java.i
+data/src/solaris/sample/dtrace/hotspot_jni/hotspot_jni_calls_tree.d.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMBean.java.i
 data/src/share/classes/sun/tools/java/Package.java.i
 data/src/windows/classes/sun/java2d/windows/WinBackBufferSurfaceData.java.i
 data/src/share/classes/com/sun/media/sound/ModelByteBuffer.java.i
 data/src/share/classes/javax/management/remote/TargetedNotification.java.i
+data/src/share/classes/javax/swing/LayoutComparator.java.i
 data/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneQuestion.wav.i
 data/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/project.xml.i
 data/test/com/sun/security/sasl/gsskerb/runwjaas.csh.i
-data/test/java/beans/Introspector/Test6963811.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java.i
 data/src/share/native/java/util/zip/zlib-1.2.3/deflate.c.i
 data/test/javax/swing/border/Test4247606.html.i
 data/src/share/classes/java/util/HashSet.java.i
@@ -8603,16 +8556,16 @@ data/test/java/io/Writer/WriteFromString.java.i
 data/test/java/lang/reflect/Generics/Probe.java.i
 data/src/windows/native/sun/security/provider/WinCAPISeedGenerator.c.i
 data/src/share/native/sun/java2d/SurfaceData.h.i
-data/make/mkdemo/management/README.txt.i
+data/src/share/classes/sun/awt/image/ImagingLib.java.i
 data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/ComURLNulls.java.i
 data/src/share/classes/javax/management/modelmbean/DescriptorSupport.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicBorders.java.i
 data/test/org/openjdk/jigsaw/maze.sh.i
 data/src/share/lib/images/cursors/win32_CopyDrop32x32.gif.i
 data/make/tools/CharsetMapping/Johab.map.d
+data/make/org/jcp/Makefile.i
 data/src/share/classes/javax/swing/plaf/metal/MetalComboBoxIcon.java.i
 data/test/java/util/zip/InfoZip.java.i
-data/src/share/classes/java/awt/TexturePaint.java.i
 data/test/java/nio/Buffer/LimitDirectMemory.sh.i
 data/src/share/classes/org/openjdk/jigsaw/JigsawVersionQuery.java.i
 data/src/share/classes/org/openjdk/jigsaw/Trace.java.i
@@ -8620,8 +8573,6 @@ data/src/share/classes/javax/swing/plaf/RootPaneUI.java.i
 data/make/tools/CharsetMapping/Johab.map.i
 data/test/javax/swing/SwingTest.java.i
 data/test/java/security/UnresolvedPermission/DebugPermission0.java.i
-data/test/com/sun/crypto/provider/Cipher/RSA/TestRSA.java.i
-data/test/lib/security/java.policy/Ext_AllPolicy.sh.i
 data/src/share/classes/sun/java2d/pipe/RenderingEngine.java.i
 data/test/com/sun/servicetag/JavaServiceTagTest1.java.i
 data/src/share/classes/java/nio/file/FileSystemException.java.i
@@ -8630,11 +8581,11 @@ data/test/java/net/Authenticator/B4933582.sh.i
 data/src/solaris/hpi/native_threads/include/np.h.i
 data/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java.i
 data/test/javax/script/NullUndefinedVarTest.java.i
-data/src/share/classes/sun/java2d/pipe/RegionIterator.java.i
+data/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemMono32.gif.i
 data/test/java/security/KeyRep/Blowfish.pre.1.5.key.i
 data/test/javax/swing/JColorChooser/Test6541987.java.i
 data/test/java/util/EnumSet/JumboRange.java.i
-data/src/share/demo/management/FullThreadDump/Deadlock.java.i
+data/src/share/classes/javax/sql/rowset/spi/SyncFactoryException.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java.i
 data/src/share/classes/javax/management/relation/RelationSupportMBean.java.i
 data/test/javax/management/relation/RelationTypeTest.java.i
@@ -8646,13 +8597,11 @@ data/src/share/classes/sun/invoke/util/package-info.java.i
 data/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java.i
 data/test/java/lang/annotation/Missing/MissingWrapper.java.i
 data/src/share/classes/sun/nio/fs/BasicFileAttributesHolder.java.i
-data/src/share/native/sun/awt/image/jpeg/jinclude.h.i
 data/src/share/classes/sun/util/resources/CalendarData_de.properties.i
 data/src/share/classes/sun/io/ByteToCharCp1381.java.i
 data/src/share/classes/java/net/URI.java.i
-data/src/windows/native/sun/jkernel/graphics/cautionshield32.bmp.i
+data/src/share/classes/sun/misc/FormattedFloatingDecimal.java.i
 data/src/share/classes/javax/swing/table/TableCellEditor.java.i
-data/src/share/classes/sun/tools/serialver/SerialVer.java.i
 data/test/java/beans/Introspector/Test6660539.java.i
 data/src/share/classes/javax/smartcardio/ATR.java.i
 data/src/share/classes/java/util/prefs/Preferences.java.i
@@ -8661,26 +8610,27 @@ data/src/share/classes/com/sun/inputmethods/internal/thaiim/java.awt.im.spi.Inpu
 data/src/share/classes/sun/text/normalizer/NormalizerDataReader.java.i
 data/src/share/classes/sun/util/resources/CalendarData_pt_PT.properties.i
 data/src/share/classes/sun/swing/ImageCache.java.i
+data/test/sun/nio/cs/StreamEncoderClose.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLEncryptionException.java.i
-data/test/java/rmi/reliability/benchmark/bench/serial/Strings.java.i
+data/src/share/native/java/lang/fdlibm/src/k_standard.c.i
 data/src/share/classes/sun/security/provider/SunEntries.java.i
 data/src/share/classes/com/sun/net/ssl/TrustManager.java.i
+data/test/javax/security/auth/x500/X500Principal/KeywordMap.java.i
 data/src/share/classes/sun/nio/cs/ext/MS50221.java.i
 data/test/java/net/Inet4Address/isSiteLocalAddress.java.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/image-failed.png.i
 data/test/sun/security/pkcs11/KeyAgreement/TestDH.java.i
 data/make/tools/sharing/tests/Hello.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/OpenStream.java.i
-data/test/sun/security/tools/jarsigner/oldsig.sh.i
+data/src/share/classes/java/security/KeyStoreException.java.i
 data/test/com/sun/jdi/MethodCalls.java.i
-data/src/share/classes/javax/swing/text/Caret.java.i
 data/test/java/beans/PropertyEditor/TestColorClass.java.i
+data/src/share/classes/javax/swing/plaf/ListUI.java.i
 data/src/share/demo/jfc/Notepad/resources/Notepad_fr.properties.i
 data/src/share/classes/sun/io/ByteToCharCp949.java.i
-data/test/sun/rmi/transport/tcp/blockAccept/TestIface.java.i
+data/test/java/util/ResourceBundle/RestrictedBundleTest.java.i
 data/test/java/io/StringReader/NegativeMarkLimit.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/Icons.java.i
-data/src/share/classes/sun/misc/JavaIODeleteOnExitAccess.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java.i
 data/src/share/classes/java/io/SerialCallbackContext.java.i
 data/src/share/classes/javax/print/attribute/DocAttribute.java.i
@@ -8688,12 +8638,14 @@ data/src/solaris/classes/sun/net/sdp/SdpProvider.java.i
 data/src/share/classes/com/sun/jdi/event/Event.java.i
 data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java.i
 data/test/javax/crypto/spec/RC5ParameterSpec/InvalidIV.java.i
-data/src/share/classes/sun/java2d/pipe/TextRenderer.java.i
+data/src/share/classes/java/nio/file/attribute/PosixFilePermissions.java.i
 data/test/sun/security/pkcs11/Signature/TestRSAKeyLength.java.i
 data/src/share/classes/sun/io/ByteToCharCp838.java.i
 data/test/javax/rmi/ssl/keystore.i
 data/src/share/native/java/lang/fdlibm/src/w_j0.c.i
 data/src/share/classes/sun/security/krb5/internal/crypto/DesMacKCksumType.java.i
+data/src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java.i
 data/src/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java.i
 data/src/share/classes/java/nio/X-Buffer-bin.java.i
 data/src/share/classes/sun/util/xml/XMLUtils.java.i
@@ -8704,46 +8656,41 @@ data/src/share/classes/javax/swing/SizeRequirements.java.i
 data/src/share/classes/sun/management/HotspotThread.java.i
 data/make/modules/image.rest.ls.i
 data/src/linux/doc/man/ja/rmiregistry.1.i
-data/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java.i
+data/src/solaris/classes/sun/misc/FileURLMapper.java.i
 data/src/share/classes/javax/sound/midi/MidiSystem.java.i
 data/src/share/native/sun/java2d/loops/ThreeByteBgr.h.i
 data/src/share/native/java/util/zip/zlib-1.1.3/zutil.h.i
 data/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java.i
-data/test/javax/swing/JFileChooser/4252173/bug4252173.java.i
-data/test/java/awt/Graphics2D/DrawString/LCDTextSrcEa.java.i
+data/make/java/beans/Makefile.i
 data/src/share/classes/sun/security/jgss/GSSCredentialImpl.java.i
+data/src/share/classes/javax/swing/tree/AbstractLayoutCache.java.i
 data/make/sun/awt/mapfile-vers-linux.i
 data/src/share/classes/java/util/prefs/AbstractPreferences.java.i
 data/src/share/classes/com/sun/tools/jdi/ValueImpl.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java.i
 data/src/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java.i
-data/test/java/rmi/transport/checkFQDN/CheckFQDN.java.i
 data/make/tools/CharsetMapping/IBM1006.map.i
 data/test/java/lang/instrument/appendToClassLoaderSearch/B.2.i
-data/test/java/util/ResourceBundle/ReferencesTestBundle.properties.i
+data/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java.i
 data/src/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java.i
 data/src/share/classes/sun/java2d/pipe/hw/AccelDeviceEventNotifier.java.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/directory.gif.i
-data/src/share/classes/javax/print/attribute/standard/PrinterMakeAndModel.java.i
 data/src/share/classes/sun/text/normalizer/UnicodeSet.java.i
-data/src/solaris/classes/sun/awt/X11/XAtom.java.i
+data/src/share/classes/sun/security/provider/MD4.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java.i
 data/test/java/lang/Math/HyperbolicTests.java.i
-data/src/share/classes/java/awt/geom/FlatteningPathIterator.java.i
 data/test/javax/management/remote/mandatory/version/JMXSpecVersionTest.java.i
 data/src/share/classes/com/sun/media/sound/DLSSample.java.i
-data/test/java/nio/channels/AsyncCloseAndInterrupt.java.i
+data/src/share/classes/java/security/SecureClassLoader.java.i
 data/make/tools/CharsetMapping/IBM285.map.i
 data/test/java/awt/Multiscreen/TranslucencyThrowsExceptionWhenFullScreen/TranslucencyThrowsExceptionWhenFullScreen.java.i
-data/test/java/util/Collections/CheckedMapBash.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java.i
 data/make/tools/src/build/tools/jdwpgen/ConstantNode.java.i
-data/src/share/classes/javax/naming/ldap/ExtendedRequest.java.i
 data/test/java/lang/instrument/NullGetObjectSizeTest.java.i
 data/src/share/classes/java/rmi/server/package.html.i
 data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init5.java.i
 data/src/solaris/classes/sun/nio/ch/SctpNotification.java.i
 data/make/common/Demo.gmk.i
-data/make/tools/fontchecker/Makefile.i
 data/src/share/classes/sun/beans/editors/BooleanEditor.java.i
 data/test/java/awt/Graphics2D/RenderClipTest/6766342.tests.i
 data/test/java/nio/BufferPoolMXBean/Basic.java.i
@@ -8757,26 +8704,21 @@ data/src/share/classes/sun/dyn/MethodHandleNatives.java.i
 data/src/share/classes/javax/swing/doc-files/JLayeredPane-1.gif.i
 data/src/share/native/sun/font/layout/ScriptAndLanguage.cpp.i
 data/src/share/classes/com/sun/media/sound/AutoConnectSequencer.java.i
-data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java.i
 data/src/share/classes/javax/swing/doc-files/JRootPane-1.gif.i
 data/test/javax/swing/JButton/6604281/bug6604281.java.i
-data/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java.i
-data/test/java/io/File/Cons.java.i
-data/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java.i
 data/src/share/classes/sun/nio/cs/IBM874.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpFunc.h.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunities.java.i
 data/test/java/lang/ClassLoader/findSystemClass/java/lang/Object.class.i
 data/src/share/classes/sun/management/snmp/jvminstr/JVM_MANAGEMENT_MIB_IMPL.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/icons/image-delayed.png.i
 data/src/share/classes/java/lang/reflect/Executable.java.i
-data/test/java/nio/channels/SocketChannel/BufferSize.java.i
 data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyName.java.i
 data/src/share/classes/com/sun/media/sound/SoftTuning.java.i
 data/test/javax/swing/JColorChooser/Test4222508.html.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.access.in.i
+data/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/java/net/MyDatagramSocketImplFactory.java.i
 data/src/share/classes/sun/security/ssl/SSLSocketImpl.java.i
-data/src/share/native/sun/font/layout/GlyphIterator.h.i
+data/src/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java.i
 data/src/share/demo/jfc/Metalworks/resources/HelpFiles/credits.html.i
 data/src/share/classes/sun/security/jgss/GSSManagerImpl.java.i
 data/src/share/classes/sun/reflect/DelegatingConstructorAccessorImpl.java.i
@@ -8784,29 +8726,23 @@ data/src/share/classes/java/awt/image/DataBufferUShort.java.i
 data/test/java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java.i
 data/src/share/sample/jmx/jmx-scandir/docfiles/connect-local.jpg.i
 data/src/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java.i
-data/test/java/net/URLEncoder/URLEncodeDecode.java.i
 data/make/sun/management/Makefile.i
-data/test/java/util/Arrays/Sorting.java.i
 data/src/share/native/sun/font/layout/Features.cpp.i
 data/test/java/lang/System/finalization/FinExit.sh.i
 data/src/share/classes/sun/security/ssl/ClientHandshaker.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/icons/TreeClosed.gif.i
 data/make/tools/src/build/tools/automulti/TestALFLookAndFeel.java.i
-data/test/sun/java2d/DirectX/NonOpaqueDestLCDAATest/NonOpaqueDestLCDAATest.java.i
+data/test/java/nio/channels/SocketChannel/Stream.java.i
 data/src/share/classes/java/net/ResponseCache.java.i
 data/src/share/classes/java/awt/SplashScreen.java.i
-data/src/share/classes/sun/io/ByteToCharCp1123.java.i
-data/test/java/lang/ThreadLocal/ImmutableLocal.java.i
 data/make/java/hpi/native/reorder-i586.i
 data/test/ModulesProblemList.txt.i
-data/test/javax/swing/JDialog/6639507/bug6639507.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java.i
 data/test/java/lang/management/ThreadMXBean/ThreadUserTime.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java.i
-data/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh.i
-data/test/java/io/Serializable/classDescFlagConflict/Read.java.i
 data/src/windows/native/sun/windows/awt_Debug.cpp.i
-data/test/sun/security/util/BitArray/NamedBitList.java.i
 data/src/share/classes/java/lang/management/MemoryUsage.java.i
+data/src/share/demo/jvmti/hprof/hprof_ioname.h.i
 data/src/share/classes/sun/io/ByteToCharCp942.java.i
 data/test/java/nio/channels/SocketChannel/FinishConnect.java.i
 data/test/java/util/PluggableLocale/providersrc/java.text.spi.BreakIteratorProvider.i
@@ -8818,21 +8754,22 @@ data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties.i
 data/test/java/io/File/CreateNewFile.java.i
 data/src/share/classes/sun/io/CharToByteSingleByte.java.i
-data/src/share/classes/java/rmi/server/RemoteCall.java.i
+data/test/java/beans/PropertyEditor/TestFloatClassNull.java.i
 data/src/share/classes/javax/security/auth/DestroyFailedException.java.i
 data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.ssl.in.i
-data/src/share/classes/sun/security/krb5/internal/KRBSafe.java.i
+data/src/share/classes/java/lang/IncompatibleClassChangeError.java.i
+data/src/share/classes/java/net/PasswordAuthentication.java.i
 data/src/solaris/native/sun/nio/ch/Net.c.i
 data/src/share/classes/com/sun/media/sound/WaveFileWriter.java.i
 data/test/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html.i
 data/src/share/classes/javax/swing/tree/RowMapper.java.i
 data/src/share/native/sun/awt/medialib/mlib_image_proto.h.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/error.png.i
-data/src/windows/native/sun/java2d/d3d/D3DRenderQueue.cpp.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/CipherSuite/SSL_NULL.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmMemoryMeta.java.i
+data/src/share/classes/com/sun/security/auth/PolicyParser.java.i
+data/src/solaris/native/sun/java2d/loops/vis_ByteGray.c.i
 data/test/sun/java2d/DirectX/OpaqueImageToSurfaceBlitTest/OpaqueImageToSurfaceBlitTest.java.i
 data/src/share/native/sun/java2d/loops/UshortGray.h.i
-data/src/solaris/classes/sun/awt/X11/XTextTransferHelper.java.i
 data/src/share/native/java/util/zip/zlib-1.1.3/zconf.h.i
 data/make/common/shared/Defs-java.gmk.i
 data/src/share/classes/java/awt/AWTError.java.i
@@ -8840,13 +8777,13 @@ data/src/share/classes/org/openjdk/internal/joptsimple/internal/AbbreviationMap.
 data/make/tools/swing-beans/beaninfo/images/JOptionPaneMono16.gif.i
 data/test/com/sun/jdi/PopAsynchronousTest.java.i
 data/src/share/classes/java/awt/color/ProfileDataException.java.i
-data/src/solaris/doc/sun/man/man1/ja/keytool.1.i
+data/test/javax/script/Test3.js.i
+data/make/tools/src/build/tools/jdwpgen/StringObjectTypeNode.java.i
 data/make/com/sun/security/auth/module/Makefile.i
 data/src/share/classes/javax/swing/colorchooser/DiagramComponent.java.i
 data/test/java/lang/StringBuffer/Capacity.java.i
 data/src/windows/native/sun/java2d/d3d/D3DMaskFill.cpp.i
 data/src/share/classes/javax/security/auth/login/ConfigurationSpi.java.i
-data/src/share/classes/sun/awt/resources/awt_zh_TW.properties.i
 data/src/share/classes/javax/management/MatchQueryExp.java.i
 data/src/share/classes/sun/tools/jstat/Expression.java.i
 data/src/share/classes/java/util/prefs/XmlSupport.java.i
@@ -8861,26 +8798,27 @@ data/test/javax/management/eventService/ListenerTest.java.i
 data/test/java/lang/instrument/ATransformerManagementTestCase.java.i
 data/src/share/native/sun/awt/image/jpeg/jdhuff.c.i
 data/test/com/sun/security/auth/login/ConfigFile/EmptyOption.config.i
-data/src/share/classes/javax/swing/plaf/metal/sounds/MenuItemCommand.wav.i
 data/src/share/classes/java/awt/CheckboxGroup.java.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolEntryImpl.java.i
 data/src/share/classes/java/util/concurrent/BrokenBarrierException.java.i
-data/src/share/classes/sun/tools/serialver/serialver_ja.properties.i
+data/src/solaris/doc/sun/man/man1/ja/jsadebugd.1.i
+data/src/share/classes/sun/tools/tree/LocalMember.java.i
 data/src/share/classes/sun/tools/jstat/AscendingMonitorComparator.java.i
 data/test/java/net/URLClassLoader/AddURLTest.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java.i
+data/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties.i
 data/src/share/native/sun/font/layout/GlyphIterator.cpp.i
 data/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh.i
 data/test/sun/management/jmxremote/RunTest.sh.i
 data/test/sun/security/tools/policytool/OpenPolicy.html.i
+data/test/sun/security/provider/PolicyParser/ExtDirsDefaultPolicy.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c.i
 data/src/share/bin/wildcard.c.i
 data/src/share/classes/sun/text/resources/FormatData_mt.java.i
 data/src/share/native/java/lang/fdlibm/src/e_j1.c.i
 data/src/share/classes/sun/security/ssl/InputRecord.java.i
-data/test/java/beans/PropertyEditor/Test6397609.java.i
+data/src/share/classes/sun/nio/cs/ext/Johab.java.i
 data/src/share/demo/applets/DitherTest/example1.html.i
 data/test/java/util/IdentityHashMap/DistinctEntrySetElements.java.i
-data/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java.i
 data/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java.i
 data/test/sun/tools/jstat/jstatOptions1.sh.i
 data/test/java/security/Policy/GetInstance/GetInstanceSecurity.policy.i
@@ -8888,13 +8826,11 @@ data/test/javax/management/notification/NotifExecutorTest.java.i
 data/test/sun/tools/jconsole/ImmutableResourceTest.java.i
 data/src/windows/classes/sun/print/Win32MediaTray.java.i
 data/src/share/classes/java/security/interfaces/ECPublicKey.java.i
-data/test/sun/security/provider/PolicyFile/getinstance/GetInstance.policy.i
 data/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5CksumType.java.i
 data/src/solaris/native/sun/awt/awt_GraphicsEnv.c.i
 data/src/share/classes/java/awt/GraphicsConfiguration.java.i
 data/src/share/classes/sun/tools/java/Constants.java.i
-data/test/javax/management/remote/mandatory/passwordAccessFile/password.properties.i
-data/test/java/util/Locale/serialized/java6locale_iw_IL.i
+data/test/java/security/SecureRandom/Serialize.java.i
 data/test/java/lang/management/ManagementFactory/GetObjectName.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ServerThread.java.i
 data/src/share/native/sun/awt/debug/debug_assert.h.i
@@ -8904,7 +8840,7 @@ data/test/sun/security/util/DerValue/NegInt.java.i
 data/src/share/classes/sun/net/www/protocol/http/NTLMAuthenticationProxy.java.i
 data/test/java/rmi/reliability/benchmark/bench/serial/Bytes.java.i
 data/src/solaris/native/sun/security/smartcardio/MUSCLE/winscard.h.i
-data/test/java/awt/print/PrinterJob/ExceptionTest.java.i
+data/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c.i
 data/test/javax/management/Introspector/AnnotatedMBeanTest.java.i
 data/src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java.i
 data/src/share/classes/sun/io/CharToByteISO8859_8.java.i
@@ -8917,14 +8853,15 @@ data/src/share/classes/sun/audio/AudioTranslatorStream.java.i
 data/test/java/util/BitSet/And.java.i
 data/test/sun/net/InetAddress/nameservice/dns/Lookup.java.i
 data/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java.i
-data/src/share/classes/sun/security/krb5/internal/TransitedEncoding.java.i
+data/test/java/beans/PropertyEditor/TestEnumClassNull.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java.i
+data/src/share/classes/java/rmi/server/RemoteRef.java.i
 data/src/solaris/native/sun/nio/ch/InheritedChannel.c.i
 data/src/share/classes/sun/security/krb5/internal/KdcErrException.java.i
 data/src/share/native/java/util/zip/zlib-1.1.3/gzio.c.i
 data/src/share/javavm/include/opcodes.list.i
 data/test/java/lang/instrument/InstrumentationHandoff.java.i
-data/test/java/beans/Introspector/Test6194788.java.i
+data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManager.java.i
 data/test/java/lang/reflect/ReflectPermission/Exceptions.java.i
 data/src/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java.i
 data/test/org/openjdk/jigsaw/preinstall.sh.i
@@ -8932,16 +8869,16 @@ data/test/com/sun/servicetag/InvalidRegistrationData.java.i
 data/src/share/classes/sun/tools/tree/FloatExpression.java.i
 data/src/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java.i
 data/src/solaris/classes/sun/awt/X11/XWindowPeer.java.i
+data/src/share/classes/sun/util/resources/CalendarData_sr_Latn_RS.properties.i
 data/src/share/classes/java/lang/instrument/UnmodifiableClassException.java.i
 data/src/share/classes/sun/io/CharToByteCp949.java.i
-data/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java.i
-data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/FileListTransferable.java.i
+data/src/share/classes/java/net/SdpSocketImpl.java.i
 data/src/solaris/native/sun/awt/VDrawingAreaP.h.i
 data/src/share/classes/sun/text/resources/FormatData_ar_LB.java.i
 data/src/share/classes/sun/io/ByteToCharCp284.java.i
 data/src/share/classes/com/sun/jndi/dns/Resolver.java.i
 data/src/share/classes/sun/security/x509/BasicConstraintsExtension.java.i
-data/src/share/classes/com/sun/jdi/JDIPermission.java.i
+data/src/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java.i
 data/test/java/awt/event/MouseEvent/CheckGetMaskForButton/CheckGetMaskForButton.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java.i
 data/src/share/native/common/opcodes.in_out.i
@@ -8950,16 +8887,17 @@ data/src/solaris/native/sun/awt/awt_xembed.c.i
 data/src/share/classes/java/io/FilterWriter.java.i
 data/src/share/classes/com/sun/jdi/ObjectReference.java.i
 data/src/share/classes/com/sun/media/sound/FFT.java.i
+data/src/share/native/sun/awt/splashscreen/splashscreen_png.c.i
+data/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java.i
 data/src/share/classes/javax/swing/CellEditor.java.i
 data/test/java/security/Policy/GetPermissions/JarURL.java.i
 data/test/java/lang/instrument/AppendToClassPathTest.java.i
 data/src/share/classes/java/nio/file/Files.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java.i
 data/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java.i
-data/test/sun/nio/cs/TestX11JIS0201.java.i
 data/src/share/classes/javax/accessibility/AccessibleExtendedTable.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Warn.gif.i
-data/make/com/sun/jmx/Makefile.i
+data/src/share/native/sun/font/layout/ExtensionSubtables.cpp.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformItem.java.i
 data/src/share/classes/sun/misc/JavaNioAccess.java.i
 data/test/javax/management/query/QueryExpStringTest.java.i
@@ -8971,20 +8909,21 @@ data/src/share/classes/sun/audio/AudioSecurityAction.java.i
 data/src/share/classes/com/sun/security/sasl/gsskerb/FactoryImpl.java.i
 data/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java.i
 data/test/com/sun/jdi/JdbMethodExitTest.sh.i
+data/src/share/classes/sun/nio/fs/AbstractFileSystemProvider.java.i
 data/test/java/net/Socket/TestTcpNoDelay.java.i
 data/src/share/classes/sun/beans/editors/DoubleEditor.java.i
 data/src/share/classes/java/security/cert/CertificateFactory.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java.i
-data/src/windows/native/sun/java2d/d3d/D3DTextRenderer.h.i
+data/make/tools/swing-beans/beaninfo/images/JPanelMono16.gif.i
 data/src/share/classes/java/security/cert/CertificateNotYetValidException.java.i
 data/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/netbeans-targets.xml.i
-data/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService_Stub.java.i
-data/test/sun/security/tools/policytool/ChangeUI.html.i
-data/src/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java.i
+data/src/share/classes/sun/rmi/transport/Endpoint.java.i
+data/src/share/classes/java/lang/reflect/Member.java.i
+data/src/share/native/sun/awt/medialib/mlib_sys.h.i
 data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnspr4.so.i
 data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServer.java.i
 data/test/java/rmi/server/ObjID/randomIDs/RandomIDs.java.i
-data/src/share/classes/sun/security/provider/certpath/OCSPRequest.java.i
+data/src/windows/native/sun/windows/awt_Button.cpp.i
 data/src/share/classes/sun/util/resources/LocaleNames_ga.properties.i
 data/make/javax/swing/FILES.gmk.i
 data/test/javax/management/query/QueryMatchTest.java.i
@@ -8992,44 +8931,43 @@ data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java.i
 data/test/java/io/Serializable/6559775/SerialVictim.java.i
 data/src/share/classes/sun/io/CharToByteCp871.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM1140.java.i
+data/src/share/classes/sun/applet/resources/MsgAppletViewer_de.java.i
 data/src/share/sample/vm/jvm-clr/README.txt.i
 data/src/share/native/com/sun/media/sound/MidiOutDevice.c.i
-data/src/share/native/java/util/zip/zlib-1.2.3/inffast.h.i
 data/test/java/lang/instrument/RedefineClassesTests.java.i
 data/src/windows/native/sun/windows/awt_IconCursor.cpp.i
 data/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java.i
 data/src/share/classes/com/sun/tools/jdi/StackFrameImpl.java.i
 data/test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh.i
 data/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java.i
-data/src/share/classes/java/awt/image/BandCombineOp.java.i
 data/test/java/nio/channels/Selector/OpRead.java.i
 data/src/share/classes/java/lang/module/ModuleNotPresentException.java.i
 data/test/java/awt/font/TextLayout/UnderlinePositionTest.java.i
 data/src/share/classes/java/awt/event/MouseMotionListener.java.i
 data/src/solaris/transport/socket/socket_md.h.i
 data/src/share/classes/javax/imageio/spi/ImageInputStreamSpi.java.i
-data/src/share/native/java/util/zip/zlib-1.2.3/uncompr.c.i
 data/test/java/rmi/transport/httpSocket/security.policy.i
 data/src/share/classes/java/awt/geom/RectIterator.java.i
 data/test/demo/jvmti/waiters/WaitersTest.java.i
 data/src/share/classes/com/sun/jndi/toolkit/ctx/HeadTail.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_F32.c.i
+data/src/share/classes/sun/tools/jconsole/resources/connected16.png.i
 data/src/share/classes/java/util/PriorityQueue.java.i
 data/test/sun/misc/Encode/Encode.java.i
 data/test/sun/security/provider/PolicyParser/p001.policy.i
-data/test/sun/security/provider/PolicyFile/Alias.policy.i
+data/src/share/native/sun/font/layout/PairPositioningSubtables.h.i
 data/src/share/classes/java/awt/image/SampleModel.java.i
 data/test/java/rmi/reliability/benchmark/bench/BenchInfo.java.i
-data/src/solaris/doc/sun/man/man1/rmic.1.i
+data/src/solaris/native/sun/awt/awt_Insets.h.i
 data/src/share/classes/sun/util/resources/LocaleNames_fi.properties.i
 data/src/share/classes/javax/net/ssl/TrustManagerFactorySpi.java.i
 data/src/windows/classes/sun/security/mscapi/JarVerifier.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Bit.c.i
+data/src/share/native/sun/awt/libpng/README.i
 data/src/share/native/sun/awt/medialib/mlib_ImageConv_F32nw.c.i
 data/src/share/classes/java/security/spec/PSSParameterSpec.java.i
-data/src/share/classes/java/awt/font/GlyphMetrics.java.i
-data/src/share/classes/com/sun/beans/decoder/AccessorElementHandler.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java.i
+data/test/javax/management/openmbean/CompositeDataStringTest.java.i
+data/src/share/classes/javax/print/attribute/PrintJobAttribute.java.i
+data/test/sun/security/util/DerValue/EmptyValue.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/package.html.i
 data/src/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreDown.wav.i
 data/src/share/classes/javax/management/monitor/MonitorSettingException.java.i
@@ -9042,17 +8980,17 @@ data/test/java/util/concurrent/ThreadPoolExecutor/Custom.java.i
 data/test/javax/swing/JColorChooser/Test4177735.java.i
 data/test/sun/security/provider/MessageDigest/TestSHAClone.java.i
 data/src/linux/doc/man/ja/servertool.1.i
-data/src/share/classes/sun/security/x509/SerialNumber.java.i
+data/test/java/io/Serializable/oldTests/CircularList.java.i
 data/test/java/util/zip/ZipFile/input.zip.i
 data/test/com/sun/jndi/ldap/LdapsReadTimeoutTest.java.i
-data/test/java/rmi/reliability/benchmark/bench/serial/ObjTrees.java.i
+data/src/share/classes/com/sun/jmx/event/LeaseManager.java.i
 data/src/share/classes/com/sun/jmx/snmp/mpm/SnmpMsgTranslator.java.i
-data/make/tools/CharsetMapping/MacGreek.map.i
-data/src/share/classes/javax/naming/TimeLimitExceededException.java.i
+data/src/solaris/hpi/native_threads/src/monitor_md.c.i
 data/make/jpda/front/Makefile.i
 data/src/share/classes/java/nio/file/PathMatcher.java.i
 data/src/share/classes/sun/io/ByteToCharMS950_HKSCS.java.i
 data/test/java/lang/String/ToUpperCase.java.i
+data/src/share/classes/sun/net/www/http/HttpClient.java.i
 data/src/share/classes/javax/accessibility/AccessibleText.java.i
 data/src/windows/native/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.c.i
 data/test/java/util/Formatter/Basic.java.i
@@ -9061,35 +8999,38 @@ data/src/share/classes/javax/swing/DefaultListSelectionModel.java.i
 data/src/share/classes/sun/text/resources/FormatData_en_AU.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_ko.properties.i
 data/test/sun/security/krb5/auto/TwoPrinces.java.i
-data/test/java/lang/invoke/ThrowExceptionsTest.java.i
+data/src/windows/native/sun/jkernel/resource.h.i
 data/src/share/classes/javax/swing/text/StringContent.java.i
 data/test/java/io/PipedReader/ReadToArray.java.i
-data/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java.i
 data/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-40.xml.i
 data/src/share/classes/com/sun/tools/hat/internal/oql/OQLException.java.i
 data/src/share/classes/com/sun/jarsigner/package.html.i
 data/src/share/classes/javax/swing/text/DefaultTextUI.java.i
 data/src/share/classes/sun/font/GlyphLayout.java.i
 data/src/share/classes/java/sql/Timestamp.java.i
-data/test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.so.i
+data/test/javax/naming/ldap/LdapName/RdnToAttrsTest.java.i
 data/src/share/classes/java/nio/exceptions.i
 data/src/share/native/sun/awt/medialib/mlib_image_get.h.i
 data/test/java/lang/instrument/ilib/Options.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_ms.properties.i
+data/src/share/demo/management/FullThreadDump/ThreadMonitor.java.i
 data/src/share/classes/sun/io/CharToByteMacGreek.java.i
 data/src/solaris/native/java/util/logging.c.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8ext.c.i
 data/make/sun/applet/Makefile.i
-data/test/java/util/Calendar/Bug6645263.java.i
-data/src/share/classes/javax/swing/plaf/SpinnerUI.java.i
+data/src/share/classes/sun/security/ssl/Debug.java.i
+data/src/share/classes/java/io/FilterOutputStream.java.i
 data/src/solaris/classes/sun/awt/motif/MEmbeddedFrame.java.i
+data/test/java/beans/XMLEncoder/javax_swing_plaf_FontUIResource.java.i
 data/src/share/classes/java/util/TreeSet.java.i
 data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java.i
-data/src/solaris/native/sun/awt/color.h.i
-data/src/share/classes/sun/reflect/FieldInfo.java.i
+data/src/share/demo/scripting/jconsole-plugin/src/META-INF/services/com.sun.tools.jconsole.JConsolePlugin.i
+data/src/share/classes/com/oracle/net/Sdp.java.i
 data/src/share/demo/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml.i
 data/test/java/text/Bidi/BidiBug.java.i
 data/test/java/net/URI/Test.java.i
 data/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java.i
+data/src/share/classes/sun/tools/jconsole/OverviewPanel.java.i
 data/test/java/lang/management/ThreadMXBean/DisableTest.java.i
 data/test/sun/security/pkcs11/tls/TestPremaster.java.i
 data/test/sun/nio/ch/SelProvider.java.i
@@ -9103,12 +9044,12 @@ data/src/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java.i
 data/test/java/beans/XMLDecoder/spec/TestChar.java.i
 data/make/tools/src/build/tools/jdwpgen/RootNode.java.i
 data/test/java/beans/XMLDecoder/spec/TestByte.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java.i
-data/src/share/demo/management/JTop/JTop.java.i
+data/src/share/classes/sun/misc/VMNotification.java.i
 data/src/share/classes/sun/text/resources/FormatData_be.java.i
-data/src/share/classes/sun/applet/AppletViewerFactory.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java.i
 data/test/sun/security/krb5/auto/LoginModuleOptions.java.i
 data/make/tools/swing-beans/beaninfo/images/JSeparatorMono16.gif.i
+data/make/sun/jawt/mapfile-vers.i
 data/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclBlock.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java.i
@@ -9116,41 +9057,37 @@ data/test/java/awt/Graphics/LCDTextAndGraphicsState.java.i
 data/src/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java.i
 data/src/share/classes/java/lang/NumberFormatException.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_en_MT.properties.i
-data/src/share/classes/javax/swing/JRadioButtonMenuItem.java.i
+data/test/com/sun/crypto/provider/TLS/TestPremaster.java.i
 data/src/share/classes/sun/io/CharToByteCp1255.java.i
-data/src/share/native/sun/nio/ch/genSocketOptionRegistry.c.i
 data/test/java/io/StreamTokenizer/NullConstruct.java.i
 data/test/javax/management/Introspector/LegacyIntrospectorTest.java.i
 data/src/share/classes/javax/rmi/ssl/SslRMIServerSocketFactory.java.i
-data/src/share/classes/sun/tools/tree/ShiftLeftExpression.java.i
-data/src/share/classes/javax/swing/DebugGraphicsFilter.java.i
+data/src/share/classes/sun/io/CharToByteSJIS.java.i
 data/src/share/classes/sun/misc/CEStreamExhausted.java.i
 data/make/netbeans/common/sample-view.ent.i
-data/test/com/sun/jdi/TargetListener.java.i
 data/src/share/classes/sun/util/resources/OpenListResourceBundle.java.i
 data/test/sun/nio/cs/TestIllegalSJIS.java.i
 data/THIRD_PARTY_README.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpAckPdu.java.i
 data/test/java/util/ResourceBundle/Control/StressOut_zh_CN.properties.i
+data/src/solaris/classes/sun/awt/X11/XChoicePeer.java.i
 data/src/share/classes/java/lang/reflect/WildcardType.java.i
-data/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java.i
 data/test/sun/security/tools/jarsigner/a%b/percent.keystore.i
 data/src/share/native/sun/font/layout/IndicRearrangementProcessor.h.i
 data/src/share/classes/java/awt/dnd/DragSourceContext.java.i
 data/src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiRules.java.i
-data/src/solaris/classes/sun/awt/motif/MDragSourceContextPeer.java.i
 data/make/jpda/tty/Makefile.i
-data/test/java/beans/Beans/Test4067824.java.i
+data/test/demo/jvmti/gctest/BigHello.java.i
 data/src/linux/doc/man/wsimport.1.i
 data/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java.i
 data/src/share/classes/java/text/RBCollationTables.java.i
 data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init1.java.i
 data/src/share/demo/java2d/J2DBench/resources/textdata/japanese.ut8.txt.i
 data/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java.i
-data/test/javax/management/MBeanServer/MBeanServerNotificationTest.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java.i
+data/src/share/demo/applets/SimpleGraph/example1.html.i
+data/test/javax/print/attribute/ServiceDialogTest.java.i
 data/src/share/demo/jvmti/waiters/README.txt.i
+data/src/share/native/java/lang/fdlibm/src/w_gamma.c.i
 data/src/share/classes/sun/util/resources/CurrencyNames.properties.i
 data/test/java/nio/channels/SocketChannel/OpenLeak.java.i
 data/test/java/lang/instrument/appendToClassLoaderSearch/PrematureLoadTest.java.i
@@ -9160,46 +9097,49 @@ data/src/solaris/native/sun/awt/awt_xembed_server.h.i
 data/test/java/lang/Thread/StackTraces.java.i
 data/test/java/util/ResourceBundle/Test4314141B_fr_CH.java.i
 data/test/java/nio/file/Files/DeleteOnClose.java.i
-data/test/sun/tools/jstatd/jstatdUsage1.sh.i
+data/src/solaris/native/sun/awt/awt_Font.c.i
 data/src/share/sample/nio/server/Server.java.i
+data/make/java/redist/FILES.gmk.i
 data/src/share/classes/sun/swing/text/CountingPrintable.java.i
-data/src/share/native/sun/awt/image/jpeg/jctrans.c.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputStreamTests.java.i
 data/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/Foo.java.i
-data/test/java/awt/PrintJob/RoundedRectTest/RoundedRectTest.java.i
+data/src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java.i
+data/make/sun/security/pkcs11/Makefile.i
 data/test/java/io/Serializable/PutField/Read2.java.i
 data/src/share/classes/sun/io/CharToByteISO2022KR.java.i
 data/src/share/lib/sound.properties.i
 data/test/com/sun/net/httpserver/Test8.java.i
 data/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java.i
 data/src/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java.i
+data/test/java/nio/file/Files/probeContentType/META-INF/services/java.nio.file.spi.FileTypeDetector.i
 data/src/share/classes/javax/sound/midi/Synthesizer.java.i
 data/test/java/lang/reflect/Generics/exceptionCauseTest.java.i
 data/src/share/classes/sun/io/CharToByteCp1141.java.i
 data/test/java/nio/file/Path/DeleteOnClose.java.i
-data/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.java.i
-data/src/share/classes/sun/util/ResourceBundleEnumeration.java.i
+data/src/share/classes/sun/io/ByteToCharISO2022CN.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java.i
 data/src/windows/native/sun/java2d/d3d/D3DMaskBlit.cpp.i
 data/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java.i
 data/test/java/nio/charset/CharsetDecoder/AverageMax.java.i
 data/src/share/classes/java/lang/module/ModuleClassLoader.java.i
 data/test/java/lang/Integer/GetInteger.java.i
+data/src/solaris/classes/sun/font/XMap.java.i
 data/src/share/classes/sun/io/CharToByteCp937.java.i
 data/src/share/classes/java/nio/file/ProviderMismatchException.java.i
+data/src/share/classes/javax/naming/spi/ResolveResult.java.i
 data/src/share/classes/java/security/spec/RSAKeyGenParameterSpec.java.i
 data/test/java/security/Policy/GetInstance/GetInstanceProvider.java.i
 data/src/share/classes/sun/management/MonitorInfoCompositeData.java.i
 data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java.i
+data/test/java/beans/XMLEncoder/java_awt_ScrollPane.java.i
 data/test/java/lang/Class/getDeclaredField/Exceptions.java.i
 data/src/share/classes/javax/xml/crypto/dom/DOMStructure.java.i
 data/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/package.html.i
+data/test/sun/net/www/protocol/http/RelativeRedirect.java.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextConstructionTests.java.i
-data/src/share/native/java/util/zip/zlib-1.1.3/infblock.c.i
-data/test/javax/swing/JSlider/4252173/bug4252173.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthContext.java.i
+data/test/sun/security/tools/jarsigner/emptymanifest.sh.i
 data/test/java/lang/String/CaseConvertSameInstance.java.i
-data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpMibTree.java.i
+data/src/share/classes/java/nio/charset/Charset-X-Coder.java.i
 data/src/share/classes/sun/java2d/loops/FillSpans.java.i
 data/src/share/classes/sun/font/CharToGlyphMapper.java.i
 data/test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy.i
@@ -9207,7 +9147,8 @@ data/src/share/native/sun/awt/image/cvutils/img_replscale.h.i
 data/test/sun/security/krb5/canonicalize/Test.java.i
 data/src/share/classes/java/security/spec/RSAOtherPrimeInfo.java.i
 data/src/share/classes/sun/net/httpserver/ChunkedOutputStream.java.i
-data/src/share/classes/javax/swing/text/html/ObjectView.java.i
+data/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java.i
+data/test/java/security/cert/CertPathValidator/nameConstraints/openssl.cnf.i
 data/src/share/classes/javax/security/cert/CertificateException.java.i
 data/test/java/rmi/reliability/benchmark/bench/rmi/SmallObjTreeCalls.java.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmThreadingImpl.java.i
@@ -9217,20 +9158,25 @@ data/test/javax/sound/sampled/FileWriter/AlawEncoderSync.java.i
 data/test/java/util/IllegalFormatException/Constructors.java.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java.i
 data/src/share/classes/sun/tools/jstat/Parser.java.i
+data/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear_f.c.i
 data/src/share/native/java/lang/fdlibm/src/s_scalbn.c.i
+data/src/share/classes/java/util/TooManyListenersException.java.i
 data/src/share/native/sun/security/ec/ecp.h.i
-data/src/share/classes/javax/sound/midi/Transmitter.java.i
+data/test/java/math/BigInteger/ModPow.java.i
 data/test/sun/net/www/protocol/http/spnegoLogin.conf.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/UIPropertyMapper.java.i
+data/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java.i
+data/src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties.i
 data/test/java/rmi/activation/Activatable/nonExistentActivatable/rmid.security.policy.i
-data/src/share/classes/sun/nio/cs/ISO_8859_9.java.i
+data/src/share/classes/sun/management/GcInfoCompositeData.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/RequiredArgumentOptionSpec.java.i
 data/src/share/classes/com/sun/management/GcInfo.java.i
 data/src/solaris/native/sun/nio/ch/EPollPort.c.i
-data/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.html.i
 data/src/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java.i
 data/test/java/util/Locale/Bug4518797.java.i
-data/test/javax/accessibility/6986385/bug6986385.java.i
+data/test/com/sun/jdi/RedefineFinal.sh.i
+data/test/sun/security/pkcs11/ec/p12passwords.txt.i
 data/test/java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java.i
 data/src/share/classes/sun/java2d/pisces/Curve.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_Fp.c.i
@@ -9239,46 +9185,45 @@ data/src/share/classes/sun/rmi/rmic/newrmic/BatchEnvironment.java.i
 data/test/java/security/KeyRep/DH.pre.1.5.key.i
 data/test/java/awt/PrintJob/PrintArcTest/PrintArcTest.java.i
 data/src/share/classes/java/security/cert/CertPathValidatorSpi.java.i
+data/src/share/classes/javax/swing/ScrollPaneConstants.java.i
 data/src/share/classes/java/rmi/MarshalledObject.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_de.properties.i
-data/src/share/classes/sun/misc/Sort.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/DSAKeyValue.java.i
 data/test/javax/crypto/SecretKeyFactory/P1SecretKeyFactory.java.i
 data/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_sk.properties.i
 data/src/share/native/sun/java2d/loops/FillRect.c.i
 data/test/java/nio/file/Files/ForceLoad.java.i
-data/src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java.i
 data/src/share/classes/sun/awt/image/OffScreenImage.java.i
 data/test/sun/security/krb5/krb5-capaths.conf.i
 data/test/java/lang/reflect/Module/module-annotation.sh.i
-data/test/javax/swing/JScrollBar/6924059/bug6924059.java.i
+data/test/java/util/ResourceBundle/Control/XmlRB_ja.xml.i
 data/src/share/demo/jvmti/hprof/hprof_error.c.i
-data/test/java/net/SocketPermission/NoAction.java.i
+data/src/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java.i
 data/src/share/classes/sun/io/ByteToCharCp297.java.i
-data/test/javax/management/namespace/DomainCreationTest.java.i
+data/test/com/sun/tools/attach/redefineagent.mf.i
 data/make/java/nio/Exportedfiles.gmk.i
 data/test/sun/tools/jhat/HatHeapDump1Test.java.i
 data/test/javax/swing/UIManager/Test6657026.java.i
 data/src/share/sample/scripting/scriptpad/nbproject/project.xml.i
-data/test/javax/imageio/plugins/bmp/TopDownTest.java.i
+data/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java.i
 data/src/share/classes/java/lang/SafeVarargs.java.i
-data/test/sun/security/tools/keytool/CloneKeyAskPassword.sh.i
+data/src/share/classes/sun/tools/tree/UnaryExpression.java.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassFileParser.java.i
 data/src/share/classes/javax/swing/text/html/CSSParser.java.i
-data/test/sun/security/rsa/TestKeyPairGenerator.java.i
 data/test/com/sun/crypto/provider/Cipher/DES/Sealtest.java.i
+data/src/share/classes/javax/net/ssl/SSLSessionBindingEvent.java.i
 data/src/share/demo/applets/NervousText/example1.html.i
-data/src/share/classes/com/sun/tools/script/shell/messages.properties.i
-data/src/share/classes/sun/nio/cs/ISO_8859_4.java.i
+data/src/share/classes/sun/java2d/cmm/lcms/LCMS.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/SynthModel.java.i
-data/test/com/sun/jdi/FieldWatchpoints.java.i
-data/test/javax/crypto/SealedObject/NullKeySealedObject.java.i
+data/src/solaris/native/common/jdk_util_md.h.i
 data/test/sun/security/krb5/auto/SPNEGO.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthArrowButton.java.i
 data/test/javax/swing/JFileChooser/6945316/bug6945316.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U16Func.c.i
-data/test/java/lang/instrument/RedefineMethodAddInvokeTarget.java.i
+data/make/tools/reorder/tools/util-i586.il.i
+data/src/share/native/sun/awt/libpng/pngerror.c.i
 data/src/windows/native/sun/windows/colordata.h.i
 data/test/javax/management/eventService/FetchingTest.java.i
 data/test/java/net/URL/B5086147.java.i
@@ -9286,7 +9231,9 @@ data/src/share/classes/javax/security/auth/login/FailedLoginException.java.i
 data/src/share/classes/java/lang/invoke/MethodHandle.java.i
 data/src/share/classes/sun/util/resources/CalendarData_tr.properties.i
 data/src/share/transport/socket/socketTransport.h.i
+data/src/share/classes/sun/text/resources/CollationData_sr_Latn.java.i
 data/test/java/io/PipedInputStream/Constructors.java.i
+data/test/com/sun/org/apache/xml/internal/security/exceptions/LocaleTest.java.i
 data/test/java/util/Collections/CheckedQueue.java.i
 data/src/share/classes/javax/swing/SwingConstants.java.i
 data/src/share/classes/javax/swing/ComboBoxModel.java.i
@@ -9296,16 +9243,16 @@ data/test/javax/management/remote/mandatory/connection/DeadLockTest.java.i
 data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/group.security.policy.i
 data/test/sun/security/tools/jarsigner/oldsig/A.jar.i
 data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubNextRequestHandler.java.i
-data/test/java/lang/StringBuffer/Supplementary.java.i
 data/src/solaris/classes/sun/awt/X11/XMSelectionListener.java.i
-data/test/java/beans/Introspector/4520754/Foo.java.i
 data/make/sun/cmm/lcms/FILES_c_windows.gmk.i
-data/src/share/classes/org/openjdk/jigsaw/cli/Repositor.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java.i
+data/test/java/util/ArrayList/AddAll.java.i
+data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java.i
+data/src/share/classes/sun/tools/jstat/Literal.java.i
 data/src/windows/native/sun/windows/awt_Unicode.cpp.i
 data/make/modules/image.awt.ls.i
 data/src/share/classes/sun/util/resources/CurrencyNames_es_CL.properties.i
 data/make/sun/awt/mapfile-vers.i
+data/make/sun/security/ec/Makefile.i
 data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScannerMXBean.java.i
 data/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.java.i
 data/make/tools/src/build/tools/jdwpgen/ErrorNode.java.i
@@ -9328,16 +9275,12 @@ data/test/javax/management/loading/LibraryLoader/jar_src/RandomGen.c.i
 data/src/share/classes/javax/print/AttributeException.java.i
 data/test/java/net/ipv6tests/Tests.java.i
 data/test/com/sun/jdi/ListenAddress.java.i
-data/test/java/security/BasicPermission/SerialVersion.java.i
+data/src/share/classes/sun/awt/dnd/SunDropTargetEvent.java.i
 data/src/share/classes/java/nio/file/FileVisitResult.java.i
-data/test/sun/security/tools/jarsigner/emptymanifest.sh.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/package.html.i
 data/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java.i
 data/src/share/classes/java/security/KeyStoreSpi.java.i
 data/src/share/native/sun/java2d/opengl/OGLFuncs.c.i
-data/make/tools/CharsetMapping/IBM037.nr.i
 data/src/share/classes/sun/awt/geom/Edge.java.i
-data/src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java.i
 data/src/share/demo/nbproject/jfc/Metalworks/build.xml.i
 data/src/share/classes/sun/security/util/Cache.java.i
 data/src/share/classes/sun/net/ftp/FtpLoginException.java.i
@@ -9357,7 +9300,7 @@ data/test/sun/security/util/Resources/NewResourcesNames.java.i
 data/test/javax/swing/plaf/nimbus/Test6919629.java.i
 data/test/java/util/IdentityHashMap/EntrySetIteratorRemoveInvalidatesEntry.java.i
 data/src/share/classes/com/sun/media/sound/SoftControl.java.i
-data/test/java/nio/Buffer/CopyDirect-X-Memory.java.template.i
+data/src/share/classes/java/rmi/activation/UnknownGroupException.java.i
 data/make/mksample/scripting/scriptpad/Makefile.i
 data/src/share/native/java/util/zip/zlib-1.1.3/trees.c.i
 data/src/share/classes/java/math/BigInteger.java.i
@@ -9367,30 +9310,31 @@ data/test/java/util/zip/ZipEntry/Clone.java.i
 data/src/share/classes/java/util/concurrent/ScheduledFuture.java.i
 data/make/tools/src/build/tools/jdwpgen/NameValueNode.java.i
 data/src/share/classes/java/awt/peer/RobotPeer.java.i
-data/src/share/classes/sun/java2d/SunCompositeContext.java.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/homeFolder.gif.i
 data/src/share/classes/com/sun/tools/hat/internal/model/Snapshot.java.i
 data/test/javax/swing/plaf/synth/6771547/SynthTest.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiTableUI.java.i
 data/test/sun/nio/cs/OLD/DBCS_IBM_ASCII_Decoder.java.i
+data/src/share/classes/java/lang/CloneNotSupportedException.java.i
 data/test/java/awt/dnd/FileListBetweenJVMsTest/FileListTransferable.java.i
 data/test/sun/nio/cs/X11CNS11643P2.java.i
-data/test/java/security/cert/CertPathValidatorException/cert_file.i
+data/src/share/classes/java/dyn/MethodHandleImpl.java.i
 data/src/share/classes/java/nio/file/Watchable.java.i
 data/test/java/util/ResourceBundle/Bug6356571.java.i
+data/test/java/net/URLConnection/UNCTest.java.i
 data/test/java/util/ResourceBundle/KeySetResources.properties.i
 data/src/share/demo/jvmti/hprof/hprof_loader.c.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java.i
 data/src/share/classes/sun/management/ManagementFactory.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java.i
 data/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java.i
-data/src/solaris/classes/sun/awt/X11/XAtomList.java.i
 data/src/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java.i
-data/src/share/native/sun/reflect/Reflection.c.i
+data/src/share/classes/sun/io/ByteToCharCp1145.java.i
 data/src/share/classes/javax/management/MBeanServerFactory.java.i
-data/src/solaris/classes/sun/java2d/xr/XRMaskImage.java.i
-data/test/sun/security/ssl/sanity/pluggability/MySSLContextImpl.java.i
+data/src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties.i
+data/make/tools/swing-beans/beaninfo/images/JScrollBarMono32.gif.i
 data/src/solaris/demo/jni/Poller/Poller.c.i
+data/src/share/classes/sun/java2d/StateTrackableDelegate.java.i
 data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java.i
 data/src/share/classes/sun/tools/tree/DivRemExpression.java.i
 data/test/com/sun/jdi/SimulResumerTest.java.i
@@ -9408,6 +9352,7 @@ data/src/share/classes/javax/accessibility/AccessibleState.java.i
 data/src/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java.i
 data/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java.i
 data/test/java/lang/Thread/HoldsLock.java.i
+data/test/com/sun/jdi/SourceNameFilterTest.java.i
 data/test/java/io/BufferedReader/EOL.java.i
 data/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java.i
 data/test/java/lang/Runtime/exec/ExitValue.java.i
@@ -9420,34 +9365,29 @@ data/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java.i
 data/src/share/classes/javax/swing/ListSelectionModel.java.i
 data/src/share/classes/javax/print/attribute/standard/MediaSizeName.java.i
 data/src/share/classes/sun/awt/image/SurfaceManager.java.i
-data/src/share/native/sun/java2d/opengl/OGLContext.c.i
-data/src/windows/native/sun/windows/awt_DataTransferer.h.i
+data/make/netbeans/common/architectures/name-Linux.properties.i
 data/test/java/lang/instrument/PremainClass/NoPremainAgent.sh.i
-data/test/java/lang/management/ThreadMXBean/MonitorDeadlock.java.i
-data/src/solaris/classes/sun/java2d/x11/X11VolatileSurfaceManager.java.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.access.in.i
 data/make/sun/security/krb5/FILES_c_windows.gmk.i
 data/src/share/classes/java/awt/dnd/DragGestureListener.java.i
+data/test/java/io/Serializable/unshared/Read.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/OptionSet.java.i
 data/src/share/classes/com/sun/tools/attach/AttachNotSupportedException.java.i
-data/src/share/classes/com/sun/tools/hat/MANIFEST.mf.i
-data/src/share/classes/sun/misc/CRC16.java.i
+data/test/sun/security/x509/AVA/EmptyValue.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java.i
-data/src/share/classes/com/sun/jdi/InvalidStackFrameException.java.i
 data/src/windows/hpi/include/mutex_md.h.i
 data/make/tools/reorder/tests/IntToString.java.i
-data/src/windows/native/java/net/net_util_md.c.i
-data/src/share/classes/sun/awt/resources/awt_pt_BR.properties.i
+data/src/share/instrument/PathCharsValidator.h.i
+data/src/share/classes/javax/swing/plaf/ScrollBarUI.java.i
 data/src/share/classes/com/sun/media/sound/MidiOutDevice.java.i
 data/src/share/classes/java/awt/Conditional.java.i
 data/test/sun/management/jmxremote/bootstrap/launcher.c.i
 data/src/share/classes/com/sun/jndi/dns/ZoneNode.java.i
-data/src/share/classes/sun/io/CharToByteTIS620.java.i
 data/src/share/classes/java/lang/management/CompilationMXBean.java.i
 data/test/java/net/MulticastSocket/TestInterfaces.java.i
-data/test/java/awt/xembed/server/TestXEmbedServerJava.java.i
+data/test/java/util/Hashtable/IllegalLoadFactor.java.i
 data/src/share/classes/java/nio/file/FileSystemNotFoundException.java.i
 data/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java.i
+data/test/java/beans/PropertyEditor/TestShortTypeJava.java.i
 data/src/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java.i
 data/test/java/lang/ClassLoader/GetPackage.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC.c.i
@@ -9455,27 +9395,26 @@ data/src/share/classes/javax/swing/plaf/synth/SynthPasswordFieldUI.java.i
 data/src/share/classes/sun/net/TelnetInputStream.java.i
 data/src/share/classes/java/awt/Toolkit.java.i
 data/src/share/classes/sun/nio/ch/IOUtil.java.i
-data/test/java/io/Serializable/arraySuidConflict/Read.java.i
 data/src/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java.i
 data/test/sun/security/krb5/edu.mit.Kerberos.i
-data/test/java/util/Collections/FindSubList.java.i
+data/test/java/nio/file/Files/walkFileTree/denyAll.policy.i
+data/make/tools/src/build/tools/javazic/Rule.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIComponent.java.i
 data/src/share/classes/sun/awt/datatransfer/TransferableProxy.java.i
 data/src/share/classes/javax/script/CompiledScript.java.i
 data/test/sun/net/www/protocol/ftp/HandlerEquals.java.i
+data/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java.i
 data/test/sun/security/ssl/sun/net/www/http/ChunkedOutputStream/Test.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageFilters.h.i
+data/test/java/nio/file/WatchService/denyAll.policy.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties.i
-data/test/javax/management/MBeanServer/DynamicWrapperMBeanTest.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMeta.java.i
-data/src/solaris/classes/sun/awt/X11/XMenuWindow.java.i
+data/src/share/classes/com/sun/security/auth/NTUserPrincipal.java.i
+data/make/common/internal/NativeCompileRules.gmk.i
 data/src/solaris/native/sun/awt/awt_Event.h.i
 data/src/share/classes/javax/swing/event/HyperlinkEvent.java.i
 data/src/share/classes/sun/launcher/resources/launcher_it.properties.i
-data/make/tools/swing-beans/beaninfo/images/JSpinnerMono32.gif.i
+data/src/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java.i
 data/src/share/classes/sun/font/TextLabel.java.i
 data/src/share/classes/sun/awt/im/InputMethodContext.java.i
-data/src/share/classes/sun/tools/tree/BinaryShiftExpression.java.i
 data/make/jpda/gui/Makefile.i
 data/test/java/security/cert/CertPathBuilder/selfIssued/README.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java.i
@@ -9485,77 +9424,77 @@ data/make/tools/swing-beans/beaninfo/images/JListColor32.gif.i
 data/src/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java.i
 data/src/share/classes/javax/swing/Icon.java.i
 data/src/share/classes/sun/tools/tree/IdentifierExpression.java.i
-data/src/share/classes/com/sun/tools/jdi/VoidValueImpl.java.i
+data/make/java/nio/genCoder.sh.i
 data/test/sun/security/pkcs11/KeyStore/BasicData/ca.cert.i
-data/test/com/sun/jdi/PrivateTransportTest.sh.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java.i
 data/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java.i
 data/src/share/classes/javax/print/attribute/standard/Compression.java.i
 data/test/java/net/URLConnection/xml/xml2.xml.i
 data/test/java/beans/Introspector/6976577/Test6976577.java.i
-data/src/share/classes/org/openjdk/jigsaw/BaseContext.java.i
+data/src/share/classes/sun/tools/jstat/ExpressionExecuter.java.i
 data/src/share/classes/sun/nio/cs/ext/MacUkraine.java.i
 data/src/share/native/java/lang/fdlibm/src/s_asinh.c.i
 data/src/share/back/eventHelper.h.i
 data/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java.i
+data/test/java/nio/channels/FileChannel/Write.java.i
 data/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.c.i
-data/make/tools/swing-beans/beaninfo/images/JPanelColor32.gif.i
 data/test/com/sun/servicetag/registration.xml.i
 data/src/windows/classes/sun/java2d/d3d/D3DRenderer.java.i
-data/src/share/classes/sun/tracing/dtrace/DTraceProbe.java.i
+data/src/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java.i
 data/src/share/classes/com/sun/jdi/BooleanValue.java.i
 data/test/java/util/concurrent/Phaser/Basic.java.i
-data/make/netbeans/jconsole/build.xml.i
 data/src/share/classes/java/awt/dnd/MouseDragGestureRecognizer.java.i
 data/test/com/sun/servicetag/servicetag3.properties.i
-data/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java.i
+data/src/share/classes/com/sun/jdi/request/MethodEntryRequest.java.i
 data/test/tools/launcher/UnicodeCleanup.java.i
+data/src/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java.i
+data/src/share/classes/sun/text/normalizer/UProperty.java.i
 data/src/share/classes/com/sun/jmx/interceptor/DomainDispatchInterceptor.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java.i
 data/src/share/classes/sun/net/www/protocol/http/logging/HttpLogFormatter.java.i
 data/src/share/classes/sun/security/krb5/internal/crypto/dk/Des3DkCrypto.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsTableMeta.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/CustomUIDefault.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmCompilationMBean.java.i
 data/src/share/demo/management/VerboseGC/PrintGCStat.java.i
-data/src/share/classes/javax/imageio/ImageWriter.java.i
-data/test/sun/nio/cs/OLD/IBM949_OLD.java.i
-data/src/windows/native/sun/java2d/d3d/D3DShaders.h.i
+data/test/javax/swing/border/Test4760089.java.i
+data/src/share/classes/com/sun/tools/extcheck/ExtCheck.java.i
 data/src/share/classes/javax/management/namespace/JMXNamespaceView.java.i
 data/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh.i
 data/src/share/classes/sun/tools/jconsole/resources/collapse-winlf.png.i
 data/test/java/awt/image/LookupOp/SingleArrayTest.java.i
 data/make/com/sun/java/browser/net/Makefile.i
-data/test/java/lang/StringCoding/CheckEncodings.sh.i
+data/make/sun/security/mscapi/Makefile.i
 data/test/javax/swing/text/html/TableView/7030332/bug7030332.html.i
 data/make/tools/CharsetMapping/HKSCS2008.map.i
-data/src/share/classes/sun/security/pkcs/PKCS7.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java.i
+data/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html.i
 data/src/share/classes/javax/print/attribute/standard/PrinterResolution.java.i
-data/test/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html.i
-data/test/javax/management/Introspector/ImmutableNotificationInfoTest.java.i
+data/src/share/classes/com/sun/tools/example/debug/gui/ClassManager.java.i
 data/test/javax/swing/plaf/metal/MetalBumps/Test6657026.java.i
 data/test/java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java.i
 data/test/java/lang/management/BufferPoolMXBean/Basic.java.i
-data/test/sun/security/krb5/auto/DynamicKeytab.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_PA.java.i
+data/src/share/classes/java/awt/HeadlessException.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java.i
 data/src/share/classes/com/sun/tools/jdi/FloatTypeImpl.java.i
 data/src/solaris/classes/sun/nio/fs/UnixFileStoreAttributes.java.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java.i
+data/test/java/util/logging/LoggerWeakRefLeak.java.i
 data/src/share/classes/javax/print/StreamPrintService.java.i
 data/src/share/classes/sun/security/jgss/GSSCaller.java.i
 data/test/java/lang/instrument/GetObjectSizeTest.java.i
 data/src/solaris/bin/amd64/jvm.cfg.i
 data/src/share/classes/java/awt/List.java.i
 data/make/com/sun/java/Makefile.i
-data/src/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java.i
+data/src/share/classes/sun/security/ec/ECPublicKeyImpl.java.i
 data/src/share/classes/com/sun/jdi/CharType.java.i
 data/src/share/classes/javax/print/attribute/standard/Copies.java.i
 data/src/share/classes/com/sun/jmx/remote/util/EventClientConnection.java.i
 data/src/share/classes/sun/beans/editors/ShortEditor.java.i
 data/src/share/classes/java/lang/Object.java.i
-data/src/share/classes/com/sun/jdi/event/VMStartEvent.java.i
-data/test/java/lang/Math/CubeRootTests.java.i
-data/test/java/beans/XMLEncoder/Test6921644.java.i
+data/test/java/util/PriorityQueue/RemoveContains.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/package.html.i
-data/src/share/classes/sun/text/resources/FormatData_th_TH_TH.java.i
 data/src/share/classes/java/lang/ProcessBuilder.java.i
 data/src/share/classes/sun/awt/RequestFocusController.java.i
 data/src/share/native/java/util/zip/zlib-1.2.3/inflate.c.i
@@ -9563,45 +9502,43 @@ data/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java.i
 data/test/sun/nio/cs/OLD/DBCSDecoderMapping.java.i
 data/src/share/classes/javax/swing/JInternalFrame.java.i
 data/test/java/lang/String/ContentEquals.java.i
+data/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_es.properties.i
 data/src/share/classes/sun/tools/jconsole/VariableGridLayout.java.i
 data/test/java/lang/StringBuffer/Exceptions.java.i
 data/src/share/classes/javax/swing/ComboBoxEditor.java.i
 data/src/share/classes/javax/swing/plaf/ColorChooserUI.java.i
 data/test/java/nio/charset/Charset/IllegalCharsetName.java.i
-data/src/share/classes/sun/security/provider/DSAParameters.java.i
 data/test/javax/management/remote/mandatory/subjectDelegation/SimpleStandard.java.i
 data/src/share/classes/com/sun/jmx/snmp/defaults/package.html.i
 data/test/java/lang/Runtime/exec/ExecWithInput.java.i
 data/src/share/hpi/include/hpi_impl.h.i
 data/test/java/security/cert/CertPathValidator/OCSP/RootCert.pem.i
 data/src/share/classes/sun/tools/jstat/ParserException.java.i
-data/test/java/util/ServiceLoader/Basic.java.i
-data/test/java/io/Serializable/explicitCNFException/ExplicitCNFException.java.i
-data/src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java.i
+data/test/com/sun/java/swing/plaf/windows/Test6824600.java.i
+data/src/share/classes/javax/swing/text/html/default.css.i
+data/test/com/sun/crypto/provider/Cipher/PBE/PKCS12Oid.java.i
+data/test/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJobHeadless.java.i
 data/test/java/beans/XMLEncoder/java_awt_Color.java.i
-data/test/org/openjdk/jigsaw/cli/tsa-prikey.pem.i
 data/src/share/classes/javax/swing/text/html/HTMLDocument.java.i
 data/src/share/classes/java/io/PrintWriter.java.i
 data/src/windows/native/common/jni_util_md.c.i
 data/src/share/classes/java/beans/IndexedPropertyDescriptor.java.i
 data/src/windows/classes/sun/awt/windows/WingDings.java.i
-data/test/sun/java2d/DirectX/DrawBitmaskToSurfaceTest.java.i
+data/src/share/classes/sun/text/resources/FormatData_en_IN.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetVoiceStatus.java.i
 data/test/sun/security/provider/PolicyFile/EmailAddress.java.i
 data/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java.i
 data/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java.i
 data/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java.i
 data/test/javax/swing/JTableHeader/6884066/bug6884066.java.i
-data/src/share/native/sun/font/layout/LayoutEngine.cpp.i
 data/src/share/classes/com/sun/nio/sctp/NotificationHandler.java.i
 data/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java.i
 data/src/share/classes/java/sql/SQLSyntaxErrorException.java.i
 data/src/share/classes/javax/swing/DebugGraphicsObserver.java.i
-data/src/share/back/threadControl.c.i
 data/test/java/security/KeyRep/DSA.pre.1.5.key.i
 data/test/sun/security/tools/keytool/StartDateTest.java.i
 data/test/java/awt/print/PrinterJob/Collate2DPrintingTest.java.i
-data/test/javax/management/ImplementationVersion/policy.i
 data/src/share/classes/java/util/LocaleISOData.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java.i
 data/src/share/native/java/util/zip/zlib-1.2.3/zutil.h.i
@@ -9610,83 +9547,76 @@ data/src/share/classes/sun/net/www/protocol/http/AuthCache.java.i
 data/src/share/classes/com/sun/jmx/namespace/serial/SerialRewritingProcessor.java.i
 data/src/share/classes/sun/font/TrueTypeFont.java.i
 data/test/sun/security/krb5/auto/NoAddresses.java.i
-data/src/share/classes/sun/security/jgss/ProviderList.java.i
+data/test/com/sun/jdi/JdbMissStep.sh.i
 data/test/java/rmi/activation/Activatable/checkImplClassLoader/MyRMI.java.i
+data/src/solaris/classes/sun/awt/X11/security-icon-yellow24.png.i
 data/src/share/classes/java/text/CalendarBuilder.java.i
 data/src/share/demo/applets/WireFrame/ThreeD.java.i
-data/test/java/rmi/server/RMIClassLoader/noSecurityManager/LocalDummy.java.i
 data/test/java/net/ResponseCache/file1.cache.i
 data/src/share/classes/sun/awt/HorizBagLayout.java.i
-data/src/windows/native/sun/jkernel/stdafx.cpp.i
+data/src/share/classes/java/security/SecurityPermission.java.i
 data/test/javax/management/remote/mandatory/threads/ExecutorTest.java.i
-data/make/tools/reorder/tests/LoadJFrame.java.i
+data/src/share/native/sun/awt/libpng/png.h.i
 data/make/tools/src/build/tools/jdwpgen/ValueTypeNode.java.i
-data/src/share/classes/javax/print/attribute/PrintRequestAttribute.java.i
+data/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h.i
+data/src/linux/doc/man/rmic.1.i
 data/src/share/classes/javax/swing/plaf/metal/MetalHighContrastTheme.java.i
 data/src/share/classes/sun/nio/cs/ext/SimpleEUCDecoder.java.i
 data/src/share/classes/sun/security/krb5/internal/ETypeInfo.java.i
-data/test/java/security/cert/CertPathBuilder/targetConstraints/ee.cer.i
+data/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java.i
 data/src/share/classes/sun/security/x509/AlgorithmId.java.i
 data/test/javax/swing/JSlider/6742358/bug6742358.java.i
 data/test/java/nio/file/Files/WalkWithSecurity.java.i
 data/src/share/classes/java/util/IllegalFormatException.java.i
-data/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh.i
-data/src/windows/native/sun/jkernel/kernel.def.i
+data/test/java/nio/channels/Selector/LotsOfCancels.java.i
 data/src/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/package.html.i
 data/test/java/beans/VetoableChangeSupport/Test4994635.java.i
 data/src/share/classes/javax/net/ssl/SSLHandshakeException.java.i
 data/src/share/classes/sun/misc/NativeSignalHandler.java.i
-data/src/share/classes/sun/io/CharToByteCp949C.java.i
+data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiIn.cpp.i
 data/src/share/classes/sun/applet/AppletClassLoader.java.i
 data/src/share/classes/javax/accessibility/AccessibleComponent.java.i
 data/src/share/classes/sun/tools/java/BinaryClass.java.i
-data/test/javax/management/modelmbean/DescriptorSupportXMLTest.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonListener.java.i
 data/test/java/awt/Focus/InputVerifierTest3/InputVerifierTest3.java.i
-data/src/windows/classes/sun/security/mscapi/RSAPrivateKey.java.i
-data/src/share/classes/java/awt/Polygon.java.i
-data/src/share/classes/sun/tools/jar/resources/jar_de.properties.i
-data/test/sun/security/pkcs11/tls/TestPRF.java.i
+data/test/java/lang/StringBuffer/InsertMaxValue.java.i
 data/test/java/beans/PropertyEditor/TestDoubleType.java.i
 data/src/share/classes/sun/io/ByteToCharJIS0208.java.i
-data/make/mkdemo/jvmti/minst/Makefile.i
 data/test/java/io/FileInputStream/FinalizeShdCallClose.java.i
 data/src/share/lib/cmm/lcms/CIEXYZ.pf.i
 data/src/share/classes/java/lang/ClassValue.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/package.html.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java.i
 data/src/share/classes/sun/print/SunMinMaxPage.java.i
 data/src/solaris/classes/sun/awt/X11/security-icon-bw16.png.i
-data/src/share/classes/sun/misc/JavaUtilJarAccess.java.i
+data/src/share/classes/javax/print/package.html.i
 data/test/java/util/ResourceBundle/Bug6359330.java.i
 data/test/java/lang/Class/getEnclosingClass/build.sh.i
 data/src/share/classes/javax/swing/event/TreeModelListener.java.i
 data/test/java/lang/String/ToLowerCase.java.i
-data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java.i
-data/src/share/classes/sun/security/krb5/internal/ccache/Credentials.java.i
+data/test/sun/nio/cs/TestUTF_16.java.i
+data/src/share/classes/com/sun/java/browser/dom/DOMAccessException.java.i
 data/src/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java.i
-data/src/share/native/sun/awt/image/jpeg/jpeglib.h.i
-data/test/java/lang/Class/IsAnnotationType.java.i
+data/src/share/classes/com/sun/crypto/provider/PBECipherCore.java.i
 data/src/share/classes/javax/security/auth/Refreshable.java.i
 data/src/share/classes/sun/text/resources/FormatData_ar_MA.java.i
-data/src/share/classes/javax/accessibility/AccessibleResourceBundle.java.i
 data/make/tools/CharsetMapping/MacTurkish.map.i
 data/test/sun/tools/jstack/Basic.sh.i
 data/src/share/classes/java/security/AccessControlException.java.i
-data/test/java/io/Externalizable/definesWriteObject/DefinesWriteObject.java.i
 data/test/javax/management/standardmbean/DeadlockTest.java.i
 data/test/javax/naming/RefAddr/NullContent.java.i
 data/src/solaris/bin/ppc/jvm.cfg.i
 data/src/share/demo/nbproject/README.txt.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html.i
 data/src/share/classes/org/openjdk/jigsaw/Resolver.java.i
 data/test/com/sun/jdi/RepStepTarg.java.i
 data/src/windows/native/sun/jkernel/kernel_it.rc.i
 data/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties.i
 data/src/share/classes/java/awt/font/GraphicAttribute.java.i
 data/src/share/classes/java/awt/ColorPaintContext.java.i
 data/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java.i
-data/test/java/io/File/ListNull.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/ByteArrayCalls.java.i
 data/test/sun/net/InetAddress/nameservice/deadlock/Hang.java.i
 data/src/share/classes/com/sun/media/sound/ModelPerformer.java.i
 data/src/share/classes/javax/management/remote/JMXServerErrorException.java.i
@@ -9696,31 +9626,30 @@ data/src/share/native/sun/awt/medialib/mlib_ImageFilters.c.i
 data/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasResources.java.i
 data/src/share/classes/java/awt/geom/QuadCurve2D.java.i
-data/src/windows/native/sun/java2d/d3d/D3DRenderer.h.i
-data/test/java/io/Serializable/oldTests/SimpleArrays.java.i
-data/test/sun/security/pkcs11/ec/pkcs12/secp256r1server-secp384r1ca.p12.i
+data/src/share/classes/javax/swing/event/TreeModelEvent.java.i
+data/src/share/classes/sun/util/calendar/ImmutableGregorianDate.java.i
 data/src/share/classes/java/net/SocketTimeoutException.java.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh.i
 data/src/share/classes/sun/security/timestamp/TSRequest.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.java.i
 data/src/share/classes/sun/net/www/protocol/http/HttpLogFormatter.java.i
+data/src/share/native/java/util/zip/zlib-1.1.3/zadler32.c.i
 data/src/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java.i
 data/test/com/sun/jmx/snmp/TimeTicksWrapping.java.i
 data/src/share/classes/javax/naming/AuthenticationNotSupportedException.java.i
 data/test/java/nio/file/Files/walkFileTree/SkipSiblings.java.i
-data/make/mksample/jmx/Makefile.i
+data/test/java/lang/String/SBConstructor.java.i
 data/src/share/classes/java/util/zip/DataFormatException.java.i
 data/src/share/classes/java/security/AccessController.java.i
 data/src/windows/native/java/io/io_util_md.h.i
-data/test/java/nio/channels/SocketChannel/UnboundSocketTests.java.i
+data/src/share/classes/sun/tools/jconsole/resources/mbeanserverdelegate.gif.i
 data/test/java/lang/System/IgnoreNullSecurityManager.java.i
-data/test/java/io/Serializable/GetField/Read2.java.i
 data/src/share/classes/java/awt/font/TextAttribute.java.i
-data/test/com/sun/net/httpserver/Test6.java.i
+data/make/java/java/reflect/Makefile.i
 data/src/share/classes/sun/nio/cs/ext/JIS_X_0208.java.i
 data/test/java/rmi/testlibrary/RemoteExiter.java.i
 data/test/java/lang/annotation/ParameterAnnotations.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaShort.java.i
+data/src/share/classes/com/sun/servicetag/ServiceTag.java.i
 data/test/java/net/MulticastSocket/B6425815.java.i
 data/test/java/lang/ToString.java.i
 data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java.i
@@ -9729,12 +9658,12 @@ data/src/share/classes/com/sun/crypto/provider/RC2Crypt.java.i
 data/src/share/classes/sun/io/ByteToCharCp850.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java.i
 data/src/share/classes/sun/text/resources/CollationData_lv.java.i
-data/src/share/classes/org/openjdk/jigsaw/Launcher.java.i
-data/test/java/io/SequenceInputStream/ConstructorNull.java.i
+data/test/java/io/Serializable/oldTests/AnnotateClass.java.i
 data/src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java.i
 data/test/java/lang/Long/Decode.java.i
-data/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java.i
-data/src/share/classes/sun/text/resources/CollationData_es.java.i
+data/src/solaris/demo/jigsaw/basic/Makefile.i
+data/src/share/classes/java/awt/doc-files/Scrollbar-2.gif.i
+data/test/java/security/KeyStore/keystore.jks.i
 data/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java.i
 data/test/java/util/Vector/ComodifiedRemoveAllElements.java.i
 data/src/linux/doc/man/tnameserv.1.i
@@ -9745,13 +9674,13 @@ data/src/share/classes/sun/util/EmptyListResourceBundle.java.i
 data/src/share/classes/java/lang/doc-files/capiota.gif.i
 data/test/sun/util/resources/TimeZone/Bug4640234.java.i
 data/test/java/rmi/reliability/juicer/AppleEvent.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_DO.properties.i
 data/src/share/classes/sun/awt/CustomCursor.java.i
 data/src/windows/classes/java/util/prefs/WindowsPreferencesFactory.java.i
-data/src/share/classes/sun/security/x509/X509CertImpl.java.i
 data/src/windows/native/sun/java2d/d3d/D3DRenderer.cpp.i
 data/test/java/util/Currency/CheckDataVersion.java.i
 data/test/java/util/concurrent/BlockingQueue/LoopHelpers.java.i
-data/src/solaris/classes/sun/awt/X11/java-icon32.png.i
+data/src/share/classes/sun/awt/im/CompositionAreaHandler.java.i
 data/src/share/classes/com/sun/beans/decoder/ElementHandler.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/package.html.i
 data/src/share/classes/javax/crypto/JceSecurityManager.java.i
@@ -9759,29 +9688,26 @@ data/src/solaris/classes/sun/awt/X11/XProtocol.java.i
 data/make/tools/src/build/tools/charsetmapping/HKSCS.java.i
 data/test/tools/launcher/Settings.java.i
 data/src/share/classes/java/lang/doc-files/javalang.doc.anc21.gif.i
+data/src/share/classes/javax/swing/undo/UndoableEdit.java.i
+data/src/share/classes/sun/io/ByteToCharBig5_Solaris.java.i
 data/src/share/native/sun/security/ec/mpi-config.h.i
 data/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java.i
 data/src/share/classes/java/util/JapaneseImperialCalendar.java.i
 data/test/java/nio/channels/DatagramChannel/Refused.java.i
 data/src/share/classes/javax/swing/plaf/ComboBoxUI.java.i
-data/src/share/classes/sun/tools/jar/CommandLine.java.i
-data/src/share/classes/sun/java2d/pipe/BufferedTextPipe.java.i
-data/test/sun/security/provider/X509Factory/BigCRL.java.i
-data/make/docs/Notes.html.i
+data/src/share/classes/sun/util/resources/CurrencyNames_en_PH.properties.i
+data/src/share/sample/README.i
 data/src/share/native/sun/awt/image/jpeg/jpegint.h.i
 data/src/share/classes/javax/net/ssl/SSLSessionContext.java.i
 data/test/sun/security/krb5/canonicalize/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
-data/test/javax/swing/JColorChooser/Test4887836.java.i
+data/src/share/classes/com/sun/net/httpserver/HttpsExchange.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java.i
-data/test/java/io/Serializable/enum/badResolve/Read.java.i
+data/src/share/classes/sun/tracing/dtrace/JVM.java.i
 data/test/sun/net/www/protocol/file/Equals.java.i
 data/src/solaris/classes/sun/awt/X11/XCheckboxMenuItemPeer.java.i
 data/src/share/classes/java/util/zip/DeflaterOutputStream.java.i
-data/src/share/classes/java/sql/PreparedStatement.java.i
 data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java.i
-data/src/share/classes/sun/util/resources/CalendarData_cs.properties.i
 data/src/share/classes/java/dyn/InvokeDynamicBootstrapError.java.i
-data/src/share/classes/com/sun/media/sound/DLSRegion.java.i
 data/make/tools/swing-beans/beaninfo/images/JListMono32.gif.i
 data/src/share/classes/sun/util/resources/CurrencyNames_sq_AL.properties.i
 data/test/java/io/Serializable/badSerialVersionUID/BadSerialVersionUID.java.i
@@ -9789,6 +9715,7 @@ data/test/java/io/File/NullArgs.java.i
 data/test/sun/security/smartcardio/TestConnectAgain.java.i
 data/src/share/classes/javax/xml/crypto/dsig/SignatureMethod.java.i
 data/src/share/classes/sun/security/ssl/ByteBufferInputStream.java.i
+data/test/java/net/HttpURLConnection/getResponseCode.java.i
 data/src/windows/native/sun/windows/MouseInfo.cpp.i
 data/make/sun/util/Makefile.i
 data/test/javax/security/auth/login/Configuration/GetInstance.config.i
@@ -9798,7 +9725,7 @@ data/src/share/classes/javax/management/QueryExp.java.i
 data/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java.i
 data/make/tools/CharsetMapping/extsbcs.i
-data/test/sun/tools/jhat/jmap.bin.i
+data/src/share/classes/java/awt/image/BandCombineOp.java.i
 data/src/share/classes/sun/tools/tree/BitXorExpression.java.i
 data/src/solaris/javavm/export/jawt_md.h.i
 data/src/share/demo/jvmti/hprof/hprof_cpu.c.i
@@ -9806,7 +9733,9 @@ data/test/sun/net/www/protocol/file/EncodedMultiByteChar.java.i
 data/src/share/classes/sun/net/httpserver/FixedLengthInputStream.java.i
 data/src/share/classes/sun/tools/tree/PreDecExpression.java.i
 data/src/share/classes/javax/naming/NameParser.java.i
+data/test/sun/security/pkcs11/KeyStore/ClientAuthData/key3.db.i
 data/make/sun/javazic/tzdata/leapseconds.i
+data/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java.i
 data/src/share/classes/java/nio/file/attribute/BasicFileAttributeView.java.i
 data/src/share/classes/java/awt/peer/ContainerPeer.java.i
 data/test/java/lang/instrument/Different_ExampleRedefine.java.i
@@ -9819,25 +9748,23 @@ data/src/share/classes/sun/java2d/pipe/AlphaPaintPipe.java.i
 data/test/javax/management/ObjectName/RepositoryWildcardTest.java.i
 data/src/share/classes/sun/security/pkcs11/TemplateManager.java.i
 data/src/windows/native/sun/windows/awt_DCHolder.cpp.i
-data/src/share/classes/javax/swing/plaf/DimensionUIResource.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/IsOpen.java.i
 data/test/sun/net/ftp/FtpGetContent.java.i
 data/src/share/back/ObjectReferenceImpl.c.i
+data/test/tools/jar/index/MetaInf.java.i
 data/src/share/classes/java/lang/NullPointerException.java.i
 data/src/share/classes/sun/awt/ModalityEvent.java.i
 data/src/solaris/demo/jigsaw/basic/src/org/hello/Main.java.i
 data/src/share/classes/sun/util/resources/CalendarData_sr.properties.i
+data/test/sun/net/www/protocol/http/HttpInputStream.java.i
 data/src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties.i
 data/src/share/classes/sun/text/resources/CollationData_et.java.i
-data/make/netbeans/world/nbproject/project.xml.i
-data/test/java/util/ResourceBundle/Control/LoadingStrategiesTest.java.i
+data/src/share/classes/java/io/StringBufferInputStream.java.i
 data/src/share/classes/java/security/MessageDigest.java.i
-data/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h.i
+data/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java.i
 data/test/sun/nio/cs/TestJIS0208Decoder.java.i
 data/src/share/classes/com/sun/security/sasl/CramMD5Client.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ClientServer.java.i
 data/make/tools/src/build/tools/jdwpgen/StringTypeNode.java.i
-data/src/share/classes/sun/java2d/SurfaceData.java.i
 data/src/share/classes/javax/naming/Binding.java.i
 data/src/share/classes/sun/io/ByteToCharCp833.java.i
 data/test/demo/jvmti/versionCheck/FailsWhenJvmtiVersionDiffers.java.i
@@ -9845,24 +9772,22 @@ data/test/javax/swing/JTable/6913768/bug6913768.java.i
 data/src/share/classes/javax/print/attribute/standard/JobMediaSheets.java.i
 data/src/share/classes/javax/crypto/NullCipherSpi.java.i
 data/src/share/classes/sun/io/CharToByteCp1257.java.i
-data/src/solaris/classes/sun/print/AttributeClass.java.i
-data/test/java/rmi/activation/Activatable/nestedActivate/security.policy.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so.i
 data/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java.i
 data/src/share/classes/sun/io/CharToByteCp875.java.i
 data/src/solaris/demo/jni/Poller/LinkedQueue.java.i
 data/test/javax/management/remote/mandatory/connectorServer/CloseConnectionTest.java.i
-data/src/share/classes/sun/tools/tree/ReturnStatement.java.i
 data/src/share/classes/com/sun/jndi/ldap/EventSupport.java.i
 data/test/java/beans/PropertyChangeSupport/Test4092905.java.i
 data/src/share/classes/com/sun/jdi/InvalidLineNumberException.java.i
-data/test/java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java.i
+data/src/solaris/back/linker_md.c.i
 data/src/share/classes/sun/net/ftp/FtpClient.java.i
 data/test/java/util/ResourceBundle/KeySetTest.java.i
 data/src/share/demo/jvmti/hprof/hprof_string.c.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java.i
 data/test/tools/launcher/Makefile.SolarisRunpath.i
-data/src/share/classes/sun/management/LazyCompositeData.java.i
-data/make/tools/swing-beans/beaninfo/images/JListColor16.gif.i
+data/make/tools/src/build/tools/generatecharacter/CharacterName.java.i
+data/src/share/lib/images/cursors/motif_CopyDrop32x32.gif.i
 data/src/share/hpi/export/hpi.h.i
 data/src/share/classes/java/awt/event/FocusEvent.java.i
 data/test/java/rmi/reliability/benchmark/bench/rmi/altroot/Node.java.i
@@ -9870,28 +9795,32 @@ data/test/sun/misc/EscapePath.java.i
 data/test/sun/security/util/Oid/SerialTest.java.i
 data/make/tools/src/build/tools/javazic/DayOfWeek.java.i
 data/test/sun/security/krb5/auto/BasicKrb5Test.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java.i
 data/src/share/classes/javax/crypto/CipherOutputStream.java.i
-data/test/javax/swing/JFileChooser/6342301/bug6342301.java.i
+data/test/java/lang/ProcessBuilder/Basic.java.i
 data/src/share/classes/java/util/RegularEnumSet.java.i
 data/src/solaris/native/sun/awt/awt_MenuItem.c.i
 data/src/share/classes/sun/dyn/anon/ConstantPoolPatch.java.i
+data/src/share/classes/sun/tools/tree/BinaryExpression.java.i
 data/test/java/io/Serializable/superclassDataLoss/Test.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/PermissionImpl.java.i
 data/test/java/util/Locale/data/deflocale.c.i
 data/src/share/classes/sun/rmi/transport/ObjectEndpoint.java.i
+data/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java.i
 data/src/solaris/classes/sun/awt/X11/genhash.awk.i
 data/src/share/native/sun/awt/medialib/mlib_ImageRowTable.h.i
 data/src/linux/doc/man/ja/jstat.1.i
 data/src/share/demo/jvmti/hprof/hprof_reference.c.i
-data/test/java/io/File/WinMaxPath.java.i
+data/src/share/native/java/util/zip/zlib-1.1.3/inftrees.h.i
+data/make/tools/swing-beans/beaninfo/images/JTreeMono16.gif.i
 data/src/share/classes/javax/sql/rowset/Predicate.java.i
 data/src/share/classes/java/nio/channels/WritableByteChannel.java.i
-data/src/share/classes/sun/nio/cs/FastCharsetProvider.java.i
+data/src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java.i
+data/src/share/classes/sun/net/www/protocol/http/Handler.java.i
 data/make/tools/swing-beans/beaninfo/images/JWindowMono32.gif.i
 data/test/sun/security/pkcs11/fips/key3.db.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java.i
 data/src/share/classes/java/awt/AWTPermission.java.i
-data/src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/OutputListener.java.i
 data/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh.i
@@ -9900,55 +9829,53 @@ data/test/java/net/Socket/OldImpl.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java.i
 data/test/java/dyn/JavaDocExamplesTest.java.i
-data/test/sun/net/www/protocol/http/B6518816.java.i
 data/src/share/classes/javax/swing/JDesktopPane.java.i
 data/src/share/classes/javax/management/monitor/CounterMonitorMBean.java.i
 data/src/share/native/sun/security/ec/impl/ecl-priv.h.i
 data/src/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java.i
-data/test/java/rmi/Naming/LookupNameWithColon.java.i
+data/test/com/sun/tools/extcheck/TestExtcheckArgs.java.i
+data/src/share/classes/javax/swing/text/rtf/RTFAttribute.java.i
 data/src/share/classes/java/nio/file/InvalidPathException.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c.i
 data/src/share/classes/sun/security/ssl/EphemeralKeyManager.java.i
 data/src/solaris/classes/sun/awt/motif/MWindowAttributes.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/ProxyArrayCalls.java.i
-data/test/sun/security/tools/policytool/UsePolicy.html.i
+data/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency_Stub.java.i
 data/make/mksample/webservices/EbayClient/Makefile.i
 data/src/share/classes/javax/swing/plaf/nimbus/skin.laf.i
 data/test/java/net/URLClassLoader/jars/class_path_test_classpath.jar.i
-data/src/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java.i
+data/src/share/native/sun/security/ec/impl/secitem.c.i
 data/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java.i
 data/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java.i
-data/src/share/demo/jfc/Metalworks/resources/HelpFiles/javalogo.gif.i
-data/src/windows/classes/sun/awt/windows/WPageDialogPeer.java.i
+data/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java.i
 data/src/share/classes/sun/font/StandardTextSource.java.i
 data/src/share/classes/com/sun/beans/decoder/ByteElementHandler.java.i
 data/test/sun/net/www/protocol/http/CloseOptionHeader.java.i
 data/src/share/classes/javax/management/timer/TimerMBean.java.i
 data/src/share/classes/sun/swing/UIAction.java.i
 data/src/share/classes/java/util/Scanner.java.i
-data/src/share/classes/java/awt/image/DataBufferShort.java.i
+data/src/share/classes/java/awt/Scrollbar.java.i
 data/src/share/native/sun/java2d/ShaderList.c.i
 data/src/share/classes/javax/swing/JRadioButton.java.i
 data/test/javax/swing/JFileChooser/6738668/bug6738668.java.i
 data/src/share/classes/javax/swing/text/rtf/charsets/mac.txt.i
-data/test/java/net/InetSocketAddress/ToString.java.i
-data/src/share/classes/javax/swing/tree/TreeSelectionModel.java.i
+data/src/share/classes/javax/sql/rowset/serial/SerialRef.java.i
 data/src/share/classes/com/sun/imageio/plugins/common/I18NImpl.java.i
-data/src/share/classes/sun/io/CharToByteCp1112.java.i
+data/src/share/native/java/lang/fdlibm/src/e_acosh.c.i
 data/test/sun/rmi/rmic/newrmic/equivalence/DayTimeServerImpl.java.i
 data/src/solaris/classes/sun/awt/X11/XLabelPeer.java.i
 data/src/share/native/sun/security/pkcs11/wrapper/p11_general.c.i
 data/test/com/sun/jdi/sde/SourceDebugExtensionTest.java.i
 data/src/share/classes/sun/security/util/AuthResources_sv.java.i
 data/src/share/classes/javax/swing/DefaultRowSorter.java.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/ShowRefs.java.i
+data/src/share/classes/java/sql/package.html.i
 data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy.i
 data/test/java/nio/file/Path/CopyAndMove.java.i
-data/test/sun/security/krb5/IPv6.java.i
+data/src/share/classes/sun/java2d/pipe/LoopPipe.java.i
 data/src/share/classes/com/sun/jmx/snmp/internal/package.html.i
 data/src/share/classes/javax/swing/SizeSequence.java.i
-data/test/java/security/cert/CertPathBuilder/selfIssued/openssl.cnf.i
+data/src/share/classes/sun/jvmstat/monitor/event/package.html.i
 data/src/share/classes/java/awt/doc-files/Modality.html.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/p11-activcard.txt.i
 data/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/services/com.message.spi.MessageService.i
 data/src/share/classes/java/dyn/NoAccessException.java.i
 data/src/share/classes/sun/io/ByteToCharEUC_JP.java.i
@@ -9957,27 +9884,29 @@ data/src/share/classes/sun/util/resources/LocaleNames_mt.properties.i
 data/src/share/classes/sun/nio/cs/ext/IBM942C.java.i
 data/test/com/sun/crypto/provider/Mac/MacKAT.java.i
 data/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_2.java.i
+data/src/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java.i
 data/test/java/beans/XMLEncoder/javax_swing_border_EmptyBorder.java.i
 data/src/windows/classes/sun/awt/windows/WDropTargetContextPeer.java.i
+data/test/java/security/Policy/GetInstance/GetInstanceSecurity.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java.i
-data/test/sun/security/provider/PolicyParser/ExtDirsB.java.i
+data/test/java/net/InetSocketAddress/B6469803.java.i
 data/src/windows/native/sun/windows/awt_KeyboardFocusManager.h.i
+data/src/share/classes/java/awt/event/WindowAdapter.java.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties.i
-data/src/solaris/doc/sun/man/man1/rmid.1.i
+data/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java.i
 data/src/share/demo/jfc/Font2DTest/Font2DTestApplet.java.i
-data/test/sun/net/www/http/HttpClient/ImplicitFileName.java.i
+data/test/java/net/MulticastSocket/B6427403.java.i
 data/src/share/classes/java/util/IllegalFormatCodePointException.java.i
-data/src/share/classes/com/sun/jmx/mbeanserver/Util.java.i
+data/src/solaris/classes/sun/awt/motif/X11KSC5601.java.i
 data/src/share/classes/com/sun/media/sound/DirectAudioDevice.java.i
-data/src/share/classes/java/awt/event/ActionListener.java.i
+data/make/tools/swing-beans/beaninfo/images/JToggleButtonColor16.gif.i
 data/src/share/classes/javax/swing/text/BadLocationException.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizationException.java.i
 data/src/share/native/java/io/io_util.h.i
-data/src/share/classes/javax/management/Description.java.i
+data/test/sun/security/smartcardio/TestConnect.java.i
 data/test/java/io/RandomAccessFile/EOF.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageClipping.h.i
-data/make/javax/rmi/ssl/Makefile.i
-data/src/windows/classes/sun/java2d/d3d/D3DRenderQueue.java.i
+data/src/solaris/native/sun/awt/swing_GTKStyle.c.i
+data/src/share/classes/sun/tools/tree/ConditionVars.java.i
 data/src/share/classes/sun/security/x509/URIName.java.i
 data/src/share/sample/jmx/jmx-scandir/docfiles/remote-connection.jpg.i
 data/src/share/classes/java/beans/IndexedPropertyChangeEvent.java.i
@@ -9987,15 +9916,13 @@ data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineD
 data/test/java/util/ResourceBundle/Control/DefaultControlTest.java.i
 data/test/java/beans/XMLEncoder/javax_swing_JLayeredPane.java.i
 data/test/java/lang/StringBuilder/Supplementary.java.i
-data/src/share/classes/sun/io/ByteToCharCp865.java.i
+data/src/share/classes/sun/nio/cs/ext/MacRomania.java.i
 data/test/java/nio/file/Files/grantAll.policy.i
 data/src/windows/hpi/src/threads_md.c.i
 data/test/com/sun/jdi/redefine/RedefineTest.java.i
-data/src/share/classes/java/awt/im/package.html.i
-data/src/windows/native/sun/windows/awt_Color.h.i
-data/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll.i
-data/src/share/classes/sun/tools/serialver/serialver.properties.i
-data/src/share/classes/javax/swing/DelegatingDefaultFocusManager.java.i
+data/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java.i
+data/src/share/classes/sun/nio/fs/AbstractWatchService.java.i
+data/src/share/modules/jdk/module-info.java.i
 data/src/share/classes/sun/io/CharToByteCp868.java.i
 data/src/share/classes/sun/io/ByteToCharBig5.java.i
 data/src/share/demo/jfc/Metalworks/GreenMetalTheme.java.i
@@ -10005,42 +9932,42 @@ data/test/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java.i
 data/src/share/classes/sun/io/ByteToCharISO8859_7.java.i
 data/test/java/lang/ref/NullQueue.java.i
 data/src/windows/javavm/export/jawt_md.h.i
+data/src/share/classes/java/security/acl/Group.java.i
 data/test/sun/security/provider/PolicyFile/Utf8.java.i
 data/test/javax/management/monitor/CounterMonitorInitThresholdTest.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_fr_FR.properties.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java.i
 data/test/tools/pack200/pack200-verifier/src/xmlkit/TokenList.java.i
-data/test/sun/security/x509/X500Name/NullX500Name.java.i
 data/test/javax/swing/JMenuItem/7036148/bug7036148.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c.i
 data/test/java/lang/annotation/Missing/A.java.i
 data/test/java/net/Socket/SetSoLinger.java.i
+data/test/java/nio/channels/Channels/ReadOffset.java.i
 data/make/tools/classanalyzer/classanalyzer.html.i
+data/src/share/classes/sun/tools/jconsole/inspector/XMBean.java.i
 data/src/share/native/sun/font/layout/LEFontInstance.cpp.i
+data/src/share/native/sun/security/ec/ecl.h.i
 data/test/sun/rmi/rmic/newrmic/equivalence/ComputeServerImpl.java.i
 data/src/share/classes/javax/swing/text/html/FrameSetView.java.i
-data/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java.i
+data/src/share/native/sun/security/ec/impl/ec2_233.c.i
 data/src/share/classes/javax/management/ObjectInstance.java.i
 data/src/share/classes/java/awt/ScrollPaneAdjustable.java.i
-data/test/java/util/Locale/PrintDefaultLocale.java.i
-data/src/share/demo/jfc/SampleTree/resources/images/expanded.gif.i
+data/src/share/classes/javax/swing/border/AbstractBorder.java.i
 data/src/share/classes/sun/nio/cs/ext/MacRoman.java.i
-data/src/share/sample/scripting/scriptpad/src/META-INF/manifest.mf.i
-data/src/solaris/classes/sun/nio/ch/FileKey.java.i
+data/src/share/sample/scripting/scriptpad/README.txt.i
 data/src/share/classes/javax/management/ObjectNameTemplate.java.i
-data/src/share/classes/javax/swing/text/PlainView.java.i
-data/src/share/sample/jmx/jmx-scandir/index.html.i
+data/src/share/classes/com/sun/jmx/namespace/NamespaceInterceptor.java.i
+data/src/share/classes/java/util/EnumSet.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/GroupImpl.java.i
+data/test/java/net/URLConnection/UNCTest.sh.i
 data/test/java/nio/charset/coders/Check.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java.i
-data/src/windows/classes/sun/awt/windows/WMenuBarPeer.java.i
 data/src/share/classes/sun/awt/AppContext.java.i
 data/test/java/beans/XMLDecoder/spec/TestLong.java.i
-data/test/javax/security/auth/Subject/Synch2.policy.i
-data/src/share/classes/sun/reflect/UnsafeStaticShortFieldAccessorImpl.java.i
-data/src/share/classes/javax/management/relation/RoleStatus.java.i
+data/src/solaris/doc/sun/man/man1/rmiregistry.1.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java.i
 data/test/javax/management/MBeanServer/OldMBeanServerTest.java.i
-data/src/windows/native/sun/windows/Hashtable.h.i
+data/src/share/classes/java/util/IllegalFormatWidthException.java.i
 data/src/share/classes/java/rmi/activation/Activatable.java.i
 data/src/share/classes/javax/swing/RepaintManager.java.i
 data/src/share/classes/com/sun/crypto/provider/BlowfishCrypt.java.i
@@ -10050,71 +9977,71 @@ data/src/share/classes/java/awt/doc-files/RadialGradientPaint-3.png.i
 data/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageConvVersion.c.i
 data/src/share/native/java/lang/Object.c.i
-data/src/share/native/sun/font/layout/GlyphPositionAdjustments.cpp.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java.i
+data/src/windows/classes/sun/awt/windows/WTrayIconPeer.java.i
 data/make/sun/security/jgss/wrapper/FILES_c.gmk.i
-data/src/share/classes/com/sun/jdi/Mirror.java.i
+data/src/share/classes/sun/tools/asm/StringExpressionConstantData.java.i
 data/test/java/util/Locale/serialized/java6locale_no_NO_NY.i
-data/test/java/util/concurrent/ThreadPoolExecutor/ShutdownNowExecuteRace.java.i
+data/src/share/classes/javax/management/BetweenQueryExp.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java.i
+data/test/java/util/Locale/PrintDefaultLocale.java.i
 data/src/solaris/transport/socket/socket_md.c.i
 data/src/share/classes/javax/swing/MenuElement.java.i
 data/src/share/classes/sun/security/krb5/internal/AuthorizationDataEntry.java.i
 data/src/share/classes/sun/io/CharToByteCp922.java.i
 data/test/java/lang/instrument/ManifestTestApp.java.i
-data/src/solaris/hpi/native_threads/include/condvar_md.h.i
+data/test/java/beans/XMLDecoder/spec/TestNull.java.i
 data/test/java/rmi/reliability/benchmark/bench/rmi/ExportObjs.java.i
-data/src/solaris/classes/sun/awt/X11GraphicsConfig.java.i
-data/src/share/classes/java/awt/dnd/DropTargetDragEvent.java.i
+data/test/java/util/jar/JarFile/SorryClosed.java.i
+data/src/share/classes/sun/security/action/GetBooleanAction.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_CheckedSortedMap.java.i
-data/src/windows/classes/sun/net/NetHooks.java.i
-data/test/java/awt/Window/SetBackgroundNPE/SetBackgroundNPE.java.i
+data/test/com/sun/tools/extcheck/TestExtcheckArgs.sh.i
+data/test/java/util/ResourceBundle/Control/Bug6530694.java.i
 data/make/tools/swing-beans/beaninfo/images/JDialogColor32.gif.i
 data/test/java/lang/StrictMath/Tests.java.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputTests.java.i
-data/src/share/classes/javax/management/event/FetchingEventForwarder.java.i
-data/src/share/classes/sun/rmi/transport/Transport.java.i
+data/src/share/classes/javax/sound/midi/Patch.java.i
+data/src/share/classes/sun/text/resources/FormatData_ja_JP_JP.java.i
+data/src/share/classes/javax/swing/event/InternalFrameAdapter.java.i
 data/src/share/classes/java/sql/SQLOutput.java.i
-data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java.i
+data/src/windows/classes/sun/awt/windows/fontconfig.98.properties.i
 data/src/solaris/native/sun/awt/awt_TopLevel.h.i
+data/src/share/classes/java/lang/VerifyError.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java.i
 data/src/share/native/sun/java2d/cmm/lcms/cmssm.c.i
-data/src/share/classes/javax/management/MXBean.java.i
+data/test/sun/rmi/runtime/Log/6409194/logging.properties.i
 data/src/share/classes/javax/net/ssl/SSLPermission.java.i
 data/src/share/classes/sun/swing/MenuItemCheckIconFactory.java.i
 data/test/java/lang/instrument/FakeTestDriver.java.i
 data/src/solaris/classes/sun/awt/X11/XErrorHandler.java.i
-data/test/sun/misc/JarIndex/metaInfFilenames/jarA/a/A.java.i
+data/test/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java.i
 data/src/share/classes/sun/nio/cs/ext/EUC_JP_Open.java.i
 data/test/java/lang/instrument/PremainClass/InheritAgent1001.java.i
 data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_3.java.i
 data/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c.i
 data/test/com/sun/jdi/StringConvertTest.sh.i
 data/src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java.i
-data/src/solaris/doc/sun/man/man1/DO_NOT_EDIT--GENERATED_FILES.i
+data/src/share/classes/sun/nio/cs/ext/IBM861.java.i
 data/src/share/classes/sun/io/ByteToCharMacIceland.java.i
-data/src/share/sample/scripting/scriptpad/src/scripts/memory.js.i
 data/src/windows/native/sun/windows/awt_MenuItem.h.i
 data/test/com/sun/jdi/RedefineException.sh.i
 data/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.8.properties.i
-data/test/java/util/Locale/bug4122700.java.i
-data/make/tools/swing-beans/beaninfo/images/JFileChooserColor16.gif.i
-data/make/tools/swing-beans/beaninfo/SwingBeanInfoBase.java.i
+data/test/sun/net/www/httptest/AbstractCallback.java.i
+data/src/share/classes/sun/java2d/pipe/Region.java.i
 data/src/share/classes/java/awt/peer/CheckboxMenuItemPeer.java.i
 data/test/java/lang/String/ICCBasher.java.i
 data/src/share/native/sun/awt/image/cvutils/img_dirdither.h.i
-data/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java.i
+data/test/sun/security/provider/PolicyParser/ExtDirsA.java.i
 data/src/share/classes/java/awt/event/WindowStateListener.java.i
-data/src/share/classes/java/math/BigDecimal.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthConstants.java.i
 data/src/share/classes/java/security/ProviderException.java.i
 data/src/share/classes/java/nio/file/attribute/AclEntry.java.i
 data/test/java/io/Serializable/wrongReturnTypes/Write.java.i
 data/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/kidpr.ttf.i
 data/src/share/classes/sun/security/x509/Extension.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv_8nw.c.i
-data/src/share/classes/sun/tools/tree/Statement.java.i
+data/test/java/util/BitSet/StickySize.java.i
 data/src/solaris/classes/sun/awt/X11/XDialogPeer.java.i
-data/src/share/classes/sun/util/locale/LocaleObjectCache.java.i
+data/src/share/native/sun/awt/image/jpeg/jidctfst.c.i
 data/src/share/native/sun/java2d/pipe/SpanClipRenderer.c.i
 data/test/java/awt/event/MouseEvent/CTORRestrictions/CTORRestrictions_Disable.java.i
 data/test/java/awt/dnd/URIListBetweenJVMsTest/FileListTransferable.java.i
@@ -10122,125 +10049,126 @@ data/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java.i
 data/src/share/classes/com/sun/media/sound/ModelDestination.java.i
 data/src/share/classes/sun/awt/OSInfo.java.i
 data/make/com/oracle/Makefile.i
-data/test/sun/text/resources/Format/Bug4395196.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java.i
 data/src/solaris/native/sun/nio/fs/UnixCopyFile.c.i
-data/src/solaris/classes/sun/nio/fs/SolarisFileStore.java.i
+data/test/sun/tools/jstat/gcOldCapacityOutput1.awk.i
 data/src/share/classes/sun/tools/jstatd/RemoteVmImpl.java.i
 data/src/share/classes/sun/io/CharToByteJohab.java.i
-data/test/sun/security/krb5/auto/Context.java.i
-data/src/share/classes/javax/imageio/IIOParam.java.i
 data/src/share/classes/sun/audio/ContinuousAudioDataStream.java.i
 data/src/windows/native/sun/java2d/d3d/D3DGlyphCache.cpp.i
 data/src/share/classes/sun/security/krb5/EncryptedData.java.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKRegion.java.i
 data/src/share/classes/java/awt/event/ComponentAdapter.java.i
-data/make/tools/README.txt.i
+data/src/share/classes/java/awt/doc-files/RadialGradientPaint-2.png.i
 data/src/share/classes/com/sun/jdi/BooleanType.java.i
 data/src/solaris/classes/sun/awt/X11/XComponentPeer.java.i
+data/src/share/classes/javax/swing/text/Keymap.java.i
 data/src/share/classes/sun/util/resources/CalendarData_en_GB.properties.i
 data/src/solaris/classes/sun/awt/X11/java-icon16.png.i
 data/src/share/classes/java/sql/SQLInput.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_pt.properties.i
-data/src/share/classes/sun/text/resources/CollationData_bg.java.i
+data/test/java/nio/file/attribute/PosixFileAttributeView/Basic.java.i
 data/src/share/classes/com/sun/jmx/snmp/mpm/package.html.i
 data/test/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.java.i
 data/test/java/lang/StringBuffer/GetCharsOverLength.java.i
-data/src/share/classes/sun/text/resources/CollationData_pl.java.i
 data/test/sun/tools/native2ascii/Native2AsciiTests.sh.i
-data/test/sun/net/www/protocol/http/WebGet.java.i
+data/test/java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java.i
 data/src/solaris/classes/sun/awt/X11/java-icon24.png.i
+data/src/share/classes/com/sun/tools/attach/VirtualMachine.java.i
+data/src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java.i
 data/src/share/classes/javax/swing/text/rtf/MockAttributeSet.java.i
 data/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java.i
 data/test/com/sun/jmx/snmp/SnmpOidHashCode.java.i
-data/src/windows/native/java/io/FileSystem_md.c.i
+data/make/com/sun/security/Makefile.i
 data/test/com/sun/net/httpserver/bugs/B6886436.java.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageConvCopyEdge.c.i
 data/test/javax/management/generified/GenericTest.java.i
 data/test/tools/jar/UpdateManifest.java.i
-data/src/share/classes/com/sun/media/sound/FastSysexMessage.java.i
-data/make/sun/cmm/lcms/mapfile-vers.i
+data/test/java/lang/management/MemoryMXBean/LowMemoryTestConcMarkSweepGC.sh.i
+data/make/tools/CharsetMapping/IBM1144.map.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpCounter.java.i
 data/make/java/hpi/native/reorder-sparc.i
 data/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c.i
 data/src/share/classes/sun/audio/AudioPlayer.java.i
-data/test/sun/security/tools/jarsigner/JarSigningNonAscii.java.i
+data/make/sun/management/jmxremote/Makefile.i
 data/test/java/net/URLClassLoader/B7050028.java.i
-data/src/share/classes/javax/crypto/CryptoPermissions.java.i
-data/src/windows/classes/java/net/PlainSocketImpl.java.i
+data/test/java/util/concurrent/LinkedBlockingQueue/OfferRemoveLoops.java.i
+data/test/java/beans/XMLEncoder/Test4679556.java.i
+data/make/tools/CharsetMapping/IBM273.c2b.i
+data/test/javax/swing/JFileChooser/4252173/bug4252173.java.i
 data/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/jane2jane.cer.i
-data/test/java/awt/Mixing/MixingOnShrinkingHWButton.java.i
-data/test/java/rmi/activation/Activatable/downloadParameterClass/group.security.policy.i
+data/src/share/classes/java/math/package-info.java.i
 data/test/java/io/PipedInputStream/FasterWriter.java.i
 data/src/share/classes/javax/print/attribute/HashAttributeSet.java.i
 data/src/share/classes/sun/security/x509/CertificatePoliciesExtension.java.i
 data/make/tools/src/build/tools/dtdbuilder/DTDBuilder.java.i
+data/src/share/classes/sun/util/calendar/CalendarDate.java.i
 data/src/windows/native/sun/java2d/windows/DDBlitLoops.cpp.i
 data/test/java/rmi/activation/Activatable/shutdownGracefully/RegisteringActivatable.java.i
 data/src/share/classes/java/awt/GradientPaintContext.java.i
-data/test/java/beans/Introspector/Test4984912.java.i
+data/src/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java.i
 data/src/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java.i
 data/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog_Stub.java.i
 data/src/share/classes/java/lang/Runtime.java.i
 data/src/solaris/doc/sun/man/man1/ja/extcheck.1.i
-data/src/windows/native/sun/jkernel/DownloadDialog.cpp.i
+data/src/solaris/native/sun/awt/awt_motif.h.i
+data/test/javax/crypto/Mac/TestGetInstance.java.i
 data/src/share/classes/sun/tools/java/ClassDeclaration.java.i
-data/src/share/native/sun/java2d/loops/ByteBinary1Bit.h.i
-data/src/share/classes/java/lang/annotation/package-info.java.i
-data/src/share/classes/com/sun/tools/example/debug/expr/Token.java.i
-data/test/javax/management/notification/SupportClearTest.java.i
+data/test/java/util/Locale/LocaleEnhanceTest.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java.i
+data/src/share/classes/javax/net/ssl/ExtendedSSLSession.java.i
 data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/KMTMGetNothing.java.i
 data/make/sun/cmm/kcms/FILES_c_windows.gmk.i
 data/src/share/javavm/export/jni.h.i
 data/src/share/classes/java/net/HttpURLConnection.java.i
 data/src/solaris/native/sun/java2d/x11/X11SurfaceData.c.i
 data/test/java/util/TimSort/Sorter.java.i
-data/src/share/classes/sun/rmi/rmic/newrmic/Resources.java.i
+data/src/share/native/sun/security/ec/ecp_521.c.i
 data/src/share/classes/javax/swing/JButton.java.i
 data/src/share/classes/javax/swing/plaf/SeparatorUI.java.i
-data/make/java/main/java/Makefile.i
 data/src/share/classes/sun/security/ssl/EngineWriter.java.i
-data/test/com/sun/net/httpserver/bugs/B6431193.java.i
-data/test/sun/java2d/cmm/ColorConvertOp/RGBColorConvertTest.java.i
+data/test/javax/management/namespace/ExportNamespaceTest.java.i
+data/src/share/demo/jfc/SampleTree/SampleTree.java.i
 data/test/java/net/PlainSocketImpl/BigBacklog.java.i
 data/src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java.i
 data/src/share/classes/sun/security/krb5/internal/KDCOptions.java.i
 data/src/share/native/sun/awt/debug/debug_util.c.i
 data/test/java/beans/PropertyEditor/TestStringClassJava.java.i
-data/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithoutRID.java.i
-data/src/share/classes/com/sun/beans/finder/ConstructorFinder.java.i
-data/src/share/sample/nio/server/Reply.java.i
-data/src/share/classes/sun/io/ByteToCharHKSCS_2001.java.i
-data/test/javax/swing/JInternalFrame/Test6505027.java.i
+data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java.i
+data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java.i
+data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java.i
+data/test/java/io/PushbackInputStream/Available.java.i
+data/src/share/classes/sun/net/www/http/ChunkedInputStream.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_zh_SG.java.i
 data/src/solaris/classes/sun/nio/ch/DatagramDispatcher.java.i
 data/test/javax/management/standardmbean/RegistrationTest.java.i
 data/src/solaris/native/sun/java2d/loops/vis_AlphaMacros.c.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_zh_TW.properties.i
+data/src/share/classes/com/sun/jmx/remote/internal/Unmarshal.java.i
 data/src/share/classes/javax/swing/Action.java.i
-data/test/java/security/UnresolvedPermission/DebugPermissionBad.java.i
-data/test/com/sun/jndi/ldap/LdapName/EmptyNameSearch.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain2.txt.i
+data/src/share/classes/sun/tools/java/Identifier.java.i
 data/test/sun/nio/cs/MalformedSurrogates.java.i
 data/test/java/util/jar/Attributes/PutAndPutAll.java.i
 data/src/share/classes/sun/net/www/protocol/mailto/Handler.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java.i
+data/src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java.i
 data/test/java/rmi/activation/Activatable/checkRegisterInLog/group.security.policy.i
-data/src/share/classes/java/lang/Readable.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_in.properties.i
 data/src/share/classes/java/awt/CompositeContext.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DSAKeyValueResolver.java.i
-data/test/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.java.i
 data/test/java/awt/Frame/InitialMaximizedTest/InitialMaximizedTest.html.i
 data/src/share/classes/javax/swing/text/html/HTMLEditorKit.java.i
+data/src/share/classes/java/net/SocketPermission.java.i
 data/src/share/classes/javax/sound/midi/MidiEvent.java.i
-data/src/share/classes/javax/management/JMException.java.i
+data/test/java/beans/XMLEncoder/Test5023559.java.i
 data/src/share/classes/java/beans/beancontext/BeanContextMembershipListener.java.i
-data/make/tools/CharsetMapping/MacArabic.map.i
+data/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider.i
 data/src/share/native/java/util/zip/zlib-1.1.3/infutil.c.i
-data/src/windows/native/common/locale_str.h.i
 data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_it.properties.i
 data/src/share/classes/sun/security/provider/X509Factory.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/image-delayed.png.i
+data/src/share/classes/sun/security/util/DerOutputStream.java.i
+data/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java.i
 data/src/share/classes/sun/applet/resources/MsgAppletViewer_fr.java.i
-data/src/share/classes/sun/rmi/transport/TransportConstants.java.i
 data/src/share/native/sun/font/layout/HebrewShaping.cpp.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/Open.java.i
 data/test/com/sun/crypto/provider/TLS/TestPRF.java.i
@@ -10248,21 +10176,18 @@ data/src/share/classes/javax/swing/plaf/metal/MetalIconFactory.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties.i
 data/src/share/classes/javax/security/auth/x500/X500PrivateCredential.java.i
 data/test/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy21.i
-data/src/share/classes/sun/security/tools/PathList.java.i
+data/make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java.i
 data/test/java/awt/dnd/FileListBetweenJVMsTest/TargetFileListFrame.java.i
-data/src/share/classes/com/sun/media/sound/SoftPointResampler.java.i
+data/test/sun/security/pkcs11/SecureRandom/Basic.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/log4j.properties.i
 data/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java.i
-data/test/java/nio/channels/SocketChannel/Bind.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSet.java.i
 data/test/javax/management/openmbean/GenericMBeanExceptionTest.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpEngineParameters.java.i
+data/src/share/classes/sun/misc/CRC16.java.i
 data/src/share/classes/sun/jvmstat/monitor/package.html.i
-data/src/share/classes/sun/font/Font2D.java.i
+data/make/sun/dcpr/Makefile.i
 data/src/share/classes/java/beans/Beans.java.i
-data/src/share/classes/sun/reflect/ConstructorAccessor.java.i
-data/test/java/rmi/registry/interfaceHash/ReferenceRegistryStub.java.i
+data/test/javax/management/notification/SupportClearTest.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java.i
 data/src/share/classes/sun/management/snmp/util/package.html.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java.i
@@ -10273,84 +10198,86 @@ data/src/linux/doc/man/javadoc.1.i
 data/src/share/classes/java/awt/datatransfer/package.html.i
 data/test/sun/security/tools/jarsigner/PercentSign.sh.i
 data/src/share/classes/sun/tools/asm/LocalVariable.java.i
-data/src/share/classes/java/awt/doc-files/TextField-1.gif.i
-data/src/share/classes/javax/imageio/metadata/IIOMetadataController.java.i
+data/src/share/classes/java/awt/TexturePaint.java.i
+data/src/share/classes/java/util/prefs/NodeChangeListener.java.i
 data/src/share/classes/java/nio/file/attribute/BasicFileAttributes.java.i
 data/src/share/classes/sun/jvmstat/monitor/event/VmEvent.java.i
 data/test/java/lang/Class/forName/classes/left-square.class.i
-data/src/share/classes/org/openjdk/jigsaw/cli/Commands.java.i
+data/make/java/util/FILES_properties.gmk.i
 data/src/share/classes/com/sun/jmx/snmp/agent/SnmpGenericObjectServer.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BlendingMode.java.i
+data/src/share/classes/sun/text/resources/FormatData_el.java.i
 data/make/java/java_hprof_demo/Makefile.i
 data/src/windows/native/sun/font/lcdglyph.c.i
 data/make/tools/freetypecheck/Makefile.i
 data/src/share/sample/jmx/jmx-scandir/nbproject/file-targets.xml.i
 data/test/java/nio/file/Path/CheckPermissions.java.i
-data/src/share/classes/javax/swing/ComponentInputMap.java.i
+data/make/tools/CharsetMapping/IBM284.c2b.i
 data/test/java/rmi/testlibrary/JavaVM.java.i
-data/test/sun/management/jmxremote/bootstrap/management_test06_ok.properties.in.i
+data/test/com/sun/servicetag/DuplicateNotFound.java.i
 data/src/share/classes/javax/naming/event/NamingListener.java.i
-data/src/share/classes/java/sql/Statement.java.i
-data/src/share/classes/javax/swing/text/PlainDocument.java.i
-data/test/java/awt/FileDialog/MultipleMode/MultipleMode.java.i
+data/src/share/classes/javax/security/auth/login/LoginException.java.i
+data/test/java/nio/file/Files/TerminateWalk.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM278.java.i
 data/src/share/classes/sun/io/CharToByteJIS0212_Solaris.java.i
-data/src/share/classes/sun/nio/cs/UTF_16BE.java.i
+data/src/linux/doc/man/ja/jarsigner.1.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/PainterBorder.java.i
-data/test/java/nio/channels/Selector/CloseThenRegister.java.i
-data/test/java/io/BufferedInputStream/SkipTest.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_PY.properties.i
+data/src/share/classes/javax/swing/plaf/nimbus/PainterImpl.template.i
 data/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java.i
+data/src/linux/doc/man/ja/jstack.1.i
 data/src/share/classes/java/lang/SecurityManager.java.i
 data/src/share/classes/java/util/concurrent/atomic/AtomicReference.java.i
-data/src/share/native/java/security/AccessController.c.i
+data/test/java/beans/Introspector/Test6528714.java.i
 data/test/sun/rmi/rmic/covariantReturns/G5Impl.java.i
 data/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java.i
-data/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.Connector.i
+data/test/java/util/zip/ZipFile/Available.java.i
 data/src/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java.i
 data/src/share/demo/jfc/TableExample/TableExample4.java.i
 data/test/sun/net/www/EncDec.doc.i
+data/src/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_de_LU.properties.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpTooBigException.java.i
-data/src/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java.i
-data/test/java/lang/Runtime/exec/StreamsSurviveDestroy.java.i
-data/src/share/classes/sun/tools/javac/CompilerMember.java.i
+data/src/share/classes/sun/text/resources/FormatData_es_HN.java.i
+data/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java.i
+data/test/sun/text/resources/Collator/Bug4848897.java.i
 data/src/windows/npt/utf_md.c.i
 data/test/javax/management/ObjectName/ValueWildcardTest.java.i
-data/src/share/classes/sun/io/CharToByteCp273.java.i
 data/src/windows/native/sun/java2d/d3d/D3DUtils.h.i
 data/src/share/native/java/util/zip/zlib-1.2.3/crc32.h.i
 data/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java.i
-data/src/share/classes/javax/xml/crypto/KeySelector.java.i
+data/test/java/lang/instrument/RedefineClassWithNativeMethod.sh.i
 data/src/share/classes/java/text/DateFormat.java.i
+data/test/javax/management/modelmbean/InfoSupportTest.java.i
 data/test/sun/security/provider/SeedGenerator/Awt_Hang_Test.java.i
-data/src/solaris/classes/sun/awt/X11/XHorizontalScrollbar.java.i
-data/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java.i
+data/test/sun/nio/cs/TestEUC_TW.java.i
+data/test/org/openjdk/jigsaw/cli/ModuleFormatTest01.sh.i
 data/src/share/classes/sun/awt/image/DataBufferNative.java.i
-data/test/java/beans/Introspector/4750368/com/foo/test/Component.java.i
 data/make/tools/src/build/tools/charsetmapping/JIS0213.java.i
-data/test/java/awt/dnd/URIListBetweenJVMsTest/TargetFileListFrame.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java.i
-data/src/share/classes/java/net/HttpRetryException.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java.i
 data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipConstants.java.i
 data/test/java/util/Random/NextBytes.java.i
-data/src/share/demo/jvmti/waiters/waiters.cpp.i
-data/src/share/classes/sun/security/x509/PolicyMappingsExtension.java.i
+data/make/com/sun/servicetag/Makefile.i
 data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java.i
-data/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java.i
+data/src/share/demo/applets/Fractal/CLSFractal.java.i
+data/src/share/classes/sun/misc/GC.java.i
 data/test/java/awt/font/TextLayout/DecorationBoundsTest.java.i
 data/src/share/demo/applets/SpreadSheet/example1.html.i
 data/test/sun/security/pkcs11/ec/ReadPKCS12.java.i
-data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java.i
-data/test/sun/security/pkcs11/Provider/Login.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java.i
+data/test/sun/security/provider/PolicyParser/ExpansionErrorMisleading.java.i
 data/test/java/rmi/activation/Activatable/shutdownGracefully/group.security.policy.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/EffectUtilsTemp.java.i
 data/test/java/io/Serializable/partialClassDesc/PartialClassDesc.java.i
-data/src/linux/doc/man/policytool.1.i
+data/src/share/classes/org/openjdk/jigsaw/LibraryPool.java.i
 data/src/share/classes/com/sun/tools/jdi/LocalVariableImpl.java.i
-data/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java.i
-data/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java.i
-data/src/share/classes/sun/java2d/pipe/TextPipe.java.i
-data/src/share/classes/sun/io/CharToByteCp285.java.i
+data/test/java/nio/channels/FileChannel/TransferToNonWritable.java.i
+data/test/java/lang/instrument/BootClassPath/Setup.java.i
+data/src/share/back/error_messages.h.i
+data/src/share/classes/sun/nio/cs/SingleByteDecoder.java.i
 data/src/windows/classes/sun/awt/windows/awtLocalization_fr.properties.i
+data/test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java.i
 data/make/mkdemo/jfc/SwingSet3/Makefile.i
 data/src/share/native/java/util/zip/zlib-1.1.3/infutil.h.i
 data/make/sun/javazic/tzdata/VERSION.i
@@ -10358,74 +10285,77 @@ data/src/share/classes/java/lang/reflect/Type.java.i
 data/src/share/classes/sun/rmi/server/UnicastRef.java.i
 data/src/share/native/sun/security/ec/impl/ecp_mont.c.i
 data/src/share/classes/javax/management/BadStringOperationException.java.i
-data/src/share/classes/sun/security/x509/CertificateIssuerName.java.i
+data/test/java/net/URLConnection/RequestProperties.java.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/TestAllSuites.java.i
-data/test/java/nio/channels/Selector/BasicAccept.java.i
-data/src/share/classes/javax/xml/crypto/dsig/SignedInfo.java.i
+data/src/share/classes/java/text/AttributedCharacterIterator.java.i
+data/test/java/net/Socket/InheritTimeout.java.i
 data/test/java/net/Inet6Address/serialize/Serialize.java.i
+data/test/javax/swing/JLabel/7004134/bug7004134.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_th_TH.properties.i
-data/test/java/security/SecureRandom/sha1prng-new.bin.i
+data/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java.i
 data/src/solaris/native/sun/awt/awt_Robot.c.i
 data/test/sun/security/pkcs11/fips/CipherTest.java.i
+data/test/tools/launcher/PrintVersion.java.i
 data/src/share/classes/sun/security/krb5/internal/crypto/EType.java.i
 data/make/tools/CharsetMapping/IBM833.c2b.i
 data/src/share/classes/java/security/Permissions.java.i
 data/test/sun/security/jgss/spnego/NoSpnegoAsDefMech.java.i
-data/src/share/classes/javax/naming/ldap/ControlFactory.java.i
-data/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java.i
-data/test/javax/swing/JSlider/4987336/box.gif.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Gradient.java.i
-data/test/sun/tools/jstat/jstatClassloadOutput1.sh.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy21.i
+data/test/javax/xml/crypto/dsig/data/certs/crl.i
+data/make/tools/GenerateCharacter/CharacterDataLatin1.java.template.i
+data/test/com/sun/security/sasl/util/CheckAccess.java.i
 data/src/share/classes/sun/util/calendar/Gregorian.java.i
 data/src/share/classes/sun/security/ssl/AppInputStream.java.i
 data/test/javax/print/attribute/AttributeTest.java.i
 data/src/share/classes/java/security/Key.java.i
 data/test/java/nio/channels/DatagramChannel/SelectWhenRefused.java.i
-data/src/windows/native/sun/windows/awt_IconCursor.h.i
+data/src/share/classes/sun/security/krb5/KrbAsReq.java.i
 data/test/sun/security/pkcs11/KeyStore/BasicData/basic.keystore.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformEnvelopedSignature.java.i
 data/src/share/classes/sun/io/CharToByteMacSymbol.java.i
-data/src/share/classes/java/lang/doc-files/theta.gif.i
+data/test/javax/management/namespace/VirtualMBeanNotifTest.java.i
 data/src/share/classes/sun/invoke/anon/ConstantPoolPatch.java.i
-data/make/launchers/Makefile.launcher.i
-data/test/java/io/StreamTokenizer/Comment.java.i
+data/src/share/classes/java/net/JarURLConnection.java.i
+data/make/sun/javazic/tzdata/pacificnew.i
 data/test/java/math/BigInteger/OperatorNpeTests.java.i
-data/LICENSE.i
+data/make/sun/security/ec/FILES_c.gmk.i
 data/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java.i
-data/src/share/classes/sun/io/ByteToCharCp1258.java.i
+data/test/sun/tools/jstat/lineCounts2.awk.i
 data/src/share/classes/sun/tools/jconsole/ConnectDialog.java.i
 data/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java.i
 data/src/share/classes/javax/naming/directory/InvalidSearchControlsException.java.i
 data/src/share/classes/java/security/cert/PKIXParameters.java.i
 data/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java.i
-data/test/java/rmi/activation/Activatable/restartService/RestartService.java.i
+data/src/share/classes/javax/management/NumericValueExp.java.i
 data/src/share/classes/com/sun/tools/jdi/DoubleTypeImpl.java.i
-data/make/tools/src/build/tools/generatenimbus/Utils.java.i
 data/test/javax/swing/JColorChooser/Test4711996.java.i
-data/test/java/net/Socket/reset/Test.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/PreferredKey.java.i
 data/test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.chk.i
 data/test/java/util/TreeMap/cr5045147.java.i
 data/src/share/classes/java/awt/print/package.html.i
 data/test/sun/security/provider/PolicyFile/Alias.keystore.i
-data/test/java/lang/ClassLoader/findSystemClass/Loadee.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/Warn.gif.i
 data/src/share/classes/java/lang/Cloneable.java.i
 data/src/share/classes/javax/swing/JToggleButton.java.i
-data/test/java/net/SocketPermission/ActionSpace.java.i
-data/test/java/net/URL/HashCode.java.i
+data/test/javax/management/relation/NonArrayListTest.java.i
+data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/project.xml.i
+data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties.i
+data/src/share/classes/java/lang/Comparable.java.i
 data/test/java/lang/management/ThreadMXBean/Locks.java.i
 data/src/share/classes/java/security/cert/PolicyQualifierInfo.java.i
 data/test/javax/management/remote/mandatory/notif/policy.positive.i
-data/src/share/classes/com/sun/jdi/request/MonitorWaitRequest.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java.i
 data/src/share/classes/java/dyn/MethodHandle.java.i
 data/src/share/demo/jvmti/hprof/hprof_blocks.h.i
-data/test/java/io/PrintStream/FailingConstructors.java.i
+data/test/java/rmi/testlibrary/TestFailedException.java.i
 data/test/java/rmi/server/serverStackTrace/Impl1_Skel.java.i
 data/test/sun/security/pkcs11/fips/certs/server.cer.i
-data/src/share/classes/javax/swing/doc-files/groupLayout.sequential.vertical.gif.i
-data/test/javax/crypto/NullCipher/TestWithoutInit.java.i
-data/test/java/io/RandomAccessFile/Close.java.i
+data/test/sun/security/pkcs11/fips/ImportKeyStore.java.i
+data/make/com/sun/tracing/dtrace/Makefile.i
 data/src/share/classes/java/awt/peer/PopupMenuPeer.java.i
 data/src/share/classes/java/awt/dnd/Autoscroll.java.i
+data/test/java/beans/Introspector/memory/Bean2.java.i
 data/src/share/native/java/lang/fdlibm/src/e_log.c.i
 data/test/sun/rmi/transport/proxy/EagerHttpFallback.java.i
 data/test/sun/security/pkcs11/SecmodTest.java.i
@@ -10433,16 +10363,16 @@ data/test/sun/net/www/AuthHeaderTest.java.i
 data/test/com/sun/tools/attach/PermissionTest.java.i
 data/test/com/sun/jdi/HomeTest.java.i
 data/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java.i
-data/test/sun/security/tools/policytool/i18n.sh.i
+data/test/sun/net/www/http/KeepAliveCache/B5045306.java.i
 data/src/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java.i
-data/src/share/native/java/util/zip/zlib-1.2.3/inffast.c.i
-data/src/share/native/java/lang/Float.c.i
-data/src/share/classes/com/sun/jndi/ldap/LdapURL.java.i
+data/src/share/classes/sun/io/ByteToCharMS932.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain5.txt.i
 data/src/share/native/sun/awt/libpng/pngread.c.i
 data/test/java/beans/XMLDecoder/spec/TestFloat.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMBean.java.i
 data/src/share/back/ArrayReferenceImpl.c.i
 data/src/share/classes/java/util/IllformedLocaleException.java.i
+data/test/java/net/CookieHandler/CookieHandlerTest.java.i
 data/test/sun/nio/cs/TestConverterDroppedCharacters.java.i
 data/src/share/native/sun/awt/image/jpeg/jddctmgr.c.i
 data/test/java/net/Socket/UrgentDataTest.java.i
@@ -10451,86 +10381,87 @@ data/test/demo/jvmti/hprof/OptionsTest.java.i
 data/src/solaris/doc/sun/man/man1/ja/jarsigner.1.i
 data/make/tools/swing-beans/beaninfo/images/JInternalFrameColor32.gif.i
 data/src/share/classes/com/sun/media/sound/SF2Layer.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java.i
+data/test/java/awt/dnd/ImageDecoratedDnD/DnDTarget.java.i
 data/test/sun/security/ssl/sun/net/www/httpstest/HttpTransaction.java.i
 data/src/share/classes/javax/swing/ActionPropertyChangeListener.java.i
-data/src/share/classes/sun/io/ByteToCharCp933.java.i
+data/test/java/io/pathNames/win32/SJIS.java.i
 data/test/javax/script/Test6.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM943.java.i
 data/src/share/classes/com/sun/tools/hat/internal/parser/PositionDataInputStream.java.i
-data/src/share/classes/java/awt/image/renderable/RenderContext.java.i
+data/test/java/awt/font/StyledMetrics/BoldSpace.java.i
 data/test/java/nio/file/WatchService/FileTreeModifier.java.i
 data/test/java/lang/instrument/GetInitiatedClassesTest.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java.i
 data/src/share/classes/sun/text/resources/FormatData_es_ES.java.i
-data/src/share/native/java/lang/fdlibm/src/s_tanh.c.i
+data/test/sun/rmi/rmic/newrmic/equivalence/batch.sh.i
 data/src/solaris/doc/sun/man/man1/ja/javac.1.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java.i
 data/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java.i
 data/src/share/native/sun/management/HotSpotDiagnostic.c.i
-data/src/share/classes/sun/security/provider/certpath/CertId.java.i
+data/test/sun/security/tools/keytool/trystore.sh.i
+data/src/share/classes/sun/tools/jconsole/inspector/XPlottingViewer.java.i
 data/test/java/math/BigDecimal/RangeTests.java.i
-data/src/share/native/sun/awt/medialib/mlib_status.h.i
+data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/jdk.xml.i
 data/src/share/classes/javax/swing/text/ComponentView.java.i
-data/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c.i
-data/test/java/lang/Character/CheckProp.java.i
-data/src/share/classes/java/awt/color/package.html.i
+data/test/javax/crypto/Cipher/TestCipherMode.java.i
+data/test/java/lang/Math/Expm1Tests.java.i
 data/test/java/awt/PrintJob/Security/SecurityDialogTest.java.i
 data/src/share/classes/javax/naming/event/ObjectChangeListener.java.i
 data/src/share/classes/javax/swing/tree/DefaultTreeModel.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java.i
+data/src/share/classes/sun/tools/tree/ExprExpression.java.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest12_ok.ssl.in.i
 data/test/javax/sound/midi/Gervill/SoftTuning/GetTuningInt.java.i
 data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain7.txt.i
-data/test/java/io/Serializable/PutField/Write2.java.i
-data/src/share/classes/com/sun/tools/example/doc/index.html.i
+data/src/share/classes/sun/security/jgss/GSSNameImpl.java.i
 data/test/javax/sound/midi/Gervill/SoftChannel/Controller.java.i
-data/src/share/classes/sun/tracing/MultiplexProviderFactory.java.i
+data/test/java/lang/instrument/PremainClass/DummyMain.java.i
 data/test/javax/sound/midi/Gervill/SoftReceiver/Send_ActiveSense.java.i
 data/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c.i
-data/src/share/classes/java/awt/font/GlyphJustificationInfo.java.i
+data/test/sun/security/rsa/TestCACerts.java.i
 data/src/share/demo/jfc/Metalworks/MetalworksPrefs.java.i
 data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/PublicInterface.java.i
-data/test/java/security/Policy/Dynamic/DynamicPolicy.java.i
+data/test/sun/security/provider/PolicyParser/PrincipalExpansionError.sh.i
 data/test/com/sun/tracing/BasicWithSecurityMgr.java.i
-data/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java.i
-data/make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java.i
+data/test/javax/management/modelmbean/DescriptorSupportXMLTest.java.i
+data/test/sun/util/resources/TimeZone/Bug4858517.java.i
 data/src/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java.i
 data/src/windows/classes/sun/java2d/windows/DDBlitLoops.java.i
-data/src/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java.i
 data/src/linux/doc/man/ja/jdb.1.i
 data/src/share/classes/javax/crypto/spec/IvParameterSpec.java.i
-data/src/share/classes/com/sun/jndi/dns/ResourceRecord.java.i
+data/test/javax/print/applet/applet2/Applet2PrintServiceLookup.java.i
 data/make/tools/swing-beans/beaninfo/images/JEditorPaneMono16.gif.i
-data/make/tools/jarreorder/Makefile.i
+data/src/share/classes/com/sun/jmx/remote/internal/NotificationBufferFilter.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java.i
 data/test/java/awt/dnd/ImageDecoratedDnDInOut/DnDTarget.java.i
 data/test/org/openjdk/jigsaw/preinstall-setup.sh.i
 data/test/java/security/cert/CertPathValidator/OCSP/AIACert.pem.i
 data/src/share/classes/sun/io/ByteToCharUnicodeLittleUnmarked.java.i
-data/src/share/classes/sun/security/util/DerInputBuffer.java.i
+data/src/share/classes/sun/security/x509/PolicyMappingsExtension.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/internal/ColumnarData.java.i
 data/test/java/util/ResourceBundle/Bug4396021GeneralMessages.java.i
 data/test/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java.i
 data/src/share/native/sun/awt/libpng/pngmem.c.i
 data/src/share/classes/java/net/URLStreamHandler.java.i
-data/src/share/classes/sun/reflect/generics/tree/Tree.java.i
+data/test/java/util/Formatter/Basic-X.java.i
 data/src/share/classes/sun/nio/ch/DatagramChannelImpl.java.i
 data/src/share/classes/sun/tools/jstat/RawOutputFormatter.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java.i
 data/src/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java.i
 data/src/share/classes/sun/security/provider/DSAKeyFactory.java.i
+data/src/share/classes/java/lang/ref/FinalReference.java.i
+data/src/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java.i
 data/src/share/native/sun/management/VMManagementImpl.c.i
-data/src/share/classes/javax/swing/text/rtf/RTFParser.java.i
+data/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java.i
 data/test/java/awt/Focus/ContainerFocusAutoTransferTest/ContainerFocusAutoTransferTest.java.i
+data/test/java/net/Inet6Address/B4923906.java.i
 data/test/com/sun/crypto/provider/KeyFactory/PBKDF2HmacSHA1FactoryTest.java.i
 data/src/share/sample/nio/file/Copy.java.i
-data/src/share/classes/javax/security/auth/callback/ConfirmationCallback.java.i
+data/src/share/classes/sun/tools/jconsole/TimeComboBox.java.i
 data/test/sun/net/idn/nfscsi.spp.i
 data/test/sun/net/www/protocol/http/ProtocolRedirect.java.i
 data/src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h.i
 data/src/share/classes/java/util/concurrent/CompletionService.java.i
-data/src/share/classes/com/sun/jdi/event/EventQueue.java.i
+data/test/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java.i
 data/src/solaris/bin/ergo_zero.c.i
 data/src/windows/native/sun/windows/awt_List.cpp.i
 data/test/sun/tools/jstat/gcOldOutput1.awk.i
@@ -10540,90 +10471,90 @@ data/test/tools/launcher/libraryCaller.h.i
 data/src/share/native/java/io/ObjectInputStream.c.i
 data/test/sun/security/rsa/rsakeys.ks.i
 data/test/javax/swing/JColorChooser/Test6199676.java.i
-data/src/share/classes/sun/security/provider/IdentityDatabase.java.i
+data/src/share/native/sun/font/layout/LEFontInstance.h.i
+data/test/java/rmi/reliability/scripts/run_serialbench.ksh.i
 data/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java.i
 data/test/java/security/BasicPermission/PermClass.1.3.1.i
+data/src/share/classes/sun/font/CMap.java.i
 data/src/share/classes/java/awt/geom/NoninvertibleTransformException.java.i
 data/test/javax/management/mxbean/MXBeanPreRegisterTest.java.i
 data/src/share/classes/java/lang/annotation/RetentionPolicy.java.i
 data/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpec.java.i
-data/src/share/classes/java/lang/invoke/InvokeGeneric.java.i
+data/test/java/beans/XMLDecoder/spec/TestVar.java.i
 data/src/share/classes/javax/net/ssl/SSLSocketFactory.java.i
 data/src/share/classes/sun/text/resources/BreakIteratorInfo_th.java.i
 data/make/tools/CharsetMapping/ISO_8859_15.map.i
 data/src/share/classes/sun/text/resources/FormatData_da.java.i
 data/test/java/lang/instrument/appendToClassLoaderSearch/B.1.i
-data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl_Stub.java.i
 data/src/share/native/sun/font/layout/NonContextualGlyphSubstProc.h.i
 data/src/windows/native/sun/windows/awt_DnDDT.h.i
-data/src/share/classes/org/relaxng/datatype/DatatypeLibrary.java.i
+data/make/tools/swing-beans/beaninfo/images/JToolBarMono16.gif.i
 data/test/java/awt/image/GetSamplesTest.java.i
 data/test/com/sun/nio/sctp/SctpChannel/Receive.java.i
 data/test/org/openjdk/jigsaw/cli/timestamp-test.sh.i
-data/src/solaris/native/sun/awt/awt_dnd.h.i
-data/test/java/lang/reflect/Generics/TestC2.java.i
+data/make/java/text/FILES_java.gmk.i
 data/test/com/sun/jdi/redefineMethod/Different_RedefineSubTarg.java.i
 data/test/java/security/BasicPermission/PermClass.1.2.1.i
-data/test/sun/rmi/rmic/newrmic/equivalence/ComputeServer.java.i
+data/test/java/rmi/dgc/dgcImplInsulation/security.policy.i
 data/test/java/dyn/6987555/Test6987555.java.i
 data/test/java/awt/event/HierarchyEvent/AncestorResized/AncestorResized.java.i
+data/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties.i
 data/make/modules/tools/src/com/sun/classanalyzer/AnnotatedDependency.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java.i
 data/src/share/native/sun/awt/image/cvutils/img_dir8dither.h.i
-data/src/share/classes/sun/applet/Main.java.i
-data/src/share/classes/sun/awt/resources/awt_ja.properties.i
+data/src/share/classes/sun/security/util/AuthResources_ja.java.i
+data/test/java/util/HashMap/ToString.java.i
 data/src/share/native/sun/java2d/opengl/OGLRenderer.c.i
 data/src/share/classes/sun/management/HotspotInternal.java.i
 data/src/share/native/java/util/zip/zlib-1.2.3/inffixed.h.i
 data/test/sun/security/tools/policytool/SaveAs.sh.i
-data/test/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandardMBean.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U8Func.c.i
 data/test/com/sun/net/httpserver/FileServerHandler.java.i
 data/test/java/lang/management/ThreadMXBean/InvalidThreadID.java.i
-data/src/share/classes/com/sun/media/sound/SoftVoice.java.i
 data/test/java/net/Socket/asyncClose/AsyncClose.java.i
 data/make/javax/swing/plaf/Makefile.i
-data/src/share/classes/sun/util/resources/CalendarData_th.properties.i
-data/src/share/classes/javax/management/loading/MLetObjectInputStream.java.i
+data/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java.i
+data/test/java/rmi/activation/Activatable/downloadParameterClass/security.policy.i
 data/test/java/awt/print/PrinterJob/duke.gif.i
 data/src/solaris/doc/sun/man/man1/ja/unpack200.1.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html.i
-data/test/java/security/cert/CertificateFactory/BadX509CertData.java.i
+data/src/share/classes/java/util/AbstractMap.java.i
 data/make/javax/swing/beaninfo/Makefile.i
+data/src/share/classes/java/util/concurrent/ThreadLocalRandom.java.i
 data/src/share/classes/java/awt/image/IndexColorModel.java.i
+data/src/share/demo/applets/WireFrame/example2.html.i
 data/test/java/rmi/activation/Activatable/restartCrashedService/group.security.policy.i
 data/src/solaris/classes/sun/awt/motif/X11CNS11643P3.java.i
 data/make/common/internal/Defs-jaxws.gmk.i
-data/src/share/classes/java/beans/XMLDecoder.java.i
-data/src/solaris/doc/sun/man/man1/jrunscript.1.i
-data/src/share/classes/sun/awt/image/BufferedImageDevice.java.i
+data/src/share/classes/javax/swing/text/StyleConstants.java.i
+data/src/windows/native/java/io/dirent_md.c.i
 data/test/java/util/logging/LoggingDeadlock3.props.i
 data/src/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java.i
 data/src/share/classes/javax/xml/crypto/KeySelectorResult.java.i
-data/src/share/classes/javax/sql/rowset/JdbcRowSet.java.i
-data/src/solaris/native/sun/java2d/loops/vis_ThreeByteBgr.c.i
+data/test/java/beans/Beans/6669869/TestGuiAvailable.java.i
+data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java.i
 data/src/share/classes/java/awt/image/PixelGrabber.java.i
-data/test/javax/print/attribute/CollateAttr.java.i
+data/src/solaris/classes/sun/awt/motif/X11SelectionHolder.java.i
 data/test/java/beans/XMLEncoder/Test4652928.java.i
 data/src/windows/native/java/util/TimeZone_md.h.i
 data/test/tools/launcher/MiscTests.java.i
 data/src/share/classes/sun/awt/OrientableFlowLayout.java.i
 data/test/sun/security/mscapi/AccessKeyStore.java.i
-data/test/java/beans/PropertyEditor/TestByteType.java.i
+data/test/com/sun/crypto/provider/Cipher/PBE/PKCS12Cipher.java.i
 data/src/share/back/transport.h.i
-data/src/share/classes/java/security/cert/PKIXReason.java.i
 data/src/share/classes/sun/text/resources/FormatData_sr_Latn.java.i
-data/test/java/net/SocketPermission/Wildcard.java.i
-data/test/sun/security/util/PropertyExpander/ExpandAndEncode.java.i
+data/test/javax/swing/plaf/basic/BasicScrollPaneUI/Test6632810.java.i
+data/test/sun/tools/jconsole/ResourceCheckTest.sh.i
+data/test/java/rmi/reliability/benchmark/bench/serial/Longs.java.i
 data/src/share/classes/sun/nio/ch/PendingFuture.java.i
 data/make/modules/modularize.sh.i
 data/test/java/lang/instrument/AppendToBootstrapClassPathSetUp.sh.i
 data/test/sun/util/resources/TimeZone/Bug6442006.java.i
 data/test/java/text/Bidi/BidiEmbeddingTest.java.i
 data/test/java/security/Policy/GetInstance/GetInstance.policy.i
-data/src/share/classes/sun/text/resources/FormatData_cs_CZ.java.i
-data/make/mkdemo/jfc/Notepad/Makefile.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java.i
+data/test/com/sun/servicetag/DeleteServiceTag.java.i
+data/test/java/lang/ClassLoader/package2/Class2.java.i
 data/src/solaris/classes/java/net/PlainDatagramSocketImpl.java.i
+data/test/org/openjdk/jigsaw/InstallFromRepo.java.i
 data/src/share/classes/javax/management/MBeanNotificationInfo.java.i
 data/src/share/classes/java/util/Collection.java.i
 data/src/share/classes/sun/tools/jconsole/inspector/XDataViewer.java.i
@@ -10637,25 +10568,25 @@ data/src/share/classes/sun/text/resources/FormatData_hu.java.i
 data/src/share/classes/sun/dyn/util/Wrapper.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_CheckedCollection.java.i
 data/make/tools/CharsetMapping/euc_tw.map.i
-data/test/java/awt/FontClass/CreateFont/fileaccess/FontFile.java.i
+data/make/tools/src/build/tools/generatenimbus/Utils.java.i
 data/src/solaris/classes/sun/awt/X11/XAWTXSettings.java.i
 data/src/share/classes/sun/io/ByteToCharHKSCS.java.i
 data/src/share/classes/sun/font/TextSourceLabel.java.i
-data/src/share/classes/com/sun/servicetag/RegistrationData.java.i
+data/make/com/sun/nio/Makefile.i
+data/src/share/classes/sun/nio/cs/ext/EUC_KR.java.i
 data/src/share/classes/sun/java2d/loops/DrawParallelogram.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/InvalidKeyResolverException.java.i
 data/src/solaris/hpi/export/byteorder_md.h.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/ui/CompactLayout.java.i
-data/src/share/classes/javax/sql/rowset/spi/SyncFactoryException.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_zh_TW.properties.i
 data/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java.i
 data/src/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java.i
-data/src/share/classes/javax/management/DefaultLoaderRepository.java.i
+data/test/sun/tools/jps/jps-lm_Output1.awk.i
 data/test/java/net/Inet6Address/serialize/serial1.4.2.ser.i
-data/test/sun/misc/JarIndex/metaInfFilenames/jarA/META-INF/services/my.happy.land.i
+data/src/share/bin/jli_util.h.i
 data/make/tools/CharsetMapping/IBM278.nr.i
-data/test/java/lang/Short/ByteSwap.java.i
-data/test/sun/security/provider/DSA/TestDSA.java.i
+data/test/java/lang/ClassLoader/deadlock/SupBob.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_fr.properties.i
 data/src/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java.i
 data/src/windows/native/sun/management/FileSystemImpl.c.i
@@ -10664,58 +10595,57 @@ data/src/share/classes/sun/awt/DisplayChangedListener.java.i
 data/src/share/classes/java/util/concurrent/locks/Lock.java.i
 data/src/share/classes/sun/net/httpserver/UnmodifiableHeaders.java.i
 data/src/share/native/com/sun/java/util/jar/pack/main.cpp.i
-data/src/share/classes/javax/management/openmbean/CompositeData.java.i
 data/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java.i
 data/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation_Stub.java.i
-data/src/share/classes/sun/font/FontFamily.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java.i
 data/src/share/demo/nbproject/jfc/TableExample/nbproject/project.xml.i
 data/src/share/classes/sun/util/resources/CalendarData_sr_Latn_ME.properties.i
 data/src/share/classes/java/awt/geom/LineIterator.java.i
-data/test/java/beans/XMLEncoder/Test5023557.java.i
-data/test/java/lang/management/MemoryMXBean/PendingAllGC.sh.i
+data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.policy.i
 data/src/share/classes/sun/tools/native2ascii/N2AFilter.java.i
 data/test/javax/swing/border/Test4243289.html.i
 data/test/java/security/UnresolvedPermission/AccessorMethods.signer2.i
+data/src/share/classes/sun/text/resources/CollationData_hr.java.i
 data/src/share/classes/javax/swing/GraphicsWrapper.java.i
+data/src/share/classes/sun/nio/cs/ext/MS949.java.i
 data/src/solaris/native/sun/java2d/loops/java2d_Mlib.c.i
 data/src/share/classes/java/lang/invoke/DirectMethodHandle.java.i
-data/src/share/native/sun/java2d/pipe/BufferedRenderPipe.c.i
-data/test/javax/management/namespace/VirtualPropsTest.java.i
+data/src/share/native/sun/awt/image/cvutils/img_icm.h.i
+data/test/java/awt/Multiscreen/DeviceIdentificationTest/DeviceIdentificationTest.java.i
 data/src/share/classes/com/sun/tools/example/doc/trace.html.i
 data/test/java/lang/StringBuilder/Insert.java.i
+data/src/share/classes/sun/nio/cs/ext/ISO_8859_8.java.i
 data/src/share/classes/java/io/PipedWriter.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java.i
 data/test/sun/nio/cs/FindEncoderBugs.java.i
+data/src/share/demo/jfc/FileChooserDemo/FileChooserDemo.java.i
 data/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp.i
 data/src/share/classes/javax/naming/InterruptedNamingException.java.i
+data/test/java/util/zip/FlaterCriticalArray.java.i
 data/src/share/classes/sun/security/tools/JarSigner.java.i
 data/test/com/sun/jdi/ClassLoaderClassesTest.java.i
-data/src/share/classes/javax/naming/LinkLoopException.java.i
 data/src/windows/native/sun/windows/alloc.h.i
 data/src/windows/classes/sun/awt/windows/awtLocalization_de.properties.i
 data/test/java/beans/XMLEncoder/javax_swing_tree_DefaultTreeModel.java.i
 data/src/share/classes/sun/nio/cs/ext/MS1256.java.i
-data/test/java/nio/file/Files/SkipSiblings.java.i
+data/test/javax/management/descriptor/UnionTest.java.i
 data/src/share/classes/sun/io/ByteToCharCp855.java.i
-data/test/javax/management/mxbean/MXBeanAnnotationTest.java.i
 data/make/tools/src/build/tools/generatecharacter/UnicodeSpec.java.i
-data/src/share/classes/sun/awt/image/BufImgVolatileSurfaceManager.java.i
+data/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template.i
 data/test/java/lang/Class/getEnclosingConstructor/EnclosingConstructorTests.java.i
-data/src/share/classes/sun/net/www/ApplicationLaunchException.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv.h.i
 data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp.i
-data/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java.i
 data/test/tools/launcher/ZipMeUp.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadBlocksClose.java.i
-data/src/share/classes/com/sun/java/browser/net/ProxyInfo.java.i
+data/src/share/classes/java/rmi/Remote.java.i
+data/src/share/classes/java/awt/ModalEventFilter.java.i
+data/src/windows/classes/sun/awt/windows/WCheckboxPeer.java.i
 data/test/sun/net/www/protocol/http/RetryUponTimeout.java.i
 data/src/share/classes/javax/management/remote/JMXConnectorServerProvider.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java.i
+data/test/sun/security/pkcs11/ec/TestKeyFactory.java.i
 data/src/windows/native/java/util/WindowsPreferences.c.i
-data/test/java/nio/file/attribute/FileTime/Basic.java.i
-data/test/java/rmi/testlibrary/TestParams.java.i
 data/src/share/classes/com/sun/tools/jdi/ClassLoaderReferenceImpl.java.i
-data/test/sun/jvmstat/testlibrary/Sleeper.java.i
-data/src/share/classes/com/sun/rowset/internal/XmlErrorHandler.java.i
-data/test/java/rmi/reliability/benchmark/bench/Makefile.i
+data/test/tools/pack200/TestExceptions.java.i
+data/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider.i
 data/src/share/classes/javax/management/remote/MBeanServerForwarder.java.i
 data/test/javax/swing/JFileChooser/7036025/security.policy.i
 data/test/sun/nio/cs/TestIllegalISO2022Esc.java.i
@@ -10727,73 +10657,77 @@ data/make/tools/src/build/tools/generatenimbus/PainterGenerator.java.i
 data/test/sun/management/jmxremote/bootstrap/management_ssltest09_ko.properties.in.i
 data/src/share/classes/sun/text/resources/FormatData_ar_OM.java.i
 data/src/share/classes/sun/applet/AppletThreadGroup.java.i
-data/test/java/security/cert/CertPathBuilder/targetConstraints/ca.cer.i
+data/src/share/demo/java2d/J2DBench/resources/textdata/english.ut8.txt.i
 data/src/share/classes/javax/print/attribute/standard/Media.java.i
 data/test/com/sun/security/auth/login/ConfigFile/InnerClassConfig.policy.i
 data/src/share/classes/sun/net/ftp/impl/FtpClient.java.i
-data/src/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java.i
+data/src/share/native/sun/security/ec/ec.h.i
 data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibHandler.java.i
 data/src/share/classes/sun/text/resources/FormatData_et.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpV6Address.java.i
 data/src/share/classes/sun/net/spi/nameservice/NameService.java.i
 data/src/share/classes/com/sun/jdi/CharValue.java.i
-data/src/share/classes/java/awt/MenuBar.java.i
-data/src/share/classes/sun/swing/ImageIconUIResource.java.i
+data/test/sun/security/provider/PolicyFile/SelfWildcard.java.i
 data/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java.i
-data/src/share/classes/sun/nio/cs/SingleByteEncoder.java.i
+data/src/share/classes/sun/font/TextSource.java.i
+data/test/java/util/Random/NextIntPowerOfTwoMod.java.i
 data/test/java/nio/charset/coders/StreamTimeout.java.i
+data/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java.i
 data/src/share/classes/org/ietf/jgss/MessageProp.java.i
 data/src/share/native/java/io/RandomAccessFile.c.i
-data/src/share/classes/sun/tools/jconsole/ClassTab.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java.i
 data/src/share/classes/javax/sound/sampled/LineListener.java.i
-data/src/share/sample/nio/server/ChannelIO.java.i
-data/test/java/util/ResourceBundle/Bug4168625Resource2.java.i
+data/test/javax/accessibility/6986385/bug6986385.java.i
 data/src/share/classes/java/nio/file/ReadOnlyFileSystemException.java.i
 data/make/tools/CharsetMapping/IBM943.nr.i
 data/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/floppy.gif.i
-data/test/java/util/PluggableLocale/ClasspathTest.sh.i
+data/src/share/demo/jvmti/heapViewer/README.txt.i
+data/src/windows/native/sun/windows/hand.cur.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormat.java.i
 data/src/share/classes/javax/swing/table/JTableHeader.java.i
 data/make/java/java/localelist.sh.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java.i
+data/src/share/native/sun/java2d/loops/AnyByte.c.i
 data/src/share/native/sun/java2d/opengl/J2D_GL/glext.h.i
 data/test/java/io/Serializable/replaceWithNull/ReplaceWithNull.java.i
+data/make/sun/javazic/tzdata/antarctica.i
 data/src/share/classes/sun/security/krb5/KrbException.java.i
 data/src/share/classes/javax/management/event/package-info.java.i
 data/test/java/io/BufferedInputStream/CloseStream.java.i
-data/src/share/classes/com/sun/crypto/provider/AESParameters.java.i
+data/test/javax/xml/crypto/dsig/SecurityManager/policy.i
+data/src/share/classes/com/sun/jdi/event/package.html.i
 data/src/windows/classes/com/sun/management/OSMBeanFactory.java.i
 data/src/share/classes/java/nio/charset/StandardCharsets.java.i
 data/test/java/util/ResourceBundle/Bug4179766Class.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java.i
+data/src/share/classes/java/security/cert/CertificateException.java.i
 data/src/share/classes/com/sun/management/OperatingSystemMXBean.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/PaintModel.java.i
+data/src/share/classes/sun/awt/image/VolatileSurfaceManager.java.i
 data/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java.i
 data/src/share/classes/java/awt/peer/ComponentPeer.java.i
+data/src/share/classes/sun/net/www/URLConnection.java.i
 data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java.i
-data/test/com/sun/crypto/provider/Cipher/PBE/PKCS12Oid.java.i
+data/test/sun/net/InetAddress/nameservice/dns/CanonicalName.java.i
 data/src/share/native/sun/misc/VM.c.i
 data/make/mkdemo/jfc/Font2DTest/Makefile.i
 data/src/share/classes/sun/java2d/pipe/SpanShapeRenderer.java.i
 data/test/com/sun/jdi/OnThrowTest.java.i
-data/test/javax/management/remote/mandatory/connection/RMIExitTest.java.i
+data/src/share/native/sun/java2d/loops/LoopMacros.h.i
+data/test/java/nio/Buffer/StringCharBufferSliceTest.java.i
 data/src/share/native/sun/awt/image/jpeg/jfdctint.c.i
+data/src/share/native/sun/reflect/ConstantPool.c.i
 data/src/share/native/sun/awt/medialib/mlib_ImageUtils.c.i
 data/src/solaris/hpi/native_threads/include/monitor_md.h.i
-data/src/share/classes/com/sun/crypto/provider/DESCrypt.java.i
+data/src/share/native/sun/java2d/loops/FourByteAbgr.c.i
+data/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations_Stub.java.i
+data/make/common/BuildPackages.gmk.i
 data/src/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java.i
-data/src/share/classes/java/security/UnrecoverableKeyException.java.i
+data/test/sun/net/www/ParseUtil_6306697.java.i
 data/test/java/beans/XMLEncoder/Test4936682.java.i
 data/test/java/nio/file/Files/Links.java.i
-data/test/java/beans/Introspector/Test6311051.java.i
-data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/VerifyTreeSet.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageColormap.h.i
+data/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java.i
+data/test/java/awt/Frame/FrameLocation/FrameLocation.java.i
 data/test/tools/pack200/Pack200Simple.sh.i
 data/src/share/classes/javax/xml/crypto/dsig/keyinfo/RetrievalMethod.java.i
-data/src/share/classes/com/sun/jndi/rmi/registry/RemoteReference.java.i
 data/src/share/classes/java/awt/Font.java.i
+data/src/share/classes/java/security/cert/CertStoreException.java.i
 data/src/share/classes/sun/text/resources/FormatData_en_NZ.java.i
 data/src/share/native/sun/awt/image/cvutils/img_fsdither.h.i
 data/src/share/classes/java/lang/module/ModuleIdQuery.java.i
@@ -10804,219 +10738,225 @@ data/src/share/classes/sun/jvmstat/perfdata/resources/aliasmap.i
 data/src/share/classes/sun/dyn/CallSiteImpl.java.i
 data/test/java/io/File/BlockIsDirectory.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_es_VE.properties.i
-data/src/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java.i
+data/src/share/classes/sun/text/CollatorUtilities.java.i
 data/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java.i
-data/test/java/lang/Class/forName/classes/period.class.i
 data/src/share/native/sun/font/layout/MarkArrays.h.i
 data/test/java/io/pathNames/win32/DriveSlash.java.i
-data/src/share/classes/sun/misc/DoubleConsts.java.i
-data/src/share/classes/com/sun/jmx/event/EventParams.java.i
+data/src/share/classes/com/sun/crypto/provider/HmacSHA1.java.i
+data/test/java/io/Serializable/oldTests/SimpleArrays.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMeta.java.i
 data/test/java/util/EnumMap/EntrySetIteratorRemoveInvalidatesEntry.java.i
-data/src/solaris/native/sun/awt/list.h.i
-data/test/java/rmi/activation/Activatable/forceLogSnapshot/group.security.policy.i
+data/test/java/util/Collections/EmptyIterator.java.i
 data/test/java/rmi/activation/Activatable/restartLatecomer/security.policy.i
 data/src/share/classes/sun/tools/tree/AssignSubtractExpression.java.i
 data/make/tools/swing-beans/beaninfo/images/JDesktopPaneColor32.gif.i
 data/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java.i
-data/src/windows/native/sun/net/dns/ResolverConfigurationImpl.c.i
+data/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java.i
+data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_EBCDIC_Encoder.java.i
 data/src/share/classes/sun/net/sdp/SdpSupport.java.i
 data/src/share/classes/sun/io/CharToByteCp864.java.i
-data/src/windows/bin/java-rmi.c.i
 data/test/sun/nio/cs/ConvertSingle.java.i
-data/src/share/native/sun/font/layout/ClassDefinitionTables.cpp.i
-data/src/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java.i
+data/src/windows/native/sun/windows/awt_BitmapUtil.cpp.i
+data/src/share/native/sun/font/layout/MirroredCharData.cpp.i
 data/make/sun/jpeg/mapfile-vers-closed.i
 data/test/com/sun/net/httpserver/DummyVerifier.java.i
-data/src/share/classes/sun/tools/javac/resources/javac_zh_CN.properties.i
+data/make/java/nio/reorder-sparcv9.i
 data/src/share/classes/java/lang/invoke/ConstantCallSite.java.i
+data/src/windows/native/java/net/NetworkInterface.h.i
 data/src/share/classes/com/sun/inputmethods/internal/thaiim/resources/DisplayNames.properties.i
 data/test/sun/nio/cs/TestUTF8BOM.java.i
-data/src/share/native/sun/awt/image/jpeg/jpegdecoder.c.i
-data/test/java/util/logging/GetGlobalTest.java.i
+data/src/solaris/classes/sun/nio/ch/SocketDispatcher.java.i
+data/make/netbeans/common/windows-view.ent.i
 data/src/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java.i
 data/src/windows/lib/images/cursors/cursors.properties.i
 data/src/share/classes/sun/security/x509/X509Key.java.i
+data/src/share/classes/javax/swing/Spring.java.i
 data/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java.i
+data/src/share/classes/com/sun/tools/hat/resources/platform_names.txt.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/maximize.gif.i
-data/src/windows/npt/utf_md.h.i
-data/src/share/classes/sun/java2d/SunGraphics2D.java.i
+data/test/javax/sound/midi/Gervill/SoftTuning/Load7.java.i
+data/src/share/classes/sun/font/FontScalerException.java.i
 data/src/share/classes/javax/swing/event/TableModelListener.java.i
 data/src/share/classes/sun/java2d/pipe/DrawImagePipe.java.i
 data/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java.i
 data/test/java/rmi/reliability/benchmark/bench/serial/IntArrays.java.i
-data/src/share/classes/sun/security/x509/X400Address.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpecVisitor.java.i
 data/src/solaris/classes/sun/awt/X11/XlibWrapper.java.i
-data/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain6.txt.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ro_RO.properties.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java.i
-data/src/share/classes/sun/net/dns/ResolverConfiguration.java.i
+data/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.i
+data/src/windows/classes/java/io/Win32FileSystem.java.i
+data/make/javax/rmi/ssl/Makefile.i
+data/src/share/classes/sun/tools/jconsole/ProxyClient.java.i
+data/test/java/util/ResourceBundle/Test4318520RB_en.properties.i
 data/src/share/native/java/net/net_util.h.i
 data/src/solaris/doc/sun/man/man1/ja/schemagen.1.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/Generator.java.i
 data/make/sun/jpeg/reorder-sparc.i
 data/test/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java.i
-data/src/share/classes/javax/swing/text/html/parser/ParserDelegator.java.i
 data/test/java/beans/XMLEncoder/Test6501431.java.i
-data/test/java/lang/reflect/Proxy/Basic1.java.i
+data/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java.i
 data/make/netbeans/common/standard-actions.ent.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java.i
+data/src/share/classes/com/sun/java/util/jar/pack/Instruction.java.i
 data/src/share/classes/java/nio/charset/MalformedInputException.java.i
 data/src/share/native/sun/awt/image/jpeg/jerror.c.i
+data/src/share/classes/sun/font/FontScaler.java.i
 data/src/share/classes/sun/management/StackTraceElementCompositeData.java.i
 data/src/share/classes/sun/awt/PeerEvent.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c.i
+data/make/com/sun/tracing/Makefile.i
 data/src/solaris/classes/sun/awt/X11/XCreateWindowParams.java.i
+data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java.i
+data/test/java/io/Serializable/nonserializable/ExceptionDetail.java.i
 data/src/share/native/sun/font/layout/GlyphDefinitionTables.cpp.i
-data/src/share/classes/com/sun/security/auth/SolarisPrincipal.java.i
+data/src/share/classes/sun/misc/resources/Messages_it.java.i
 data/src/share/classes/javax/swing/text/doc-files/Document-coord.gif.i
-data/src/share/classes/sun/text/resources/CollationData_sr_Latn.java.i
+data/src/share/classes/sun/text/resources/FormatData_et_EE.java.i
 data/src/share/classes/java/awt/image/PixelInterleavedSampleModel.java.i
 data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Decoder.java.i
 data/test/java/security/Security/signedfirst/Static.props.i
 data/test/java/io/DataOutputStream/WriteUTF.java.i
 data/src/share/demo/jfc/CodePointIM/README_zh_CN.html.i
+data/src/share/lib/security/java.security.i
 data/src/share/classes/sun/text/resources/CollationData_no.java.i
 data/src/share/classes/javax/sound/midi/MetaEventListener.java.i
+data/src/share/classes/javax/xml/crypto/Data.java.i
 data/src/share/classes/com/sun/net/httpserver/HttpContext.java.i
 data/test/java/rmi/reliability/launch_reliability.ksh.i
 data/test/java/util/jar/JarFile/SignedJarFileGetInputStream.java.i
 data/test/com/sun/security/auth/login/ConfigFile/InnerClassConfig.config.i
+data/test/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java.i
 data/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java.i
 data/test/javax/swing/JFileChooser/6698013/bug6698013.java.i
-data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_EBCDIC_Decoder.java.i
+data/test/com/oracle/net/Sanity.java.i
 data/src/share/demo/jvmti/heapTracker/HeapTracker.java.i
 data/test/java/security/UnresolvedPermission/DebugPermission2.java.i
 data/test/java/math/BigDecimal/MultiplyTests.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java.i
 data/src/share/classes/javax/script/Compilable.java.i
-data/test/java/net/InetAddress/WhiteSpaceHostTest.java.i
 data/test/sun/net/www/protocol/jar/foo1.jar.i
 data/src/share/classes/com/sun/jdi/IntegerType.java.i
 data/src/share/classes/sun/java2d/pipe/PixelDrawPipe.java.i
 data/src/share/back/ArrayReferenceImpl.h.i
-data/src/share/classes/javax/swing/border/StrokeBorder.java.i
-data/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_f.c.i
+data/test/javax/sound/midi/Sequencer/SequencerImplicitSynthOpen.java.i
+data/src/share/native/sun/font/layout/LookupProcessor.cpp.i
 data/src/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java.i
 data/src/share/classes/javax/swing/colorchooser/ColorModelHSV.java.i
-data/src/solaris/classes/sun/nio/fs/UnixFileStore.java.i
 data/src/share/classes/com/sun/media/sound/SoftFilter.java.i
 data/src/share/native/sun/security/pkcs11/j2secmod.h.i
-data/src/solaris/classes/sun/awt/X11/XInputMethodDescriptor.java.i
-data/test/java/lang/Runtime/exec/ArgWithSpaceAndFinalBackslash.java.i
+data/src/share/classes/java/awt/KeyEventPostProcessor.java.i
+data/test/java/util/ResourceBundle/Control/BadControlsTest.java.i
+data/src/share/demo/nbproject/management/FullThreadDump/nbproject/file-targets.xml.i
 data/src/share/classes/java/net/BindException.java.i
 data/src/share/native/sun/java2d/cmm/lcms/cmstypes.c.i
 data/src/share/sample/nio/file/FileType.java.i
 data/src/share/classes/sun/io/ByteToCharGB18030DB.java.i
-data/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form.i
+data/test/java/io/Serializable/badSerialPersistentField/BadSerialPersistentField.java.i
+data/src/solaris/native/sun/nio/ch/DatagramDispatcher.c.i
 data/src/share/classes/java/util/concurrent/ConcurrentNavigableMap.java.i
 data/src/share/classes/javax/print/attribute/HashPrintRequestAttributeSet.java.i
 data/test/java/util/Collections/Swap.java.i
 data/test/java/nio/channels/DatagramChannel/UseDGWithIPv6.java.i
 data/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java.i
 data/src/share/classes/sun/util/locale/LocaleExtensions.java.i
-data/test/java/rmi/activation/Activatable/notSerializable/NotSerializable.java.i
+data/src/share/classes/sun/io/CharToByteISO8859_5.java.i
 data/src/share/classes/sun/security/x509/CertificateSubjectUniqueIdentity.java.i
 data/src/share/native/sun/font/layout/LayoutEngine.h.i
 data/test/java/util/Collections/MinMax.java.i
 data/src/share/classes/java/io/UnsupportedEncodingException.java.i
-data/make/modules/tools/src/com/sun/classanalyzer/AnnotationParser.java.i
+data/src/share/classes/sun/java2d/loops/GeneralRenderer.java.i
 data/src/share/classes/sun/reflect/UnsafeFieldAccessorFactory.java.i
 data/src/share/classes/javax/swing/tree/MutableTreeNode.java.i
-data/src/share/classes/sun/security/x509/CertificateValidity.java.i
+data/src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM1112.java.i
+data/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp.i
 data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties.i
 data/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java.i
 data/src/linux/doc/man/jps.1.i
 data/test/com/sun/jdi/RedefineClasses.sh.i
-data/src/share/classes/javax/imageio/ImageIO.java.i
-data/src/windows/native/sun/windows/hand.cur.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties.i
 data/make/tools/swing-beans/beaninfo/images/JComboBoxMono16.gif.i
-data/test/sun/tools/native2ascii/N2A_4636448.expected.i
+data/test/com/sun/tools/attach/SimpleProvider.java.i
 data/test/java/nio/channels/SocketChannel/SocketOptionTests.java.i
 data/test/java/rmi/activation/Activatable/checkAnnotations/group.security.policy.i
 data/src/share/classes/javax/swing/plaf/OptionPaneUI.java.i
-data/test/javax/swing/JInternalFrame/6726866/bug6726866.html.i
+data/src/share/classes/java/io/LineNumberInputStream.java.i
 data/src/share/native/sun/font/layout/CursiveAttachmentSubtables.h.i
-data/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java.i
+data/make/tools/swing-beans/beaninfo/images/JPanelColor16.gif.i
 data/src/share/classes/javax/swing/plaf/multi/MultiDesktopPaneUI.java.i
 data/src/share/demo/jfc/SampleTree/README.txt.i
 data/test/java/awt/dnd/FileListBetweenJVMsTest/InterprocessMessages.java.i
-data/test/sun/management/jmxremote/bootstrap/management_ssltest10_ok.properties.in.i
 data/test/sun/security/krb5/auto/OkAsDelegateXRealm.java.i
 data/make/netbeans/common/demo-sources.ent.i
 data/src/share/classes/sun/io/ByteToCharConverter.java.i
 data/src/share/classes/sun/nio/cs/ext/MS874.java.i
 data/make/tools/swing-beans/beaninfo/images/JColorChooserMono16.gif.i
-data/make/modules/jdk.boot.ls.i
+data/test/java/beans/XMLEncoder/4741757/TestStackOverflow.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_it.properties.i
 data/src/share/sample/jmx/jmx-scandir/src/etc/password.properties.i
 data/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.h.i
 data/src/share/native/sun/font/layout/IndicLayoutEngine.cpp.i
 data/test/java/util/Collections/ViewSynch.java.i
-data/src/share/classes/java/security/spec/ECField.java.i
+data/test/com/sun/jdi/ConnectedVMs.java.i
 data/src/share/classes/sun/font/FontRunIterator.java.i
-data/src/linux/doc/man/servertool.1.i
+data/src/windows/classes/com/sun/tools/jdi/SharedMemoryAttachingConnector.java.i
 data/src/share/classes/java/awt/peer/LabelPeer.java.i
 data/test/javax/swing/border/Test4252164.java.i
-data/src/share/sample/nio/server/ChannelIOSecure.java.i
+data/test/java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java.i
 data/src/share/classes/javax/sound/sampled/Line.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpMsg.java.i
 data/test/sun/nio/cs/TestUTF_32.java.i
-data/src/share/classes/com/sun/jndi/rmi/registry/RegistryContextFactory.java.i
+data/test/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.html.i
 data/src/share/classes/java/text/EntryPair.java.i
 data/src/solaris/classes/sun/awt/X11/keysym2ucs.h.i
 data/src/windows/native/sun/windows/awt_MenuBar.h.i
 data/src/share/classes/sun/security/jgss/spnego/NegTokenTarg.java.i
 data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_4.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif.i
 data/src/share/classes/sun/security/jgss/krb5/CipherHelper.java.i
 data/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java.i
 data/src/solaris/classes/sun/awt/X11/doc-files/Modality.txt.i
-data/src/share/classes/java/lang/module/package-info.java.i
-data/src/share/classes/sun/reflect/generics/tree/ReturnType.java.i
-data/src/share/classes/org/ietf/jgss/GSSContext.java.i
+data/src/share/back/standardHandlers.h.i
+data/src/share/classes/java/lang/annotation/ElementType.java.i
 data/test/java/nio/file/attribute/BasicFileAttributeView/Basic.java.i
 data/src/share/native/com/sun/tools/jdi/SharedMemory.h.i
 data/src/share/classes/sun/security/provider/DSAParameterGenerator.java.i
 data/test/sun/security/util/Resources/Format.java.i
 data/test/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java.i
 data/src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java.i
-data/src/share/classes/sun/java2d/InvalidPipeException.java.i
+data/test/java/awt/xembed/server/TestXEmbedServerJava.java.i
 data/test/sun/tools/jstat/jstatGcNewOutput1.sh.i
-data/src/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper.java.i
+data/src/share/classes/java/awt/event/ActionListener.java.i
 data/src/share/classes/sun/jvmstat/monitor/HostIdentifier.java.i
 data/src/share/classes/com/sun/net/ssl/package.html.i
 data/src/share/classes/com/sun/media/sound/SoftCubicResampler.java.i
-data/test/sun/security/pkcs11/sslecc/CipherTest.java.i
-data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties.i
+data/src/share/classes/java/text/RuleBasedBreakIterator.java.i
 data/src/share/demo/applets/SortDemo/BidirBubbleSortAlgorithm.java.i
 data/test/sun/java2d/cmm/ColorConvertOp/PYCC.png.i
 data/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java.i
 data/src/solaris/native/sun/security/pkcs11/j2secmod_md.c.i
-data/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java.i
+data/test/java/awt/Dialog/DialogOverflowSizeTest/DialogSizeOverflowTest.java.i
 data/src/solaris/doc/sun/man/man1/ja/jar.1.i
 data/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java.i
+data/src/share/classes/sun/awt/datatransfer/DataTransferer.java.i
+data/src/share/classes/sun/util/resources/CalendarData.properties.i
 data/make/tools/compile_font_config/Makefile.i
-data/src/share/sample/nio/file/WatchDir.java.i
+data/src/share/classes/sun/java2d/opengl/OGLMaskBlit.java.i
 data/test/javax/management/Introspector/DuplicateGetterTest.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java.i
 data/src/windows/native/sun/windows/awt_Menu.h.i
-data/src/solaris/bin/zero/jvm.cfg.i
+data/src/share/classes/sun/awt/AWTCharset.java.i
 data/src/share/classes/sun/awt/image/BufImgSurfaceData.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocket.java.i
+data/test/javax/crypto/Mac/NullMacSpi.java.i
 data/src/share/classes/sun/misc/UCEncoder.java.i
 data/test/java/lang/ClassLoader/package1/Class1.java.i
 data/test/java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java.i
-data/src/share/classes/javax/print/URIException.java.i
+data/src/share/classes/sun/font/NullFontScaler.java.i
 data/make/tools/CharsetMapping/ISO_8859_13.map.i
-data/src/share/demo/jfc/TableExample/TableSorter.java.i
+data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/group.security.policy.i
 data/src/share/classes/java/security/spec/EllipticCurve.java.i
-data/src/windows/native/java/net/NetworkInterface.h.i
+data/test/sun/net/www/http/HttpClient/IsKeepingAlive.java.i
 data/make/java/applet/Makefile.i
+data/src/share/native/sun/awt/image/cvutils/img_output16_32.h.i
 data/src/share/native/sun/font/layout/LigatureSubstProc.h.i
 data/test/sun/rmi/rmic/newrmic/equivalence/OrangeEcho.java.i
-data/make/tools/CharsetMapping/IBM420.nr.i
 data/src/share/native/java/util/zip/zlib-1.1.3/README.i
 data/test/com/sun/jdi/Unload2Targ.java.i
 data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/Foo.java.i
@@ -11024,21 +10964,21 @@ data/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.j
 data/make/sun/cmm/kcms/FILES_c_unix.gmk.i
 data/test/sun/security/tools/jarsigner/newsize7.sh.i
 data/src/share/native/sun/awt/image/cvutils/img_colors.h.i
-data/test/java/util/ResourceBundle/Control/Chinese_zh.properties.i
-data/test/java/lang/instrument/AppendToBootstrapClassPathTest.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java.i
+data/src/share/classes/javax/naming/event/NamingEvent.java.i
 data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.password.in.i
-data/src/share/classes/javax/naming/event/package.html.i
+data/src/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java.i
 data/test/java/lang/ThreadGroup/Stop.java.i
-data/make/com/sun/security/auth/FILES_java.gmk.i
+data/test/java/beans/Introspector/Test6277246.java.i
 data/test/java/lang/ClassLoader/deadlock/DelegatingLoader.java.i
 data/src/share/classes/javax/swing/text/ElementIterator.java.i
-data/make/tools/src/build/tools/charsetmapping/DBCS.java.i
-data/src/share/classes/sun/nio/cs/MS1254.java.i
+data/test/com/sun/security/auth/login/ConfigFile/Override.props.i
+data/test/java/util/logging/ClassLoaderLeakTest.java.i
 data/src/share/native/java/util/zip/zlib-1.1.3/zutil.c.i
-data/test/javax/sound/sampled/AudioFormat/PCM_FLOAT_support.java.i
+data/test/java/nio/file/WatchService/Basic.java.i
 data/src/share/classes/sun/launcher/resources/launcher_sv.properties.i
 data/test/sun/tools/jstat/jstatFileURITest1.sh.i
-data/test/java/net/URLConnection/ChunkedEncoding.java.i
+data/src/windows/native/sun/nio/ch/SocketChannelImpl.c.i
 data/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties.i
 data/src/share/classes/sun/awt/EventListenerAggregate.java.i
 data/src/share/classes/com/sun/tracing/dtrace/ModuleAttributes.java.i
@@ -11046,81 +10986,89 @@ data/test/java/io/File/GetXSpace.java.i
 data/src/share/classes/sun/tools/jstat/Operator.java.i
 data/src/share/classes/sun/print/PathGraphics.java.i
 data/src/share/demo/applets/GraphicsTest/GraphicsTest.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java.i
+data/make/tools/CharsetMapping/MacArabic.map.i
 data/src/share/classes/sun/nio/ch/SocketOpts.java.i
 data/src/share/classes/sun/font/StrikeCache.java.i
 data/test/java/lang/reflect/Method/GenericStringTest.java.i
 data/src/windows/classes/sun/security/mscapi/RSAKeyPair.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose.gif.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpEngine.java.i
 data/src/share/classes/sun/management/AgentConfigurationError.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java.i
-data/src/share/classes/sun/rmi/rmic/RemoteClass.java.i
+data/src/share/native/sun/java2d/cmm/lcms/icc34.h.i
 data/src/share/classes/javax/management/Descriptor.java.i
 data/test/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java.i
-data/src/share/native/sun/java2d/loops/ThreeByteBgr.c.i
+data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java.i
 data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java.i
 data/test/sun/tools/jstatd/jpsOutput1.awk.i
 data/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java.i
 data/src/share/classes/sun/swing/FilePane.java.i
+data/test/javax/security/auth/kerberos/KerberosTixDateTest.java.i
 data/make/java/main/java/mapfile-amd64.i
-data/test/java/util/concurrent/ConcurrentQueues/LoopHelpers.java.i
+data/src/share/classes/com/sun/jndi/toolkit/dir/DirSearch.java.i
+data/test/java/rmi/activation/Activatable/restartService/RestartService_Stub.java.i
 data/src/share/classes/com/sun/crypto/provider/SymmetricCipher.java.i
-data/src/share/classes/com/sun/media/sound/ModelStandardDirector.java.i
+data/test/java/util/concurrent/DelayQueue/Stress.java.i
 data/test/sun/nio/cs/OLD/TestIBMDB.java.i
+data/test/java/security/cert/CertPathValidator/indirectCRL/README.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/package.html.i
-data/src/share/native/java/util/zip/zlib-1.1.3/deflate.h.i
+data/src/share/classes/com/sun/security/sasl/ClientFactoryImpl.java.i
 data/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java.i
-data/src/share/classes/sun/awt/im/CompositionArea.java.i
+data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.java.i
 data/test/com/sun/net/httpserver/Test4.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/ArgumentList.java.i
-data/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/test.html.i
+data/src/share/classes/sun/tools/jconsole/LabeledComponent.java.i
 data/test/sun/text/resources/Collator/Bug4248694.java.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/ResourceFile.java.i
 data/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java.i
+data/test/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java.i
+data/src/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java.i
 data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileAttributeView.java.i
 data/test/sun/security/pkcs11/rsa/GenKeyStore.java.i
 data/src/share/classes/sun/net/URLCanonicalizer.java.i
 data/test/java/util/Collections/Frequency.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java.i
 data/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java.i
+data/src/share/classes/sun/text/resources/FormatData_zh_CN.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java.i
-data/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java.i
+data/src/share/classes/javax/swing/JSlider.java.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509ExtendedKeyManager.java.i
 data/make/tools/swing-beans/beaninfo/images/JFileChooserMono32.gif.i
 data/make/tools/src/build/tools/jdwpgen/AbstractSimpleNode.java.i
 data/test/javax/management/namespace/EventWithNamespaceTest.java.i
-data/test/javax/swing/JScrollPane/6559589/bug6559589.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformCommunity.java.i
+data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java.i
+data/test/java/beans/Introspector/TestTypeResolver.java.i
 data/src/share/classes/java/beans/PropertyEditorSupport.java.i
 data/src/share/classes/sun/font/FontDesignMetrics.java.i
 data/src/windows/classes/sun/awt/windows/WListPeer.java.i
+data/src/share/classes/javax/management/loading/PrivateClassLoader.java.i
 data/test/java/util/Locale/Bug4175998Test.java.i
-data/make/com/sun/jndi/cosnaming/Makefile.i
-data/src/share/classes/sun/text/resources/FormatData_de_LU.java.i
+data/src/share/native/sun/security/ec/ec2_233.c.i
 data/src/share/classes/java/awt/event/MouseListener.java.i
 data/src/share/classes/sun/tools/tree/ContinueStatement.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMeta.java.i
 data/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java.i
 data/src/share/classes/sun/jvmstat/monitor/Units.java.i
 data/test/java/security/KeyRep/PBE.pre.1.5.key.i
-data/test/com/sun/jdi/ShutdownDebuggee.java.i
+data/test/javax/management/descriptor/ImmutableArrayFieldTest.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_uk.properties.i
 data/src/share/classes/com/sun/jdi/connect/Connector.java.i
-data/test/java/net/URLClassLoader/getresourceasstream/Test.java.i
+data/src/share/classes/javax/script/package.html.i
 data/src/share/classes/com/sun/security/sasl/ntlm/NTLMClient.java.i
-data/test/java/lang/reflect/Method/invoke/ErrorInInvoke.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_el_CY.properties.i
-data/src/share/classes/com/sun/security/auth/module/UnixSystem.java.i
+data/make/sun/launcher/Makefile.i
 data/ASSEMBLY_EXCEPTION.i
 data/src/share/classes/sun/io/ByteToCharUTF16.java.i
 data/src/share/classes/java/lang/Iterable.java.i
 data/test/java/net/Socket/ReadTimeout.java.i
 data/make/tools/src/build/tools/javazic/ZoneRec.java.i
 data/src/share/native/sun/awt/medialib/mlib_sys_proto.h.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpErrorHandlerAgent.java.i
-data/src/share/classes/java/text/DontCareFieldPosition.java.i
+data/src/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java.i
+data/src/share/classes/java/awt/datatransfer/Clipboard.java.i
+data/src/share/sample/scripting/scriptpad/build.xml.i
 data/src/share/classes/sun/tools/tree/VarDeclarationStatement.java.i
+data/src/share/transport/socket/socketTransport.c.i
 data/src/share/demo/jvmti/minst/minst.c.i
+data/src/share/classes/com/sun/jdi/connect/ListeningConnector.java.i
 data/src/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java.i
 data/src/share/classes/sun/security/pkcs11/KeyCache.java.i
 data/test/java/util/Collections/ReverseOrder.java.i
@@ -11128,6 +11076,7 @@ data/test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java.i
 data/make/tools/src/build/tools/jdwpgen/LocationTypeNode.java.i
 data/src/share/classes/javax/swing/text/ChangedCharSetException.java.i
+data/src/share/native/sun/awt/medialib/mlib_c_ImageBlendTable.h.i
 data/test/org/openjdk/jigsaw/optional-jaxp.sh.i
 data/src/share/native/sun/font/bidi/jbidi.c.i
 data/test/java/nio/file/Files/SimpleFileTypeDetector.java.i
@@ -11136,7 +11085,7 @@ data/test/java/nio/channels/AsynchronousSocketChannel/Leaky.java.i
 data/test/java/beans/XMLDecoder/spec/TestTrue.java.i
 data/make/tools/CharsetMapping/IBM1149.map.i
 data/src/share/classes/sun/io/CharToByteISO2022.java.i
-data/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp.i
+data/src/share/classes/sun/security/jgss/krb5/MicToken_v2.java.i
 data/test/java/net/DatagramSocket/ImplicitBind.java.i
 data/src/share/classes/javax/print/event/PrintJobEvent.java.i
 data/src/share/classes/sun/io/ByteToCharCp864.java.i
@@ -11145,26 +11094,26 @@ data/src/share/classes/sun/tools/tree/PositiveExpression.java.i
 data/src/share/classes/com/sun/jdi/InvocationException.java.i
 data/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java.i
-data/test/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.java.i
-data/test/javax/management/Introspector/ChangingNotifsTest.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java.i
 data/test/java/rmi/MarshalledObject/compare/HashCode.java.i
 data/test/sun/security/krb5/auto/SpnegoReqFlags.java.i
 data/src/share/demo/jvmti/hprof/hprof_loader.h.i
+data/test/java/io/Serializable/proxy/replace/WriteReplace.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpecList.java.i
 data/test/java/io/charStreams/UTF8.java.i
 data/src/share/classes/javax/script/SimpleBindings.java.i
 data/test/java/util/AbstractCollection/ToString.java.i
 data/test/java/io/RandomAccessFile/Seek.java.i
-data/test/java/util/jar/JarFile/TurkCert.java.i
+data/test/java/security/cert/CertificateFactory/GenerateCertificatesEmptyCollection.java.i
 data/test/java/security/BasicPermission/NullOrEmptyName.java.i
 data/src/share/native/sun/java2d/opengl/OGLTextRenderer.h.i
-data/test/sun/security/provider/PolicyParser/EncodeURL.java.i
 data/test/javax/swing/JSlider/4987336/bug4987336.html.i
 data/test/com/sun/security/sasl/gsskerb/PropertiesFileCallbackHandler.java.i
-data/src/solaris/sample/dtrace/hotspot/method_compile_stat.d.i
-data/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter.i
-data/test/java/math/BigDecimal/RoundingTests.java.i
-data/make/com/sun/security/sasl/Makefile.i
+data/src/share/classes/javax/swing/event/ListSelectionListener.java.i
+data/test/sun/security/tools/keytool/file-in-help.sh.i
+data/src/share/classes/com/sun/java/util/jar/pack/Attribute.java.i
+data/src/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java.i
+data/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityCache.java.i
 data/src/share/native/sun/awt/giflib/gif_lib.h.i
 data/test/java/rmi/reliability/benchmark/bench/rmi/ExceptionCalls.java.i
 data/src/share/demo/scripting/jconsole-plugin/src/scripts/invoke.js.i
@@ -11172,44 +11121,42 @@ data/src/share/classes/java/lang/ref/SoftReference.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceTableMetaImpl.java.i
 data/src/share/classes/javax/swing/plaf/MenuItemUI.java.i
+data/test/sun/net/InetAddress/nameservice/chaining/Providers.java.i
 data/src/share/classes/com/sun/rowset/JoinRowSetImpl.java.i
 data/src/share/classes/javax/management/remote/JMXConnectorServerMBean.java.i
 data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/file-targets.xml.i
 data/src/share/native/sun/font/layout/LayoutTables.h.i
 data/test/sun/security/pkcs11/nss/lib/solaris-i586/libsoftokn3.so.d
-data/test/javax/security/auth/x500/X500Principal/RFC4514.java.i
 data/src/share/classes/java/sql/SQLTransientException.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-i586/libsoftokn3.so.i
 data/test/org/openjdk/jigsaw/ContextBuilder.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_de.properties.i
-data/test/java/rmi/reliability/benchmark/bench/ConfigFormatException.java.i
+data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml.i
+data/make/tools/swing-beans/beaninfo/images/JRadioButtonMono16.gif.i
 data/make/tools/CharsetMapping/IBM869.map.i
-data/src/share/classes/sun/awt/image/ImageFetcher.java.i
+data/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh.i
 data/src/share/classes/java/awt/Image.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties.i
 data/src/solaris/classes/sun/font/XRGlyphCache.java.i
+data/make/netbeans/swing/build.properties.i
 data/src/share/classes/sun/security/x509/PolicyInformation.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java.i
-data/test/java/beans/XMLEncoder/6777487/TestCheckedCollection.java.i
+data/test/sun/net/www/protocol/http/UserCookie.java.i
 data/test/sun/security/provider/PolicyFile/TokenStore.RelPassPolicy.i
 data/src/solaris/classes/sun/awt/X11/XPropertyCache.java.i
 data/make/tools/swing-beans/beaninfo/images/JScrollPaneColor16.gif.i
-data/test/java/math/BigInteger/ModPowPowersof2.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java.i
 data/test/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java.i
 data/test/java/nio/Buffer/genCopyDirectMemory.sh.i
-data/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java.i
+data/test/sun/tools/jstat/jstatSnap2.sh.i
 data/src/share/classes/javax/naming/Context.java.i
 data/test/java/beans/Introspector/4520754/Test4520754.java.i
 data/test/javax/xml/crypto/dsig/SignatureValidator.java.i
 data/src/share/classes/java/util/concurrent/Executor.java.i
 data/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider.i
-data/src/share/classes/java/lang/reflect/InvocationHandler.java.i
-data/src/share/lib/images/cursors/invalid32x32.gif.i
+data/src/share/classes/sun/misc/Compare.java.i
 data/src/share/classes/java/lang/management/ManagementFactory.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so.i
-data/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java.i
+data/src/share/demo/management/JTop/JTopPlugin.java.i
 data/src/share/classes/sun/tools/tree/SynchronizedStatement.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmslut.c.i
 data/src/share/classes/sun/nio/cs/ext/IBM1006.java.i
 data/make/tools/CharsetMapping/IBM942.map.i
 data/src/share/classes/java/awt/image/ImageProducer.java.i
@@ -11217,23 +11164,24 @@ data/src/share/classes/javax/imageio/stream/ImageInputStreamImpl.java.i
 data/src/share/native/sun/awt/libpng/pngget.c.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java.i
 data/test/sun/nio/cs/Test4206507.java.i
-data/test/java/lang/instrument/TransformerManagementThreadAddTests.java.i
 data/test/java/beans/XMLEncoder/javax_swing_border_MatteBorder.java.i
-data/src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java.i
+data/src/share/classes/javax/sound/midi/Track.java.i
 data/src/windows/classes/sun/awt/Win32FontManager.java.i
 data/src/share/classes/java/lang/ref/ReferenceQueue.java.i
 data/src/share/native/sun/font/layout/TibetanReordering.h.i
 data/test/java/io/Serializable/classDescFlagConflict/Foo.ser.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_SingletonList.java.i
-data/src/share/classes/java/awt/image/VolatileImage.java.i
-data/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java.i
+data/src/share/classes/java/util/Calendar.java.i
+data/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.java.i
+data/test/java/awt/FontClass/FontAccess.java.i
 data/src/windows/native/sun/windows/awt_InputEvent.cpp.i
 data/test/java/net/ipv6tests/BadIPv6Addresses.java.i
-data/test/com/sun/jdi/FetchLocals.java.i
+data/src/share/native/sun/awt/image/imageInitIDs.h.i
 data/test/java/security/cert/CertificateFactory/openssl/BadFooter.java.i
-data/src/share/native/sun/security/ec/ecp_384.c.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java.i
-data/src/solaris/sample/dtrace/hotspot/class_loading_stat.d.i
+data/test/java/lang/StackTraceElement/PublicConstructor.java.i
+data/src/share/classes/com/sun/crypto/provider/DESKeyGenerator.java.i
+data/src/solaris/classes/sun/net/spi/SdpProvider.java.i
 data/src/share/demo/applets/WireFrame/models/dinasaur.obj.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/dnsstore.i
 data/src/solaris/classes/sun/awt/X11/XKeysym.java.i
@@ -11241,16 +11189,15 @@ data/src/share/classes/sun/io/ByteToCharISO8859_2.java.i
 data/src/share/classes/com/sun/crypto/provider/FeedbackCipher.java.i
 data/src/share/classes/sun/nio/cs/ISO_8859_15.java.i
 data/test/java/io/OutputStreamWriter/Encode.java.i
-data/src/share/classes/java/io/ExpiringCache.java.i
-data/make/mkdemo/jvmti/heapViewer/Makefile.i
+data/test/java/nio/channels/Selector/BasicAccept.java.i
+data/src/share/classes/sun/applet/AppletImageRef.java.i
 data/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java.i
 data/test/sun/tools/jstat/classOutput1.awk.i
-data/test/sun/security/provider/PolicyFile/AliasExpansion.java.i
+data/src/share/classes/javax/sound/midi/spi/MidiFileWriter.java.i
 data/test/java/rmi/testlibrary/RegistryRunner_Stub.java.i
-data/src/share/classes/com/sun/jndi/url/rmi/rmiURLContextFactory.java.i
+data/test/javax/swing/GroupLayout/6613904/bug6613904.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/v1_0/BasicType.java.i
 data/src/share/classes/com/sun/awt/SecurityWarning.java.i
-data/src/share/native/java/lang/fdlibm/src/w_exp.c.i
 data/test/java/awt/Focus/FocusTraversalPolicy/DefaultFTPTest.java.i
 data/src/share/classes/javax/sound/midi/Sequencer.java.i
 data/test/sun/net/www/protocol/http/B6299712.java.i
@@ -11259,10 +11206,10 @@ data/src/share/classes/sun/rmi/transport/DGCImpl.java.i
 data/src/share/classes/com/sun/security/sasl/PlainClient.java.i
 data/src/share/demo/nbproject/jfc/Notepad/build.xml.i
 data/src/share/classes/com/sun/jndi/url/dns/dnsURLContextFactory.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpGenericMetaServer.java.i
-data/src/share/classes/com/sun/media/sound/ModelOscillatorStream.java.i
-data/src/share/classes/java/dyn/MethodType.java.i
-data/src/windows/native/sun/windows/awt_Insets.cpp.i
+data/src/share/classes/javax/crypto/ExemptionMechanismSpi.java.i
+data/src/share/classes/javax/sound/sampled/AudioFileFormat.java.i
+data/src/share/classes/com/sun/media/sound/SoftSincResampler.java.i
+data/src/share/classes/sun/misc/ProxyGenerator.java.i
 data/src/share/classes/sun/tools/jconsole/resources/masthead-right.png.i
 data/test/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTestHeyYou.java.i
@@ -11272,41 +11219,41 @@ data/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java.i
 data/src/share/classes/java/awt/im/spi/package.html.i
 data/src/share/classes/javax/security/auth/callback/package.html.i
 data/test/javax/management/mxbean/ComparatorExceptionTest.java.i
-data/test/java/beans/PropertyEditor/TestStringClassNull.java.i
+data/src/share/classes/sun/tools/jconsole/CreateMBeanDialog.java.i
+data/test/java/io/charStreams/StringConvert.java.i
+data/src/share/classes/java/io/ExpiringCache.java.i
 data/src/windows/native/sun/windows/awtmsg.h.i
 data/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java.i
 data/src/share/classes/sun/security/jgss/wrapper/NativeGSSFactory.java.i
-data/src/share/classes/sun/net/www/http/HttpCapture.java.i
+data/make/tools/strip_properties/Makefile.i
 data/test/java/net/DatagramSocket/SetReceiveBufferSize.java.i
 data/src/solaris/native/sun/nio/fs/SolarisWatchService.c.i
 data/make/com/sun/java/pack/FILES_cpp.gmk.i
 data/src/share/npt/README.txt.i
-data/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java.i
+data/test/java/util/concurrent/DelayQueue/Iterate.java.i
 data/src/share/classes/javax/print/attribute/standard/JobStateReason.java.i
 data/test/com/sun/security/sasl/names.properties.i
 data/src/share/classes/javax/print/attribute/standard/JobState.java.i
 data/src/share/classes/javax/naming/directory/NoSuchAttributeException.java.i
 data/src/share/demo/jvmti/hprof/hprof_trace.c.i
-data/test/javax/management/namespace/NamespaceControllerMBean.java.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpStatusException.java.i
 data/test/java/beans/Introspector/4520754/infos/ComponentBeanInfo.java.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java.i
 data/test/javax/management/mxbean/MXBeanTest.java.i
-data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java.i
+data/make/common/Defs-modules.gmk.i
 data/src/solaris/classes/sun/awt/X11/XEmbeddedFrame.java.i
 data/test/java/util/zip/ZipFile/EnumAfterClose.java.i
 data/src/share/classes/sun/security/krb5/internal/ASRep.java.i
 data/make/com/sun/security/jgss/Makefile.i
 data/src/share/native/com/sun/media/sound/PortMixerProvider.c.i
 data/test/com/sun/jdi/JdbVarargsTest.sh.i
-data/src/share/classes/sun/text/resources/CollationData_vi.java.i
-data/src/share/classes/com/sun/tracing/ProbeName.java.i
+data/src/share/classes/javax/print/event/package.html.i
 data/test/java/rmi/activation/CommandEnvironment/security.policy.i
 data/src/solaris/classes/sun/awt/X11/generator/sizes.64-solaris-i386.i
 data/src/share/classes/java/util/logging/Handler.java.i
-data/src/share/demo/java2d/J2DBench/README.i
-data/src/share/classes/sun/tools/tree/BinaryExpression.java.i
-data/src/share/classes/java/rmi/package.html.i
+data/test/java/lang/Throwable/LocalizedMessage.java.i
+data/test/com/sun/security/sasl/pw.properties.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-delayed.png.i
 data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_zh_CN.properties.i
 data/src/share/native/java/util/zip/zlib-1.2.3/zutil.c.i
 data/src/share/back/ClassLoaderReferenceImpl.c.i
@@ -11315,26 +11262,26 @@ data/src/share/classes/sun/dyn/ToGeneric.java.i
 data/src/share/classes/java/awt/doc-files/FocusCycle.gif.i
 data/src/solaris/classes/sun/awt/motif/java.fonts.dir.i
 data/test/tools/pack200/Pack200Test.java.i
-data/src/linux/doc/man/jarsigner.1.i
 data/test/java/nio/charset/coders/IOCoders.java.i
-data/src/share/classes/sun/java2d/Surface.java.i
+data/src/share/native/sun/awt/libpng/pngrutil.c.i
 data/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneError.wav.i
-data/src/share/classes/sun/rmi/rmic/IndentingWriter.java.i
-data/src/linux/doc/man/schemagen.1.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/GoodProvider.java.i
+data/src/share/classes/java/util/concurrent/CancellationException.java.i
 data/test/java/io/RandomAccessFile/WriteUTF.java.i
 data/src/share/native/sun/awt/image/jpeg/jccolor.c.i
 data/src/share/classes/sun/management/counter/StringCounter.java.i
 data/test/java/net/CookieHandler/CookieManagerTest.java.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/README.i
-data/src/solaris/native/sun/nio/ch/DatagramDispatcher.c.i
+data/make/tools/src/build/tools/jdwpgen/CommentNode.java.i
+data/test/java/net/Inet6Address/IPv6Numeric.java.i
 data/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.h.i
+data/src/share/classes/java/rmi/server/ServerNotActiveException.java.i
 data/src/windows/native/sun/windows/awt_PopupMenu.h.i
 data/make/sun/cmm/kcms/Makefile.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/AliasFileParser.java.i
 data/src/share/classes/javax/swing/plaf/nimbus/Effect.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpGauge.java.i
+data/test/java/io/File/GetParent.java.i
 data/test/java/net/URL/jar_urls.i
-data/src/share/classes/sun/reflect/annotation/AnnotationParser.java.i
+data/test/sun/security/tools/jarsigner/Test4431684.java.i
 data/test/java/io/FileInputStream/LargeFileAvailable.java.i
 data/test/java/util/jar/JarInputStream/BadSignedJar.jar.i
 data/src/share/classes/javax/print/attribute/standard/JobStateReasons.java.i
@@ -11343,69 +11290,75 @@ data/src/share/classes/java/lang/ApplicationShutdownHooks.java.i
 data/test/javax/sound/midi/Gervill/RiffReaderWriter/Read.java.i
 data/src/solaris/classes/sun/awt/motif/X11GB18030_0.java.i
 data/test/java/io/Serializable/typeSafeEnum/TypeSafeEnum.java.i
-data/src/share/classes/javax/management/ClientContext.java.i
-data/test/java/util/Hashtable/SimpleSerialization.java.i
-data/src/share/classes/sun/text/resources/CollationData_cs.java.i
-data/src/share/classes/javax/script/ScriptContext.java.i
+data/test/java/lang/invoke/CallSiteTest.java.i
+data/src/share/classes/java/net/URL.java.i
+data/src/solaris/classes/sun/awt/motif/MDropTargetContextPeer.java.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/ca.key.i
+data/src/share/classes/javax/naming/NameClassPair.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_NN.c.i
 data/src/share/native/sun/java2d/loops/DrawPath.h.i
 data/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.h.i
 data/src/share/classes/java/awt/Label.java.i
 data/src/windows/native/sun/java2d/d3d/D3DMaskCache.h.i
 data/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java.i
-data/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java.i
+data/src/share/classes/sun/io/CharToByteHKSCS.java.i
 data/src/share/classes/sun/security/x509/PolicyConstraintsExtension.java.i
 data/test/java/security/cert/CertPathValidatorException/Serial.java.i
-data/make/tools/CharsetMapping/IBM864.map.i
-data/test/java/util/jar/JarFile/MevNPE.java.i
+data/src/share/classes/javax/swing/plaf/nimbus/OuterGlowEffect.java.i
+data/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html.i
 data/src/share/classes/sun/text/resources/FormatData_it.java.i
+data/src/share/classes/sun/io/CharToByteISO2022CN_GB.java.i
 data/make/tools/sharing/classlist.windows.i
 data/test/java/util/Locale/data/deflocale.win7.fmtasdefault.i
 data/test/java/io/FileInputStream/OpenDir.java.i
-data/src/linux/doc/man/jstatd.1.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java.i
 data/src/share/classes/sun/tools/util/CommandLine.java.i
 data/test/java/lang/instrument/PremainClass/ZeroArgPremainAgent.java.i
 data/src/share/classes/javax/swing/plaf/ProgressBarUI.java.i
-data/src/share/classes/javax/swing/colorchooser/CenterLayout.java.i
-data/src/share/classes/sun/text/resources/FormatData_fr_LU.java.i
+data/test/java/awt/Window/TranslucentShapedFrameTest/TSFrame.java.i
+data/src/share/classes/java/util/BitSet.java.i
+data/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java.i
 data/src/share/classes/sun/jvmstat/monitor/MonitorException.java.i
-data/test/java/awt/font/TextLayout/TestHebrewMark.java.i
+data/src/share/demo/jfc/Font2DTest/Font2DTest.html.i
 data/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java.i
 data/src/share/classes/javax/print/DocPrintJob.java.i
 data/test/java/beans/Introspector/Test6868189.java.i
-data/src/share/native/sun/awt/image/jpeg/jidctred.c.i
-data/src/share/demo/management/FullThreadDump/ThreadMonitor.java.i
+data/test/sun/security/provider/PolicyParser/ExtDirs1.policy.i
+data/src/share/native/com/sun/media/sound/SoundDefs.h.i
+data/test/java/beans/Introspector/Test4498236.java.i
 data/test/sun/security/provider/PolicyFile/Comparator.Principal.Policy.i
-data/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java.i
+data/src/share/classes/javax/swing/plaf/multi/package.html.i
 data/test/java/awt/font/NumericShaper/EasternArabicTest.java.i
 data/src/share/classes/javax/naming/ldap/LdapContext.java.i
 data/test/java/net/InterfaceAddress/NetworkPrefixLength.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM871.java.i
+data/src/share/classes/com/sun/beans/finder/ClassFinder.java.i
 data/src/share/classes/javax/management/namespace/JMXRemoteNamespaceMBean.java.i
 data/src/share/classes/java/awt/image/RGBImageFilter.java.i
+data/src/share/classes/sun/net/httpserver/LeftOverInputStream.java.i
 data/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java.i
 data/src/windows/classes/sun/java2d/windows/Win32SurfaceDataProxy.java.i
 data/test/sun/security/tools/keytool/resource.sh.i
+data/test/java/io/DataInputStream/ReadUTF.java.i
 data/test/sun/nio/cs/OLD/IBM943_OLD.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_th.properties.i
-data/src/share/native/sun/awt/medialib/mlib_ImageColorTrue2Index.c.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolTableMetaImpl.java.i
 data/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java.i
-data/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java.i
-data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/jdk.xml.i
+data/test/sun/nio/cs/SurrogateTestEUCTW.plane3.surrogates.i
+data/test/java/util/Collections/RotateEmpty.java.i
+data/src/share/classes/java/awt/font/GlyphMetrics.java.i
 data/test/java/awt/dnd/ImageDecoratedDnDNegative/DnDTarget.java.i
 data/test/java/security/Security/removing/RemoveProviders.java.i
 data/test/java/rmi/activation/Activatable/downloadParameterClass/Bar.java.i
 data/test/java/io/Serializable/subclass/run.sh.i
 data/test/java/io/Writer/WriteParams.java.i
 data/make/common/internal/Defs-jaxp.gmk.i
-data/src/share/javavm/export/jawt.h.i
-data/src/share/classes/sun/security/tools/KeyTool.java.i
+data/test/sun/security/pkcs11/Cipher/TestRSACipherWrap.java.i
+data/test/sun/security/pkcs11/Provider/Login.sh.i
 data/src/share/classes/sun/net/spi/nameservice/dns/DNSNameServiceDescriptor.java.i
-data/src/share/classes/sun/swing/WindowsPlacesBar.java.i
-data/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c.i
+data/src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java.i
 data/src/share/classes/javax/management/timer/package.html.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/AcceptLargeFragments.java.i
-data/test/javax/management/Introspector/DescribedMX.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionContextImpl/Timeout.java.i
 data/src/solaris/classes/sun/awt/X11/XCursorFontConstants.java.i
 data/test/sun/net/InetAddress/nameservice/simple/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
 data/test/javax/crypto/CryptoPermission/RC2PermCheck.java.i
@@ -11421,31 +11374,35 @@ data/make/sun/javazic/javatz/jdk1.1.x_zone_ids.txt.i
 data/src/share/classes/com/sun/tools/hat/internal/parser/MappedReadBuffer.java.i
 data/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java.i
 data/src/share/demo/jfc/FileChooserDemo/README.txt.i
-data/src/share/classes/sun/tools/tree/SubtractExpression.java.i
+data/src/solaris/classes/sun/awt/X11/XException.java.i
 data/test/javax/swing/UIDefaults/6795356/bug6795356.java.i
 data/test/sun/net/www/protocol/jar/jarbug/etc/jar1/res1.txt.i
 data/src/share/classes/sun/awt/VariableGridLayout.java.i
 data/src/share/demo/jfc/Metalworks/MetalworksDocumentFrame.java.i
-data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnUnmarshal.java.i
+data/src/share/demo/nbproject/jfc/SwingApplet/build.xml.i
+data/test/javax/management/loading/LibraryLoader/UseNativeLib1.html.i
 data/make/sun/security/other/Makefile.i
 data/src/windows/back/linker_md.c.i
+data/src/share/classes/javax/imageio/spi/IIOServiceProvider.java.i
 data/test/java/util/Currency/Bug4512215.java.i
-data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/jdk.xml.i
+data/test/java/rmi/reliability/juicer/OrangeEchoImpl.java.i
 data/test/java/lang/instrument/ilib/RuntimeConstants.java.i
 data/test/java/security/cert/pkix/nameConstraintsMinMax/VerifyNameConstraints.java.i
 data/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_ro.properties.i
+data/src/share/demo/nbproject/jfc/Notepad/nbproject/jdk.xml.i
+data/src/share/classes/sun/nio/cs/UTF_8.java.i
 data/src/share/classes/javax/management/ManagedAttribute.java.i
-data/src/share/classes/javax/net/ssl/SSLEngineResult.java.i
+data/src/share/classes/sun/rmi/transport/proxy/RMIHttpToPortSocketFactory.java.i
 data/src/windows/javavm/include/typedefs_md.h.i
-data/test/java/nio/channels/FileChannel/ReadFull.java.i
 data/test/javax/xml/crypto/dsig/data/signature-external-dsa.xml.i
 data/test/javax/swing/JTableHeader/6889007/bug6889007.java.i
 data/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java.i
-data/test/javax/management/relation/RelationNotificationSourceTest.java.i
+data/src/windows/classes/sun/awt/windows/WGlobalCursorManager.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextMeasureTests.java.i
 data/src/linux/doc/man/ja/wsimport.1.i
 data/make/sun/net/others/Makefile.i
 data/test/java/security/KeyRep/Serial.java.i
+data/src/share/classes/sun/net/ftp/FtpProtocolException.java.i
 data/src/share/classes/javax/swing/border/SoftBevelBorder.java.i
 data/test/java/io/PrintStream/CheckError.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java.i
@@ -11455,8 +11412,9 @@ data/src/share/classes/sun/tools/jstat/ExpressionEvaluator.java.i
 data/make/common/Modules.gmk.i
 data/src/solaris/hpi/export/timeval_md.h.i
 data/src/share/classes/javax/naming/BinaryRefAddr.java.i
-data/src/share/classes/java/lang/VerifyError.java.i
-data/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java.i
+data/src/share/classes/com/sun/security/auth/module/NTSystem.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java.i
+data/test/com/sun/jdi/redefine/SchemaChange_RedefineSubTarg.java.i
 data/src/share/classes/sun/util/logging/resources/logging_fr.properties.i
 data/src/share/classes/java/util/zip/GZIPOutputStream.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnss3.so.d
@@ -11464,77 +11422,74 @@ data/src/share/demo/jvmti/waiters/Monitor.cpp.i
 data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnss3.so.i
 data/src/share/classes/sun/java2d/pisces/PiscesCache.java.i
 data/src/share/classes/com/sun/crypto/provider/PrivateKeyInfo.java.i
-data/src/share/classes/sun/io/ByteToCharCp942C.java.i
+data/src/share/classes/sun/io/ByteToCharEUC_KR.java.i
 data/src/share/classes/com/sun/jndi/toolkit/ctx/AtomicContext.java.i
 data/src/share/classes/sun/awt/resources/awt_sv.properties.i
 data/test/sun/security/pkcs11/ec/TestCurves.java.i
-data/src/share/classes/sun/awt/NullComponentPeer.java.i
+data/src/share/demo/jfc/FileChooserDemo/ExampleFileView.java.i
+data/src/share/classes/java/awt/doc-files/Checkbox-1.gif.i
 data/test/java/util/zip/TestZipError.java.i
 data/make/tools/swing-beans/beaninfo/images/BoxMono16.gif.i
 data/test/java/beans/XMLEncoder/6777487/TestCheckedSet.java.i
-data/test/java/security/BasicPermission/PermClass.1.4.i
-data/src/share/demo/applets/SimpleGraph/example1.html.i
+data/src/share/native/java/lang/fdlibm/src/e_cosh.c.i
+data/src/solaris/native/sun/awt/awt_mgrsel.c.i
 data/test/com/sun/crypto/provider/Cipher/AES/Test4512704.java.i
-data/src/share/classes/sun/util/resources/CalendarData_lt.properties.i
+data/src/share/classes/sun/awt/resources/awt_ko.properties.i
 data/src/share/classes/javax/management/build.xml.i
 data/test/sun/net/www/http/ChunkedInputStream/TestAvailable.java.i
 data/src/share/classes/sun/dyn/FromGeneric.java.i
-data/src/share/classes/java/awt/event/InvocationEvent.java.i
-data/src/share/classes/java/awt/Transparency.java.i
+data/test/sun/java2d/OpenGL/GradientPaints.java.i
 data/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java.i
 data/test/java/beans/PropertyEditor/TestLongClass.java.i
 data/src/share/native/sun/misc/Signal.c.i
-data/src/share/classes/javax/swing/text/html/HRuleView.java.i
-data/make/tools/CharsetMapping/ISO_8859_6.map.i
+data/src/share/classes/sun/security/krb5/internal/TransitedEncoding.java.i
+data/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java.i
 data/make/tools/CharsetMapping/HKSCS2001.c2b.i
 data/src/share/classes/java/nio/file/NotLinkException.java.i
 data/src/share/native/sun/java2d/loops/Ushort565Rgb.h.i
-data/src/share/classes/sun/text/resources/FormatData_pl.java.i
-data/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c.i
+data/src/share/classes/sun/util/resources/CalendarData_pl.properties.i
 data/test/com/sun/security/sasl/digest/ClientCallbackHandler.java.i
 data/src/windows/native/sun/java2d/windows/WindowsFlags.h.i
 data/test/java/rmi/server/serverStackTrace/ServerStackTrace_Stub.java.i
 data/src/share/classes/sun/jvmstat/monitor/MonitoredHost.java.i
 data/test/java/nio/channels/ServerSocketChannel/SocketOptionTests.java.i
 data/src/share/classes/sun/security/util/AuthResources_de.java.i
-data/test/javax/swing/border/Test4760089.java.i
+data/test/java/nio/channels/Selector/SelectorTest.java.i
 data/make/modules/tools/src/com/sun/classanalyzer/ClassPath.java.i
 data/src/share/classes/java/util/Random.java.i
 data/src/solaris/bin/ergo_sparc.c.i
-data/src/share/classes/java/awt/doc-files/RadialGradientPaint-4.png.i
-data/test/java/util/concurrent/ThreadPoolExecutor/ModifyCorePoolSize.java.i
 data/src/share/classes/sun/text/resources/BreakIteratorRules.java.i
+data/test/com/sun/net/httpserver/SimpleSSLContext.java.i
 data/src/share/classes/sun/security/krb5/RealmException.java.i
-data/src/share/native/java/lang/fdlibm/src/k_standard.c.i
-data/src/share/classes/sun/java2d/Disposer.java.i
-data/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObjectVisitor.java.i
+data/test/java/rmi/reliability/benchmark/bench/serial/Strings.java.i
+data/src/share/classes/java/awt/doc-files/GridBagLayout-baseline.png.i
 data/src/share/classes/javax/sound/midi/MidiUnavailableException.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties.i
 data/test/java/awt/TrayIcon/DragEventSource/DragEventSource.java.i
 data/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java.i
 data/src/share/classes/javax/crypto/spec/RC5ParameterSpec.java.i
-data/src/solaris/classes/sun/misc/FileURLMapper.java.i
+data/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java.i
 data/test/java/util/ServiceLoader/FooProvider1.java.i
 data/test/sun/nio/cs/FindASCIICodingBugs.java.i
-data/test/java/nio/channels/Pipe/EmptyRead.java.i
+data/src/share/classes/java/security/interfaces/DSAPrivateKey.java.i
 data/src/share/classes/javax/swing/text/html/OptionComboBoxModel.java.i
 data/test/java/rmi/activation/Activatable/createPrivateActivable/rmid.security.policy.i
 data/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java.i
-data/src/share/classes/java/security/SecureClassLoader.java.i
+data/test/java/nio/channels/AsyncCloseAndInterrupt.java.i
 data/src/share/demo/nbproject/jfc/TransparentRuler/build.properties.i
 data/src/share/native/sun/java2d/loops/IntRgb.h.i
 data/test/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.html.i
+data/make/java/jli/mapfile-vers.i
 data/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java.i
 data/src/share/classes/java/sql/NClob.java.i
 data/src/windows/native/sun/java2d/windows/dxInit.cpp.i
-data/test/sun/net/www/ftptest/FtpFileSystemHandler.java.i
 data/test/java/rmi/invalidName/InvalidName.java.i
 data/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java.i
 data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java.i
 data/src/share/classes/sun/security/x509/OCSPNoCheckExtension.java.i
 data/test/sun/security/pkcs11/Serialize/SerializeProvider.java.i
-data/src/share/classes/com/sun/security/auth/PolicyParser.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/CipherSuite/SSL_NULL.java.i
+data/src/share/classes/javax/swing/event/MenuDragMouseListener.java.i
 data/src/share/classes/java/nio/charset/package.html.i
 data/src/share/classes/javax/swing/doc-files/groupLayout.1.gif.i
 data/test/java/nio/channels/FileChannel/ClosedChannelTransfer.java.i
@@ -11544,297 +11499,295 @@ data/src/share/classes/java/awt/TextField.java.i
 data/src/solaris/native/sun/awt/XDrawingAreaP.h.i
 data/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java.i
 data/test/java/beans/XMLEncoder/javax_swing_KeyStroke.java.i
-data/test/java/awt/regtesthelpers/AbstractTest.java.i
-data/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c.i
+data/test/java/awt/print/PrinterJob/ExceptionTest.java.i
 data/make/tools/CharsetMapping/IBM1140.map.i
+data/test/javax/management/monitor/MBeanServerForwarderInvocationHandler.java.i
 data/test/javax/management/modelmbean/OnUnregisterTest.java.i
 data/src/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java.i
-data/test/sun/tools/jps/usage.out.i
-data/src/share/classes/java/net/SdpSocketImpl.java.i
+data/src/share/classes/sun/tools/asm/NumberConstantData.java.i
+data/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java.i
 data/test/java/lang/Thread/StartOOMTest.java.i
 data/src/share/classes/java/lang/NegativeArraySizeException.java.i
 data/src/share/classes/com/sun/jdi/ArrayType.java.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedFieldAccessorImpl.java.i
-data/make/tools/swing-beans/beaninfo/images/JPanelMono16.gif.i
-data/src/share/classes/sun/io/CharToByteUnicodeLittle.java.i
+data/src/windows/native/sun/java2d/d3d/D3DTextRenderer.h.i
+data/test/java/io/Serializable/skipToEndOfBlockData/SkipToEndOfBlockData.java.i
 data/src/share/classes/sun/font/FontResolver.java.i
+data/make/jpda/transport/socket/mapfile-vers.i
 data/src/share/native/com/sun/java/util/jar/pack/zip.h.i
 data/src/share/classes/sun/io/ByteToCharCp1141.java.i
 data/test/java/lang/Integer/ParsingTest.java.i
 data/make/tools/UnicodeData/SpecialCasing.txt.i
-data/src/share/classes/org/openjdk/jigsaw/FilePaths.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpSecurityException.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthTableUI.java.i
 data/test/javax/management/Introspector/NotCompliantCauseTest.java.i
 data/src/share/lib/images/cursors/win32_CopyNoDrop32x32.gif.i
-data/src/solaris/native/sun/java2d/loops/vis_ByteGray.c.i
+data/src/share/classes/sun/management/resources/agent_es.properties.i
 data/test/javax/management/security/MBeanPermissionTest.java.i
 data/src/share/classes/javax/security/auth/spi/package.html.i
 data/src/share/classes/com/sun/jdi/VMDisconnectedException.java.i
 data/src/solaris/doc/sun/man/man1/ja/javaws.1.i
 data/src/windows/native/java/io/Console_md.c.i
-data/src/share/classes/com/sun/jmx/snmp/tasks/ThreadService.java.i
+data/src/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java.i
 data/src/share/classes/sun/text/resources/FormatData_lt.java.i
-data/src/share/classes/sun/misc/VMNotification.java.i
+data/src/share/classes/javax/imageio/event/IIOReadWarningListener.java.i
+data/src/share/demo/management/JTop/JTop.java.i
 data/src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributeView.java.i
 data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java.i
 data/test/java/io/OutputStream/WriteParams.java.i
-data/src/share/classes/sun/io/CharToByteSJIS.java.i
+data/src/share/classes/sun/tools/tree/ShiftLeftExpression.java.i
 data/src/windows/hpi/export/byteorder_md.h.i
 data/test/com/sun/jdi/ConstantPoolInfo.java.i
-data/test/sun/nio/cs/TestCompoundTest.java.i
 data/test/java/net/Socket/OldSocketImpl.sh.i
 data/src/share/classes/java/text/CollationElementIterator.java.i
-data/src/share/native/sun/security/ec/impl/ec2_233.c.i
-data/src/solaris/native/sun/awt/list.c.i
-data/make/tools/src/build/tools/jdwpgen/BooleanTypeNode.java.i
+data/test/java/awt/PrintJob/RoundedRectTest/RoundedRectTest.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmscam02.c.i
+data/src/share/classes/sun/text/normalizer/Trie.java.i
 data/src/share/classes/sun/tools/tree/AddExpression.java.i
 data/test/sun/security/tools/jarsigner/AlgOptions.sh.i
 data/test/java/lang/Long/ParsingTest.java.i
-data/src/share/classes/java/util/IllegalFormatPrecisionException.java.i
+data/make/tools/swing-beans/beaninfo/images/JProgressBarMono16.gif.i
+data/test/javax/swing/JSlider/4252173/bug4252173.java.i
 data/src/windows/native/sun/java2d/j2d_md.h.i
 data/test/lib/security/java.policy/Ext_AllPolicy.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM1026.java.i
+data/src/share/classes/sun/text/resources/FormatData_is_IS.java.i
 data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/XmlConfigUtils.java.i
 data/src/share/classes/sun/security/krb5/internal/KRBSafeBody.java.i
 data/src/windows/native/sun/windows/awt_Button.h.i
 data/src/share/classes/sun/nio/cs/ext/IBM939.java.i
-data/test/sun/java2d/pisces/Test7036754.java.i
+data/src/share/classes/java/awt/event/InvocationEvent.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthMenuLayout.java.i
 data/test/java/io/Serializable/readPastObject/ReadPastObject.java.i
-data/test/java/lang/instrument/NoTransformerAddedTest.java.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL.c.i
-data/test/com/sun/tools/attach/redefineagent.mf.i
-data/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java.i
+data/test/javax/management/namespace/DomainCreationTest.java.i
+data/test/javax/imageio/plugins/bmp/TopDownTest.java.i
 data/test/java/security/cert/pkix/nameConstraintsMinMax/sun.cer.i
 data/test/java/awt/print/PrinterJob/Margins.java.i
 data/test/java/nio/charset/RemovingSunIO/TestCOMP.java.i
-data/src/share/classes/sun/tools/tree/AssignAddExpression.java.i
+data/test/java/awt/FileDialog/MultipleMode/MultipleMode.html.i
 data/src/windows/native/sun/windows/ObjectList.h.i
 data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties.i
 data/src/share/classes/sun/security/x509/FreshestCRLExtension.java.i
-data/src/share/classes/sun/awt/dnd/SunDropTargetEvent.java.i
+data/test/java/security/BasicPermission/SerialVersion.java.i
 data/test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java.i
 data/make/com/sun/java/pack/prop/Makefile.i
-data/src/share/native/sun/font/layout/TibetanLayoutEngine.h.i
+data/test/sun/security/validator/samedn.sh.i
 data/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp.i
 data/src/share/native/java/lang/fdlibm/src/e_gamma.c.i
 data/src/share/native/sun/security/ec/impl/ec_naf.c.i
-data/test/java/io/File/MaxPathLength.java.i
-data/src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties.i
+data/src/solaris/classes/sun/java2d/xr/XRMaskImage.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_zh_TW.properties.i
 data/src/share/classes/sun/nio/cs/ext/IBM33722.java.i
-data/src/share/native/sun/font/layout/SinglePositioningSubtables.h.i
+data/src/share/classes/com/sun/crypto/provider/DESKey.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java.i
-data/test/sun/security/rsa/TestSignatures.java.i
-data/src/share/classes/sun/io/ByteToCharBig5_HKSCS.java.i
+data/test/sun/security/pkcs11/Signature/ByteBuffers.java.i
 data/make/tools/CharsetMapping/IBM850.map.i
 data/test/sun/security/krb5/auto/BadKdc3.java.i
 data/src/share/classes/com/sun/jmx/snmp/ServiceName.java.i
 data/test/sun/misc/JarIndex/metaInfFilenames/jarC/my/impl/StandardMessageService.java.i
-data/test/com/sun/crypto/provider/KeyAgreement/DHKeyFactory.java.i
-data/src/windows/native/sun/windows/ComCtl32Util.cpp.i
-data/test/java/nio/file/Files/walkFileTree/denyAll.policy.i
-data/make/common/internal/NativeCompileRules.gmk.i
+data/src/share/native/java/lang/fdlibm/src/w_atanh.c.i
+data/test/java/util/Collections/FindSubList.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMeta.java.i
 data/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java.i
 data/test/java/rmi/registry/reexport/Reexport.java.i
 data/src/share/classes/javax/swing/event/TableModelEvent.java.i
 data/make/tools/CharsetMapping/DoubleByte-X.java.template.i
-data/src/share/classes/com/sun/jdi/request/MethodEntryRequest.java.i
+data/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java.i
 data/src/share/native/sun/java2d/loops/ByteBinary4Bit.h.i
 data/src/share/classes/sun/reflect/MethodAccessorGenerator.java.i
+data/src/share/classes/sun/tools/jar/resources/jar.properties.i
 data/src/share/classes/java/security/spec/ECGenParameterSpec.java.i
 data/src/share/classes/sun/io/ByteToCharCp868.java.i
 data/src/share/native/java/util/zip/zlib-1.2.3/inftrees.h.i
 data/src/share/classes/java/util/concurrent/DelayQueue.java.i
-data/test/org/openjdk/jigsaw/cli/expired-signer-cert.pem.i
-data/src/share/classes/sun/security/ec/ECPublicKeyImpl.java.i
-data/test/java/nio/channels/Selector/OutOfBand.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java.i
 data/test/java/beans/PropertyChangeSupport/TestSerialization.java.i
 data/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java.i
 data/src/share/classes/sun/tools/attach/HotSpotAttachProvider.java.i
 data/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java.i
 data/test/sun/nio/cs/DecoderOverflow.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_fr.properties.i
-data/src/share/classes/sun/reflect/SerializationConstructorAccessorImpl.java.i
+data/src/share/native/sun/font/layout/MPreFixups.h.i
+data/make/com/sun/security/auth/Makefile.i
 data/test/sun/net/InetAddress/nameservice/simple/CacheTest.java.i
 data/make/tools/swing-beans/beaninfo/images/JToolBarMono32.gif.i
-data/test/sun/security/pkcs11/Secmod/secmod.db.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/DynamicTest.java.i
 data/make/netbeans/common/build-folder.ent.i
 data/src/share/classes/javax/swing/JFileChooser.java.i
-data/src/share/classes/java/security/SecurityPermission.java.i
+data/src/windows/native/sun/jkernel/stdafx.cpp.i
 data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileStore.java.i
-data/test/java/io/LineNumberReader/MarkReset.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/DetailsView.gif.i
 data/src/share/classes/sun/java2d/pisces/Transform4.java.i
-data/test/java/lang/StringBuffer/InsertMaxValue.java.i
+data/test/sun/security/pkcs11/tls/TestPRF.java.i
 data/src/share/native/java/util/zip/zlib-1.1.3/deflate.c.i
 data/src/share/classes/sun/tools/tree/InlineReturnStatement.java.i
 data/src/share/classes/sun/io/CharToByteCp500.java.i
+data/src/share/classes/java/rmi/server/SkeletonNotFoundException.java.i
 data/test/javax/security/auth/Subject/doAs/Test.java.i
 data/src/windows/native/sun/windows/awt_Object.h.i
 data/src/share/classes/com/sun/rowset/package.html.i
 data/make/sun/dcpr/FILES_c.gmk.i
 data/test/sun/security/mscapi/SignUsingNONEwithRSA.sh.i
 data/src/share/classes/org/openjdk/jigsaw/LoaderPool.java.i
+data/src/windows/native/sun/java2d/d3d/D3DShaderGen.c.i
 data/test/sun/security/krb5/UnknownCCEntry.java.i
 data/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh.i
 data/src/share/native/sun/font/layout/TibetanReordering.cpp.i
 data/test/java/net/ResponseCache/B6181108.java.i
 data/src/share/classes/sun/font/Type1Font.java.i
-data/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java.i
+data/test/com/sun/servicetag/SystemRegistryTest.java.i
 data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/Echo.java.i
 data/test/javax/management/monitor/StartStopTest.java.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java.i
+data/src/share/classes/com/sun/servicetag/package.html.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedByteFieldAccessorImpl.java.i
-data/src/solaris/classes/sun/java2d/xr/XRCompositeManager.java.i
+data/src/share/classes/javax/management/remote/JMXConnectorServer.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiScrollPaneUI.java.i
 data/test/java/lang/module/Main.java.i
-data/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java.i
+data/src/share/classes/com/sun/jndi/ldap/PersistentSearchControl.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/Traffic.java.i
+data/test/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java.i
 data/src/share/classes/java/awt/font/LineBreakMeasurer.java.i
-data/test/java/nio/channels/DatagramChannel/NotBound.java.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh.i
-data/src/share/classes/sun/io/ByteToCharCp277.java.i
+data/make/tools/src/build/tools/jdwpgen/Context.java.i
 data/src/share/classes/sun/io/ByteToCharMacCroatian.java.i
 data/src/share/classes/javax/swing/JComboBox.java.i
 data/src/share/classes/javax/management/remote/JMXConnectorProvider.java.i
+data/src/share/classes/sun/tools/tree/GreaterExpression.java.i
 data/test/javax/management/remote/mandatory/subjectDelegation/policy25.i
 data/src/solaris/classes/sun/nio/fs/UnixCopyFile.java.i
 data/make/java/java/Exportedfiles.gmk.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/TemplateLayer.java.i
-data/src/solaris/hpi/native_threads/src/monitor_md.c.i
+data/test/java/util/PluggableLocale/BreakIteratorProviderTest.java.i
+data/test/java/security/AccessControlContext/NullCombinerEquals.java.i
 data/test/javax/management/namespace/VirtualNamespaceQueryTest.java.i
 data/src/share/classes/sun/rmi/transport/tcp/MultiplexConnectionInfo.java.i
-data/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency_Stub.java.i
+data/test/sun/security/tools/policytool/UsePolicy.html.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties.i
 data/test/javax/swing/JSpinner/6532833/bug6532833.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java.i
-data/src/share/classes/java/awt/Scrollbar.java.i
+data/src/share/demo/jvmti/gctest/sample.makefile.txt.i
+data/src/share/classes/java/awt/image/DataBufferShort.java.i
 data/test/java/beans/XMLEncoder/java_lang_Enum.java.i
 data/src/solaris/hpi/include/largefile_solaris.h.i
 data/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java.i
-data/src/share/classes/sun/jvmstat/monitor/event/package.html.i
+data/test/java/security/cert/CertPathBuilder/selfIssued/openssl.cnf.i
 data/test/java/rmi/reliability/benchmark/bench/serial/ProxyClassDesc.java.i
 data/src/share/classes/sun/text/resources/BreakIteratorRules_th.java.i
 data/test/java/io/Serializable/classDescHooks/CNFException.java.i
-data/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java.i
+data/src/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java.i
+data/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java.i
 data/src/solaris/native/sun/awt/awt_Choice21.c.i
 data/src/share/native/com/sun/java/util/jar/pack/zip.cpp.i
 data/src/solaris/native/sun/awt/awt_Mlib.h.i
 data/src/share/demo/nbproject/management/VerboseGC/build.properties.i
+data/test/java/net/Inet6Address/IPv6AddressTypes.java.i
 data/make/tools/CharsetMapping/IBM870.map.i
 data/test/org/openjdk/jigsaw/cli/signed-module.policy.i
 data/test/javax/management/Introspector/DescribedMBean.java.i
+data/src/share/classes/com/sun/jdi/request/BreakpointRequest.java.i
 data/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java.i
 data/src/share/classes/org/openjdk/jigsaw/LinkingContext.java.i
-data/src/share/classes/javax/crypto/spec/PBEKeySpec.java.i
+data/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java.i
 data/src/share/classes/javax/swing/text/CompositeView.java.i
 data/test/java/rmi/registry/altSecurityManager/TestSecurityManager.java.i
-data/src/share/classes/java/util/IllegalFormatWidthException.java.i
+data/src/windows/native/sun/windows/Hashtable.h.i
 data/test/java/net/URLConnection/URLConnectionHeaders.java.i
 data/make/javax/sound/FILES_c.gmk.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheData.java.i
 data/src/share/classes/com/sun/servicetag/WindowsSystemEnvironment.java.i
 data/src/share/classes/org/openjdk/jigsaw/PathLinker.java.i
 data/src/share/classes/com/sun/beans/decoder/NewElementHandler.java.i
-data/test/com/sun/tools/extcheck/TestExtcheckArgs.sh.i
+data/test/java/awt/Window/SetBackgroundNPE/SetBackgroundNPE.java.i
 data/src/share/classes/java/lang/instrument/IllegalClassFormatException.java.i
 data/test/org/openjdk/jigsaw/optional-deps.sh.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java.i
+data/src/share/native/sun/font/layout/GlyphPositioningTables.h.i
 data/src/share/classes/java/security/Signer.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM861.java.i
+data/src/solaris/doc/sun/man/man1/DO_NOT_EDIT--GENERATED_FILES.i
 data/src/share/classes/javax/management/openmbean/TabularData.java.i
 data/test/java/security/SignedObject/Correctness.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java.i
-data/src/share/classes/javax/net/ssl/ExtendedSSLSession.java.i
-data/src/windows/native/sun/windows/awt_TextArea.h.i
+data/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java.i
 data/test/java/util/ResourceBundle/Control/Chinese_zh_CN.properties.i
 data/src/share/classes/sun/rmi/transport/Target.java.i
 data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Decoder.java.i
 data/test/com/sun/crypto/provider/Cipher/PBE/PBEInvalidParamsTest.java.i
 data/src/share/native/java/lang/fdlibm/src/k_rem_pio2.c.i
-data/test/java/io/BufferedInputStream/CountUpdate.java.i
+data/src/share/demo/jfc/TableExample/TableSorter.java.i
 data/test/java/rmi/activation/ActivationSystem/unregisterGroup/group.security.policy.i
-data/make/sun/management/jmxremote/Makefile.i
-data/src/share/classes/sun/net/www/protocol/https/HttpsClient.java.i
+data/test/sun/security/tools/jarsigner/JarSigningNonAscii.java.i
+data/src/share/classes/java/dyn/MethodHandleProvider.java.i
 data/test/java/io/Serializable/maskSyntheticModifier/Test.java.i
 data/src/share/classes/javax/naming/spi/StateFactory.java.i
 data/src/share/native/sun/awt/medialib/safe_alloc.h.i
-data/test/java/util/Locale/LocaleEnhanceTest.java.i
+data/src/share/classes/java/nio/file/LinkPermission.java.i
+data/src/share/native/sun/java2d/loops/ByteBinary1Bit.h.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Layer.java.i
-data/src/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java.i
 data/make/java/text/base/FILES_java.gmk.i
-data/test/javax/management/mxbean/OperationImpactTest.java.i
-data/src/share/demo/jfc/SampleTree/SampleTree.java.i
+data/test/java/util/EnumSet/AllOf.java.i
+data/test/sun/java2d/cmm/ColorConvertOp/RGBColorConvertTest.java.i
 data/src/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java.i
-data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java.i
+data/src/share/sample/nio/server/Reply.java.i
 data/make/tools/CharsetMapping/IBM1381.map.i
-data/src/share/classes/sun/tools/java/Identifier.java.i
+data/test/com/sun/jndi/ldap/LdapName/EmptyNameSearch.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/Host.java.i
 data/test/javax/imageio/plugins/jpeg/ReadAsGrayTest.java.i
 data/make/javax/crypto/policy/unlimited/default_local.policy.i
 data/test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh.i
 data/src/share/classes/sun/security/provider/certpath/PolicyChecker.java.i
 data/src/share/demo/jvmti/hprof/hprof_tag.c.i
-data/make/sun/dcpr/Makefile.i
+data/src/share/classes/sun/font/Font2D.java.i
 data/src/share/classes/sun/util/calendar/ZoneInfo.java.i
 data/test/java/io/charStreams/BCat.java.i
-data/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/package.html.i
 data/src/share/classes/javax/swing/plaf/multi/MultiSpinnerUI.java.i
-data/make/tools/CharsetMapping/IBM284.c2b.i
+data/src/share/classes/javax/swing/ComponentInputMap.java.i
 data/src/solaris/native/sun/awt/awt_MToolkit.h.i
 data/src/share/classes/javax/security/sasl/SaslClient.java.i
 data/test/java/dyn/MethodHandlesTest.java.i
-data/test/java/util/concurrent/ConcurrentQueues/RemovePollRace.java.i
+data/src/windows/classes/sun/java2d/ScreenUpdateManager.java.i
 data/src/share/classes/sun/io/CharToByteCp943C.java.i
 data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipConstants.java.i
-data/make/tools/swing-beans/beaninfo/images/JPasswordFieldMono32.gif.i
 data/src/share/classes/sun/security/ssl/Krb5Helper.java.i
 data/test/java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java.i
 data/src/share/native/sun/java2d/opengl/OGLSurfaceData.c.i
-data/src/share/back/error_messages.h.i
+data/src/share/classes/sun/java2d/pipe/TextPipe.java.i
 data/make/mkdemo/applets/Blink/Makefile.i
 data/src/share/classes/java/awt/event/KeyListener.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java.i
-data/src/share/classes/sun/security/provider/SHA2.java.i
-data/make/sun/javazic/tzdata/pacificnew.i
+data/make/tools/src/build/tools/spp/Spp.java.i
+data/test/java/io/StreamTokenizer/Comment.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_EmptyMap.java.i
-data/src/share/classes/sun/security/rsa/RSAPadding.java.i
+data/test/sun/net/www/protocol/http/DigestTest.java.i
+data/test/java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java.i
 data/src/share/classes/sun/management/HotspotInternalMBean.java.i
 data/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java.i
 data/test/sun/misc/BootClassLoaderHook/TestHook.java.i
 data/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java.i
 data/src/share/demo/scripting/jconsole-plugin/src/scripts/jstack.js.i
 data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java.i
-data/test/sun/security/tools/keytool/trystore.sh.i
+data/src/share/classes/sun/security/provider/certpath/CertId.java.i
 data/test/sun/tools/jps/jps-Vvml.sh.i
 data/src/share/classes/java/rmi/activation/ActivationGroupDesc.java.i
 data/test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java.i
 data/make/tools/swing-beans/DocBeanInfo.java.i
 data/src/share/classes/sun/util/resources/CalendarData_fr.properties.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/crisubn.jks.i
+data/src/share/demo/jvmti/hprof/hprof_object.h.i
 data/test/sun/security/ssl/sanity/pluggability/CipherSuites.java.i
+data/src/share/classes/javax/swing/text/html/ResourceLoader.java.i
 data/src/share/classes/java/awt/doc-files/FlowLayout-1.gif.i
-data/test/java/io/BufferedInputStream/ReadAfterClose.java.i
-data/src/share/demo/jvmti/gctest/sample.makefile.txt.i
-data/test/java/io/Serializable/class/SerialA_2.java.i
-data/src/share/classes/sun/io/CharToByteUnicodeLittleUnmarked.java.i
-data/src/solaris/doc/sun/man/man1/pack200.1.i
+data/test/java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java.i
+data/src/share/classes/sun/java2d/pipe/GlyphListLoopPipe.java.i
+data/test/java/rmi/activation/Activatable/createPrivateActivable/ActivateMe.java.i
 data/make/sun/awt/FILES_export_unix.gmk.i
 data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReader.java.i
 data/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java.i
 data/test/javax/xml/crypto/dsig/data/signature-enveloping-b64-dsa.xml.i
-data/test/java/util/concurrent/ConcurrentQueues/GCRetention.java.i
-data/src/solaris/classes/sun/awt/motif/X11SelectionHolder.java.i
+data/test/javax/print/attribute/CollateAttr.java.i
 data/test/sun/security/krb5/krb5.conf.i
-data/test/java/rmi/reliability/benchmark/bench/serial/Longs.java.i
+data/test/javax/management/remote/mandatory/notif/RMINotifTest.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_U16.c.i
-data/test/sun/tools/jstatd/jstatdPort.sh.i
-data/test/java/lang/ClassLoader/package2/Class2.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java.i
 data/test/java/lang/Class/forName/InitArg.java.i
 data/src/share/classes/java/security/interfaces/ECPrivateKey.java.i
-data/make/tools/src/build/tools/dtdbuilder/PublicMapping.java.i
 data/src/share/classes/java/text/DigitList.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/ParserRules.java.i
 data/make/tools/CharsetMapping/IBM1148.c2b.i
@@ -11842,102 +11795,98 @@ data/test/javax/management/context/LocaleTest.java.i
 data/make/netbeans/jmx/build.xml.i
 data/src/share/classes/sun/text/resources/FormatData_ar_TN.java.i
 data/test/java/io/File/CheckTempDir.java.i
+data/test/java/beans/XMLEncoder/Test6852574.java.i
 data/test/sun/net/www/HeaderTests.java.i
 data/src/share/classes/sun/awt/shell/ShellFolder.java.i
 data/test/org/openjdk/jigsaw/cli/ModuleFormatTest01.java.i
 data/src/share/classes/sun/security/smartcardio/PCSCTerminals.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpAddress.java.i
 data/src/share/native/sun/font/bidi/uchardir.h.i
-data/src/share/demo/java2d/J2DBench/resources/textdata/english.ut8.txt.i
-data/src/share/native/sun/security/ec/impl/ecdecode.c.i
+data/test/java/security/cert/CertPathBuilder/targetConstraints/ca.cer.i
+data/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c.i
 data/src/linux/doc/man/ja/jconsole.1.i
-data/test/javax/management/mxbean/LeakTest.java.i
 data/src/share/demo/jvmti/versionCheck/versionCheck.c.i
 data/src/share/classes/java/lang/Thread.java.i
 data/make/sun/headless/reorder-sparcv9.i
 data/make/netbeans/common/properties.ent.i
-data/test/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java.i
+data/src/share/sample/vm/clr-jvm/Makefile.i
 data/test/java/util/jar/Attributes/Name.java.i
 data/test/sun/nio/cs/OLD/Johab_OLD.java.i
-data/src/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java.i
+data/test/java/beans/Introspector/Test6311051.java.i
 data/src/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java.i
 data/src/share/native/java/lang/fdlibm/src/s_log1p.c.i
 data/src/share/demo/jvmti/mtrace/sample.makefile.txt.i
 data/src/share/classes/javax/swing/event/TreeWillExpandListener.java.i
 data/src/share/classes/sun/text/resources/CollationData_nl.java.i
+data/test/java/io/RandomAccessFile/OpsAfterClose.java.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedBooleanFieldAccessorImpl.java.i
-data/src/share/native/com/sun/tools/jdi/SharedMemoryTransport.c.i
-data/src/solaris/classes/sun/nio/ch/SocketDispatcher.java.i
+data/src/share/native/sun/awt/image/jpeg/jpegdecoder.c.i
 data/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatchByteArray.java.i
 data/test/java/awt/FontClass/CreateFont/bigfont.html.i
 data/src/share/classes/com/sun/jdi/InterfaceType.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpecVisitor.java.i
-data/src/windows/classes/java/io/Win32FileSystem.java.i
-data/test/sun/net/util/IPAddressUtilTest.java.i
+data/src/share/classes/sun/security/x509/X400Address.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain6.txt.i
 data/test/java/util/ResourceBundle/TestResource.java.i
 data/src/share/classes/java/util/EnumMap.java.i
-data/test/java/util/PluggableLocale/providersrc/LocaleNames_xx.properties.i
-data/src/share/classes/sun/nio/ch/SelectionKeyImpl.java.i
+data/src/share/classes/javax/management/MBeanOperationInfo.java.i
+data/test/java/rmi/reliability/benchmark/bench/Makefile.i
 data/src/share/classes/java/security/cert/TrustAnchor.java.i
 data/make/tools/swing-beans/beaninfo/images/JTextFieldColor16.gif.i
 data/src/share/classes/javax/crypto/SealedObject.java.i
 data/test/sun/security/krb5/ConfigWithQuotations.java.i
 data/src/share/native/com/sun/java/util/jar/pack/unpack.h.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostName.java.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.access.in.i
-data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java.i
-data/src/share/classes/java/awt/dnd/peer/DropTargetPeer.java.i
+data/test/java/lang/instrument/MakeJAR3.sh.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java.i
+data/src/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java.i
 data/test/java/nio/channels/FileChannel/Truncate.java.i
 data/src/share/classes/javax/sql/XAConnection.java.i
 data/test/java/beans/XMLDecoder/spec/TestProperty.java.i
-data/src/share/native/sun/font/layout/ContextualGlyphSubstitution.h.i
-data/src/solaris/classes/sun/java2d/xr/XRPaints.java.i
-data/src/share/classes/java/lang/annotation/ElementType.java.i
-data/src/share/classes/sun/io/CharToByteCp420.java.i
+data/src/share/classes/org/ietf/jgss/GSSContext.java.i
+data/src/share/classes/sun/util/resources/CalendarData_ja.properties.i
+data/test/java/beans/Introspector/Test4918902.java.i
 data/src/share/classes/javax/accessibility/AccessibleValue.java.i
 data/src/share/classes/javax/swing/plaf/ButtonUI.java.i
-data/src/share/classes/sun/awt/AWTCharset.java.i
+data/src/solaris/bin/zero/jvm.cfg.i
 data/test/javax/imageio/CachePremissionsTest/rwd.policy.i
-data/test/sun/java2d/SunGraphics2D/SimplePrimQuality.java.i
 data/test/sun/tools/native2ascii/A2N_6247817.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java.i
 data/test/java/util/ResourceBundle/Control/MalformedDataRB_en.properties.i
 data/src/share/classes/java/lang/doc-files/javalang.doc.anc38.gif.i
-data/test/java/nio/file/WatchService/Basic.java.i
+data/test/javax/sound/sampled/AudioFormat/PCM_FLOAT_support.java.i
 data/make/jprt.properties.i
-data/src/solaris/classes/com/sun/management/OSMBeanFactory.java.i
+data/test/sun/net/www/http/HttpClient/RetryPost.sh.i
 data/test/java/beans/XMLEncoder/6777487/TestEncoder.java.i
 data/src/share/native/java/lang/fdlibm/src/w_sqrt.c.i
 data/test/java/rmi/transport/dgcDeadLock/TestImpl_Stub.java.i
 data/src/share/native/sun/awt/image/jpeg/jidctflt.c.i
 data/test/java/nio/Buffer/CopyDirect-X-Memory.java.i
+data/src/share/classes/javax/swing/undo/doc-files/UndoManager-3.gif.i
 data/src/share/classes/javax/management/NotificationBroadcaster.java.i
 data/test/java/util/Locale/serialized/java6locale___Java.i
 data/src/share/classes/javax/swing/text/DefaultFormatterFactory.java.i
 data/make/java/hpi/native/reorder-sparcv9.i
 data/test/sun/security/ssl/sun/net/www/httpstest/AbstractCallback.java.i
-data/src/share/classes/javax/management/MalformedObjectNameException.java.i
+data/src/share/classes/javax/sql/rowset/spi/XmlWriter.java.i
 data/src/share/classes/com/sun/tools/hat/internal/server/RootsQuery.java.i
-data/src/share/classes/sun/security/jgss/krb5/MicToken_v2.java.i
+data/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp.i
 data/src/share/classes/javax/naming/NamingSecurityException.java.i
 data/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java.i
 data/test/java/lang/Class/forName/classes/0.class.i
-data/test/java/io/Serializable/proxy/replace/WriteReplace.java.i
+data/src/share/classes/sun/security/krb5/internal/ccache/Credentials.java.i
 data/src/share/classes/javax/accessibility/AccessibleHyperlink.java.i
-data/src/share/classes/javax/management/relation/RelationServiceNotRegisteredException.java.i
+data/src/share/classes/java/awt/geom/Arc2D.java.i
 data/src/share/classes/javax/swing/JOptionPane.java.i
 data/src/share/classes/sun/security/krb5/internal/LocalSeqNumber.java.i
 data/src/share/classes/javax/imageio/metadata/IIOMetadata.java.i
 data/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c.i
-data/src/share/classes/java/rmi/UnexpectedException.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java.i
 data/src/share/classes/java/beans/beancontext/BeanContextServicesListener.java.i
-data/test/java/beans/XMLEncoder/6329581/Test6329581.java.i
-data/src/share/classes/com/sun/crypto/provider/PCBC.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMManagers.java.i
 data/src/share/classes/com/sun/nio/sctp/SendFailedNotification.java.i
 data/src/share/classes/sun/io/ByteToCharCp1140.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ar_JO.properties.i
-data/src/share/classes/com/sun/imageio/plugins/common/I18N.java.i
+data/make/tools/swing-beans/beaninfo/images/JSpinnerMono32.gif.i
 data/src/share/classes/java/sql/RowId.java.i
 data/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java.i
 data/src/share/classes/javax/swing/plaf/synth/package.html.i
@@ -11945,60 +11894,59 @@ data/src/share/classes/javax/security/cert/Certificate.java.i
 data/test/java/beans/PropertyEditor/TestIntegerTypeNull.java.i
 data/make/common/Cscope.gmk.i
 data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolState.java.i
-data/src/share/classes/com/sun/tools/hat/README.txt.i
 data/test/java/net/Authenticator/B4962064.java.i
 data/src/share/classes/java/awt/event/ComponentListener.java.i
-data/test/java/lang/Math/WorstCaseTests.java.i
-data/test/java/nio/charset/Charset/EmptyCharsetName.java.i
-data/src/share/native/sun/font/layout/GDEFMarkFilter.h.i
+data/src/share/classes/javax/sound/midi/MidiFileFormat.java.i
+data/src/share/classes/sun/nio/cs/ArrayDecoder.java.i
+data/src/share/classes/sun/text/resources/CollationData_vi.java.i
 data/test/com/sun/crypto/provider/KeyGenerator/TestExplicitKeyLength.java.i
 data/src/share/classes/sun/nio/cs/ext/MacCentralEurope.java.i
 data/make/tools/src/build/tools/javazic/Mappings.java.i
 data/test/java/nio/charset/spi/basic.sh.i
 data/src/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java.i
 data/src/share/classes/sun/misc/ClassFileTransformer.java.i
-data/src/share/demo/jfc/Font2DTest/Font2DTest.html.i
+data/src/share/classes/java/io/ObjectOutput.java.i
+data/test/java/awt/font/TextLayout/TestHebrewMark.java.i
 data/make/sun/xawt/Makefile.i
 data/test/java/math/BigDecimal/AddTests.java.i
 data/make/netbeans/awt2d/build.properties.i
 data/src/share/classes/javax/management/OperationsException.java.i
-data/src/share/demo/jvmti/waiters/Agent.cpp.i
+data/src/share/native/sun/font/DrawGlyphList.c.i
 data/src/share/native/sun/security/ec/ecc_impl.h.i
 data/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java.i
-data/src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java.i
-data/make/tools/CharsetMapping/IBM863.map.i
+data/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java.i
 data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java.i
 data/test/com/sun/crypto/provider/Cipher/CTS/CTSMode.java.i
 data/src/share/classes/sun/misc/CEFormatException.java.i
-data/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh.i
+data/test/sun/security/util/DerOutputStream/LocaleInTime.java.i
 data/test/java/awt/Focus/CloseDialogActivateOwnerTest/java.policy.i
 data/src/windows/native/sun/java2d/windows/WinBackBufferSurfaceData.cpp.i
 data/test/sun/security/pkcs11/KeyStore/ClientAuthData/secmod.db.i
 data/src/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIBOidTable.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextMeasureTests.java.i
+data/test/javax/management/relation/RelationNotificationSourceTest.java.i
 data/src/windows/native/sun/net/spi/DefaultProxySelector.c.i
 data/test/java/io/File/SetAccess.java.i
 data/make/tools/src/build/tools/makeclasslist/MakeClasslist.java.i
 data/src/solaris/classes/sun/awt/motif/MEmbedCanvasPeer.java.i
 data/src/share/classes/sun/security/krb5/internal/KRBPriv.java.i
 data/src/share/classes/java/awt/MenuComponent.java.i
-data/src/share/classes/java/awt/doc-files/GridBagLayout-baseline.png.i
+data/src/share/classes/sun/java2d/Disposer.java.i
 data/src/share/classes/java/util/FormatterClosedException.java.i
 data/test/javax/management/monitor/CounterMonitorThresholdTest.java.i
 data/src/share/classes/sun/security/util/BitArray.java.i
 data/make/tools/src/build/tools/jdwpgen/ByteTypeNode.java.i
-data/src/share/classes/sun/tools/asm/NumberConstantData.java.i
+data/test/sun/tools/jps/usage.out.i
 data/src/share/classes/sun/awt/PaintEventDispatcher.java.i
 data/src/linux/doc/man/jhat.1.i
 data/src/share/native/java/util/zip/zlib-1.1.3/minigzip.c.i
-data/src/share/classes/sun/security/krb5/internal/LastReq.java.i
+data/src/share/classes/javax/swing/event/RowSorterListener.java.i
 data/src/share/classes/javax/print/attribute/standard/DocumentName.java.i
 data/src/share/classes/java/io/CharConversionException.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmscam02.c.i
+data/src/solaris/native/sun/awt/list.c.i
 data/src/share/classes/javax/swing/plaf/metal/MetalTreeUI.java.i
 data/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java.i
 data/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor.i
-data/test/java/math/BigDecimal/CompareToTests.java.i
+data/src/share/classes/sun/awt/event/IgnorePaintEvent.java.i
 data/test/java/lang/annotation/Missing/D.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java.i
 data/make/javax/sound/Makefile.i
@@ -12006,100 +11954,94 @@ data/src/solaris/classes/sun/java2d/x11/X11SurfaceDataProxy.java.i
 data/src/share/classes/sun/text/resources/FormatData_lv.java.i
 data/src/share/classes/sun/tools/tree/NullExpression.java.i
 data/src/share/native/sun/font/layout/OpenTypeTables.h.i
-data/test/java/util/ResourceBundle/Control/Bug6530694.java.i
+data/src/share/lib/images/cursors/invalid32x32.gif.i
 data/src/share/classes/sun/io/ByteToCharCp943.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/DetailsView.gif.i
-data/test/java/rmi/transport/checkLeaseInfoLeak/security.policy.i
+data/test/java/io/LineNumberReader/MarkReset.java.i
+data/src/share/classes/sun/security/krb5/KrbCryptoException.java.i
 data/test/javax/security/auth/login/Configuration/GetInstanceSecurity.java.i
-data/src/share/classes/com/sun/servicetag/package.html.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java.i
 data/test/java/io/RandomAccessFile/WriteBytesChars.java.i
-data/src/share/classes/com/sun/jndi/ldap/PersistentSearchControl.java.i
+data/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java.i
 data/src/share/classes/javax/net/ssl/X509ExtendedKeyManager.java.i
 data/src/share/classes/javax/crypto/ExemptionMechanismException.java.i
 data/test/javax/xml/crypto/dsig/GenerationTests.java.i
 data/test/com/sun/jdi/ReferrersTest.java.i
-data/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java.i
-data/test/sun/rmi/rmic/newrmic/equivalence/run.sh.i
-data/src/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java.i
+data/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java.i
 data/src/share/classes/javax/print/PrintException.java.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageConvClearEdge.c.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java.i
+data/src/share/classes/sun/text/resources/FormatData_sk_SK.java.i
 data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java.i
-data/src/solaris/native/sun/nio/ch/FileKey.c.i
 data/src/share/classes/sun/util/resources/LocaleNames_zh.properties.i
 data/src/share/classes/javax/swing/JScrollPane.java.i
 data/src/share/classes/java/lang/module/RequireOptionalModule.java.i
-data/test/java/rmi/activation/Activatable/shutdownGracefully/TestSecurityManager.java.i
-data/test/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java.i
-data/test/sun/tools/jrunscript/hello.js.i
+data/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java.i
+data/test/com/sun/servicetag/InvalidServiceTag.java.i
 data/test/javax/crypto/Cipher/TestGetInstance.java.i
+data/src/share/classes/javax/net/ssl/SSLEngine.java.i
 data/test/java/beans/PropertyChangeSupport/TestListeners.java.i
-data/test/java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java.i
+data/test/java/io/Serializable/class/SerialA_2.java.i
 data/test/sun/net/www/protocol/ftp/UserAndPasswordTest.java.i
 data/test/javax/sound/midi/Gervill/SoftTuning/Load2.java.i
 data/test/sun/java2d/cmm/ColorConvertOp/ColConvTest.java.i
 data/src/share/classes/sun/security/provider/certpath/State.java.i
 data/make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java.i
 data/src/share/classes/javax/swing/package.html.i
-data/src/share/classes/sun/nio/cs/ext/EUC_KR.java.i
+data/src/share/classes/javax/swing/colorchooser/ColorSelectionModel.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties.i
-data/src/share/classes/sun/java2d/pisces/Stroker.java.i
-data/src/share/classes/javax/management/MBeanOperationInfo.java.i
+data/test/java/util/PluggableLocale/providersrc/LocaleNames_xx.properties.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java.i
-data/test/java/lang/instrument/MakeJAR3.sh.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.access.in.i
 data/src/share/classes/javax/net/ssl/SSLProtocolException.java.i
-data/src/share/classes/sun/security/x509/DNSName.java.i
+data/test/java/security/CodeSigner/Serialize.java.i
 data/src/share/classes/com/sun/beans/decoder/ValueObject.java.i
+data/test/tools/jar/JarEntryTime.java.i
 data/test/java/util/concurrent/Phaser/TieredArriveLoops.java.i
 data/src/share/classes/com/sun/jdi/request/ClassPrepareRequest.java.i
 data/test/sun/rmi/rmic/newrmic/equivalence/NotActivatableInterface.java.i
 data/test/sun/tools/jps/jps-q.sh.i
 data/src/share/native/java/util/zip/zlib-1.1.3/example.c.i
-data/test/java/lang/management/ThreadMXBean/AllThreadIds.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315WithComments.java.i
 data/test/javax/management/modelmbean/UnserializableTargetObjectTest.java.i
-data/src/solaris/classes/sun/awt/X11CustomCursor.java.i
 data/test/javax/management/context/LocaleAwareBroadcasterTest.java.i
 data/src/share/classes/sun/misc/ServiceConfigurationError.java.i
-data/test/javax/print/attribute/GetCopiesSupported.java.i
-data/src/share/classes/javax/management/namespace/MBeanServerConnectionWrapper.java.i
+data/src/windows/classes/sun/awt/windows/ThemeReader.java.i
 data/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java.i
 data/test/java/io/FilePermission/SpecTests.java.i
-data/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java.i
+data/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java.i
 data/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java.i
-data/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java.i
+data/src/share/classes/javax/swing/border/LineBorder.java.i
 data/src/share/classes/java/lang/invoke/FilterOneArgument.java.i
 data/test/com/sun/jdi/BadHandshakeTest.java.i
 data/test/java/nio/channels/etc/Shadow.java.i
 data/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java.i
 data/src/share/classes/sun/awt/Mutex.java.i
+data/src/share/native/sun/font/layout/AlternateSubstSubtables.h.i
 data/src/windows/classes/sun/print/Win32PrintServiceLookup.java.i
-data/src/share/native/sun/font/layout/LookupTables.h.i
+data/src/share/classes/sun/text/resources/CollationData_pl.java.i
 data/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c.i
-data/test/java/util/regex/POSIX_Unicode.java.i
+data/test/java/io/Serializable/skippedObjCNFException/Write.java.i
 data/test/javax/management/query/QueryDottedAttrTest.java.i
-data/src/share/native/sun/awt/image/jpeg/jchuff.c.i
+data/src/share/classes/java/net/Inet4AddressImpl.java.i
 data/test/com/sun/jdi/NewInstanceTest.java.i
 data/test/java/beans/PropertyEditor/TestColorClassNull.java.i
 data/make/tools/CharsetMapping/IBM939.nr.i
 data/test/java/text/Format/DateFormat/Bug4823811.java.i
 data/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1.xml.i
-data/src/share/classes/sun/java2d/pipe/AAShapePipe.java.i
+data/make/common/Defs-solaris.gmk.i
 data/src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java.i
 data/src/share/native/sun/awt/libpng/pngpread.c.i
-data/src/share/native/sun/awt/image/BufImgSurfaceData.h.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xenc-schema.rng.i
-data/src/share/classes/sun/management/resources/agent_zh_CN.properties.i
+data/src/share/classes/java/net/URISyntaxException.java.i
 data/test/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java.i
 data/src/share/classes/sun/security/jgss/krb5/Krb5NameElement.java.i
 data/make/common/shared/PrivateDefs.gmk-example.i
 data/src/share/classes/javax/print/attribute/standard/PrinterMessageFromOperator.java.i
 data/src/share/classes/sun/security/ssl/DHCrypt.java.i
 data/src/share/classes/java/nio/file/package-info.java.i
-data/test/javax/management/Introspector/SetWrongTypeAttributeTest.java.i
-data/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java.i
+data/src/share/classes/sun/management/resources/agent_zh_CN.properties.i
 data/src/share/back/debugDispatch.h.i
-data/test/sun/security/action/Generify.java.i
 data/src/share/native/sun/font/layout/LESwaps.h.i
 data/src/share/classes/java/dyn/MethodHandleStatics.java.i
 data/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java.i
@@ -12111,7 +12053,7 @@ data/src/share/classes/sun/security/provider/DigestBase.java.i
 data/src/solaris/native/sun/awt/awt_TextArea.h.i
 data/src/share/classes/java/awt/im/spi/InputMethodDescriptor.java.i
 data/src/share/classes/sun/security/krb5/KrbKdcRep.java.i
-data/src/share/classes/sun/rmi/transport/Channel.java.i
+data/src/share/classes/sun/security/ssl/HelloExtensions.java.i
 data/src/share/classes/java/nio/file/DirectoryStreamFilters.java.i
 data/test/javax/management/proxy/ProxyObjectMethodsTest.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments.java.i
@@ -12128,28 +12070,26 @@ data/src/share/classes/com/sun/jdi/StringReference.java.i
 data/make/sun/xawt/ToBin.java.i
 data/test/java/net/URL/ftp_urls.i
 data/test/java/io/Serializable/wrongReturnTypes/Read.java.i
-data/test/com/sun/jdi/AllLineLocations.java.i
+data/src/share/classes/sun/security/x509/RDN.java.i
 data/test/java/rmi/server/serverStackTrace/Impl2_Stub.java.i
-data/test/javax/swing/JSpinner/6463712/bug6463712.java.i
+data/make/tools/CharsetMapping/IBM420.nr.i
 data/src/share/classes/sun/swing/UIClientPropertyKey.java.i
 data/test/javax/swing/JFileChooser/6550546/bug6550546.java.i
 data/src/share/classes/sun/net/InetAddressCachePolicy.java.i
-data/test/sun/nio/cs/OLD/IBM950_OLD.java.i
+data/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java.i
 data/src/share/classes/java/awt/image/ComponentColorModel.java.i
 data/test/sun/security/ssl/javax/net/ssl/SSLContextVersion.java.i
-data/test/javax/rmi/ssl/SSLSocketParametersTest.sh.i
+data/src/share/classes/javax/sound/sampled/AudioInputStream.java.i
 data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/file-targets.xml.i
 data/src/share/classes/sun/net/ProgressEvent.java.i
 data/test/sun/tools/jps/jps-Vvm_Output1.awk.i
 data/src/share/classes/sun/util/resources/TimeZoneNames_en.java.i
 data/src/windows/classes/sun/awt/windows/awtLocalization.properties.i
 data/src/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptorSupport.java.i
-data/src/share/demo/jfc/Notepad/resources/Notepad.properties.i
-data/src/solaris/doc/sun/man/man1/ja/rmiregistry.1.i
+data/src/share/classes/sun/io/CharToByteTIS620.java.i
 data/src/share/classes/javax/swing/plaf/DesktopIconUI.java.i
 data/src/linux/doc/man/pack200.1.i
 data/src/share/classes/com/sun/jmx/interceptor/NamespaceDispatchInterceptor.java.i
-data/test/java/util/ResourceBundle/Control/PackagePrivateTest.java.i
 data/src/solaris/classes/sun/print/UnixPrintServiceLookup.java.i
 data/test/java/util/EnumSet/LargeEnumIteratorRemoveResilience.java.i
 data/test/javax/swing/SwingWorker/6480289/bug6480289.java.i
@@ -12162,16 +12102,15 @@ data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16S32Func.c.i
 data/src/share/classes/javax/swing/colorchooser/ColorPanel.java.i
 data/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter.java.i
 data/src/share/classes/com/sun/jmx/defaults/JmxProperties.java.i
-data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.config.i
 data/test/sun/java2d/cmm/ColorConvertOp/ColorConvertTest.java.i
 data/src/share/classes/java/util/concurrent/atomic/AtomicBoolean.java.i
 data/src/share/classes/sun/tools/asm/FieldConstantData.java.i
-data/make/tools/CharsetMapping/IBM937.c2b.i
+data/src/windows/native/sun/jkernel/graphics/cautionshield32.bmp.i
 data/src/share/native/sun/java2d/loops/Index12Gray.h.i
-data/src/share/classes/sun/security/tools/CertAndKeyGen.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaClass.java.i
 data/make/modules/tools/src/com/sun/classanalyzer/ConstantPoolAnalyzer.java.i
 data/test/java/io/charStreams/ABCInputStream.java.i
+data/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher.i
 data/src/share/classes/sun/font/Underline.java.i
 data/src/share/demo/management/FullThreadDump/README.txt.i
 data/test/java/rmi/transport/readTimeout/TestIface.java.i
@@ -12179,9 +12118,7 @@ data/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java.i
 data/test/sun/security/provider/KeyStore/pw.jks.i
 data/src/share/classes/sun/text/resources/FormatData_ja.java.i
 data/test/java/nio/file/Files/walkFileTree/grantTopOnly.policy.i
-data/src/share/classes/sun/security/krb5/internal/crypto/Aes256.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/internal/Classes.java.i
-data/test/javax/management/modelmbean/LoggingExceptionTest.java.i
+data/src/share/classes/sun/reflect/misc/ReflectUtil.java.i
 data/test/java/util/concurrent/forkjoin/NQueensCS.java.i
 data/test/java/util/jar/JarFile/JarNoManifest.java.i
 data/test/java/awt/FontClass/CreateFont/DeleteFont.java.i
@@ -12189,35 +12126,32 @@ data/make/mkdemo/management/JTop/Makefile.i
 data/src/share/native/sun/security/ec/impl/ec2_163.c.i
 data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libplc4.so.i
 data/src/share/classes/sun/misc/Version.java.template.i
-data/test/sun/rmi/rmic/newrmic/equivalence/CountServerImpl.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy22.i
 data/test/sun/rmi/rmic/classFileVersion/G1.java.i
 data/src/solaris/native/sun/awt/awt_AWTEvent.h.i
 data/test/com/sun/jdi/DeleteEventRequestsTest.java.i
 data/src/share/demo/nbproject/management/JTop/nbproject/jdk.xml.i
-data/src/windows/native/sun/windows/awt_InputEvent.h.i
+data/src/share/classes/sun/management/MemoryImpl.java.i
 data/make/com/Makefile.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ProtocolVersion/HttpsProtocols.java.i
+data/make/modules/tools/src/com/sun/classanalyzer/ClassAnalyzer.java.i
+data/src/share/classes/javax/swing/text/html/BRView.java.i
 data/src/share/native/sun/font/layout/LEInsertionList.h.i
 data/src/share/classes/java/lang/Short.java.i
 data/src/share/classes/javax/swing/text/html/HTMLWriter.java.i
 data/test/com/sun/tools/attach/ProviderTest.java.i
-data/test/sun/nio/cs/CheckICNE.java.i
 data/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java.i
 data/src/windows/transport/shmem/shmem_md.c.i
-data/src/share/classes/sun/util/resources/LocaleNames_sq.properties.i
+data/src/share/back/classTrack.c.i
 data/src/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/pk3.key.i
 data/src/share/classes/sun/nio/cs/ext/IBM273.java.i
 data/src/share/classes/java/dyn/MemberName.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties.i
 data/src/share/classes/javax/swing/text/MutableAttributeSet.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_sr.properties.i
-data/src/share/classes/sun/nio/ch/OptionKey.java.i
 data/src/solaris/native/sun/awt/awt_mgrsel.h.i
-data/src/solaris/classes/sun/awt/motif/X11GB2312.java.i
 data/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevelRevoked.java.i
 data/test/javax/management/MBeanInfo/NotificationInfoTest.java.i
-data/test/java/io/IOException/LastErrorString.java.i
+data/src/share/classes/java/security/cert/CollectionCertStoreParameters.java.i
 data/test/javax/sound/midi/Gervill/SimpleInstrument/Clear.java.i
 data/test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java.i
 data/test/com/sun/jdi/OptionTest.java.i
@@ -12226,7 +12160,6 @@ data/src/share/classes/sun/security/provider/PolicyFile.java.i
 data/make/java/fdlibm/Makefile.i
 data/test/java/net/URL/URIToURLTest.java.i
 data/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java.i
-data/test/tools/launcher/DefaultLocaleTest.sh.i
 data/test/tools/pack200/pack200-verifier/src/xmlkit/CommandLineParser.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java.i
 data/src/share/classes/sun/nio/cs/IBM857.java.i
@@ -12240,12 +12173,11 @@ data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibRequest.java.i
 data/src/share/native/sun/security/ec/ecl_mult.c.i
 data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_OmitComments.java.i
-data/test/java/util/prefs/ExportSubtree.java.i
+data/src/share/back/threadControl.c.i
 data/test/com/sun/security/auth/login/ConfigFile/InconsistentError.java.i
 data/make/sun/javazic/javatz/java_zone_ids.txt.i
-data/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java.i
 data/src/share/classes/com/sun/tools/jdi/MethodImpl.java.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/InstrumentedApplication.java.i
+data/src/share/classes/sun/text/resources/FormatData_pl.java.i
 data/src/share/classes/java/util/regex/ASCII.java.i
 data/src/share/classes/java/beans/beancontext/BeanContextChild.java.i
 data/test/sun/nio/cs/EUC_TW_OLD.java.d
@@ -12256,6 +12188,7 @@ data/src/share/classes/sun/io/CharToByteCp1149.java.i
 data/src/share/native/sun/awt/image/jpeg/jutils.c.i
 data/src/share/classes/sun/tools/jconsole/PlotterPanel.java.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedStaticDoubleFieldAccessorImpl.java.i
+data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java.i
 data/src/solaris/doc/sun/man/man1/ja/jstat.1.i
 data/test/javax/script/Test2.java.i
 data/src/share/classes/javax/security/auth/kerberos/KerberosKey.java.i
@@ -12264,6 +12197,7 @@ data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Directory.gif.i
 data/test/java/lang/instrument/appendToClassLoaderSearch/BootSupport.java.i
 data/src/share/classes/sun/security/x509/OIDMap.java.i
 data/test/java/io/Unicode.java.i
+data/src/share/classes/javax/sql/RowSetMetaData.java.i
 data/test/java/util/concurrent/ConcurrentHashMap/LoopHelpers.java.i
 data/test/javax/sound/midi/Gervill/SoftChannel/ProgramChange.java.i
 data/test/java/beans/XMLDecoder/spec/TestField.java.i
@@ -12271,7 +12205,7 @@ data/test/java/lang/Double/BitwiseConversion.java.i
 data/test/sun/security/krb5/auto/NonMutualSpnego.java.i
 data/src/solaris/doc/sun/man/man1/ja/wsgen.1.i
 data/src/share/classes/javax/swing/text/html/InlineView.java.i
-data/test/org/openjdk/jigsaw/cli/jmod-basic.sh.i
+data/test/java/io/BufferedInputStream/ReadAfterClose.java.i
 data/test/java/beans/Introspector/4520754/WombatBeanInfo.java.i
 data/src/solaris/classes/sun/awt/X11/XDragSourceProtocolListener.java.i
 data/src/share/classes/org/openjdk/jigsaw/JigsawModuleSystem.java.i
@@ -12280,9 +12214,9 @@ data/test/java/awt/Mixing/LWPopupMenu.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvIndex3_8_16nw.c.i
 data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties.i
 data/test/javax/swing/JColorChooser/Test4759934.html.i
+data/src/share/native/sun/font/layout/ClassDefinitionTables.cpp.i
 data/src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java.i
 data/test/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.java.i
-data/src/share/classes/javax/print/attribute/standard/Fidelity.java.i
 data/src/solaris/native/java/io/Console_md.c.i
 data/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh.i
 data/test/java/util/Collections/ReverseOrder2.java.i
@@ -12293,15 +12227,14 @@ data/src/share/classes/sun/font/FontStrike.java.i
 data/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java.i
 data/test/sun/management/jmxremote/bootstrap/jmxremote_test04_ok.password.in.i
 data/src/linux/doc/man/ja/keytool.1.i
-data/test/sun/security/smartcardio/TestMultiplePresent.java.i
-data/test/java/net/Socket/TrafficClass.java.i
 data/src/share/classes/java/util/FormatFlagsConversionMismatchException.java.i
 data/src/share/classes/java/nio/file/attribute/FileStoreAttributeView.java.i
-data/test/sun/security/pkcs11/Provider/ConfigQuotedString.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractMonitoredVm.java.i
 data/src/share/classes/javax/smartcardio/Card.java.i
 data/src/share/classes/sun/nio/cs/ext/MacGreek.java.i
+data/src/share/classes/javax/swing/DesktopManager.java.i
 data/src/share/classes/sun/net/spi/nameservice/NameServiceDescriptor.java.i
+data/test/java/awt/Mixing/Validating.java.i
 data/src/windows/native/sun/windows/awt_Dimension.h.i
 data/test/java/math/BigDecimal/FloatDoubleValueTests.java.i
 data/test/java/nio/file/Files/walkFileTree/PrintFileTree.java.i
@@ -12312,10 +12245,10 @@ data/src/share/back/classTrack.h.i
 data/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/internal/Strings.java.i
 data/test/java/security/Provider/DefaultPKCS11.java.i
-data/src/share/classes/javax/swing/plaf/multi/MultiProgressBarUI.java.i
+data/src/share/classes/com/sun/net/httpserver/Filter.java.i
 data/src/share/npt/utf.c.i
 data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmRTBootClassPathSupport.java.i
-data/src/share/classes/javax/sql/rowset/spi/SyncResolver.java.i
+data/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObjectVisitor.java.i
 data/test/java/awt/print/PageFormat/PageFormatFromAttributes.java.i
 data/src/share/classes/sun/tools/javac/SourceMember.java.i
 data/src/share/classes/java/awt/doc-files/FocusSpec.html.i
@@ -12323,7 +12256,7 @@ data/make/tools/src/build/tools/jdwpgen/LongTypeNode.java.i
 data/src/share/classes/javax/management/namespace/MBeanServerSupport.java.i
 data/test/java/util/ResourceBundle/Test4314141B_fr.properties.i
 data/src/share/native/sun/java2d/loops/IntRgbx.c.i
-data/test/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java.i
+data/src/share/classes/java/nio/charset/StandardCharset.java.i
 data/src/windows/native/sun/windows/ComCtl32Util.h.i
 data/test/java/util/HashMap/KeySetRemove.java.i
 data/src/windows/native/sun/jkernel/kernel_fr.rc.i
@@ -12332,9 +12265,9 @@ data/src/share/classes/com/sun/jdi/event/LocatableEvent.java.i
 data/test/javax/swing/JFileChooser/6798062/bug6798062.java.i
 data/src/share/classes/org/openjdk/jigsaw/FileConstants.java.i
 data/test/java/rmi/activation/Activatable/checkActivateRef/group.security.policy.i
-data/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java.i
-data/test/java/nio/file/Files/BytesAndLines.java.i
-data/test/java/awt/image/BufferedImage/TinyScale.java.i
+data/src/windows/native/sun/windows/awt_Multimon.h.i
+data/test/java/rmi/reliability/benchmark/bench/serial/SmallObjTrees.java.i
+data/test/sun/rmi/transport/tcp/blockAccept/TestIface.java.i
 data/test/javax/management/eventService/NotSerializableNotifTest.java.i
 data/test/java/net/URLConnection/contentHandler/COM/foo/content/text/plain.java.i
 data/src/share/classes/java/awt/RadialGradientPaint.java.i
@@ -12349,47 +12282,44 @@ data/test/java/awt/Focus/RequestOnCompWithNullParent/RequestOnCompWithNullParent
 data/src/share/classes/com/sun/servicetag/resources/javase_6_swordfish.properties.i
 data/src/share/classes/java/lang/NoSuchMethodException.java.i
 data/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_BO.properties.i
 data/src/share/classes/javax/swing/text/LayeredHighlighter.java.i
 data/test/javax/management/MBeanInfo/SerializedMBeanInfo.java.i
 data/test/java/beans/XMLEncoder/Test4993777.java.i
 data/src/windows/native/sun/nio/ch/nio_util.h.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java.i
-data/test/sun/tools/jstat/jstatGcOldOutput1.sh.i
 data/src/share/classes/org/openjdk/internal/joptsimple/IllegalOptionClusterException.java.i
 data/src/share/classes/java/io/DataOutput.java.i
 data/src/share/classes/java/util/concurrent/LinkedTransferQueue.java.i
-data/src/share/classes/java/beans/AppletInitializer.java.i
+data/src/solaris/doc/sun/man/man1/jstack.1.i
 data/src/share/instrument/FileSystemSupport.h.i
-data/test/java/nio/channels/TestThread.java.i
+data/test/com/sun/jdi/AllLineLocations.java.i
+data/src/share/classes/java/nio/channels/DatagramChannel.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMeta.java.i
 data/test/sun/net/idn/TestData.java.i
 data/src/share/classes/java/nio/file/attribute/AclEntryPermission.java.i
 data/src/share/classes/javax/swing/RowSorter.java.i
 data/test/java/awt/print/PrinterJob/ImagePrinting/PrintARGBImage.java.i
-data/test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableStreamCipher.java.i
-data/test/sun/net/www/protocol/jar/B5105410.sh.i
+data/test/javax/swing/JSpinner/6463712/bug6463712.java.i
 data/test/com/sun/servicetag/servicetag5.properties.i
 data/src/share/classes/sun/reflect/generics/tree/ClassSignature.java.i
 data/test/java/io/BufferedReader/MarkedFillAtEOF.java.i
+data/test/sun/rmi/rmic/manifestClassPath/Util.sh.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties.i
 data/src/share/classes/java/nio/package.html.i
+data/make/sun/awt/FILES_c_windows.gmk.i
 data/src/linux/doc/man/ja/klist.1.i
-data/src/share/classes/java/awt/event/TextEvent.java.i
 data/src/share/classes/org/openjdk/jigsaw/Configuration.java.i
 data/src/share/classes/sun/security/krb5/internal/rcache/ReplayCache.java.i
-data/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java.i
+data/test/java/rmi/transport/readTimeout/security.policy.i
 data/test/sun/tools/jstat/gcPermCapacityOutput1.awk.i
-data/src/solaris/classes/java/lang/ProcessEnvironment.java.i
-data/src/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties.i
 data/test/java/awt/regtesthelpers/Util.java.i
 data/test/sun/util/resources/TimeZone/Bug4848242.java.i
 data/test/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/services/no.name.service.i
 data/src/share/classes/com/sun/jmx/snmp/internal/SnmpSubSystem.java.i
 data/src/windows/native/sun/windows/WBufferStrategy.cpp.i
-data/test/sun/tools/jconsole/ImmutableResourceTest.sh.i
 data/test/tools/launcher/MultipleJRE.sh.i
 data/src/share/classes/javax/xml/crypto/dsig/Manifest.java.i
-data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Globals.java.i
 data/src/share/classes/com/sun/net/httpserver/HttpHandler.java.i
 data/test/java/awt/FontClass/LCDScale.java.i
 data/src/share/classes/sun/security/x509/CRLExtensions.java.i
@@ -12398,9 +12328,10 @@ data/src/share/classes/java/awt/datatransfer/FlavorTable.java.i
 data/src/share/native/sun/java2d/loops/Index8Gray.h.i
 data/src/share/classes/javax/accessibility/AccessibleStateSet.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ReuseAddr.java.i
-data/src/solaris/classes/sun/awt/X11/XRootWindow.java.i
+data/src/share/classes/javax/swing/AbstractSpinnerModel.java.i
 data/src/share/classes/javax/net/ssl/SSLServerSocket.java.i
-data/src/share/classes/javax/management/openmbean/InvalidKeyException.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U16Func.c.i
+data/src/share/classes/sun/text/resources/FormatData_sr_CS.java.i
 data/src/solaris/hpi/native_threads/include/threads_md.h.i
 data/make/tools/src/build/tools/jdwpgen/ReferenceTypeNode.java.i
 data/test/sun/net/www/protocol/http/BasicLongCredentials.java.i
@@ -12408,9 +12339,9 @@ data/test/java/io/Serializable/resolveClass/deserializeButton/Foo.java.i
 data/test/javax/sql/rowset/serial/SerialBlob/SetBinaryStream.java.i
 data/test/javax/management/openmbean/NullConstructorParamsTest.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java.i
+data/src/share/classes/javax/smartcardio/CommandAPDU.java.i
 data/src/windows/native/sun/java2d/d3d/D3DBlitLoops.h.i
-data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java.i
-data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java.i
 data/src/share/back/MethodImpl.h.i
 data/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java.i
 data/src/solaris/classes/sun/awt/X11/XMenuItemPeer.java.i
@@ -12421,9 +12352,9 @@ data/make/common/internal/BinaryPlugs.gmk.i
 data/src/share/classes/java/io/SerializablePermission.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerTableMeta.java.i
 data/src/share/classes/sun/io/ByteToCharMacThai.java.i
-data/test/java/util/concurrent/ScheduledThreadPoolExecutor/Stress.java.i
+data/src/share/classes/java/lang/IndexOutOfBoundsException.java.i
 data/src/share/classes/com/sun/tools/jdi/MirrorImpl.java.i
-data/test/sun/security/provider/PolicyParser/PrincipalExpansionErrorAction.java.i
+data/src/windows/classes/sun/awt/windows/WMenuPeer.java.i
 data/test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableBlockCipher.java.i
 data/test/javax/management/namespace/namespace.policy.i
 data/make/sun/javazic/tzdata/solar87.i
@@ -12433,23 +12364,21 @@ data/test/sun/rmi/rmic/covariantReturns/run.sh.i
 data/src/share/classes/sun/security/provider/SHA5.java.i
 data/src/share/classes/sun/text/normalizer/SymbolTable.java.i
 data/test/sun/management/jmxremote/bootstrap/ssl/keystore.i
-data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so.d
-data/test/java/nio/charset/StandardCharsets/Standard.java.i
 data/test/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java.i
 data/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java.i
 data/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java.i
 data/src/share/native/java/util/TimeZone.c.i
-data/src/share/classes/com/sun/beans/decoder/FalseElementHandler.java.i
-data/src/share/classes/java/util/UUID.java.i
+data/make/tools/src/build/tools/charsetmapping/GenerateMapping.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthParser.java.i
+data/test/sun/tools/jstat/jstatGcOldOutput1.sh.i
 data/src/share/classes/javax/management/relation/RelationTypeSupport.java.i
 data/src/share/classes/java/net/ContentHandler.java.i
 data/test/java/awt/FontClass/SurrogateTest/SupplementaryCanDisplayUpToTest.java.i
-data/src/share/classes/java/security/DigestOutputStream.java.i
-data/test/javax/sound/midi/File/SMPTESequence.java.i
-data/src/solaris/sample/dtrace/hotspot_jni/README.txt.i
+data/src/solaris/doc/sun/man/man1/ja/rmiregistry.1.i
+data/test/javax/print/applet/applet0/Applet0.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NonAutoClose.java.i
 data/test/java/io/LineNumberReader/Skip.java.i
 data/src/share/classes/sun/util/resources/TimeZoneNames_sv.java.i
-data/src/share/classes/sun/security/x509/X509CRLEntryImpl.java.i
 data/test/sun/misc/Safe.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathFuncHereAPI.java.i
 data/test/java/security/KeyStore/EntryMethods.pre15.keystore.i
@@ -12463,32 +12392,31 @@ data/src/share/classes/sun/nio/cs/UTF_32LE_BOM.java.i
 data/src/solaris/native/sun/awt/jawt.c.i
 data/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java.i
 data/src/share/classes/sun/util/resources/CalendarData_en_MT.properties.i
+data/src/share/native/sun/java2d/loops/IntRgb.c.i
 data/src/share/classes/com/sun/jmx/snmp/internal/SnmpTools.java.i
 data/src/share/demo/nbproject/management/VerboseGC/nbproject/jdk.xml.i
-data/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_tr_TR.properties.i
-data/src/share/classes/sun/print/CustomMediaSizeName.java.i
+data/src/share/classes/javax/print/attribute/DocAttributeSet.java.i
+data/src/share/classes/sun/tools/asm/LocalVariableTable.java.i
 data/test/java/lang/instrument/NativeMethodPrefixAgent.java.i
 data/src/share/classes/sun/font/BidiUtils.java.i
-data/src/share/classes/java/rmi/registry/RegistryHandler.java.i
 data/src/share/classes/com/sun/media/sound/WaveFileFormat.java.i
 data/test/com/sun/crypto/provider/Cipher/AES/Test4517355.java.i
 data/test/java/lang/instrument/RedefineClassesDisabledTest.java.i
-data/src/share/classes/com/sun/beans/decoder/ValueObjectImpl.java.i
+data/src/share/classes/sun/nio/cs/ext/ISO2022_JP_2.java.i
+data/src/share/classes/sun/security/krb5/internal/SeqNumber.java.i
 data/src/share/sample/vm/clr-jvm/jinvoker.cpp.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ServerTimeout.java.i
 data/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PublicCtor.java.i
-data/src/share/classes/sun/security/tools/PolicyTool.java.i
 data/test/java/beans/XMLEncoder/Test4994637.java.i
 data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS5022X_Decoder.java.i
-data/src/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java.i
 data/src/share/classes/sun/font/Script.java.i
-data/src/windows/classes/sun/java2d/d3d/D3DTextRenderer.java.i
-data/src/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java.i
+data/test/javax/management/modelmbean/ExoticTargetTypeTest.java.i
 data/src/share/classes/javax/imageio/metadata/IIOMetadataFormat.java.i
-data/test/java/math/BigDecimal/PowTests.java.i
+data/make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java.i
+data/test/java/awt/im/InputContext/bug4625203.java.i
 data/test/sun/security/provider/PolicyFile/TokenStore.java.i
 data/test/sun/tools/jrunscript/jrunscript-eTest.sh.i
+data/test/sun/security/ssl/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java.i
 data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java.i
 data/src/share/classes/sun/jkernel/KernelError.java.i
 data/make/java/net/mapfile-vers.i
@@ -12498,12 +12426,13 @@ data/src/share/classes/java/text/BreakDictionary.java.i
 data/src/solaris/native/java/lang/ProcessEnvironment_md.c.i
 data/test/java/awt/MenuBar/MenuBarSetFont/MenuBarSetFont.java.i
 data/test/com/sun/servicetag/missing-environ-field.xml.i
-data/test/sun/tools/jstatd/usage.out.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java.i
+data/test/sun/security/jgss/spnego/NegTokenTargFields.java.i
 data/src/share/classes/javax/swing/text/html/parser/Entity.java.i
-data/src/share/native/java/lang/fdlibm/src/s_logb.c.i
+data/src/share/classes/sun/text/resources/FormatData_ms.java.i
+data/test/sun/tools/jrunscript/Hello.java.i
 data/src/share/classes/javax/sql/RowSetReader.java.i
-data/make/tools/CharsetMapping/IBM870.c2b.i
-data/src/share/classes/sun/util/resources/LocaleNames_hr.properties.i
+data/src/share/classes/sun/security/tools/KeyTool.java.i
 data/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_mk_MK.properties.i
 data/test/javax/management/remote/mandatory/notif/NotificationSender.java.i
@@ -12513,10 +12442,11 @@ data/test/java/nio/channels/Pipe/ScatteringRead.java.i
 data/test/java/util/zip/ZipFile/ReadLongZipFileName.java.i
 data/src/share/classes/javax/swing/event/CellEditorListener.java.i
 data/test/javax/sound/midi/Gervill/SoftChannel/SoftTestUtils.java.i
-data/src/share/classes/javax/management/BinaryOpValueExp.java.i
+data/src/share/classes/sun/io/CharToByteCp273.java.i
 data/src/share/classes/java/awt/image/DataBufferDouble.java.i
-data/src/solaris/native/sun/font/X11FontScaler.c.i
+data/test/sun/net/www/MarkResetTest.java.i
 data/src/windows/javavm/export/jvm_md.h.i
+data/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java.i
 data/src/windows/native/sun/jkernel/version.rc.i
 data/src/share/classes/sun/security/timestamp/TSResponse.java.i
 data/src/share/classes/com/sun/jndi/url/ldap/ldapURLContextFactory.java.i
@@ -12525,24 +12455,24 @@ data/src/share/classes/sun/management/jmxremote/package.html.i
 data/src/share/classes/java/beans/Encoder.java.i
 data/src/share/classes/java/nio/file/attribute/AclEntryFlag.java.i
 data/src/share/classes/sun/nio/fs/Globs.java.i
-data/src/share/classes/sun/text/resources/FormatData_ru.java.i
 data/src/share/classes/java/awt/peer/CheckboxPeer.java.i
-data/test/sun/java2d/cmm/ColorConvertOp/GRAY.png.i
+data/src/share/classes/sun/security/ssl/Record.java.i
 data/src/share/classes/sun/text/resources/CollationData_sv.java.i
 data/make/netbeans/common/architectures/name-SunOS.properties.i
 data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipPath.java.i
 data/test/java/lang/annotation/loaderLeak/C.java.i
 data/test/sun/security/pkcs11/nss/p11-deimos.txt.i
 data/src/share/classes/javax/swing/DefaultFocusManager.java.i
-data/src/share/classes/java/util/spi/LocaleNameProvider.java.i
 data/src/share/classes/sun/invoke/util/VerifyType.java.i
 data/src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java.i
+data/test/sun/net/www/protocol/http/ChunkedErrorStream.java.i
+data/test/java/nio/file/Files/PassThroughFileSystem.java.i
 data/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NonAutoClose.java.i
-data/make/tools/src/build/tools/jdwpgen/Context.java.i
+data/make/tools/generate_break_iterator/Makefile.i
+data/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java.i
 data/make/tools/CharsetMapping/IBM871.c2b.i
 data/src/share/classes/javax/swing/JLayer.java.i
-data/make/modules/update_module.sh.i
+data/test/java/lang/StrictMath/HyperbolicTests.java.i
 data/src/windows/native/java/util/TimeZone_md.c.i
 data/src/share/classes/sun/java2d/pipe/GeneralCompositePipe.java.i
 data/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java.i
@@ -12553,49 +12483,50 @@ data/test/sun/net/www/http/HttpClient/RetryPost.java.i
 data/test/sun/security/smartcardio/TestDefault.java.i
 data/test/java/util/Locale/data/deflocale.rhel5.fmtasdefault.i
 data/src/share/native/sun/awt/image/jpeg/jcmaster.c.i
-data/src/share/classes/javax/smartcardio/CardPermission.java.i
-data/src/share/classes/javax/management/MBeanServerDelegate.java.i
-data/test/javax/swing/JColorChooser/Test4380468.html.i
+data/src/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java.i
+data/src/share/classes/sun/nio/cs/ext/MacHebrew.java.i
 data/src/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java.i
 data/src/share/classes/sun/io/ByteToCharCp1255.java.i
 data/src/share/classes/javax/naming/MalformedLinkException.java.i
 data/test/java/net/URL/Equals.java.i
-data/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java.i
+data/test/com/sun/net/httpserver/bugs/B6424196.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html.i
-data/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java.i
 data/test/java/rmi/transport/httpSocket/HttpSocketTest_Stub.java.i
 data/make/tools/reorder/tests/Hello.java.i
-data/src/share/classes/javax/swing/event/MenuKeyListener.java.i
+data/src/share/classes/sun/security/ssl/SSLSessionImpl.java.i
 data/src/share/back/debugInit.h.i
 data/src/share/demo/applets/BarChart/example2.html.i
-data/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java.i
 data/test/java/awt/FullScreen/MultimonFullscreenTest/MultimonFullscreenTest.java.i
 data/test/sun/security/tools/keytool/PrintSSL.java.i
-data/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java.i
+data/make/javax/swing/plaf/FILES.gmk.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/HandshakeOutStream/NullCerts.java.i
 data/src/share/classes/com/sun/imageio/plugins/common/ImageUtil.java.i
 data/src/solaris/hpi/native_threads/src/condvar_md.c.i
-data/test/java/beans/PropertyEditor/TestColorClassValue.java.i
+data/test/java/beans/PropertyEditor/TestByteClassJava.java.i
 data/test/javax/management/openmbean/CompositeDataToMapTest.java.i
 data/src/share/classes/sun/security/ssl/Handshaker.java.i
-data/src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java.i
+data/make/tools/src/build/tools/generatenimbus/UIStyle.java.i
 data/src/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java.i
 data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile.i
-data/src/share/classes/javax/swing/undo/UndoableEdit.java.i
-data/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java.i
+data/src/share/classes/sun/nio/ch/PollSelectorProvider.java.i
+data/src/share/classes/sun/print/PrintJobAttributeException.java.i
 data/src/share/classes/com/sun/media/sound/SoftProvider.java.i
 data/test/sun/security/x509/X500Name/RDNwithMultipleAVAs.java.i
 data/make/sun/jawt/Makefile.i
+data/src/share/classes/javax/print/attribute/Size2DSyntax.java.i
 data/test/com/sun/tracing/BasicFunctionality.java.i
-data/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityCache.java.i
+data/test/java/io/IOException/LastErrorString.java.i
 data/test/sun/tools/jstat/lineCounts1.awk.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.c.i
+data/test/javax/swing/JSlider/6794831/bug6794831.java.i
 data/test/java/nio/channels/Channels/Basic2.java.i
 data/src/share/classes/sun/tools/jstat/JStatLogger.java.i
-data/test/javax/imageio/plugins/png/ItxtUtf8Test.java.i
+data/src/share/classes/sun/net/www/http/HttpCapture.java.i
+data/test/java/math/BigDecimal/RoundingTests.java.i
 data/test/java/nio/channels/Selector/RegAfterPreClose.java.i
 data/test/java/io/Serializable/resolveClass/consTest/Boot.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/Load1.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ServerHandler.java.i
 data/src/share/native/sun/java2d/pipe/SpanIterator.h.i
 data/src/share/classes/sun/util/locale/Extension.java.i
 data/test/java/awt/Focus/WrongKeyTypedConsumedTest/WrongKeyTypedConsumedTest.java.i
@@ -12612,14 +12543,13 @@ data/src/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java.i
 data/test/demo/jvmti/Hello.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_pl_PL.properties.i
-data/test/sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java.i
+data/src/share/classes/java/io/FilterInputStream.java.i
 data/test/sun/security/tools/keytool/selfissued.sh.i
 data/test/com/sun/crypto/provider/TLS/masterdata.txt.i
-data/test/com/sun/jdi/VMDeathRequestTest.java.i
+data/src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java.i
 data/src/share/classes/java/net/ServerSocket.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpUserDataFactory.java.i
+data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java.i
 data/test/java/util/Arrays/Correct.java.i
-data/src/share/native/sun/management/GarbageCollectorImpl.c.i
 data/test/javax/security/auth/login/LoginContext/DefaultHandlerModule.java.i
 data/src/share/classes/javax/swing/JEditorPane.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/IllegalOptionSpecificationException.java.i
@@ -12629,55 +12559,50 @@ data/src/share/classes/sun/tools/asm/NameAndTypeConstantData.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java.i
 data/test/java/util/PluggableLocale/providersrc/LocaleNames_ja.properties.i
 data/src/share/classes/java/awt/event/package.html.i
-data/src/share/classes/java/dyn/FilterOneArgument.java.i
 data/test/javax/security/auth/PrivateCredentialPermission/Subset.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java.i
-data/test/sun/management/jmxremote/bootstrap/Utils.java.i
 data/test/java/rmi/reliability/benchmark/runSerialBench.sh.i
 data/test/javax/xml/crypto/dsig/data/exc-signature.xml.i
 data/src/share/classes/java/nio/file/OpenOption.java.i
-data/test/java/net/InetSocketAddress/CreateUnresolved.java.i
 data/test/sun/security/provider/KeyStore/WrongPassword.java.i
 data/test/javax/script/UnescapedBracketRegExTest.java.i
-data/src/share/classes/sun/tools/tree/BinaryAssignExpression.java.i
+data/src/share/classes/sun/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java.i
 data/test/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorServerProvider.i
+data/test/sun/security/provider/PolicyParser/p002.policy.i
 data/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java.i
 data/test/sun/management/jmxremote/bootstrap/management_ssltest14_ko.properties.in.i
 data/src/share/classes/java/util/Arrays.java.i
-data/src/share/classes/java/nio/channels/Channel.java.i
+data/test/sun/security/rsa/TestKeyPairGenerator.java.i
 data/test/java/security/Provider/Turkish.java.i
-data/src/share/native/sun/security/ec/ecl.h.i
-data/make/netbeans/common/unix-view.ent.i
+data/test/java/lang/reflect/Method/invoke/IllegalAccessInInvoke.java.i
 data/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java.i
 data/src/share/classes/com/sun/jdi/request/DuplicateRequestException.java.i
 data/src/share/classes/sun/text/resources/FormatData_vi.java.i
 data/test/java/net/URL/RelativePath.java.i
-data/src/share/classes/java/lang/StringBuilder.java.i
-data/src/share/classes/java/awt/image/ReplicateScaleFilter.java.i
+data/test/java/util/ResourceBundle/ReferencesTestBundle.properties.i
+data/make/common/Release.gmk.i
 data/test/java/rmi/activation/Activatable/downloadParameterClass/Foo.java.i
 data/test/java/beans/PropertyEditor/TestBooleanClassJava.java.i
-data/src/share/classes/java/lang/reflect/Constructor.java.i
-data/test/java/util/concurrent/CopyOnWriteArrayList/EqualsRace.java.i
+data/src/share/classes/sun/security/krb5/internal/crypto/Aes256.java.i
 data/src/share/demo/jvmti/hprof/hprof_check.h.i
 data/src/share/classes/sun/dyn/AdapterMethodHandle.java.i
 data/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html.i
-data/test/com/sun/jdi/DeoptimizeWalk.sh.i
-data/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java.i
+data/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java.i
 data/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java.i
 data/test/java/awt/Focus/OwnedWindowFocusIMECrashTest/OwnedWindowFocusIMECrashTest.java.i
+data/src/share/classes/javax/naming/NameImpl.java.i
 data/src/share/classes/javax/sql/rowset/serial/package.html.i
 data/test/tools/pack200/UnpackerMemoryTest.java.i
 data/test/javax/management/MBeanServer/NotifDeadlockTest.java.i
-data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java.i
+data/src/share/classes/sun/io/CharToByteUnicodeLittleUnmarked.java.i
 data/src/share/classes/sun/tracing/dtrace/DTraceProvider.java.i
 data/test/sun/rmi/transport/tcp/blockAccept/TestImpl.java.i
 data/test/Makefile.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S32Func.c.i
-data/test/sun/security/provider/PolicyFile/SelfExpansion.java.i
+data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-config.jpg.i
 data/make/tools/swing-beans/beaninfo/images/JLabelMono32.gif.i
 data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init4.java.i
 data/make/tools/CharsetMapping/IBM775.map.i
-data/test/java/lang/reflect/Constructor/TestParameterAnnotations.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java.i
 data/src/share/classes/com/sun/jmx/snmp/daemon/CommunicationException.java.i
 data/src/share/classes/sun/text/resources/FormatData_ms_MY.java.i
@@ -12689,17 +12614,16 @@ data/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java.i
 data/test/javax/management/namespace/RoutingServerProxyTest.java.i
 data/src/share/classes/sun/invoke/util/Wrapper.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11_WithComments.java.i
-data/src/share/demo/jvmti/waiters/Agent.hpp.i
+data/src/share/classes/java/awt/font/OpenType.java.i
 data/src/share/demo/jvmti/hprof/hprof_class.h.i
 data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComKeyManagerFactoryImpl.java.i
 data/src/share/native/sun/java2d/loops/FourByteAbgrPre.h.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/SSLEngineResultArgs.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java.i
 data/src/share/classes/com/sun/tools/example/debug/expr/Expr.jj.i
 data/test/sun/net/www/protocol/file/GetContentType.java.i
-data/src/solaris/demo/jigsaw/basic/run.sh.i
+data/test/javax/print/StreamPrintingOrientation.java.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.h.i
-data/test/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.java.i
+data/src/share/classes/javax/management/namespace/JMXNamespace.java.i
 data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfig.java.i
 data/src/share/classes/javax/management/relation/RelationSupport.java.i
 data/test/sun/security/provider/PolicyParser/AvoidPropertyExpansionExceptions.java.i
@@ -12709,30 +12633,29 @@ data/src/share/native/sun/font/layout/ValueRecords.h.i
 data/src/share/native/sun/awt/medialib/mlib_ImageConvEdge.h.i
 data/src/share/classes/javax/print/attribute/PrintRequestAttributeSet.java.i
 data/src/solaris/native/sun/awt/awt_AWTEvent.c.i
-data/src/windows/native/sun/java2d/windows/ddrawObject.h.i
+data/src/share/classes/java/nio/channels/Selector.java.i
 data/src/share/classes/sun/java2d/loops/ScaledBlit.java.i
 data/test/java/io/charStreams/Cat.java.i
-data/test/sun/security/ssl/README.i
 data/src/windows/native/sun/windows/UnicowsLoader.h.i
 data/src/share/classes/sun/io/CharToByteCp865.java.i
-data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/ClassCompare.java.i
+data/src/share/classes/java/security/GeneralSecurityException.java.i
+data/src/share/classes/javax/sound/midi/Receiver.java.i
 data/make/netbeans/awt2d/README.i
 data/test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java.i
 data/src/share/classes/java/lang/ArithmeticException.java.i
 data/test/sun/rmi/rmic/newrmic/equivalence/Orange.java.i
 data/src/share/classes/javax/management/ClassAttributeValueExp.java.i
-data/src/share/native/sun/security/ec/impl/ecp_aff.c.i
-data/test/java/util/zip/TestEmptyZip.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_pt_PT.properties.i
 data/test/java/lang/instrument/NamedBuffer.java.i
 data/src/share/native/sun/font/layout/SimpleArrayProcessor.cpp.i
-data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup_Stub.java.i
 data/test/sun/security/krb5/auto/basic.sh.i
+data/test/java/dyn/6991596/Test6991596.java.i
 data/src/windows/native/sun/jkernel/kernel_pt_BR.rc.i
 data/test/java/lang/System/ExitFinalizersAndJIT.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_es_PA.properties.i
 data/test/sun/misc/JarIndex/metaInfFilenames/jarA/com/message/spi/MessageService.java.i
-data/src/share/classes/java/text/Format.java.i
+data/test/java/nio/channels/FileChannel/ReadFull.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/package.html.i
 data/src/share/classes/sun/nio/ch/SctpStdSocketOption.java.i
 data/src/share/classes/java/awt/geom/Ellipse2D.java.i
@@ -12741,36 +12664,38 @@ data/src/share/classes/java/io/CharArrayReader.java.i
 data/test/sun/tools/jps/jps-lm.sh.i
 data/src/share/classes/javax/management/remote/IdentityMBeanServerForwarder.java.i
 data/src/share/classes/sun/awt/geom/Order3.java.i
-data/test/javax/script/DummyScriptEngine.java.i
 data/src/share/back/invoker.c.i
 data/test/sun/management/jmxremote/bootstrap/Makefile.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java.i
 data/src/share/classes/com/sun/servicetag/SolarisSystemEnvironment.java.i
 data/src/share/classes/sun/jvmstat/monitor/remote/BufferedMonitoredVm.java.i
+data/src/share/classes/sun/dyn/util/ValueConversions.java.i
 data/test/java/awt/Focus/TypeAhead/TestFocusFreeze.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java.i
+data/make/tools/swing-beans/beaninfo/images/JEditorPaneColor16.gif.i
 data/test/java/lang/instrument/RedefineClassWithNativeMethodApp.java.i
-data/test/java/util/ResourceBundle/Bug6190861Data_en_US.properties.i
-data/make/mkdemo/jvmti/heapTracker/Makefile.i
+data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl_Stub.java.i
+data/test/javax/swing/JColorChooser/Test4380468.html.i
 data/test/javax/management/remote/mandatory/util/CacheMapTest.java.i
 data/test/java/util/Formatter/BasicBigDecimal.java.i
 data/test/java/security/Security/removing/RemoveStaticProvider.policy.i
+data/src/share/classes/java/lang/Shutdown.java.i
 data/test/java/beans/XMLEncoder/6380849/Bean.java.i
 data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.pass.i
 data/test/java/net/URLClassLoader/jars/class_path_test.jar.i
 data/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-8-attack.xml.i
+data/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh.i
 data/test/java/rmi/reliability/benchmark/bench/serial/GetPutFieldTrees.java.i
 data/src/share/classes/sun/java2d/loops/DrawGlyphListLCD.java.i
-data/src/share/classes/java/text/spi/NumberFormatProvider.java.i
+data/test/java/awt/Component/isLightweightCrash/IsLightweightCrash.java.i
 data/src/share/classes/sun/net/ftp/FtpClientProvider.java.i
 data/src/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java.i
 data/src/share/native/sun/security/ec/mplogic.h.i
 data/test/sun/security/x509/X500Name/DerValueConstructor.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java.i
 data/src/share/classes/java/net/package.html.i
 data/src/share/classes/sun/net/spi/DefaultProxySelector.java.i
-data/test/java/rmi/transport/readTimeout/security.policy.i
-data/src/share/classes/sun/text/normalizer/RangeValueIterator.java.i
+data/test/sun/rmi/rmic/newrmic/equivalence/run.sh.i
+data/src/share/classes/sun/io/ByteToCharDBCS_EBCDIC.java.i
+data/test/java/util/Collections/CheckedMapBash.java.i
 data/src/share/classes/javax/sql/rowset/serial/SerialException.java.i
 data/test/java/io/Serializable/finalFields/FinalFields.java.i
 data/make/tools/swing-beans/beaninfo/images/JComboBoxMono32.gif.i
@@ -12779,9 +12704,9 @@ data/src/share/classes/java/nio/channels/ByteChannel.java.i
 data/test/java/net/MulticastSocket/SetTTLAndGetTTL.java.i
 data/src/share/classes/com/sun/tools/example/README.i
 data/test/java/beans/Introspector/4520754/Wombat.java.i
-data/test/java/util/PluggableLocale/BreakIteratorProviderTest.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java.i
 data/src/share/classes/java/awt/geom/CubicCurve2D.java.i
-data/test/java/nio/Buffer/CopyDirectIntMemory.java.i
+data/test/java/net/CookieHandler/B6644726.java.i
 data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java.i
 data/test/com/sun/net/httpserver/Test9.java.i
 data/src/share/native/sun/java2d/pipe/Region.h.i
@@ -12792,30 +12717,30 @@ data/test/com/sun/security/sasl/gsskerb/NoSecurityLayer.java.i
 data/src/share/demo/jfc/SwingApplet/SwingApplet.java.i
 data/src/share/classes/sun/launcher/resources/launcher.properties.i
 data/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java.i
-data/src/share/classes/sun/rmi/server/Util.java.i
 data/src/share/classes/sun/security/util/HostnameChecker.java.i
 data/src/share/classes/java/util/AbstractSequentialList.java.i
 data/src/share/classes/sun/reflect/generics/tree/Wildcard.java.i
 data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgentMBean.java.i
 data/make/sun/cmm/kcms/mapfile-vers.i
+data/test/java/security/cert/PKIXParameters/InvalidParameters.java.i
 data/src/share/native/sun/awt/image/jpeg/jcapimin.c.i
 data/test/java/rmi/reliability/benchmark/bench/rmi/BenchServer.java.i
+data/test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java.i
 data/src/share/classes/com/sun/crypto/provider/PKCS5Padding.java.i
 data/src/share/native/java/nio/Bits.c.i
 data/src/share/classes/java/lang/doc-files/javalang.doc.anc41.gif.i
 data/src/share/classes/javax/naming/spi/DirObjectFactory.java.i
 data/test/java/util/ResourceBundle/Bug4257318Res_en.java.i
-data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/Receiver.java.i
 data/src/share/native/sun/security/ec/ecl_curve.c.i
 data/test/java/nio/channels/DatagramChannel/ThereCanBeOnlyOne.java.i
 data/test/java/util/EnumSet/OneUniverse.java.i
 data/src/share/classes/javax/net/ssl/TrustManager.java.i
 data/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java.i
 data/src/share/demo/jfc/SampleTree/SampleTreeCellRenderer.java.i
-data/src/share/native/sun/font/layout/LETypes.h.i
+data/make/tools/src/build/tools/jarsplit/JarSplit.java.i
 data/src/solaris/classes/sun/awt/motif/X11JIS0201.java.i
-data/src/share/classes/sun/io/CharToByteJIS0201.java.i
-data/test/java/io/charStreams/StringGenerator.java.i
+data/src/share/classes/sun/java2d/opengl/OGLBufImgOps.java.i
+data/make/sun/xawt/mapfile-vers.i
 data/test/demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties.i
 data/src/share/native/sun/java2d/loops/MaskFill.c.i
@@ -12823,14 +12748,13 @@ data/test/javax/management/remote/mandatory/connection/CloseServerTest.java.i
 data/src/solaris/doc/sun/man/man1/appletviewer.1.i
 data/src/share/classes/sun/java2d/pipe/NullPipe.java.i
 data/src/share/classes/com/sun/jdi/event/MethodExitEvent.java.i
-data/src/share/back/export/sys.h.i
 data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java.i
 data/test/java/lang/ref/SoftReference/Pin.java.i
 data/test/java/util/Collections/NullComparator.java.i
-data/test/java/beans/PropertyEditor/TestDoubleClassValue.java.i
-data/src/share/classes/sun/io/ByteToCharEUC_JP_Solaris.java.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/manifest.mf.i
+data/test/sun/jvmstat/testlibrary/Sleeper.java.i
+data/src/share/demo/nbproject/jfc/Notepad/nbproject/file-targets.xml.i
 data/src/share/classes/sun/security/timestamp/HttpTimestamper.java.i
+data/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties.i
 data/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c.i
 data/src/share/classes/javax/security/sasl/Sasl.java.i
@@ -12841,11 +12765,13 @@ data/test/java/util/concurrent/DelayQueue/PollUnexpired.java.i
 data/src/share/classes/java/util/regex/PatternSyntaxException.java.i
 data/src/share/classes/com/sun/beans/WildcardTypeImpl.java.i
 data/src/share/classes/sun/awt/ExtendedKeyCodes.java.i
+data/test/javax/management/mxbean/customtypes/IntegerIsStringFactory.java.i
 data/src/linux/doc/man/ja/javac.1.i
 data/src/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java.i
 data/test/java/util/Calendar/WeekDateTest.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ar_OM.properties.i
 data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanIntrospector.java.i
+data/make/netbeans/jarzip/build.xml.i
 data/src/share/classes/javax/management/loading/MLet.java.i
 data/src/share/demo/applets/GraphicsTest/example1.html.i
 data/src/share/classes/java/lang/doc-files/capchi.gif.i
@@ -12853,11 +12779,13 @@ data/src/share/classes/com/sun/media/sound/ModelPatch.java.i
 data/src/share/modules/jdk.tools/module-info.java.i
 data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_5.java.i
 data/test/javax/crypto/spec/IvParameterSpec/InvalidArgs.java.i
+data/src/share/classes/sun/reflect/generics/repository/MethodRepository.java.i
 data/test/java/awt/Mixing/JButtonInGlassPane.java.i
 data/src/windows/native/sun/nio/ch/Net.c.i
 data/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java.i
 data/test/com/sun/crypto/provider/Cipher/RSA/TestOAEPParameterSpec.java.i
 data/src/share/classes/java/awt/image/FilteredImageSource.java.i
+data/src/share/classes/com/sun/media/sound/SunFileReader.java.i
 data/src/share/classes/com/sun/crypto/provider/PBEKey.java.i
 data/src/share/classes/javax/swing/JPanel.java.i
 data/src/share/classes/java/rmi/server/SocketSecurityException.java.i
@@ -12869,15 +12797,15 @@ data/src/share/classes/sun/tracing/dtrace/Activation.java.i
 data/test/java/nio/charset/StandardCharset/Standard.java.i
 data/src/share/classes/javax/print/attribute/ResolutionSyntax.java.i
 data/src/share/classes/com/sun/crypto/provider/AESWrapCipher.java.i
-data/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails_Stub.java.i
+data/src/share/native/sun/awt/image/jpeg/jctrans.c.i
 data/src/share/classes/java/io/InvalidClassException.java.i
 data/test/java/lang/Math/Rint.java.i
 data/src/share/classes/com/sun/tools/jdi/PrimitiveTypeImpl.java.i
 data/test/javax/crypto/Cipher/GCMAPI.java.i
 data/src/windows/native/sun/windows/awt_Choice.h.i
-data/make/tools/reorder/tools/Combine.java.i
+data/src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java.i
 data/src/share/native/sun/font/layout/CanonData.cpp.i
-data/src/share/classes/com/sun/media/sound/JavaSoundAudioClip.java.i
+data/src/share/classes/sun/misc/Sort.java.i
 data/test/java/net/URL/PerConnectionProxy.java.i
 data/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html.i
 data/test/java/text/Bidi/Bug6850113.java.i
@@ -12889,13 +12817,13 @@ data/src/share/classes/javax/swing/plaf/nimbus/InnerGlowEffect.java.i
 data/test/java/awt/Robot/RobotExtraButton/RobotExtraButton.java.i
 data/test/javax/security/auth/login/LoginContext/DefaultHandler.java.i
 data/src/share/classes/javax/sql/rowset/spi/XmlReader.java.i
-data/test/java/beans/XMLEncoder/Test4679556.java.i
-data/test/java/lang/reflect/Proxy/ClassRestrictions.java.i
+data/src/share/native/java/util/zip/zlib-1.2.3/inffast.c.i
 data/test/java/net/NetworkInterface/IPv4Only.java.i
 data/src/share/native/sun/security/ec/impl/mpmontg.c.i
 data/src/share/classes/sun/io/ByteToCharCp437.java.i
-data/src/share/classes/sun/text/resources/CollationData_iw.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_PR.java.i
+data/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java.i
+data/make/javax/crypto/policy/limited/LIMITED.i
 data/src/share/classes/java/security/interfaces/RSAPublicKey.java.i
 data/src/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java.i
 data/test/sun/net/ftp/FtpURL.java.i
@@ -12906,46 +12834,40 @@ data/test/javax/security/auth/login/LoginContext/ConfigConstructor.config.i
 data/src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java.i
 data/test/sun/nio/cs/ISO8859x.java.i
 data/test/java/io/Serializable/proxy/skipMissing/Write.java.i
-data/test/java/io/pathNames/GeneralWin32.java.i
-data/src/share/classes/sun/font/TextSource.java.i
+data/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java.i
+data/src/share/classes/sun/nio/ch/IOVecWrapper.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java.i
-data/src/share/classes/sun/awt/image/ByteComponentRaster.java.i
+data/test/java/nio/channels/Selector/Wakeup.java.i
 data/test/java/util/ResourceBundle/awtres.jar.i
 data/test/java/util/Arrays/Fill.java.i
 data/test/java/lang/management/MemoryMXBean/MemoryTest.java.i
 data/test/java/io/Serializable/evolution/AddedSuperClass/README.i
-data/src/share/classes/sun/security/jgss/spi/MechanismFactory.java.i
+data/src/share/demo/jvmti/waiters/Agent.cpp.i
 data/make/tools/CharsetMapping/MS1252.map.i
 data/src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp.i
-data/src/share/classes/com/sun/tools/hat/internal/server/FinalizerObjectsQuery.java.i
-data/src/windows/classes/sun/awt/windows/WDesktopProperties.java.i
+data/test/javax/management/Introspector/UnDescribed.java.i
 data/src/share/classes/com/sun/net/httpserver/HttpExchange.java.i
 data/src/solaris/classes/sun/awt/X11/security-icon-yellow48.png.i
 data/test/java/security/UnresolvedPermission/DebugPermission1.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/ding.sf2.i
 data/src/share/classes/sun/security/krb5/internal/LastReqEntry.java.i
 data/test/javax/sound/midi/Gervill/SoftChannel/NoteOn.java.i
 data/test/java/lang/Class/IsEnum.java.i
 data/src/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java.i
 data/src/share/classes/javax/swing/event/ChangeListener.java.i
-data/test/java/util/concurrent/ThreadPoolExecutor/ScheduledTickleService.java.i
-data/src/share/native/java/lang/fdlibm/src/e_gamma_r.c.i
 data/src/share/classes/sun/misc/Cleaner.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_UY.properties.i
 data/test/sun/net/www/protocol/jar/GetContentType.java.i
+data/test/javax/security/auth/login/Configuration/GetInstanceSecurity.policy.i
 data/src/share/classes/sun/text/resources/FormatData_ga.java.i
 data/src/share/classes/sun/awt/image/ImageConsumerQueue.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/Load6.java.i
+data/src/share/native/sun/awt/image/jpeg/jcdctmgr.c.i
 data/make/tools/generatecurrencydata/Makefile.i
 data/src/solaris/classes/sun/awt/X11/security-icon-interim24.png.i
-data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java.i
 data/test/sun/security/provider/certpath/ReverseBuilder/mgrM2leadMA.i
-data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java.i
+data/src/share/classes/javax/naming/RefAddr.java.i
 data/test/java/io/pathNames/win32/DriveRelativePath.java.i
-data/src/share/classes/javax/swing/text/html/CSSBorder.java.i
+data/test/java/nio/Buffer/CopyDirectMemory.java.i
 data/make/sun/net/spi/nameservice/dns/Makefile.i
-data/test/javax/crypto/SecretKeyFactory/FailOverTest.java.i
-data/test/java/util/ResourceBundle/Test4300693.java.i
+data/src/share/native/sun/security/ec/mpi.h.i
 data/test/java/nio/channels/FileChannel/TryLock.java.i
 data/test/javax/management/MBeanServer/PostExceptionTest.java.i
 data/src/share/classes/sun/java2d/cmm/ProfileActivator.java.i
@@ -12956,175 +12878,160 @@ data/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.jav
 data/test/sun/tools/jps/jps-Vvml_Output2.awk.i
 data/test/vm/verifier/VerifyProtectedConstructor.java.i
 data/src/windows/native/common/java_main_md.h.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUp.c.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseError.java.i
 data/make/tools/CharsetMapping/MS1258.map.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/pk1.cert.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java.i
 data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java.i
 data/test/sun/net/sdp/Sanity.java.i
 data/src/share/native/sun/java2d/opengl/OGLFuncMacros.h.i
 data/src/share/classes/javax/management/openmbean/KeyAlreadyExistsException.java.i
 data/src/share/classes/sun/tools/asm/SwitchData.java.i
 data/test/java/lang/instrument/classpathAgent.mf.i
-data/src/share/native/sun/font/layout/DeviceTables.h.i
+data/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java.i
 data/src/share/classes/com/sun/jndi/ldap/NotifierArgs.java.i
 data/src/share/demo/jvmti/heapTracker/README.txt.i
 data/test/sun/rmi/rmic/defaultStubVersion/G1Impl.java.i
 data/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java.i
-data/test/javax/swing/JFileChooser/6484091/bug6484091.java.i
-data/test/demo/jvmti/hprof/StackMapTableTest.java.i
+data/src/share/classes/java/net/MulticastSocket.java.i
 data/make/tools/swing-beans/beaninfo/images/JTreeMono32.gif.i
-data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemColor32.gif.i
-data/src/share/classes/sun/util/resources/CurrencyNames_en_SG.properties.i
+data/src/share/classes/java/io/ObjectStreamConstants.java.i
 data/src/share/classes/sun/misc/UUDecoder.java.i
-data/src/share/classes/sun/management/snmp/util/SnmpListTableCache.java.i
 data/src/share/classes/sun/nio/cs/SingleByte.java.i
 data/test/sun/security/pkcs11/fips/keystore.i
 data/test/javax/sound/midi/Gervill/SoftTuning/Load8.java.i
+data/test/sun/rmi/rmic/newrmic/equivalence/AppleEvent.java.i
 data/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java.i
 data/src/share/native/sun/awt/giflib/gif_lib_private.h.i
 data/src/windows/native/sun/windows/awt_Font.h.i
 data/src/solaris/native/sun/awt/awt_Choice12.c.i
 data/test/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java.i
-data/test/sun/security/util/Resources/Format.config.i
-data/src/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java.i
+data/test/java/util/prefs/ExportSubtree.java.i
 data/make/tools/CharsetMapping/MacRoman.map.i
 data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileAttributes.java.i
 data/test/sun/tools/jstat/jstatCompilerOutput1.sh.i
 data/test/java/util/concurrent/ScheduledThreadPoolExecutor/DelayOverflow.java.i
 data/src/share/classes/javax/swing/ArrayTable.java.i
-data/test/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl_Stub.java.i
+data/src/share/classes/sun/reflect/annotation/AnnotationParser.java.i
 data/test/java/security/cert/CertificateFactory/invalidEncodedCerts/DetectInvalidEncoding.java.i
-data/test/sun/tools/jhat/hprof.bin.i
+data/make/tools/swing-beans/beaninfo/BeanInfoUtils.java.i
 data/test/java/lang/Class/EnumPoseur.java.src.i
 data/test/javax/swing/RepaintManager/6608456/bug6608456.java.i
 data/src/share/classes/sun/security/ssl/EngineInputRecord.java.i
-data/src/share/classes/sun/font/TextLineComponent.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServerBuilder.java.i
 data/src/windows/classes/sun/awt/windows/WKeyboardFocusManagerPeer.java.i
-data/test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java.i
-data/src/windows/native/sun/java2d/windows/RegistryKey.h.i
+data/src/share/classes/java/beans/XMLEncoder.java.i
+data/test/sun/security/pkcs11/KeyStore/ClientAuthData/README.i
 data/make/sun/rmi/cgi/Makefile.i
 data/src/share/classes/java/rmi/dgc/VMID.java.i
-data/test/com/sun/jdi/RedefineCrossStart.java.i
 data/src/share/classes/javax/swing/PopupFactory.java.i
-data/src/share/classes/com/sun/servicetag/resources/javase_5_swordfish.properties.i
-data/test/java/security/Policy/GetInstance/GetInstanceSecurity.java.i
+data/src/share/classes/sun/text/resources/CollationData_en.java.i
 data/src/share/classes/javax/swing/JRootPane.java.i
 data/src/share/classes/com/sun/media/sound/MidiUtils.java.i
 data/src/share/classes/sun/security/ssl/SunJSSE.java.i
-data/test/java/rmi/reliability/benchmark/bench/serial/StreamBuffer.java.i
 data/src/share/classes/java/awt/peer/PanelPeer.java.i
-data/test/java/io/FilterOutputStream/BoundsCheck.java.i
+data/test/java/beans/PropertyEditor/TestByteTypeNull.java.i
 data/test/org/openjdk/jigsaw/_JigsawVersion.java.i
 data/src/share/classes/javax/swing/text/html/LineView.java.i
 data/src/share/classes/sun/security/ssl/SessionId.java.i
 data/src/solaris/classes/sun/awt/X11/XDropTargetEventProcessor.java.i
 data/src/share/native/sun/java2d/loops/ByteGray.c.i
 data/test/java/net/MulticastSocket/TimeToLive.java.i
-data/src/share/classes/sun/text/resources/FormatData_lv_LV.java.i
-data/test/sun/management/jmxremote/bootstrap/rmiregistryssl.properties.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/InstrumentedApplication.java.i
 data/src/share/classes/com/sun/pept/ept/MessageInfo.java.i
 data/src/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java.i
 data/test/java/security/PermissionCollection/AddToReadOnlyPermissionCollection.java.i
 data/test/java/beans/PropertyEditor/TestEnumClassJava.java.i
-data/test/java/text/Format/DateFormat/Bug4396385.java.i
+data/src/share/native/java/lang/Runtime.c.i
 data/make/tools/reorder/tools/remove_mcount.c.i
-data/src/share/classes/javax/print/attribute/HashPrintJobAttributeSet.java.i
+data/make/tools/CharsetMapping/IBM1141.c2b.i
 data/make/tools/swing-beans/beaninfo/images/JTableMono16.gif.i
 data/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java.i
-data/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh.i
 data/src/share/classes/javax/swing/text/rtf/Constants.java.i
 data/src/share/demo/management/FullThreadDump/FullThreadDump.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties.i
-data/src/share/classes/java/awt/font/LineMetrics.java.i
 data/src/share/classes/java/security/cert/CertPathBuilderException.java.i
 data/test/java/rmi/reliability/benchmark/bench/serial/Floats.java.i
+data/src/share/demo/nbproject/management/JTop/nbproject/project.xml.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassListWriter.java.i
 data/src/share/native/java/lang/fdlibm/src/s_copysign.c.i
 data/src/share/classes/sun/io/CharToByteCp1026.java.i
 data/test/demo/jvmti/heapViewer/HeapViewerTest.java.i
 data/src/solaris/native/sun/awt/VDrawingArea.c.i
-data/src/share/classes/com/sun/media/sound/SF2Soundbank.java.i
 data/test/java/util/ServiceLoader/Load.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/MissingResourceFailureException.java.i
-data/test/sun/net/www/protocol/http/SetIfModifiedSince.java.i
 data/src/windows/native/sun/windows/awt_ScrollPane.cpp.i
-data/src/share/classes/sun/nio/cs/ext/ISO2022_JP_2.java.i
+data/src/share/sample/jmx/jmx-scandir/build.xml.i
 data/src/share/classes/java/util/concurrent/ConcurrentSkipListSet.java.i
-data/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java.i
 data/src/share/classes/java/text/spi/DateFormatProvider.java.i
-data/test/sun/net/www/protocol/http/ProxyTunnelServer.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java.i
+data/test/java/io/Serializable/PutField/Write.java.i
 data/src/share/back/debugInit.c.i
 data/test/sun/nio/cs/EUC_TW_OLD.java.i
 data/test/demo/jvmti/hprof/DefineClass.java.i
 data/src/share/classes/sun/print/resources/oneside.png.i
-data/test/sun/net/InetAddress/nameservice/B6442088.java.i
+data/src/share/classes/sun/security/jgss/ProviderList.java.i
 data/test/javax/swing/JSlider/6742358/bug6742358.html.i
-data/src/solaris/classes/sun/awt/X11/XSelection.java.i
 data/test/java/beans/XMLEncoder/javax_swing_plaf_ColorUIResource.java.i
-data/src/share/native/java/util/zip/zlib-1.2.3/README.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java.i
 data/test/java/nio/channels/SocketChannel/BigReadWrite.java.i
 data/src/share/classes/java/util/SimpleTimeZone.java.i
 data/test/java/rmi/activation/CommandEnvironment/group.security.policy.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/ColorMapper.java.i
 data/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java.i
 data/make/tools/src/build/tools/dirdiff/DirDiff.java.i
+data/test/javax/xml/crypto/dsig/data/signature-keyname.xml.i
 data/make/docs/NON_CORE_PKGS.gmk.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java.i
 data/test/java/util/Locale/serialized/java6locale_en_US_Java.i
 data/test/javax/print/attribute/Chroma.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java.i
-data/src/share/demo/nbproject/jfc/SampleTree/nbproject/file-targets.xml.i
 data/src/share/classes/sun/util/resources/CalendarData_mk.properties.i
 data/src/share/classes/com/sun/tools/jdi/LineInfo.java.i
+data/test/javax/security/auth/login/Configuration/Synchronize.config.i
 data/src/solaris/native/java/net/PlainSocketImpl.c.i
 data/src/share/classes/sun/util/resources/TimeZoneNames_en_GB.java.i
 data/make/common/Defs-linux.gmk.i
 data/src/share/classes/sun/net/httpserver/HttpError.java.i
 data/src/share/classes/javax/management/BadBinaryOpValueExpException.java.i
-data/src/share/native/sun/font/layout/LEStandalone.h.i
+data/src/share/classes/sun/tools/jconsole/ClassTab.java.i
 data/src/share/classes/javax/imageio/event/IIOWriteWarningListener.java.i
 data/test/java/io/ObjectInputStream/ResolveProxyClass.java.i
 data/test/java/nio/channels/ServerSocketChannel/NonBlockingAccept.java.i
 data/src/share/classes/sun/reflect/generics/reflectiveObjects/LazyReflectiveObjectGenerator.java.i
 data/src/share/classes/sun/management/HotspotRuntime.java.i
 data/src/share/classes/sun/swing/plaf/synth/SynthIcon.java.i
-data/test/javax/swing/JSlider/6348946/bug6348946.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicListUI.java.i
 data/src/solaris/classes/sun/nio/ch/EPollSelectorProvider.java.i
 data/test/java/beans/XMLEncoder/java_awt_GradientPaint.java.i
-data/src/share/classes/java/util/jar/Manifest.java.i
+data/test/java/awt/Paint/PgramUserBoundsTest.java.i
+data/src/windows/native/sun/windows/awt_DataTransferer.h.i
+data/test/java/util/ResourceBundle/Control/PrivateConstructorRB.java.i
 data/test/java/util/concurrent/CyclicBarrier/Basic.java.i
-data/src/share/demo/jfc/CodePointIM/resources/codepoint_zh_CN.properties.i
-data/src/share/demo/jvmti/agent_util/agent_util.h.i
+data/src/share/native/com/sun/media/sound/Ports.h.i
+data/src/share/classes/sun/management/VMManagement.java.i
+data/src/share/classes/sun/io/CharToByteCp970.java.i
 data/src/share/classes/sun/rmi/server/resources/rmid_ko.properties.i
 data/test/java/awt/Toolkit/Headless/ExceptionContract/ExceptionContract.java.i
 data/test/java/rmi/activation/Activatable/checkAnnotations/rmid.security.policy.i
 data/make/tools/CharsetMapping/HKSCS2001.map.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/package.html.i
 data/src/share/classes/sun/text/resources/FormatData_ca_ES.java.i
-data/test/java/security/cert/PolicyNode/GetPolicyQualifiers.java.i
 data/src/share/classes/sun/security/pkcs11/P11SecureRandom.java.i
 data/src/share/classes/sun/security/acl/PrincipalImpl.java.i
 data/src/windows/native/sun/jkernel/kernel_ja.rc.i
 data/src/share/classes/sun/java2d/pipe/CompositePipe.java.i
-data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java.i
 data/src/share/classes/sun/tools/tree/Node.java.i
-data/test/com/sun/servicetag/environ.properties.i
+data/src/share/classes/java/beans/PropertyChangeSupport.java.i
 data/test/java/io/RandomAccessFile/ReadWritePrimitives.java.i
 data/src/share/classes/com/sun/media/sound/DLSSoundbank.java.i
 data/test/javax/management/modelmbean/SimpleModelMBean/policy.i
+data/src/share/classes/java/text/spi/BreakIteratorProvider.java.i
 data/src/share/classes/sun/tools/java/AmbiguousMember.java.i
 data/src/share/classes/sun/security/krb5/internal/util/KrbDataOutputStream.java.i
-data/test/sun/nio/cs/NIOJISAutoDetectTest.java.i
 data/test/java/net/Socket/SocksConnectTimeout.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherParameters.java.i
-data/test/java/net/Socket/asyncClose/BrokenPipe.java.i
+data/src/windows/native/sun/jkernel/kernel.def.i
 data/src/share/classes/javax/accessibility/AccessibleHypertext.java.i
-data/test/java/awt/Robot/CtorTest/CtorTest.java.i
-data/src/windows/classes/sun/nio/fs/WindowsWatchService.java.i
+data/test/java/awt/font/TextLayout/TestSinhalaChar.java.i
+data/src/share/demo/jfc/Metalworks/Metalworks.java.i
 data/src/share/classes/javax/swing/table/TableStringConverter.java.i
 data/src/share/classes/sun/tools/javac/Main.java.i
 data/src/share/classes/java/security/Policy.java.i
@@ -13135,34 +13042,33 @@ data/src/share/classes/sun/io/CharToByteCp1140.java.i
 data/test/java/security/testlibrary/CertUtils.java.i
 data/make/mkdemo/nio/Makefile.i
 data/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_ko.properties.i
 data/make/tools/swing-beans/beaninfo/images/JComboBoxColor32.gif.i
 data/src/share/classes/sun/print/psfont.properties.ja.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmMemGCTableMeta.java.i
 data/make/mkdemo/applets/DitherTest/Makefile.i
 data/test/java/awt/geom/CubicCurve2D/ContainsTest.java.i
-data/test/java/beans/XMLEncoder/Test6256805.java.i
+data/test/java/util/Vector/SimpleSerialization.java.i
 data/src/share/classes/sun/java2d/pipe/RenderBuffer.java.i
 data/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java.i
 data/make/com/sun/jndi/rmi/registry/Makefile.i
-data/src/share/instrument/Utilities.h.i
 data/src/share/javavm/export/jmm.h.i
 data/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java.i
 data/src/share/classes/sun/swing/text/CompoundPrintable.java.i
 data/test/java/beans/PropertyEditor/TestByteClassNull.java.i
 data/test/java/lang/Class/getClasses/Sanity.java.i
 data/make/com/sun/inputmethods/thaiim/Makefile.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmOSMBean.java.i
+data/src/share/classes/sun/tools/java/SyntaxError.java.i
+data/src/share/classes/java/util/zip/GZIPInputStream.java.i
 data/src/share/classes/com/sun/tools/jdi/SDE.java.i
-data/src/share/lib/images/cursors/win32_MoveNoDrop32x32.gif.i
+data/make/sun/net/spi/nameservice/Makefile.i
 data/src/share/classes/javax/swing/text/DefaultStyledDocument.java.i
 data/src/share/classes/sun/rmi/server/resources/rmid_fr.properties.i
-data/test/sun/nio/cs/SurrogateTestEUCTW.plane6.surrogates.i
 data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libsoftokn3.so.d
 data/src/windows/classes/sun/management/FileSystemImpl.java.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/Files.java.i
 data/test/sun/security/pkcs11/sslecc/JSSEServer.java.i
-data/src/share/classes/javax/management/IntrospectionException.java.i
-data/test/java/lang/management/MemoryMXBean/Pending.java.i
+data/test/sun/nio/cs/OLD/GBK_OLD.java.i
 data/src/share/classes/com/sun/nio/sctp/HandlerResult.java.i
 data/src/share/demo/scripting/jconsole-plugin/src/scripts/sysprops.js.i
 data/test/java/util/ResourceBundle/Control/StressOut_en_CA.properties.i
@@ -13170,7 +13076,7 @@ data/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java.i
 data/src/share/classes/sun/tools/tree/ExpressionStatement.java.i
 data/test/sun/tools/jstat/jstatLineCounts1.sh.i
 data/test/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java.i
-data/src/share/classes/java/awt/event/InputEvent.java.i
+data/src/share/classes/java/beans/SimpleBeanInfo.java.i
 data/test/java/beans/XMLDecoder/4676532/test.jar.i
 data/src/share/classes/java/awt/event/AWTEventListenerProxy.java.i
 data/src/linux/doc/man/ja/unpack200.1.i
@@ -13179,16 +13085,14 @@ data/src/share/classes/sunw/util/EventListener.java.i
 data/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java.i
 data/src/linux/doc/man/ja/ktab.1.i
 data/test/java/util/ResourceBundle/KeySetResources_ja_JP.properties.i
-data/test/java/awt/Modal/SupportedTest/SupportedTest.java.i
 data/make/tools/dtdbuilder/dtds/HTMLsymbol.sgml.i
 data/src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c.i
 data/make/netbeans/awt2d/build.xml.i
 data/src/share/classes/sun/rmi/rmic/newrmic/Constants.java.i
-data/test/sun/security/util/DerInputBuffer/BigInteger0.java.i
 data/src/share/classes/com/sun/jndi/dns/ResourceRecords.java.i
 data/test/java/io/Serializable/duplicateSerialFields/Test.java.i
 data/src/share/demo/jfc/Metalworks/PropertiesMetalTheme.java.i
-data/test/javax/imageio/CachePremissionsTest/CachePermissionsTest.java.i
+data/src/share/classes/java/util/prefs/package.html.i
 data/src/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java.i
 data/src/share/classes/com/sun/tools/example/debug/tty/MessageOutput.java.i
 data/src/share/classes/sun/nio/cs/MS1252.java.i
@@ -13202,15 +13106,13 @@ data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_S32.c.i
 data/src/share/classes/javax/sound/sampled/spi/package.html.i
 data/test/sun/security/pkcs11/fips/fips.cfg.i
 data/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.sh.i
-data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/jdk.xml.i
-data/src/share/native/sun/font/layout/LEFontInstance.h.i
+data/src/share/native/sun/java2d/SurfaceData.c.i
 data/make/com/sun/tools/attach/mapfile-solaris.i
-data/test/sun/tools/native2ascii/A2N_4630463.i
 data/src/share/native/sun/font/layout/GXLayoutEngine.h.i
 data/test/java/nio/Buffer/Chew.java.i
 data/test/java/beans/Introspector/4520754/FooBarBeanInfo.java.i
 data/test/com/sun/jdi/DeferredStepTest.sh.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressOutputStream.java.i
+data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemColor32.gif.i
 data/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties.i
 data/src/share/classes/javax/print/MimeType.java.i
 data/test/java/util/Vector/CopyInto.java.i
@@ -13219,10 +13121,11 @@ data/src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ar_EG.properties.i
 data/test/java/util/Collections/T6433170.java.i
 data/src/share/classes/java/awt/datatransfer/Transferable.java.i
-data/test/java/net/Authenticator/Deadlock.java.i
+data/make/modules/modularize.i
 data/src/share/classes/sun/java2d/loops/FillPath.java.i
 data/test/java/nio/charset/spi/FooCharset.java.i
 data/src/share/classes/javax/swing/plaf/SliderUI.java.i
+data/make/mkdemo/applets/NervousText/Makefile.i
 data/src/share/classes/java/awt/dnd/DragSourceMotionListener.java.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties.i
 data/make/mkdemo/jfc/SampleTree/Makefile.i
@@ -13234,27 +13137,29 @@ data/src/share/classes/sun/net/httpserver/Request.java.i
 data/src/share/classes/sun/dyn/DirectMethodHandle.java.i
 data/src/share/classes/javax/swing/JSeparator.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java.i
-data/test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java.i
+data/src/share/classes/sun/java2d/pipe/TextRenderer.java.i
 data/src/share/classes/sun/font/DelegatingShape.java.i
 data/src/share/sample/nio/server/AcceptHandler.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Computer.gif.i
 data/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.java.i
 data/test/java/util/Collections/CheckedListBash.java.i
 data/test/com/sun/servicetag/InstanceUrnCheck.java.i
-data/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c.i
+data/src/share/classes/java/awt/doc-files/TextField-1.gif.i
 data/src/share/demo/jfc/Metalworks/MetalThemeMenu.java.i
 data/test/sun/nio/cs/TestISO2022JPSubBytes.java.i
 data/src/share/classes/sun/io/CharToByteHKSCS_2001.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/BooleanArrayCalls.java.i
 data/make/mkdemo/jfc/TransparentRuler/Makefile.i
 data/src/share/classes/sun/security/jca/JCAUtil.java.i
 data/src/share/native/sun/awt/image/cvutils/img_util.h.i
-data/src/share/classes/javax/management/event/EventForwarder.java.i
-data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties.i
+data/src/share/classes/com/sun/jmx/defaults/package.html.i
+data/src/share/classes/java/security/PublicKey.java.i
 data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/project.xml.i
 data/src/share/classes/sun/io/CharToByteMacUkraine.java.i
 data/src/share/classes/sun/security/krb5/EncryptionKey.java.i
 data/src/solaris/classes/sun/nio/fs/SolarisWatchService.java.i
 data/src/share/classes/com/sun/crypto/provider/DESedeCrypt.java.i
+data/src/share/classes/javax/naming/ReferralException.java.i
 data/src/share/native/sun/font/glyphblitting.h.i
 data/src/share/classes/sun/management/counter/perf/Prologue.java.i
 data/test/demo/jvmti/hprof/MonitorTest.java.i
@@ -13268,32 +13173,36 @@ data/src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java.
 data/test/java/io/File/basic.sh.i
 data/src/share/sample/jmx/jmx-scandir/docfiles/connect-local-java-jar.jpg.i
 data/test/java/io/Serializable/packageAccess/B.java.i
+data/src/share/classes/sun/awt/HeadlessToolkit.java.i
 data/test/java/util/TimeZone/Bug6772689.java.i
 data/test/java/nio/charset/coders/ref.shift_jis.i
+data/src/share/classes/javax/swing/text/ParagraphView.java.i
 data/src/share/classes/sun/nio/cs/ext/MacArabic.java.i
 data/src/share/back/FrameID.c.i
 data/test/java/nio/Buffer/CopyDirectLongMemory.java.i
-data/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java.i
+data/src/share/classes/com/sun/tools/script/shell/messages.properties.i
 data/src/share/native/java/lang/fdlibm/src/e_sqrt.c.i
 data/test/java/util/zip/ZipFile/FinalizeInflater.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/package.html.i
-data/test/java/nio/file/Path/TemporaryFiles.java.i
+data/src/share/native/sun/security/ec/impl/ecp_aff.c.i
 data/src/share/classes/java/security/interfaces/DSAPublicKey.java.i
 data/src/share/classes/sun/misc/JavaxSecurityAuthKerberosAccess.java.i
-data/src/windows/native/java/io/Win32FileSystem_md.c.i
-data/test/java/net/InetAddress/GetLocalHostWithSM.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java.i
+data/src/share/classes/sun/io/CharToByteUnicodeLittle.java.i
+data/src/share/classes/javax/management/loading/MLetMBean.java.i
 data/src/share/classes/sun/io/ByteToCharISO8859_15.java.i
 data/test/java/lang/instrument/PremainClass/InheritAgent1010.java.i
 data/src/share/lib/cmm/lcms/LINEAR_RGB.pf.i
 data/test/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java.i
-data/src/share/classes/sun/security/jgss/krb5/WrapToken_v2.java.i
+data/src/share/classes/sun/security/x509/CertificatePolicyMap.java.i
 data/test/com/sun/crypto/provider/Cipher/DES/TestUtility.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathFilterCHGPContainer.java.i
 data/test/java/lang/String/Regex.java.i
 data/src/share/classes/sun/io/CharToByteCp1123.java.i
 data/src/share/classes/javax/print/attribute/standard/PrinterMoreInfo.java.i
 data/test/java/lang/instrument/ExampleForBootClassPath.java.i
-data/src/share/classes/sun/management/MemoryPoolImpl.java.i
+data/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties.i
+data/test/com/sun/jdi/BreakpointWithFullGC.sh.i
 data/test/java/beans/Introspector/Test4274639.java.i
 data/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp.i
 data/test/java/lang/management/RuntimeMXBean/PropertiesTest.java.i
@@ -13302,21 +13211,22 @@ data/test/java/lang/annotation/Missing/B.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/CheckNullEntity.java.i
 data/test/java/beans/Introspector/4750368/Test4750368.java.i
 data/src/share/classes/sun/tools/jstat/OptionFormat.java.i
-data/src/share/classes/com/sun/net/httpserver/spi/package-info.java.i
+data/make/common/Program.gmk.i
 data/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h.i
 data/test/sun/security/tools/jarsigner/JavaApplication1.jar.i
-data/test/java/lang/instrument/bootreporter/StringIdCallbackReporter.java.i
+data/src/share/classes/com/sun/crypto/provider/DESParameters.java.i
 data/src/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java.i
 data/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java.i
-data/test/java/net/URLClassLoader/getresourceasstream/test.jar.i
+data/src/share/classes/javax/swing/event/AncestorEvent.java.i
+data/src/share/classes/java/security/UnrecoverableKeyException.java.i
 data/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java.i
 data/test/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.html.i
 data/src/share/classes/sun/util/resources/CalendarData_es_ES.properties.i
-data/src/share/native/sun/font/layout/ContextualGlyphInsertion.h.i
-data/test/java/util/PluggableLocale/providersrc/java.util.spi.LocaleNameProvider.i
+data/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java.i
+data/src/share/classes/javax/imageio/ImageIO.java.i
 data/test/sun/nio/cs/OLD/IBM935_OLD.java.i
-data/test/sun/rmi/transport/tcp/blockAccept/TestImpl_Stub.java.i
-data/test/java/awt/Color/OpacityChange/OpacityChange.java.i
+data/src/share/classes/sun/text/CodePointIterator.java.i
+data/src/share/classes/javax/print/StreamPrintServiceFactory.java.i
 data/test/java/net/Socket/asyncClose/Socket_getInputStream_read.java.i
 data/make/sun/security/jgss/wrapper/Makefile.i
 data/test/com/sun/security/auth/module/KeyStoreLoginModule/ReadOnly.java.i
@@ -13330,9 +13240,10 @@ data/src/solaris/demo/jvmti/hprof/hprof_md.c.i
 data/test/sun/security/mscapi/SignUsingSHA2withRSA.sh.i
 data/make/mkdemo/jfc/Laffy/Makefile.i
 data/src/share/classes/sun/io/CharToByteISO8859_1.java.i
+data/src/share/classes/java/lang/SuppressWarnings.java.i
 data/src/share/classes/java/io/FileSystem.java.i
 data/test/java/net/URLDecoder/EncodeDecode.java.i
-data/test/java/awt/xembed/server/RunTestXEmbed.java.i
+data/src/share/classes/java/util/ArrayDeque.java.i
 data/src/share/classes/sun/util/locale/BaseLocale.java.i
 data/test/javax/swing/UIDefaults/6622002/bug6622002.java.i
 data/src/share/classes/sun/swing/PrintColorUIResource.java.i
@@ -13349,36 +13260,37 @@ data/src/share/classes/javax/swing/doc-files/JScrollPane-1.gif.i
 data/test/java/awt/Component/NoUpdateUponShow/NoUpdateUponShow.java.i
 data/test/java/util/ResourceBundle/Test4314141A_.properties.i
 data/src/windows/hpi/src/monitor_md.c.i
-data/test/java/beans/Introspector/6380849/beans/FirstBean.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so.d
+data/src/share/classes/sun/security/jgss/krb5/Krb5Util.java.i
 data/make/common/shared/Defs-utils.gmk.i
 data/src/windows/hpi/export/io_md.h.i
 data/src/share/classes/sun/security/x509/CertAndKeyGen.java.i
 data/src/share/classes/sun/security/krb5/Confounder.java.i
 data/src/share/classes/sun/misc/LRUCache.java.i
 data/src/share/lib/images/cursors/win32_LinkNoDrop32x32.gif.i
-data/test/sun/tools/jstatd/jstatdDefaults.sh.i
-data/test/sun/nio/cs/TestStringCoding.java.i
+data/test/java/rmi/activation/CommandEnvironment/NullOptions.java.i
 data/src/share/classes/javax/xml/crypto/dsig/spec/SignatureMethodParameterSpec.java.i
 data/make/mkdemo/scripting/jconsole-plugin/Makefile.i
 data/src/share/classes/sun/security/ssl/DefaultSSLContextImpl.java.i
 data/src/share/native/sun/security/ec/ec2_193.c.i
 data/src/share/classes/sun/text/resources/FormatData_fr.java.i
-data/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java.i
+data/src/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java.i
 data/test/javax/crypto/spec/DESKeySpec/NullKey.java.i
 data/test/java/beans/XMLEncoder/javax_swing_Box_Filler.java.i
-data/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java.i
 data/src/share/classes/java/awt/Container.java.i
 data/src/solaris/classes/sun/awt/motif/X11Dingbats.java.i
 data/test/sun/nio/cs/Test4200310.sh.i
-data/src/share/classes/sun/io/ByteToCharCp424.java.i
+data/test/java/io/charStreams/RandomLines.java.i
+data/src/share/classes/com/sun/media/sound/StandardMidiFileReader.java.i
 data/src/share/classes/java/util/concurrent/ExecutorService.java.i
 data/src/share/classes/sun/security/validator/Validator.java.i
 data/src/share/classes/java/awt/event/PaintEvent.java.i
 data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/DirectoryScannerConfig.java.i
+data/src/share/classes/javax/management/SendNotification.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java.i
 data/src/share/classes/sun/security/krb5/internal/rcache/CacheTable.java.i
 data/make/tools/swing-beans/beaninfo/images/JButtonMono32.gif.i
+data/src/share/sample/scripting/scriptpad/src/resources/conc.js.i
+data/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java.i
 data/test/java/io/Serializable/longString/mesg.ser.i
 data/test/javax/swing/JColorChooser/Test6348456.java.i
 data/test/java/awt/print/PrinterJob/ValidatePage/ValidatePage.java.i
@@ -13387,15 +13299,16 @@ data/src/share/classes/sun/reflect/UnsafeStaticBooleanFieldAccessorImpl.java.i
 data/src/share/classes/sun/net/www/content/text/PlainTextInputStream.java.i
 data/src/share/classes/sun/tools/jar/Manifest.java.i
 data/src/share/classes/javax/print/attribute/standard/Finishings.java.i
+data/src/share/classes/javax/xml/crypto/dom/package.html.i
 data/src/share/classes/com/sun/jdi/ClassObjectReference.java.i
 data/test/sun/security/krb5/etype/weakcrypto.conf.i
 data/test/javax/swing/JSlider/6579827/bug6579827.java.i
 data/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java.i
 data/test/java/net/Socket/TestAfterClose.java.i
-data/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java.i
 data/src/share/classes/java/rmi/server/ExportException.java.i
 data/test/sun/misc/URLClassPath/ClassnameCharTest.java.i
-data/test/sun/security/pkcs11/Signature/ReinitSignature.java.i
+data/test/java/util/ResourceBundle/Bug6204853_Utf8.properties.i
 data/src/share/classes/javax/naming/directory/SearchResult.java.i
 data/src/share/classes/javax/swing/BufferStrategyPaintManager.java.i
 data/src/windows/native/sun/java2d/d3d/D3DUtils.cpp.i
@@ -13410,64 +13323,60 @@ data/make/java/java_crw_demo/Makefile.i
 data/src/share/native/sun/font/layout/GlyphPositioningTables.cpp.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java.i
 data/test/java/net/DatagramSocket/Send12k.java.i
-data/test/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java.i
+data/src/solaris/classes/sun/awt/motif/MButtonPeer.java.i
 data/src/share/classes/java/lang/module/Dependence.java.i
 data/test/java/beans/PropertyEditor/TestStringClass.java.i
-data/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/rsa/BrokenRSAPrivateCrtKey.java.i
 data/src/share/demo/jvmti/hprof/hprof_io.h.i
 data/test/java/net/Inet6Address/serialize/Readme.txt.i
-data/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/FloatCalls.java.i
 data/src/share/classes/sun/nio/cs/ext/MS1258.java.i
 data/test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_es_MX.properties.i
 data/test/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java.i
-data/test/java/util/Locale/bug6277243.java.i
+data/test/java/beans/XMLDecoder/spec/TestNew.java.i
 data/src/share/classes/com/sun/security/auth/NTNumericCredential.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_es_PR.properties.i
+data/make/mksample/nio/file/Makefile.i
 data/src/share/classes/javax/management/MBeanTrustPermission.java.i
 data/test/java/beans/Introspector/Test4935607.java.i
-data/test/java/awt/Cursor/PredefinedPrivate/PredefinedPrivate.java.i
-data/test/java/beans/XMLDecoder/spec/TestClass.java.i
-data/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java.i
+data/src/share/classes/javax/sql/rowset/spi/SyncResolver.java.i
+data/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.Connector.i
+data/src/share/classes/java/util/TimerTask.java.i
+data/src/share/classes/sun/text/resources/FormatData_en_IE.java.i
 data/src/share/classes/java/lang/Byte.java.i
-data/src/solaris/classes/sun/awt/X11/generator/functions.txt.i
+data/test/sun/security/ssl/sanity/interop/JSSEServer.java.i
 data/test/java/util/logging/AnonLoggerWeakRefLeak.java.i
 data/test/javax/management/namespace/VirtualMBeanTest.java.i
 data/test/java/net/SocketInputStream/SocketTimeout.java.i
 data/test/sun/tools/common/ApplicationSetup.sh.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityException.java.i
+data/src/share/classes/sun/misc/ExtensionInstallationException.java.i
 data/src/share/classes/com/sun/jndi/ldap/BerEncoder.java.i
 data/src/share/classes/sun/font/FontManager.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java.i
 data/src/share/classes/sun/tools/jconsole/resources/brandlogo.png.i
-data/src/windows/hpi/src/path_md.c.i
-data/test/java/util/PluggableLocale/providersrc/DateFormatProviderImpl.java.i
 data/src/share/classes/sun/security/krb5/internal/util/KerberosString.java.i
-data/src/share/classes/sun/security/pkcs11/Secmod.java.i
 data/src/share/classes/java/awt/image/AffineTransformOp.java.i
 data/src/windows/native/sun/java2d/d3d/D3DBadHardware.h.i
 data/src/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java.i
+data/src/share/classes/java/text/spi/DateFormatSymbolsProvider.java.i
 data/src/share/demo/scripting/jconsole-plugin/build.xml.i
 data/src/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java.i
-data/test/java/security/KeyRep/SerialOld.java.i
 data/src/share/native/sun/java2d/Trace.h.i
 data/test/demo/jvmti/hprof/CpuSamplesTest.java.i
-data/test/java/lang/management/MemoryMXBean/LowMemoryTest2.java.i
-data/src/share/classes/java/security/cert/CertificateRevokedException.java.i
+data/test/java/lang/reflect/Constructor/TestParameterAnnotations.java.i
 data/src/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java.i
+data/src/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java.i
 data/src/share/classes/javax/swing/plaf/PopupMenuUI.java.i
-data/test/java/util/zip/GZIP/GZIPInputStreamRead.java.i
 data/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java.i
-data/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java.i
 data/test/java/net/URL/B5086147.sh.i
-data/src/solaris/classes/sun/awt/motif/X11DropTargetContextPeer.java.i
-data/test/javax/management/query/QueryNotifFilterTest.java.i
+data/src/windows/classes/java/net/PlainSocketImpl.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/AbstractOptionSpec.java.i
 data/test/java/nio/charset/spi/default-pol.i
-data/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.java.i
 data/src/share/classes/java/sql/DriverManager.java.i
 data/src/share/classes/com/sun/servicetag/RegistrationDocument.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownSubSystemException.java.i
+data/test/java/rmi/transport/checkLeaseInfoLeak/security.policy.i
 data/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.properties.i
 data/src/share/classes/javax/swing/tree/TreePath.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java.i
@@ -13476,22 +13385,23 @@ data/make/tools/UnicodeData/VERSION.i
 data/test/java/beans/XMLEncoder/6777487/TestEnumMap.java.i
 data/src/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java.i
 data/src/share/classes/javax/swing/ButtonModel.java.i
-data/src/share/classes/javax/management/NotificationInfos.java.i
-data/src/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java.i
 data/src/share/classes/javax/management/QueryEval.java.i
 data/make/tools/swing-beans/beaninfo/images/JAppletColor32.gif.i
 data/src/windows/classes/sun/awt/windows/WDesktopPeer.java.i
-data/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandardMBean.java.i
+data/make/java/zip/Makefile.i
 data/test/sun/nio/cs/TestISO2022JP.java.i
 data/src/share/classes/java/io/FilePermission.java.i
-data/test/java/awt/print/PrinterJob/PrtException.java.i
+data/src/share/classes/sun/audio/AudioStream.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM918.java.i
 data/test/javax/imageio/plugins/bmp/BMPSubsamplingTest.java.i
-data/src/share/classes/javax/crypto/spec/RC2ParameterSpec.java.i
+data/src/share/classes/javax/swing/plaf/DimensionUIResource.java.i
 data/test/sun/misc/ClassLoaderUtil/Test.java.i
+data/test/java/net/URLConnection/xml/not-xml1.i
 data/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java.i
 data/src/solaris/classes/sun/awt/X11/ListHelper.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/GetResponseCode.java.i
+data/test/java/io/Serializable/6559775/README.i
 data/test/sun/net/idn/nfscis.spp.i
 data/test/javax/management/remote/mandatory/connection/RMISerializeTest.java.i
 data/src/windows/classes/sun/java2d/windows/WinBackBuffer.java.i
@@ -13503,19 +13413,19 @@ data/src/share/classes/sun/util/resources/CalendarData_ca.properties.i
 data/src/share/classes/sun/jvmstat/monitor/Variability.java.i
 data/test/com/sun/jdi/InstancesTest.java.i
 data/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java.i
-data/src/share/classes/java/text/CollationKey.java.i
+data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java.i
 data/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2_Stub.java.i
-data/src/share/classes/sun/io/CharToByteDoubleByte.java.i
+data/test/java/security/KeyPairGenerator/GenerateKeypair.java.i
 data/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java.i
 data/make/tools/src/build/tools/jdwpgen/EventNode.java.i
 data/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java.i
-data/make/tools/src/build/tools/jdwpgen/Main.java.i
+data/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldColor32.gif.i
 data/test/sun/security/provider/PolicyFile/TrustedCert.java.i
 data/src/share/classes/sun/swing/plaf/WindowsKeybindings.java.i
 data/test/javax/management/mxbean/ThreadMXBeanTest.java.i
 data/src/share/classes/com/sun/media/sound/DLSSampleOptions.java.i
 data/test/java/util/Collections/SetFromMap.java.i
-data/test/sun/tools/jrunscript/Hello.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ProtocolVersion/HttpsProtocols.java.i
 data/test/java/nio/file/Files/CreateFileTree.java.i
 data/src/share/classes/javax/management/monitor/MonitorNotification.java.i
 data/src/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java.i
@@ -13523,264 +13433,267 @@ data/src/windows/bin/java_md.c.i
 data/src/share/classes/java/util/JumboEnumSet.java.i
 data/test/com/sun/servicetag/NewRegistrationData.java.i
 data/src/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java.i
+data/test/sun/security/provider/PolicyFile/CombinedPerms.java.i
 data/src/share/classes/sun/security/krb5/internal/util/KerberosFlags.java.i
 data/src/share/classes/javax/print/attribute/standard/PrinterIsAcceptingJobs.java.i
 data/test/java/util/Formatter/Constructors.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java.i
 data/src/solaris/native/sun/java2d/x11/XRSurfaceData.c.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpValue.java.i
 data/make/sun/motif12/reorder-sparc.i
 data/test/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java.i
 data/src/share/classes/sun/text/normalizer/UnicodeSetIterator.java.i
 data/test/sun/security/krb5/Krb5NameEquals.java.i
-data/test/javax/crypto/CryptoPermission/AllPermCheck.java.i
-data/src/solaris/classes/sun/awt/motif/X11SunUnicode_0.java.i
+data/test/java/beans/beancontext/Test4132698.java.i
 data/src/share/classes/java/awt/AWTEvent.java.i
 data/src/share/demo/jfc/Notepad/resources/paste.gif.i
-data/src/share/classes/sun/text/normalizer/UnicodeMatcher.java.i
+data/src/share/classes/javax/sql/rowset/Joinable.java.i
 data/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh.i
 data/test/org/openjdk/jigsaw/_RepositoryCatalog.java.i
+data/test/java/beans/XMLEncoder/java_lang_reflect_Method.java.i
 data/test/sun/net/www/protocol/jar/B4756443.java.i
-data/src/share/sample/nio/server/BP.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorVersionException.java.i
 data/make/tools/swing-beans/beaninfo/images/JMenuItemColor32.gif.i
 data/src/share/classes/java/util/concurrent/locks/ReentrantLock.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionImpl/HashCodeMissing.java.i
-data/src/solaris/hpi/include/interrupt.h.i
-data/src/share/native/sun/awt/libpng/pngerror.c.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java.i
 data/test/java/rmi/reliability/benchmark/bench/serial/ClassDesc.java.i
 data/make/org/openjdk/Makefile.i
 data/src/share/classes/java/awt/print/PrinterAbortException.java.i
 data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/project.xml.i
 data/src/share/lib/logging.properties.i
 data/src/share/classes/sun/io/CharToByteCp874.java.i
+data/test/org/openjdk/jigsaw/hello-view.sh.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpPduBulkType.java.i
 data/src/share/native/java/lang/fdlibm/src/e_sinh.c.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java.i
-data/src/share/classes/sun/applet/AppletIOException.java.i
+data/test/java/rmi/reliability/benchmark/bench/Benchmark.java.i
+data/src/share/classes/javax/sound/sampled/Port.java.i
 data/test/java/lang/Math/CeilAndFloorTests.java.i
 data/test/java/util/Locale/bug4123285.java.i
-data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubBulkRequestHandler.java.i
-data/src/share/native/sun/security/ec/impl/ec.h.i
-data/src/share/classes/sun/reflect/generics/tree/TypeSignature.java.i
-data/test/java/lang/instrument/AInstrumentationTestCase.java.i
-data/test/javax/print/applet/applet3/Applet3PrintService.java.i
-data/src/share/classes/sun/text/bidi/BidiRun.java.i
-data/src/solaris/javavm/export/jni_md.h.i
+data/src/share/classes/java/awt/GridLayout.java.i
+data/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java.i
+data/test/java/nio/channels/FileChannel/Position.java.i
+data/test/java/beans/PropertyChangeSupport/Test4985020.java.i
+data/test/java/rmi/reliability/benchmark/bench/serial/DoubleArrays.java.i
 data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h.i
 data/test/javax/swing/JFileChooser/6741890/bug6741890.java.i
-data/src/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java.i
+data/src/windows/classes/com/sun/security/auth/module/README.i
 data/make/tools/src/build/tools/jdwpgen/UntaggedValueTypeNode.java.i
 data/src/share/classes/sun/awt/shell/ShellFolderManager.java.i
-data/test/sun/security/pkcs11/KeyStore/ClientAuthData/p11-nss.txt.i
+data/test/java/net/DatagramPacket/CheckBoundaries.java.i
 data/src/share/classes/java/security/cert/PKIXBuilderParameters.java.i
 data/test/java/net/Socket/asyncClose/ServerSocket_accept.java.i
-data/src/share/classes/javax/naming/ldap/UnsolicitedNotification.java.i
-data/test/java/lang/Throwable/LegacyChainedExceptionSerialization.java.i
+data/src/share/classes/sun/net/www/protocol/http/InMemoryCookieStore.java.i
+data/test/java/net/URL/HandlerLoop.java.i
 data/src/share/classes/sun/security/provider/certpath/BuildStep.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapItem.java.i
+data/test/java/beans/VetoableChangeSupport/1.6.0.ser.i
 data/src/share/classes/sun/security/ssl/HandshakeInStream.java.i
 data/src/windows/native/sun/windows/awt_FileDialog.h.i
-data/src/share/native/java/util/zip/zlib-1.1.3/zadler32.c.i
-data/test/sun/net/www/protocol/jar/foo.jar.i
-data/test/java/beans/PropertyEditor/TestBooleanTypeJava.java.i
+data/src/windows/bin/i586/jvm.cfg.i
+data/src/share/classes/java/awt/font/MultipleMaster.java.i
+data/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h.i
 data/test/java/security/Identity/EqualsHashCodeContract.java.i
 data/test/sun/security/util/DerValue/DerValueEqualsHashCode.java.i
 data/make/sun/xawt/FILES_export_unix.gmk.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/ConstantPoolAnalyzer.java.i
+data/test/java/nio/channels/DatagramChannel/ChangingAddress.java.i
 data/test/java/io/Serializable/packageAccess/D.java.i
+data/src/share/classes/sun/nio/ch/SelectionKeyImpl.java.i
 data/test/java/util/ResourceBundle/Control/ControlFactoryTest.java.i
 data/src/share/classes/javax/smartcardio/CardTerminal.java.i
 data/make/tools/src/build/tools/jdwpgen/Parse.java.i
-data/src/share/classes/sun/io/CharToByteCp964.java.i
-data/test/sun/security/pkcs11/Provider/cspPlus.cfg.i
+data/src/share/classes/java/awt/print/PrinterGraphics.java.i
 data/test/java/net/URLConnection/RequestPropertyValues.java.i
-data/make/mkdemo/applets/SimpleGraph/Makefile.i
+data/src/share/classes/sun/security/x509/X500Name.java.i
 data/test/java/io/PipedOutputStream/NotConnected.java.i
-data/test/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ClientServer.java.i
 data/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java.i
-data/src/share/classes/sun/tools/tree/FinallyStatement.java.i
+data/src/share/classes/sun/text/resources/FormatData_bg_BG.java.i
 data/src/share/classes/javax/management/AttributeValueExp.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java.i
+data/src/share/classes/com/sun/tools/jdi/BooleanTypeImpl.java.i
 data/test/java/lang/instrument/appendToClassLoaderSearch/Tracer.java.i
-data/src/solaris/classes/sun/awt/X11InputMethod.java.i
+data/test/java/security/SecureRandom/sha1prng-old.bin.i
 data/src/share/classes/java/awt/event/KeyAdapter.java.i
-data/test/java/util/concurrent/CopyOnWriteArraySet/RacingCows.java.i
-data/src/share/classes/com/sun/naming/internal/VersionHelper.java.i
-data/src/share/classes/com/sun/jdi/ObjectCollectedException.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so.i
+data/test/sun/nio/cs/X11CNS11643.java.i
 data/test/java/lang/annotation/loaderLeak/A.java.i
-data/src/share/classes/javax/xml/crypto/dsig/spec/TransformParameterSpec.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so.d
 data/make/tools/CharsetMapping/IBM874.nr.i
 data/src/share/classes/com/sun/rmi/rmid/ExecPermission.java.i
 data/src/share/classes/java/util/Map.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_sv.properties.i
+data/src/share/javavm/export/classfile_constants.h.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/SyntaxException.java.i
 data/test/java/rmi/reliability/README.i
 data/src/share/classes/java/util/Stack.java.i
 data/src/share/classes/java/awt/SystemColor.java.i
 data/test/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java.i
 data/src/share/classes/com/sun/crypto/provider/DESKeyFactory.java.i
-data/test/demo/jvmti/hprof/HeapDumpTest.java.i
+data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java.i
 data/src/share/classes/java/security/KeyManagementException.java.i
 data/src/share/classes/org/openjdk/jigsaw/Library.java.i
 data/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh.i
-data/src/share/classes/java/lang/TypeNotPresentException.java.i
+data/test/java/util/AbstractMap/SimpleEntries.java.i
 data/src/share/classes/java/util/regex/Matcher.java.i
 data/make/tools/reorder/tests/JHello.java.i
 data/src/share/javavm/include/opcodes.length.i
 data/src/share/classes/java/security/acl/Permission.java.i
-data/src/share/classes/sun/tools/tree/PreIncExpression.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java.i
 data/test/java/awt/dnd/FileListBetweenJVMsTest/SourceFileListFrame.java.i
 data/test/java/rmi/RemoteException/chaining/Chaining.java.i
-data/src/share/classes/com/sun/jndi/toolkit/dir/ContainmentFilter.java.i
-data/make/com/sun/security/auth/module/FILES_export_windows.gmk.i
+data/test/javax/management/ObjectInstance/MBeanInfoFailTest.java.i
 data/src/share/classes/sun/io/CharToByteEUC.java.i
 data/src/share/classes/sun/io/CharToByteGBK.java.i
 data/test/java/beans/XMLEncoder/Test4950122.java.i
 data/test/java/io/File/DeleteOnExit.java.i
 data/src/share/classes/javax/imageio/spi/RegisterableService.java.i
-data/test/tools/jar/JarEntryTime.java.i
+data/test/java/lang/instrument/IsModifiableClassAgent.java.i
 data/src/share/classes/sun/nio/cs/MS1250.java.i
 data/src/share/classes/sun/tools/tree/BitNotExpression.java.i
+data/test/java/lang/reflect/Array/ExceedMaxDim.java.i
 data/src/share/classes/sun/java2d/pipe/ShapeSpanIterator.java.i
-data/src/share/classes/java/util/AbstractSet.java.i
+data/src/share/classes/sun/io/ByteToCharMacCyrillic.java.i
 data/src/share/classes/sun/security/x509/AlgIdDSA.java.i
-data/src/windows/classes/sun/awt/windows/WClipboard.java.i
 data/src/share/classes/sun/reflect/package.html.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpBadSecurityLevelException.java.i
 data/src/share/classes/javax/net/ssl/SSLSession.java.i
+data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java.i
 data/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java.i
 data/test/sun/net/InetAddress/nameservice/simple/DefaultCaching.java.i
 data/test/java/awt/Mixing/setComponentZOrder.java.i
-data/src/share/classes/sun/print/CustomMediaTray.java.i
+data/src/share/classes/sun/tools/jconsole/Plotter.java.i
 data/test/java/beans/XMLDecoder/spec/TestString.java.i
 data/src/share/native/sun/awt/image/jpeg/jcphuff.c.i
 data/test/sun/security/provider/certpath/DisabledAlgorithms/README.i
 data/src/share/classes/com/sun/tools/attach/spi/package.html.i
-data/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-failed.png.i
+data/src/share/demo/nbproject/management/FullThreadDump/build.xml.i
 data/src/share/classes/com/sun/media/sound/AuFileFormat.java.i
 data/test/java/net/URLClassLoader/B6827999.java.i
-data/test/java/io/Serializable/class/SerialA_1.java.i
-data/src/share/native/sun/security/ec/mp_gf2m.h.i
+data/test/javax/swing/ToolTipManager/Test6256140.java.i
+data/src/share/classes/java/beans/AppletInitializer.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM948.java.i
-data/src/share/demo/jvmti/hprof/hprof_object.h.i
-data/make/tools/swing-beans/beaninfo/images/JRadioButtonColor32.gif.i
+data/test/java/security/Security/ClassLoaderDeadlock/CreateSerialized.java.i
 data/test/java/util/concurrent/locks/ReentrantReadWriteLock/Count.java.i
 data/test/java/net/URLClassLoader/closetest/test1/com/foo/Resource1.i
-data/src/share/classes/sun/security/krb5/KrbKdcReq.java.i
+data/test/sun/nio/cs/LatinCharReplacementTWTest.java.i
 data/test/java/util/EnumMap/ToArray.java.i
-data/make/tools/CharsetMapping/IBM868.map.i
 data/src/share/classes/sun/security/ssl/X509TrustManagerImpl.java.i
-data/src/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java.i
-data/src/share/classes/com/sun/servicetag/resources/register_ja.html.i
+data/src/share/classes/sun/util/resources/CurrencyNames_sk_SK.properties.i
+data/test/java/nio/channels/TestThread.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java.i
 data/test/sun/nio/cs/OLD/EUC_KR_OLD.java.i
 data/src/solaris/native/sun/awt/awt_TextField.h.i
-data/src/share/classes/org/openjdk/internal/joptsimple/internal/ValueConverter.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathTableMetaImpl.java.i
 data/src/windows/native/common/jdk_util_md.c.i
-data/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c.i
+data/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java.i
+data/src/share/classes/sun/tools/jconsole/resources/masthead-left.png.i
 data/src/share/native/sun/awt/libpng/LICENSE.i
 data/src/share/classes/sun/management/Sensor.java.i
+data/make/netbeans/common/jtreg-view.ent.i
 data/src/share/classes/javax/management/openmbean/CompositeDataView.java.i
 data/src/share/classes/java/lang/annotation/Retention.java.i
-data/make/tools/swing-beans/beaninfo/images/JPopupMenuMono16.gif.i
-data/src/share/classes/sun/reflect/generics/tree/IntSignature.java.i
+data/src/share/classes/javax/swing/JComponent.java.i
+data/src/share/native/sun/awt/image/cvutils/img_noscale.h.i
 data/src/share/classes/com/sun/tools/jdi/Packet.java.i
-data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/file-targets.xml.i
+data/test/java/beans/XMLEncoder/javax_swing_border_EtchedBorder.java.i
 data/test/java/nio/charset/Charset/EncDec.java.i
 data/src/share/classes/java/net/SocketAddress.java.i
 data/src/solaris/doc/sun/man/man1/javap.1.i
 data/src/share/classes/sun/tools/jstat/RowClosure.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java.i
-data/src/share/classes/java/nio/X-Buffer-bin.java.template.i
-data/test/java/beans/EventHandler/Test6179222.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/Constants.java.i
+data/test/sun/net/www/protocol/jar/getcontenttype.sh.i
+data/test/java/lang/instrument/RedefineSetUp.sh.i
 data/src/share/classes/sun/util/logging/resources/logging.properties.i
-data/test/sun/security/provider/PolicyParser/ExtDirs.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM1047.java.i
-data/src/share/classes/sun/awt/TracedEventQueue.java.i
+data/test/sun/management/windows/revokeall.c.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmMemoryMetaImpl.java.i
 data/test/java/awt/AlphaComposite/TestAlphaCompositeForNaN.java.i
 data/src/share/native/java/lang/SecurityManager.c.i
 data/test/java/awt/dnd/ImageDecoratedDnDInOut/MyCursor.java.i
 data/src/share/classes/sun/text/resources/FormatData_ar.java.i
 data/test/java/rmi/activation/Activatable/checkActivateRef/rmid.security.policy.i
-data/test/java/beans/Statement/Test6788531.java.i
+data/test/java/lang/Class/IsSynthetic.java.i
 data/src/solaris/doc/sun/man/man1/ja/jinfo.1.i
 data/test/sun/security/tools/keytool/NewSize7.java.i
 data/src/share/classes/javax/swing/JFormattedTextField.java.i
 data/src/share/classes/sun/security/krb5/PrincipalName.java.i
-data/test/javax/swing/JTabbedPane/6670274/bug6670274.java.i
+data/src/share/classes/sun/security/tools/CertAndKeyGen.java.i
 data/src/share/classes/java/security/interfaces/DSAKey.java.i
-data/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java.i
-data/src/share/classes/javax/swing/event/RowSorterEvent.java.i
-data/make/tools/swing-beans/beaninfo/images/JRadioButtonMono16.gif.i
-data/src/windows/native/sun/java2d/d3d/D3DRuntimeTest.cpp.i
-data/src/share/classes/com/sun/security/auth/LdapPrincipal.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvIndex3_8_8nw.c.i
+data/src/share/classes/sun/security/provider/DSAParameters.java.i
+data/src/share/classes/javax/swing/text/TabSet.java.i
+data/test/java/lang/reflect/Method/InheritedInterfaceMethods.java.i
+data/test/org/openjdk/jigsaw/cli/TimestampTest.java.i
+data/make/sun/font/reorder-i586.i
 data/test/sun/security/krb5/auto/KeyTabCompat.java.i
 data/make/netbeans/common/architectures/arch-i386.properties.i
+data/test/java/math/BigDecimal/DivideMcTests.java.i
 data/src/share/classes/java/nio/channels/spi/SelectorProvider.java.i
 data/src/share/classes/sun/security/rsa/RSAKeyFactory.java.i
 data/src/share/classes/sun/print/resources/serviceui_ko.properties.i
 data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedSet.java.i
 data/test/java/util/zip/InflateIn_DeflateOut.java.i
 data/test/javax/management/remote/mandatory/subjectDelegation/policy35.i
-data/src/share/classes/javax/security/auth/callback/CallbackHandler.java.i
+data/src/share/classes/sun/text/normalizer/UCharacterProperty.java.i
 data/test/java/rmi/reliability/benchmark/bench/serial/manifest.i
 data/test/com/sun/nio/sctp/SctpChannel/Util.java.i
 data/test/sun/tools/jstat/hsperfdata_3433.i
-data/src/solaris/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java.i
-data/src/share/classes/java/lang/ClassCircularityError.java.i
-data/src/share/classes/com/sun/tools/attach/VirtualMachine.java.i
+data/src/share/native/sun/security/ec/mp_gf2m-priv.h.i
+data/src/share/classes/com/sun/jndi/ldap/pool/ConnectionsWeakRef.java.i
 data/src/windows/bin/java_md.h.i
 data/src/share/classes/sun/util/resources/LocaleNames_nl.properties.i
-data/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties.i
+data/src/share/classes/java/beans/ExceptionListener.java.i
 data/test/javax/security/auth/login/LoginContext/ResetModule.java.i
+data/src/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java.i
+data/src/share/classes/java/nio/file/attribute/FileAttributeView.java.i
 data/test/java/lang/management/ThreadMXBean/LockingThread.java.i
 data/src/share/classes/sun/io/ByteToCharCp834.java.i
 data/src/share/classes/com/sun/jdi/VMMismatchException.java.i
 data/src/share/classes/sun/security/krb5/internal/KDCRep.java.i
 data/src/share/classes/sun/java2d/opengl/OGLPaints.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java.i
-data/test/javax/sound/midi/Gervill/SoftChannel/Mono.java.i
-data/src/share/classes/java/io/PushbackReader.java.i
+data/src/share/classes/sun/beans/editors/FontEditor.java.i
 data/src/share/classes/sun/tools/jstat/Jstat.java.i
 data/src/share/classes/javax/management/event/EventSubscriber.java.i
 data/src/share/native/sun/java2d/loops/MapAccelFunc.c.i
 data/src/share/classes/java/beans/PropertyEditorManager.java.i
+data/src/share/classes/java/applet/package.html.i
 data/src/share/classes/com/sun/jndi/url/ldap/ldapURLContext.java.i
-data/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java.i
-data/src/windows/native/java/util/logging.c.i
 data/src/share/classes/java/util/concurrent/Executors.java.i
-data/test/java/security/BasicPermission/SerialVersion.1.2.1.i
-data/src/windows/classes/sun/awt/windows/WSystemTrayPeer.java.i
+data/src/share/classes/sun/nio/cs/ext/ISO2022_CN.java.i
+data/src/share/classes/sun/java2d/loops/FillRect.java.i
+data/make/tools/swing-beans/beaninfo/images/JProgressBarColor16.gif.i
 data/test/java/text/Bidi/Bug7051769.java.i
 data/test/com/sun/jdi/ProcessAttachDebuggee.java.i
 data/src/share/demo/nbproject/jfc/Metalworks/nbproject/project.xml.i
+data/src/share/classes/sun/tools/tree/ByteExpression.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM1143.java.i
+data/src/share/native/sun/java2d/pipe/RenderBuffer.c.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16S16Func.c.i
 data/test/com/sun/crypto/provider/Cipher/DES/FlushBug.java.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/Module.java.i
+data/test/java/lang/instrument/PremainClass/InheritAgent1011.java.i
+data/test/java/security/spec/ECCBasic.java.i
 data/test/sun/net/idn/PunycodeTest.java.i
 data/src/share/classes/sun/font/CompositeStrike.java.i
-data/src/share/classes/sun/security/provider/certpath/OCSPResponse.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/TruncateArray.java.i
 data/src/share/demo/java2d/J2DBench/resources/textdata/korean.ut8.txt.i
 data/src/share/back/ClassTypeImpl.h.i
-data/src/share/classes/sun/security/provider/SeedGenerator.java.i
 data/test/java/net/MulticastSocket/MulticastTTL.java.i
-data/make/tools/swing-beans/beaninfo/images/JButtonMono16.gif.i
-data/src/share/classes/sun/nio/cs/MS1257.java.i
-data/src/share/classes/sun/io/ByteToCharCp1046.java.i
+data/test/sun/security/krb5/IPv6.java.i
+data/src/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java.i
+data/test/java/util/concurrent/CopyOnWriteArrayList/EqualsRace.java.i
+data/src/share/classes/sun/net/util/IPAddressUtil.java.i
 data/src/share/classes/java/awt/dnd/package.html.i
 data/src/share/classes/sun/tools/jconsole/inspector/XMBeanOperations.java.i
+data/test/com/sun/net/httpserver/SelCacheTest.java.i
 data/test/java/net/ResponseCache/ResponseCacheTest.java.i
 data/make/sun/security/Makefile.i
 data/test/java/rmi/activation/Activatable/checkImplClassLoader/rmid.security.policy.i
 data/test/sun/security/provider/PolicyFile/getinstance/GetInstance.java.i
 data/test/java/util/Scanner/FailingConstructors.java.i
 data/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java.i
-data/src/share/classes/sun/text/resources/FormatData_ar_KW.java.i
-data/src/share/classes/com/sun/jdi/connect/ListeningConnector.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_no_NO_NY.properties.i
+data/test/sun/rmi/rmic/newrmic/equivalence/Agent.java.i
 data/make/java/nio/spp.sh.i
 data/src/share/classes/java/nio/file/FileTreeWalker.java.i
 data/src/share/native/sun/tracing/dtrace/JVM.c.i
@@ -13789,15 +13702,12 @@ data/make/sun/nio/cs/FILES_java.gmk.i
 data/test/javax/management/query/QuerySubstringTest.java.i
 data/src/share/classes/com/sun/beans/decoder/StringElementHandler.java.i
 data/src/share/classes/sun/net/ResourceManager.java.i
-data/src/share/classes/sun/security/pkcs/EncodingException.java.i
-data/test/java/net/URLClassLoader/closetest/Common.java.i
 data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h.i
-data/src/share/classes/sun/text/normalizer/UProperty.java.i
-data/test/java/net/MulticastSocket/Leave.java.i
+data/src/windows/classes/java/lang/Terminator.java.i
 data/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java.i
 data/src/share/classes/sun/font/AttributeValues.java.i
 data/test/java/lang/ThreadGroup/Daemon.java.i
-data/src/share/classes/java/sql/SQLPermission.java.i
+data/src/share/classes/sun/net/www/protocol/https/HttpsClient.java.i
 data/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java.i
 data/src/share/classes/sun/swing/BakedArrayList.java.i
 data/src/share/classes/javax/management/relation/RoleResult.java.i
@@ -13805,15 +13715,15 @@ data/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java.i
 data/make/mkdemo/jvmti/compiledMethodLoad/Makefile.i
 data/test/java/util/jar/JarFile/no-manifest.jar.i
 data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl_Stub.java.i
-data/src/share/classes/java/net/Inet4Address.java.i
-data/test/java/rmi/server/useCustomRef/UseCustomRef.java.i
+data/test/sun/net/www/protocol/http/SetIfModifiedSince.java.i
+data/test/sun/security/pkcs11/ec/TestECDH.java.i
 data/src/windows/native/sun/windows/README.JNI.i
 data/src/share/classes/javax/security/cert/CertificateExpiredException.java.i
 data/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html.i
 data/src/share/classes/javax/naming/ldap/package.html.i
 data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/DirectoryScannerTest.java.i
-data/make/tools/swing-beans/beaninfo/images/JRootPaneMono32.gif.i
-data/src/share/classes/javax/xml/crypto/dsig/dom/package.html.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/OwnerImpl.java.i
+data/src/share/classes/sun/security/krb5/internal/crypto/CksumType.java.i
 data/test/javax/management/remote/mandatory/notif/NotificationBufferTest.java.i
 data/src/share/classes/sun/io/CharToByteISCII91.java.i
 data/src/share/classes/javax/accessibility/AccessibleAttributeSequence.java.i
@@ -13821,146 +13731,145 @@ data/src/share/instrument/Reentrancy.c.i
 data/src/share/classes/javax/swing/text/html/TextAreaDocument.java.i
 data/test/com/sun/crypto/provider/Cipher/PBE/PBEKeysAlgorithmNames.java.i
 data/make/javax/sound/jsoundhs/Makefile.i
-data/test/java/net/DatagramSocket/SendSize.java.i
+data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java.i
 data/test/java/beans/PropertyEditor/TestFontClass.java.i
 data/test/java/nio/charset/CharsetEncoder/Flush.java.i
-data/src/share/classes/sun/font/SunFontManager.java.i
-data/src/linux/doc/man/ja/javadoc.1.d
+data/src/share/classes/sun/text/resources/FormatData_ko_KR.java.i
+data/src/share/classes/sun/jkernel/Mutex.java.i
 data/src/share/classes/com/sun/security/auth/module/Crypt.java.i
 data/src/share/classes/java/lang/reflect/ReflectPermission.java.i
-data/src/linux/doc/man/ja/javadoc.1.i
+data/src/share/classes/sun/net/www/protocol/http/BasicAuthentication.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ReverseNameLookup.java.i
 data/src/share/classes/sun/misc/CharacterEncoder.java.i
-data/test/javax/xml/crypto/dsig/data/xml-stylesheet.b64.i
-data/src/share/back/eventFilter.h.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java.i
+data/src/share/classes/sun/rmi/server/resources/rmid.properties.i
 data/test/java/util/concurrent/ExecutorService/Invoke.java.i
-data/src/share/native/java/util/zip/zlib-1.2.3/zadler32.c.i
-data/src/share/classes/sun/applet/AppletPanel.java.i
+data/test/sun/tools/jps/jps-l_Output1.awk.i
+data/src/share/classes/sun/security/util/BigInt.java.i
 data/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c.i
 data/src/share/classes/sun/nio/cs/ext/JIS_X_0212.java.i
+data/src/share/javavm/export/jdwpTransport.h.i
 data/src/share/classes/javax/swing/ImageIcon.java.i
 data/src/share/classes/com/sun/jdi/request/EventRequestManager.java.i
-data/src/windows/native/sun/windows/awt_MouseEvent.cpp.i
+data/src/share/demo/jfc/Metalworks/UISwitchListener.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpecBuilder.java.i
-data/src/share/classes/com/sun/rowset/WebRowSetImpl.java.i
+data/test/java/io/Serializable/arraySuidConflict/Read.java.i
 data/test/sun/net/sdp/sanity.sh.i
 data/test/java/awt/GraphicsEnvironment/TestGetDefScreenDevice.java.i
-data/test/java/util/TreeMap/NullPermissiveComparator.java.i
-data/make/tools/CharsetMapping/IBM860.map.i
+data/test/com/sun/java/swing/plaf/gtk/Test6635110.java.i
+data/src/solaris/native/sun/awt/awt_DrawingSurface.h.i
 data/test/java/io/StreamTokenizer/input.txt.i
+data/make/modules/tools/src/com/sun/classanalyzer/ResolutionInfo.java.i
 data/test/sun/security/provider/PolicyFile/TrustedCert.policy.i
 data/test/java/nio/charset/RemovingSunIO/SunioAlias.java.i
-data/src/share/classes/sun/text/resources/FormatData_zh_SG.java.i
-data/src/share/classes/java/awt/event/AdjustmentListener.java.i
+data/test/java/util/Collections/Ser.java.i
 data/test/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java.i
 data/src/share/classes/javax/imageio/IIOException.java.i
-data/src/share/classes/com/sun/jdi/request/EventRequest.java.i
+data/make/common/shared/Defs-windows.gmk.i
 data/test/java/beans/PropertyEditor/6380849/editors/SecondBeanEditor.java.i
 data/test/java/lang/Class/getModifiers/ForStaticInnerClass.java.i
 data/test/java/net/InetAddress/MyPrincipal.java.i
 data/src/share/classes/java/awt/doc-files/modal-example2.gif.i
 data/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Des3KdCksumType.java.i
 data/src/share/native/sun/java2d/loops/ParallelogramUtils.h.i
-data/src/share/classes/java/util/concurrent/FutureTask.java.i
+data/src/share/classes/javax/swing/InputVerifier.java.i
 data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/Receiver.java.i
 data/src/share/classes/java/net/StandardSocketOption.java.i
 data/test/java/beans/PropertyEditor/TestBooleanClass.java.i
+data/src/share/classes/sun/security/util/DerIndefLenConverter.java.i
 data/src/windows/native/java/io/RandomAccessFile_md.c.i
 data/src/share/native/sun/font/layout/ThaiShaping.cpp.i
-data/test/java/net/URLClassLoader/getresourceasstream/test.sh.i
+data/test/java/rmi/activation/Activatable/nonExistentActivatable/group.security.policy.i
 data/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c.i
-data/test/java/awt/PrintJob/MultipleEnd/MultipleEnd.java.i
-data/src/share/classes/java/io/PrintStream.java.i
+data/src/share/classes/sun/font/FontManagerFactory.java.i
+data/test/sun/security/tools/policytool/ChangeUI.java.i
+data/test/java/io/NegativeInitSize.java.i
 data/test/java/lang/ClassLoader/ExceptionHidingLoader.java.i
-data/src/linux/doc/man/jsadebugd.1.i
+data/test/javax/security/auth/Subject/Serial.java.i
 data/src/share/classes/sun/io/CharToByteCp833.java.i
 data/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java.i
 data/src/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java.i
-data/src/share/classes/java/awt/event/MouseMotionAdapter.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_ru.properties.i
 data/src/share/classes/com/sun/media/sound/ReferenceCountingDevice.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthCheckBoxUI.java.i
-data/test/java/nio/Buffer/BasicShort.java.i
-data/src/share/classes/com/sun/beans/decoder/NullElementHandler.java.i
+data/src/share/classes/sun/net/www/protocol/http/AuthScheme.java.i
+data/src/solaris/native/sun/awt/CUPSfuncs.c.i
+data/src/solaris/classes/sun/awt/X11CustomCursor.java.i
 data/test/javax/naming/spi/DirectoryManager/DummyObjectFactory.java.i
 data/src/solaris/classes/sun/awt/X11/XVerticalScrollbar.java.i
 data/src/share/classes/com/sun/media/sound/PortMixerProvider.java.i
 data/src/share/sample/nio/server/Handler.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaValue.java.i
 data/src/share/native/sun/font/layout/GlyphPositionAdjustments.h.i
-data/test/java/net/URLConnection/ResendPostBody.java.i
+data/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java.i
 data/test/java/util/concurrent/Phaser/Arrive.java.i
-data/test/java/util/Locale/icuLocales.txt.i
-data/test/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.java.i
 data/test/com/sun/jdi/redefineMethod/RedefineTest.java.i
 data/test/java/nio/Buffer/Order.java.i
 data/test/javax/print/attribute/ChromaticityValues.java.i
 data/make/tools/src/build/tools/dtdbuilder/DTDInputStream.java.i
 data/src/share/classes/java/nio/file/Path.java.i
-data/src/share/demo/jfc/Font2DTest/resources/TextResources_ko.properties.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl_Stub.java.i
+data/test/javax/security/auth/PrivateCredentialPermission/Subset.policy.i
 data/src/share/classes/javax/swing/ProgressMonitor.java.i
 data/test/java/lang/System/finalization/FinExit.java.i
-data/test/sun/security/mscapi/AccessKeyStore.sh.i
+data/src/share/classes/javax/naming/LinkRef.java.i
 data/src/share/classes/java/lang/Override.java.i
 data/src/share/classes/java/sql/PseudoColumnUsage.java.i
 data/test/java/lang/Double/ParseDouble.java.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpNull.java.i
 data/src/share/classes/javax/naming/SizeLimitExceededException.java.i
+data/src/share/classes/java/awt/color/ICC_ProfileRGB.java.i
 data/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java.i
 data/test/sun/nio/cs/OLD/DoubleByteDecoder.java.i
 data/src/share/classes/java/beans/ConstructorProperties.java.i
 data/src/share/classes/sun/applet/AppletProps.java.i
-data/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java.i
+data/test/java/beans/PropertyEditor/TestEnumSubclassJava.java.i
 data/src/share/classes/sun/java2d/opengl/OGLUtilities.java.i
-data/make/tools/swing-beans/beaninfo/images/AbstractButtonColor16.gif.i
+data/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java.i
 data/test/javax/swing/JPopupMenu/Separator/6547087/bug6547087.java.i
 data/src/share/classes/javax/management/remote/rmi/RMIServer.java.i
-data/src/share/demo/jfc/CodePointIM/CodePointInputMethod.java.i
+data/test/com/sun/jdi/redefine/RedefineSubTarg.java.i
 data/test/java/lang/instrument/RetransformAgent.java.i
 data/src/share/classes/sun/text/CompactByteArray.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c.i
-data/src/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmOSMBean.java.i
 data/src/share/classes/com/sun/crypto/provider/AESCrypt.java.i
 data/test/java/nio/file/Files/content_type.sh.i
 data/src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java.i
+data/test/javax/management/remote/mandatory/notif/NotificationSenderMBean.java.i
 data/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Extra.java.i
 data/src/share/classes/sun/java2d/opengl/OGLContext.java.i
 data/src/share/classes/sun/java2d/cmm/ProfileDeferralInfo.java.i
-data/src/share/classes/com/sun/media/sound/ModelOscillator.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM864.java.i
-data/test/java/net/URLClassLoader/closetest/test2/com/foo/TestClass1.java.i
+data/src/share/demo/java2d/J2DBench/resources/textdata/greek.ut8.txt.i
+data/test/java/security/BasicPermission/EqualsImplies.java.i
+data/test/java/io/BufferedReader/Ready.java.i
 data/test/java/net/URLConnection/ExifContentGuesser.java.i
 data/test/com/sun/jdi/ArgumentValuesTest.java.i
-data/src/share/classes/sun/awt/CausedFocusEvent.java.i
+data/src/solaris/classes/sun/nio/ch/PipeImpl.java.i
 data/test/java/util/HashMap/SetValue.java.i
 data/src/share/native/sun/font/bidi/ubidi.h.i
 data/src/solaris/native/sun/awt/awt_MenuBar.c.i
 data/src/share/classes/javax/swing/plaf/basic/icons/JavaCup16.png.i
+data/test/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java.i
 data/test/java/io/Serializable/packageAccess/Test.java.i
-data/test/java/security/cert/CertPathBuilder/targetConstraints/BuildOddSel.java.i
-data/src/share/native/common/jdk_util.c.i
-data/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java.i
+data/src/share/classes/sun/security/action/PutAllAction.java.i
+data/test/sun/security/ssl/sanity/interop/CipherTest.java.i
 data/test/javax/imageio/stream/StreamCloserLeak/test/Main.java.i
 data/src/share/classes/sun/io/CharToByteMacHebrew.java.i
-data/test/java/net/URLEncoder/URLEncoderEncodeArgs.java.i
-data/src/share/classes/javax/management/relation/RelationType.java.i
+data/src/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java.i
 data/src/share/demo/java2d/J2DBench/nbproject/project.xml.i
 data/test/sun/net/www/http/HttpClient/RequestURI.java.i
 data/test/java/nio/channels/AsynchronousServerSocketChannel/Basic.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java.i
-data/src/share/classes/sun/net/www/http/KeepAliveCache.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-failed.png.i
 data/test/java/util/ArrayList/RangeCheckMicroBenchmark.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U16Func.c.i
+data/test/javax/script/MyContext.java.i
 data/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java.i
 data/src/share/classes/sun/security/jgss/wrapper/GSSLibStub.java.i
 data/test/java/io/Serializable/inactiveRegistration/InactiveRegistration.java.i
 data/test/sun/rmi/rmic/newrmic/equivalence/G1.java.i
-data/src/share/classes/com/sun/tools/example/debug/event/JDIListener.java.i
-data/test/sun/security/smartcardio/TestExclusive.java.i
+data/test/sun/nio/cs/FindDecoderBugs.java.i
 data/src/share/classes/sun/awt/KeyboardFocusManagerPeerProvider.java.i
 data/test/java/nio/channels/DatagramChannel/IsConnected.java.i
-data/src/share/classes/javax/management/relation/RelationNotification.java.i
+data/test/java/security/cert/pkix/policyChanges/ca.cer.i
 data/make/tools/swing-beans/beaninfo/images/JPopupMenuColor32.gif.i
 data/test/com/sun/crypto/provider/TLS/prf12data.txt.i
 data/test/java/math/BigInteger/StringConstructor.java.i
@@ -13968,32 +13877,33 @@ data/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.ja
 data/test/java/util/Locale/Bug4210525.java.i
 data/src/share/classes/java/util/zip/ZipException.java.i
 data/src/windows/native/java/io/dirent_md.h.i
-data/test/java/dyn/ClassValueTest.java.i
+data/test/java/awt/regtesthelpers/Sysout.java.i
 data/make/tools/reorder/tests/LoadFrame.java.i
 data/make/tools/CharsetMapping/IBM935.nr.i
 data/src/share/classes/sun/tools/tree/NaryExpression.java.i
 data/test/sun/security/tools/jarsigner/ts.sh.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmOSMeta.java.i
+data/src/share/classes/sun/management/snmp/util/SnmpTableHandler.java.i
 data/src/share/classes/com/sun/java/util/jar/pack/FixedList.java.i
 data/src/share/classes/sun/io/ByteToCharUnicodeLittle.java.i
-data/src/share/classes/org/openjdk/jigsaw/Files.java.i
-data/test/sun/security/ssl/sanity/pluggability/CheckSSLContextExport.java.i
-data/src/share/classes/java/beans/DesignMode.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java.i
+data/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java.i
+data/test/java/nio/file/Files/BytesAndLines.java.i
+data/test/java/lang/Character/PropertyValueAliases.txt.i
+data/src/share/classes/sun/text/resources/FormatData_uk.java.i
 data/src/share/classes/sun/java2d/pisces/Renderer.java.i
 data/src/share/classes/sun/print/resources/serviceui_zh_TW.properties.i
 data/src/share/classes/org/openjdk/jigsaw/Loader.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM1144.java.i
 data/test/java/util/logging/ParentLoggersTest.props.i
 data/test/java/rmi/MarshalledObject/compare/NullReference.java.i
+data/test/sun/security/krb5/ParseCAPaths.java.i
 data/src/share/classes/java/nio/file/LinkOption.java.i
 data/src/share/classes/java/awt/Stroke.java.i
-data/test/java/security/cert/pkix/policyChanges/ee.cer.i
 data/test/java/math/BigDecimal/NegateTests.java.i
-data/test/java/util/ResourceBundle/bug6572242.properties.i
+data/test/com/sun/net/httpserver/Test10.java.i
+data/test/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.Connector.i
 data/src/share/demo/jvmti/heapTracker/heapTracker.h.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/BooleanArrayCalls.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_CheckedSortedSet.java.i
+data/test/sun/security/krb5/auto/ok-as-delegate-xrealm.sh.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java.i
 data/test/java/security/KeyFactory/Failover.java.i
 data/test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java.i
 data/test/java/lang/instrument/ilib/ClassReaderWriter.java.i
@@ -14002,78 +13912,81 @@ data/make/java/verify/mapfile-vers.i
 data/test/java/awt/Graphics2D/DrawString/ScaledLCDTextMetrics.java.i
 data/make/mksample/nio/multicast/Makefile.i
 data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java.i
-data/src/share/classes/org/openjdk/jigsaw/ClassInfo.java.i
-data/test/com/sun/tools/attach/java.policy.allow.i
+data/src/share/classes/javax/xml/crypto/dsig/spec/XSLTTransformParameterSpec.java.i
 data/test/javax/swing/JColorChooser/Test4165217.java.i
+data/src/share/demo/jvmti/hprof/hprof_table.h.i
+data/test/java/io/PipedWriter/ConnectAfterReaderClose.java.i
 data/test/java/awt/print/PrinterJob/PrintAWTImage.java.i
-data/src/share/native/sun/font/fontscalerdefs.h.i
 data/src/share/classes/com/sun/jmx/snmp/InetAddressAcl.java.i
 data/src/windows/hpi/export/timeval_md.h.i
 data/test/java/io/ByteArrayOutputStream/ToString.java.i
-data/src/share/demo/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml.i
+data/src/share/classes/sun/tools/tree/LessExpression.java.i
+data/test/java/io/pathNames/GeneralWin32.java.i
 data/src/share/classes/javax/swing/AncestorNotifier.java.i
+data/src/share/classes/org/relaxng/datatype/Datatype.java.i
 data/src/solaris/doc/sun/man/man1/unpack200.1.i
 data/src/share/classes/com/sun/tools/jdi/TypeComponentImpl.java.i
-data/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/java/net/MyDatagramSocketImplFactory.java.i
-data/src/share/classes/sun/tools/jstat/resources/jstat_unsupported_options.i
-data/src/share/classes/sun/io/ByteToCharCp935.java.i
+data/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java.i
+data/src/share/classes/com/sun/crypto/provider/AESParameters.java.i
+data/src/share/classes/sun/misc/JavaIOAccess.java.i
 data/make/java/main/javaw/Makefile.i
+data/src/share/classes/java/beans/DefaultPersistenceDelegate.java.i
+data/src/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java.i
 data/src/share/classes/javax/management/JMX.java.i
-data/make/com/sun/jndi/dns/Makefile.i
+data/test/java/util/PluggableLocale/TimeZoneNameProviderTest.java.i
 data/src/share/classes/java/lang/InterruptedException.java.i
 data/test/org/openjdk/jigsaw/_Library.java.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java.i
 data/src/solaris/classes/sun/font/NativeStrikeDisposer.java.i
 data/src/share/native/sun/security/ec/ec2_163.c.i
 data/src/share/classes/javax/naming/CommunicationException.java.i
-data/src/share/classes/sun/management/CompilationImpl.java.i
+data/src/share/classes/sun/rmi/runtime/RuntimeUtil.java.i
+data/test/javax/crypto/JceSecurity/MyProvider.java.i
 data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl.java.i
 data/make/sun/tools/Makefile.i
-data/test/javax/naming/ldap/LdapName/LdapParserTests.java.i
-data/src/share/classes/sun/management/HotspotThreadMBean.java.i
+data/src/share/classes/org/ietf/jgss/ChannelBinding.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/newFolder.gif.i
 data/test/java/io/Serializable/typeStringBackRef/TypeStringBackRef.java.i
+data/src/share/classes/java/lang/RuntimeException.java.i
 data/src/windows/classes/sun/net/www/protocol/file/Handler.java.i
-data/src/share/native/sun/font/layout/MPreFixups.h.i
+data/src/share/native/sun/security/ec/impl/mp_gf2m.h.i
 data/src/share/classes/sun/net/smtp/SmtpProtocolException.java.i
 data/test/java/awt/print/PrinterJob/ImagePrinting/ClippedImages.java.i
 data/make/common/CancelImplicits.gmk.i
-data/src/share/classes/java/lang/RuntimePermission.java.i
-data/test/java/security/SecureRandom/sha1prng-old.bin.i
-data/src/windows/native/sun/jkernel/graphics/masthead.bmp.i
-data/test/java/util/ResourceBundle/Control/PrivateConstructorRB.java.i
+data/src/share/native/sun/awt/debug/debug_assert.c.i
+data/test/java/beans/XMLEncoder/java_util_Collections_CheckedMap.java.i
+data/test/java/nio/file/Files/walkFileTree/grantAll.policy.i
+data/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java.i
 data/test/java/rmi/activation/Activatable/checkAnnotations/security.policy.i
 data/test/sun/management/jmxremote/bootstrap/management_ssltest12_ko.properties.in.i
 data/test/java/nio/file/WatchService/grantDirAndOneLevel.policy.i
 data/src/share/demo/jfc/Metalworks/resources/HelpFiles/duke.gif.i
 data/src/share/classes/javax/swing/plaf/basic/BasicViewportUI.java.i
 data/src/solaris/classes/sun/awt/motif/MFileDialogPeer.java.i
-data/src/share/classes/com/sun/media/sound/AudioSynthesizer.java.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java.i
+data/src/share/classes/java/security/PolicySpi.java.i
 data/test/javax/swing/text/WrappedPlainView/6857057/bug6857057.java.i
-data/src/solaris/classes/com/sun/management/UnixOperatingSystem.java.i
+data/test/org/openjdk/jigsaw/_Resolver.java.i
 data/make/tools/CharsetMapping/MS1251.map.i
 data/test/java/beans/Introspector/Test4072197.java.i
 data/make/java/main/java/mapfile-sparcv9.i
 data/test/java/lang/reflect/Modifier/toStringTest.java.i
-data/src/share/demo/jfc/Metalworks/BigContrastMetalTheme.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java.i
-data/src/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java.i
-data/src/solaris/classes/sun/awt/motif/MFontConfiguration.java.i
+data/test/com/sun/jndi/ldap/NoWaitForReplyTest.java.i
+data/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh.i
+data/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-8-attack.xml.i
+data/src/solaris/native/java/io/FileSystem_md.c.i
 data/src/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java.i
-data/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh.i
-data/src/share/demo/applets/WireFrame/example2.html.i
-data/test/sun/net/InetAddress/nameservice/chaining/Simple1NameServiceDescriptor.java.i
+data/test/java/nio/Buffer/genBasic.sh.i
+data/src/share/classes/com/sun/jdi/JDIPermission.java.i
 data/make/mkdemo/jvmti/README.txt.i
 data/test/java/security/CodeSigner/cert_file.i
-data/src/share/classes/java/io/OutputStreamWriter.java.i
+data/test/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/ReachableObjects.java.i
-data/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java.i
-data/test/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java.i
+data/make/tools/src/build/tools/javazic/RuleDay.java.i
+data/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java.i
 data/src/share/classes/sun/dc/DuctusRenderingEngine.java.i
 data/test/org/openjdk/jigsaw/repolist.sh.i
 data/test/javax/swing/plaf/synth/6771547/synthconfig.xml.i
+data/src/share/classes/com/sun/jdi/event/ClassUnloadEvent.java.i
 data/test/java/net/Socket/ShutdownBoth.java.i
-data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/group.security.policy.i
 data/src/share/classes/sun/security/jgss/GSSContextImpl.java.i
 data/src/share/classes/sun/text/resources/FormatData_no_NO.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_fr_CH.properties.i
@@ -14082,16 +13995,17 @@ data/src/share/classes/java/net/URLStreamHandlerFactory.java.i
 data/test/java/awt/print/PrinterJob/SameService.java.i
 data/test/sun/security/jgss/DefaultGssConfig.java.i
 data/src/share/native/sun/reflect/NativeAccessors.c.i
-data/src/solaris/native/sun/awt/awt_InputMethod.c.i
-data/src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java.i
+data/src/solaris/native/sun/java2d/loops/vis_IntBgr.c.i
+data/src/solaris/doc/sun/man/man1/ja/jvisualvm.1.i
+data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/Receiver.java.i
 data/test/sun/net/www/protocol/jar/copyin.sh.i
-data/make/tools/CharsetMapping/IBM1143.map.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509KeyManager.java.i
 data/test/sun/tools/jstat/jstatGcOutput1.sh.i
-data/test/javax/smartcardio/Serialize.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_en_GB.properties.i
 data/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java.i
 data/src/share/classes/sun/security/ec/ECKeyPairGenerator.java.i
 data/src/share/classes/sun/tools/tree/IncDecExpression.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java.i
+data/src/share/classes/sun/security/jgss/krb5/WrapToken_v2.java.i
 data/test/java/beans/XMLEncoder/javax_swing_OverlayLayout.java.i
 data/test/java/nio/file/Files/walkFileTree/Nulls.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Fp.c.i
@@ -14099,37 +14013,35 @@ data/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java.i
 data/src/windows/native/sun/windows/awt_GDIObject.h.i
 data/src/share/demo/jfc/Metalworks/resources/HelpFiles/back.gif.i
 data/make/tools/CharsetMapping/IBM1025.map.i
-data/src/share/classes/java/lang/management/package.html.i
+data/src/share/classes/java/util/concurrent/ForkJoinPool.java.i
 data/test/com/sun/jdi/LocationTest.java.i
-data/test/java/io/Serializable/underlyingOutputStreamException/UnderlyingOutputStreamException.java.i
-data/src/share/classes/java/awt/font/MultipleMaster.java.i
-data/test/java/security/BasicPermission/ExitVMEquals.java.i
+data/src/share/classes/com/sun/beans/decoder/FalseElementHandler.java.i
 data/src/share/classes/sun/util/resources/TimeZoneNames_en_IE.java.i
 data/test/sun/security/pkcs11/KeyStore/BasicData/pk1.cert2.i
 data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java.i
 data/src/share/native/com/sun/media/sound/PlatformMidi.h.i
 data/test/javax/management/remote/mandatory/socketFactories/RMIServerFactory.java.i
-data/src/share/classes/javax/swing/SpinnerListModel.java.i
+data/src/solaris/native/sun/awt/awt_Checkbox.c.i
 data/src/share/classes/sun/security/ec/NamedCurve.java.i
-data/src/share/classes/javax/crypto/spec/DHParameterSpec.java.i
+data/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java.i
 data/test/sun/security/krb5/auto/Test5653.java.i
 data/src/share/classes/sun/tools/java/BinaryConstantPool.java.i
-data/test/sun/security/tools/jarsigner/diffend.sh.i
-data/src/share/classes/sun/io/ByteToCharCp964.java.i
+data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java.i
 data/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImpl_Stub.java.i
+data/test/sun/net/www/ParseUtil_6478588.java.i
 data/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java.i
 data/src/share/classes/sun/security/ssl/ProtocolList.java.i
-data/src/share/classes/com/sun/security/auth/SubjectCodeSource.java.i
+data/make/com/sun/java/browser/dom/Makefile.i
 data/src/share/demo/jfc/TableExample/TableMap.java.i
 data/src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java.i
 data/src/share/classes/javax/imageio/event/IIOWriteProgressListener.java.i
-data/src/share/classes/sun/applet/resources/MsgAppletViewer_de.java.i
+data/src/share/classes/sun/text/resources/FormatData_es_PA.java.i
 data/src/share/demo/nbproject/management/JTop/build.xml.i
 data/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider.i
-data/src/share/classes/java/text/Bidi.java.i
+data/src/share/demo/jvmti/hprof/hprof_tls.c.i
 data/src/share/sample/nio/server/B1.java.i
 data/test/java/util/zip/ZipFile/CorruptedZipFiles.java.i
-data/src/share/classes/javax/management/loading/MLetMBean.java.i
+data/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java.i
 data/src/share/classes/sun/tools/tree/CharExpression.java.i
 data/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java.i
 data/test/sun/nio/cs/JISAutoDetectTest.java.i
@@ -14137,86 +14049,88 @@ data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java.i
 data/src/share/demo/java2d/J2DBench/resources/textdata/hindi.ut8.txt.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/SimpleShape.java.i
 data/src/windows/classes/sun/awt/Win32ColorModel24.java.i
-data/src/share/demo/jvmti/hprof/hprof_io.c.i
+data/src/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreUp.wav.i
+data/test/java/lang/management/ThreadMXBean/Semaphore.java.i
 data/test/java/io/File/Basic.java.i
-data/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt.i
-data/src/share/native/java/util/zip/zip_util.c.i
-data/src/share/classes/javax/xml/crypto/dsig/spec/HMACParameterSpec.java.i
+data/src/share/classes/java/security/DigestOutputStream.java.i
+data/test/sun/security/pkcs11/KeyStore/ClientAuthData/p11-nss.txt.i
+data/test/sun/security/tools/policytool/SaveAs.html.i
+data/test/java/util/ResourceBundle/Test4318520.java.i
 data/test/java/net/DatagramSocket/SendDatagramToBadAddress.java.i
-data/src/windows/classes/sun/awt/windows/WCustomCursor.java.i
 data/test/java/lang/Character/CheckScript.java.i
 data/src/share/classes/sun/net/www/content/image/png.java.i
 data/test/java/net/ProxySelector/NullSelector.java.i
-data/src/solaris/bin/arm/jvm.cfg.i
-data/src/share/classes/sun/swing/CachedPainter.java.i
-data/src/share/native/sun/font/layout/MPreFixups.cpp.i
+data/test/javax/management/mxbean/MXBeanAnnotationTest.java.i
+data/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java.i
+data/test/java/net/DatagramSocket/SendSize.java.i
 data/test/sun/nio/cs/OLD/IBM948_OLD.java.d
 data/src/share/classes/sun/rmi/transport/LiveRef.java.i
 data/src/share/classes/sun/security/krb5/internal/TCPClient.java.i
 data/src/solaris/native/java/lang/java_props_md.c.i
 data/test/java/lang/instrument/DummyClass.java.i
-data/src/share/demo/nio/zipfs/src/META-INF/services/java.nio.file.spi.FileSystemProvider.i
 data/src/share/classes/sun/tools/tree/SwitchStatement.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/KeyWrapping.java.i
+data/make/com/sun/jmx/Makefile.i
 data/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java.i
 data/test/demo/jvmti/hprof/CpuOldTest.java.i
+data/make/PatchList.solaris.i
 data/test/sun/nio/cs/OLD/MS932_OLD.java.i
 data/test/javax/sound/midi/Gervill/SoftChannel/NoteOff.java.i
-data/src/solaris/classes/sun/awt/X11ComponentPeer.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NewSocketMethods.java.i
 data/make/tools/CharsetMapping/ISO_8859_11.map.i
+data/src/share/classes/javax/swing/border/CompoundBorder.java.i
 data/src/windows/native/sun/java2d/d3d/D3DRenderQueue.h.i
 data/test/java/awt/image/GetDataElementsTest.java.i
-data/make/sun/security/mscapi/Makefile.i
-data/src/windows/native/sun/jkernel/kernel_en.rc.i
+data/src/share/classes/sun/util/resources/CalendarData_ro.properties.i
+data/test/sun/security/krb5/auto/Action.java.i
 data/test/sun/nio/cs/OLD/IBM943C_OLD.java.i
 data/test/java/util/zip/ZipEntry/input.jar.i
+data/test/java/awt/print/PrinterJob/GetMediasTest.java.i
 data/test/java/util/ResourceBundle/Bug6204853.java.i
-data/test/javax/security/auth/login/Configuration/GetInstanceConfigSpi.java.i
+data/src/share/native/sun/awt/image/DataBufferNative.c.i
 data/test/java/lang/invoke/6991596/Test6991596.java.i
 data/test/java/net/URLClassLoader/closetest/build.sh.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16S16Func.c.i
 data/src/share/demo/java2d/J2DBench/options/default.opt.i
 data/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/FontMapper.java.i
+data/test/tools/pack200/pack200-verifier/data/README.i
 data/src/share/classes/com/sun/crypto/provider/AESCipher.java.i
 data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java.i
 data/src/share/classes/javax/crypto/KeyAgreement.java.i
 data/src/share/classes/javax/management/monitor/package.html.i
-data/src/windows/native/sun/jkernel/DownloadHelper.h.i
+data/test/java/nio/file/TestUtil.java.i
 data/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTask.java.i
 data/src/share/instrument/JavaExceptions.c.i
 data/test/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java.i
-data/test/org/openjdk/jigsaw/hello.sh.i
+data/test/sun/java2d/DirectX/NonOpaqueDestLCDAATest/NonOpaqueDestLCDAATest.java.i
 data/test/java/util/PluggableLocale/ExecTest.sh.i
-data/src/share/classes/sun/text/resources/FormatData_ms.java.i
-data/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java.i
-data/src/share/classes/sun/util/calendar/ZoneInfoFile.java.i
+data/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java.i
+data/src/share/classes/java/awt/DisplayMode.java.i
 data/test/java/net/InetAddress/Simple2NameServiceDescriptor.java.i
 data/src/solaris/classes/sun/awt/motif/MCheckboxMenuItemPeer.java.i
 data/src/share/classes/sun/security/x509/AttributeNameEnumeration.java.i
-data/test/javax/script/CommonSetup.sh.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGBuffer.java.i
 data/make/tools/src/build/tools/charsetmapping/Main.java.i
 data/src/share/classes/sun/security/util/ManifestDigester.java.i
-data/src/solaris/classes/sun/java2d/xr/GrowableIntArray.java.i
+data/src/solaris/classes/sun/nio/fs/UnixMountEntry.java.i
 data/test/java/util/jar/JarInputStream/ScanSignedJar.java.i
-data/src/share/classes/sun/font/FontLineMetrics.java.i
+data/test/java/net/Socket/AccurateTimeout.java.i
 data/test/java/io/charStreams/LineGenerator.java.i
-data/make/java/management/FILES_c.gmk.i
+data/test/java/rmi/server/RemoteObject/notExtending/NotExtending_Stub.java.i
 data/test/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java.i
 data/make/tools/CharsetMapping/euc_tw.map.d
 data/src/solaris/classes/sun/nio/ch/SctpAssociationImpl.java.i
 data/test/sun/nio/cs/EucJpLinux0212.java.i
 data/src/share/classes/sun/security/krb5/internal/MethodData.java.i
-data/test/java/net/URL/ParseAuthority.java.i
+data/src/solaris/doc/sun/man/man1/ja/serialver.1.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java.i
 data/make/mkdemo/jfc/Makefile.i
 data/src/share/native/sun/java2d/pipe/PathConsumer2D.h.i
-data/src/share/classes/com/sun/tools/hat/resources/platform_names.txt.i
-data/src/share/classes/java/net/DatagramSocket.java.i
-data/src/share/native/sun/awt/image/jpeg/jversion.h.i
+data/src/share/native/sun/font/layout/LEGlyphStorage.cpp.i
+data/src/solaris/hpi/native_threads/include/porting.h.i
+data/make/tools/CharsetMapping/IBM284.map.i
 data/src/share/classes/java/rmi/server/RMIFailureHandler.java.i
-data/make/tools/CharsetMapping/IBM939.c2b.i
+data/test/java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java.i
 data/test/sun/security/pkcs11/fips/JSSEClient.java.i
 data/src/share/native/sun/font/layout/LEGlyphFilter.h.i
 data/src/solaris/native/sun/awt/medialib/vis_proto.h.i
@@ -14224,126 +14138,128 @@ data/test/sun/security/provider/certpath/DisabledAlgorithms/openssl.cnf.i
 data/src/linux/doc/man/jstat.1.i
 data/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java.i
 data/test/java/rmi/activation/Activatable/forceLogSnapshot/ActivateMe.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java.i
+data/src/share/native/sun/java2d/opengl/OGLBlitLoops.h.i
 data/test/sun/nio/cs/BufferUnderflowEUCTWTest.java.i
-data/src/share/classes/java/security/DomainCombiner.java.i
+data/src/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java.i
 data/src/share/demo/java2d/J2DBench/resources/textdata/hebrew.ut8.txt.i
 data/src/share/classes/com/sun/jdi/connect/spi/package.html.i
 data/src/share/classes/javax/swing/doc-files/groupLayout.2.gif.i
-data/src/share/classes/sun/nio/cs/IBM852.java.i
+data/test/java/beans/XMLEncoder/java_sql_Timestamp.java.i
 data/test/com/sun/jndi/ldap/LdapName/UnescapeTest.java.i
-data/src/share/classes/sun/invoke/util/ValueConversions.java.i
+data/test/java/net/B6499348.java.i
 data/src/share/classes/javax/naming/spi/DirectoryManager.java.i
-data/test/javax/swing/plaf/nimbus/ColorCustomizationTest.java.i
+data/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c.i
 data/src/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java.i
 data/src/windows/native/sun/windows/awt_MouseEvent.h.i
+data/test/java/math/BigInteger/ModPowPowersof2.java.i
 data/test/java/nio/channels/DatagramChannel/ReceiveISA.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/package.html.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java.i
 data/src/share/classes/sun/io/ByteToCharDoubleByte.java.i
 data/src/share/classes/sun/security/x509/X509Cert.java.i
 data/test/com/sun/jdi/NullLocalVariable.sh.i
-data/src/share/classes/java/nio/file/FileVisitor.java.i
-data/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java.i
+data/test/java/rmi/server/serverStackTrace/ServerStackTrace.java.i
+data/test/sun/security/krb5/auto/BadKdc.java.i
 data/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties.i
-data/test/java/rmi/activation/rmidViaInheritedChannel/rmid.security.policy.i
+data/test/java/security/Security/signedfirst/exp.jar.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/ListView.gif.i
 data/test/java/lang/annotation/AnnotationTypeMismatchException/FoundType.java.i
 data/src/share/classes/javax/swing/colorchooser/SyntheticImage.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxSSLContextImpl.java.i
 data/make/tools/CharsetMapping/IBM833.map.i
 data/make/tools/CharsetMapping/ISO_8859_3.map.i
 data/src/share/classes/javax/management/modelmbean/XMLParseException.java.i
+data/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService_Stub.java.i
 data/src/share/classes/com/sun/security/auth/NTSidUserPrincipal.java.i
-data/src/share/native/java/lang/fdlibm/src/k_cos.c.i
+data/test/com/sun/jdi/StepTest.java.i
 data/src/solaris/classes/sun/java2d/xr/XRRenderer.java.i
 data/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java.i
 data/src/share/classes/java/awt/font/package.html.i
 data/test/sun/tools/jstat/jstatHelp.sh.i
 data/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java.i
 data/src/share/native/sun/font/layout/SingleTableProcessor.cpp.i
-data/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh.i
+data/src/share/classes/sun/io/ByteToCharSingleByte.java.i
+data/src/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java.i
 data/src/share/classes/com/sun/net/ssl/KeyManager.java.i
-data/make/tools/CharsetMapping/IBM1144.c2b.i
+data/src/share/classes/javax/smartcardio/CardChannel.java.i
+data/src/share/classes/sun/tools/jstat/ColumnFormat.java.i
+data/src/share/classes/java/sql/Clob.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthPanelUI.java.i
-data/src/share/classes/java/io/DataInputStream.java.i
+data/test/java/security/cert/CertificateFactory/BadX509CertData.java.i
 data/src/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java.i
 data/test/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.html.i
-data/test/java/lang/ThreadLocal/TestThreadId.java.i
 data/test/java/awt/event/MouseEvent/EventTimeInFuture/EventTimeInFuture.java.i
 data/test/java/util/UUID/UUIDTest.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java.i
+data/test/javax/swing/DataTransfer/6456844/bug6456844.java.i
 data/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp.i
 data/test/java/beans/XMLEncoder/Test6570354.java.i
 data/test/java/awt/image/MemoryLeakTest/MemoryLeakTest.java.i
 data/src/share/classes/sun/print/resources/serviceui.properties.i
-data/src/share/classes/sun/text/normalizer/UCharacterIterator.java.i
+data/test/java/net/URLConnection/xml/xml1.i
 data/test/java/util/logging/LoggerWeakRefLeak.sh.i
 data/src/windows/native/sun/windows/awt_DnDDT.cpp.i
-data/test/javax/security/auth/login/Configuration/GetInstanceSecurity.grantedPolicy.i
-data/src/windows/native/sun/windows/security_warning_int.ico.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostTrap.java.i
+data/src/share/classes/sun/security/provider/certpath/OCSPRequest.java.i
 data/make/tools/CharsetMapping/IBM1142.map.i
 data/src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java.i
 data/test/sun/security/pkcs11/fips/cert8.db.i
 data/src/share/classes/sun/io/ByteToCharISO2022KR.java.i
-data/src/share/native/java/lang/fdlibm/src/w_hypot.c.i
+data/src/share/classes/javax/swing/JMenuItem.java.i
 data/test/demo/zipfs/basic.sh.i
-data/test/java/lang/StrictMath/HypotTests.java.i
+data/src/share/classes/com/sun/media/sound/SoftMixingMixer.java.i
 data/src/share/classes/com/sun/servicetag/LinuxSystemEnvironment.java.i
 data/make/tools/sharing/tests/JHello.java.i
-data/test/java/nio/channels/etc/NetworkChannelTests.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/OptionException.java.i
+data/test/java/lang/Double/Constants.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java.i
+data/src/share/native/sun/awt/libpng/pngstruct.h.i
 data/src/share/classes/java/awt/GraphicsCallback.java.i
-data/src/share/classes/javax/security/auth/x500/X500Principal.java.i
-data/src/share/classes/sun/tools/javac/BatchParser.java.i
+data/test/java/lang/instrument/PremainClass/InheritAgent0011.java.i
 data/test/java/lang/instrument/PremainClass/README.i
 data/test/java/util/ResourceBundle/Control/NonResourceBundle.java.i
 data/src/share/classes/com/sun/pept/transport/Connection.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java.i
+data/src/share/classes/javax/swing/text/Caret.java.i
 data/test/java/io/PrintWriter/OpsAfterClose.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ipstore.i
-data/src/share/classes/javax/imageio/event/IIOReadWarningListener.java.i
+data/src/share/classes/sun/tools/jar/resources/jar_de.properties.i
 data/src/solaris/native/sun/awt/awt_Cursor.h.i
 data/test/java/net/DatagramPacket/ReuseBuf.java.i
 data/src/share/classes/sun/io/CharToByteCp1143.java.i
 data/make/java/nio/FILES_java.gmk.i
-data/src/share/classes/sun/applet/AppletIllegalArgumentException.java.i
+data/src/share/classes/java/util/jar/Pack200.java.i
 data/src/share/classes/sun/applet/AppletAudioClip.java.i
 data/test/sun/rmi/rmic/newrmic/equivalence/OrangeEchoImpl.java.i
 data/src/share/classes/sun/security/krb5/Config.java.i
 data/src/share/native/java/lang/Class.c.i
 data/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h.i
-data/test/java/lang/ThreadLocal/MemoryLeak.java.i
+data/src/share/classes/sun/tools/tree/ForStatement.java.i
+data/test/sun/security/pkcs11/Provider/cspPlus.cfg.i
 data/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java.i
-data/src/share/classes/java/util/concurrent/locks/ReadWriteLock.java.i
+data/make/mkdemo/applets/GraphicsTest/Makefile.i
 data/src/solaris/classes/sun/awt/X11/security-icon-interim48.png.i
-data/src/share/classes/sun/java2d/pipe/RenderQueue.java.i
-data/src/share/classes/sun/text/resources/FormatData_zh_CN.java.i
+data/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java.i
+data/src/share/transport/shmem/shmemBase.h.i
 data/make/tools/swing-beans/beaninfo/images/JInternalFrameMono16.gif.i
-data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-result.jpg.i
+data/make/java/nio/mxbean/Makefile.i
 data/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java.i
-data/src/share/native/sun/security/ec/impl/ec.c.i
+data/src/share/instrument/JPLISAgent.c.i
 data/src/share/hpi/src/hpi.c.i
 data/make/tools/src/build/tools/jdwpgen/ClassTypeNode.java.i
 data/test/java/nio/charset/CharsetDecoder/EmptyInput.java.i
-data/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java.i
 data/test/javax/swing/AbstractButton/6711682/bug6711682.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedSet.java.i
 data/src/share/demo/jvmti/hprof/hprof_object.c.i
-data/test/java/net/Authenticator/B4678055.java.i
 data/test/javax/imageio/plugins/png/PngOutputTypeTest.java.i
 data/src/share/demo/jfc/Notepad/resources/cut.gif.i
 data/test/tools/launcher/lib/sparc/lib32/liblibrary.so.i
 data/src/share/native/sun/font/layout/GlyphPosnLookupProc.h.i
 data/test/java/rmi/activation/Activatable/nestedActivate/ActivateMe.java.i
-data/src/share/sample/scripting/scriptpad/src/resources/conc.js.i
-data/test/java/util/Locale/serialized/java6locale__US.i
-data/src/share/classes/sun/tools/util/ModifierFilter.java.i
+data/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh.i
+data/test/javax/management/ObjectName/ComparatorTest.java.i
+data/test/java/lang/InheritableThreadLocal/ITLRemoveTest.java.i
 data/test/com/sun/jdi/FilterNoMatch.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_nl_NL.properties.i
-data/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_CheckedRandomAccessList.java.i
 data/test/com/sun/security/sasl/log.properties.i
-data/src/share/classes/javax/swing/table/package.html.i
+data/src/share/classes/sun/util/resources/CurrencyNames_en_US.properties.i
 data/src/share/classes/sun/awt/util/IdentityLinkedList.java.i
 data/test/sun/tools/common/ShutdownSimpleApplication.java.i
 data/src/share/classes/sun/java2d/pipe/ShapeDrawPipe.java.i
@@ -14354,97 +14270,93 @@ data/src/share/classes/com/sun/media/sound/DataPusher.java.i
 data/test/java/lang/reflect/Generics/TestC1.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java.i
 data/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java.i
-data/src/share/classes/sun/text/resources/FormatData_de.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java.i
-data/src/share/classes/java/util/CurrencyData.properties.i
+data/src/share/classes/java/awt/Choice.java.i
+data/test/java/util/Hashtable/ReadObject.java.i
 data/test/javax/print/applet/applet1/Applet1.java.i
 data/src/share/classes/javax/swing/MenuSelectionManager.java.i
 data/make/tools/CharsetMapping/IBM424.nr.i
-data/src/share/classes/javax/swing/LayoutComparator.java.i
+data/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties.i
 data/src/share/native/sun/awt/giflib/dgif_lib.c.i
 data/src/share/demo/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java.i
 data/test/javax/print/DialogMargins.java.i
 data/src/share/classes/sun/awt/EmbeddedFrame.java.i
-data/test/sun/security/smartcardio/Utils.java.i
+data/src/share/classes/sun/security/pkcs12/MacData.java.i
 data/src/share/classes/com/sun/media/sound/SunFileWriter.java.i
-data/test/org/openjdk/jigsaw/_Resolver.java.i
+data/test/java/nio/charset/Charset/default.sh.i
 data/test/javax/swing/border/Test4120351.java.i
 data/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerGlowEffect.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Compress.java.i
-data/src/share/native/java/lang/fdlibm/src/s_expm1.c.i
+data/src/windows/native/sun/windows/awt_MenuItem.cpp.i
+data/src/share/classes/java/awt/geom/AffineTransform.java.i
+data/test/javax/sound/midi/Gervill/SoftTuning/Load4.java.i
+data/src/share/classes/com/sun/jmx/remote/internal/ProxyRef.java.i
 data/make/tools/swing-beans/beaninfo/images/JTextPaneMono16.gif.i
 data/src/windows/native/sun/java2d/d3d/D3DGlyphCache.h.i
-data/test/sun/security/pkcs11/KeyStore/ClientAuthData/truststore.i
-data/test/java/nio/charset/Charset/Default.java.i
-data/test/sun/security/provider/PolicyParser/p002.policy.i
+data/src/share/classes/javax/swing/DefaultDesktopManager.java.i
 data/test/java/lang/instrument/bootclasspathAgent.mf.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/maximize-pressed.gif.i
 data/test/java/beans/XMLEncoder/6777487/TestCheckedSortedMap.java.i
-data/test/javax/print/applet/applet4/Applet4.java.i
 data/test/java/net/Socket/AddressTest.java.i
-data/src/share/classes/com/sun/servicetag/resources/Putback-Notes.txt.i
+data/src/solaris/classes/com/sun/management/OSMBeanFactory.java.i
 data/src/windows/native/java/lang/ProcessImpl_md.c.i
 data/src/solaris/classes/sun/java2d/xr/XcbRequestCounter.java.i
 data/src/share/classes/javax/management/remote/JMXConnectorServerFactory.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedCollection.java.i
 data/src/solaris/native/sun/java2d/loops/vis_SrcMaskFill.c.i
-data/test/sun/security/ssl/templates/SSLEngineTemplate.java.i
-data/test/java/io/File/HashCodeEquals.java.i
+data/src/share/classes/javax/management/MBeanPermission.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM1383.java.i
 data/src/share/classes/sun/reflect/generics/scope/Scope.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java.i
+data/src/linux/doc/man/ja/rmic.1.i
 data/src/share/native/sun/awt/image/jpeg/jdapimin.c.i
-data/src/share/classes/java/dyn/MethodHandleProvider.java.i
-data/src/share/classes/sun/tools/java/SyntaxError.java.i
+data/src/share/classes/javax/swing/text/TabableView.java.i
+data/src/share/classes/sun/print/CustomMediaSizeName.java.i
 data/src/share/classes/sun/font/TrueTypeGlyphMapper.java.i
-data/test/java/security/KeyRep/RC5.pre.1.5.key.i
 data/src/share/classes/java/lang/reflect/Proxy.java.i
-data/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java.i
+data/make/org/Makefile.i
 data/src/share/classes/java/util/concurrent/PriorityBlockingQueue.java.i
-data/src/solaris/classes/sun/awt/X11/UnsafeXDisposerRecord.java.i
-data/src/share/native/sun/java2d/loops/ImageData.h.i
-data/test/java/util/jar/JarEntry/test.jar.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpPduFactoryBER.java.i
-data/src/solaris/classes/sun/awt/X11/XScrollPanePeer.java.i
-data/test/java/awt/print/Dialog/DialogType.java.i
+data/src/share/modules/jdk.swing/module-info.java.i
+data/test/java/security/cert/CertPathValidator/indirectCRL/generate.sh.i
+data/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java.i
+data/src/share/classes/com/sun/jmx/snmp/defaults/SnmpProperties.java.i
+data/test/java/rmi/activation/Activatable/nestedActivate/rmid.security.policy.i
+data/src/share/classes/com/sun/tools/jdi/ArrayReferenceImpl.java.i
+data/test/java/util/ResourceBundle/Bug4168625Resource2.java.i
 data/src/share/classes/sun/security/pkcs11/P11Signature.java.i
 data/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java.i
 data/src/share/classes/sun/awt/geom/ChainEnd.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/IconManager.java.i
+data/make/README.i
 data/src/solaris/doc/sun/man/man1/ja/jconsole.1.i
 data/src/share/native/sun/security/ec/mpi-priv.h.i
 data/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/Company-corporate.ttf.i
 data/src/share/classes/com/sun/tools/hat/resources/hat.js.i
-data/test/java/security/Security/signedfirst/Static.sh.i
+data/test/java/lang/instrument/StressGetObjectSizeTest.sh.i
 data/test/javax/sound/midi/Gervill/SoftReceiver/Send_PitchBend.java.i
 data/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java.i
 data/make/tools/swing-beans/beaninfo/images/JViewportColor16.gif.i
 data/src/share/sample/vm/jvm-clr/invoker.java.i
 data/src/share/classes/com/sun/tools/hat/internal/util/CompositeEnumeration.java.i
-data/src/share/classes/javax/sound/midi/spi/MidiFileReader.java.i
+data/src/share/classes/sun/security/x509/RFC822Name.java.i
 data/test/sun/tools/jstat/jstatGcNewCapacityOutput1.sh.i
 data/test/sun/security/krb5/DnsFallback.java.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageConv_f.c.i
 data/test/java/lang/instrument/ParallelTransformerLoaderAgent.java.i
-data/test/java/awt/Component/isLightweightCrash/IsLightweightCrash.java.i
-data/test/java/io/InputStream/OpsAfterClose.java.i
+data/test/java/beans/VetoableChangeSupport/TestListeners.java.i
+data/test/sun/net/InetAddress/nameservice/CacheTest.java.i
 data/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java.i
-data/src/share/classes/sun/nio/cs/US_ASCII.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/Functions.java.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so.i
 data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so.i
 data/test/java/rmi/reliability/benchmark/bench/serial/Main.java.i
-data/src/solaris/classes/sun/awt/motif/X11CNS11643P2.java.i
 data/src/share/classes/sun/security/pkcs11/P11Mac.java.i
 data/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java.i
 data/src/share/classes/java/sql/Ref.java.i
 data/test/sun/security/pkcs11/KeyStore/BasicData/ca2.cert.i
 data/src/share/classes/java/sql/Array.java.i
-data/test/javax/xml/crypto/dsig/data/signature-keyname.xml.i
-data/src/share/classes/sun/io/CharToByteCp1258.java.i
+data/test/java/nio/charset/spi/Test.java.i
+data/src/share/native/java/lang/fdlibm/src/s_logb.c.i
 data/make/tools/CharsetMapping/IBM037.c2b.i
 data/src/share/classes/sun/nio/cs/StreamEncoder.java.i
-data/test/java/awt/im/InputContext/bug4625203.java.i
+data/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/SimpleNode.java.i
 data/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c.i
 data/src/share/classes/javax/swing/SwingPaintEventDispatcher.java.i
@@ -14452,19 +14364,16 @@ data/test/demo/jvmti/DemoRun.java.i
 data/src/share/sample/nio/chatserver/DataReader.java.i
 data/src/share/classes/javax/naming/event/EventDirContext.java.i
 data/make/tools/src/build/tools/jdwpgen/CommandSetNode.java.i
-data/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java.i
 data/test/javax/rmi/ssl/SSLSocketParametersTest.java.i
 data/src/share/classes/sun/text/resources/FormatData_ar_BH.java.i
 data/test/java/nio/channels/ServerSocketChannel/Open.java.i
-data/src/share/classes/com/sun/jndi/dns/DnsClient.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java.i
+data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_2.java.i
 data/src/share/classes/com/sun/tools/jdi/VMAction.java.i
 data/test/javax/management/descriptor/MBeanInfoInteropTest.java.i
 data/src/share/classes/sun/nio/fs/Cancellable.java.i
 data/src/share/classes/java/lang/doc-files/sigma1.gif.i
 data/src/share/sample/nbproject/project.xml.i
-data/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java.i
-data/make/tools/swing-beans/beaninfo/images/JFrameColor32.gif.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll.i
 data/test/java/nio/file/DirectoryStream/SecureDS.java.i
 data/src/share/native/sun/java2d/loops/IntArgb.c.i
 data/test/java/net/Socks/SocksV4Test.java.i
@@ -14477,81 +14386,81 @@ data/src/share/sample/nio/chatserver/README.txt.i
 data/src/linux/doc/man/javap.1.i
 data/make/sun/javazic/tzdata/solar88.i
 data/test/javax/swing/JSlider/6587742/bug6587742.html.i
-data/src/solaris/native/sun/awt/XDrawingArea.c.i
-data/src/share/classes/sun/util/locale/LocaleUtils.java.i
+data/src/share/classes/java/lang/reflect/InvocationTargetException.java.i
+data/src/share/classes/java/beans/package.html.i
+data/make/tools/CharsetMapping/IBM870.c2b.i
 data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpInformHandler.java.i
 data/src/share/classes/java/net/DatagramSocketImplFactory.java.i
 data/test/javax/swing/JSlider/6524424/bug6524424.html.i
 data/src/windows/classes/sun/awt/windows/WDragSourceContextPeer.java.i
 data/src/share/classes/javax/swing/text/Element.java.i
-data/make/sun/motif12/reorder-i586.i
+data/test/sun/security/provider/PolicyFile/Alias.policy.i
 data/src/share/classes/javax/management/QualifiedAttributeValueExp.java.i
 data/src/share/classes/java/lang/Compiler.java.i
 data/src/solaris/native/sun/awt/awt_DataTransferer.h.i
 data/src/windows/native/sun/windows/awt_Debug.h.i
 data/src/share/native/sun/awt/image/cvutils/img_input32.h.i
-data/test/javax/management/mxbean/JMXServiceURLTest.java.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java.i
-data/test/java/lang/String/Exceptions.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Hello.java.i
+data/src/share/classes/javax/management/DynamicMBean.java.i
+data/src/share/demo/jfc/Metalworks/resources/HelpFiles/metalworks.html.i
 data/test/sun/nio/cs/SurrogateTestEUCTW.java.i
 data/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/ValidateCertPath.java.i
-data/src/solaris/classes/sun/awt/X11/XFontPeer.java.i
-data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java.i
+data/src/solaris/doc/sun/man/man1/javac.1.i
+data/src/share/classes/sun/text/resources/FormatData_cs_CZ.java.i
 data/src/windows/native/sun/windows/awt_InputMethod.cpp.i
 data/src/share/classes/javax/swing/text/doc-files/OpenBookIcon.gif.i
 data/test/sun/java2d/SunGraphicsEnvironment/TestSGEuseAlternateFontforJALocales.java.i
 data/src/solaris/native/sun/awt/awt_XmDnD.c.i
 data/src/windows/hpi/export/path_md.h.i
-data/src/share/classes/java/rmi/server/RMIServerSocketFactory.java.i
+data/make/common/BuildToolJar.gmk.i
 data/test/java/security/Exceptions/ChainingConstructors.java.i
 data/src/share/native/sun/font/layout/GDEFMarkFilter.cpp.i
 data/src/share/classes/java/lang/invoke/SwitchPoint.java.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/SSLEngineService.java.i
 data/test/javax/swing/JColorChooser/Test6977726.html.i
+data/src/share/native/sun/java2d/opengl/OGLPaints.c.i
 data/src/share/classes/sun/io/CharToByteCp297.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerShadowEffect.java.i
-data/test/sun/net/www/protocol/http/DigestTest.java.i
+data/test/java/beans/PropertyEditor/TestShortTypeValue.java.i
 data/src/solaris/bin/java_md.c.i
-data/src/solaris/classes/sun/awt/X11/XContentWindow.java.i
+data/test/java/nio/channels/AsynchronousSocketChannel/Basic.java.i
 data/src/share/classes/sun/nio/fs/Reflect.java.i
-data/src/share/classes/javax/naming/ldap/StartTlsRequest.java.i
+data/src/share/demo/applets/WireFrame/Matrix3D.java.i
+data/test/sun/java2d/cmm/ProfileOp/SetDataTest.java.i
+data/test/sun/security/pkcs11/fips/TrustManagerTest.java.i
 data/test/java/text/Bidi/BidiConformance.java.i
-data/test/com/sun/jdi/InnerTarg.java.i
 data/make/tools/src/build/tools/javazic/Month.java.i
-data/test/javax/xml/crypto/dsig/SecurityManager/policy.i
+data/make/tools/swing-beans/beaninfo/images/JPanelColor32.gif.i
 data/src/linux/doc/man/jconsole.1.i
 data/src/share/classes/java/text/SimpleDateFormat.java.i
-data/test/java/nio/Buffer/StringCharBufferSliceTest.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Bit.c.i
 data/test/javax/management/monitor/StringMonitorDeadlockTest.java.i
 data/src/share/classes/sun/util/resources/TimeZoneNames_en_CA.java.i
+data/src/share/classes/java/awt/event/FocusListener.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java.i
-data/src/windows/classes/sun/nio/fs/WindowsException.java.i
 data/make/mkdemo/applets/Animator/Makefile.i
 data/make/tools/winver/src/winver.cpp.i
 data/src/share/classes/java/awt/dnd/DropTarget.java.i
 data/test/java/lang/Runtime/exec/ExecWithLotsOfArgs.java.i
 data/test/javax/swing/MultiUIDefaults/Test6860438.java.i
 data/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java.i
-data/src/share/classes/javax/swing/table/TableColumn.java.i
 data/src/solaris/classes/sun/awt/motif/X11GBK.java.i
 data/src/share/classes/sun/rmi/transport/proxy/WrappedSocket.java.i
-data/src/share/classes/javax/sql/rowset/serial/SerialArray.java.i
+data/src/share/classes/javax/management/BinaryOpValueExp.java.i
 data/test/sun/security/tools/policytool/OpenPolicy.java.i
 data/test/java/lang/management/ThreadMXBean/Barrier.java.i
-data/test/java/util/AbstractSequentialList/AddAll.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmThreadingMeta.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_S32.c.i
+data/test/java/beans/XMLEncoder/java_awt_Point.java.i
 data/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java.i
 data/src/share/classes/javax/print/attribute/AttributeSetUtilities.java.i
-data/src/share/classes/java/io/InputStream.java.i
+data/make/tools/CharsetMapping/IBM1147.map.i
 data/src/share/classes/sun/security/action/GetLongAction.java.i
 data/test/sun/security/pkcs11/Provider/csp.cfg.i
 data/src/share/classes/java/util/Dictionary.java.i
-data/src/share/classes/sun/tools/jstat/OptionFinder.java.i
+data/src/solaris/classes/sun/awt/X11/XToolkit.java.i
 data/test/sun/net/www/protocol/http/AsyncDisconnect.java.i
-data/src/share/classes/javax/print/ServiceUI.java.i
-data/test/javax/swing/JColorChooser/Test4380468.java.i
+data/test/sun/net/www/http/HttpClient/ImplicitFileName.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.h.i
 data/src/windows/native/sun/awt/splashscreen/splashscreen_config.h.i
 data/src/share/classes/sun/io/CharToByteISO8859_3.java.i
@@ -14559,111 +14468,109 @@ data/src/share/classes/sun/nio/cs/ext/DoubleByteDecoder.java.i
 data/src/share/demo/applets/Clock/example1.html.i
 data/src/share/classes/java/awt/datatransfer/MimeType.java.i
 data/src/share/classes/javax/swing/TimerQueue.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S16Func.c.i
+data/test/javax/swing/JFileChooser/6520101/bug6520101.java.i
 data/test/javax/swing/JColorChooser/Test4222508.java.i
 data/test/sun/rmi/transport/tcp/blockAccept/security.policy.i
 data/test/java/beans/PropertyEditor/TestFloatClassJava.java.i
-data/test/sun/security/pkcs11/KeyStore/ClientAuthData/README.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxPolyphony.java.i
-data/src/share/classes/javax/naming/spi/ContinuationDirContext.java.i
-data/src/share/back/commonRef.c.i
-data/src/share/classes/sun/misc/GC.java.i
+data/src/share/classes/javax/smartcardio/CardPermission.java.i
+data/src/share/sample/scripting/scriptpad/src/scripts/textcolor.js.i
+data/test/java/beans/Introspector/4750368/com/foo/test/Component.java.i
 data/test/sun/security/util/Resources/NewNamesFormat.java.i
-data/src/share/classes/javax/sound/sampled/FloatControl.java.i
-data/make/mkdemo/jni/Makefile.i
-data/src/share/classes/java/util/zip/GZIPInputStream.java.i
+data/src/solaris/classes/sun/font/NativeGlyphMapper.java.i
 data/src/windows/native/sun/windows/check.bmp.i
 data/make/tools/swing-beans/beaninfo/images/JWindowColor16.gif.i
 data/src/solaris/native/sun/awt/awt_Menu.h.i
 data/test/javax/management/mxbean/SameObjectTwoNamesTest.java.i
 data/src/linux/doc/man/extcheck.1.i
 data/src/share/classes/javax/swing/plaf/package.html.i
-data/src/share/classes/java/awt/IllegalComponentStateException.java.i
+data/src/share/native/java/lang/fdlibm/src/s_rint.c.i
 data/src/share/classes/java/util/concurrent/SynchronousQueue.java.i
-data/test/java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java.i
+data/test/java/util/Timer/KillThread.java.i
 data/src/share/classes/java/security/NoSuchProviderException.java.i
-data/src/share/classes/java/lang/doc-files/captheta.gif.i
+data/test/org/openjdk/jigsaw/cli/expired-signer-cert.pem.i
 data/make/tools/swing-beans/beaninfo/images/JTableColor32.gif.i
 data/src/share/classes/com/sun/jndi/ldap/pool/PooledConnection.java.i
 data/src/windows/native/sun/windows/mlib_types_md.h.i
 data/test/javax/management/Introspector/Described.java.i
 data/test/javax/management/remote/mandatory/loading/MethodResultTest.java.i
 data/src/share/classes/sun/font/Font2DHandle.java.i
-data/src/share/javavm/export/jdwpTransport.h.i
-data/src/share/classes/java/rmi/UnknownHostException.java.i
+data/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java.i
+data/test/javax/management/ImplementationVersion/ImplVersionCommand.java.i
 data/test/java/io/Serializable/6559775/Test6559775.sh.i
+data/make/tools/CharsetMapping/KOI8_R.map.i
 data/src/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java.i
 data/src/share/classes/com/sun/security/ntlm/NTLMException.java.i
-data/test/javax/print/PrintSubInputStream/Example.java.i
-data/make/tools/CharsetMapping/MS1254.map.i
-data/src/share/classes/sun/net/ftp/FtpProtocolException.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java.i
-data/src/share/native/sun/java2d/loops/ByteIndexed.c.i
+data/src/share/demo/nio/zipfs/Demo.java.i
+data/make/tools/CharsetMapping/IBM855.map.i
+data/src/share/classes/sun/security/ec/ECDHKeyAgreement.java.i
+data/src/solaris/native/sun/nio/ch/FileKey.c.i
+data/test/javax/print/applet/applet2/Applet2.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java.i
 data/test/com/sun/jdi/ExpiredRequestDeletionTest.java.i
-data/src/share/classes/sun/security/pkcs11/Token.java.i
 data/make/mkdemo/applets/MoleculeViewer/Makefile.i
 data/src/share/classes/sun/security/util/SecurityConstants.java.i
+data/src/share/classes/com/sun/beans/finder/AbstractFinder.java.i
 data/src/share/demo/jvmti/hprof/hprof_monitor.c.i
 data/src/solaris/native/sun/awt/multi_font.c.i
-data/make/tools/UnicodeData/PropList.txt.i
+data/test/javax/print/attribute/SidesPageRangesTest.java.i
 data/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_1.java.i
-data/src/share/classes/java/dyn/BootstrapMethod.java.i
-data/src/share/classes/javax/swing/event/TreeExpansionEvent.java.i
+data/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java.i
+data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java.i
 data/src/share/classes/javax/security/sasl/AuthorizeCallback.java.i
 data/test/sun/rmi/rmic/newrmic/equivalence/G1Impl.java.i
 data/test/javax/sound/sampled/Clip/ClipSetPos.java.i
-data/src/share/classes/java/sql/DatabaseMetaData.java.i
+data/make/sun/headless/reorder-i586.i
+data/test/javax/swing/border/Test4124729.java.i
 data/test/com/sun/security/sasl/ntlm/Conformance.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.c.i
 data/src/share/classes/sun/text/resources/FormatData_ar_SA.java.i
-data/test/java/io/Serializable/defaultDataEnd/DefaultDataEnd.java.i
-data/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations_Stub.java.i
+data/test/javax/management/remote/mandatory/connection/AddressableTest.java.i
+data/test/java/util/prefs/PrefsSpi.sh.i
 data/src/share/classes/sun/jvmstat/monitor/Monitor.java.i
-data/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/ImageTests.java.i
 data/src/share/classes/javax/naming/NameAlreadyBoundException.java.i
-data/src/share/classes/sun/io/CharToByteCp858.java.i
+data/test/java/io/PrintWriter/FailingConstructors.java.i
 data/test/java/rmi/activation/Activatable/shutdownGracefully/security.policy.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/SSLSocketTimeoutNulls.java.i
-data/src/share/classes/sun/net/www/http/HttpClient.java.i
+data/src/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java.i
 data/src/share/classes/sun/java2d/cmm/ColorTransform.java.i
 data/make/javax/swing/Makefile.i
 data/src/share/classes/sun/java2d/SurfaceDataProxy.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java.i
 data/src/share/classes/javax/print/attribute/standard/JobName.java.i
-data/src/share/classes/com/sun/java/util/jar/pack/Code.java.i
+data/src/solaris/sample/dtrace/hotspot_jni/README.txt.i
 data/test/sun/tools/native2ascii/test1.i
 data/test/java/lang/Class/getField/Exceptions.java.i
-data/test/java/security/cert/CertPathValidator/indirectCRL/README.i
-data/src/solaris/classes/sun/awt/XSettings.java.i
-data/src/share/demo/jfc/FileChooserDemo/resources/images/jpgIcon.jpg.i
-data/test/tools/launcher/unresolvedExceptions.sh.i
+data/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java.i
+data/test/sun/nio/cs/OLD/IBM933_OLD.java.i
+data/src/share/classes/sun/security/x509/SerialNumber.java.i
+data/test/sun/security/tools/jarsigner/ec.sh.i
+data/src/share/native/sun/java2d/opengl/OGLMaskBlit.c.i
+data/src/solaris/native/sun/java2d/loops/vis_GlyphListXor.c.i
 data/src/share/classes/java/nio/file/spi/package-info.java.i
-data/src/share/classes/java/nio/channels/FileChannel.java.i
-data/src/share/classes/sun/text/resources/FormatData_it_CH.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_et.properties.i
 data/src/share/demo/jfc/SampleTree/DynamicTreeNode.java.i
-data/test/javax/smartcardio/HistoricalBytes.java.i
 data/src/share/classes/java/rmi/server/UID.java.i
-data/test/java/rmi/server/clientStackTrace/ClientStackTrace.java.i
+data/test/java/rmi/reliability/benchmark/bench/ConfigFormatException.java.i
 data/test/java/security/cert/CertPathValidatorException/jdk6.serial.i
 data/src/share/native/sun/java2d/loops/ByteBinary2Bit.c.i
-data/src/share/classes/sun/io/ByteToCharUnicodeBigUnmarked.java.i
+data/test/sun/nio/cs/ISCIITest.java.i
 data/src/share/classes/javax/swing/JPopupMenu.java.i
 data/src/share/classes/sun/util/TimeZoneNameUtility.java.i
-data/test/java/net/SocketPermission/Ctor.java.i
+data/src/share/classes/javax/swing/plaf/basic/ComboPopup.java.i
 data/src/share/demo/nbproject/jfc/Metalworks/build.properties.i
 data/test/sun/security/krb5/auto/OneKDC.java.i
-data/src/share/classes/java/security/spec/ECParameterSpec.java.i
-data/test/sun/security/provider/certpath/ReverseBuilder/prjM2divE.i
-data/test/java/io/LineNumberReader/ReadReadLine.java.i
+data/src/solaris/native/sun/awt/swing_GTKEngine.c.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java.i
-data/src/share/native/sun/awt/image/cvutils/img_dcm8.h.i
+data/src/share/classes/java/awt/color/ColorSpace.java.i
+data/src/share/classes/com/sun/tools/jdi/IntegerValueImpl.java.i
 data/src/share/classes/sun/awt/image/ImageDecoder.java.i
-data/src/share/demo/jvmti/hprof/hprof_class.c.i
+data/src/share/lib/calendars.properties.i
 data/test/sun/nio/cs/OLD/MS932DB.java.i
 data/src/windows/native/java/nio/MappedByteBuffer.c.i
-data/test/java/io/Serializable/oldTests/CheckingEquality.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_es_EC.properties.i
-data/test/javax/swing/JSlider/6794831/bug6794831.java.i
+data/src/share/classes/java/sql/Driver.java.i
 data/src/share/classes/java/dyn/MethodHandles.java.i
 data/src/solaris/classes/sun/java2d/jules/TileWorker.java.i
 data/src/share/classes/sun/security/provider/ConfigSpiFile.java.i
@@ -14672,68 +14579,68 @@ data/src/share/native/sun/java2d/opengl/OGLPaints.h.i
 data/src/share/classes/javax/print/attribute/standard/PrinterState.java.i
 data/src/share/javavm/include/opcodes.wide.i
 data/src/share/classes/sun/util/resources/LocaleNames_el.properties.i
-data/src/share/classes/java/nio/file/attribute/PosixFilePermissions.java.i
+data/test/sun/java2d/SunGraphics2D/SimplePrimQuality.java.i
 data/test/java/lang/instrument/GetAllLoadedClassesTest.java.i
 data/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PackageCtor.java.i
 data/test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java.i
 data/src/share/classes/sun/tools/tree/AssignBitAndExpression.java.i
 data/src/share/classes/javax/security/cert/CertificateNotYetValidException.java.i
 data/src/share/classes/sun/applet/resources/MsgAppletViewer_it.java.i
-data/src/share/classes/java/io/ObjectInputValidation.java.i
+data/src/solaris/hpi/include/interrupt.h.i
 data/test/sun/text/resources/Format/Bug4994312.java.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_BA.properties.i
-data/src/share/classes/sun/reflect/ByteVectorImpl.java.i
+data/test/java/lang/invoke/ClassValueTest.java.i
 data/test/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.html.i
-data/make/mksample/nio/file/Makefile.i
+data/src/share/classes/java/nio/Heap-X-Buffer.java.i
 data/test/java/beans/Introspector/6380849/beans/ThirdBean.java.i
-data/src/share/classes/sun/io/CharToByteISO8859_7.java.i
+data/test/javax/swing/JComponent/4337267/bug4337267.java.i
 data/test/java/awt/dnd/Button2DragTest/Button2DragTest.html.i
-data/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java.i
-data/test/com/sun/jdi/sde/testString.i
-data/src/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java.i
-data/src/share/classes/javax/swing/event/UndoableEditListener.java.i
-data/test/sun/rmi/rmic/newrmic/equivalence/AppleEvent.java.i
+data/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java.i
+data/src/share/demo/jfc/Metalworks/KhakiMetalTheme.java.i
+data/test/java/rmi/reliability/juicer/OrangeEcho.java.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/pk3.key.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseInboundException.java.i
-data/test/javax/management/mxbean/GenericTypeTest.java.i
-data/make/templates/gpl-header.i
+data/test/java/util/Arrays/CopyMethods.java.i
 data/test/java/nio/channels/Selector/SelectAndClose.java.i
 data/src/share/classes/java/beans/ReflectionUtils.java.i
 data/src/share/demo/applets/CardTest/CardTest.java.i
-data/src/share/classes/sun/awt/image/ToolkitImage.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java.i
 data/test/sun/security/tools/keytool/SecretKeyKS.sh.i
 data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java.i
 data/make/tools/swing-beans/beaninfo/images/JColorChooserMono32.gif.i
 data/src/windows/classes/sun/awt/windows/WMenuItemPeer.java.i
 data/src/share/classes/java/awt/print/PageFormat.java.i
-data/test/java/util/Hashtable/HashCode.java.i
+data/test/java/util/ServiceLoader/FooProvider2.java.i
 data/test/java/rmi/transport/checkLeaseInfoLeak/LeaseLeak.java.i
 data/src/share/classes/sun/reflect/annotation/ExceptionProxy.java.i
-data/src/share/native/java/util/zip/zlib-1.1.3/ChangeLog.i
+data/test/java/io/etc/FileDescriptorSharing.java.i
 data/test/sun/nio/cs/OLD/TestX11CS.java.i
 data/src/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java.i
 data/src/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java.i
 data/test/javax/management/remote/mandatory/subjectDelegation/policy11.i
 data/src/share/classes/sun/dyn/FilterOneArgument.java.i
-data/src/share/classes/java/util/concurrent/atomic/package-info.java.i
-data/src/share/classes/com/sun/jdi/request/ThreadStartRequest.java.i
-data/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh.i
+data/src/share/classes/sun/launcher/resources/launcher_ja.properties.i
+data/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/AclImpl.java.i
+data/make/javax/print/Makefile.i
 data/src/share/native/java/util/zip/CRC32.c.i
-data/src/share/classes/sun/security/acl/WorldGroupImpl.java.i
+data/test/java/net/InetAddress/ptr/lookup.sh.i
 data/test/java/lang/StringBuffer/InsertNullString.java.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedStaticByteFieldAccessorImpl.java.i
+data/test/java/beans/XMLDecoder/spec/TestShort.java.i
 data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.access.in.i
 data/test/java/security/MessageDigest/ArgumentSanity.java.i
 data/src/share/classes/com/sun/beans/ObjectHandler.java.i
 data/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java.i
 data/src/share/classes/javax/swing/doc-files/groupLayout.example.png.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html.i
+data/test/com/sun/tools/attach/BasicTests.sh.i
+data/src/share/native/sun/awt/medialib/mlib_ImageConvMxN.c.i
 data/test/java/util/zip/ConstructInflaterOutput.java.i
 data/test/sun/security/rsa/TestKeyFactory.java.i
-data/src/share/classes/sun/tools/tree/ExprExpression.java.i
-data/make/java/java/mapfile-vers.i
-data/src/share/native/sun/font/layout/MarkToBasePosnSubtables.h.i
-data/src/share/native/sun/management/management.c.i
+data/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh.i
+data/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp.i
+data/make/modules/update_module.sh.i
+data/src/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java.i
+data/test/java/rmi/activation/Activatable/shutdownGracefully/TestSecurityManager.java.i
 data/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties.i
 data/test/java/nio/charset/Charset/AvailableCharsetNames.java.i
 data/src/share/classes/sun/reflect/UnsafeDoubleFieldAccessorImpl.java.i
@@ -14741,28 +14648,29 @@ data/src/share/classes/java/rmi/activation/UnknownObjectException.java.i
 data/src/share/classes/sun/rmi/rmic/BatchEnvironment.java.i
 data/test/java/util/PluggableLocale/providersrc/java.text.spi.CollatorProvider.i
 data/test/java/awt/font/TextLayout/TestOldHangul.java.i
-data/src/share/native/java/lang/fdlibm/src/e_lgamma_r.c.i
+data/src/share/native/sun/awt/image/cvutils/img_dcm8.h.i
 data/src/share/classes/sun/security/ssl/EngineOutputRecord.java.i
-data/test/java/io/charStreams/LineSink.java.i
-data/src/share/classes/javax/xml/crypto/Data.java.i
+data/test/java/io/Serializable/corruptedUTFConsumption/CorruptedUTFConsumption.java.i
+data/src/solaris/classes/sun/awt/X11/XInputMethod.java.i
 data/test/sun/tools/jps/jps-m.sh.i
 data/test/sun/security/krb5/BadKdcDefaultValue.java.i
 data/src/solaris/native/sun/nio/ch/NativeThread.c.i
 data/make/tools/swing-beans/beaninfo/images/JPasswordFieldColor16.gif.i
-data/test/java/lang/instrument/ATestCaseScaffold.java.i
+data/test/com/sun/jdi/DeoptimizeWalk.sh.i
+data/src/share/classes/sun/io/CharToByteMacIceland.java.i
 data/src/share/classes/com/sun/security/auth/module/LdapLoginModule.java.i
 data/src/share/classes/java/util/logging/XMLFormatter.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageAffineEdge.c.i
 data/make/netbeans/j2se/build.xml.i
 data/src/share/classes/sun/dyn/anon/ConstantPoolVisitor.java.i
-data/test/java/awt/PrintJob/ConstrainedPrintingTest/ConstrainedPrintingTest.java.i
-data/src/windows/native/sun/windows/awt_Cursor.cpp.i
+data/test/javax/security/auth/x500/X500Principal/RFC4514.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java.i
-data/src/share/classes/sun/nio/cs/MS1251.java.i
-data/make/netbeans/jdwpgen/nbproject/project.properties.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/beans/AbstractBean.java.i
+data/test/sun/security/provider/PolicyParser/ExtDirs.policy.i
+data/test/org/openjdk/jigsaw/security.sh.i
 data/src/share/classes/javax/print/attribute/standard/PrinterInfo.java.i
 data/test/javax/security/auth/login/LoginContext/DefaultHandler.config.i
-data/src/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java.i
+data/test/java/rmi/reliability/benchmark/bench/serial/StreamBuffer.java.i
+data/src/share/demo/jfc/CodePointIM/README_ja.html.i
 data/src/solaris/native/sun/nio/ch/SocketDispatcher.c.i
 data/src/share/native/sun/font/layout/GlyphSubstitutionTables.h.i
 data/test/java/beans/Introspector/6380849/beans/SecondBean.java.i
@@ -14772,12 +14680,13 @@ data/src/share/lib/images/cursors/win32_LinkDrop32x32.gif.i
 data/src/share/native/sun/font/layout/OpenTypeUtilities.h.i
 data/test/java/nio/channels/Selector/CloseWhenKeyIdle.java.i
 data/src/solaris/native/sun/awt/awt_UNIXToolkit.c.i
+data/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java.i
 data/test/javax/security/auth/PrivateCredentialPermission/EmptyName.java.i
 data/test/sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java.i
 data/src/share/classes/com/sun/jmx/event/RepeatedSingletonJob.java.i
-data/test/sun/security/mscapi/SignUsingNONEwithRSA.java.i
 data/src/share/classes/sun/io/CharToByteCp869.java.i
 data/src/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java.i
+data/test/javax/script/Helper.java.i
 data/src/share/classes/javax/management/ReflectionException.java.i
 data/src/share/classes/com/sun/jdi/event/ClassPrepareEvent.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java.i
@@ -14785,156 +14694,163 @@ data/test/javax/management/mxbean/MBeanOperationInfoTest.java.i
 data/src/share/back/commonRef.h.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/Close.java.i
 data/src/share/classes/java/lang/invoke/MethodType.java.i
+data/src/share/bin/java.h.i
 data/make/modules/jdk.tools.ls.i
 data/src/share/classes/javax/swing/text/html/ParagraphView.java.i
 data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/JarFileSystemProvider.java.i
+data/src/share/classes/sun/security/util/AuthResources.java.i
 data/test/java/nio/channels/SocketChannel/Hangup.java.i
 data/test/javax/print/CheckDupFlavor.java.i
 data/src/share/classes/javax/management/relation/RoleInfo.java.i
 data/test/javax/sql/rowset/serial/SerialClob/SetAsciiStream.java.i
 data/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c.i
 data/test/java/awt/Graphics/TextAAHintsTest.java.i
-data/test/java/awt/event/MouseEvent/SmoothWheel/SmoothWheel.java.i
-data/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java.i
+data/src/share/classes/java/awt/AttributeValue.java.i
+data/test/java/lang/instrument/ATestCaseScaffold.java.i
 data/src/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java.i
 data/src/share/classes/javax/swing/plaf/basic/DragRecognitionSupport.java.i
 data/test/java/util/ResourceBundle/Bug4083270Test.java.i
 data/test/sun/security/x509/AlgorithmId/TurkishRegion.java.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedFloatFieldAccessorImpl.java.i
-data/test/java/util/LinkedList/Clone.java.i
+data/test/java/util/zip/ZipFile/ManyZipFiles.java.i
 data/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Ports.c.i
 data/src/share/classes/javax/swing/plaf/ToolTipUI.java.i
-data/src/share/classes/java/awt/peer/FontPeer.java.i
+data/src/share/classes/javax/management/IntrospectionException.java.i
 data/test/java/net/Inet4Address/textToNumericFormat.java.i
-data/test/java/lang/Thread/UncaughtExceptions.sh.i
-data/make/jpda/transport/socket/mapfile-vers.i
+data/src/share/classes/sun/swing/ImageIconUIResource.java.i
 data/make/netbeans/jdwpgen/nbproject/genfiles.properties.i
 data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/config/XmlConfigUtilsTest.java.i
 data/src/share/classes/javax/swing/plaf/ToolBarUI.java.i
 data/src/windows/native/sun/windows/awt_KeyboardFocusManager.cpp.i
 data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplc4.so.i
-data/src/share/classes/javax/security/auth/login/AccountNotFoundException.java.i
 data/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java.i
 data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java.i
 data/src/share/classes/sun/java2d/loops/TransformBlit.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java.i
-data/src/share/classes/java/lang/module/ModuleInfoReader.java.i
+data/make/modules/tools/Makefile.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMBean.java.i
 data/src/share/classes/java/dyn/FilterGeneric.java.i
 data/make/javax/sound/SoundDefs.gmk.i
 data/test/java/rmi/server/RMIClassLoader/spi/Installed.java.i
 data/src/share/back/EventRequestImpl.h.i
 data/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java.i
-data/src/windows/native/sun/font/fontpath.c.i
+data/test/java/math/BigDecimal/PowTests.java.i
+data/make/java/invoke/Makefile.i
 data/src/share/classes/javax/management/NotQueryExp.java.i
 data/test/java/lang/reflect/Proxy/returnTypes/GetArray.java.i
-data/src/share/classes/javax/swing/ListModel.java.i
+data/src/share/native/sun/management/Flag.c.i
+data/src/share/classes/sun/java2d/loops/DrawLine.java.i
+data/src/share/classes/javax/print/attribute/URISyntax.java.i
 data/src/share/classes/java/rmi/NotBoundException.java.i
 data/src/share/classes/sun/tools/jconsole/JConsole.java.i
 data/test/java/util/zip/zip.java.i
 data/src/linux/doc/man/ja/jar.1.i
 data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties.i
-data/src/share/classes/sun/io/ByteToCharBig5_Solaris.java.i
+data/src/share/native/sun/awt/image/jpeg/jinclude.h.i
 data/src/share/classes/java/rmi/server/RMIClassLoaderSpi.java.i
-data/test/java/beans/PropertyEditor/TestIntegerClassNull.java.i
+data/test/sun/security/x509/AVA/AVAEqualsHashCode.java.i
 data/make/sun/misc/Makefile.i
-data/src/share/classes/java/util/NavigableSet.java.i
-data/src/share/classes/sun/dyn/package-info.java.i
-data/test/java/security/cert/PolicyNode/speech2eve.i
+data/src/share/classes/sun/security/provider/SeedGenerator.java.i
+data/src/share/classes/sun/swing/CachedPainter.java.i
+data/test/java/util/Calendar/Bug6645263.java.i
 data/src/share/demo/jvmti/mtrace/README.txt.i
 data/src/share/classes/sun/misc/JavaSecurityCodeSignerAccess.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmspack.c.i
+data/src/share/classes/javax/swing/event/MenuKeyListener.java.i
 data/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java.i
-data/make/com/sun/tools/attach/FILES_c.gmk.i
+data/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java.i
 data/src/share/classes/com/sun/servicetag/SystemEnvironment.java.i
 data/src/share/classes/java/util/Locale.java.i
 data/src/share/classes/sun/text/resources/FormatData_cs.java.i
 data/test/javax/swing/plaf/nimbus/Test6849805.java.i
-data/src/share/classes/sun/print/ProxyGraphics.java.i
-data/src/share/classes/sun/awt/ScrollPaneWheelScroller.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathAPIHolder.java.i
-data/src/solaris/classes/sun/awt/X11/XFocusProxyWindow.java.i
+data/src/share/classes/sun/io/ByteToCharBig5_HKSCS.java.i
+data/src/windows/native/sun/jkernel/DownloadDialog.cpp.i
 data/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java.i
 data/make/tools/swing-beans/beaninfo/images/JTextPaneColor32.gif.i
 data/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java.i
 data/src/share/classes/sun/io/CharToByteDBCS_ASCII.java.i
-data/test/java/io/File/WinDeviceName.java.i
-data/test/java/lang/management/ManagementFactory/StateTestMBean.java.i
+data/test/java/lang/Thread/NullStackTrace.java.i
+data/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java.i
 data/src/share/classes/com/sun/crypto/provider/BlowfishConstants.java.i
 data/src/share/classes/javax/sql/rowset/serial/SerialStruct.java.i
 data/test/com/sun/jdi/NoLaunchOptionTest.java.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/computer.gif.i
-data/test/java/lang/Character/PropList.txt.i
+data/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh.i
 data/test/java/rmi/activation/Activatable/downloadParameterClass/FooReceiverImpl_Stub.java.i
 data/test/sun/net/www/protocol/http/UserAgent.java.i
+data/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java.i
 data/test/javax/swing/JColorChooser/Test6707406.java.i
 data/src/share/classes/sun/font/StrikeMetrics.java.i
 data/test/sun/security/provider/MessageDigest/DigestKAT.java.i
 data/test/java/rmi/transport/httpSocket/HttpSocketTest.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableRandomAccessList.java.i
 data/make/mkdemo/applets/DrawTest/Makefile.i
 data/src/share/classes/sun/misc/PerfCounter.java.i
-data/test/sun/rmi/rmic/defaultStubVersion/G1.java.i
-data/src/solaris/native/sun/awt/fontpath.c.i
 data/src/share/native/sun/security/ec/ec_naf.c.i
-data/make/java/net/Makefile.i
+data/src/share/classes/java/util/zip/CheckedOutputStream.java.i
+data/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaObject.java.i
 data/test/java/util/TimeZone/OldIDMappingTest.java.i
-data/src/share/classes/javax/naming/InitialContext.java.i
+data/src/solaris/native/sun/awt/Xrandr.h.i
 data/test/sun/security/ec/truststore.i
 data/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh.i
-data/src/share/classes/java/awt/event/WindowFocusListener.java.i
+data/test/sun/security/provider/certpath/speech2speech.i
+data/src/share/classes/java/awt/BorderLayout.java.i
 data/src/share/classes/java/nio/channels/exceptions.i
 data/src/share/sample/nio/server/BN.java.i
-data/src/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java.i
-data/src/share/classes/javax/print/attribute/DocAttributeSet.java.i
+data/src/windows/classes/sun/nio/ch/DatagramDispatcher.java.i
 data/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames_Stub.java.i
 data/test/javax/swing/text/html/TableView/7030332/sample4.png.i
-data/src/share/classes/sun/java2d/cmm/lcms/LCMS.java.i
+data/test/sun/security/action/Generify.java.i
+data/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java.i
 data/test/java/nio/channels/AsynchronousChannelGroup/Identity.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java.i
 data/src/solaris/native/sun/java2d/loops/mlib_v_ImageZoom_NN_f.c.i
 data/test/com/sun/net/httpserver/bugs/B6421581.java.i
 data/src/share/classes/javax/swing/undo/package.html.i
-data/src/share/classes/java/nio/file/attribute/PosixFilePermission.java.i
-data/src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp.i
-data/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java.i
+data/src/linux/doc/man/ja/javaws.1.i
+data/test/java/awt/dnd/URIListBetweenJVMsTest/SourceFileListFrame.java.i
+data/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java.i
+data/src/share/classes/com/sun/crypto/provider/HmacCore.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanMappingFactory.java.i
 data/src/solaris/classes/sun/awt/motif/MMenuPeer.java.i
 data/test/java/nio/file/Files/InterruptCopy.java.i
 data/src/solaris/classes/sun/awt/X11/XAWTFormatter.java.i
 data/make/tools/swing-beans/beaninfo/images/JToggleButtonMono16.gif.i
-data/test/java/lang/instrument/IsModifiableClassApp.java.i
-data/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine.i
+data/src/share/classes/sun/nio/cs/Unicode.java.i
+data/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java.i
 data/src/share/classes/javax/swing/event/CaretListener.java.i
 data/test/javax/management/loading/ParserInfiniteLoopTest.java.i
 data/src/share/classes/java/awt/image/renderable/package.html.i
-data/src/solaris/classes/sun/awt/X11/XWrapperBase.java.i
+data/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java.i
 data/src/share/classes/sun/io/ConversionBufferFullException.java.i
-data/src/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java.i
+data/test/java/lang/Class/forName/classes/right-square.class.i
 data/src/share/classes/java/awt/doc-files/MenuBar-1.gif.i
-data/src/share/classes/sun/tools/jconsole/inspector/XPlottingViewer.java.i
-data/src/solaris/classes/sun/awt/X11/InfoWindow.java.i
+data/src/windows/classes/java/util/prefs/WindowsPreferences.java.i
+data/test/java/lang/Runtime/exec/ConcurrentRead.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java.i
 data/test/java/beans/XMLEncoder/java_util_RegularEnumSet.java.i
-data/src/share/classes/sun/reflect/ClassFileConstants.java.i
-data/test/tools/pack200/dyn.jar.i
+data/src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java.i
+data/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h.i
 data/test/java/lang/String/Encodings.java.i
-data/test/java/awt/Multiscreen/WPanelPeerPerf/WPanelPeerPerf.java.i
+data/src/share/classes/sun/tools/jstat/SyntaxException.java.i
 data/test/java/nio/channels/SocketChannel/IsConnectable.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/iconify-pressed.gif.i
+data/src/share/sample/nio/file/AclEdit.java.i
+data/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java.i
+data/test/java/util/EnumMap/DistinctEntrySetElements.java.i
 data/test/java/beans/PropertyEditor/TestBooleanClassNull.java.i
 data/src/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java.i
 data/src/windows/native/sun/windows/awt_Component.cpp.i
 data/src/windows/native/sun/windows/awt_Insets.h.i
-data/src/share/classes/sun/security/x509/CertificatePolicyMap.java.i
-data/test/java/io/Serializable/subclass/Allow.policy.i
+data/make/mkdemo/jni/Makefile.i
+data/src/windows/native/sun/windows/awt_Brush.cpp.i
 data/test/java/net/URLClassLoader/ClassLoad.java.i
 data/test/javax/management/mxbean/customtypes/package-info.java.i
 data/src/share/classes/java/applet/AppletContext.java.i
-data/make/docs/CORE_PKGS.gmk.i
+data/src/share/classes/java/lang/Boolean.java.i
+data/src/share/classes/javax/print/attribute/standard/PDLOverrideSupported.java.i
 data/test/java/rmi/activation/Activatable/restartCrashedService/security.policy.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/BootAnalyzer.java.i
-data/make/tools/CharsetMapping/IBM1383.map.i
+data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy.i
+data/src/share/classes/javax/security/auth/login/AccountException.java.i
+data/src/solaris/native/sun/awt/awt_FileDialog.c.i
 data/src/solaris/lib/content-types.properties.i
 data/src/share/classes/sun/security/krb5/internal/KRBCred.java.i
 data/src/share/classes/java/text/FieldPosition.java.i
@@ -14943,212 +14859,208 @@ data/src/share/classes/sun/security/pkcs11/P11RSACipher.java.i
 data/test/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java.i
 data/src/share/classes/javax/security/cert/CertificateParsingException.java.i
 data/src/share/classes/sun/security/action/GetPropertyAction.java.i
-data/src/windows/native/sun/java2d/d3d/D3DPaints.cpp.i
+data/test/java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java.i
 data/test/javax/swing/JSlider/4987336/bug4987336.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIRegion.java.i
 data/src/solaris/classes/sun/awt/motif/MLabelPeer.java.i
+data/src/windows/classes/sun/awt/windows/WPopupMenuPeer.java.i
 data/src/share/classes/com/sun/crypto/provider/HmacMD5.java.i
 data/src/share/classes/java/lang/invoke/MethodHandleProxies.java.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpPduBulk.java.i
 data/src/share/classes/javax/accessibility/AccessibleRole.java.i
 data/src/share/bin/jli_util.c.i
 data/src/windows/native/sun/windows/awt_new.h.i
-data/src/share/classes/java/util/zip/CheckedOutputStream.java.i
+data/src/share/classes/java/awt/BufferCapabilities.java.i
 data/test/java/beans/XMLEncoder/javax_swing_border_LineBorder.java.i
-data/test/javax/management/remote/mandatory/notif/DeadListenerTest.java.i
+data/src/share/classes/sun/security/krb5/internal/KRBSafe.java.i
 data/test/java/lang/StringBuilder/Exceptions.java.i
 data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS5022X_Encoder.java.i
+data/src/share/classes/java/security/cert/CertSelector.java.i
 data/src/share/classes/sun/print/ImagePrinter.java.i
 data/test/java/nio/file/Files/CopyAndMove.java.i
 data/src/linux/doc/man/xjc.1.i
 data/src/share/classes/javax/security/auth/callback/LanguageCallback.java.i
-data/src/share/classes/java/util/concurrent/atomic/AtomicLong.java.i
-data/src/share/demo/jfc/Font2DTest/resources/TextResources_en_GB.properties.i
-data/test/java/security/Signature/NONEwithRSA.java.i
+data/src/share/lib/images/cursors/win32_MoveDrop32x32.gif.i
+data/src/share/classes/sun/io/ByteToCharISO2022.java.i
 data/test/java/net/URLClassLoader/closetest/test2/com/foo/Resource1.i
 data/test/com/sun/jdi/Java_gTest.java.i
 data/test/java/nio/channels/SocketChannel/Trivial.java.i
+data/test/sun/security/rsa/TestKeyPairGeneratorLength.java.i
 data/test/java/util/ResourceBundle/Test4314141A___EURO.properties.i
-data/test/sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java.i
-data/src/share/classes/sun/tools/tree/GreaterExpression.java.i
+data/test/sun/security/tools/policytool/UsePolicy.sh.i
 data/test/com/sun/jdi/InvokeTest.java.i
 data/test/javax/management/mxbean/customtypes/IntegerIsLongFactory.java.i
-data/src/share/classes/java/util/EventObject.java.i
 data/test/javax/sound/midi/Gervill/SoftChannel/Solo.java.i
 data/src/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java.i
-data/test/java/util/Collections/RacingCollections.java.i
 data/test/javax/management/monitor/GaugeMonitorDeadlockTest.java.i
-data/src/share/demo/nbproject/management/FullThreadDump/build.xml.i
-data/src/share/classes/org/openjdk/internal/joptsimple/internal/ReflectionException.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariInputMethodDescriptor.java.i
+data/src/share/classes/com/sun/tools/hat/internal/oql/OQLEngine.java.i
+data/test/java/beans/XMLEncoder/Test5023557.java.i
+data/test/com/sun/net/httpserver/bugs/FixedLengthInputStream.java.i
 data/test/java/util/Collections/Disjoint.java.i
-data/src/share/classes/sun/rmi/server/resources/rmid_sv.properties.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ar_LB.properties.i
 data/test/req.flg.i
 data/src/solaris/native/java/net/InetAddressImplFactory.c.i
-data/test/javax/management/openmbean/OpenTypeDescriptorTest.java.i
 data/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh.i
-data/test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so.i
-data/src/share/classes/java/text/ChoiceFormat.java.i
+data/src/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/HardDrive.gif.i
 data/test/java/io/File/MaxPath.java.i
-data/test/javax/management/loading/MLetCLR/policy.i
-data/test/java/beans/PropertyEditor/TestDoubleClassNull.java.i
-data/test/javax/management/namespace/JMXNamespaceViewTest.java.i
+data/test/java/security/KeyRep/SerialDSAPubKey.java.i
+data/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp.i
 data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_BevelBorderUIResource.java.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormat.java.i
 data/src/solaris/classes/sun/java2d/x11/XSurfaceData.java.i
 data/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir.i
 data/test/java/rmi/Naming/LookupIPv6.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Identities.java.i
 data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java.i
 data/src/share/classes/javax/naming/ldap/HasControls.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/HardDrive.gif.i
+data/src/share/classes/javax/swing/text/rtf/package.html.i
 data/src/share/classes/com/sun/media/sound/JARSoundbankReader.java.i
+data/src/windows/native/sun/windows/awt_Checkbox.cpp.i
 data/src/windows/native/java/io/io_util_md.c.i
-data/src/share/demo/applets/WireFrame/models/hughes_500.obj.i
+data/src/share/classes/sun/applet/AppletViewerFactory.java.i
 data/src/share/classes/org/relaxng/datatype/ValidationContext.java.i
 data/src/share/native/sun/java2d/loops/DrawPath.c.i
 data/test/java/util/concurrent/locks/Lock/TimedAcquire.java.i
 data/src/share/classes/sun/text/resources/FormatData_no.java.i
-data/src/solaris/bin/java_md.h.i
+data/test/javax/swing/JInternalFrame/6725409/bug6725409.java.i
 data/src/share/classes/java/nio/file/FileVisitOption.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-i586/libplds4.so.i
-data/test/java/util/Arrays/ArrayObjectMethods.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM871.java.i
+data/src/windows/native/sun/windows/security_warning_int.ico.i
+data/test/javax/sound/midi/Gervill/SoftTuning/Load1.java.i
 data/src/share/classes/com/sun/net/ssl/SSLContextSpi.java.i
-data/src/share/classes/java/io/CharArrayWriter.java.i
-data/test/sun/security/mscapi/PublicKeyInterop.java.i
+data/test/java/rmi/MarshalledObject/compare/Compare.java.i
+data/test/sun/rmi/rmic/manifestClassPath/run.sh.i
 data/src/windows/native/sun/security/pkcs11/j2secmod_md.h.i
 data/src/share/classes/java/awt/doc-files/MultiScreen.gif.i
-data/src/share/native/java/lang/Thread.c.i
-data/src/share/classes/sun/io/ByteToCharCp874.java.i
+data/test/java/net/MulticastSocket/JoinGroup.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ja.properties.i
 data/test/java/lang/annotation/loaderLeak/LoaderLeak.sh.i
 data/test/java/security/spec/EllipticCurveMatch.java.i
 data/test/javax/swing/JComponent/6683775/bug6683775.java.i
 data/test/javax/swing/LookAndFeel/6474153/bug6474153.java.i
 data/test/javax/management/namespace/JMXDomainTest.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java.i
-data/make/javax/swing/plaf/FILES.gmk.i
-data/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java.i
+data/src/solaris/native/sun/awt/XDrawingArea.c.i
+data/test/java/awt/Mixing/MixingOnShrinkingHWButton.java.i
+data/src/share/classes/javax/swing/plaf/multi/MultiTreeUI.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties.i
-data/src/share/classes/com/sun/tools/hat/internal/server/HistogramQuery.java.i
 data/src/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java.i
-data/test/sun/text/resources/Collator/Bug6755060.java.i
 data/src/share/classes/java/lang/UnknownError.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java.i
 data/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java.i
 data/test/java/util/zip/InflaterInputStream/MarkReset.java.i
 data/test/sun/security/tools/keytool/NoExtNPE.sh.i
 data/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c.i
-data/make/sun/nio/Makefile.i
 data/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.c.i
 data/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java.i
-data/test/java/util/ResourceBundle/Test4314141A__DE.properties.i
+data/src/share/classes/javax/imageio/metadata/IIOMetadataController.java.i
+data/src/share/classes/javax/crypto/spec/PBEKeySpec.java.i
 data/src/windows/native/sun/java2d/d3d/D3DSurfaceData.cpp.i
-data/test/tools/jar/ChangeDir.java.i
-data/src/share/classes/sun/io/CharToByteCp1025.java.i
+data/test/java/security/BasicPermission/ExitVMEquals.java.i
+data/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java.i
 data/src/share/classes/java/nio/file/attribute/PosixFileAttributeView.java.i
 data/src/share/classes/javax/management/event/EventClient.java.i
 data/src/windows/native/sun/windows/awt_Color.cpp.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/BooleanCalls.java.i
+data/test/java/net/URLClassLoader/closetest/build2.sh.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/CriticalSubjectAltName.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMBean.java.i
+data/src/share/classes/javax/security/auth/callback/PasswordCallback.java.i
 data/src/share/classes/java/awt/im/InputMethodHighlight.java.i
 data/make/tools/swing-beans/beaninfo/images/JAppletMono16.gif.i
-data/make/tools/CharsetMapping/IBM918.map.i
-data/src/share/native/sun/font/layout/TrimmedArrayProcessor.cpp.i
-data/src/share/native/sun/security/ec/impl/ec2_193.c.i
+data/make/modules/tools/nbproject/project.properties.i
+data/src/windows/back/proc_md.h.i
+data/src/solaris/classes/sun/java2d/xr/XRMaskFill.java.i
 data/test/java/beans/XMLEncoder/java_io_File.java.i
 data/make/sun/security/krb5/Makefile.i
-data/src/share/classes/javax/swing/plaf/FileChooserUI.java.i
+data/test/java/rmi/activation/ActivationSystem/unregisterGroup/Callback_Stub.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java.i
 data/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java.i
 data/src/solaris/doc/sun/man/man1/ja/wsimport.1.i
 data/src/share/classes/javax/security/auth/package.html.i
-data/test/com/sun/servicetag/servicetag4.properties.i
+data/src/share/classes/sun/io/CharToByteISO8859_2.java.i
 data/test/javax/smartcardio/TestCardPermission.java.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java.i
-data/src/share/classes/java/util/zip/DeflaterInputStream.java.i
+data/src/share/demo/jfc/Font2DTest/resources/TextResources_en.properties.i
 data/src/share/classes/java/security/acl/Owner.java.i
 data/src/share/classes/com/sun/pept/encoding/Decoder.java.i
-data/src/windows/classes/sun/awt/windows/WRobotPeer.java.i
 data/make/common/Library.gmk.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java.i
 data/test/java/util/Collections/CheckedSetBash.java.i
 data/test/java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java.i
-data/test/java/util/Hashtable/ReadObject.java.i
+data/src/share/native/java/lang/fdlibm/src/e_asin.c.i
 data/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java.i
 data/src/share/classes/com/sun/tools/jdi/CommandSender.java.i
-data/src/share/classes/java/awt/PageAttributes.java.i
 data/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java.i
 data/src/solaris/native/java/net/Inet6AddressImpl.c.i
+data/src/share/classes/java/awt/doc-files/DesktopProperties.html.i
 data/test/java/io/File/GetCanonicalPath.java.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed.gif.i
-data/test/java/nio/file/WatchService/LotsOfEvents.java.i
+data/src/windows/classes/sun/java2d/d3d/D3DTextRenderer.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java.i
 data/test/javax/management/remote/mandatory/notif/policy.negative.i
 data/src/share/classes/sun/nio/cs/ext/MS1255.java.i
 data/src/share/classes/javax/swing/text/html/MinimalHTMLWriter.java.i
 data/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java.i
+data/src/share/classes/java/nio/file/attribute/DosFileAttributeView.java.i
 data/src/share/classes/sun/security/jgss/GSSHeader.java.i
-data/src/share/classes/sun/io/CharToByteCp943.java.i
+data/src/solaris/classes/sun/awt/X11/XListPeer.java.i
 data/src/share/classes/sun/util/locale/StringTokenIterator.java.i
-data/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java.i
+data/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java.i
 data/src/share/classes/javax/imageio/stream/ImageInputStream.java.i
 data/src/share/bin/java.c.i
 data/test/java/net/InterfaceAddress/Equals.java.i
+data/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java.i
 data/make/tools/swing-beans/beaninfo/images/JWindowMono16.gif.i
-data/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java.i
+data/test/sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java.i
 data/src/share/classes/javax/security/auth/kerberos/ServicePermission.java.i
 data/src/share/classes/javax/management/loading/package.html.i
-data/src/share/classes/sun/security/ec/ECDHKeyAgreement.java.i
+data/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java.i
 data/test/java/lang/reflect/Proxy/returnTypes/GetSerializable.java.i
-data/test/java/beans/PropertyEditor/TestEnumSubclassValue.java.i
-data/src/share/classes/sun/font/FontAccess.java.i
+data/test/java/beans/Introspector/6380849/beans/FirstBean.java.i
 data/src/share/classes/sun/awt/DebugSettings.java.i
 data/src/share/back/ReferenceTypeImpl.h.i
 data/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.keyPass.i
-data/src/share/classes/sun/io/ByteToCharUTF8.java.i
 data/test/tools/pack200/PackageVersionTest.java.i
-data/make/sun/jpeg/mapfile-vers.i
 data/src/share/classes/sun/management/jmxremote/LocalRMIServerSocketFactory.java.i
-data/src/share/classes/sun/nio/cs/UTF_8.java.i
-data/test/sun/nio/cs/SurrogateTestEUCTW.plane4.surrogates.i
+data/make/common/Defs-embedded.gmk.i
 data/src/share/classes/sun/awt/resources/awt.properties.i
-data/src/share/classes/java/nio/file/DirectoryStream.java.i
 data/src/share/classes/javax/swing/text/DateFormatter.java.i
 data/test/java/beans/XMLEncoder/java_awt_LinearGradientPaint.java.i
 data/src/share/native/java/net/InetAddress.c.i
 data/src/share/classes/sun/nio/cs/ISO_8859_13.java.i
-data/src/share/classes/com/sun/servicetag/ServiceTag.java.i
+data/src/share/classes/com/sun/pept/ept/EPTFactory.java.i
 data/test/java/awt/FontClass/CreateFont/BigFont.java.i
 data/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java.i
 data/make/mkdemo/jfc/SwingApplet/Makefile.i
 data/src/share/classes/javax/swing/text/html/FrameView.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java.i
-data/test/javax/swing/JFileChooser/6840086/bug6840086.java.i
+data/src/share/classes/javax/xml/crypto/dsig/dom/package.html.i
 data/test/java/awt/TextField/ScrollSelectionTest/ScrollSelectionTest.html.i
 data/src/share/classes/java/util/HashMap.java.i
 data/make/netbeans/common/make.xml.i
-data/src/share/classes/java/security/KeyStoreException.java.i
-data/test/sun/rmi/rmic/extraCompilation/run.sh.i
+data/src/share/classes/sun/security/provider/MD5.java.i
+data/test/sun/security/tools/jarsigner/oldsig.sh.i
+data/test/javax/crypto/Cipher/Turkish.java.i
 data/make/mkdemo/management/FullThreadDump/Makefile.i
 data/test/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java.i
 data/test/com/sun/tools/attach/ApplicationSetup.sh.i
 data/src/share/classes/sun/nio/cs/UTF_32BE.java.i
 data/src/solaris/classes/sun/awt/motif/MDataTransferer.java.i
-data/make/java/beans/Makefile.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariTables.java.i
+data/test/java/awt/Graphics2D/DrawString/LCDTextSrcEa.java.i
 data/test/java/nio/channels/Selector/KeySets.java.i
 data/src/share/native/java/io/ObjectStreamClass.c.i
 data/test/java/beans/PropertyEditor/TestByteClassValue.java.i
-data/src/share/classes/sun/security/provider/MD4.java.i
+data/src/share/classes/sun/io/CharToByteCp1258.java.i
 data/src/windows/native/sun/windows/awt_Mlib.cpp.i
-data/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandard.java.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java.i
+data/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java.i
 data/test/org/openjdk/jigsaw/properties.xml.i
 data/make/tools/CharsetMapping/IBM1123.map.i
-data/src/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java.i
+data/src/share/native/sun/font/layout/GlyphIterator.h.i
 data/src/share/classes/com/sun/media/sound/SF2GlobalRegion.java.i
 data/src/share/classes/java/lang/Process.java.i
 data/src/share/back/SDE.h.i
@@ -15159,43 +15071,45 @@ data/test/sun/text/resources/Format/Bug4651568.java.i
 data/src/share/native/java/sql/DriverManager.c.i
 data/src/solaris/native/sun/xawt/XlibWrapper.c.i
 data/test/sun/security/tools/jarsigner/LargeJarEntry.java.i
-data/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java.i
+data/src/share/native/sun/java2d/loops/Ushort555Rgb.h.i
 data/test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmMemoryMeta.java.i
-data/test/java/nio/file/Files/probeContentType/META-INF/services/java.nio.file.spi.FileTypeDetector.i
+data/src/windows/native/sun/java2d/d3d/D3DRenderQueue.cpp.i
+data/src/solaris/classes/sun/awt/X11/XTextTransferHelper.java.i
 data/src/share/classes/sun/tools/tree/AssignOpExpression.java.i
-data/make/tools/src/build/tools/jdwpgen/StringObjectTypeNode.java.i
+data/src/solaris/doc/sun/man/man1/ja/keytool.1.i
 data/test/java/math/BigInteger/ModPow65537.java.i
-data/src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java.i
+data/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html.i
 data/test/java/lang/instrument/ParallelTransformerLoaderApp.java.i
 data/make/tools/swing-beans/beaninfo/images/JPopupMenuColor16.gif.i
-data/test/javax/naming/InitialContext/EnvClone.java.i
 data/test/javax/sound/midi/Gervill/SoftReceiver/Send_Omni.java.i
 data/src/share/classes/java/security/cert/CertPathHelperImpl.java.i
-data/src/share/javavm/include/opcodes.h.i
 data/src/windows/resource/java.rc.i
 data/src/share/classes/sun/awt/im/InputContext.java.i
 data/test/javax/management/monitor/MultiMonitorTest.java.i
+data/src/share/classes/com/sun/jdi/TypeComponent.java.i
 data/src/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties.i
 data/src/share/classes/javax/swing/LayoutFocusTraversalPolicy.java.i
 data/src/share/classes/javax/swing/colorchooser/ColorModelCMYK.java.i
-data/test/sun/net/www/protocol/http/ChunkedErrorStream.java.i
-data/src/share/classes/java/rmi/server/RemoteRef.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_de.properties.i
+data/make/tools/swing-beans/beaninfo/images/AbstractButtonColor16.gif.i
+data/test/java/beans/XMLEncoder/Bean.java.i
+data/test/java/io/StringReader/ClosedReady.java.i
+data/test/java/beans/XMLEncoder/java_sql_Time.java.i
 data/test/java/lang/Class/getModifiers/ResolveFrom.java.i
-data/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java.i
+data/test/sun/net/www/protocol/http/ResponseCacheStream.java.i
 data/test/javax/management/mxbean/AmbiguousConstructorTest.java.i
 data/src/share/classes/javax/sound/sampled/ReverbType.java.i
 data/src/share/classes/sun/print/PageableDoc.java.i
 data/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java.i
-data/src/share/classes/java/lang/reflect/Member.java.i
+data/src/share/classes/javax/swing/SingleSelectionModel.java.i
+data/test/sun/security/tools/policytool/ChangeUI.html.i
 data/test/javax/xml/crypto/dsig/data/signature-retrievalmethod-rawx509crt.xml.i
+data/src/share/classes/java/nio/channels/AsynchronousFileChannel.java.i
 data/src/share/classes/sun/security/krb5/KrbTgsReq.java.i
 data/test/javax/security/auth/x500/X500Principal/DerIsConstructor.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.java.i
 data/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.html.i
 data/src/share/classes/sun/security/x509/X509CertInfo.java.i
-data/src/solaris/native/sun/awt/awt_Insets.h.i
+data/src/solaris/doc/sun/man/man1/rmic.1.i
 data/test/java/beans/XMLEncoder/java_sql_Date.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnssckbi.so.i
 data/make/tools/sharing/classlist.solaris.i
@@ -15204,263 +15118,277 @@ data/src/share/classes/com/sun/tools/example/debug/tty/TTY.java.i
 data/test/java/rmi/Naming/DefaultRegistryPort.java.i
 data/make/tools/dtdbuilder/Makefile.i
 data/test/sun/text/resources/Format/Bug4621320.java.i
-data/src/share/demo/scripting/jconsole-plugin/src/META-INF/services/com.sun.tools.jconsole.JConsolePlugin.i
-data/test/javax/print/attribute/MediaMappingsTest.java.i
-data/src/share/classes/sun/util/resources/TimeZoneNames_de.java.i
+data/src/solaris/native/sun/awt/color.h.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U8Func.c.i
+data/src/share/classes/javax/security/auth/RefreshFailedException.java.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/JSSERenegotiate.java.i
 data/test/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java.i
 data/test/java/lang/reflect/Generics/SignatureTest.java.i
 data/src/share/classes/java/lang/invoke/CountingMethodHandle.java.i
 data/src/share/demo/jvmti/hprof/jvm.hprof.txt.i
+data/src/solaris/doc/sun/man/man1/jmap.1.i
 data/src/share/classes/java/awt/peer/DialogPeer.java.i
-data/test/demo/jvmti/gctest/BigHello.java.i
+data/test/java/beans/Beans/Test4067824.java.i
 data/src/share/classes/java/rmi/activation/ActivationID.java.i
-data/test/java/net/SocketPermission/Equals.java.i
-data/make/java/redist/FILES.gmk.i
-data/test/java/beans/XMLEncoder/javax_swing_border_BevelBorder.java.i
+data/test/java/nio/channels/SocketChannel/Open.sh.i
 data/make/tools/src/build/tools/jdwpgen/ArrayRegionTypeNode.java.i
 data/test/sun/security/tools/keytool/DummyProvider.java.i
 data/src/solaris/sample/dtrace/hotspot/method_invocation_stat.d.i
-data/src/share/native/sun/awt/image/jpeg/jquant2.c.i
+data/src/share/classes/sun/nio/cs/ext/IBM1026.java.i
 data/src/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java.i
 data/src/share/classes/java/io/ObjectStreamClass.java.i
-data/test/sun/net/www/protocol/http/RelativeRedirect.java.i
-data/test/java/lang/Class/getMethod/NullInParamList.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/package.html.i
+data/test/com/sun/nio/sctp/SctpServerChannel/NonBlockingAccept.java.i
 data/src/share/classes/java/util/prefs/PreferencesFactory.java.i
-data/src/share/classes/java/util/TooManyListenersException.java.i
+data/test/java/net/SocketPermission/Ctor.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmThreadingMBean.java.i
 data/src/share/classes/java/util/Properties.java.i
 data/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.java.i
 data/src/share/classes/sun/tools/jar/Main.java.i
 data/src/share/classes/java/awt/doc-files/GridLayout-2.gif.i
-data/test/java/util/ResourceBundle/Control/XmlRB_ja.xml.i
-data/test/javax/print/applet/applet2/META-INF/services/javax.print.PrintServiceLookup.i
+data/test/javax/swing/JScrollBar/6924059/bug6924059.java.i
+data/test/sun/security/util/PropertyExpander/ExpandAndEncode.java.i
 data/src/solaris/native/sun/awt/fontconfig.h.i
 data/test/java/net/URL/Test.java.i
-data/make/netbeans/common/shared.xml.i
-data/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy24.i
+data/make/sun/security/smartcardio/mapfile-vers.i
 data/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c.i
 data/test/com/sun/tools/attach/BadAgent.java.i
-data/src/share/classes/sun/tools/jstat/Literal.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java.i
+data/src/share/classes/com/sun/media/sound/AiffFileFormat.java.i
 data/test/java/lang/reflect/Field/GenericStringTest.java.i
-data/test/org/openjdk/jigsaw/cli/signer-prikey.pem.i
+data/src/share/native/sun/security/ec/ecl-exp.h.i
+data/src/share/classes/java/util/CurrencyData.properties.i
 data/test/java/beans/XMLEncoder/Test6187118.java.i
-data/test/com/sun/jndi/ldap/ReadTimeoutTest.java.i
+data/src/share/classes/org/openjdk/jigsaw/cli/Signer.java.i
 data/src/share/classes/javax/sql/rowset/JoinRowSet.java.i
 data/src/share/classes/sun/java2d/pisces/Helpers.java.i
 data/test/sun/security/krb5/auto/ok-as-delegate.sh.i
-data/src/share/classes/java/rmi/activation/UnknownGroupException.java.i
+data/test/java/nio/Buffer/CopyDirect-X-Memory.java.template.i
 data/src/share/instrument/JarFacade.h.i
 data/test/java/rmi/reliability/juicer/AppleUser.java.i
 data/src/windows/native/sun/windows/awt_ScrollPane.h.i
 data/test/java/io/RandomAccessFile/ParameterCheck.java.i
-data/src/share/classes/sun/io/ByteToCharCp1145.java.i
+data/src/share/native/sun/reflect/Reflection.c.i
+data/test/sun/nio/cs/TestUni2HKSCS.java.i
+data/src/share/classes/java/awt/print/PrinterJob.java.i
 data/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.c.i
-data/test/java/rmi/reliability/benchmark/runRmiBench.sh.i
+data/src/share/classes/java/awt/print/PrinterIOException.java.i
+data/src/share/classes/javax/print/MultiDocPrintService.java.i
+data/src/share/classes/java/nio/channels/Channel.java.i
 data/src/share/native/sun/java2d/loops/DrawRect.c.i
 data/src/solaris/classes/sun/nio/fs/UnixFileSystem.java.i
-data/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java.i
+data/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java.i
 data/test/java/io/PrintWriter/CheckError.java.i
 data/test/sun/security/smartcardio/TestTransmit.java.i
 data/test/java/util/concurrent/forkjoin/Integrate.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java.i
-data/src/solaris/bin/jexec.c.i
+data/test/javax/crypto/SealedObject/NullKeySealedObject.java.i
 data/src/windows/native/sun/tracing/dtrace/jvm_symbols_md.c.i
-data/src/solaris/doc/sun/man/man1/ja/appletviewer.1.i
+data/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java.i
 data/test/sun/nio/cs/OLD/EUC_CN_OLD.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpMessage.java.i
+data/src/share/classes/sun/tools/tree/BinaryShiftExpression.java.i
 data/src/share/classes/java/rmi/activation/ActivationException.java.i
 data/test/sun/net/www/protocol/http/B6890349.java.i
+data/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509IssuerSerial.java.i
-data/src/share/classes/sun/security/ec/ECDSASignature.java.i
+data/src/solaris/native/java/io/canonicalize_md.c.i
+data/src/share/native/sun/awt/image/jpeg/jchuff.c.i
 data/make/tools/swing-beans/beaninfo/images/JViewportColor32.gif.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/CustomUIDefault.java.i
-data/make/sun/security/pkcs11/mapfile-vers.i
-data/src/share/classes/sun/reflect/generics/tree/BaseType.java.i
-data/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java.i
+data/src/share/classes/javax/imageio/ImageWriter.java.i
+data/test/java/lang/StringCoding/CheckEncodings.sh.i
+data/src/share/classes/sun/security/pkcs/PKCS7.java.i
 data/test/java/rmi/registry/classPathCodebase/security.policy.i
-data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c.i
 data/test/java/net/URLClassLoader/sealing/b/p/B.java.i
-data/test/org/openjdk/jigsaw/hello-optional.sh.i
+data/src/solaris/classes/sun/nio/fs/UnixPath.java.i
 data/test/java/util/concurrent/ConcurrentQueues/IteratorWeakConsistency.java.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java.i
-data/src/share/classes/sun/tools/tree/MultiplyExpression.java.i
-data/src/share/classes/java/nio/file/WatchKey.java.i
+data/test/sun/jvmstat/monitor/VmIdentifier/testcases.i
+data/src/solaris/classes/sun/awt/X11/security-icon-bw48.png.i
 data/src/share/classes/java/util/logging/Logging.java.i
-data/src/share/classes/sun/security/krb5/KrbApRep.java.i
+data/test/java/io/Serializable/explicitCNFException/ExplicitCNFException.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidDigestValueException.java.i
-data/src/share/classes/sun/java2d/loops/DrawLine.java.i
+data/src/share/back/eventFilter.h.i
 data/src/share/classes/sun/util/resources/CalendarData_sr_Latn_BA.properties.i
-data/test/java/lang/Class/forName/classes/3.class.i
+data/test/sun/jvmstat/testlibrary/utils.sh.i
 data/src/share/classes/sun/security/krb5/internal/crypto/DesMacCksumType.java.i
 data/test/javax/security/auth/login/Exceptions/NewExceptions.java.i
 data/src/share/classes/sun/nio/cs/CharsetMapping.java.i
-data/test/javax/security/auth/login/Configuration/Synchronize.config.i
+data/make/mkdemo/applets/TicTacToe/Makefile.i
 data/src/share/classes/java/lang/ref/WeakReference.java.i
 data/src/share/classes/java/nio/file/CopyOption.java.i
 data/test/sun/rmi/rmic/newrmic/equivalence/DayTimeInterface.java.i
-data/make/java/jexec/Makefile.i
+data/src/share/classes/java/lang/StringBuilder.java.i
 data/test/sun/security/provider/KeyStore/TestJKSWithSecretKey.java.i
 data/make/tools/swing-beans/beaninfo/images/JOptionPaneMono32.gif.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHost.java.i
-data/test/java/nio/channels/Selector/LotsOfCancels.java.i
+data/src/share/classes/java/awt/Polygon.java.i
+data/make/mkdemo/jvmti/minst/Makefile.i
 data/src/windows/classes/sun/awt/windows/WDialogPeer.java.i
 data/test/com/sun/jdi/GetLocalVariables3Test.sh.i
 data/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java.i
 data/src/share/classes/sun/awt/AWTSecurityManager.java.i
 data/test/javax/management/Introspector/annot/Name.java.i
 data/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java.i
-data/src/share/classes/javax/accessibility/AccessibleEditableText.java.i
+data/src/share/classes/sun/misc/JavaIODeleteOnExitAccess.java.i
 data/src/share/classes/sun/text/resources/CollationData.java.i
-data/src/share/classes/javax/management/SendNotification.java.i
+data/test/java/util/ResourceBundle/Test4314141A_de_.properties.i
 data/make/sun/awt/Makefile.i
+data/src/share/classes/java/awt/geom/PathIterator.java.i
 data/src/share/classes/javax/net/ssl/HostnameVerifier.java.i
 data/test/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java.i
+data/test/java/nio/channels/DatagramChannel/NotBound.java.i
 data/src/share/classes/java/nio/file/FileAlreadyExistsException.java.i
-data/test/java/rmi/registry/interfaceHash/InterfaceHash.java.i
+data/test/sun/security/provider/X509Factory/BigCRL.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAccess.java.i
 data/src/windows/classes/sun/security/provider/NativePRNG.java.i
+data/src/solaris/classes/sun/awt/X11ComponentPeer.java.i
 data/test/javax/crypto/SecretKeyFactory/P2.jar.i
 data/src/share/native/sun/font/layout/SubtableProcessor.cpp.i
-data/src/share/classes/sun/rmi/transport/ConnectionInputStream.java.i
+data/src/share/classes/java/rmi/server/RMISocketFactory.java.i
 data/src/solaris/classes/java/lang/UNIXProcess.java.linux.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain10.txt.i
+data/src/share/demo/README.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java.i
 data/src/share/native/sun/font/AccelGlyphCache.c.i
-data/src/solaris/back/linker_md.c.i
-data/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java.i
+data/test/java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java.i
 data/src/share/classes/com/sun/security/sasl/ServerFactoryImpl.java.i
 data/src/share/classes/sun/rmi/transport/proxy/RMISocketInfo.java.i
 data/test/java/lang/reflect/Assignment/ArrayAssignment.java.i
 data/make/tools/swing-beans/beaninfo/images/JTableMono32.gif.i
-data/src/solaris/classes/sun/awt/motif/X11DragSourceContextPeer.java.i
-data/make/sun/security/pkcs11/Makefile.i
+data/src/share/classes/sun/security/tools/PathList.java.i
+data/src/share/classes/sun/print/ServiceDialog.java.i
 data/test/sun/security/pkcs11/rsa/TestSignatures.java.i
 data/src/share/classes/javax/print/attribute/standard/QueuedJobCount.java.i
-data/src/share/classes/com/sun/jdi/ThreadGroupReference.java.i
-data/src/share/classes/javax/swing/text/rtf/RTFAttribute.java.i
+data/test/javax/swing/JColorChooser/Test4380468.java.i
+data/test/java/rmi/Naming/LookupNameWithColon.java.i
 data/test/java/lang/instrument/TestClass2.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputImageTests.java.i
-data/src/solaris/native/sun/awt/awt_FileDialog.c.i
-data/test/javax/swing/JPopupMenu/6691503/bug6691503.java.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c.i
+data/src/windows/classes/sun/awt/windows/WPageDialogPeer.java.i
+data/test/javax/print/PrintSE/PrintSE.sh.i
 data/test/java/lang/invoke/MethodHandlesTest.java.i
 data/src/share/classes/java/util/concurrent/locks/LockSupport.java.i
 data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java.i
 data/test/java/net/DatagramSocket/InheritHandle.java.i
-data/src/solaris/native/sun/awt/awt_Selection.c.i
 data/test/java/util/Formatter/BasicDouble.java.i
 data/test/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java.i
-data/test/javax/swing/border/Test4243289.java.i
+data/src/share/sample/nio/server/URLDumper.java.i
 data/test/java/util/concurrent/locks/ReentrantReadWriteLock/LoopHelpers.java.i
 data/src/share/classes/com/sun/tools/example/debug/expr/ASCII_UCodeESC_CharStream.java.i
 data/test/java/io/FileInputStream/LeadingSlash.java.i
 data/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldMono16.gif.i
-data/src/share/classes/sun/tools/tree/ConditionVars.java.i
-data/src/share/classes/java/lang/Float.java.i
+data/src/windows/classes/sun/java2d/d3d/D3DRenderQueue.java.i
+data/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java.i
 data/make/javax/swing/beaninfo/manifest.i
-data/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java.i
+data/src/share/classes/java/awt/im/package.html.i
 data/src/share/classes/javax/swing/text/html/parser/DTD.java.i
 data/src/share/classes/javax/security/sasl/SaslServerFactory.java.i
 data/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java.i
 data/src/share/classes/java/dyn/WrongMethodTypeException.java.i
 data/src/share/classes/java/nio/charset/exceptions.i
-data/src/share/classes/javax/swing/border/AbstractBorder.java.i
-data/src/share/sample/scripting/scriptpad/README.txt.i
+data/src/share/demo/jfc/SampleTree/resources/images/expanded.gif.i
+data/src/solaris/classes/sun/nio/ch/FileKey.java.i
 data/test/javax/security/auth/x500/X500Principal/EscapedChars.java.i
 data/src/share/classes/javax/swing/text/DocumentFilter.java.i
-data/src/windows/native/sun/windows/stdhdrs.h.i
 data/src/solaris/native/sun/java2d/loops/vis_IntArgb.c.i
 data/src/share/classes/sun/awt/geom/Order0.java.i
-data/make/modules/tools/src/com/sun/classanalyzer/CheckDeps.java.i
+data/src/share/native/sun/font/layout/ThaiLayoutEngine.cpp.i
 data/test/java/io/File/AccessDenied.java.i
 data/src/share/classes/java/awt/geom/Rectangle2D.java.i
 data/test/java/rmi/server/clientStackTrace/security.policy.i
+data/test/sun/security/krb5/auto/SSL.java.i
 data/src/share/classes/sun/nio/ch/SelectorImpl.java.i
+data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml.i
 data/test/java/math/BigInteger/ProbablePrime.java.i
+data/test/javax/management/namespace/NamespaceCreationTest.java.i
 data/src/share/classes/sun/nio/cs/UTF_32.java.i
-data/src/share/classes/sun/io/ByteToCharCp1253.java.i
-data/src/share/classes/sun/security/ssl/HelloExtensions.java.i
+data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java.i
 data/src/share/classes/sun/security/krb5/internal/APReq.java.i
 data/src/share/classes/java/awt/peer/ListPeer.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_it.properties.i
 data/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java.i
+data/src/share/native/common/gdefs.h.i
 data/src/windows/classes/sun/nio/ch/SctpServerChannelImpl.java.i
-data/src/solaris/demo/jni/Poller/Poller.java.i
+data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java.i
 data/src/share/classes/com/sun/jmx/remote/internal/IIOPHelper.java.i
 data/src/solaris/classes/sun/java2d/BackBufferCapsProvider.java.i
 data/src/share/classes/sun/text/resources/uprops.icu.i
 data/src/share/classes/javax/swing/filechooser/FileSystemView.java.i
 data/test/com/sun/jdi/HelloWorld.java.i
-data/src/share/classes/com/sun/jndi/ldap/BindingWithControls.java.i
+data/src/share/classes/sun/misc/BASE64Encoder.java.i
+data/src/share/classes/com/sun/tools/example/debug/expr/Token.java.i
 data/test/java/io/charStreams/WriteLengths.java.i
 data/make/sun/xawt/FILES_c_unix.gmk.i
 data/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java.i
-data/src/share/classes/com/sun/jdi/Value.java.i
+data/test/sun/tools/jps/jps-Vm_Output2.awk.i
+data/src/share/classes/sun/jvmstat/monitor/event/VmStatusChangeEvent.java.i
 data/src/share/classes/java/awt/event/MouseEvent.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java.i
-data/make/org/jcp/Makefile.i
+data/src/share/classes/sun/security/jgss/krb5/MicToken.java.i
 data/make/netbeans/jconsole/nbproject/project.xml.i
 data/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java.i
 data/test/sun/security/provider/MessageDigest/Offsets.java.i
 data/test/org/openjdk/jigsaw/cli/signed-module.sh.i
-data/make/java/invoke/Makefile.i
+data/test/java/lang/ClassLoader/Assert.java.i
 data/src/share/classes/sun/dyn/MethodHandleImpl.java.i
 data/test/java/beans/XMLDecoder/Test4864117.java.i
 data/src/share/sample/forkjoin/mergesort/MergeDemo.java.i
 data/test/sun/net/www/ftptest/FtpCommandHandler.java.i
-data/src/windows/native/sun/java2d/windows/ddrawUtils.h.i
-data/src/share/classes/sun/nio/cs/ext/IBM278.java.i
+data/test/sun/security/provider/PolicyFile/SelfExpansion.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/ObjectCodeConvertors.java.i
+data/test/java/awt/FileDialog/MultipleMode/MultipleMode.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_de_CH.properties.i
 data/test/sun/rmi/rmic/newrmic/equivalence/Task.java.i
 data/test/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java.i
-data/test/java/util/TimSort/README.i
+data/src/share/classes/sun/awt/AWTAccessor.java.i
 data/test/javax/swing/JEditorPane/6917744/test.html.i
 data/src/share/classes/java/awt/Point.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/ArgumentAcceptingOptionSpec.java.i
-data/src/share/classes/java/net/SocketPermission.java.i
+data/src/share/classes/javax/swing/LayoutStyle.java.i
 data/test/java/io/File/Unicode.java.i
 data/src/share/classes/sun/util/locale/LocaleSyntaxException.java.i
-data/make/sun/Makefile.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHereContext.java.i
-data/make/sun/cmm/lcms/Makefile.i
+data/src/share/classes/javax/accessibility/AccessibleBundle.java.i
+data/src/share/classes/com/sun/beans/decoder/NullElementHandler.java.i
+data/src/share/classes/sun/text/normalizer/ReplaceableString.java.i
 data/src/share/classes/com/sun/jdi/request/ThreadDeathRequest.java.i
-data/src/share/classes/sun/security/krb5/KrbAsReq.java.i
+data/src/windows/native/sun/windows/awt_IconCursor.h.i
 data/test/java/lang/Runtime/exec/Status.java.i
 data/test/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java.i
 data/src/share/classes/sun/dyn/anon/AnonymousClassLoader.java.i
-data/src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java.i
+data/test/sun/security/mscapi/RSAEncryptDecrypt.sh.i
 data/src/share/classes/com/sun/crypto/provider/DHKeyFactory.java.i
 data/src/share/classes/com/sun/security/sasl/Provider.java.i
-data/src/share/classes/javax/naming/spi/ResolveResult.java.i
+data/test/java/util/ServiceLoader/FooService.java.i
 data/test/java/rmi/reliability/benchmark/bench/serial/FloatArrays.java.i
 data/test/java/nio/channels/Selector/lots_of_updates.sh.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java.i
+data/test/lib/security/java.policy/Ext_AllPolicy.sh.i
 data/test/java/net/InetAddress/SimpleNameService.java.i
-data/src/share/classes/sun/reflect/generics/tree/BottomSignature.java.i
 data/src/share/native/sun/security/ec/impl/ecp_521.c.i
-data/src/share/classes/javax/swing/JCheckBoxMenuItem.java.i
+data/src/solaris/instrument/FileSystemSupport_md.c.i
 data/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java.i
 data/src/share/classes/javax/management/RuntimeOperationsException.java.i
-data/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java.i
-data/src/share/classes/javax/swing/plaf/TreeUI.java.i
+data/test/javax/management/namespace/RemoveNotificationListenerTest.java.i
+data/make/tools/swing-beans/beaninfo/images/JPasswordFieldMono32.gif.i
+data/src/share/classes/javax/xml/crypto/URIDereferencer.java.i
+data/test/javax/management/MBeanInfo/SerializationTest.java.i
 data/src/share/native/java/util/concurrent/atomic/AtomicLong.c.i
 data/src/share/classes/org/ietf/jgss/GSSException.java.i
 data/test/javax/naming/ldap/LdapName/EscapeUnescapeTests.java.i
 data/test/java/util/LinkedList/Remove.java.i
 data/test/com/sun/jdi/DeleteAllBkptsTest.java.i
+data/src/share/classes/sun/rmi/server/ActivationGroupInit.java.i
 data/src/windows/classes/sun/awt/windows/WPathGraphics.java.i
 data/test/sun/security/provider/PolicyFile/EmailAddress.policy.i
 data/test/java/net/URL/abnormal_http_urls.i
-data/make/tools/swing-beans/beaninfo/images/JToolBarMono16.gif.i
+data/src/share/classes/java/awt/image/TileObserver.java.i
+data/src/share/classes/org/relaxng/datatype/DatatypeLibrary.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c.i
-data/src/share/classes/sun/beans/editors/ColorEditor.java.i
+data/test/java/net/BindException/Test.java.i
 data/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java.i
-data/src/share/classes/java/nio/Buffer.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U8Func.c.i
-data/src/share/classes/sun/util/resources/CalendarData.properties.i
-data/src/share/classes/java/util/AbstractMap.java.i
+data/test/java/util/EnumSet/RetainAll.java.i
+data/test/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandardMBean.java.i
+data/test/java/rmi/reliability/benchmark/bench/serial/Doubles.java.i
+data/src/share/classes/sun/tools/javac/resources/javac_zh_CN.properties.i
 data/src/share/classes/sun/tools/tree/StringExpression.java.i
 data/test/java/util/zip/InflaterBufferSize.java.i
 data/src/share/classes/sun/tools/jconsole/SummaryTab.java.i
@@ -15469,130 +15397,136 @@ data/src/share/classes/java/awt/image/package.html.i
 data/src/share/classes/sun/awt/image/BadDepthException.java.i
 data/test/javax/management/loading/mlet1.html.i
 data/test/sun/nio/ch/Basic.java.i
+data/src/share/classes/com/sun/java/util/jar/pack/CodingMethod.java.i
 data/test/java/io/Serializable/classDescGetField/GetField.java.i
 data/test/sun/nio/cs/OLD/IBM930_OLD.java.i
-data/make/com/sun/nio/Makefile.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java.i
+data/src/share/classes/com/sun/servicetag/RegistrationData.java.i
+data/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java.i
 data/src/share/classes/sun/reflect/annotation/AnnotationType.java.i
-data/src/share/bin/jli_util.h.i
+data/test/sun/misc/JarIndex/metaInfFilenames/jarA/META-INF/services/my.happy.land.i
 data/src/share/classes/com/sun/media/sound/AbstractDataLine.java.i
 data/src/share/classes/sun/security/ssl/ECDHClientKeyExchange.java.i
 data/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c.i
-data/make/jprt.config.i
+data/make/netbeans/jconsole/build.xml.i
 data/src/share/classes/sun/tools/tree/BooleanExpression.java.i
-data/test/java/awt/Multiscreen/DeviceIdentificationTest/DeviceIdentificationTest.java.i
-data/test/sun/security/ssl/etc/unknown_keystore.i
+data/test/javax/management/namespace/VirtualPropsTest.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/internal/ReflectionException.java.i
+data/make/tools/swing-beans/beaninfo/images/JLayeredPaneMono32.gif.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java.i
-data/test/java/awt/TrayIcon/CtorTest/CtorTest.java.i
+data/test/java/lang/String/IndexOfEmptyInEmpty.java.i
 data/test/java/beans/Introspector/memory/Bean.java.i
 data/src/share/classes/sun/net/httpserver/UndefLengthOutputStream.java.i
 data/src/share/classes/javax/imageio/stream/MemoryCache.java.i
-data/src/share/classes/sun/io/CharToByteMacRoman.java.i
+data/test/sun/rmi/rmic/covariantReturns/G2Impl.java.i
 data/src/share/classes/sun/java2d/pipe/BufferedBufImgOps.java.i
 data/test/sun/security/pkcs11/fips/secmod.db.i
 data/src/share/classes/sun/security/krb5/internal/crypto/HmacMd5ArcFourCksumType.java.i
-data/src/share/classes/javax/management/remote/JMXPrincipal.java.i
-data/test/java/rmi/server/useCustomRef/UseCustomRef_Stub.java.i
+data/test/java/lang/StringBuffer/Supplementary.java.i
+data/src/share/classes/com/sun/jndi/ldap/VersionHelper.java.i
 data/test/java/nio/file/Files/walk_file_tree.sh.i
 data/src/share/classes/javax/management/remote/JMXConnector.java.i
 data/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java.i
-data/src/solaris/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java.i
+data/src/share/classes/sun/io/ByteToCharUTF8.java.i
 data/test/java/lang/Float/Extrema.java.i
 data/src/share/classes/sun/security/pkcs11/Config.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c.i
-data/src/share/classes/sun/nio/cs/ArrayDecoder.java.i
+data/test/demo/jvmti/hprof/HelloWorld.java.i
+data/test/java/net/InetAddress/B5087907.java.i
+data/src/windows/native/sun/windows/stdhdrs.h.i
 data/src/share/native/sun/security/ec/ecl-priv.h.i
-data/test/java/util/Objects/BasicObjectsTest.java.i
+data/src/share/native/sun/awt/image/jpeg/jfdctflt.c.i
 data/src/solaris/doc/sun/man/man1/ja/tnameserv.1.i
-data/src/share/native/sun/font/layout/GlyphDefinitionTables.h.i
+data/src/share/classes/sun/java2d/cmm/ProfileDeferralMgr.java.i
 data/src/share/classes/com/sun/tools/jdi/SocketAttachingConnector.java.i
 data/src/windows/native/sun/windows/awt.rc.i
-data/src/share/classes/java/nio/Direct-X-Buffer.java.i
+data/test/java/nio/file/Files/walkFileTree/WalkWithSecurity.java.i
 data/make/sun/font/t2k/Makefile.i
 data/src/share/classes/sun/util/resources/CurrencyNames_fi_FI.properties.i
+data/src/share/classes/sun/nio/ch/NativeDispatcher.java.i
 data/src/share/classes/javax/swing/JTextField.java.i
-data/make/com/sun/tracing/Makefile.i
-data/test/javax/crypto/spec/DESKeySpec/CheckWeakKeys.java.i
-data/test/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Inform.gif.i
+data/test/java/rmi/reliability/juicer/ApplicationServer.java.i
 data/src/solaris/classes/sun/awt/X11/XRobotPeer.java.i
 data/test/java/rmi/reliability/benchmark/bench/serial/Cons.java.i
-data/src/share/classes/javax/swing/plaf/SplitPaneUI.java.i
-data/test/java/util/Formatter/Basic.sh.i
-data/test/sun/security/pkcs11/ec/TestECDSA.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java.i
+data/test/org/openjdk/jigsaw/cli/keystore.pw.i
+data/src/share/classes/java/security/PermissionCollection.java.i
 data/src/share/classes/java/awt/peer/DesktopPeer.java.i
-data/src/share/native/java/lang/Shutdown.c.i
-data/make/netbeans/awt2d/nbproject/project.xml.i
-data/src/solaris/demo/jni/Poller/PollingServer.java.i
-data/src/share/classes/java/io/LineNumberInputStream.java.i
+data/test/javax/swing/JInternalFrame/Test6505027.java.i
+data/src/share/classes/sun/security/x509/IPAddressName.java.i
+data/test/sun/tools/native2ascii/N2A_4636448.expected.i
+data/test/javax/swing/JInternalFrame/6726866/bug6726866.html.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S32Func.c.i
 data/test/java/lang/Math/TanTests.java.i
-data/src/share/classes/sun/text/resources/FormatData_en_IE.java.i
+data/src/share/classes/sun/tools/javac/resources/javac.properties.i
 data/src/share/classes/java/io/NotSerializableException.java.i
 data/src/share/classes/java/lang/AbstractMethodError.java.i
 data/test/java/util/concurrent/CountDownLatch/Basic.java.i
+data/src/share/demo/jvmti/index.html.i
 data/src/share/classes/com/sun/management/VMOption.java.i
 data/src/share/classes/sun/text/resources/FormatData_it_IT.java.i
 data/test/java/util/ResourceBundle/KeySetMessages_zh_CN.java.i
-data/src/share/classes/sun/awt/datatransfer/DataTransferer.java.i
-data/src/share/classes/sun/java2d/opengl/OGLMaskBlit.java.i
+data/src/share/classes/sun/awt/resources/awt_zh_TW.properties.i
+data/src/share/sample/nio/file/WatchDir.java.i
 data/make/tools/src/build/tools/jdwpgen/GroupNode.java.i
 data/test/javax/print/TestRaceCond.java.i
 data/src/share/classes/java/sql/Struct.java.i
 data/make/tools/commentchecker/Makefile.i
 data/test/java/awt/FileDialog/FileNameOverrideTest/FileNameOverrideTest.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java.i
+data/test/java/security/cert/pkix/policyChanges/TestPolicy.java.i
 data/src/share/classes/sun/awt/DefaultMouseInfoPeer.java.i
 data/src/windows/native/sun/tools/attach/WindowsAttachProvider.c.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpEngine.java.i
-data/test/java/rmi/activation/Activatable/restartService/RestartService_Stub.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose.gif.i
+data/test/java/util/concurrent/ConcurrentQueues/LoopHelpers.java.i
 data/test/sun/security/ssl/javax/net/ssl/HttpsURLConnection/DelayDefaultContextLoading.java.i
-data/src/share/classes/sun/tools/jconsole/LabeledComponent.java.i
+data/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/test.html.i
 data/src/share/classes/sun/security/x509/OIDName.java.i
-data/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java.i
-data/make/modules/tools/Makefile.i
+data/src/share/classes/java/lang/module/ModuleInfoReader.java.i
 data/src/share/classes/sun/security/pkcs/SignerInfo.java.i
 data/test/sun/security/tools/jarsigner/nameclash.sh.i
 data/test/sun/net/www/protocol/http/spnegoLog.properties.i
 data/test/sun/rmi/rmic/newrmic/equivalence/AgentServerImpl.java.i
 data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/InterprocessMessages.java.i
-data/test/java/net/Socket/setReuseAddress/Basic.java.i
-data/test/java/util/ArrayList/IteratorMicroBenchmark.java.i
+data/src/share/native/sun/nio/ch/genSocketOptionRegistry.c.i
+data/test/java/net/Socket/asyncClose/AsyncCloseTest.java.i
 data/test/java/io/Serializable/proxy/Basic.java.i
 data/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java.i
 data/src/share/classes/sun/nio/ch/AbstractFuture.java.i
-data/src/windows/classes/sun/awt/windows/WTextComponentPeer.java.i
+data/src/solaris/demo/jigsaw/basic/run.sh.i
 data/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java.i
 data/src/share/classes/javax/management/relation/RoleList.java.i
-data/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevel.java.i
+data/src/share/classes/sun/io/ByteToCharUnicodeBig.java.i
 data/src/share/classes/com/sun/jndi/toolkit/dir/AttrFilter.java.i
 data/src/share/classes/sun/net/idn/uidna.spp.i
 data/test/java/beans/Introspector/Test6707234.java.i
 data/src/share/classes/com/sun/servicetag/resources/javase_servicetag.properties.i
 data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain9.txt.i
+data/test/java/util/Formatter/BasicShort.java.i
 data/src/share/classes/java/io/DataInput.java.i
-data/src/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java.i
+data/test/javax/management/modelmbean/LoggingExceptionTest.java.i
 data/src/share/classes/sun/security/util/AuthResources_pt_BR.java.i
 data/src/windows/native/java/io/FileOutputStream_md.c.i
-data/src/share/native/sun/awt/image/jpeg/jdapistd.c.i
-data/test/java/awt/FontClass/FontAccess.java.i
-data/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.c.i
+data/test/javax/swing/JComponent/6989617/bug6989617.java.i
+data/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java.i
+data/src/share/classes/javax/swing/text/html/parser/DocumentParser.java.i
+data/src/share/classes/java/nio/file/SimpleFileVisitor.java.i
 data/test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java.i
 data/src/share/classes/sun/text/resources/FormatData_zh_HK.java.i
 data/src/share/transport/shmem/shmemBack.c.i
-data/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java.i
+data/test/sun/security/pkcs11/ec/pkcs12/sect193r1server-rsa1024ca.p12.i
 data/test/java/rmi/server/RMIClassLoader/getClassLoader/Foo.java.i
 data/src/share/classes/sun/text/resources/CollationData_sq.java.i
-data/src/share/classes/javax/swing/table/TableModel.java.i
+data/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.9.properties.i
 data/test/java/util/Locale/LocaleCategory.sh.i
 data/test/java/awt/EventDispatchThread/PreserveDispathThread/PreserveDispatchThread.java.i
 data/src/share/classes/com/sun/servicetag/BrowserSupport.java.i
 data/make/mksample/webservices/EbayServer/Makefile.i
-data/make/common/Defs-modules.gmk.i
-data/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties.i
+data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java.i
+data/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet_Stub.java.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl.java.i
-data/test/java/util/concurrent/locks/Lock/FlakyMutex.java.i
+data/src/share/classes/sun/security/jca/ServiceId.java.i
 data/test/sun/misc/JarIndex/metaInfFilenames/Basic.java.i
-data/make/tools/src/build/tools/jdwpgen/CommentNode.java.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/README.i
 data/test/javax/swing/SwingUtilities/7088744/bug7088744.java.i
 data/src/share/classes/javax/swing/JProgressBar.java.i
 data/test/java/awt/PrintJob/QuoteAndBackslashTest/QuoteAndBackslashTest.java.i
@@ -15601,14 +15535,14 @@ data/src/share/classes/java/dyn/SpreadGeneric.java.i
 data/test/sun/rmi/log/ReliableLog/SnapshotSize.java.i
 data/src/share/demo/jfc/Metalworks/AquaMetalTheme.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMeta.java.i
-data/src/share/instrument/PathCharsValidator.c.i
+data/src/windows/native/java/net/net_util_md.h.i
 data/src/share/classes/com/sun/servicetag/resources/jdk_header.png.i
 data/test/java/text/Bidi/Bug7002398.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpMsg.java.i
+data/src/share/classes/com/sun/servicetag/resources/javase_5_swordfish.properties.i
 data/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider.i
 data/test/javax/management/mxbean/PropertyNamesTest.java.i
 data/src/share/classes/java/nio/file/Paths.java.i
-data/test/java/net/URL/Protocol.java.i
+data/test/java/util/Locale/serialized/java6locale_ROOT.i
 data/src/share/classes/com/sun/tools/jdi/BaseLineInfo.java.i
 data/test/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java.i
 data/src/share/back/bag.c.i
@@ -15624,11 +15558,12 @@ data/test/java/security/Policy/Dynamic/TestDynamicPolicy.java.i
 data/src/linux/doc/man/ja/kinit.1.i
 data/test/java/rmi/reliability/benchmark/bench/rmi/ShortArrayCalls.java.i
 data/src/share/classes/java/applet/AppletStub.java.i
+data/test/java/nio/channels/FileChannel/Pwrite.java.i
 data/test/sun/security/pkcs11/tls/keymatdata.txt.i
 data/test/java/rmi/reliability/benchmark/bench/rmi/manifest.i
 data/test/java/util/Formatter/BasicChar.java.i
 data/test/sun/tools/native2ascii/A2N_4630463.expected.i
-data/src/share/classes/sun/io/ByteToCharCp875.java.i
+data/src/share/classes/sun/rmi/rmic/Names.java.i
 data/src/share/classes/javax/swing/RowFilter.java.i
 data/src/share/classes/sun/awt/ConstrainableGraphics.java.i
 data/make/tools/swing-beans/beaninfo/images/JTabbedPaneMono32.gif.i
@@ -15637,42 +15572,46 @@ data/test/sample/chatserver/ChatTest.java.i
 data/test/java/io/FileOutputStream/OpsAfterClose.java.i
 data/src/share/classes/sun/tools/jps/Jps.java.i
 data/src/share/classes/javax/management/RuntimeErrorException.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java.i
 data/src/share/demo/nbproject/jfc/Notepad/nbproject/project.xml.i
 data/src/share/classes/com/sun/jmx/mbeanserver/SecureClassLoaderRepository.java.i
 data/test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java.i
-data/src/share/classes/sun/net/ftp/FtpDirEntry.java.i
+data/test/java/nio/file/Path/FileAttributes.java.i
 data/test/sun/security/pkcs11/KeyStore/Basic.sh.i
 data/src/share/sample/scripting/scriptpad/src/resources/scriptpad.js.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java.i
 data/src/share/classes/sun/net/www/MeteredStream.java.i
-data/test/java/beans/XMLEncoder/java_awt_ScrollPane.java.i
+data/test/javax/xml/crypto/dsig/data/signature-external-b64-dsa.xml.i
 data/test/sun/management/jmxremote/bootstrap/management_test03_ko.properties.in.i
-data/src/share/native/java/lang/fdlibm/src/w_atanh.c.i
+data/src/windows/native/sun/windows/ComCtl32Util.cpp.i
 data/test/sun/tools/jps/jps-l_2.sh.i
 data/test/java/util/EnumSet/InsertWrongType.java.i
-data/test/java/net/DatagramSocket/BindFailTest.java.i
+data/src/share/back/export/sys.h.i
 data/test/java/rmi/activation/Activatable/restartService/rmid.security.policy.i
-data/make/com/sun/security/auth/Makefile.i
+data/src/share/classes/sun/reflect/SerializationConstructorAccessorImpl.java.i
 data/src/share/classes/sun/misc/Ref.java.i
 data/src/share/native/sun/font/freetypeScaler.c.i
-data/test/sun/tools/jps/jps-help.sh.i
-data/src/share/classes/sun/security/ssl/DHClientKeyExchange.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java.i
+data/test/java/awt/dnd/Button2DragTest/Button2DragTest.java.i
 data/src/share/native/sun/awt/image/cvutils/img_fsgray.h.i
+data/src/share/classes/java/util/concurrent/ExecutorCompletionService.java.i
 data/src/share/classes/sun/security/ec/SunECEntries.java.i
 data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipInfo.java.i
+data/src/windows/classes/sun/nio/fs/WindowsSecurity.java.i
 data/src/share/classes/javax/sql/rowset/serial/SerialDatalink.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JJTParserState.java.i
 data/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryFactory.java.i
 data/src/windows/native/sun/java2d/d3d/D3DContext.h.i
 data/src/share/classes/sun/security/x509/CertAttrSet.java.i
 data/src/windows/native/sun/windows/awt_Frame.cpp.i
-data/src/solaris/doc/sun/man/man1/keytool.1.i
-data/src/share/classes/sun/management/resources/agent_de.properties.i
+data/src/share/classes/sun/rmi/server/ActivatableServerRef.java.i
 data/src/share/classes/sun/security/util/Resources_zh_TW.java.i
 data/src/share/classes/java/nio/file/ClosedWatchServiceException.java.i
+data/make/tools/GenerateCharacter/CharacterDataUndefined.java.template.i
+data/src/share/classes/sun/util/resources/CalendarData_et.properties.i
 data/test/com/sun/jdi/RedefineAnnotation.sh.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionConstants.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/PaddingTest.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/UnconnectedSocketWrongExceptions.java.i
 data/test/java/io/Serializable/GetField/Read.java.i
 data/src/share/classes/sun/rmi/transport/StreamRemoteCall.java.i
@@ -15681,28 +15620,29 @@ data/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java.i
 data/make/sun/security/pkcs11/FILES_c.gmk.i
 data/src/share/classes/sun/awt/im/InputMethodManager.java.i
 data/src/share/classes/javax/sound/midi/MidiMessage.java.i
+data/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java.i
 data/src/share/classes/sun/nio/cs/ext/ISO2022.java.i
 data/test/demo/jvmti/minst/MinstExample.java.i
+data/make/tools/CharsetMapping/MS936.map.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelTableMetaImpl.java.i
 data/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.h.i
-data/make/tools/CharsetMapping/IBM875.map.i
-data/src/share/sample/vm/clr-jvm/Makefile.i
+data/test/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java.i
 data/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java.i
 data/src/share/classes/sun/dyn/InvokeGeneric.java.i
 data/src/share/native/sun/font/layout/SegmentSingleProcessor.h.i
-data/src/share/sample/vm/clr-jvm/invoker.cs.i
-data/src/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java.i
+data/make/tools/reorder/tests/LoadToolkit.java.i
+data/src/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java.i
+data/src/share/classes/java/awt/dnd/peer/DropTargetPeer.java.i
 data/test/java/util/ResourceBundle/Test4314141A.properties.i
-data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/project.xml.i
-data/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java.i
+data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/ClassCompare.java.i
 data/src/share/native/sun/java2d/loops/Any4Byte.h.i
 data/src/share/classes/sun/net/www/protocol/ftp/Handler.java.i
 data/test/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test.java.i
 data/src/share/classes/sun/tools/javac/ErrorConsumer.java.i
-data/src/share/native/sun/management/Flag.c.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java.i
-data/make/tools/GenerateCharacter/CharacterData02.java.template.i
-data/src/share/native/java/util/zip/zlib-1.2.3/deflate.h.i
+data/src/share/classes/java/nio/file/DirectoryStream.java.i
+data/src/share/classes/java/rmi/UnexpectedException.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties.i
+data/src/share/classes/javax/security/sasl/SaslException.java.i
 data/src/share/classes/sun/nio/cs/standard-charsets.i
 data/src/share/classes/sun/util/resources/CurrencyNames_es_CU.properties.i
 data/test/java/io/Serializable/classDescHooks/ClassDescHooks.java.i
@@ -15712,12 +15652,13 @@ data/src/share/classes/java/lang/module/ModuleInfo.java.i
 data/test/java/util/concurrent/Executors/Throws.java.i
 data/src/share/native/sun/awt/image/cvutils/img_output16.h.i
 data/src/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java.i
-data/src/share/classes/java/lang/Shutdown.java.i
+data/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java.i
+data/make/mkdemo/jvmti/gctest/Makefile.i
 data/src/share/classes/javax/swing/plaf/synth/SynthStyleFactory.java.i
 data/test/javax/management/context/localizable/MBeanDescriptions.properties.i
-data/src/share/native/sun/awt/splashscreen/splashscreen_png.c.i
-data/test/sun/management/jmxremote/bootstrap/management_test01_ok.properties.in.i
-data/test/java/nio/channels/AsynchronousFileChannel/Lock.java.i
+data/src/share/classes/sun/text/resources/FormatData_es_GT.java.i
+data/src/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html.i
+data/src/share/classes/java/util/EventObject.java.i
 data/src/share/classes/sun/nio/cs/ext/DoubleByte.java.i
 data/src/windows/classes/sun/awt/windows/awtLocalization_it.properties.i
 data/make/java/security/Makefile.i
@@ -15726,28 +15667,29 @@ data/test/java/net/URL/OpenConnection.java.i
 data/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java.i
 data/test/com/sun/tools/attach/AgentSetup.sh.i
 data/src/share/native/sun/security/ec/logtab.h.i
+data/src/share/classes/com/sun/rowset/providers/RIXMLProvider.java.i
 data/test/sun/nio/cs/OLD/IBM950_OLD.java.d
 data/src/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java.i
-data/test/sun/util/resources/Locale/Bug6275682.java.i
+data/src/share/sample/vm/jvm-clr/Makefile.i
 data/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeDirContext.java.i
-data/make/com/sun/sql/Makefile.i
+data/src/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java.i
 data/test/javax/management/remote/mandatory/subjectDelegation/policy23.i
-data/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java.i
+data/test/sun/nio/cs/OLD/IBM950_OLD.java.i
 data/src/solaris/native/sun/awt/awt_TextArea.c.i
-data/make/tools/CharsetMapping/dbcs.i
+data/src/share/classes/java/net/CookieHandler.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java.i
 data/test/java/nio/charset/Charset/CharsetContainmentTest.java.i
 data/test/java/net/PortUnreachableException/Test.java.i
 data/test/org/openjdk/jigsaw/eg/com/foo/bar/module-info.java.i
 data/src/solaris/native/sun/java2d/loops/vis_IntArgbPre.c.i
 data/src/share/classes/java/lang/management/PlatformComponent.java.i
 data/src/share/classes/java/util/logging/SocketHandler.java.i
-data/test/sun/net/idn/nfsmxp.spp.i
+data/src/share/demo/jvmti/hprof/hprof_stack.h.i
 data/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java.i
 data/src/share/classes/sun/misc/Timer.java.i
 data/src/share/classes/com/sun/jndi/ldap/EventQueue.java.i
 data/src/share/classes/sun/security/krb5/KrbPriv.java.i
 data/test/java/lang/management/RuntimeMXBean/InputArgument.java.i
-data/src/windows/npt/npt_md.h.i
 data/src/share/classes/sun/security/util/PolicyUtil.java.i
 data/make/com/sun/nio/sctp/Exportedfiles.gmk.i
 data/src/share/classes/sun/security/x509/KeyIdentifier.java.i
@@ -15756,154 +15698,157 @@ data/test/sun/java2d/cmm/ColorConvertOp/LRGB.png.i
 data/test/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java.i
 data/src/share/classes/java/beans/beancontext/BeanContextEvent.java.i
 data/src/share/classes/sun/security/krb5/KdcComm.java.i
-data/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties.i
-data/src/windows/native/java/net/Inet6AddressImpl.c.i
-data/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java.i
+data/test/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/JAVA2.DS.i
+data/test/java/lang/instrument/ExampleRedefine.java.i
+data/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdParallelGC.sh.i
 data/src/share/classes/sun/awt/FontConfiguration.java.i
 data/test/com/sun/net/httpserver/bugs/B6393710.java.i
 data/src/share/classes/javax/crypto/SecretKey.java.i
 data/test/java/util/Arrays/Big.java.i
 data/test/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_BO.properties.i
+data/src/share/classes/javax/sound/midi/Transmitter.java.i
 data/src/share/classes/com/sun/jmx/namespace/serial/RewritingProcessor.java.i
-data/src/windows/native/sun/java2d/d3d/D3DShaderGen.c.i
-data/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/CheckMyTrustedKeystore.java.i
+data/test/javax/naming/InitialContext/EnvClone.java.i
 data/test/sun/nio/cs/OLD/MS936_OLD.java.i
 data/test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java.i
 data/src/share/back/debugLoop.h.i
 data/src/share/classes/java/beans/VetoableChangeListenerProxy.java.i
 data/src/share/classes/java/net/SocketImplFactory.java.i
 data/src/share/classes/sun/security/krb5/internal/ETypeInfo2.java.i
-data/src/share/classes/sun/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java.i
+data/test/com/sun/jdi/BreakpointTest.java.i
+data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Main.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java.i
 data/make/mkdemo/applets/WireFrame/Makefile.i
-data/test/java/io/Serializable/unshared/Read.java.i
-data/src/share/classes/java/lang/IndexOutOfBoundsException.java.i
+data/test/sun/net/www/ftptest/FtpFileSystemHandler.java.i
+data/test/java/util/concurrent/ScheduledThreadPoolExecutor/Stress.java.i
 data/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.h.i
-data/test/sun/security/pkcs11/KeyStore/ClientAuthData/key3.db.i
+data/src/windows/npt/npt_md.h.i
 data/src/share/classes/sun/awt/geom/AreaOp.java.i
+data/test/javax/swing/JPopupMenu/6987844/bug6987844.java.i
 data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h.i
 data/test/java/rmi/reliability/benchmark/bench/serial/ObjArrays.java.i
 data/test/java/util/ResourceBundle/ResourceBundleTest.java.i
-data/src/share/lib/security/java.security.i
+data/make/sun/awt/mapfile-mawt-vers.i
 data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_ja.properties.i
 data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java.i
 data/src/share/classes/sun/awt/resources/awt_fr.properties.i
-data/test/java/io/Serializable/evolution/RenamePackage/test/SerialDriver.java.i
-data/test/sun/security/jgss/spnego/NegTokenTargFields.java.i
+data/test/javax/xml/crypto/dsig/data/signature.xml.i
+data/test/sun/tools/jstatd/usage.out.i
 data/src/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java.i
 data/src/share/classes/java/dyn/LinkagePermission.java.i
 data/test/sun/net/InetAddress/nameservice/chaining/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
-data/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java.i
+data/src/share/classes/java/text/Format.java.i
 data/src/share/lib/images/cursors/motif_LinkDrop32x32.gif.i
-data/src/share/classes/com/sun/tools/jdi/CharValueImpl.java.i
+data/src/share/classes/sun/nio/cs/ISO_8859_4.java.i
 data/src/share/classes/com/sun/beans/finder/PersistenceDelegateFinder.java.i
 data/test/sun/security/pkcs11/tls/prfdata.txt.i
-data/test/java/util/zip/pkware123456789012345.zip.i
-data/src/share/classes/java/util/concurrent/ThreadFactory.java.i
+data/test/java/lang/ThreadLocal/Basic.java.i
+data/src/share/classes/javax/print/attribute/TextSyntax.java.i
 data/src/share/classes/java/util/jar/JarEntry.java.i
-data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanManagerTest.java.i
-data/src/windows/classes/sun/awt/windows/WGlobalCursorManager.java.i
+data/src/share/classes/sun/security/pkcs10/PKCS10Attribute.java.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.access.in.i
 data/make/tools/GenerateCharacter/CharacterDataPrivateUse.java.template.i
 data/test/org/openjdk/jigsaw/cli/SignedModuleFileTest.sh.i
 data/test/java/net/Socket/SocketImplTest.java.i
-data/src/share/classes/sun/print/PrintJobAttributeException.java.i
+data/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java.i
 data/src/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java.i
-data/test/javax/swing/JLayer/6824395/bug6824395.java.i
-data/src/share/classes/java/awt/Adjustable.java.i
+data/test/java/util/ResourceBundle/Control/BadStaticInitRB.java.i
 data/src/share/classes/java/security/UnrecoverableEntryException.java.i
 data/test/java/rmi/reliability/juicer/OrangeImpl.java.i
-data/test/java/io/Serializable/6966692/Victim.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/OptionException.java.i
+data/src/share/classes/sun/tools/jstat/Identifier.java.i
 data/test/java/io/Serializable/enum/array/Test.java.i
-data/src/share/classes/sun/nio/cs/ext/ISO2022_CN.java.i
+data/src/share/classes/sun/tools/tree/BinaryAssignExpression.java.i
 data/test/java/net/DatagramPacket/Constructor.java.i
 data/src/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java.i
 data/src/windows/native/sun/java2d/d3d/D3DResourceManager.cpp.i
-data/test/com/sun/jdi/Redefine-g.sh.i
-data/src/share/classes/javax/print/attribute/PrintJobAttribute.java.i
+data/src/share/classes/javax/swing/SwingUtilities.java.i
+data/test/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorProvider.i
 data/src/share/classes/sun/reflect/generics/repository/ConstructorRepository.java.i
 data/test/java/lang/StrictMath/Log10Tests.java.i
-data/test/java/nio/file/Files/MaxDepth.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames.properties.i
+data/make/mkdemo/jvmti/waiters/Makefile.i
+data/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java.i
+data/src/share/classes/com/sun/jdi/PrimitiveType.java.i
+data/make/tools/src/build/tools/generatenimbus/Generator.java.i
 data/src/share/sample/nio/server/Dispatcher1.java.i
 data/test/java/net/Socket/OldSocketImpl.java.i
 data/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java.i
 data/src/share/classes/sun/java2d/pipe/LCDTextRenderer.java.i
 data/test/java/security/cert/CertPathBuilder/targetConstraints/sun.cer.i
-data/src/share/classes/sun/util/resources/CurrencyNames_pt_PT.properties.i
-data/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java.i
+data/test/java/util/zip/TestEmptyZip.java.i
+data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup_Stub.java.i
 data/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java.i
-data/src/share/classes/sun/dyn/util/ValueConversions.java.i
+data/src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java.i
 data/src/share/classes/sun/io/CharToByteUnicode.java.i
 data/test/java/beans/XMLEncoder/6380849/BeanPersistenceDelegate.java.i
 data/src/share/classes/com/sun/jndi/ldap/ServiceLocator.java.i
-data/src/share/classes/sun/awt/image/BytePackedRaster.java.i
+data/src/share/classes/java/text/spi/NumberFormatProvider.java.i
 data/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java.i
-data/test/sun/nio/cs/EUCJPUnderflowDecodeTest.java.i
 data/src/share/native/sun/font/layout/SingleTableProcessor.h.i
 data/src/share/classes/java/lang/annotation/Annotation.java.i
 data/test/java/nio/channels/Channels/Basic.java.i
-data/src/share/classes/com/sun/jdi/AbsentInformationException.java.i
+data/test/com/sun/jdi/GenericsTest.java.i
 data/src/share/classes/sun/tools/tree/BitAndExpression.java.i
-data/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java.i
+data/src/share/demo/jfc/CodePointIM/resources/codepoint_zh_CN.properties.i
 data/test/java/net/URL/GetDefaultPort.java.i
-data/src/share/demo/applets/GraphicsTest/AppletFrame.java.i
-data/test/java/lang/Throwable/SuppressedExceptions.java.i
-data/src/share/classes/com/sun/beans/decoder/DoubleElementHandler.java.i
+data/src/share/classes/sun/util/resources/LocaleNames.properties.i
+data/src/share/classes/sun/reflect/ClassFileConstants.java.i
 data/src/share/native/sun/java2d/loops/Index8Gray.c.i
 data/src/share/classes/java/awt/FlowLayout.java.i
 data/test/javax/script/StringWriterPrintTest.java.i
 data/src/share/classes/java/awt/geom/Dimension2D.java.i
 data/src/windows/classes/sun/awt/windows/WObjectPeer.java.i
-data/make/javax/crypto/policy/unlimited/default_US_export.policy.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_SV.properties.i
 data/src/share/classes/sun/awt/RepaintArea.java.i
+data/src/share/classes/sun/security/ssl/CipherSuite.java.i
 data/test/sun/security/pkcs11/KeyStore/BasicData/pk3.cert.i
-data/make/javax/crypto/policy/limited/LIMITED.i
+data/src/share/classes/sun/text/resources/FormatData_es_PR.java.i
 data/src/share/classes/com/sun/nio/sctp/SctpChannel.java.i
 data/make/tools/swing-beans/beaninfo/images/JSliderColor32.gif.i
-data/src/share/classes/sun/rmi/log/LogOutputStream.java.i
-data/src/share/classes/com/sun/jdi/connect/LaunchingConnector.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/PaddingTest.java.i
+data/src/share/classes/com/sun/tools/hat/internal/server/FinalizerObjectsQuery.java.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/ConstantPoolParser.java.i
 data/src/share/classes/javax/sound/sampled/AudioSystem.java.i
-data/src/share/classes/javax/naming/RefAddr.java.i
-data/src/share/native/sun/security/ec/mpi.h.i
+data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java.i
+data/test/javax/crypto/SecretKeyFactory/FailOverTest.java.i
 data/src/share/classes/java/sql/Wrapper.java.i
-data/test/sun/security/ssl/sanity/pluggability/MySSLEngineImpl.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java.i
-data/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/pk1.cert.i
+data/src/share/native/com/sun/java/util/jar/pack/unpack.cpp.i
+data/src/share/native/sun/font/layout/DeviceTables.h.i
 data/src/solaris/classes/sun/awt/X11/security-icon-yellow32.png.i
-data/src/share/classes/java/net/MulticastSocket.java.i
-data/src/share/classes/java/io/ObjectStreamConstants.java.i
+data/test/javax/swing/JFileChooser/6484091/bug6484091.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_en_SG.properties.i
 data/test/com/sun/jdi/JdbLockTest.sh.i
+data/src/share/classes/sun/util/resources/CalendarData_en.properties.i
 data/src/share/classes/sun/io/ByteToCharCp037.java.i
-data/test/java/util/logging/ClassLoaderLeakTest.java.i
-data/test/java/util/PluggableLocale/providersrc/java.text.spi.NumberFormatProvider.i
-data/test/java/net/CookieHandler/B6791927.java.i
+data/test/java/io/Serializable/lookupInterfaceDesc/LookupInterfaceDesc.java.i
+data/test/sun/nio/cs/TestX11JIS0201.java.i
 data/make/java/java_crw_demo/mapfile-vers.i
 data/src/share/classes/sun/security/provider/certpath/Vertex.java.i
-data/make/tools/CharsetMapping/IBM1141.c2b.i
-data/test/java/io/Serializable/PutField/Write.java.i
+data/src/share/classes/javax/print/attribute/HashPrintJobAttributeSet.java.i
+data/src/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java.i
 data/src/share/modules/jdk.base/module-info.java.i
-data/make/sun/jawt/Depend.mak.i
 data/src/share/classes/sun/tools/tree/TryStatement.java.i
 data/src/share/classes/java/awt/peer/MenuComponentPeer.java.i
 data/test/sun/security/tools/keytool/readjar.sh.i
+data/src/share/native/sun/security/ec/ecp_384.c.i
 data/test/java/awt/List/SetFontTest/SetFontTest.java.i
 data/src/share/classes/java/security/cert/package.html.i
-data/test/java/io/Serializable/primitiveClasses/PrimitiveClasses.java.i
-data/src/share/classes/sun/io/CharToByteCp970.java.i
+data/src/share/native/sun/font/fontscalerdefs.h.i
+data/src/share/demo/jvmti/agent_util/agent_util.h.i
 data/src/share/classes/sun/reflect/UnsafeStaticByteFieldAccessorImpl.java.i
 data/test/sun/util/resources/Calendar/Bug4527203.java.i
 data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ActivateMe.java.i
 data/src/share/classes/sun/nio/ch/Net.java.i
 data/test/java/io/Serializable/classDescHooks/Loopback.java.i
 data/test/java/beans/PropertyEditor/TestFloatTypeNull.java.i
-data/src/share/classes/sun/text/resources/FormatData_th_TH.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c.i
+data/test/tools/pack200/MemoryAllocatorTest.java.i
+data/src/share/classes/com/sun/media/sound/DLSInstrument.java.i
+data/test/java/beans/PropertyEditor/TestDoubleClassNull.java.i
 data/src/share/sample/jmx/jmx-scandir/logging.properties.i
-data/test/sun/security/krb5/auto/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
-data/test/lib/security/cacerts/VerifyCACerts.java.i
+data/src/share/classes/com/sun/jndi/toolkit/dir/ContextEnumerator.java.i
 data/make/tools/CharsetMapping/ISO_8859_8.map.i
 data/src/share/classes/sun/misc/resources/Messages.java.i
 data/test/java/lang/ClassLoader/UninitializedParent.java.i
@@ -15912,14 +15857,12 @@ data/src/share/classes/sun/rmi/rmic/RMIConstants.java.i
 data/src/solaris/classes/sun/nio/ch/EPollPort.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_EmptyList.java.i
 data/test/sun/security/krb5/auto/RRC.java.i
-data/test/tools/pack200/Pack200Props.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM964.java.i
+data/src/share/classes/javax/swing/ScrollPaneLayout.java.i
 data/src/share/classes/javax/print/attribute/UnmodifiableSetException.java.i
-data/src/share/classes/sun/java2d/DefaultDisposerRecord.java.i
 data/test/java/util/concurrent/FutureTask/Throw.java.i
 data/test/java/awt/event/MouseEvent/CTORRestrictions/CTORRestrictions.java.i
 data/src/share/classes/sun/io/Converters.java.i
-data/src/share/classes/sun/awt/SunHints.java.i
+data/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java.i
 data/test/java/awt/dnd/ImageDecoratedDnD/ImageGenerator.java.i
 data/test/java/security/Provider/ProviderInfoCheck.java.i
 data/test/sun/nio/cs/SurrogateTestHKSCS.java.i
@@ -15927,47 +15870,48 @@ data/test/demo/zipfs/Basic.java.i
 data/src/share/classes/sun/java2d/NullSurfaceData.java.i
 data/src/share/classes/javax/swing/event/SwingPropertyChangeSupport.java.i
 data/test/java/text/Format/DateFormat/Bug6609750.java.i
-data/test/sun/nio/cs/StrCodingBenchmark.java.i
+data/test/javax/management/Introspector/SetWrongTypeAttributeTest.java.i
 data/src/share/classes/sun/io/CharToByteMacCroatian.java.i
 data/test/java/beans/PropertyEditor/TestShortClass.java.i
 data/src/solaris/classes/sun/awt/motif/MMenuBarPeer.java.i
 data/src/share/classes/sun/security/x509/CertificateVersion.java.i
-data/test/javax/management/modelmbean/DescriptorSupportTest.java.i
-data/make/sun/security/ec/Makefile.i
-data/src/share/classes/com/sun/media/sound/StandardMidiFileReader.java.i
-data/src/share/classes/com/sun/jmx/mbeanserver/NotificationMBeanSupport.java.i
-data/test/java/awt/dnd/URIListBetweenJVMsTest/InterprocessMessages.java.i
+data/test/java/util/ResourceBundle/Bug6190861Data_en_US.properties.i
+data/src/share/demo/applets/DrawTest/example1.html.i
+data/make/tools/CharsetMapping/ISO_8859_6.map.i
+data/src/solaris/classes/sun/awt/X11/XAtom.java.i
+data/make/mkdemo/jvmti/heapTracker/Makefile.i
+data/src/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java.i
 data/src/share/back/ArrayTypeImpl.c.i
 data/src/share/native/com/sun/media/sound/MidiInDevice.c.i
 data/src/solaris/classes/sun/awt/X11/XWindow.java.i
 data/src/share/classes/java/awt/MediaTracker.java.i
 data/src/share/classes/sun/rmi/transport/proxy/HttpAwareServerSocket.java.i
-data/src/share/native/sun/java2d/loops/UshortIndexed.h.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/FloatCalls.java.i
-data/src/share/classes/sun/tools/tree/ConstantExpression.java.i
-data/src/share/native/sun/awt/image/cvutils/img_ordclruns.h.i
-data/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java.i
-data/test/javax/management/remote/mandatory/URLTest.java.i
+data/test/java/lang/Float/BitwiseConversion.java.i
+data/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java.i
+data/test/sun/security/provider/PolicyFile/nullDomain.java.i
+data/src/share/classes/sun/security/pkcs11/Secmod.java.i
+data/make/tools/fontchecker/Makefile.i
 data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxKeyManagerFactoryImpl.java.i
-data/test/java/nio/file/Files/Misc.java.i
-data/src/share/classes/com/sun/imageio/stream/StreamFinalizer.java.i
+data/test/java/lang/management/MemoryMXBean/LowMemoryTest2.java.i
+data/src/solaris/doc/sun/man/man1/idlj.1.i
 data/src/share/classes/sun/reflect/LangReflectAccess.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathFuncHereAPI.java.i
 data/test/java/security/BasicPermission/SerialVersion.1.4.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy14.i
+data/src/share/classes/java/awt/dnd/DragSourceDropEvent.java.i
 data/make/tools/CharsetMapping/IBM1141.map.i
 data/src/share/classes/sun/net/httpserver/FixedLengthOutputStream.java.i
 data/src/solaris/native/java/lang/locale_str.h.i
 data/test/java/io/Serializable/enum/constantSubclasses/Write.java.i
 data/test/java/io/Serializable/packageAccess/C.java.i
 data/src/share/classes/com/sun/security/auth/X500Principal.java.i
-data/src/share/classes/javax/sound/sampled/Port.java.i
+data/src/share/classes/sun/applet/AppletIOException.java.i
 data/test/java/util/ArrayList/Bug6533203.java.i
 data/src/share/classes/javax/naming/directory/DirContext.java.i
+data/src/share/classes/java/net/DatagramSocketImpl.java.i
 data/src/share/classes/javax/management/remote/JMXConnectionNotification.java.i
 data/src/share/classes/sun/misc/InvalidJarIndexException.java.i
-data/test/com/sun/security/sasl/util/CheckAccess.java.i
-data/src/share/classes/com/sun/tools/jdi/BooleanTypeImpl.java.i
+data/src/solaris/doc/sun/man/man1/jsadebugd.1.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java.i
 data/src/share/classes/sun/util/resources/CalendarData_el_CY.properties.i
 data/test/java/math/BigDecimal/StringConstructor.java.i
 data/src/share/classes/java/lang/invoke/BoundMethodHandle.java.i
@@ -15978,73 +15922,71 @@ data/make/sun/javazic/Makefile.i
 data/src/share/classes/com/sun/script/util/ScriptEngineFactoryBase.java.i
 data/src/share/classes/sun/io/CharToByteCp942C.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIPaint.java.i
-data/src/share/classes/sun/tools/jconsole/resources/masthead-left.png.i
-data/src/share/classes/sun/tools/tree/AssignExpression.java.i
+data/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c.i
+data/src/share/classes/java/awt/MultipleGradientPaint.java.i
 data/test/java/nio/channels/Selector/SelectNowWhenEmpty.java.i
-data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.html.i
-data/src/share/classes/com/sun/beans/decoder/ClassElementHandler.java.i
+data/src/share/classes/java/awt/print/PrinterException.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java.i
 data/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java.i
 data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressInputStream.java.i
-data/src/share/classes/sun/text/normalizer/UCharacterPropertyReader.java.i
-data/src/share/classes/java/util/AbstractCollection.java.i
-data/src/share/classes/java/security/AlgorithmConstraints.java.i
+data/src/windows/native/sun/java2d/windows/RegistryKey.h.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/CipherSuiteOrder.java.i
-data/src/share/classes/java/lang/InstantiationError.java.i
-data/src/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java.i
+data/test/javax/sound/midi/Gervill/SoftChannel/Mono.java.i
+data/src/share/native/sun/awt/image/cvutils/img_output8.h.i
 data/src/windows/native/sun/java2d/d3d/D3DSurfaceData.h.i
-data/src/share/classes/com/sun/media/sound/ModelStandardTransform.java.i
-data/test/java/beans/PropertyEditor/TestShortTypeJava.java.i
-data/src/share/native/sun/java2d/opengl/OGLVertexCache.h.i
+data/test/java/net/URI/RelativeEncoding.java.i
+data/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java.i
+data/src/share/classes/com/sun/tools/jdi/LocationImpl.java.i
 data/test/java/security/cert/pkix/policyChanges/anchor.cer.i
 data/src/share/classes/sun/net/httpserver/HttpServerImpl.java.i
 data/src/share/classes/sun/nio/cs/CESU_8.java.i
 data/test/java/awt/font/Rotate/TestTransform.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDimension.java.i
-data/src/share/classes/java/net/Socket.java.i
-data/src/share/classes/sun/rmi/server/resources/rmid.properties.i
+data/src/share/classes/com/sun/media/sound/AudioSynthesizer.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java.i
 data/src/share/classes/com/sun/tracing/Provider.java.i
 data/test/java/beans/PropertyEditor/TestShortClassJava.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_pt_BR.properties.i
 data/test/java/beans/XMLEncoder/Test4968523.java.i
-data/test/java/beans/EventHandler/Test6788531.java.i
 data/src/share/classes/javax/swing/text/html/FormView.java.i
-data/src/share/classes/sun/jvmstat/monitor/remote/package.html.i
-data/src/share/classes/sun/tools/jconsole/OverviewPanel.java.i
+data/test/java/rmi/activation/Activatable/notSerializable/NotSerializable.java.i
+data/src/share/classes/javax/management/monitor/StringMonitorMBean.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/PixelTests.java.i
 data/src/share/sample/jmx/jmx-scandir/src/etc/access.properties.i
 data/src/share/classes/java/awt/doc-files/List-1.gif.i
+data/src/share/classes/java/awt/image/VolatileImage.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S16Func.c.i
 data/src/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java.i
 data/test/sun/security/smartcardio/README.txt.i
-data/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java.i
 data/src/share/classes/java/security/cert/Extension.java.i
+data/test/java/beans/VetoableChangeSupport/TestEquals.java.i
 data/test/java/util/LinkedList/AddAll.java.i
 data/src/share/demo/management/MemoryMonitor/MemoryMonitor.java.i
-data/src/share/classes/sun/rmi/registry/resources/rmiregistry.properties.i
+data/src/windows/javavm/export/jni_md.h.i
 data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java.i
 data/src/windows/native/sun/windows/awt_TextComponent.h.i
-data/src/share/classes/sun/audio/AudioData.java.i
-data/make/common/Mapfile-vers.gmk.i
-data/test/sun/security/tools/keytool/newhelp.sh.i
-data/src/share/classes/javax/management/MBeanRegistrationException.java.i
+data/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java.i
+data/src/share/classes/sun/misc/SharedSecrets.java.i
+data/src/share/back/debugLoop.c.i
+data/src/share/classes/javax/management/MBeanRegistrationException.java.i
 data/make/tools/CharsetMapping/IBM1383.c2b.i
-data/test/java/beans/VetoableChangeSupport/TestListeners.java.i
-data/src/solaris/native/sun/awt/awt_LoadLibrary.c.i
+data/test/java/io/RandomAccessFile/Close.java.i
+data/test/java/io/Serializable/sanityCheck/SanityCheck.java.i
 data/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java.i
-data/src/share/classes/javax/xml/crypto/dsig/spec/XSLTTransformParameterSpec.java.i
-data/test/java/io/Serializable/packageAccess/A.java.i
+data/src/share/classes/org/openjdk/jigsaw/ClassInfo.java.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java.i
 data/src/share/classes/sun/text/resources/FormatData_ar_SD.java.i
 data/test/javax/swing/text/CSSBorder/6796710/bug6796710.java.i
-data/test/sun/rmi/rmic/covariantReturns/G2Impl.java.i
 data/src/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java.i
-data/test/javax/management/namespace/RemoveNotificationListenerTest.java.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java.i
 data/test/java/security/ProtectionDomain/NullPerms.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/newFolder.gif.i
-data/make/tools/swing-beans/beaninfo/images/JEditorPaneColor16.gif.i
-data/make/tools/src/build/tools/jdwpgen/CommandNode.java.i
-data/src/share/classes/java/net/PasswordAuthentication.java.i
+data/src/share/classes/java/security/DomainCombiner.java.i
+data/test/java/io/Serializable/concurrentClassDescLookup/ConcurrentClassDescLookup.java.i
+data/test/javax/swing/border/Test6625450.java.i
 data/test/java/lang/invoke/indify/Indify.java.i
 data/src/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java.i
+data/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java.i
 data/test/java/math/BigDecimal/ToPlainStringTests.java.i
 data/test/java/net/URLConnection/SetIfModifiedSince.java.i
 data/src/share/classes/sun/awt/geom/Order1.java.i
@@ -16052,54 +15994,51 @@ data/src/share/classes/sun/tools/java/BinaryExceptionHandler.java.i
 data/src/solaris/native/sun/awt/awt_motif12.c.i
 data/src/share/sample/jmx/jmx-scandir/keystore.i
 data/test/javax/script/PluggableContextTest.java.i
-data/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java.i
-data/src/share/classes/javax/swing/border/CompoundBorder.java.i
-data/test/sun/security/pkcs11/Cipher/TestRSACipher.java.i
+data/src/share/classes/javax/imageio/spi/ImageReaderSpi.java.i
+data/test/java/security/cert/PolicyNode/GetPolicyQualifiers.java.i
 data/test/javax/swing/JSlider/6524424/bug6524424.java.i
 data/make/tools/swing-beans/beaninfo/images/JMenuBarMono32.gif.i
 data/src/share/classes/sun/io/ByteToCharMS932DB.java.i
-data/test/java/util/PluggableLocale/providersrc/LocaleNames_ja_JP_kyoto.properties.i
 data/test/javax/swing/JEditorPane/bug4714674.java.i
 data/src/share/classes/java/awt/event/InputMethodListener.java.i
 data/src/share/classes/java/lang/invoke/WrongMethodTypeException.java.i
-data/test/javax/management/remote/mandatory/notif/NotificationSenderMBean.java.i
-data/make/tools/CharsetMapping/IBM284.map.i
-data/test/java/beans/PropertyEditor/TestByteTypeJava.java.i
+data/test/java/nio/channels/SocketChannel/Bind.java.i
+data/src/share/native/sun/awt/image/jpeg/jversion.h.i
 data/test/sun/net/InetAddress/nameservice/simple/SimpleNameService.java.i
-data/src/share/classes/sun/java2d/pipe/SolidTextRenderer.java.i
-data/src/share/classes/java/awt/event/ItemEvent.java.i
-data/test/java/net/InetAddress/B5087907.java.i
+data/src/share/classes/sun/management/MemoryUsageCompositeData.java.i
+data/test/java/util/PluggableLocale/ClasspathTest.sh.i
+data/src/share/native/java/lang/fdlibm/src/k_cos.c.i
 data/test/sun/net/www/EmbeddedEquals.java.i
-data/src/share/classes/javax/smartcardio/CardChannel.java.i
+data/src/share/classes/com/sun/jmx/snmp/tasks/ThreadService.java.i
 data/test/javax/management/remote/mandatory/version/policy.i
 data/src/share/classes/com/sun/jdi/request/InvalidRequestStateException.java.i
-data/src/share/classes/sun/text/resources/CollationData_hr.java.i
-data/src/share/classes/com/sun/media/sound/SoftMixingMixer.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java.i
+data/src/solaris/native/sun/nio/ch/SocketChannelImpl.c.i
+data/test/java/lang/StrictMath/HypotTests.java.i
+data/test/java/nio/channels/etc/NetworkChannelTests.java.i
+data/src/share/classes/javax/swing/text/doc-files/Document-insert.gif.i
 data/src/share/classes/javax/swing/event/TableColumnModelListener.java.i
-data/src/share/demo/jfc/TableExample/TableExample.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/Echo.java.i
 data/test/javax/security/auth/SubjectDomainCombiner/Optimize.java.i
 data/src/share/classes/javax/swing/KeyStroke.java.i
 data/test/com/sun/tools/attach/java.policy.deny.i
-data/src/share/classes/javax/security/auth/callback/PasswordCallback.java.i
+data/test/com/sun/crypto/provider/Cipher/RSA/TestOAEP_KAT.java.i
 data/src/share/native/sun/font/layout/LigatureSubstSubtables.h.i
-data/test/java/util/PluggableLocale/LocaleNameProviderTest.sh.i
-data/test/sun/security/provider/PolicyFile/CombinedPerms.java.i
+data/src/share/classes/com/sun/servicetag/SolarisServiceTag.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java.i
 data/src/linux/doc/man/ja/orbd.1.i
-data/src/share/classes/sun/nio/ch/Interruptible.java.i
-data/make/tools/CharsetMapping/IBM1026.map.i
-data/test/java/rmi/Naming/RmiIsNoScheme.java.i
-data/src/share/classes/com/sun/jmx/remote/internal/ProxyRef.java.i
+data/src/share/classes/sun/nio/ch/ThreadPool.java.i
+data/test/tools/launcher/DefaultLocaleTest.sh.i
+data/src/share/native/java/lang/fdlibm/src/s_expm1.c.i
 data/src/share/classes/javax/management/QueryNotificationFilter.java.i
-data/src/share/bin/java.h.i
-data/src/share/classes/javax/management/MBeanPermission.java.i
+data/test/javax/print/applet/applet4/Applet4.java.i
+data/test/sun/security/ssl/templates/SSLEngineTemplate.java.i
 data/test/java/nio/channels/Selector/CheckLocking.java.i
 data/src/share/classes/javax/swing/plaf/TabbedPaneUI.java.i
 data/src/share/classes/com/sun/media/sound/ModelWavetable.java.i
 data/test/java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java.i
 data/test/java/awt/List/ActionAfterRemove/ActionAfterRemove.java.i
 data/src/windows/native/sun/jkernel/kernel_ko.rc.i
-data/src/share/test/pack200/pack.conf.i
+data/src/solaris/classes/java/lang/ProcessEnvironment.java.i
 data/test/java/dyn/MethodTypeTest.java.i
 data/test/javax/management/Introspector/InvokeGettersTest.java.i
 data/src/share/classes/sun/security/validator/KeyStores.java.i
@@ -16107,48 +16046,47 @@ data/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java.i
 data/src/share/classes/com/sun/crypto/provider/BlowfishParameters.java.i
 data/test/javax/management/namespace/EventWithNamespaceControlTest.java.i
 data/src/solaris/classes/sun/font/FontConfigManager.java.i
-data/make/common/BuildToolJar.gmk.i
+data/src/share/classes/java/rmi/server/RMIServerSocketFactory.java.i
 data/src/share/classes/sun/applet/AppletListener.java.i
 data/src/share/classes/javax/sql/RowSet.java.i
-data/test/org/openjdk/jigsaw/MockLibrary.java.i
 data/test/java/lang/reflect/Constructor/GenericStringTest.java.i
 data/src/solaris/native/sun/java2d/loops/vis_GlyphList.c.i
 data/src/share/classes/javax/security/sasl/AuthenticationException.java.i
-data/test/com/sun/security/auth/login/ConfigFile/EmptyOption.java.i
+data/src/share/classes/java/awt/image/ReplicateScaleFilter.java.i
 data/src/share/classes/sun/tools/jconsole/OutputViewer.java.i
 data/src/share/classes/sun/net/www/content/image/x_xpixmap.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/package.html.i
 data/src/share/classes/javax/sound/midi/InvalidMidiDataException.java.i
-data/src/share/classes/com/sun/tools/hat/internal/server/PlatformClasses.java.i
 data/test/sun/security/pkcs11/nss/db/key3.db.i
-data/test/javax/management/openmbean/CompositeDataStringTest.java.i
+data/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java.i
 data/src/share/sample/nio/server/FileContent.java.i
-data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java.i
+data/src/share/classes/javax/swing/event/TreeExpansionEvent.java.i
 data/src/solaris/native/sun/awt/medialib/vis_asi.h.i
-data/src/share/classes/sun/misc/Cache.java.i
 data/src/share/classes/com/sun/tools/jdi/ProcessAttachingConnector.java.i
 data/test/javax/crypto/spec/GCMParameterSpec/GCMParameterSpecTest.java.i
-data/src/share/classes/sun/io/CharToByteCp857.java.i
+data/src/share/sample/scripting/scriptpad/src/scripts/memory.js.i
 data/test/sun/java2d/DirectX/RenderingToCachedGraphicsTest/RenderingToCachedGraphicsTest.java.i
 data/test/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java.i
 data/src/share/classes/javax/xml/crypto/dsig/keyinfo/X509Data.java.i
 data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy.i
-data/src/share/classes/java/awt/datatransfer/FlavorEvent.java.i
+data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/jdk.xml.i
 data/test/java/io/PrintStream/NullConstructor.java.i
 data/test/sun/net/www/protocol/http/GetOutputStream.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java.i
+data/test/com/sun/jdi/sde/testString.i
 data/test/java/beans/VetoableChangeSupport/Test4076065.java.i
 data/src/share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java.i
-data/test/java/beans/XMLDecoder/spec/TestShort.java.i
+data/src/share/native/sun/font/layout/LookupTables.h.i
 data/src/share/classes/java/awt/image/ByteLookupTable.java.i
-data/test/com/sun/jdi/sde/TemperatureTable.jsp.i
+data/src/share/classes/javax/management/openmbean/TabularDataSupport.java.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedShortFieldAccessorImpl.java.i
 data/src/share/classes/sun/invoke/anon/ConstantPoolVisitor.java.i
 data/src/share/classes/sun/net/ApplicationProxy.java.i
-data/src/share/classes/sun/io/ByteToCharCp860.java.i
+data/src/share/demo/jfc/Notepad/resources/new.gif.i
 data/src/share/native/sun/font/layout/StateTables.h.i
 data/src/share/classes/sun/tools/tree/ArrayExpression.java.i
 data/src/solaris/classes/sun/awt/X11/OwnershipListener.java.i
 data/src/share/native/sun/java2d/loops/Ushort4444Argb.h.i
+data/src/share/sample/scripting/scriptpad/src/scripts/linewrap.js.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpPduRequest.java.i
 data/test/sun/security/pkcs11/SecureRandom/TestDeserialization.java.i
 data/test/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test1.java.i
@@ -16163,97 +16101,97 @@ data/src/share/classes/sun/security/util/PathList.java.i
 data/src/share/classes/javax/swing/AbstractAction.java.i
 data/src/share/classes/com/sun/jdi/FloatType.java.i
 data/test/java/util/concurrent/Executors/AutoShutdown.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java.i
-data/make/sun/security/smartcardio/Makefile.i
+data/src/share/classes/sun/reflect/generics/tree/IntSignature.java.i
+data/src/share/native/sun/font/layout/GDEFMarkFilter.h.i
 data/test/java/security/KeyRep/DSA.1.5.key.i
-data/src/share/classes/sun/awt/WindowClosingListener.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java.i
 data/test/java/nio/file/Files/denyAll.policy.i
 data/test/javax/management/monitor/ThreadPoolAccTest.java.i
 data/src/share/classes/com/sun/tools/jdi/ByteTypeImpl.java.i
 data/src/share/classes/sun/nio/cs/ext/MacSymbol.java.i
-data/src/linux/doc/man/ja/javaws.1.i
+data/src/share/classes/java/nio/file/attribute/PosixFilePermission.java.i
 data/src/share/classes/sun/text/resources/ubidi.icu.i
-data/make/tools/src/build/tools/generatecharacter/CharacterScript.java.i
+data/test/java/util/ResourceBundle/Test4300693.java.i
 data/test/java/awt/Frame/ShownOnPack/ShownOnPack.html.i
 data/src/share/classes/sun/io/CharToByteEUC_JP.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/question.png.i
+data/src/share/classes/javax/management/openmbean/CompositeData.java.i
 data/test/java/lang/Class/forName/NonJavaNames.sh.i
 data/test/java/lang/instrument/basicAgent.mf.i
-data/test/javax/swing/text/html/TableView/7030332/sample1.png.i
-data/src/share/classes/java/lang/Boolean.java.i
+data/src/share/classes/javax/management/ImmutableDescriptor.java.i
+data/src/share/classes/sun/security/provider/SHA2.java.i
 data/src/solaris/demo/jigsaw/basic/src/module-info.java.i
 data/test/java/rmi/activation/Activatable/downloadParameterClass/FooReceiverImpl.java.i
 data/src/share/classes/java/lang/VirtualMachineError.java.i
-data/src/solaris/classes/sun/awt/motif/MCustomCursor.java.i
-data/src/share/classes/sun/text/resources/FormatData_lt_LT.java.i
+data/src/share/javavm/include/opcodes.h.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java.i
 data/test/java/security/Security/SecurityPropFile/SecurityPropFile.file.i
-data/src/share/classes/javax/accessibility/AccessibleIcon.java.i
-data/src/share/classes/java/util/TreeMap.java.i
+data/test/java/net/Authenticator/Deadlock.java.i
 data/test/java/awt/Graphics2D/RenderClipTest/RenderClipTest.java.i
-data/src/share/classes/javax/management/loading/PrivateClassLoader.java.i
-data/test/java/io/Serializable/skipToEndOfBlockData/SkipToEndOfBlockData.java.i
-data/test/javax/swing/JFileChooser/6524424/bug6524424.java.i
+data/src/share/classes/java/text/ChoiceFormat.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Identities.java.i
+data/src/share/back/ClassObjectReferenceImpl.c.i
 data/test/java/nio/channels/AsynchronousDatagramChannel/Basic.java.i
-data/src/share/classes/java/rmi/server/SkeletonNotFoundException.java.i
+data/test/java/io/Serializable/underlyingOutputStreamException/UnderlyingOutputStreamException.java.i
 data/src/solaris/classes/sun/awt/X11/XBaseWindow.java.i
 data/src/share/demo/jfc/Notepad/resources/save.gif.i
 data/src/share/classes/sun/tools/jconsole/inspector/XTable.java.i
-data/test/java/util/Map/Get.java.i
-data/make/modules/tools/nbproject/project.properties.i
+data/make/tools/CharsetMapping/IBM918.map.i
 data/test/java/rmi/reliability/juicer/AppleImpl.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java.i
+data/src/share/classes/sun/nio/cs/ext/HKSCS_2001.java.i
 data/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java.i
 data/test/sun/rmi/rmic/minimizeWrapperInstances/PImpl.java.i
-data/test/java/net/URL/OpenStream.java.i
-data/src/share/back/stepControl.h.i
-data/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java.i
-data/src/share/classes/java/awt/JobAttributes.java.i
+data/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java.i
+data/src/share/classes/sun/security/pkcs/EncodingException.java.i
+data/test/java/nio/channels/DatagramChannel/Sender.java.i
+data/src/share/classes/java/awt/color/package.html.i
 data/make/tools/CharsetMapping/DoubleByte-X.java.i
 data/src/share/classes/java/util/logging/LoggingMXBean.java.i
 data/src/share/classes/sun/management/HotspotClassLoadingMBean.java.i
 data/src/share/classes/javax/script/SimpleScriptContext.java.i
-data/test/java/lang/management/ThreadMXBean/ThreadExecutionSynchronizer.java.i
-data/src/share/classes/javax/swing/event/AncestorEvent.java.i
-data/src/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/package.html.i
+data/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java.i
+data/test/javax/swing/JFileChooser/6840086/bug6840086.java.i
 data/make/com/sun/java/pack/Makefile.i
 data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy.i
 data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java.i
 data/src/share/classes/sun/text/resources/CollationData_hu.java.i
 data/test/java/lang/reflect/Generics/TestParameterizedType.java.i
+data/test/tools/launcher/ChangeDataModel.sh.i
 data/src/share/classes/java/sql/RowIdLifetime.java.i
-data/src/share/classes/com/sun/jmx/mbeanserver/DynamicMBean2.java.i
+data/test/sun/security/util/DerInputBuffer/BigInteger0.java.i
 data/test/java/lang/StringBuffer/AppendCharSequence.java.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/Group.java.i
-data/src/share/classes/java/awt/im/spi/InputMethod.java.i
-data/src/share/classes/java/util/logging/LoggingProxyImpl.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U8Func.c.i
+data/src/share/classes/sun/management/resources/agent_de.properties.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java.i
+data/test/javax/print/attribute/MediaMappingsTest.java.i
 data/test/java/util/zip/ZipFile/deletetempjar.sh.i
 data/src/windows/native/sun/java2d/windows/ddrawObject.cpp.i
-data/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h.i
-data/test/sun/tools/native2ascii/test3.i
-data/test/java/rmi/transport/checkFQDN/CheckFQDN_Stub.java.i
-data/test/sun/security/util/HostnameMatcher/cert4.crt.i
+data/src/share/native/sun/java2d/opengl/OGLVertexCache.h.i
+data/test/java/net/Authenticator/B4769350.java.i
+data/make/tools/CharsetMapping/IBM875.map.i
+data/src/share/classes/org/openjdk/jigsaw/Files.java.i
 data/test/java/security/Security/SecurityPropFile/SecurityPropFile.java.i
 data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U8Func.c.i
 data/make/mkdemo/nio/zipfs/Makefile.i
 data/src/share/demo/applets/ArcTest/example1.html.i
 data/test/sun/security/util/DerInputBuffer/PaddedBitString.java.i
-data/src/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java.i
+data/test/sun/text/resources/Format/Bug4762201.java.i
 data/src/share/classes/sun/misc/Perf.java.i
-data/make/tools/CharsetMapping/HKSCS2008.c2b.i
+data/src/share/classes/sun/tools/tree/MultiplyExpression.java.i
 data/src/windows/native/sun/java2d/d3d/D3DResourceManager.h.i
-data/make/tools/GenerateCharacter/Character.c.template.i
+data/src/windows/native/sun/windows/awt_Panel.h.i
 data/src/share/classes/com/sun/media/sound/ModelIdentifier.java.i
-data/src/share/classes/javax/swing/event/InternalFrameAdapter.java.i
+data/src/share/classes/javax/swing/plaf/SpinnerUI.java.i
+data/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java.i
 data/src/share/classes/com/sun/tracing/dtrace/FunctionAttributes.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java.i
 data/src/share/demo/applets/DitherTest/DitherTest.java.i
 data/src/windows/classes/sun/java2d/windows/DDScaleLoops.java.i
-data/src/share/sample/nio/server/URLDumper.java.i
+data/src/solaris/classes/sun/awt/X11/XFocusProxyWindow.java.i
 data/test/java/io/Serializable/unnamedPackageSwitch/Test.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_nl_BE.properties.i
-data/make/netbeans/common/standard-bindings.ent.i
+data/test/java/beans/XMLEncoder/Test6921644.java.i
+data/src/windows/native/java/util/logging.c.i
 data/src/solaris/classes/sun/java2d/xr/MaskTile.java.i
 data/src/share/classes/java/awt/Panel.java.i
 data/src/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java.i
@@ -16262,95 +16200,105 @@ data/src/share/classes/com/sun/beans/decoder/IntElementHandler.java.i
 data/make/tools/swing-beans/beaninfo/images/JViewportMono16.gif.i
 data/make/sun/security/mscapi/FILES_cpp.gmk.i
 data/src/linux/doc/man/ja/jrunscript.1.i
-data/test/javax/management/loading/MLetCLR/MLetCommand.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifProgressBarUI.java.i
 data/test/java/awt/print/Dialog/DialogCopies.java.i
+data/src/share/classes/javax/xml/crypto/OctetStreamData.java.i
 data/src/share/demo/applets/Fractal/example1.html.i
 data/src/solaris/classes/sun/awt/X11/XTranslateCoordinates.java.i
 data/src/share/classes/sun/java2d/loops/FillParallelogram.java.i
-data/test/sun/nio/cs/OLD/IBM1381_OLD.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/OptionMissingRequiredArgumentException.java.i
 data/test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java.i
 data/test/java/lang/instrument/TestClass3.java.i
-data/test/java/net/HttpURLConnection/getResponseCode.java.i
+data/test/sun/net/www/protocol/jar/jarbug/src/test/RunAllTests.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_ca.properties.i
 data/src/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java.i
 data/make/netbeans/jconsole/README.i
 data/src/share/classes/sun/java2d/opengl/OGLTextRenderer.java.i
-data/src/share/classes/java/security/PermissionCollection.java.i
+data/test/sun/security/pkcs11/ec/TestECDSA.java.i
 data/make/javax/management/Makefile.i
 data/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so.i
-data/src/share/classes/java/security/GeneralSecurityException.java.i
+data/src/share/classes/sun/io/CharToByteMacRoman.java.i
 data/test/javax/xml/crypto/dsig/data/certs/bres.crt.i
 data/make/com/sun/demo/Makefile.i
 data/src/share/classes/sun/applet/AppletSecurity.java.i
-data/src/share/classes/sun/font/CompositeFont.java.i
-data/src/share/demo/applets/SortDemo/QSortAlgorithm.java.i
+data/test/javax/management/eventService/LeaseTest.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSet.java.i
+data/src/share/classes/org/openjdk/jigsaw/cli/Repositor.java.i
 data/src/share/classes/java/awt/event/MouseWheelListener.java.i
 data/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java.i
 data/test/sun/security/pkcs11/Signature/TestDSA.java.i
 data/test/java/lang/annotation/Missing/Marker.java.i
 data/src/windows/classes/sun/nio/ch/NativeThread.java.i
-data/src/solaris/native/sun/java2d/loops/mlib_v_ImageLogic_proto.h.i
+data/test/sun/security/smartcardio/TestExclusive.java.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedStaticFloatFieldAccessorImpl.java.i
 data/test/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.html.i
-data/src/solaris/classes/sun/awt/X11/XChoicePeer.java.i
-data/src/share/native/sun/awt/libpng/pnginfo.h.i
+data/src/share/classes/sun/reflect/ByteVectorImpl.java.i
+data/test/com/sun/jdi/ClassesByName2Test.java.i
 data/make/mksample/forkjoin/mergesort/Makefile.i
 data/src/share/classes/javax/imageio/stream/IIOByteBuffer.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj.i
 data/src/share/classes/sun/io/ByteToCharCp1144.java.i
 data/test/javax/management/mxbean/MerlinMXBean.java.i
-data/src/share/classes/sun/io/ByteToCharDBCS_EBCDIC.java.i
+data/src/solaris/doc/sun/man/man1/keytool.1.i
 data/src/share/classes/com/sun/media/sound/AlawCodec.java.i
 data/src/share/classes/com/sun/jdi/event/BreakpointEvent.java.i
 data/test/java/io/Serializable/arraySuidConflict/Write.java.i
 data/src/share/sample/forkjoin/mergesort/MergeSort.java.i
 data/test/java/rmi/Naming/UnderscoreHost.java.i
 data/src/share/classes/java/util/logging/LogManager.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java.i
 data/test/java/nio/channels/AsynchronousChannelGroup/Restart.java.i
-data/src/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html.i
-data/test/demo/jvmti/hprof/HeapBinaryFormatTest.java.i
-data/src/share/sample/vm/jvm-clr/Makefile.i
-data/src/share/native/sun/awt/image/jpeg/imageioJPEG.c.i
-data/src/share/classes/java/net/CookieHandler.java.i
-data/src/share/demo/jvmti/hprof/hprof_stack.h.i
-data/src/share/native/sun/font/layout/ExtensionSubtables.h.i
+data/test/sun/management/jmxremote/bootstrap/management_test01_ok.properties.in.i
+data/test/org/openjdk/jigsaw/pubrepo.sh.i
+data/test/sun/util/resources/Locale/Bug6275682.java.i
+data/test/java/net/URLClassLoader/closetest/CloseTest.java.i
+data/make/tools/CharsetMapping/dbcs.i
+data/test/sun/net/idn/nfsmxp.spp.i
+data/src/share/classes/sun/net/httpserver/Code.java.i
+data/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_AWT.java.i
 data/test/java/security/KeyStore/KeyStoreBuilder.java.i
 data/test/java/util/concurrent/Executors/PrivilegedCallables.java.i
 data/src/share/classes/com/sun/jdi/ByteValue.java.i
+data/src/share/classes/sun/dyn/Access.java.i
 data/test/java/io/Serializable/serialver/nested/Test.java.i
-data/test/sun/java2d/cmm/ProfileOp/SetDataTest.java.i
+data/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java.i
+data/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/Dummy.java.i
 data/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java.i
-data/src/share/classes/com/sun/tools/hat/internal/server/InstancesQuery.java.i
+data/src/share/classes/sun/io/CharToByteJIS0201.java.i
 data/src/share/lib/management/jmxremote.password.template.i
 data/test/java/lang/management/ThreadMXBean/LockedMonitors.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java.i
+data/test/java/nio/file/Files/MaxDepth.java.i
 data/src/share/classes/java/nio/charset/Charset.java.i
 data/test/javax/swing/JSlider/6918861/bug6918861.java.i
-data/test/com/sun/tools/attach/BasicTests.sh.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java.i
 data/src/share/classes/sun/font/LayoutPathImpl.java.i
 data/test/sun/net/www/protocol/http/spnegoTest.i
 data/make/tools/swing-beans/beaninfo/images/BoxColor32.gif.i
+data/src/solaris/native/sun/awt/colordata.h.i
 data/test/sun/security/pkcs11/nss/lib/linux-amd64/libplc4.so.i
-data/src/share/classes/javax/management/timer/TimerAlarmClockNotification.java.i
+data/src/share/classes/javax/management/event/EventClientDelegateMBean.java.i
+data/src/share/classes/javax/sound/midi/MidiDeviceTransmitter.java.i
 data/src/share/classes/sun/io/CharToByteCp939.java.i
 data/test/javax/management/ObjectInstance/ToStringMethodTest.java.i
 data/src/share/native/sun/security/ec/mpi.c.i
 data/make/tools/CharsetMapping/IBM1123.nr.i
 data/make/java/nio/reorder-sparc.i
+data/src/share/classes/sun/util/calendar/CalendarUtils.java.i
 data/src/share/classes/javax/swing/text/rtf/RTFReader.java.i
 data/src/share/classes/sun/net/www/content/text/Generic.java.i
-data/test/javax/crypto/SecretKeyFactory/P1.jar.i
+data/src/share/classes/sun/management/snmp/package.html.i
 data/src/share/classes/sun/tools/asm/StringConstantData.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageCopy.h.i
-data/test/java/rmi/activation/Activatable/checkActivateRef/ActivateMe.java.i
+data/test/java/util/Locale/data/deflocale.rhel5.i
+data/make/tools/src/build/tools/javazic/Zoneinfo.java.i
 data/src/share/demo/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml.i
 data/src/share/native/java/lang/fdlibm/src/e_j0.c.i
-data/src/share/classes/java/awt/dnd/DragSourceDropEvent.java.i
-data/src/share/classes/sun/awt/event/IgnorePaintEvent.java.i
-data/src/share/classes/com/sun/tools/hat/internal/util/ArraySorter.java.i
+data/src/share/classes/sun/tools/tree/IfStatement.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy14.i
+data/src/share/demo/jfc/Notepad/resources/Notepad.properties.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/LoopbackSSLSocket.java.i
 data/src/share/classes/javax/management/monitor/MonitorMBean.java.i
-data/src/share/classes/java/net/DatagramSocketImpl.java.i
+data/test/java/nio/channels/Selector/ConnectWrite.java.i
 data/test/javax/swing/JTextArea/Test6593649.java.i
 data/test/java/net/URLClassLoader/extdir/extention.jar.i
 data/src/solaris/native/sun/awt/extutil.h.i
@@ -16361,116 +16309,115 @@ data/test/java/beans/Introspector/6380849/infos/ThirdBeanBeanInfo.java.i
 data/test/java/rmi/reliability/benchmark/bench/serial/Ints.java.i
 data/src/share/classes/javax/naming/directory/ModificationItem.java.i
 data/src/share/classes/java/util/RandomAccess.java.i
-data/src/share/back/debugLoop.c.i
-data/test/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.java.i
+data/test/sun/java2d/pisces/Test7036754.java.i
+data/src/share/classes/sun/reflect/generics/tree/DoubleSignature.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaDouble.java.i
 data/src/windows/bin/amd64/jvm.cfg.i
+data/src/share/demo/applets/SortDemo/QSortAlgorithm.java.i
 data/test/java/awt/MenuBar/DeadlockTest1/DeadlockTest1.java.i
 data/src/share/native/sun/awt/image/jpeg/README.i
 data/src/share/classes/com/sun/beans/finder/PrimitiveTypeMap.java.i
-data/src/share/classes/javax/swing/text/TextLayoutStrategy.java.i
+data/src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthStyle.java.i
 data/test/java/util/ResourceBundle/Control/TestResourceRB.java.i
 data/src/share/classes/sun/awt/PlatformFont.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_en_NZ.properties.i
-data/src/share/classes/javax/management/loading/MLetParser.java.i
+data/src/share/classes/sun/io/ByteToCharCp1112.java.i
 data/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak_Stub.java.i
 data/test/java/util/concurrent/atomic/VMSupportsCS8.java.i
-data/src/share/classes/javax/swing/JPasswordField.java.i
-data/test/sun/nio/cs/X11CNS11643.java.i
-data/make/tools/swing-beans/beaninfo/images/JToggleButtonColor32.gif.i
+data/test/sun/tools/jhat/hprof.bin.i
+data/test/java/rmi/activation/ActivationSystem/activeGroup/security.policy.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/CanvasMapper.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/Node.java.i
+data/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java.i
 data/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c.i
-data/src/share/classes/java/beans/package.html.i
-data/test/java/lang/Runtime/exec/setcwd.sh.i
-data/test/sun/misc/Encode/DecodeBuffer.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java.i
+data/test/java/util/Locale/data/deflocale.input.i
 data/test/java/net/Authenticator/B4921848.java.i
-data/src/windows/native/sun/windows/awt_Scrollbar.h.i
+data/src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp.i
 data/src/share/classes/sun/tools/serialver/serialver_zh_CN.properties.i
 data/test/java/nio/file/FileStore/Basic.java.i
 data/src/share/classes/sun/util/resources/CalendarData_hi.properties.i
 data/src/windows/native/sun/windows/awt_Label.h.i
-data/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java.i
-data/test/java/io/PipedWriter/ConnectAfterReaderClose.java.i
-data/src/share/classes/java/util/prefs/PreferenceChangeListener.java.i
+data/src/share/native/com/sun/java/util/jar/pack/bytes.cpp.i
+data/test/sun/tools/jstat/jstatLineCounts3.sh.i
 data/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.java.i
 data/test/com/sun/jdi/ResumeOneThreadTest.java.i
 data/src/share/classes/java/text/spi/CollatorProvider.java.i
 data/test/sun/misc/CopyMemory.java.i
 data/test/java/beans/Introspector/4168475/Test4168475.java.i
+data/test/sun/security/provider/PolicyParser/UnresolvedProperty.policy.i
 data/test/javax/management/eventService/LeaseManagerDeadlockTest.java.i
 data/src/windows/native/sun/windows/awt_Rectangle.h.i
-data/test/java/beans/beancontext/Test4132698.java.i
+data/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java.i
 data/src/share/classes/sun/util/resources/CalendarData_sl.properties.i
-data/src/share/classes/java/lang/Comparable.java.i
+data/make/altclasses/Makefile.i
 data/test/sun/net/www/protocol/file/NonUTF8EncodedChar.java.i
 data/src/share/classes/sun/net/www/content/image/jpeg.java.i
-data/src/share/classes/java/nio/file/SimpleFileVisitor.java.i
-data/src/share/classes/javax/management/openmbean/MXBeanMappingFactoryClass.java.i
+data/test/java/util/concurrent/ThreadPoolExecutor/ShutdownNowExecuteRace.java.i
 data/test/java/util/Formatter/BasicBigInteger.java.i
-data/test/java/io/LineNumberInputStream/Skip.java.i
-data/src/share/classes/sun/net/httpserver/Code.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java.i
+data/src/share/native/sun/font/layout/ExtensionSubtables.h.i
 data/src/share/classes/sun/security/rsa/RSASignature.java.i
 data/src/share/classes/sun/tools/native2ascii/A2NFilter.java.i
+data/src/share/classes/java/awt/event/InputEvent.java.i
 data/test/java/rmi/server/RemoteServer/AddrInUse.java.i
-data/src/share/classes/javax/management/event/EventClientDelegateMBean.java.i
+data/src/share/classes/javax/management/timer/TimerAlarmClockNotification.java.i
 data/src/share/native/java/util/zip/zlib-1.2.3/ChangeLog.i
-data/src/share/classes/sun/management/snmp/package.html.i
-data/test/java/beans/Performance/TestPropertyChangeSupport.java.i
+data/test/javax/crypto/SecretKeyFactory/P1.jar.i
+data/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java.i
 data/src/share/native/sun/security/jgss/wrapper/NativeUtil.c.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDeviceInfo.java.i
-data/src/share/classes/sun/reflect/generics/tree/DoubleSignature.java.i
+data/test/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.java.i
 data/src/share/native/sun/java2d/cmm/lcms/cmspcs.c.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java.i
+data/src/share/classes/javax/swing/JPasswordField.java.i
 data/src/share/classes/sun/java2d/loops/TransformHelper.java.i
 data/test/sun/awt/image/ImageRepresentation/LUTCompareTest.java.i
 data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.fail.i
 data/src/share/classes/com/sun/jmx/mbeanserver/MBeanAnalyzer.java.i
-data/src/share/classes/javax/naming/event/NamingEvent.java.i
-data/test/sun/security/provider/SeedGenerator/Priority_Inversion.java.i
+data/test/java/lang/instrument/AppendToBootstrapClassPathTest.java.i
+data/src/share/classes/javax/management/remote/package.html.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduBulk.java.i
+data/test/sun/security/krb5/auto/W83.java.i
 data/test/java/net/Authenticator/BasicTest4.java.i
 data/src/windows/hpi/src/system_md.c.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.java.i
+data/test/java/awt/event/MouseEvent/SmoothWheel/SmoothWheel.java.i
 data/src/share/native/com/sun/java/util/jar/pack/bands.cpp.i
 data/src/solaris/native/common/jni_util_md.c.i
-data/src/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.java.i
 data/src/share/classes/java/nio/file/attribute/AclEntryType.java.i
 data/test/java/lang/StrictMath/Log1pTests.java.i
 data/src/solaris/native/sun/awt/gtk2_interface.h.i
 data/src/share/classes/javax/swing/plaf/multi/MultiToolTipUI.java.i
 data/test/java/beans/PropertyEditor/TestDoubleClass.java.i
 data/test/java/io/Serializable/subclassGC/SubclassOfOOS.java.i
-data/test/sun/net/www/ParseUtil_6478588.java.i
+data/src/share/instrument/JPLISAgent.h.i
 data/test/sun/security/provider/PolicyParser/PrincipalExpansionError.policy.i
 data/test/javax/crypto/NullCipher/TestNPE.java.i
 data/src/share/classes/com/sun/jdi/event/VMDeathEvent.java.i
-data/test/sun/tools/jps/jps-l_Output2.awk.i
+data/src/share/classes/javax/swing/plaf/nimbus/EffectUtils.java.i
 data/test/java/beans/XMLEncoder/java_beans_Expression.java.i
 data/src/share/demo/jfc/SampleTree/SampleTreeModel.java.i
 data/src/share/classes/sun/print/resources/serviceui_zh_CN.properties.i
 data/test/org/openjdk/jigsaw/_Configurator.java.i
 data/src/share/classes/javax/accessibility/AccessibleTable.java.i
-data/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport_Stub.java.i
 data/test/java/security/ProtectionDomain/AllPerm.java.i
 data/src/share/classes/java/io/DeleteOnExitHook.java.i
 data/test/com/sun/net/httpserver/Test1.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthFormattedTextFieldUI.java.i
+data/src/share/native/sun/font/layout/CanonShaping.h.i
 data/test/sun/rmi/rmic/newrmic/equivalence/TestInterface.java.i
 data/src/share/classes/sun/util/logging/PlatformLogger.java.i
-data/src/solaris/native/sun/nio/ch/SctpNet.c.i
+data/src/share/native/com/sun/tools/jdi/SharedMemoryTransport.c.i
 data/src/share/native/sun/font/fontscaler.h.i
 data/src/share/classes/com/sun/servicetag/resources/register.html.i
 data/test/sun/security/pkcs11/KeyGenerator/DESParity.java.i
 data/src/share/classes/javax/swing/MutableComboBoxModel.java.i
 data/test/java/net/URLClassLoader/sealing/CheckSealed.java.i
 data/src/windows/classes/java/net/DualStackPlainSocketImpl.java.i
-data/test/java/rmi/activation/CommandEnvironment/NullOptions.java.i
+data/test/com/sun/security/sasl/digest/AuthRealms.java.i
 data/test/java/io/File/Mkdir.java.i
 data/src/windows/native/java/net/NetworkInterface_win9x.c.i
 data/test/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies_Stub.java.i
-data/test/java/nio/Buffer/BasicChar.java.i
 data/src/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java.i
 data/src/share/classes/javax/swing/plaf/ColorUIResource.java.i
 data/src/share/classes/com/sun/tools/jdi/ShortTypeImpl.java.i
@@ -16478,40 +16425,40 @@ data/src/share/classes/sun/util/resources/CurrencyNames_mt_MT.properties.i
 data/test/java/lang/StringBuffer/SetLength.java.i
 data/test/sun/security/krb5/auto/CrossRealm.java.i
 data/src/share/classes/sun/management/resources/agent_zh_TW.properties.i
-data/src/share/classes/sun/text/resources/FormatData_sr_BA.java.i
 data/test/javax/swing/JSlider/6278700/bug6278700.java.i
 data/src/solaris/classes/sun/misc/OSEnvironment.java.i
 data/test/java/security/CodeSource/Implies.java.i
 data/test/javax/swing/border/Test4129681.html.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_NN.c.i
 data/src/share/classes/java/awt/event/MouseWheelEvent.java.i
-data/test/sun/security/x509/X509CRLImpl/UnexpectedNPE.java.i
+data/test/sun/net/util/IPAddressUtilTest.java.i
 data/src/share/classes/sun/io/MalformedInputException.java.i
-data/test/java/rmi/MarshalledObject/compare/annotatedRef.i
+data/src/share/classes/sun/tools/java/Environment.java.i
 data/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_sr_CS.properties.i
-data/test/java/security/IdentityScope/NoDefaultSystemScope.java.i
+data/src/share/classes/com/sun/tools/jdi/BooleanValueImpl.java.i
 data/test/java/awt/FileDialog/DefaultFocusOwner/DefaultFocusOwner.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java.i
+data/src/share/classes/sun/rmi/server/WeakClassHashMap.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/SpecListener.java.i
 data/src/share/demo/jfc/TableExample/TableExample2.java.i
-data/test/sun/net/www/ParseUtil_6306697.java.i
+data/test/java/nio/file/Path/PassThroughFileSystem.java.i
 data/test/javax/security/auth/PrivateCredentialPermission/Serial.java.i
 data/test/java/lang/instrument/AddTransformerTest.java.i
-data/src/share/classes/sun/dyn/util/VerifyAccess.java.i
+data/test/java/nio/channels/FileChannel/Size.java.i
+data/make/tools/CharsetMapping/MS932.map.i
 data/src/share/classes/sun/text/resources/CollationData_da.java.i
 data/src/share/npt/utf.h.i
 data/src/share/classes/sun/nio/cs/ext/DelegatableDecoder.java.i
-data/test/com/sun/tools/attach/RedefineAgent.java.i
+data/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java.i
 data/test/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl.java.i
 data/src/share/classes/sun/tools/jar/resources/jar_it.properties.i
 data/src/solaris/classes/sun/awt/motif/MMenuItemPeer.java.i
 data/src/share/classes/javax/naming/CannotProceedException.java.i
-data/test/javax/management/MBeanServer/NewMBeanListenerTest.java.i
 data/test/java/nio/channels/Channels/ShortWrite.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java.i
+data/test/sun/tools/jps/jps-l_Output2.awk.i
 data/src/share/classes/java/awt/doc-files/GridLayout-1.gif.i
 data/test/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.html.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/RadialGradient.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/SelectOneKeyOutOfMany.java.i
 data/test/sun/rmi/rmic/covariantReturns/G5.java.i
 data/test/java/awt/dnd/ImageDecoratedDnDNegative/DnDSource.java.i
@@ -16520,30 +16467,30 @@ data/test/java/util/ResourceBundle/Bug6299235Test.sh.i
 data/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java.i
 data/test/java/beans/Introspector/Test6447751.java.i
 data/test/sun/net/www/protocol/http/TunnelThroughProxy.java.i
-data/test/java/io/Serializable/InvalidClassException/noargctor/Serialize/SamePackageCtor.java.i
-data/test/java/util/concurrent/Exchanger/ExchangeLoops.java.i
+data/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml.i
 data/test/java/awt/Frame/LayoutOnMaximizeTest/LayoutOnMaximizeTest.java.i
 data/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java.i
 data/test/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny.i
 data/src/solaris/native/sun/java2d/loops/mlib_v_ImageConstXor.c.i
+data/src/solaris/native/sun/java2d/loops/vis_ByteIndexed.c.i
 data/src/share/classes/sun/net/httpserver/HttpsExchangeImpl.java.i
-data/test/java/util/concurrent/ScheduledThreadPoolExecutor/DecorateTask.java.i
+data/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java.i
 data/src/share/classes/sun/text/resources/CollationData_ca.java.i
-data/test/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java.i
+data/src/share/classes/sun/java2d/DefaultDisposerRecord.java.i
 data/src/share/classes/sun/security/x509/DistributionPoint.java.i
-data/test/java/util/Locale/serialized/java6locale_th_TH_TH.i
+data/test/com/sun/jdi/CountFilterTest.java.i
 data/test/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.java.i
 data/src/share/classes/sun/io/ByteToCharCp500.java.i
-data/make/tools/makeclasslist/Makefile.i
+data/test/javax/management/remote/mandatory/version/ImplVersionTest.java.i
 data/src/share/demo/management/VerboseGC/README.txt.i
 data/make/java/text/base/Makefile.i
 data/test/java/awt/Window/WindowType/WindowType.java.i
 data/src/share/native/sun/security/smartcardio/pcsc.c.i
-data/src/share/classes/javax/sound/sampled/spi/MixerProvider.java.i
+data/src/share/demo/scripting/jconsole-plugin/src/scripts/hello.js.i
 data/test/java/util/EnumMap/SimpleSerialization.java.i
 data/src/share/classes/java/lang/reflect/Array.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315OmitComments.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocketException.java.i
+data/test/java/util/zip/ConstructDeflaterInput.java.i
 data/src/share/native/sun/awt/image/jpeg/jquant1.c.i
 data/src/share/classes/java/util/concurrent/TimeUnit.java.i
 data/src/share/classes/sun/tools/jar/resources/jar_fr.properties.i
@@ -16555,45 +16502,43 @@ data/test/sun/tools/native2ascii/test2.i
 data/make/tools/swing-beans/beaninfo/images/JSplitPaneMono32.gif.i
 data/src/share/classes/javax/swing/plaf/synth/DefaultMenuLayout.java.i
 data/test/java/util/ResourceBundle/Control/Chinese_zh_TW.properties.i
-data/test/java/awt/geom/Arc2D/SerializationTest.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadContentionMonitoring.java.i
 data/test/sun/awt/font/ClassLoaderLeakTest.java.i
-data/src/share/classes/javax/swing/tree/AbstractLayoutCache.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c.i
 data/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java.i
-data/test/java/net/DatagramSocket/LocalSocketAddress.java.i
 data/test/javax/management/mxbean/TypeNameTest.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java.i
+data/src/share/classes/com/sun/tools/hat/internal/server/PlatformClasses.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHostClient.java.i
 data/src/share/classes/sun/io/ByteToCharEUC_JP_LINUX.java.i
 data/src/solaris/classes/sun/nio/fs/LinuxWatchService.java.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy33.i
+data/test/java/awt/image/BufferedImage/TinyScale.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_it_CH.properties.i
-data/test/com/sun/jdi/MixedSuspendTest.sh.i
+data/src/share/classes/java/rmi/ServerError.java.i
 data/test/javax/swing/SwingWorker/6493680/bug6493680.java.i
 data/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java.i
-data/src/solaris/classes/sun/awt/X11/XWINProtocol.java.i
-data/src/share/classes/sun/beans/editors/IntegerEditor.java.i
+data/src/share/native/sun/security/ec/impl/mpprime.h.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ExtendedKeySocket.java.i
 data/test/java/lang/annotation/TestIncompleteAnnotationExceptionNPE.java.i
 data/src/share/native/java/lang/fdlibm/src/e_acos.c.i
 data/test/java/lang/Math/Tests.java.i
-data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties.i
+data/src/share/classes/sun/security/tools/PolicyTool.java.i
 data/src/share/classes/java/util/concurrent/ConcurrentSkipListMap.java.i
 data/src/share/classes/sun/tools/tree/InlineNewInstanceExpression.java.i
-data/src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java.i
+data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.html.i
 data/src/share/classes/sun/nio/cs/ext/DoubleByteEncoder.java.i
 data/src/share/classes/java/awt/Graphics2D.java.i
 data/test/javax/swing/plaf/synth/Test6660049.java.i
 data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/ClosedStreams.java.i
-data/src/windows/native/sun/windows/awt_Pen.h.i
+data/src/share/classes/javax/accessibility/AccessibleStreamable.java.i
 data/src/linux/doc/man/ja/pack200.1.i
-data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall_Stub.java.i
+data/test/javax/imageio/plugins/png/ItxtUtf8Test.java.i
 data/test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java.i
-data/make/tools/CharsetMapping/IBM273.c2b.i
+data/src/share/classes/java/awt/geom/FlatteningPathIterator.java.i
 data/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java.i
-data/src/share/classes/java/util/concurrent/CopyOnWriteArraySet.java.i
+data/src/share/classes/sun/print/SunAlternateMedia.java.i
 data/test/java/io/Serializable/stopCustomDeserialization/Read.java.i
 data/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java.i
-data/test/java/io/Serializable/lookupInterfaceDesc/LookupInterfaceDesc.java.i
+data/src/share/classes/java/rmi/server/RemoteCall.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/internal/ColumnWidthCalculator.java.i
 data/test/javax/xml/crypto/dsig/data/certs/user.crt.i
 data/src/share/classes/sun/awt/image/SunVolatileImage.java.i
@@ -16601,9 +16546,9 @@ data/src/share/classes/java/beans/VetoableChangeSupport.java.i
 data/test/java/lang/management/MXBean/MXBeanBehavior.java.i
 data/test/java/lang/Class/getDeclaredClasses/TypeTag.java.i
 data/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java.i
+data/src/share/classes/sun/io/CharToByteMacThai.java.i
 data/test/java/rmi/server/RemoteServer/setLogPermission/SetLogPermission.java.i
-data/src/share/demo/jvmti/heapViewer/sample.makefile.txt.i
+data/src/share/classes/com/sun/crypto/provider/PCBC.java.i
 data/test/java/io/charStreams/LineLengths.java.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/IIOTests.java.i
 data/src/share/classes/javax/swing/text/GapVector.java.i
@@ -16621,24 +16566,20 @@ data/src/share/classes/javax/swing/plaf/nimbus/LoweredBorder.java.i
 data/src/share/classes/java/awt/font/TextJustifier.java.i
 data/src/share/classes/java/lang/ClassCastException.java.i
 data/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericBlockCipher.java.i
-data/src/share/classes/java/awt/ScrollPane.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_EmptySet.java.i
 data/test/java/net/PortUnreachableException/Concurrent.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM1149.java.i
-data/test/java/text/Collator/Bug5047314.java.i
+data/src/share/classes/javax/accessibility/AccessibleIcon.java.i
 data/src/share/classes/java/nio/channels/Channels.java.i
 data/test/java/util/ResourceBundle/Bug4179766Resource.java.i
 data/src/solaris/back/path_md.h.i
 data/test/java/beans/XMLDecoder/spec/TestArray.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html.i
-data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml.i
-data/test/sun/tools/jps/jps-Vvml_2.sh.i
+data/test/org/openjdk/jigsaw/MockLibrary.java.i
 data/src/share/demo/applets/MoleculeViewer/models/ethane.xyz.i
 data/test/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.html.i
-data/test/javax/management/eventService/ReconnectableConnectorTest.java.i
-data/src/share/classes/sun/nio/ch/Invoker.java.i
+data/test/java/net/Socket/RST.java.i
+data/make/tools/src/build/tools/automulti/README.txt.i
 data/test/com/sun/jdi/AfterThreadDeathTest.java.i
-data/src/share/classes/sun/text/resources/FormatData_ar_JO.java.i
-data/src/share/native/sun/java2d/loops/MaskBlit.c.i
 data/src/share/native/sun/misc/VMSupport.c.i
 data/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java.i
 data/src/windows/classes/sun/nio/ch/SourceChannelImpl.java.i
@@ -16653,116 +16594,118 @@ data/src/share/native/sun/awt/debug/debug_trace.h.i
 data/src/windows/native/sun/nio/ch/WindowsSelectorImpl.c.i
 data/test/java/lang/Float/Constants.java.i
 data/test/java/security/ProtectionDomain/Recursion.policy.i
-data/src/share/classes/java/nio/file/attribute/FileTime.java.i
-data/src/share/classes/javax/management/monitor/GaugeMonitorMBean.java.i
+data/src/share/classes/sun/net/www/protocol/http/NegotiatorImpl.java.i
 data/test/java/util/PluggableLocale/providersrc/TimeZoneNameProviderImpl.java.i
 data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressOutputStream.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java.i
+data/test/java/util/zip/Bounds.java.i
 data/src/share/classes/java/lang/StringIndexOutOfBoundsException.java.i
-data/test/javax/management/MBeanInfo/NullInfoArraysTest.java.i
 data/src/share/classes/sun/security/krb5/internal/HostAddresses.java.i
 data/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java.i
 data/test/javax/script/Test8.js.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java.i
+data/src/windows/classes/sun/awt/windows/WRobotPeer.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java.i
 data/src/share/classes/java/security/acl/LastOwnerException.java.i
 data/src/solaris/native/sun/xawt/XWindow.c.i
-data/src/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreUp.wav.i
+data/test/java/util/PluggableLocale/providersrc/java.util.spi.LocaleNameProvider.i
 data/test/java/util/logging/LoggingMXBeanTest2.java.i
-data/src/share/classes/javax/management/remote/package.html.i
+data/test/javax/script/DummyScriptEngine.java.i
 data/test/java/lang/Boolean/ParseBoolean.java.i
 data/src/share/classes/java/awt/font/FontRenderContext.java.i
 data/src/solaris/native/sun/nio/ch/SctpServerChannelImpl.c.i
+data/make/mkdemo/jfc/Metalworks/Makefile.i
 data/src/share/classes/sun/util/resources/CalendarData_sq.properties.i
 data/src/share/classes/javax/crypto/Mac.java.i
 data/src/share/demo/applets/WireFrame/example3.html.i
-data/test/com/sun/jdi/TemplateTest.java.i
 data/test/sun/management/jmxremote/bootstrap/rmiregistry.properties.i
 data/src/share/classes/java/awt/dnd/peer/DragSourceContextPeer.java.i
 data/src/windows/classes/sun/awt/windows/WToolkit.java.i
 data/src/share/classes/java/text/DictionaryBasedBreakIterator.java.i
 data/src/share/classes/javax/security/auth/callback/UnsupportedCallbackException.java.i
-data/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java.i
+data/src/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java.i
 data/test/com/sun/servicetag/SvcTagClient.java.i
 data/src/share/classes/javax/print/event/PrintServiceAttributeEvent.java.i
 data/src/share/classes/com/sun/security/sasl/digest/SecurityCtx.java.i
-data/test/javax/script/GetInterfaceTest.java.i
-data/src/windows/native/sun/windows/awt_new.cpp.i
+data/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails_Stub.java.i
+data/src/share/classes/sun/tools/tree/ReturnStatement.java.i
 data/make/tools/src/build/tools/javazic/Simple.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java.i
-data/src/share/classes/com/sun/java/swing/SwingUtilities3.java.i
+data/src/linux/doc/man/ja/jinfo.1.i
 data/src/share/classes/sun/awt/image/ByteBandedRaster.java.i
 data/src/share/native/sun/font/layout/KhmerReordering.h.i
 data/src/share/classes/sun/io/ByteToCharCp1122.java.i
 data/test/java/util/Formatter/BasicDoubleObject.java.i
+data/make/tools/src/build/tools/fontchecker/README.txt.i
 data/src/share/classes/sun/rmi/server/resources/rmid_es.properties.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/NullCalls.java.i
+data/src/share/classes/javax/sql/rowset/serial/SerialArray.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/OptionArgumentConversionException.java.i
 data/test/com/sun/jdi/connect/spi/Foo.java.i
-data/test/com/sun/net/httpserver/Test5.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java.i
+data/src/windows/classes/sun/awt/windows/WCustomCursor.java.i
 data/test/com/sun/jdi/RedefinePop.sh.i
 data/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h.i
 data/src/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java.i
-data/src/share/classes/javax/print/attribute/standard/JobHoldUntil.java.i
+data/src/share/classes/com/sun/tools/hat/internal/util/ArraySorter.java.i
 data/src/share/classes/java/awt/image/DataBufferFloat.java.i
 data/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java.i
-data/src/share/classes/sun/nio/fs/DynamicFileAttributeView.java.i
-data/test/java/net/URL/TestRFC2732.java.i
+data/test/sun/text/resources/Collator/Bug6755060.java.i
+data/src/share/classes/com/sun/security/sasl/ExternalClient.java.i
 data/src/share/classes/com/sun/crypto/provider/DESConstants.java.i
 data/test/com/sun/jdi/redefine/Different_RedefineSubTarg.java.i
 data/src/share/classes/sun/applet/AppletObjectInputStream.java.i
 data/src/share/classes/sun/awt/Symbol.java.i
 data/src/share/demo/applets/SimpleGraph/GraphApplet.java.i
+data/test/java/security/cert/CertPathValidatorException/GetMessage.java.i
 data/test/java/rmi/server/serverStackTrace/SuppressStackTraces.java.i
 data/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java.i
 data/src/share/demo/jfc/SwingApplet/SwingApplet.html.i
 data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.html.i
 data/test/org/openjdk/jigsaw/cli/JpkgArgsTest.java.i
 data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c.i
+data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnClass.java.i
 data/src/windows/native/sun/java2d/d3d/D3DTestRaster.h.i
 data/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java.i
 data/src/share/classes/com/sun/jmx/namespace/RoutingConnectionProxy.java.i
 data/src/share/classes/javax/crypto/ExemptionMechanism.java.i
-data/src/solaris/native/sun/awt/awt_PopupMenu.h.i
-data/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java.i
+data/src/solaris/classes/sun/awt/X11/XMenuWindow.java.i
+data/src/windows/bin/java-rmi.c.i
+data/make/tools/reorder/tools/Combine.java.i
+data/test/java/beans/PropertyEditor/TestStringClassNull.java.i
 data/test/java/util/ResourceBundle/Bug4257318Res.java.i
 data/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java.i
-data/test/javax/management/eventService/SharingThreadTest.java.i
-data/test/com/sun/jdi/sde/MangleStepTest.java.i
+data/make/java/hpi/windows/Makefile.i
+data/src/share/native/sun/awt/medialib/mlib_image.h.i
 data/test/java/util/Formatter/BasicBoolean.java.i
 data/src/share/classes/sun/invoke/package-info.java.i
-data/src/share/classes/java/lang/IllegalStateException.java.i
+data/src/share/classes/javax/swing/DebugGraphicsFilter.java.i
+data/src/share/classes/java/lang/reflect/GenericSignatureFormatError.java.i
 data/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java.i
 data/src/share/classes/java/awt/font/TextLine.java.i
-data/test/java/beans/EventHandler/Test6277266.java.i
-data/src/share/classes/sun/util/resources/CalendarData_vi.properties.i
+data/test/sun/security/x509/X509CRLImpl/UnexpectedNPE.java.i
+data/src/share/back/commonRef.c.i
 data/test/javax/imageio/metadata/BooleanAttributes.java.i
 data/src/share/classes/javax/print/attribute/standard/MediaTray.java.i
 data/src/share/classes/com/sun/jdi/connect/package.html.i
 data/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java.i
 data/test/java/lang/ProcessBuilder/Zombies.java.i
-data/test/javax/management/mxbean/RandomMXBeanTest.java.i
+data/src/share/classes/java/lang/management/MemoryManagerMXBean.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libsoftokn3.so.d
-data/test/sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java.i
-data/src/share/classes/javax/management/NotificationFilterSupport.java.i
-data/src/share/classes/javax/print/attribute/standard/PagesPerMinute.java.i
-data/test/sun/nio/cs/OLD/MS950_OLD.java.i
-data/test/java/text/BreakIterator/ExceptionTest.java.i
+data/src/share/native/sun/management/management.c.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpRequestTree.java.i
+data/src/share/classes/javax/sound/midi/Soundbank.java.i
+data/src/share/classes/sun/tracing/MultiplexProviderFactory.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java.i
 data/src/windows/native/sun/jkernel/DownloadHelper.cpp.i
 data/src/share/classes/javax/management/namespace/JMXNamespacePermission.java.i
-data/test/sun/security/provider/PolicyParser/ExtDirsA/a.jar.i
 data/src/share/classes/sun/applet/AppletSecurityException.java.i
 data/src/share/classes/sun/security/ssl/SSLServerSocketImpl.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceTableMeta.java.i
 data/test/java/io/Serializable/expectedStackTrace/ExpectedStackTrace.java.i
-data/test/java/util/zip/FlaterTest.java.i
+data/src/solaris/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBuffer/Load.java.i
-data/src/solaris/native/sun/jdga/dgalock.c.i
-data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnssckbi.so.i
+data/src/share/classes/com/sun/media/sound/SoftLimiter.java.i
 data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java.i
 data/test/javax/swing/JLabel/6596966/bug6596966.java.i
-data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java.i
+data/src/share/classes/sun/io/ByteToCharCp1098.java.i
 data/test/sun/net/www/protocol/http/B6660405.java.i
 data/test/sun/security/smartcardio/TestChannel.java.i
 data/test/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in.i
@@ -16771,91 +16714,96 @@ data/make/netbeans/j2se/nbproject/project.xml.i
 data/test/sun/security/util/Resources/Format.policy.i
 data/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java.i
 data/src/share/classes/javax/security/auth/login/AppConfigurationEntry.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java.i
 data/test/sun/net/www/protocol/jar/jarbug/etc/jar1/jar1/bundle.properties.i
 data/test/java/io/Serializable/accessConstants/AccessConstants.java.i
 data/test/java/io/File/IsHidden.java.i
 data/src/solaris/native/com/sun/security/auth/module/Solaris.c.i
 data/src/windows/native/sun/windows/awt_TextField.h.i
-data/src/share/classes/sun/security/krb5/internal/HostAddress.java.i
+data/test/java/lang/management/ThreadMXBean/AllThreadIds.java.i
 data/test/java/lang/System/System.policy.i
 data/src/share/classes/javax/swing/plaf/multi/MultiTabbedPaneUI.java.i
 data/test/java/security/cert/CertificateFactory/openssl/OpenSSLCert.java.i
 data/test/java/awt/EventQueue/6638195/bug6638195.java.i
 data/src/share/classes/sun/tools/tree/PostDecExpression.java.i
-data/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java.i
+data/src/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java.i
 data/src/windows/native/sun/io/Win32ErrorMode.c.i
 data/src/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java.i
 data/test/java/awt/im/4959409/bug4959409.html.i
 data/test/org/openjdk/jigsaw/cli/ee-cert.pem.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java.i
-data/src/share/classes/java/awt/AttributeValue.java.i
+data/src/share/classes/sun/io/CharToByteCp850.java.i
 data/src/share/classes/sun/management/Agent.java.i
 data/src/share/classes/sun/awt/datatransfer/SunClipboard.java.i
 data/.hgtags.i
 data/src/windows/native/sun/nio/ch/FileChannelImpl.c.i
 data/src/share/classes/javax/management/relation/InvalidRoleInfoException.java.i
 data/src/share/classes/sun/security/util/PermissionFactory.java.i
-data/test/java/nio/file/Path/PassThroughFileSystem.java.i
 data/src/share/classes/sun/security/util/ObjectIdentifier.java.i
 data/src/share/classes/java/lang/ThreadGroup.java.i
 data/test/sun/security/provider/PolicyParser/ExtDirsChange.policy.i
-data/test/sun/net/www/http/HttpClient/ProxyTest.java.i
+data/src/windows/back/util_md.h.i
 data/src/share/classes/java/awt/PrintJob.java.i
 data/test/javax/security/auth/login/Configuration/ConfigFileWithBlank.java.i
 data/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java.i
-data/test/sun/net/www/http/HttpClient/StreamingRetry.java.i
 data/test/java/lang/Runtime/exec/ExecWithDir.java.i
 data/test/org/openjdk/jigsaw/cli/ImportPrivateKey.java.i
-data/test/javax/sound/midi/Gervill/DLSSoundbankReader/ding.dls.i
+data/test/java/awt/im/4490692/bug4490692.html.i
 data/make/modules/imagine.sh.i
 data/src/share/classes/sun/reflect/UnsafeStaticIntegerFieldAccessorImpl.java.i
-data/src/share/classes/java/nio/channels/MembershipKey.java.i
+data/src/share/classes/java/lang/AssertionStatusDirectives.java.i
 data/make/common/Release-embedded.gmk.i
 data/src/share/classes/javax/swing/plaf/basic/package.html.i
 data/test/sun/tools/jrunscript/dash-f.out.i
 data/test/sun/security/provider/certpath/SunCertPathBuilderExceptionTest.java.i
-data/src/windows/native/sun/java2d/d3d/D3DRuntimeTest.h.i
-data/test/java/lang/instrument/PremainClass/PremainClassTest.sh.i
-data/src/share/classes/javax/swing/plaf/nimbus/ImageCache.java.i
+data/src/solaris/classes/sun/awt/motif/X11GB18030_1.java.i
+data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.config.i
+data/test/java/util/ResourceBundle/Bug4083270Test.properties.i
 data/src/share/demo/nbproject/jfc/Font2DTest/build.properties.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/spi/ProviderInit.java.i
+data/src/share/classes/sun/dyn/util/VerifyAccess.java.i
+data/src/share/classes/javax/swing/CellRendererPane.java.i
 data/test/sun/tools/jhat/HelloWorld.java.i
+data/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java.i
 data/src/windows/hpi/src/sys_api_md.c.i
 data/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java.i
 data/src/share/demo/jvmti/java_crw_demo/README.txt.i
-data/src/share/native/java/lang/fdlibm/src/w_sinh.c.i
-data/src/share/classes/java/nio/channels/ReadableByteChannel.java.i
+data/src/share/classes/com/sun/jdi/event/ThreadStartEvent.java.i
+data/src/solaris/sample/dtrace/hotspot/README.txt.i
+data/test/java/util/zip/ZipFile/CopyJar.java.i
+data/make/tools/CharsetMapping/IBM1026.map.i
+data/src/solaris/native/sun/awt/awt_dnd.h.i
 data/src/share/classes/sun/rmi/runtime/NewThreadAction.java.i
-data/test/java/rmi/testlibrary/RegistryRunner.java.i
+data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java.i
 data/src/windows/native/sun/windows/awt_TextComponent.cpp.i
 data/src/share/native/sun/awt/medialib/mlib_ImageDivTables.c.i
 data/test/java/security/KeyRep/Serial.policy.i
-data/src/share/classes/java/dyn/package-info.java.i
+data/src/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java.i
 data/src/share/classes/java/util/SortedMap.java.i
 data/src/share/classes/javax/net/ssl/package.html.i
-data/test/java/rmi/Naming/UnderscoreHost_Stub.java.i
 data/test/java/io/FileInputStream/Available.java.i
 data/src/windows/classes/sun/security/mscapi/RSASignature.java.i
-data/src/solaris/native/common/jdk_util_md.c.i
+data/src/share/classes/com/sun/jdi/InvalidStackFrameException.java.i
 data/test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java.i
-data/src/share/classes/sun/security/provider/certpath/ForwardState.java.i
-data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java.i
-data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/group.security.policy.i
+data/src/share/classes/com/sun/tools/hat/MANIFEST.mf.i
+data/test/sun/security/ec/keystore.i
 data/src/share/classes/sun/print/resources/serviceui_es.properties.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextRenderTests.java.i
 data/src/share/native/sun/awt/image/jpeg/jdct.h.i
+data/src/share/classes/sun/util/logging/resources/logging_sv.properties.i
+data/src/windows/native/sun/java2d/d3d/D3DTextRenderer.cpp.i
 data/test/com/sun/jdi/InvokeHangTest.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties.i
 data/test/java/util/concurrent/FutureTask/LoopHelpers.java.i
 data/src/share/native/sun/security/ec/ECC_JNI.cpp.i
 data/src/share/classes/sun/invoke/anon/AnonymousClassLoader.java.i
+data/src/share/native/java/lang/fdlibm/src/w_lgamma_r.c.i
 data/test/sun/tools/jps/jps-v_Output1.awk.i
 data/src/share/classes/sun/print/BackgroundLookupListener.java.i
 data/src/share/classes/sun/tools/java/ClassType.java.i
-data/src/share/classes/java/security/cert/CertStore.java.i
+data/src/share/classes/sun/security/pkcs10/PKCS10.java.i
 data/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorStructureException.java.i
-data/src/linux/doc/man/orbd.1.i
+data/test/sun/tools/jstatd/jstatdPort.sh.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaStatic.java.i
 data/src/share/demo/jfc/Metalworks/resources/MyTheme.theme.i
 data/src/share/classes/sun/tools/jstat/OptionLister.java.i
@@ -16864,8 +16812,9 @@ data/src/share/classes/sun/print/resources/serviceui_ja.properties.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/MyKeyManager.java.i
 data/src/share/classes/sun/security/provider/certpath/URICertStore.java.i
 data/test/java/net/URL/RelativeURL.java.i
-data/test/javax/management/remote/mandatory/connectorServer/StandardForwardersTest.java.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java.i
 data/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java.i
+data/test/sun/awt/image/DrawByteBinary.java.i
 data/src/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java.i
 data/src/share/classes/sun/text/resources/CollationData_uk.java.i
 data/src/share/classes/java/awt/font/TextMeasurer.java.i
@@ -16876,17 +16825,17 @@ data/src/share/demo/jvmti/minst/Minst.java.i
 data/src/share/native/sun/awt/image/cvutils/img_output8_16_32.h.i
 data/src/share/classes/sun/rmi/rmic/resources/rmic.properties.i
 data/test/sun/java2d/X11SurfaceData/DrawImageBgTest/DrawImageBgTest.java.i
-data/src/share/classes/javax/security/cert/CertificateEncodingException.java.i
+data/src/share/classes/javax/naming/ldap/PagedResultsResponseControl.java.i
 data/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh.i
 data/src/share/classes/sun/security/pkcs/PKCS9Attributes.java.i
 data/src/share/classes/sun/java2d/pipe/PixelFillPipe.java.i
 data/test/java/awt/dnd/DnDFileGroupDescriptor/DnDTarget.java.i
 data/src/share/native/sun/awt/image/cvutils/img_output32.h.i
-data/test/java/beans/Performance/TestVetoableChangeSupport.java.i
+data/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java.i
 data/src/share/classes/sun/nio/cs/UnicodeDecoder.java.i
 data/make/common/shared/Compiler-sun.gmk.i
 data/src/share/classes/sun/text/resources/CollationData_zh_TW.java.i
-data/src/windows/native/sun/security/mscapi/security.cpp.i
+data/test/java/security/KeyRep/SerialOld.java.i
 data/test/java/util/Formatter/Flush.java.i
 data/src/share/classes/javax/swing/plaf/LabelUI.java.i
 data/test/java/beans/PropertyEditor/TestShortTypeNull.java.i
@@ -16894,23 +16843,24 @@ data/src/share/classes/sun/swing/SwingLazyValue.java.i
 data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh.i
 data/test/start-Xvfb.sh.i
 data/test/java/rmi/reliability/benchmark/bench/rmi/ObjTreeCalls.java.i
-data/src/windows/native/sun/windows/awt_Checkbox.h.i
+data/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java.i
 data/src/windows/classes/sun/awt/windows/WChoicePeer.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/OptionMissingRequiredArgumentException.java.i
+data/src/share/classes/java/security/cert/PKIXReason.java.i
 data/test/javax/management/notification/FilterExceptionTest.java.i
 data/src/windows/native/sun/windows/awt_Brush.h.i
 data/src/share/classes/com/sun/tools/jdi/PacketStream.java.i
 data/test/com/sun/net/httpserver/bugs/B6339483.java.i
-data/src/share/classes/javax/swing/text/TabExpander.java.i
+data/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java.i
 data/src/share/classes/javax/swing/ClientPropertyKey.java.i
 data/test/javax/swing/Security/6938813/bug6938813.java.i
 data/src/share/native/java/net/Inet4Address.c.i
 data/test/sun/security/provider/PolicyFile/CombinedPerms.policy.i
 data/src/share/classes/javax/management/relation/InvalidRoleValueException.java.i
+data/src/share/classes/sun/tools/jstack/JStack.java.i
 data/src/share/classes/java/io/RandomAccessFile.java.i
 data/test/java/beans/XMLEncoder/Test5023552.java.i
 data/src/windows/native/sun/java2d/d3d/D3DVertexCacher.cpp.i
-data/test/java/rmi/activation/CommandEnvironment/Doctor_Stub.java.i
+data/test/java/util/PluggableLocale/CurrencyNameProviderTest.sh.i
 data/src/windows/native/sun/windows/awt_Mlib.h.i
 data/src/share/classes/javax/management/openmbean/CompositeDataSupport.java.i
 data/test/java/lang/instrument/SimpleIdentityTransformer.java.i
@@ -16919,7 +16869,7 @@ data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Signat
 data/test/sun/tools/jhat/README.TXT.i
 data/src/share/native/sun/awt/image/jpeg/jcsample.c.i
 data/src/share/native/java/net/net_util.c.i
-data/test/java/lang/Class/forName/Z.java.i
+data/src/share/classes/sun/security/jgss/krb5/SubjectComber.java.i
 data/src/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java.i
 data/src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java.i
 data/src/share/classes/com/sun/net/ssl/SSLSecurity.java.i
@@ -16931,47 +16881,48 @@ data/src/share/classes/sun/awt/geom/Crossings.java.i
 data/test/javax/management/namespace/NamespaceNotificationsTest.java.i
 data/src/share/classes/sun/io/CharToByteCp921.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java.i
-data/test/java/util/Hashtable/IllegalLoadFactor.java.i
+data/src/share/classes/sun/awt/image/ByteComponentRaster.java.i
 data/test/javax/management/remote/mandatory/provider/ProviderTest.java.i
 data/src/share/classes/java/lang/doc-files/capsigma.gif.i
 data/src/share/native/sun/java2d/loops/Index12Gray.c.i
 data/test/java/util/zip/ZipFile/Assortment.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_D64.c.i
-data/src/share/classes/sun/tools/jconsole/LocalVirtualMachine.java.i
+data/src/share/classes/javax/swing/text/MaskFormatter.java.i
 data/src/share/classes/sun/java2d/pipe/hw/AccelSurface.java.i
-data/src/share/classes/com/sun/net/ssl/SSLPermission.java.i
+data/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java.i
 data/src/share/demo/jfc/Notepad/resources/copy.gif.i
-data/src/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java.i
 data/src/share/classes/sun/io/ByteToCharCp937.java.i
 data/make/netbeans/jarzip/build.properties.i
-data/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/J2DBench.java.i
 data/src/share/classes/sun/beans/editors/FloatEditor.java.i
 data/test/com/sun/jdi/AnyDebuggeeTest.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolCollectThreshdSupport.java.i
 data/src/solaris/doc/sun/man/man1/jarsigner.1.i
 data/test/java/io/Serializable/class/NonSerialA_1.java.i
-data/src/share/demo/jvmti/hprof/hprof_string.h.i
+data/test/java/util/Objects/BasicObjectsTest.java.i
 data/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java.i
-data/src/share/classes/java/awt/color/CMMException.java.i
+data/src/share/classes/sun/security/jgss/spi/MechanismFactory.java.i
 data/test/javax/management/namespace/JMXRemoteNamespaceTest.java.i
-data/src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h.i
+data/test/java/beans/XMLDecoder/spec/TestInt.java.i
+data/src/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingResponse.java.i
 data/test/java/security/cert/GetInstance.java.i
 data/src/share/classes/java/security/cert/CertPathBuilder.java.i
 data/src/share/classes/org/openjdk/internal/joptsimple/internal/Column.java.i
 data/test/java/io/pathNames/win32/BadDriveLetter.java.i
 data/test/java/beans/PropertyEditor/TestFloatClass.java.i
 data/test/java/security/SecureClassLoader/TestClass.java.i
-data/test/javax/crypto/CryptoPermission/RC4AliasPermCheck.java.i
-data/make/tools/CharsetMapping/IBM424.c2b.i
-data/make/tools/GenerateCharacter/CharacterDataUndefined.java.template.i
+data/test/java/util/Arrays/ArrayObjectMethods.java.i
+data/src/share/classes/sun/security/ssl/Alerts.java.i
 data/test/java/nio/channels/TestUtil.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverException.java.i
+data/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so.d
 data/src/share/classes/java/awt/image/DataBufferInt.java.i
 data/src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java.i
 data/src/share/classes/com/sun/tools/jdi/VMListener.java.i
-data/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java.i
-data/test/java/net/URLConnection/UNCTest.java.i
+data/src/share/classes/sun/java2d/pipe/BufferedOpCodes.java.i
+data/test/java/nio/channels/FileChannel/MapAssertions.java.i
 data/src/share/classes/sun/io/CharToByteISO8859_6.java.i
+data/src/share/demo/jfc/Notepad/README.txt.i
 data/make/netbeans/common/java-data-native.ent.i
 data/src/share/classes/sun/tools/tree/DivideExpression.java.i
 data/src/share/native/sun/awt/image/cvutils/img_anycm.h.i
@@ -16979,35 +16930,36 @@ data/src/windows/hpi/src/linker_md.c.i
 data/src/share/classes/sun/text/bidi/BidiLine.java.i
 data/src/share/classes/sun/jvmstat/monitor/LongMonitor.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_bg.properties.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/CloseTest.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java.i
 data/test/java/io/charStreams/ABCReader.java.i
 data/src/share/native/java/lang/fdlibm/src/s_matherr.c.i
 data/test/sun/tools/jps/jps-V_Output2.awk.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java.i
+data/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport_Stub.java.i
 data/src/share/classes/sun/util/resources/CalendarData_hr.properties.i
-data/src/share/classes/javax/print/MultiDocPrintService.java.i
-data/make/sun/javazic/tzdata/antarctica.i
-data/src/share/classes/sun/nio/cs/ext/IBM1383.java.i
+data/test/javax/swing/JFileChooser/6524424/bug6524424.java.i
+data/test/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.dtd.i
 data/make/sun/dcpr/mapfile-vers.i
-data/src/share/classes/java/util/concurrent/AbstractExecutorService.java.i
+data/test/org/openjdk/jigsaw/hello.sh.i
 data/src/share/classes/com/sun/jndi/dns/Header.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java.i
+data/test/org/openjdk/jigsaw/tester.sh.i
 data/src/share/classes/sun/nio/cs/ext/IBM856.java.i
 data/test/java/lang/instrument/RedefineMethodAddInvokeAgent.java.i
 data/src/solaris/doc/sun/man/man1/ja/jps.1.i
 data/test/java/net/DatagramSocket/B6411513.java.i
-data/test/java/lang/instrument/ilib/Injector.java.i
 data/src/windows/native/common/jdk_util_md.h.i
 data/src/share/classes/java/dyn/BoundMethodHandle.java.i
 data/src/share/classes/sun/management/counter/perf/LongCounterSnapshot.java.i
+data/test/java/security/ProtectionDomain/RecursionDebug.java.i
 data/test/javax/security/auth/Subject/Generic.java.i
-data/test/javax/management/ObjectName/SerialCompatTest.java.i
+data/src/share/classes/sun/text/resources/unorm.icu.i
 data/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java.i
 data/src/share/classes/sun/tools/tree/RemainderExpression.java.i
 data/src/share/classes/sun/java2d/pipe/LoopBasedPipe.java.i
 data/test/sun/security/ssl/sanity/pluggability/MySSLServerSocketFacImpl.java.i
-data/test/java/util/TreeMap/NullAtEnd.java.i
+data/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh.i
 data/test/java/beans/Introspector/6380849/infos/SecondBeanBeanInfo.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java.i
 data/src/solaris/native/sun/java2d/loops/vis_IntRgbx.c.i
 data/test/java/util/Formattable/StockName.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_el_GR.properties.i
@@ -17015,97 +16967,100 @@ data/test/sun/management/AgentCheckTest.java.i
 data/src/share/classes/sun/management/counter/perf/PerfLongCounter.java.i
 data/src/share/native/sun/font/sunFont.c.i
 data/test/javax/management/namespace/JMXRemoteTargetNamespace.java.i
-data/test/com/sun/net/httpserver/SimpleSSLContext.java.i
-data/src/share/classes/sun/tools/tree/WhileStatement.java.i
+data/src/share/native/sun/java2d/opengl/OGLContext.c.i
+data/make/tools/makeclasslist/Makefile.i
 data/make/com/sun/nio/sctp/mapfile-vers.i
-data/make/tools/CharsetMapping/MacRomania.map.i
+data/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java.i
 data/make/javax/crypto/policy/limited/exempt_local.policy.i
-data/src/share/classes/javax/management/DescriptorKey.java.i
-data/src/share/native/sun/java2d/loops/FillSpans.c.i
-data/test/java/net/Socket/setReuseAddress/Restart.java.i
-data/test/java/text/Format/DateFormat/WeekDateTest.java.i
+data/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapClientFactory.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CheckMethods.java.i
 data/test/java/lang/Double/ToString.java.i
 data/test/java/beans/PropertyEditor/TestBooleanClassValue.java.i
 data/src/share/classes/java/awt/image/renderable/RenderableImageProducer.java.i
 data/test/java/nio/file/attribute/FileStoreAttributeView/Basic.java.i
+data/test/java/lang/management/ThreadMXBean/Utils.java.i
 data/test/javax/print/PrintSE/PrintSE.java.i
 data/test/java/net/ResponseCache/getResponseCode.java.i
 data/test/com/sun/jdi/RedefineIntConstantToLong.sh.i
 data/src/solaris/classes/sun/tools/attach/LinuxAttachProvider.java.i
 data/src/windows/classes/sun/net/www/protocol/http/NTLMAuthSequence.java.i
 data/test/java/io/Serializable/readObjectNoData/Write.java.i
-data/test/tools/pack200/pack200-verifier/src/xmlkit/ClassSyntax.java.i
-data/make/sun/awt/FILES_export_windows.gmk.i
+data/src/share/classes/sun/tools/tree/BinaryLogicalExpression.java.i
+data/src/share/native/sun/awt/image/cvutils/img_ordclruns.h.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/TestThread.java.i
 data/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java.i
 data/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java.i
 data/test/java/nio/channels/ConfigureBlocking.java.i
 data/make/java/verify/reorder-sparc.i
+data/test/sun/nio/cs/OLD/MS950_OLD.java.i
 data/src/share/classes/java/lang/management/MemoryType.java.i
 data/test/sun/security/x509/AlgorithmId/AlgorithmIdEqualsHashCode.java.i
 data/src/share/sample/nio/server/MalformedRequestException.java.i
-data/src/share/classes/java/util/concurrent/locks/package-info.java.i
-data/test/org/openjdk/jigsaw/_JigsawVersionQuery.java.i
+data/src/share/classes/javax/management/DescriptorKey.java.i
+data/src/solaris/classes/sun/awt/X11/XWM.java.i
 data/src/share/native/sun/font/layout/LookupProcessor.h.i
 data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/MyActivationGroupImpl.java.i
-data/src/share/classes/java/rmi/activation/ActivationGroup.java.i
+data/src/share/classes/com/sun/jdi/AbsentInformationException.java.i
 data/make/sun/font/t2k/FILES_c.gmk.i
 data/src/share/demo/jfc/CodePointIM/resources/codepoint_ja.properties.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedStaticBooleanFieldAccessorImpl.java.i
 data/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java.i
 data/test/java/awt/Toolkit/SecurityTest/SecurityTest2.java.i
-data/test/java/beans/XMLEncoder/javax_swing_border_TitledBorder.java.i
+data/src/share/classes/sun/nio/ch/AllocatedNativeObject.java.i
 data/src/share/classes/sun/awt/InputMethodSupport.java.i
 data/test/java/security/Policy/Root/Root.policy.i
-data/src/share/classes/sun/util/resources/CalendarData_fi.properties.i
-data/make/templates/gpl-cp-header.i
+data/src/share/classes/sun/java2d/pipe/SolidTextRenderer.java.i
+data/src/share/classes/com/sun/tools/hat/README.txt.i
 data/src/share/classes/javax/swing/tree/TreeModel.java.i
 data/test/java/beans/PropertyEditor/TestLongTypeValue.java.i
 data/test/java/util/PriorityQueue/ForgetMeNot.java.i
-data/src/share/classes/sun/reflect/UnsafeQualifiedStaticShortFieldAccessorImpl.java.i
-data/test/sun/security/krb5/ktab/HighestKvno.java.i
-data/src/windows/native/sun/windows/awt_Window.h.i
+data/test/java/util/ArrayList/IteratorMicroBenchmark.java.i
+data/src/share/native/sun/java2d/loops/ThreeByteBgr.c.i
+data/src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java.i
 data/src/share/classes/sun/security/krb5/Checksum.java.i
-data/make/java/zip/Makefile.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocketException.java.i
 data/test/java/rmi/server/RMIClassLoader/useGetURLs/security.policy.i
 data/src/share/classes/sun/tools/jar/resources/jar_ja.properties.i
+data/src/share/classes/org/openjdk/internal/joptsimple/internal/Classes.java.i
 data/src/share/classes/com/sun/net/ssl/TrustManagerFactory.java.i
 data/test/java/nio/channels/Selector/WakeupAfterClose.java.i
+data/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserConstants.java.i
 data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressConstants.java.i
 data/make/java/nio/FILES_c.gmk.i
 data/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh.i
-data/src/share/classes/com/sun/jndi/ldap/Ber.java.i
+data/src/share/classes/javax/print/attribute/standard/RequestingUserName.java.i
 data/test/java/rmi/server/RMIClassLoader/useGetURLs/Dummy.java.i
+data/make/tools/src/build/tools/jdwpgen/ArrayObjectTypeNode.java.i
 data/test/sun/security/provider/PolicyParser/PrincipalExpansionError.java.i
 data/make/java/nio/mapfile-linux.i
 data/make/com/sun/tools/attach/Makefile.i
 data/test/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java.i
 data/src/share/classes/javax/swing/text/html/parser/Element.java.i
 data/test/java/nio/channels/Selector/SelectWrite.java.i
-data/src/share/classes/javax/swing/text/rtf/RTFGenerator.java.i
-data/test/java/util/PluggableLocale/providersrc/java.text.spi.DecimalFormatSymbolsProvider.i
-data/src/windows/native/sun/jkernel/stdafx.h.i
-data/test/sun/security/x509/AVA/EmptyValue.java.i
-data/test/com/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider.i
+data/src/share/classes/sun/security/krb5/internal/KrbApErrException.java.i
+data/src/solaris/classes/sun/awt/motif/X11CNS11643P2.java.i
+data/src/share/classes/java/util/concurrent/BlockingDeque.java.i
 data/src/windows/classes/sun/awt/windows/WFontConfiguration.java.i
 data/src/share/classes/java/util/concurrent/CountDownLatch.java.i
-data/src/share/demo/nbproject/jfc/TableExample/build.xml.i
+data/src/share/classes/java/rmi/registry/LocateRegistry.java.i
 data/test/java/awt/Container/isRemoveNotifyNeeded/JInternalFrameTest.java.i
 data/test/javax/swing/text/html/TableView/7030332/bug7030332.java.i
 data/src/share/classes/javax/swing/event/MenuKeyEvent.java.i
 data/src/share/classes/com/sun/jndi/ldap/DigestClientId.java.i
 data/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java.i
+data/src/share/classes/java/util/concurrent/locks/package-info.java.i
 data/test/java/io/Serializable/subclassGC/security.policy.i
 data/make/com/sun/java/pack/mapfile-vers-unpack200.i
 data/src/windows/classes/sun/nio/ch/PollArrayWrapper.java.i
 data/test/java/util/PluggableLocale/providersrc/DateFormatSymbolsProviderImpl.java.i
 data/src/solaris/native/java/util/TimeZone_md.h.i
 data/test/com/sun/servicetag/servicetag1.properties.i
-data/test/com/sun/jdi/CatchPatternTest.sh.i
+data/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java.i
 data/test/com/sun/jdi/RedefineMulti.sh.i
+data/test/java/rmi/server/RemoteObject/toStub/ToStub.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java.i
-data/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh.i
+data/src/share/native/sun/font/layout/LayoutEngine.cpp.i
 data/src/share/classes/sun/reflect/generics/scope/DummyScope.java.i
 data/src/share/native/java/util/zip/Deflater.c.i
 data/src/share/classes/sun/java2d/loops/DrawPath.java.i
@@ -17113,12 +17068,12 @@ data/src/windows/classes/sun/java2d/d3d/D3DDrawImage.java.i
 data/test/java/io/File/DeleteOnExitNPE.java.i
 data/src/share/classes/com/sun/media/sound/SoftSynthesizer.java.i
 data/src/share/classes/java/security/spec/InvalidKeySpecException.java.i
-data/test/com/sun/crypto/provider/TLS/TestMasterSecret.java.i
-data/test/sun/security/pkcs11/fips/TrustManagerTest.java.i
+data/test/java/net/URLClassLoader/ClassPathTest.java.i
+data/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java.i
 data/test/java/util/jar/TestExtra.java.i
-data/src/share/classes/javax/security/sasl/SaslException.java.i
+data/test/java/util/Locale/Bug4184873_id.i
 data/src/share/classes/sun/security/provider/certpath/ReverseState.java.i
-data/test/java/beans/PropertyEditor/TestEnumClassNull.java.i
+data/src/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties.i
 data/src/share/classes/java/util/Timer.java.i
 data/make/tools/swing-beans/beaninfo/images/BoxColor16.gif.i
 data/test/javax/imageio/plugins/jpeg/WritingInterruptionTest.java.i
@@ -17128,12 +17083,10 @@ data/test/tools/launcher/6842838/Test6842838.sh.i
 data/src/share/lib/security/cacerts.i
 data/src/solaris/native/sun/java2d/x11/X11FontScaler_md.c.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties.i
-data/test/sun/tools/jrunscript/jrunscript-helpTest.sh.i
+data/src/share/classes/javax/swing/text/html/CSSBorder.java.i
 data/make/tools/src/build/tools/generatenimbus/Paint.java.i
 data/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java.i
 data/src/solaris/javavm/export/jvm_md.h.i
-data/test/sun/security/provider/PolicyParser/PrincipalExpansionError.sh.i
-data/src/share/classes/javax/swing/Scrollable.java.i
 data/test/java/lang/Runtime/shutdown/ShutdownHooks.sh.i
 data/src/share/classes/java/lang/module/UnsupportedElementTypeException.java.i
 data/test/java/util/ResourceBundle/Bug6190861Data.properties.i
@@ -17145,20 +17098,20 @@ data/src/share/classes/javax/naming/ldap/InitialLdapContext.java.i
 data/test/javax/management/monitor/CounterMonitorTest.java.i
 data/src/share/native/sun/management/HotspotThread.c.i
 data/src/windows/native/sun/windows/awt_DesktopProperties.h.i
-data/test/java/io/RandomAccessFile/OpenSync.java.i
+data/src/solaris/classes/sun/awt/motif/X11GB2312.java.i
 data/test/com/sun/crypto/provider/Mac/HmacPBESHA1.java.i
 data/src/share/classes/javax/management/ObjectName.java.i
 data/src/share/native/java/lang/fdlibm/src/s_significand.c.i
 data/src/share/classes/sun/misc/Lock.java.i
 data/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java.i
 data/test/java/util/zip/ZipFile/DeleteTempJar.java.i
-data/src/share/classes/com/sun/pept/presentation/Tie.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java.i
+data/src/share/classes/java/awt/doc-files/RadialGradientPaint-4.png.i
+data/src/share/sample/scripting/scriptpad/nbproject/netbeans-targets.xml.i
 data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.java.i
 data/src/share/classes/com/sun/media/sound/AiffFileReader.java.i
 data/src/share/classes/sun/security/util/Resources_it.java.i
 data/src/share/classes/javax/smartcardio/CardException.java.i
-data/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java.i
+data/src/share/classes/sun/nio/fs/DynamicFileAttributeView.java.i
 data/test/java/beans/XMLEncoder/java_util_Date.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithmSpi.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U8Func.c.i
@@ -17171,69 +17124,71 @@ data/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java
 data/test/java/beans/Introspector/memory/Bean4.java.i
 data/make/tools/swing-beans/beaninfo/images/JPasswordFieldMono16.gif.i
 data/src/windows/transport/socket/socket_md.c.i
+data/test/javax/imageio/CachePremissionsTest/w.policy.i
 data/test/java/lang/management/ThreadMXBean/SynchronizerDeadlock.java.i
-data/src/share/classes/sun/text/resources/CollationData_ko.java.i
+data/test/java/io/PipedInputStream/CloseAndAvailableRC.java.i
 data/src/share/native/java/lang/ref/Finalizer.c.i
 data/src/share/classes/java/nio/ByteOrder.java.i
-data/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java.i
+data/test/java/lang/Class/getMethod/NullInParamList.java.i
 data/test/java/util/zip/ZipFile/GetDirEntry.java.i
 data/src/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java.i
 data/test/java/util/Locale/serialized/java6locale_en.i
-data/make/com/sun/java/browser/Makefile.i
+data/test/sun/security/pkcs11/Provider/ConfigShortPath.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_el_CY.properties.i
-data/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java.i
+data/test/java/io/Serializable/class/SerialA_1.java.i
+data/test/java/util/zip/StreamIOAfterClose.java.i
 data/test/sun/tools/jstatd/jstatGcutilOutput1.awk.i
-data/src/share/native/sun/reflect/ConstantPool.c.i
+data/test/java/nio/file/WatchService/WithSecurityManager.java.i
 data/make/tools/swing-beans/beaninfo/images/JLabelMono16.gif.i
-data/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java.i
-data/make/sun/jawt/mapfile-vers.i
-data/test/javax/swing/text/WrappedPlainView/6857057/StubBranchElement.java.i
+data/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java.i
+data/test/javax/print/applet/applet3/Applet3PrintService.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedMap.java.i
-data/test/com/sun/net/httpserver/Test10.java.i
+data/src/share/classes/java/lang/Float.java.i
 data/src/share/native/sun/java2d/loops/Any3Byte.c.i
 data/src/share/classes/com/sun/rowset/FilteredRowSetImpl.java.i
-data/src/share/classes/sun/io/ByteToCharCp1147.java.i
+data/src/share/classes/sun/security/rsa/RSACore.java.i
 data/make/com/sun/jarsigner/Makefile.i
-data/src/solaris/bin/ergo_i586.c.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolTableMeta.java.i
-data/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.storePass.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/HttpsURLConnectionLocalCertificateChain.java.i
+data/src/share/demo/java2d/J2DBench/resources/images/photo.jpg.i
+data/src/share/classes/javax/crypto/CryptoAllPermission.java.i
+data/test/com/sun/net/httpserver/Test12.java.i
+data/src/share/classes/sun/text/resources/FormatData_hr_HR.java.i
 data/make/tools/swing-beans/beaninfo/images/JLayeredPaneMono16.gif.i
-data/test/sun/nio/cs/TestUni2HKSCS.java.i
+data/src/solaris/classes/sun/awt/X11/XWarningWindow.java.i
 data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java.i
 data/test/sun/tools/jrunscript/jrunscript-DTest.sh.i
 data/src/share/classes/sun/util/calendar/Era.java.i
 data/src/windows/native/sun/windows/awt_Robot.h.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java.i
+data/src/share/classes/com/sun/media/sound/SoftVoice.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java.i
 data/test/com/sun/net/httpserver/docs/test1/smallfile.txt.i
 data/test/java/rmi/activation/ActivationSystem/unregisterGroup/ActivateMe.java.i
 data/src/share/classes/java/lang/invoke/package-info.java.i
-data/make/tools/src/build/tools/javazic/RuleRec.java.i
+data/test/java/io/Externalizable/definesWriteObject/DefinesWriteObject.java.i
 data/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.i
-data/src/share/sample/scripting/scriptpad/src/scripts/textcolor.js.i
 data/src/share/native/sun/security/ec/ecl_gf.c.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleConfig.java.i
+data/test/java/lang/instrument/ExampleForClassPath.java.i
 data/src/share/classes/sun/tools/java/ArrayType.java.i
 data/src/share/classes/sun/util/resources/CalendarData_lv.properties.i
-data/test/java/awt/dnd/ImageDecoratedDnD/MyCursor.java.i
-data/src/windows/native/sun/windows/awt_Checkbox.cpp.i
+data/src/windows/classes/sun/awt/windows/awtLocalization_es.properties.i
+data/src/solaris/classes/sun/awt/X11/XWINProtocol.java.i
 data/src/windows/classes/sun/awt/Win32GraphicsDevice.java.i
 data/test/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java.i
 data/test/java/lang/Boolean/GetBoolean.java.i
 data/test/sun/security/tools/jarsigner/crl.sh.i
 data/src/share/classes/javax/management/InvalidApplicationException.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorTypeException.java.i
+data/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing_Stub.java.i
 data/src/share/classes/java/sql/Connection.java.i
 data/test/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeMetaImpl.java.i
 data/test/tools/pack200/SegmentLimit.java.i
 data/src/solaris/doc/sun/man/man1/xjc.1.i
-data/test/sun/security/ec/certs/sunlabscerts.pem.i
 data/test/sun/security/ssl/sun/net/www/httpstest/HttpServer.java.i
 data/src/share/classes/java/awt/geom/ArcIterator.java.i
-data/src/share/lib/images/cursors/motif_CopyDrop32x32.gif.i
+data/src/share/classes/sun/util/resources/CalendarData_pt.properties.i
+data/src/solaris/classes/com/sun/management/UnixOperatingSystem.java.i
 data/src/share/classes/sun/misc/JavaIOFileDescriptorAccess.java.i
-data/test/sun/java2d/cmm/ProfileOp/MTReadProfileTest.java.i
+data/src/share/sample/nio/file/DiskUsage.java.i
 data/make/sun/nio/FILES_java.gmk.i
 data/test/java/rmi/reliability/benchmark/bench/serial/LongArrays.java.i
 data/src/windows/classes/sun/misc/FileURLMapper.java.i
@@ -17241,56 +17196,55 @@ data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/RuntimeExceptionP
 data/src/share/classes/javax/swing/plaf/ComponentUI.java.i
 data/src/share/classes/sun/java2d/loops/ProcessPath.java.i
 data/test/sun/tools/jstat/classloadOutput1.awk.i
-data/src/share/classes/javax/print/attribute/standard/Sides.java.i
+data/src/share/native/sun/awt/image/jpeg/jdhuff.h.i
 data/test/sun/nio/cs/SurrogateTestEUCTW.plane15.surrogates.i
 data/src/share/classes/sun/util/resources/CalendarData_el.properties.i
 data/src/share/sample/nio/server/RequestHandler.java.i
 data/src/share/classes/javax/script/Bindings.java.i
-data/src/share/classes/sun/util/resources/CalendarData_en.properties.i
-data/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java.i
-data/src/windows/hpi/export/hpi_md.h.i
+data/test/java/nio/channels/Selector/OutOfBand.java.i
+data/test/javax/swing/RepaintManager/7013453/bug7013453.java.i
+data/test/java/io/Serializable/longString/LongString.java.i
 data/test/com/sun/crypto/provider/Cipher/AES/Test4512524.java.i
 data/test/com/sun/jdi/TestScaffold.java.i
-data/src/solaris/native/sun/awt/cursor.c.i
-data/src/solaris/classes/sun/nio/ch/NativeThread.java.i
-data/test/java/rmi/testlibrary/ActivationLibrary.java.i
+data/src/share/sample/vm/jvm-clr/invoker.h.i
+data/src/share/native/sun/awt/medialib/mlib_ImageFilters.h.i
+data/test/sun/security/ec/certs/sunlabscerts.pem.i
 data/test/java/nio/file/Files/delete_on_close.sh.i
 data/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java.i
 data/src/share/native/java/util/zip/zlib-1.2.3/compress.c.i
 data/test/java/util/TreeMap/SubMap.java.i
-data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java.i
+data/test/sun/security/x509/X500Name/AllAttribs.java.i
 data/test/sun/net/www/http/ChunkedOutputStream/Test.java.i
-data/src/share/classes/sun/rmi/transport/WeakRef.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM1046.java.i
-data/src/solaris/classes/sun/awt/X11/XKeySymConstants.java.i
-data/src/share/classes/javax/swing/text/html/ListView.java.i
-data/make/netbeans/common/share-sources.ent.i
-data/test/java/beans/PropertyChangeSupport/Test4985020.java.i
-data/test/java/security/cert/CertPath/Serialize.java.i
+data/src/windows/native/sun/windows/awt_DataTransferer.cpp.i
+data/test/java/awt/dnd/URIListBetweenJVMsTest/TargetFileListFrame.java.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/manifest.mf.i
+data/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java.i
+data/src/share/classes/sun/text/resources/FormatData_en.java.i
 data/test/javax/naming/ldap/LdapName/LdapNameConstruction.java.i
-data/src/share/classes/com/sun/media/sound/AuFileWriter.java.i
+data/src/share/classes/com/sun/crypto/provider/DESedeKey.java.i
 data/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java.i
 data/src/share/native/common/check_code.c.i
-data/test/java/net/DatagramSocketImpl/CheckDiscard.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java.i
+data/src/share/classes/javax/print/attribute/PrintServiceAttribute.java.i
+data/make/modules/bootmodule.roots.i
+data/src/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java.i
 data/src/share/classes/javax/swing/plaf/synth/ImagePainter.java.i
 data/src/share/classes/javax/swing/UnsupportedLookAndFeelException.java.i
 data/src/share/classes/javax/swing/plaf/PanelUI.java.i
-data/src/share/native/java/lang/Throwable.c.i
-data/src/share/classes/com/sun/tools/hat/internal/server/FinalizerSummaryQuery.java.i
+data/src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java.i
 data/test/sun/security/provider/PolicyParser/p004.policy.i
-data/src/share/classes/com/sun/nio/sctp/InvalidStreamException.java.i
+data/src/solaris/classes/sun/awt/X11/XMouseInfoPeer.java.i
 data/test/java/io/File/ToURL.java.i
-data/src/share/classes/javax/sound/midi/Sequence.java.i
+data/test/java/rmi/activation/ActivateFailedException/activateFails/group.security.policy.i
 data/src/share/native/sun/awt/medialib/mlib_ImageLookUp.h.i
 data/src/share/classes/com/sun/net/httpserver/Headers.java.i
 data/src/share/classes/javax/swing/undo/AbstractUndoableEdit.java.i
-data/test/java/nio/channels/Selector/SelectorTest.java.i
+data/src/share/classes/javax/swing/tree/TreeCellEditor.java.i
 data/src/share/classes/sun/security/krb5/internal/TicketFlags.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java.i
+data/src/share/classes/sun/tools/jinfo/JInfo.java.i
 data/src/share/classes/sun/tools/jstat/Closure.java.i
-data/src/share/classes/javax/swing/text/rtf/charsets/cpg850.txt.i
-data/src/share/native/sun/java2d/opengl/OGLPaints.c.i
+data/src/share/classes/sun/text/resources/FormatData_mk_MK.java.i
+data/src/share/classes/javax/print/attribute/standard/PagesPerMinute.java.i
 data/src/share/classes/java/awt/BasicStroke.java.i
 data/test/java/util/Collections/CheckedNull.java.i
 data/src/windows/classes/sun/print/Win32PrintService.java.i
@@ -17300,14 +17254,14 @@ data/src/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java.i
 data/src/share/classes/sun/tools/jconsole/inspector/Utils.java.i
 data/src/share/javavm/include/opcodes.weight.i
 data/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java.i
-data/src/share/classes/sun/tools/java/IdentifierToken.java.i
+data/src/share/classes/com/sun/jdi/Field.java.i
 data/src/solaris/classes/sun/font/NativeFont.java.i
-data/test/java/io/Serializable/defaulted/GetFieldWrite.java.i
-data/test/java/awt/Dialog/DialogOverflowSizeTest/DialogSizeOverflowTest.java.i
-data/src/share/native/sun/awt/image/dither.c.i
+data/test/java/nio/channels/FileChannel/Transfers.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java.i
+data/src/share/back/ObjectReferenceImpl.h.i
 data/src/share/classes/javax/print/attribute/standard/Severity.java.i
 data/make/tools/CharsetMapping/IBM277.c2b.i
-data/make/sun/text/FILES_properties.gmk.i
+data/test/javax/management/MBeanServer/DynamicWrapperMBeanTest.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_uk_UA.properties.i
 data/src/share/classes/java/awt/geom/GeneralPath.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicArrowButton.java.i
@@ -17315,46 +17269,50 @@ data/src/share/classes/javax/swing/plaf/synth/SynthListUI.java.i
 data/src/share/classes/java/net/SocketInputStream.java.i
 data/test/java/nio/file/FileSystem/Basic.java.i
 data/make/netbeans/jdwpgen/build.xml.i
-data/test/javax/crypto/Cipher/ByteBuffers.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java.i
+data/test/java/security/IdentityScope/NoDefaultSystemScope.java.i
 data/test/java/util/logging/LoggingDeadlock3.java.i
 data/src/share/native/java/util/zip/zlib-1.1.3/infcodes.c.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/iconify.gif.i
 data/src/share/native/sun/awt/medialib/mlib_ImageDivTables.h.i
+data/src/share/classes/com/sun/media/sound/AbstractMixer.java.i
 data/test/com/sun/tools/attach/agent.mf.i
 data/test/java/io/StreamTokenizer/Reset.java.i
-data/test/java/beans/EventHandler/Test6277246.java.i
+data/test/java/security/Provider/CertStoreConstructorParam.java.i
 data/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java.i
-data/src/share/demo/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml.i
+data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_CompoundBorderUIResource.java.i
 data/src/share/classes/sun/tools/jconsole/AboutDialog.java.i
-data/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html.i
+data/test/java/awt/Modal/LWModalTest/LWModalTest.java.i
 data/make/sun/javazic/tzdata/zone.tab.i
-data/src/solaris/native/sun/java2d/loops/vis_AlphaMacros.h.i
-data/src/share/native/sun/font/layout/GXLayoutEngine.cpp.i
-data/make/sun/image/vis/FILES_c.gmk.i
-data/src/solaris/native/java/lang/UNIXProcess_md.c.i
+data/test/java/net/SocketPermission/Equals.java.i
+data/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.java.i
+data/src/share/demo/jvmti/hprof/hprof_event.c.i
+data/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java.i
 data/test/javax/swing/JSlider/4987336/cupanim.gif.i
-data/src/share/classes/javax/swing/table/TableColumnModel.java.i
+data/test/java/security/Security/signedfirst/Static.sh.i
 data/src/share/classes/sun/swing/text/html/FrameEditorPaneTag.java.i
-data/test/java/nio/channels/Channels/ReadOffset.java.i
+data/src/share/classes/sun/security/jgss/LoginConfigImpl.java.i
+data/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java.i
 data/test/sun/security/pkcs11/nss/lib/linux-amd64/libnspr4.so.i
 data/src/share/native/sun/font/layout/SimpleArrayProcessor.h.i
 data/src/share/classes/sun/nio/cs/ext/IBM1141.java.i
-data/src/share/classes/sun/io/CharToByteCp1047.java.i
+data/test/java/util/AbstractList/CheckForComodification.java.i
 data/src/share/classes/sun/text/resources/CollationData_sl.java.i
 data/test/javax/xml/crypto/dsig/data/signature-enveloped-dsa.xml.i
 data/src/share/classes/sun/swing/PrintingStatus.java.i
-data/make/netbeans/README.i
+data/src/share/classes/javax/swing/plaf/MenuBarUI.java.i
+data/test/java/beans/Introspector/4520754/Foo.java.i
 data/test/javax/management/eventService/SubUnsubTest.java.i
 data/src/share/native/sun/awt/libpng/CHANGES.i
-data/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider.i
-data/src/share/classes/com/sun/tools/hat/internal/oql/OQLEngine.java.i
-data/src/share/classes/com/sun/jdi/InconsistentDebugInfoException.java.i
-data/test/java/nio/channels/FileChannel/Write.java.i
-data/src/share/demo/jvmti/hprof/hprof_reference.h.i
+data/src/share/classes/java/awt/event/AdjustmentListener.java.i
+data/src/share/classes/java/util/concurrent/CopyOnWriteArraySet.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Question.gif.i
+data/src/share/classes/com/sun/java/swing/SwingUtilities3.java.i
+data/test/com/sun/jdi/sde/FilterMangleTest.java.i
 data/test/java/net/URLClassLoader/sealing/b.jar.i
 data/test/java/nio/channels/DatagramChannel/SendToUnresolved.java.i
-data/src/share/native/java/lang/fdlibm/src/s_frexp.c.i
-data/src/share/native/sun/java2d/loops/AnyShort.h.i
+data/test/java/awt/Modal/SupportedTest/SupportedTest.java.i
+data/test/java/net/DatagramSocket/ChangingAddress.java.i
 data/test/sun/net/www/protocol/jar/jarbug/src/jar1/LoadResourceBundle.java.i
 data/make/javax/imageio/Makefile.i
 data/src/share/classes/sun/tools/java/MethodType.java.i
@@ -17366,57 +17324,57 @@ data/test/java/util/PluggableLocale/NumberFormatProviderTest.sh.i
 data/src/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties.i
 data/src/share/classes/com/sun/crypto/provider/ARCFOURCipher.java.i
 data/src/share/classes/sun/font/FontStrikeDesc.java.i
-data/src/share/classes/com/sun/media/sound/Printer.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/LongCalls.java.i
-data/src/share/classes/javax/swing/plaf/DesktopPaneUI.java.i
+data/src/share/classes/javax/management/BinaryRelQueryExp.java.i
+data/test/sun/security/provider/PolicyFile/getinstance/GetInstance.policy.i
+data/src/share/classes/com/sun/jmx/event/ReceiverBuffer.java.i
 data/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java.i
 data/src/share/classes/javax/management/relation/Relation.java.i
 data/src/share/classes/sun/reflect/ConstantPool.java.i
 data/src/share/classes/sun/io/ByteToCharCp1025.java.i
-data/test/org/openjdk/jigsaw/cli/keystore.pw.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java.i
-data/test/java/lang/String/Supplementary.java.i
+data/make/tools/swing-beans/beaninfo/images/JScrollPaneColor32.gif.i
+data/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java.i
+data/src/share/native/java/lang/fdlibm/src/w_remainder.c.i
 data/src/windows/resource/unpack200_proto.exe.manifest.i
 data/src/share/classes/org/openjdk/jigsaw/ModuleFileVerifier.java.i
+data/src/share/classes/sun/security/rsa/RSAKeyPairGenerator.java.i
 data/test/javax/crypto/JceSecurity/SunJCE_BC_LoadOrdering.java.i
 data/test/java/rmi/activation/Activatable/restartService/group.security.policy.i
 data/src/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java.i
 data/test/java/util/logging/RacingThreadsTest.java.i
 data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init2.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java.i
+data/src/share/classes/javax/swing/plaf/basic/icons/image-delayed.png.i
 data/src/windows/classes/sun/awt/windows/WLabelPeer.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostInform.java.i
 data/test/java/security/cert/PolicyNode/speech2speech.i
 data/test/java/lang/management/MemoryMXBean/LowMemoryTestParallelGC.sh.i
 data/test/java/io/Serializable/enum/badResolve/Write.java.i
-data/src/share/classes/javax/script/Invocable.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownMsgProcModelException.java.i
+data/src/share/classes/sun/io/CharToByteCp930.java.i
+data/src/share/classes/sun/reflect/SignatureIterator.java.i
 data/src/solaris/hpi/src/memory_md.c.i
 data/src/share/classes/java/security/interfaces/ECKey.java.i
-data/src/share/classes/javax/management/monitor/StringMonitor.java.i
-data/test/java/lang/Compare.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpInt.java.i
 data/test/java/util/zip/ZipFile/Comment.java.i
-data/src/solaris/lib/flavormap.properties.i
+data/src/share/classes/sun/text/IntHashtable.java.i
+data/src/share/classes/java/sql/Statement.java.i
 data/src/share/classes/org/openjdk/jigsaw/Catalog.java.i
 data/test/java/rmi/server/RMIClassLoader/noSecurityManager/Dummy.java.i
 data/src/share/classes/sun/security/x509/SubjectInfoAccessExtension.java.i
-data/test/javax/imageio/EmptyFileTest.java.i
+data/src/share/native/sun/security/ec/impl/ec2.h.i
 data/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java.i
-data/src/share/classes/java/awt/event/ComponentEvent.java.i
+data/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java.i
-data/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp.i
+data/make/sun/security/jgss/Makefile.i
 data/test/com/sun/net/httpserver/docs/test1/largefile.txt.i
 data/src/share/classes/sun/nio/cs/ext/JIS_X_0201.java.i
 data/make/com/sun/jmx/snmp/Makefile.i
-data/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so.i
-data/src/share/classes/java/lang/management/MemoryPoolMXBean.java.i
+data/src/share/classes/javax/print/CancelablePrintJob.java.i
 data/src/share/classes/java/security/UnresolvedPermissionCollection.java.i
-data/test/com/sun/security/sasl/digest/AuthRealms.java.i
-data/src/share/classes/java/dyn/AdapterMethodHandle.java.i
+data/test/sun/security/provider/PolicyParser/ExtDirsA/a.jar.i
+data/test/com/sun/tools/attach/badagent.mf.i
 data/test/java/net/MulticastSocket/MulticastAddresses.java.i
 data/src/share/classes/com/sun/jmx/snmp/internal/SnmpDecryptedPdu.java.i
 data/src/share/classes/java/beans/Visibility.java.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTest.java.i
+data/test/com/sun/jdi/sde/TemperatureTable.jsp.i
 data/src/share/classes/sun/io/ByteToCharCp1026.java.i
 data/make/modules/optional.depconfig.i
 data/test/javax/management/MBeanServer/AttributeListMapTest.java.i
@@ -17426,9 +17384,10 @@ data/src/share/demo/jfc/CodePointIM/resources/codepoint.properties.i
 data/src/share/classes/sun/util/resources/TimeZoneNames_it.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java.i
 data/test/java/io/Serializable/maskSyntheticModifier/Foo.class.i
-data/src/share/classes/sun/net/NetworkClient.java.i
+data/src/share/classes/java/net/DatagramSocket.java.i
 data/src/share/classes/java/sql/SQLWarning.java.i
-data/src/solaris/doc/sun/man/man1/ja/jhat.1.i
+data/src/share/native/sun/security/ec/impl/ecp.h.i
+data/test/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl_Stub.java.i
 data/test/sun/nio/cs/TestCp93xSISO.java.i
 data/src/share/classes/java/awt/dnd/DragSourceDragEvent.java.i
 data/src/share/classes/sun/tools/jar/resources/jar_es.properties.i
@@ -17436,7 +17395,7 @@ data/test/java/lang/management/ManagementFactory/MXBeanException.java.i
 data/src/share/classes/javax/swing/text/html/parser/Parser.java.i
 data/src/solaris/classes/sun/java2d/xr/XRVolatileSurfaceManager.java.i
 data/src/share/classes/java/awt/LayoutManager2.java.i
-data/test/java/rmi/activation/Activatable/createPrivateActivable/group.security.policy.i
+data/test/java/awt/Mixing/MixingInHwPanel.java.i
 data/src/solaris/sample/dtrace/hotspot/monitors.d.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunity.java.i
 data/test/java/net/URLEncoder/SurrogatePairs.java.i
@@ -17444,46 +17403,44 @@ data/src/share/classes/java/io/FileInputStream.java.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC.c.i
 data/src/share/classes/java/util/InvalidPropertiesFormatException.java.i
 data/src/share/classes/sun/jkernel/DigestOutputStream.java.i
-data/src/share/classes/com/sun/media/sound/AbstractMixer.java.i
+data/test/java/net/MulticastSocket/Leave.java.i
 data/src/share/classes/javax/naming/InsufficientResourcesException.java.i
 data/test/java/io/charStreams/LineNumbers.java.i
 data/test/java/util/ResourceBundle/Test4314141B_en.properties.i
 data/src/share/demo/nbproject/jfc/TableExample/nbproject/jdk.xml.i
-data/src/share/classes/sun/swing/plaf/synth/SynthUI.java.i
-data/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java.i
-data/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp.i
+data/test/sun/management/jmxremote/bootstrap/management_ssltest10_ok.properties.in.i
+data/src/share/classes/java/awt/image/BufferedImage.java.i
+data/test/com/sun/crypto/provider/KeyAgreement/DHKeyFactory.java.i
 data/test/java/util/PluggableLocale/DateFormatProviderTest.java.i
 data/test/java/util/BitSet/BSMethods.java.i
 data/src/share/demo/applets/MoleculeViewer/XYZApp.java.i
 data/test/java/util/zip/FileBuilder.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMNetMask.java.i
-data/src/share/classes/javax/swing/border/EtchedBorder.java.i
+data/src/share/classes/javax/swing/text/AsyncBoxView.java.i
 data/src/share/classes/com/sun/tracing/dtrace/package-info.java.i
-data/src/share/native/sun/font/layout/LigatureSubstProc.cpp.i
+data/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive_Stub.java.i
 data/test/java/util/ResourceBundle/Control/XMLResourceBundleTest.java.i
 data/src/solaris/bin/sparcv9/jvm.cfg.i
 data/test/java/awt/geom/Path2D/FillPPathTest.java.i
-data/make/tools/CharsetMapping/IBM970.c2b.i
-data/src/windows/native/sun/windows/awt_PrintDialog.cpp.i
-data/src/share/classes/javax/crypto/CryptoAllPermission.java.i
+data/src/share/native/java/util/zip/zip_util.c.i
+data/test/java/nio/channels/FileChannel/MapTest.java.i
 data/src/share/classes/sun/io/CharToByteMS932DB.java.i
-data/src/share/classes/javax/naming/NamingException.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedList.java.i
+data/src/share/classes/java/util/ListIterator.java.i
+data/src/share/classes/java/awt/Adjustable.java.i
 data/test/com/sun/nio/sctp/SctpChannel/Bind.java.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/AdobeMarkerSegment.java.i
 data/src/share/npt/npt.c.i
-data/src/share/native/sun/font/layout/CanonShaping.h.i
-data/src/share/classes/javax/security/sasl/package.html.i
-data/test/javax/print/applet/applet4/Applet4PrintServiceLookup.java.i
-data/src/share/classes/java/util/zip/CRC32.java.i
+data/test/com/sun/jdi/PrivateTransportTest.sh.i
+data/test/java/util/Formatter/Basic.sh.i
+data/src/share/classes/sun/nio/cs/ext/GB18030.java.i
 data/test/java/lang/management/CompositeData/OpenTypeConverter.java.i
 data/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so.i
 data/src/share/classes/sun/nio/cs/MS1253.java.i
 data/src/share/classes/com/sun/tools/hat/internal/server/ReachableQuery.java.i
-data/src/share/demo/jvmti/agent_util/agent_util.c.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java.i
+data/src/share/classes/javax/management/MalformedObjectNameException.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java.i
 data/src/share/classes/sun/nio/cs/ext/GB18030.java.d
-data/src/share/classes/com/sun/jmx/event/LeaseManager.java.i
+data/test/java/util/jar/JarFile/MevNPE.java.i
 data/src/share/classes/sun/text/UCompactIntArray.java.i
 data/test/sun/security/tools/policytool/Alias.html.i
 data/src/share/native/java/lang/fdlibm/src/e_pow.c.i
@@ -17491,398 +17448,405 @@ data/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java.i
 data/src/solaris/doc/sun/man/man1/ja/pack200.1.i
 data/src/share/classes/sun/applet/AppletEventMulticaster.java.i
 data/test/java/util/ResourceBundle/Bug4168625Test.java.i
-data/src/share/classes/sun/font/FontScaler.java.i
+data/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java.i
 data/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java.i
 data/src/share/classes/sun/text/resources/CollationData_lt.java.i
-data/src/share/classes/javax/swing/event/DocumentListener.java.i
+data/test/org/openjdk/jigsaw/cli/jmod-basic.sh.i
 data/src/share/classes/com/sun/net/ssl/HostnameVerifier.java.i
 data/src/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java.i
-data/src/share/classes/sun/security/x509/CertificateSerialNumber.java.i
-data/test/javax/script/Helper.java.i
+data/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh.i
+data/src/share/classes/sun/io/ByteToCharCp852.java.i
 data/src/share/classes/sun/nio/cs/ext/MS950_HKSCS.java.i
-data/src/share/classes/java/awt/event/ActionEvent.java.i
-data/test/java/net/MulticastSocket/Test.java.i
-data/test/java/lang/ProcessBuilder/Basic.java.i
+data/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java.i
+data/src/share/native/sun/awt/medialib/mlib_status.h.i
+data/src/share/classes/sun/io/ByteToCharCp1046.java.i
+data/src/share/classes/org/openjdk/jigsaw/BaseContext.java.i
 data/src/share/classes/javax/sql/rowset/serial/SerialClob.java.i
 data/src/share/classes/com/sun/imageio/plugins/png/RowFilter.java.i
 data/test/javax/swing/JFileChooser/6570445/bug6570445.java.i
 data/src/share/native/java/lang/fdlibm/src/s_floor.c.i
 data/test/java/nio/channels/FileChannel/ExpandingMap.java.i
 data/src/windows/native/sun/windows/awt_AWTEvent.h.i
-data/src/share/classes/java/util/spi/LocaleServiceProvider.java.i
+data/src/share/classes/sun/util/resources/CalendarData_iw.properties.i
 data/test/java/util/ResourceBundle/Bug6204853.properties.i
-data/src/share/classes/sun/io/CharToByteMacRomania.java.i
+data/src/share/classes/sun/rmi/server/Dispatcher.java.i
 data/make/java/hpi/native/Makefile.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvClearEdge.c.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java.i
 data/src/windows/classes/sun/nio/fs/WindowsPath.java.i
 data/src/share/instrument/InvocationAdapter.c.i
 data/src/share/classes/java/nio/Direct-X-Buffer-bin.java.i
 data/test/javax/swing/text/LayoutQueue/Test6588003.java.i
 data/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldColor16.gif.i
-data/src/share/classes/sun/management/resources/agent_it.properties.i
+data/test/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java.i
 data/src/share/classes/sun/net/ProgressMeteringPolicy.java.i
 data/test/sun/tools/jinfo/Basic.sh.i
-data/src/share/classes/sun/rmi/server/ActivatableServerRef.java.i
+data/src/share/classes/sun/java2d/pipe/SpanClipRenderer.java.i
 data/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/DisplayModeChanger.java.i
 data/test/com/sun/security/auth/login/ConfigFile/Override.java.i
 data/src/windows/native/sun/windows/awt_TextField.cpp.i
 data/test/sun/tools/native2ascii/A2N_4701617.i
-data/src/share/native/sun/font/layout/KhmerReordering.cpp.i
+data/src/solaris/demo/jigsaw/basic/setup.sh.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java.i
 data/test/javax/management/MustBeValidMBeanInfo/logging.properties.i
 data/src/share/classes/sun/rmi/server/MarshalOutputStream.java.i
-data/src/share/classes/sun/io/ByteToCharCp33722.java.i
+data/test/java/io/FilterOutputStream/BoundsCheck.java.i
 data/test/sun/net/www/http/ChunkedInputStream/test.txt.i
 data/make/netbeans/jdwpgen/nbproject/project.xml.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/metacity/SwingFallbackTheme/metacity-1/metacity-theme-1.xml.i
 data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java.i
+data/src/share/classes/java/util/spi/LocaleNameProvider.java.i
 data/test/java/awt/Window/PropertyChangeListenerLockSerialization/PropertyChangeListenerLockSerialization.java.i
+data/test/java/io/Serializable/evolution/RenamePackage/test/SerialDriver.java.i
 data/src/share/classes/java/nio/charset/Charset-X-Coder.java.template.i
 data/test/sun/net/www/protocol/jar/jarbug/src/test/TestBug4523159.java.i
-data/src/share/demo/jvmti/hprof/hprof_ioname.h.i
+data/test/sun/net/www/http/ChunkedInputStream/test.txt.d
 data/test/java/beans/XMLEncoder/Test6437265.java.i
-data/make/tools/CharsetMapping/ISO_8859_2.map.i
+data/make/netbeans/jdwpgen/nbproject/sqe.properties.i
 data/src/share/classes/sun/awt/image/JPEGImageDecoder.java.i
 data/test/sun/security/tools/jarsigner/JarSigning_RU.jar.i
-data/src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java.i
+data/src/share/native/sun/font/layout/MorphStateTables.h.i
 data/test/javax/xml/crypto/dsig/data/signature-enveloping-dsa.xml.i
 data/src/share/classes/java/awt/font/StyledParagraph.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U8Func.c.i
-data/test/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java.i
+data/test/java/rmi/reliability/juicer/Apple.java.i
 data/make/tools/CharsetMapping/IBM273.map.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java.i
-data/make/sun/javazic/tzdata/systemv.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java.i
+data/test/com/sun/jdi/connect/spi/GeneratedConnectors.java.i
 data/src/share/sample/nio/multicast/Sender.java.i
 data/test/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java.i
 data/src/windows/classes/sun/awt/windows/WPrinterJob.java.i
 data/test/sun/security/pkcs11/KeyStore/BasicData/pkcs11_softtoken/objstore_info.i
 data/make/tools/CharsetMapping/IBM297.nr.i
-data/src/solaris/classes/sun/awt/motif/MInputMethodDescriptor.java.i
+data/test/java/text/Collator/Bug5047314.java.i
 data/src/share/classes/sun/security/krb5/internal/EncASRepPart.java.i
 data/test/java/util/ResourceBundle/Bug4195978Test.java.i
-data/src/share/classes/sun/security/pkcs10/PKCS10Attribute.java.i
-data/test/javax/swing/border/Test4124729.java.i
-data/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html.i
-data/src/share/classes/java/nio/channels/ScatteringByteChannel.java.i
-data/src/share/classes/java/net/CookieStore.java.i
+data/src/share/native/sun/awt/libpng/pngtest.c.i
+data/test/java/math/BigDecimal/StrippingZerosTest.java.i
+data/src/share/native/sun/font/layout/ICUFeatures.h.i
+data/test/java/util/Collections/Enum.java.i
+data/src/solaris/classes/sun/awt/motif/X11Selection.java.i
 data/make/jpda/jdwp/jdwp.spec.i
 data/test/java/lang/annotation/PackageMain.java.i
 data/test/tools/jar/index/jarcontents/META-INF/services/A.i
-data/src/share/classes/sun/io/ByteToCharSJIS.java.i
+data/test/java/lang/instrument/PremainClass/InheritAgent0101.java.i
 data/src/solaris/doc/sun/man/man1/serialver.1.i
 data/src/share/classes/javax/swing/text/html/TableView.java.i
-data/test/java/rmi/testlibrary/RMID.java.i
-data/src/share/native/sun/security/ec/ecl-exp.h.i
+data/src/share/classes/sun/tools/jconsole/OverviewTab.java.i
+data/src/share/classes/java/rmi/server/ObjID.java.i
 data/src/share/classes/sun/util/locale/ParseStatus.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java.i
 data/test/javax/xml/crypto/dsig/data/signature-x509-ski.xml.i
+data/src/share/native/com/sun/media/sound/DirectAudioDevice.c.i
 data/src/share/classes/sun/util/resources/LocaleNames_ja.properties.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/PainterGenerator.java.i
+data/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java.i
 data/test/sun/util/resources/Locale/Bug4429024.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthContext.java.i
+data/src/solaris/classes/sun/awt/motif/MDragSourceContextPeer.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java.i
 data/test/sun/management/jmxremote/bootstrap/management_test02_ok.properties.in.i
 data/src/share/classes/java/text/ParsePosition.java.i
-data/test/sun/security/validator/certreplace.sh.i
+data/test/java/beans/PropertyEditor/Test4968709.java.i
 data/test/com/sun/tools/attach/BasicTests.java.i
 data/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.java.i
-data/make/com/sun/org/Makefile.i
-data/src/solaris/doc/sun/man/man1/ja/jstatd.1.i
-data/make/jdk_generic_profile.sh.i
-data/src/share/classes/com/sun/rowset/providers/RIXMLProvider.java.i
-data/test/java/lang/ThreadGroup/Suspend.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java.i
+data/src/share/classes/javax/swing/ListCellRenderer.java.i
+data/make/java/main/java/Makefile.i
+data/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java.i
 data/src/share/classes/java/security/CodeSource.java.i
 data/test/sun/security/pkcs11/fips/JSSEServer.java.i
 data/test/java/rmi/server/Unmarshal/PrimitiveClasses.java.i
 data/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java.i
-data/src/share/classes/sun/font/CMap.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_hr.properties.i
 data/make/tools/swing-beans/beaninfo/images/JSpinnerColor16.gif.i
-data/src/share/classes/sun/misc/BASE64Encoder.java.i
+data/src/share/classes/sun/net/httpserver/ServerImpl.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so.i
 data/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java.i
-data/src/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java.i
+data/src/solaris/native/sun/awt/awt_ScrollPane.c.i
 data/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh.i
-data/test/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html.i
-data/src/share/classes/com/sun/java/browser/dom/DOMService.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so.d
 data/src/share/classes/sun/text/resources/FormatData_sl_SI.java.i
 data/test/java/lang/instrument/RedefineClassWithNativeMethodAgent.java.i
 data/src/share/classes/java/nio/channels/SocketChannel.java.i
-data/src/share/classes/javax/swing/FocusManager.java.i
+data/test/java/beans/PropertyEditor/TestByteTypeJava.java.i
 data/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java.i
-data/test/java/lang/ref/ReferenceEnqueue.java.i
+data/test/sun/nio/cs/EuroConverter.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_CheckedSortedSet.java.i
 data/test/sun/tools/jrunscript/common.sh.i
 data/test/sun/tools/jstat/gcCapacityOutput1.awk.i
 data/src/share/classes/sun/io/ByteToCharCp871.java.i
-data/src/share/classes/com/sun/jmx/interceptor/DispatchInterceptor.java.i
+data/test/javax/management/eventService/ReconnectableConnectorTest.java.i
 data/src/share/classes/javax/management/event/RMIPushServer.java.i
-data/test/java/awt/print/PrinterJob/GetMediasTest.java.i
+data/test/com/sun/jdi/TargetListener.java.i
 data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshall.java.i
 data/test/java/awt/image/IncorrectSampleMaskTest.java.i
 data/make/modules/tools/src/com/sun/classanalyzer/ShowDeps.java.i
-data/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java.i
+data/test/java/awt/Graphics2D/DrawString/RotTransText.java.i
 data/test/javax/management/namespace/Wombat.java.i
 data/src/share/classes/sun/security/provider/DSAKeyPairGenerator.java.i
 data/test/java/io/Serializable/resolveClass/consTest/Test.java.i
 data/test/sun/security/provider/PolicyParser/ExtDirs3.policy.i
 data/test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy.i
-data/src/share/classes/sun/util/resources/CurrencyNames_sr_ME.properties.i
+data/src/share/native/java/lang/Shutdown.c.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java.i
 data/src/share/classes/sun/nio/ch/ExtendedSocketOption.java.i
 data/test/java/util/Observable/ClearChanged.java.i
-data/src/solaris/doc/sun/man/man1/ja/jvisualvm.1.i
+data/test/javax/swing/text/WrappedPlainView/6857057/StubBranchElement.java.i
 data/test/java/util/NavigableMap/LockStep.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_F32.c.i
-data/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties.i
+data/test/sun/util/calendar/Bug6653944.java.i
+data/src/share/classes/java/io/ByteArrayInputStream.java.i
 data/test/java/security/cert/CertPathBuilder/NoExtensions.java.i
 data/test/java/util/ServiceLoader/basic.sh.i
-data/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java.i
+data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties.i
 data/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java.i
-data/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c.i
+data/test/java/net/URLClassLoader/B6896088.java.i
+data/src/share/classes/sun/io/ByteToCharCp277.java.i
 data/src/share/classes/javax/sound/midi/SysexMessage.java.i
 data/make/tools/swing-beans/beaninfo/images/JScrollBarColor16.gif.i
-data/src/share/classes/com/sun/tools/jdi/SocketTransportService.java.i
+data/make/tools/CharsetMapping/IBM420.map.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libsoftokn3.so.i
-data/test/sun/security/provider/KeyStore/CaseSensitiveAliases.java.i
+data/src/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java.i
 data/test/com/sun/jdi/UnloadEventTarg.java.i
-data/src/share/classes/java/security/URIParameter.java.i
+data/src/share/classes/com/sun/rowset/CachedRowSetImpl.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java.i
-data/test/java/security/cert/CertPathValidatorException/GetMessage.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthArrowButton.java.i
-data/src/share/classes/javax/accessibility/AccessibleStreamable.java.i
-data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java.i
-data/src/share/classes/javax/management/remote/rmi/RMIConnection.java.i
+data/src/solaris/doc/sun/man/man1/ja/apt.1.i
+data/src/windows/native/sun/windows/awt_Frame.h.i
+data/src/share/classes/java/io/ObjectInput.java.i
+data/test/javax/management/eventService/EventClientExecutorTest.java.i
+data/src/solaris/native/sun/awt/awt_Window.h.i
 data/src/share/classes/sun/security/jgss/spi/GSSContextSpi.java.i
+data/src/share/classes/com/sun/jmx/namespace/package.html.i
 data/src/share/native/java/util/zip/zlib-1.2.3/gzio.c.i
-data/src/share/classes/sun/tools/jconsole/inspector/OperationEntry.java.i
 data/test/sun/net/www/httptest/HttpCallback.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalBorders.java.i
+data/test/java/text/Format/DateFormat/ISO8601ZoneTest.java.i
 data/src/share/classes/javax/accessibility/AccessibleRelationSet.java.i
-data/src/share/classes/sun/tools/tree/NewInstanceExpression.java.i
+data/src/windows/classes/sun/java2d/windows/Win32OffScreenSurfaceData.java.i
 data/src/share/classes/sun/awt/image/URLImageSource.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableCollection.java.i
-data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java.i
+data/test/java/net/InetSocketAddress/CreateUnresolved.java.i
 data/src/share/native/sun/java2d/loops/IntBgr.h.i
 data/test/java/awt/PrintJob/SaveDialogTitleTest.java.i
 data/src/share/classes/java/security/KeyException.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/RadialGradient.java.i
-data/make/sun/security/action/Makefile.i
+data/test/java/io/Serializable/GetField/Read2.java.i
+data/test/java/awt/Cursor/PredefinedPrivate/PredefinedPrivate.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ar_LY.properties.i
 data/test/java/nio/Buffer/BasicDouble.java.i
 data/test/sun/java2d/cmm/ColorConvertOp/MTColConvTest.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java.i
+data/src/share/demo/applets/SortDemo/BubbleSortAlgorithm.java.i
 data/test/java/lang/instrument/NativeMethodPrefixApp.java.i
-data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java.i
+data/src/share/classes/javax/management/modelmbean/package.html.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpMessage.java.i
 data/src/share/classes/javax/swing/colorchooser/package.html.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGBuffer.java.i
+data/test/javax/management/eventService/CustomForwarderTest.java.i
+data/src/share/classes/javax/naming/TimeLimitExceededException.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHostServer.java.i
-data/src/share/classes/sun/tools/jstack/JStack.java.i
+data/src/share/classes/com/sun/jndi/ldap/Ber.java.i
 data/src/solaris/classes/sun/nio/ch/InheritedChannel.java.i
 data/test/java/io/BufferedInputStream/Fill.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/etsi.xsd.i
 data/test/sun/util/logging/PlatformLoggerTest.java.i
 data/src/share/classes/sun/awt/HKSCS.java.i
 data/test/sun/security/pkcs11/KeyStore/BasicData/pk1.key.i
-data/src/share/classes/com/sun/tools/jdi/JNITypeParser.java.i
-data/make/tools/CharsetMapping/MS936.map.d
+data/src/share/classes/java/awt/Frame.java.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest13_ok.ssl.in.i
 data/test/com/sun/jdi/ClassesByName.java.i
-data/test/sun/security/pkcs11/fips/certs/ca.cer.i
+data/test/java/awt/image/ImagingOpsNoExceptionsTest/ImagingOpsNoExceptionsTest.java.i
 data/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h.i
 data/src/share/classes/java/sql/SQLNonTransientException.java.i
-data/src/share/classes/sun/util/logging/resources/logging_sv.properties.i
-data/src/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java.i
+data/test/java/rmi/transport/readTimeout/ReadTimeoutTest.java.i
+data/src/share/classes/sun/java2d/pipe/BufferedTextPipe.java.i
 data/test/java/beans/XMLEncoder/java_lang_reflect_Field.java.i
-data/test/sun/awt/image/DrawByteBinary.java.i
-data/src/share/classes/java/sql/ClientInfoStatus.java.i
+data/src/share/classes/javax/sound/midi/MetaMessage.java.i
+data/test/tools/pack200/T7007157.java.i
+data/src/share/classes/sun/security/krb5/internal/Authenticator.java.i
 data/src/share/classes/sun/security/krb5/internal/crypto/Des3.java.i
 data/src/solaris/classes/sun/awt/X11/XScrollbar.java.i
-data/make/tools/CharsetMapping/IBM1025.c2b.i
-data/test/javax/swing/JFileChooser/6688203/bug6688203.java.i
+data/src/share/classes/sun/rmi/server/Util.java.i
 data/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatch.java.i
 data/src/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java.i
-data/src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java.i
+data/test/java/util/ResourceBundle/Control/PackagePrivateTest.java.i
 data/test/sun/text/resources/Format/Bug4442855.java.i
 data/test/sun/nio/cs/ReadZero.java.i
-data/test/sun/security/tools/policytool/ChangeUI.java.i
+data/src/share/classes/java/nio/file/attribute/FileTime.java.i
 data/src/share/classes/java/net/UnknownServiceException.java.i
 data/src/share/classes/java/beans/beancontext/package.html.i
 data/src/share/native/java/lang/fdlibm/src/k_tan.c.i
 data/test/java/util/Currency/Bug6807534.java.i
 data/test/java/lang/ClassLoader/package1/package3/Class3.java.i
-data/test/javax/swing/JTable/6735286/bug6735286.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageAffineEdge.c.i
+data/src/share/classes/java/awt/event/TextEvent.java.i
+data/make/netbeans/jdwpgen/nbproject/project.properties.i
 data/src/share/classes/java/lang/SecurityException.java.i
-data/src/share/modules/jdk.awt/module-info.java.i
+data/test/java/rmi/reliability/benchmark/bench/serial/Chars.java.i
 data/src/share/classes/sun/nio/cs/ISO_8859_5.java.i
-data/make/java/main/java/mapfile-sparc.i
+data/test/sun/security/ssl/sanity/pluggability/MySSLEngineImpl.java.i
 data/make/com/sun/security/auth/module/FILES_c_solaris.gmk.i
 data/src/share/classes/java/util/logging/StreamHandler.java.i
-data/src/share/classes/java/lang/IllegalThreadStateException.java.i
 data/src/share/classes/javax/security/auth/callback/Callback.java.i
 data/make/tools/CharsetMapping/IBM284.nr.i
-data/src/share/demo/scripting/jconsole-plugin/src/scripts/hello.js.i
-data/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java.i
+data/src/share/classes/javax/sound/sampled/spi/MixerProvider.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM964.java.i
 data/src/solaris/native/sun/awt/awt_Plugin.c.i
 data/src/share/classes/sun/applet/resources/MsgAppletViewer_ko.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariTables.java.i
+data/src/windows/classes/sun/nio/fs/WindowsException.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties.i
-data/make/sun/font/Makefile.i
-data/src/share/classes/sun/tools/asm/Assembler.java.i
-data/test/sun/security/tools/jarsigner/ec.sh.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/package.html.i
+data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java.i
+data/test/java/dyn/InvokeGenericTest.java.i
+data/src/share/classes/javax/imageio/IIOParam.java.i
 data/src/share/classes/sun/nio/cs/ext/ISO_8859_6.java.i
-data/src/share/native/java/lang/fdlibm/src/w_remainder.c.i
-data/src/share/classes/sun/java2d/StateTrackableDelegate.java.i
+data/test/java/lang/invoke/InvokeDynamicPrintArgs.java.i
+data/test/java/util/Locale/bug4123285.html.i
 data/test/java/beans/XMLEncoder/6777487/TestCheckedMap.java.i
 data/src/share/classes/javax/swing/undo/UndoManager.java.i
-data/make/java/jli/Makefile.i
+data/src/share/classes/sun/security/krb5/internal/HostAddress.java.i
 data/src/solaris/classes/sun/java2d/xr/GrowableEltArray.java.i
 data/test/java/io/File/createTempFile/Patterns.java.i
-data/test/java/util/logging/LoggingDeadlock4.java.i
+data/src/share/classes/sun/util/calendar/CalendarSystem.java.i
 data/src/share/demo/jvmti/minst/README.txt.i
 data/src/share/classes/java/awt/image/ImageConsumer.java.i
 data/make/sun/net/FILES_java.gmk.i
 data/src/share/classes/javax/management/InstanceNotFoundException.java.i
 data/make/tools/CharsetMapping/IBM1146.c2b.i
-data/src/share/native/sun/java2d/opengl/OGLBufImgOps.c.i
+data/test/sun/java2d/cmm/ProfileOp/MTReadProfileTest.java.i
 data/src/share/classes/sun/nio/cs/UTF_16.java.i
-data/test/java/util/ResourceBundle/Control/StressOut_ja_JP.properties.i
-data/src/share/classes/java/beans/MetaData.java.i
+data/src/share/classes/java/util/zip/ZipInputStream.java.i
+data/test/java/net/Socket/TrafficClass.java.i
 data/make/tools/swing-beans/beaninfo/images/JPopupMenuMono32.gif.i
 data/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java.i
 data/src/share/demo/applets.html.i
 data/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties.i
-data/test/java/util/PluggableLocale/providersrc/java.util.spi.CurrencyNameProvider.i
+data/test/java/lang/instrument/NoTransformerAddedTest.java.i
 data/src/share/classes/sun/text/resources/FormatData_hr.java.i
+data/src/share/classes/java/lang/reflect/TypeVariable.java.i
 data/src/share/demo/jfc/Font2DTest/resources/TextResources_ja.properties.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunities.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpFunc.h.i
 data/src/share/classes/java/util/jar/package.html.i
-data/src/share/classes/java/awt/geom/package.html.i
 data/test/java/util/ResourceBundle/Bug4177489Test.java.i
-data/test/sun/security/ssl/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java.i
+data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/VerifyTreeSet.java.i
 data/src/share/classes/sun/security/rsa/RSAPublicKeyImpl.java.i
 data/test/sun/security/pkcs11/ec/ReadCertificates.java.i
 data/test/javax/xml/crypto/dsig/data/certs/xmldsig.jks.i
+data/src/share/demo/jvmti/minst/sample.makefile.txt.i
 data/src/windows/back/mutex_md.h.i
 data/src/windows/native/sun/windows/awt_PrintControl.h.i
 data/src/share/classes/java/util/logging/package.html.i
 data/make/tools/CharsetMapping/JIS_X_0201.map.i
-data/test/java/lang/instrument/PremainClass/InheritAgent1011.java.i
-data/test/sun/tools/jstat/lineCounts4.awk.i
+data/src/share/classes/javax/swing/plaf/TextUI.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_RS.properties.i
 data/test/java/beans/PropertyEditor/TestEnumSubclassNull.java.i
-data/src/share/native/sun/java2d/loops/DrawParallelogram.c.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/ObjArrayCalls.java.i
+data/test/java/lang/Throwable/SuppressedExceptions.java.i
+data/src/share/classes/sun/nio/cs/ext/ISO2022_JP.java.i
 data/test/com/sun/tools/attach/Application.java.i
 data/src/share/classes/sun/rmi/transport/DGCAckHandler.java.i
 data/src/share/classes/com/sun/inputmethods/internal/indicim/IndicInputMethod.java.i
 data/src/share/native/sun/management/MemoryImpl.c.i
 data/src/share/classes/java/util/Set.java.i
 data/src/share/native/sun/awt/image/jpeg/jmemmgr.c.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java.i
-data/test/javax/management/Introspector/ParameterNameTest.java.i
+data/test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy.i
 data/src/share/classes/java/lang/Long.java.i
+data/src/share/classes/sun/text/resources/FormatData_ru_RU.java.i
 data/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear.c.i
 data/src/share/classes/com/sun/jdi/ReferenceType.java.i
-data/test/java/nio/file/WatchService/grantDirOnly.policy.i
-data/src/share/classes/sun/management/HotspotClassLoading.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMeta.java.i
+data/src/share/classes/sun/net/httpserver/HttpsServerImpl.java.i
+data/src/share/classes/sun/awt/image/BytePackedRaster.java.i
 data/src/share/native/sun/awt/medialib/j2d_names.h.i
 data/src/share/classes/java/awt/dnd/DropTargetListener.java.i
 data/test/sun/rmi/rmic/newrmic/equivalence/AppleImpl.java.i
 data/src/share/classes/sun/java2d/pipe/BufferedMaskBlit.java.i
 data/src/solaris/classes/sun/awt/motif/X11JIS0208.java.i
-data/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c.i
 data/src/share/classes/com/sun/crypto/provider/DESedeCipher.java.i
-data/src/share/native/sun/security/ec/ecp_jac.c.i
-data/src/share/native/java/lang/fdlibm/src/e_cosh.c.i
+data/test/sun/security/ssl/sun/net/www/httpstest/ClosedChannelList.java.i
 data/src/share/classes/javax/management/NotCompliantMBeanException.java.i
-data/src/share/classes/com/sun/media/sound/ModelSource.java.i
-data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/JavaxURLNulls.java.i
-data/src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties.i
+data/src/share/classes/sun/tools/jconsole/inspector/XNodeInfo.java.i
+data/src/solaris/demo/jni/Poller/Poller.java.i
+data/src/share/classes/sun/tools/java/CompilerError.java.i
 data/test/com/sun/security/sasl/gsskerb/log.properties.i
-data/src/share/classes/sun/security/x509/GeneralNameInterface.java.i
+data/test/java/nio/channels/SocketChannel/CloseAfterConnect.java.i
 data/src/share/demo/nbproject/management/VerboseGC/build.xml.i
-data/make/mkdemo/jvmti/mtrace/Makefile.i
+data/src/share/classes/java/beans/XMLDecoder.java.i
 data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoTest.java.i
 data/src/share/classes/java/text/CollationRules.java.i
 data/src/share/classes/javax/management/InstanceOfQueryExp.java.i
-data/src/share/classes/sun/io/CharToByteCp1145.java.i
-data/test/java/awt/im/InputContext/InputContextTest.java.i
-data/src/share/classes/java/lang/invoke/MutableCallSite.java.i
+data/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh.i
+data/test/javax/swing/JOptionPane/6464022/bug6464022.java.i
+data/src/share/native/sun/security/ec/impl/secoidt.h.i
 data/src/share/classes/sun/io/ByteToCharUnicode.java.i
 data/test/sun/tools/native2ascii/NativeErrors.java.i
-data/src/share/classes/java/lang/invoke/Invokers.java.i
-data/src/share/classes/javax/swing/JToolBar.java.i
 data/src/share/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java.i
-data/src/share/classes/java/lang/reflect/TypeVariable.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleInfo.java.i
 data/make/netbeans/common/architectures/README.i
 data/src/share/classes/sun/management/MappedMXBeanType.java.i
+data/test/java/net/Socket/GetLocalAddress.java.i
 data/src/share/classes/java/awt/ActiveEvent.java.i
-data/src/share/native/com/sun/java/util/jar/pack/unpack.cpp.i
+data/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java.i
 data/src/share/native/java/lang/java_props.h.i
 data/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/TypeCode.java.i
-data/src/share/classes/java/io/ByteArrayOutputStream.java.i
 data/src/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java.i
 data/src/share/classes/sun/text/resources/FormatData_pt_BR.java.i
 data/test/java/util/BitSet/MemoryLeak.java.i
 data/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java.i
 data/make/tools/swing-beans/beaninfo/images/JTextAreaColor32.gif.i
-data/test/java/security/AccessControlContext/NullCombinerEquals.java.i
+data/src/share/classes/com/sun/tools/hat/internal/oql/OQLQuery.java.i
 data/src/share/classes/sun/security/smartcardio/PCSCException.java.i
-data/src/share/native/sun/font/layout/AnchorTables.cpp.i
-data/make/sun/text/Makefile.i
+data/test/javax/management/modelmbean/DescriptorSupportTest.java.i
+data/test/java/awt/print/PrinterJob/PrtException.java.i
+data/src/share/classes/com/sun/media/sound/ModelSource.java.i
 data/src/share/classes/javax/swing/text/html/MuxingAttributeSet.java.i
 data/src/share/classes/java/awt/MouseInfo.java.i
 data/src/share/classes/sun/io/CharToByteCp1147.java.i
-data/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.html.i
+data/src/windows/native/sun/windows/awt_Desktop.cpp.i
 data/src/share/classes/sun/text/resources/FormatData_nl_BE.java.i
 data/test/com/sun/security/sasl/gsskerb/run-nosec-wjaas.csh.i
 data/test/sun/misc/JarIndex/metaInfFilenames/jarB/b/B.java.i
-data/src/share/classes/com/sun/jmx/namespace/RoutingServerProxy.java.i
+data/src/share/classes/org/openjdk/jigsaw/cli/Librarian.java.i
 data/test/sun/java2d/pisces/Renderer/TestNPE.java.i
 data/test/sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java.i
-data/make/java/zip/reorder-sparc.i
+data/src/share/classes/org/relaxng/datatype/DatatypeException.java.i
 data/src/windows/classes/sun/java2d/d3d/D3DSurfaceData.java.i
 data/src/share/classes/sun/rmi/transport/proxy/HttpOutputStream.java.i
-data/src/share/classes/org/openjdk/jigsaw/RemoteRepository.java.i
+data/test/java/nio/Buffer/CopyDirectByteMemory.java.i
 data/src/share/classes/java/nio/file/DirectoryIteratorException.java.i
 data/src/share/classes/com/sun/tools/hat/internal/parser/FileReadBuffer.java.i
-data/test/java/nio/charset/coders/ResetISO2022JP.java.i
+data/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java.i
 data/test/java/awt/font/Rotate/Shear.java.i
 data/src/share/classes/com/sun/beans/finder/PrimitiveWrapperMap.java.i
-data/src/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java.i
-data/src/share/classes/sun/net/httpserver/HttpExchangeImpl.java.i
+data/test/java/lang/Thread/UncaughtExceptions.sh.i
+data/src/windows/native/sun/windows/ShellFolder2.cpp.i
 data/test/sun/nio/cs/SurrogateTestEUCTW.plane7.surrogates.i
 data/src/share/classes/java/rmi/server/RemoteServer.java.i
-data/src/share/classes/javax/swing/WindowConstants.java.i
+data/src/share/classes/java/security/cert/CertPathValidator.java.i
 data/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageGenerator.java.i
 data/test/com/sun/jdi/Unload1Targ.java.i
 data/test/javax/management/Introspector/NotAnMBeanTest.java.i
-data/src/share/native/sun/java2d/loops/UshortGray.c.i
 data/make/common/shared/Defs.gmk.i
-data/src/share/classes/java/awt/event/FocusAdapter.java.i
-data/src/share/classes/javax/swing/text/DefaultFormatter.java.i
+data/src/share/classes/sun/text/normalizer/NormalizerBase.java.i
+data/src/share/native/sun/awt/image/dither.c.i
 data/test/java/net/Authenticator/B4722333.java.i
 data/src/solaris/native/sun/awt/randr.h.i
 data/src/share/native/java/lang/fdlibm/src/e_lgamma.c.i
-data/src/solaris/classes/sun/awt/X11/security-icon-yellow24.png.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/Application.java.i
+data/src/share/classes/javax/swing/ProgressMonitorInputStream.java.i
+data/make/sun/javazic/tzdata/systemv.i
+data/src/share/classes/sun/nio/cs/ext/MacCroatian.java.i
 data/src/share/classes/sun/rmi/server/ActivationGroupImpl.java.i
-data/src/solaris/native/sun/java2d/loops/vis_FourByteAbgrPre.c.i
-data/src/solaris/classes/sun/font/FcFontConfiguration.java.i
+data/test/javax/swing/JFileChooser/4847375/bug4847375.java.i
+data/test/java/util/concurrent/Exchanger/ExchangeLoops.java.i
 data/src/share/native/sun/awt/libpng/pnglibconf.h.i
-data/src/share/classes/sun/io/ByteToCharSingleByte.java.i
+data/src/share/classes/sun/nio/ch/OptionKey.java.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpUnsignedInt.java.i
-data/src/share/classes/sun/awt/image/ImagingLib.java.i
+data/src/share/classes/sun/management/MemoryNotifInfoCompositeData.java.i
+data/test/sun/security/util/HostnameMatcher/cert2.crt.i
 data/test/java/beans/PropertyEditor/TestEditor.java.i
 data/src/share/classes/java/util/concurrent/Phaser.java.i
 data/test/sun/rmi/rmic/classFileVersion/run.sh.i
+data/test/com/sun/jdi/UnpreparedByName.java.i
 data/test/sun/security/pkcs11/nss/lib/linux-i586/libnspr4.so.i
 data/src/share/classes/com/sun/media/sound/ModelDirectedPlayer.java.i
 data/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningByteArray.java.i
-data/src/share/native/sun/font/layout/MorphTables.h.i
+data/test/java/io/Serializable/NoClassDefFoundErrorTrap/NoClassDefFoundErrorTrap.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U8Func.c.i
 data/test/sun/java2d/pipe/Test7027667.java.i
 data/test/java/awt/Focus/RestoreFocusOnDisabledComponentTest/RestoreFocusOnDisabledComponentTest.java.i
@@ -17890,25 +17854,28 @@ data/src/share/classes/java/security/spec/package.html.i
 data/test/org/openjdk/jigsaw/cli/expired-signer-prikey.pem.i
 data/make/java/Makefile.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties.i
+data/test/java/util/ResourceBundle/bug6572242.properties.i
 data/test/java/util/Formatter/FailingConstructors.java.i
 data/test/javax/management/remote/mandatory/provider/provider/JMXConnectorServerProviderImpl.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U16Func.c.i
 data/test/java/lang/StringBuffer/IndexOf.java.i
 data/src/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S16Func.c.i
+data/test/java/lang/invoke/ThrowExceptionsTest.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java.i
+data/src/windows/native/sun/windows/awt_new.cpp.i
 data/src/windows/demo/jvmti/hprof/hprof_md.c.i
+data/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java.i
 data/src/share/demo/jvmti/hprof/hprof_b_spec.h.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/icons/Warn.gif.i
-data/src/share/classes/sun/security/pkcs11/JarVerifier.java.i
-data/src/share/classes/javax/management/event/NotificationManager.java.i
-data/test/sun/security/smartcardio/TestConnect.java.i
+data/test/javax/security/auth/login/LoginContext/DefaultHandlerImpl.java.i
+data/src/windows/classes/sun/awt/windows/WClipboard.java.i
+data/src/share/classes/sun/io/ByteToCharCp865.java.i
 data/test/java/io/Serializable/resolveClass/MethodTest.java.i
 data/test/java/beans/PropertyEditor/TestIntegerTypeValue.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/ObjArrayCalls.java.i
 data/src/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormatResources.java.i
-data/test/java/net/URLConnection/xml/not-xml1.i
+data/make/netbeans/world/nbproject/project.xml.i
 data/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM838.java.i
 data/src/share/classes/sun/util/logging/resources/logging_it.properties.i
@@ -17916,112 +17883,117 @@ data/src/share/classes/java/nio/file/FileRef.java.i
 data/test/javax/sound/midi/Gervill/SoftChannel/Omni.java.i
 data/src/share/classes/javax/management/loading/MLetContent.java.i
 data/src/share/native/java/util/zip/zlib-1.1.3/inffixed.h.i
+data/src/share/classes/javax/sql/ConnectionEventListener.java.i
 data/src/share/classes/sun/util/resources/CalendarData_hu.properties.i
 data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/package.html.i
 data/make/jpda/expr/Makefile.i
 data/test/java/io/Serializable/resolveClass/deserializeButton/run.sh.i
-data/test/java/lang/Runtime/exec/WinCommand.java.i
-data/src/share/classes/sun/text/resources/FormatData_ga_IE.java.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java.i
+data/src/share/native/sun/java2d/pipe/ShapeSpanIterator.c.i
 data/src/share/classes/java/security/spec/DSAPublicKeySpec.java.i
-data/test/com/sun/org/apache/xml/internal/security/exceptions/LocaleTest.java.i
+data/src/share/native/sun/font/layout/LEStandalone.h.i
 data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/jdk.xml.i
 data/src/windows/native/sun/java2d/d3d/D3DPaints.h.i
 data/make/mkdemo/applets/Clock/Makefile.i
-data/test/java/util/zip/ZipFile/CopyJar.java.i
-data/src/share/classes/sun/security/provider/certpath/AdjacencyList.java.i
+data/test/java/awt/geom/Arc2D/SerializationTest.java.i
+data/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java.i
 data/src/share/classes/sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.PCMM.i
 data/src/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java.i
 data/test/java/util/concurrent/Semaphore/RacingReleases.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/DoubleBean.java.i
-data/make/mkdemo/applets/NervousText/Makefile.i
+data/src/windows/native/sun/windows/img_util_md.h.i
+data/src/share/classes/com/sun/media/sound/RIFFReader.java.i
 data/src/share/classes/javax/xml/crypto/dsig/XMLSignatureException.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509DataContent.java.i
 data/test/java/lang/Float/ParseFloat.java.i
 data/src/share/classes/javax/management/DescriptorRead.java.i
-data/src/solaris/native/com/sun/security/auth/module/Unix.c.i
+data/test/sun/rmi/rmic/extraCompilation/run.sh.i
 data/test/com/sun/tools/attach/application.mf.i
 data/test/javax/management/loading/LibraryLoader/jar_src/RandomGen.h.i
 data/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java.i
+data/test/com/sun/servicetag/servicetag2.properties.i
 data/src/solaris/classes/sun/awt/X11/XAwtState.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java.i
+data/test/com/sun/crypto/provider/Mac/MacClone.java.i
 data/make/sun/javazic/tzdata/solar89.i
 data/test/java/awt/Graphics2D/MTGraphicsAccessTest/MTGraphicsAccessTest.java.i
+data/src/share/demo/jvmti/agent_util/README.txt.i
 data/src/share/classes/javax/naming/directory/BasicAttributes.java.i
-data/src/share/classes/sun/security/jgss/krb5/Krb5Util.java.i
-data/test/java/lang/instrument/StressGetObjectSizeTest.sh.i
+data/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java.i
+data/test/java/lang/management/MemoryMXBean/MemoryUtil.java.i
 data/src/share/classes/javax/naming/directory/AttributeInUseException.java.i
 data/test/java/beans/XMLEncoder/Test6531597.java.i
 data/test/java/io/Serializable/writeReplace/WriteReplace.java.i
-data/test/javax/imageio/plugins/png/MergeStdCommentTest.java.i
+data/test/javax/swing/JFileChooser/6688203/bug6688203.java.i
 data/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java.i
+data/test/java/util/ResourceBundle/TestResource_it.java.i
 data/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java.i
 data/test/java/awt/font/TextLayout/AttributeValuesCastTest.java.i
 data/test/javax/swing/JColorChooser/Test6827032.java.i
-data/test/com/sun/awt/Translucency/TranslucentJAppletTest/TranslucentJAppletTest.java.i
+data/src/share/classes/sun/security/krb5/internal/TGSRep.java.i
 data/src/share/native/sun/security/jgss/wrapper/gssapi.h.i
 data/src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java.i
 data/src/share/classes/sun/reflect/misc/ConstructorUtil.java.i
-data/src/share/classes/javax/imageio/spi/PartiallyOrderedSet.java.i
-data/src/share/classes/javax/management/monitor/StringMonitorMBean.java.i
+data/src/share/lib/images/cursors/win32_MoveNoDrop32x32.gif.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/NullCalls.java.i
 data/src/share/classes/sun/text/resources/FormatData_el_GR.java.i
 data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java.i
-data/test/java/rmi/activation/ActivationSystem/unregisterGroup/rmid.security.policy.i
-data/src/share/classes/sun/java2d/pipe/hw/AccelTypedVolatileImage.java.i
-data/src/share/native/sun/font/layout/AlternateSubstSubtables.h.i
+data/test/java/io/DataInputStream/ReadFully.java.i
+data/test/java/io/Serializable/oldTests/ArrayOpsTest.java.i
+data/test/java/lang/Character/CheckProp.java.i
 data/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader.i
-data/src/share/classes/com/sun/java/util/jar/pack/CodingMethod.java.i
-data/src/share/classes/sun/text/resources/FormatData_ca.java.i
-data/src/share/classes/com/sun/jmx/snmp/internal/SnmpModelLcd.java.i
+data/src/share/classes/java/sql/Date.java.i
+data/test/java/beans/Introspector/Test4634390.java.i
+data/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java.i
 data/test/java/util/ResourceBundle/Bug4168625Resource3.java.i
 data/make/tools/CharsetMapping/IBM1364.map.i
-data/test/java/util/Locale/Bug4184873_yi.i
+data/src/windows/classes/sun/security/mscapi/RSAPrivateKey.java.i
 data/src/share/demo/jvmti/hprof/hprof_tracker.h.i
 data/src/share/classes/com/sun/jdi/request/StepRequest.java.i
 data/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCEntryImpl.java.i
 data/src/share/demo/jvmti/hprof/hprof_error.h.i
-data/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp.i
-data/test/java/beans/XMLEncoder/java_util_HashMap.java.i
+data/src/share/classes/sun/io/CharToByteCp949C.java.i
+data/test/java/util/concurrent/ConcurrentQueues/RemovePollRace.java.i
 data/test/java/util/zip/ZipCoding.java.i
-data/test/java/awt/font/NumericShaper/EqualsTest.java.i
+data/test/com/sun/net/httpserver/Test5.java.i
 data/make/tools/reorder/tests/Exit.java.i
-data/test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in.i
-data/test/java/lang/ref/SoftReference/Bash.java.i
-data/test/java/beans/PropertyEditor/TestEnumSubclass.java.i
+data/make/common/shared/Defs-versions.gmk.i
+data/test/com/sun/jdi/UnpreparedClasses.java.i
+data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java.i
 data/test/java/net/DatagramPacket/Unresolved.java.i
 data/src/share/classes/sun/io/CharToByteCp1124.java.i
-data/test/java/util/Locale/data/deflocale.sh.i
+data/test/java/io/Serializable/unresolvedClassDesc/Foo.java.i
+data/test/java/io/Serializable/lookupAnyInvocation/LookupAnyInvocation.java.i
 data/src/share/back/log_messages.c.i
 data/src/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java.i
+data/test/javax/crypto/Mac/ByteBuffers.java.i
 data/test/java/io/StreamTokenizer/QuoteTest.java.i
 data/src/share/classes/com/sun/jmx/remote/protocol/iiop/ClientProvider.java.i
 data/test/com/sun/jdi/DoubleAgentTest.java.i
 data/test/java/lang/ClassLoader/findSystemClass/Loader.java.i
-data/src/share/classes/javax/xml/crypto/dom/package.html.i
+data/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.policy.i
 data/test/java/lang/Math/IeeeRecommendedTests.java.i
-data/src/share/classes/sun/util/resources/CalendarData_et.properties.i
+data/test/java/lang/instrument/TransformMethodTest.java.i
 data/test/java/util/ResourceBundle/Bug4396021SpecialMessages.java.i
-data/src/share/classes/java/io/StreamCorruptedException.java.i
+data/src/solaris/classes/sun/awt/UNIXToolkit.java.i
 data/src/solaris/classes/sun/awt/X11/XQueryTree.java.i
-data/src/share/classes/javax/swing/border/MatteBorder.java.i
-data/test/com/sun/security/sasl/Cram.java.i
+data/test/java/util/ServiceLoader/Basic.java.i
 data/test/java/io/FileOutputStream/FileOpen.sh.i
 data/make/tools/CharsetMapping/MS1257.map.i
 data/src/share/classes/javax/management/openmbean/InvalidOpenTypeException.java.i
 data/src/windows/native/sun/java2d/d3d/D3DPipeline.cpp.i
-data/src/share/back/ClassObjectReferenceImpl.h.i
-data/test/java/rmi/reliability/benchmark/bench/serial/DoubleArrays.java.i
+data/test/javax/management/Introspector/MBeanDescriptionTest.java.i
+data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipCoder.java.i
+data/test/javax/script/GetInterfaceTest.java.i
 data/src/share/native/sun/security/ec/ecp_192.c.i
 data/src/share/classes/sun/swing/plaf/synth/StyleAssociation.java.i
 data/make/mkdemo/applets/BarChart/Makefile.i
-data/src/solaris/native/sun/awt/medialib/vis_32.il.i
+data/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java.i
 data/test/java/lang/annotation/RecursiveAnnotation.java.i
-data/test/java/security/cert/CertPathValidator/nameConstraints/openssl.cnf.i
-data/src/share/classes/sun/util/resources/CalendarData_in_ID.properties.i
+data/test/sun/security/pkcs11/Secmod/TrustAnchors.java.i
+data/src/share/native/sun/awt/image/cvutils/img_input8.h.i
 data/src/share/classes/sun/io/ByteToCharMacArabic.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java.i
 data/test/javax/imageio/plugins/png/GrayPngTest.java.i
 data/test/java/lang/instrument/Counter.java.i
 data/src/share/demo/jfc/Font2DTest/README.txt.i
@@ -18033,93 +18005,93 @@ data/make/modules/jdk.awt.ls.i
 data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS932_Encoder.java.i
 data/make/netbeans/world/build.properties.i
 data/test/java/rmi/reliability/benchmark/bench/serial/Booleans.java.i
-data/src/share/classes/java/lang/reflect/InvocationTargetException.java.i
-data/src/share/classes/com/sun/beans/finder/Signature.java.i
+data/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/SignerOutputStream.java.i
 data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted_Stub.java.i
 data/src/share/classes/com/sun/tools/jdi/VoidTypeImpl.java.i
-data/test/java/io/StreamTokenizer/ReadAhead.java.i
-data/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java.i
+data/test/sun/nio/cs/TestIBMBugs.java.i
+data/test/sun/nio/cs/OLD/X11KSC5601_OLD.java.i
 data/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java.i
-data/make/sun/font/mapfile-vers.openjdk.i
-data/src/share/classes/javax/naming/event/NamespaceChangeListener.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/Test.java.i
+data/src/share/classes/sun/net/www/protocol/gopher/GopherClient.java.i
 data/test/java/util/Locale/data/deflocale.winxp.i
-data/test/com/sun/security/auth/callback/DialogCallbackHandler/Default.java.i
+data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java.i
 data/test/sun/nio/cs/OLD/IBM949C_OLD.java.i
-data/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java.i
-data/test/java/beans/PropertyChangeSupport/TestMethods.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryNotification.java.i
-data/test/com/sun/crypto/provider/Cipher/RSA/TestOAEPWithParams.java.i
+data/test/sun/security/pkcs11/MessageDigest/ReinitDigest.java.i
+data/test/java/io/Serializable/backRefCNFException/Write.java.i
+data/src/share/classes/sun/security/pkcs10/PKCS10Attributes.java.i
 data/src/windows/native/sun/windows/awt_Canvas.h.i
 data/test/javax/management/remote/mandatory/subjectDelegation/SimpleStandardMBean.java.i
 data/src/share/classes/java/nio/file/attribute/FileAttribute.java.i
 data/src/share/classes/javax/swing/ToolTipManager.java.i
 data/src/solaris/native/sun/awt/medialib/vis_64.il.i
+data/src/share/classes/sun/security/x509/PrivateKeyUsageExtension.java.i
 data/src/share/classes/java/awt/Dimension.java.i
-data/src/share/classes/java/awt/peer/FileDialogPeer.java.i
+data/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java.i
 data/src/share/classes/sun/print/OpenBook.java.i
 data/test/java/io/Serializable/oldTests/PrimitivesTest.java.i
 data/test/java/io/BufferedReader/ReadLine.java.i
 data/test/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java.i
-data/src/solaris/classes/sun/nio/ch/SctpSendFailed.java.i
+data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/JavaxURLNulls.java.i
+data/src/share/native/sun/awt/image/BufImgSurfaceData.h.i
 data/src/share/bin/splashscreen_stubs.c.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Error.gif.i
+data/src/share/classes/javax/print/attribute/PrintServiceAttributeSet.java.i
 data/src/share/native/java/lang/reflect/Proxy.c.i
 data/src/solaris/classes/sun/awt/X11/XEmbeddingContainer.java.i
-data/src/share/native/com/sun/media/sound/SoundDefs.h.i
+data/test/java/rmi/transport/checkFQDN/CheckFQDN.java.i
 data/src/share/classes/java/security/spec/ECFieldFp.java.i
 data/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithRID.java.i
 data/make/tools/CharsetMapping/IBM943.map.i
 data/src/share/classes/sun/tools/jstat/Alignment.java.i
 data/src/windows/classes/sun/awt/windows/WButtonPeer.java.i
 data/src/share/classes/sun/util/resources/CalendarData_ms_MY.properties.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java.i
-data/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java.i
-data/test/com/sun/crypto/provider/TLS/TestPRF12.java.i
+data/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java.i
+data/test/sun/net/www/http/HttpClient/ProxyFromCache.java.i
+data/test/sun/security/mscapi/SignUsingNONEwithRSA.java.i
 data/src/share/classes/java/awt/dnd/DropTargetEvent.java.i
-data/src/share/classes/javax/management/relation/RelationServiceMBean.java.i
 data/test/java/nio/MappedByteBuffer/Basic.java.i
-data/test/sun/security/pkcs11/Provider/Login.sh.i
+data/src/share/classes/javax/swing/plaf/metal/sounds/MenuItemCommand.wav.i
 data/src/share/classes/sun/text/resources/FormatData_fr_FR.java.i
 data/src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java.i
-data/src/share/classes/javax/swing/undo/doc-files/UndoManager-3.gif.i
-data/test/sun/security/krb5/ParseCAPaths.java.i
+data/test/java/net/URLEncoder/URLEncoderEncodeArgs.java.i
+data/test/java/util/Collections/AsLifoQueue.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java.i
 data/src/solaris/native/java/net/net_util_md.h.i
 data/src/windows/native/sun/windows/awt_List.h.i
-data/src/share/classes/sun/security/jgss/krb5/WrapToken.java.i
+data/test/javax/management/mxbean/OperationImpactTest.java.i
 data/test/java/util/concurrent/ConcurrentMap/ConcurrentModification.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java.i
-data/test/java/util/logging/LoggerWeakRefLeak.java.i
+data/test/java/io/Serializable/6966692/Victim.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java.i
 data/src/share/classes/java/awt/image/RasterOp.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java.i
 data/test/javax/management/query/QueryParseTest.java.i
-data/src/share/classes/java/awt/doc-files/Scrollbar-2.gif.i
+data/test/java/security/cert/CertificateFactory/invalidEncodedCerts/invalidcert.pem.i
 data/test/java/lang/instrument/PremainClass/InheritAgent1000.java.i
-data/src/share/classes/java/awt/Composite.java.i
-data/src/share/classes/javax/print/Doc.java.i
-data/src/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java.i
+data/src/share/classes/javax/naming/LinkLoopException.java.i
+data/test/java/lang/String/Split.java.i
 data/src/solaris/classes/sun/awt/motif/MDialogPeer.java.i
-data/src/share/classes/javax/security/auth/RefreshFailedException.java.i
+data/src/share/classes/java/rmi/server/RMIClientSocketFactory.java.i
 data/test/java/security/Signature/TestInitSignWithMyOwnRandom.java.i
 data/src/linux/doc/man/idlj.1.i
 data/test/sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java.i
-data/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java.i
+data/src/share/classes/javax/management/relation/RelationServiceMBean.java.i
 data/src/share/classes/javax/swing/event/CaretEvent.java.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_U16.c.i
-data/src/share/native/sun/awt/image/jpeg/jcmarker.c.i
+data/src/windows/native/sun/java2d/d3d/D3DShaders.h.i
 data/test/com/sun/tools/attach/CommonSetup.sh.i
 data/test/com/sun/nio/sctp/SctpMultiChannel/Send.java.i
 data/test/java/util/concurrent/ThreadPoolExecutor/TimeOutShrink.java.i
 data/test/java/lang/management/ThreadMXBean/ThreadStateTest.java.i
 data/test/java/io/Serializable/class/NonSerialA_2.java.i
-data/src/share/classes/java/awt/color/ICC_ProfileRGB.java.i
+data/test/java/util/concurrent/ThreadPoolExecutor/ScheduledTickleService.java.i
 data/src/solaris/native/sun/awt/awt_Insets.c.i
 data/src/share/native/sun/font/layout/GlyphLookupTables.h.i
+data/src/share/classes/sun/io/ByteToCharCp948.java.i
 data/src/share/classes/sun/text/resources/FormatData_th.java.i
 data/src/share/classes/com/sun/jdi/event/VMDisconnectEvent.java.i
-data/src/linux/doc/man/ja/jstack.1.i
-data/test/sun/java2d/SunGraphics2D/DrawImageBilinear.java.i
+data/src/share/classes/sun/io/ByteToCharEUC2.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java.i
 data/src/share/native/java/util/zip/ZipEntry.c.i
 data/test/sun/security/pkcs11/KeyStore/BasicData/random.cert.i
 data/src/share/native/java/util/zip/zlib-1.2.3/inflate.h.i
@@ -18127,99 +18099,95 @@ data/test/com/sun/security/sasl/digest/AuthNoUtf8.java.i
 data/test/java/io/OutputStreamWriter/BoundsCheck.java.i
 data/src/share/classes/sun/tools/jar/SignatureFile.java.i
 data/src/share/classes/java/util/ResourceBundle.java.i
-data/test/java/awt/Graphics2D/DrawString/EmptyAttrString.java.i
+data/test/java/math/BigDecimal/ZeroScalingTests.java.i
 data/test/java/net/URLConnection/B5052093.java.i
 data/test/com/sun/jdi/ImmutableResourceTest.java.i
 data/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html.i
 data/src/share/classes/javax/accessibility/AccessibleSelection.java.i
-data/src/share/classes/com/sun/beans/decoder/FloatElementHandler.java.i
-data/src/share/classes/sun/tools/java/AmbiguousClass.java.i
+data/test/java/lang/Double/ToHexString.java.i
+data/src/share/classes/sun/io/CharToByteEUC_JP_LINUX.java.i
 data/src/share/native/sun/awt/image/cvutils/img_globals.c.i
 data/make/sun/splashscreen/Makefile.i
-data/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/OperationEntry.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL.c.i
-data/test/java/io/Serializable/ClassCastExceptionDetail/Read.java.i
+data/src/share/classes/sun/management/manifest.i
 data/test/sun/security/tools/jarsigner/onlymanifest.sh.i
 data/src/share/classes/javax/management/event/RMIPushEventRelay.java.i
 data/src/solaris/classes/sun/awt/X11/XPanelPeer.java.i
 data/src/share/classes/javax/management/relation/MBeanServerNotificationFilter.java.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CloseKeepAliveCached.java.i
-data/src/share/classes/javax/swing/text/Document.java.i
-data/src/share/classes/sun/tools/jstat/ColumnFormat.java.i
+data/src/share/classes/sun/tools/java/Scanner.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/Node.java.i
 data/make/sun/headless/mapfile-vers.i
 data/src/share/classes/sun/java2d/pipe/ValidatePipe.java.i
-data/src/share/classes/sun/security/rsa/RSAKeyPairGenerator.java.i
+data/test/com/sun/security/sasl/digest/Privacy.java.i
 data/src/share/classes/sun/io/ByteToCharCp862.java.i
 data/test/java/util/concurrent/LinkedBlockingQueue/ToArray.java.i
-data/src/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java.i
-data/test/java/beans/VetoableChangeSupport/TestEquals.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java.i
+data/test/sun/security/pkcs11/KeyStore/ClientAuthData/server.keystore.i
 data/make/tools/CharsetMapping/IBM1046.map.i
 data/src/share/classes/sun/io/CharToByteCp1148.java.i
 data/src/share/classes/java/awt/event/WindowEvent.java.i
 data/src/share/classes/sun/io/ByteToCharISO8859_3.java.i
-data/src/share/classes/javax/swing/text/html/parser/DocumentParser.java.i
+data/src/share/classes/sun/rmi/registry/RegistryImpl.java.i
+data/test/java/io/File/GetXSpace.sh.i
 data/test/sun/rmi/rmic/covariantReturns/G2.java.i
 data/test/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java.i
 data/src/share/demo/jfc/SampleTree/resources/images/collapsed.gif.i
-data/src/share/classes/java/awt/dnd/DropTargetAdapter.java.i
+data/src/share/classes/sun/security/krb5/Credentials.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java.i
 data/src/share/classes/sun/management/counter/perf/StringCounterSnapshot.java.i
-data/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java.i
-data/src/windows/native/sun/windows/awt_MMStub.h.i
+data/src/share/classes/sun/nio/ch/MembershipRegistry.java.i
+data/src/share/classes/java/awt/image/RasterFormatException.java.i
 data/make/modules/tools/nbproject/project.xml.i
 data/src/share/classes/sun/text/resources/FormatData_mk.java.i
 data/src/share/classes/sun/tools/java/ClassDefinition.java.i
 data/test/com/sun/net/httpserver/bugs/B6341616.java.i
-data/test/java/nio/charset/spi/FooProvider.java.i
-data/test/javax/print/LookupServices.java.i
-data/test/sun/security/krb5/auto/SSL.java.i
-data/src/share/classes/java/awt/doc-files/DesktopProperties.html.i
-data/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html.i
-data/src/share/classes/sun/swing/AccessibleMethod.java.i
+data/src/share/classes/com/sun/beans/finder/Signature.java.i
+data/src/share/classes/com/sun/tools/hat/internal/server/HistogramQuery.java.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java.i
+data/src/share/classes/sun/text/resources/FormatData_nl.java.i
+data/test/java/util/Locale/bug4122700.java.i
+data/test/com/sun/jdi/sde/MangleStepTest.java.i
 data/make/com/sun/xml/Makefile.i
 data/src/share/classes/java/util/prefs/PreferenceChangeEvent.java.i
 data/src/share/classes/javax/print/attribute/standard/PrinterStateReason.java.i
 data/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java.i
-data/src/share/classes/sun/awt/HeadlessToolkit.java.i
-data/src/share/native/sun/management/MemoryPoolImpl.c.i
-data/src/share/classes/java/rmi/activation/Activator.java.i
+data/src/share/native/sun/security/ec/ec.c.i
 data/src/share/classes/java/dyn/VolatileCallSite.java.i
-data/make/tools/src/build/tools/automulti/TestALFGenerator.java.i
-data/test/javax/management/remote/mandatory/socketFactories/RMIClientFactory.java.i
+data/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java.i
 data/src/solaris/classes/sun/awt/X11/XClipboard.java.i
-data/test/java/nio/file/Files/PassThroughFileSystem.java.i
+data/src/windows/native/sun/windows/awt_Label.cpp.i
 data/src/share/classes/org/openjdk/jigsaw/cli/package-info.java.i
-data/test/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java.i
-data/src/share/native/sun/awt/libpng/pngtest.c.i
+data/src/windows/native/sun/windows/awt_Scrollbar.cpp.i
+data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml.i
 data/src/share/classes/sun/management/snmp/jvminstr/package.html.i
 data/src/share/classes/sun/util/resources/TimeZoneNames_hi.java.i
 data/src/windows/classes/sun/java2d/windows/DDRenderer.java.i
-data/src/share/classes/javax/management/namespace/VirtualEventManager.java.i
+data/test/java/beans/Introspector/Test5102804.java.i
 data/test/sun/nio/cs/TestISCII91.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java.i
+data/src/share/classes/sun/reflect/UnsafeStaticShortFieldAccessorImpl.java.i
 data/src/share/classes/org/openjdk/jigsaw/SignedModule.java.i
-data/src/share/classes/sun/text/normalizer/UCharacter.java.i
-data/src/share/classes/java/text/spi/DateFormatSymbolsProvider.java.i
+data/src/windows/native/common/locale_str.h.i
 data/src/share/classes/org/openjdk/jigsaw/KernelLoader.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_en_IE.properties.i
+data/src/windows/classes/sun/nio/fs/WindowsWatchService.java.i
 data/test/java/nio/file/Path/UriImportExport.java.i
 data/src/share/classes/sun/awt/AWTPermissionFactory.java.i
 data/make/ASSEMBLY_EXCEPTION.i
 data/test/java/net/URLClassLoader/sealing/a/p/A.java.i
 data/test/java/io/Serializable/class/Test.java.i
 data/test/java/lang/reflect/Module/ModuleAnnotationTest.java.i
-data/src/solaris/classes/java/net/PlainSocketImpl.java.i
 data/src/share/classes/java/beans/EventSetDescriptor.java.i
 data/test/java/util/concurrent/ConcurrentHashMap/toArray.java.i
-data/test/javax/swing/GroupLayout/7071166/bug7071166.java.i
-data/src/share/classes/javax/sql/RowSetMetaData.java.i
+data/make/tools/src/build/tools/javazic/RuleRec.java.i
+data/src/solaris/native/sun/java2d/x11/X11SurfaceData.h.i
 data/test/com/sun/servicetag/ValidRegistrationData.java.i
-data/src/solaris/classes/sun/nio/fs/UnixException.java.i
+data/test/com/sun/management/OperatingSystemMXBean/GetTotalSwapSpaceSize.java.i
 data/src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java.i
 data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/SSLSocketInherit.java.i
 data/test/sun/net/idn/NFS4StringPrep.java.i
 data/src/share/classes/java/lang/UnsupportedOperationException.java.i
-data/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java.i
+data/src/share/classes/javax/naming/directory/BasicAttribute.java.i
 data/src/share/native/sun/security/ec/impl/ecc_impl.h.i
 data/src/share/classes/javax/swing/filechooser/package.html.i
 data/src/share/classes/javax/swing/text/html/OptionListModel.java.i
@@ -18228,55 +18196,55 @@ data/test/sun/rmi/rmic/classFileVersion/G1Impl.java.i
 data/test/java/lang/invoke/6987555/Test6987555.java.i
 data/src/windows/classes/sun/java2d/d3d/D3DMaskFill.java.i
 data/test/java/security/Security/SecurityPropFile/SecurityPropFile.policy.i
-data/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TSFrame.java.i
-data/src/share/classes/javax/management/DescriptorAccess.java.i
+data/test/java/util/ResourceBundle/Bug4396021.java.i
+data/make/tools/CharsetMapping/MS936.map.d
 data/test/java/security/Provider/CaseSensitiveServices.java.i
-data/make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java.i
-data/src/share/classes/java/lang/IllegalMonitorStateException.java.i
-data/src/windows/native/sun/windows/awt_Event.cpp.i
+data/src/share/classes/javax/swing/AbstractCellEditor.java.i
+data/src/share/native/java/util/zip/zlib-1.2.3/README.i
+data/src/windows/classes/sun/nio/ch/SctpChannelImpl.java.i
 data/test/tools/pack200/CommandLineTests.java.i
-data/src/share/classes/sun/security/x509/PrivateKeyUsageExtension.java.i
+data/src/share/classes/sun/text/resources/FormatData_ko.java.i
 data/test/tools/pack200/AttributeTests.java.i
 data/src/windows/native/sun/windows/awt_TrayIcon.h.i
-data/src/share/classes/com/sun/tools/jdi/NonConcreteMethodImpl.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/ProxyArrayCalls.java.i
 data/src/share/classes/java/dyn/InvokeDynamic.java.i
-data/make/tools/CharsetMapping/MS936.map.i
+data/make/tools/CharsetMapping/MacGreek.map.i
 data/src/share/classes/sun/misc/ExtensionInstallationProvider.java.i
 data/src/share/classes/sun/security/tools/policytool/PolicyTool.java.i
-data/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java.i
+data/test/java/security/SecureRandom/GetAlgorithm.java.i
 data/test/java/lang/reflect/Generics/StringsAndBounds.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/package.html.i
 data/src/share/back/ThreadGroupReferenceImpl.c.i
 data/src/share/classes/sun/tools/tree/CodeContext.java.i
-data/test/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.java.i
+data/src/share/classes/java/nio/channels/SeekableByteChannel.java.i
 data/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java.i
 data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiOut.c.i
 data/src/share/classes/javax/management/openmbean/OpenMBeanInfo.java.i
-data/src/share/classes/javax/security/auth/login/CredentialNotFoundException.java.i
+data/test/java/net/URLConnection/Connect.java.i
 data/src/share/classes/javax/sound/sampled/package.html.i
-data/test/java/nio/channels/FileChannel/ReadToLimit.java.i
+data/test/javax/swing/JLayer/6872503/bug6872503.java.i
 data/test/java/net/URL/runconstructor.sh.i
 data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipDirectoryStream.java.i
 data/test/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java.i
-data/src/share/classes/sun/text/resources/FormatData_en_PH.java.i
-data/make/tools/src/build/tools/stripproperties/StripProperties.java.i
-data/src/share/classes/sun/font/GlyphDisposedListener.java.i
+data/src/solaris/classes/sun/java2d/x11/X11VolatileSurfaceManager.java.i
+data/test/java/beans/XMLDecoder/spec/TestMethod.java.i
 data/src/share/classes/java/awt/peer/TextComponentPeer.java.i
 data/src/share/classes/sun/net/SocksProxy.java.i
 data/src/share/classes/sun/security/util/PropertyExpander.java.i
 data/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageGenerator.java.i
 data/src/share/classes/sun/font/ScriptRun.java.i
-data/src/share/classes/java/rmi/Remote.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java.i
 data/test/javax/crypto/SecretKeyFactory/Provider2.java.i
-data/test/java/awt/PrintJob/EdgeTest/EdgeTest.java.i
+data/test/sun/security/provider/certpath/DisabledAlgorithms/generate.sh.i
 data/src/share/classes/javax/swing/Autoscroller.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/XMBean.java.i
+data/src/share/classes/javax/management/NotificationFilterSupport.java.i
 data/test/java/security/Provider/ChangeProviders.java.i
-data/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.cpp.i
-data/src/share/classes/java/awt/RenderingHints.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java.i
+data/src/share/bin/version_comp.c.i
 data/src/share/native/sun/awt/image/cvutils/img_fsutil.h.i
 data/test/com/sun/jdi/ClassLoaderTarg.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java.i
-data/src/share/classes/com/sun/tools/hat/internal/model/StackTrace.java.i
+data/src/solaris/classes/sun/awt/X11/XGlobalCursorManager.java.i
 data/test/sun/tools/jhat/HatRun.java.i
 data/src/share/classes/javax/swing/undo/doc-files/UndoManager-2.gif.i
 data/src/share/classes/sun/util/resources/LocaleNames_da.properties.i
@@ -18286,15 +18254,14 @@ data/src/share/back/ThreadReferenceImpl.c.i
 data/test/java/io/File/ToURI.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java.i
 data/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java.i
-data/src/share/bin/parse_manifest.c.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java.i
+data/test/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java.i
+data/test/java/beans/XMLEncoder/Test6256805.java.i
 data/src/share/classes/java/security/Principal.java.i
-data/test/javax/swing/JLabel/6501991/bug6501991.java.i
+data/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathEntryImpl.java.i
-data/test/sun/security/validator/CertReplace.java.i
 data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.password.in.i
-data/src/share/classes/java/awt/peer/MenuItemPeer.java.i
-data/test/sun/nio/cs/StreamEncoderClose.java.i
+data/test/java/security/cert/CertPathValidator/trustAnchor/ValidateNC.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM930.java.i
 data/test/javax/security/sasl/Sasl/PassSysProps.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureException.java.i
 data/src/share/classes/sun/rmi/rmic/RMIGenerator.java.i
@@ -18302,115 +18269,117 @@ data/test/java/rmi/reliability/benchmark/bench/rmi/Main.java.i
 data/src/share/lib/cmm/lcms/sRGB.pf.i
 data/src/linux/doc/man/ja/jstatd.1.i
 data/make/sun/javazic/tzdata/australasia.i
-data/make/java/java/FILES_java.gmk.i
-data/test/javax/security/auth/x500/X500Principal/KeywordMap.java.i
+data/test/sun/net/InetAddress/nameservice/chaining/Simple1NameServiceDescriptor.java.i
+data/src/share/classes/javax/print/attribute/PrintRequestAttribute.java.i
+data/src/share/classes/sun/tools/tree/BitOrExpression.java.i
 data/src/share/classes/sun/security/util/SignatureFileVerifier.java.i
 data/src/share/classes/sun/text/resources/CollationData_ru.java.i
-data/test/javax/swing/JTable/6777378/bug6777378.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java.i
-data/src/share/classes/java/awt/PopupMenu.java.i
-data/src/windows/native/sun/windows/awt_dlls.h.i
-data/src/share/classes/java/rmi/server/ServerNotActiveException.java.i
-data/src/share/classes/com/sun/media/sound/DLSInfo.java.i
+data/test/sun/net/www/protocol/http/ProxyTunnelServer.java.i
+data/src/windows/native/sun/net/dns/ResolverConfigurationImpl.c.i
+data/src/share/classes/javax/management/remote/rmi/RMIServerImpl.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java.i
 data/src/share/demo/java2d/J2DBench/build.xml.i
-data/test/java/lang/annotation/Missing/MissingTest.java.i
-data/test/java/rmi/testlibrary/README.jcov.i
 data/src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java.i
 data/test/sun/tools/jstat/jstatGcPermCapacityOutput1.sh.i
 data/test/sun/nio/cs/OLD/IBM942_OLD.java.i
-data/test/java/nio/channels/FileChannel/Read.java.i
+data/test/java/util/zip/FlaterTest.java.i
 data/src/share/demo/nbproject/jfc/SampleTree/build.xml.i
 data/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java.i
-data/src/share/classes/javax/net/ssl/SSLSessionBindingEvent.java.i
-data/test/java/io/Serializable/maskSyntheticModifier/Foo.java.i
+data/src/share/classes/java/awt/image/DataBufferByte.java.i
+data/test/java/nio/channels/SocketChannel/ConnectState.java.i
 data/src/share/classes/com/sun/tracing/dtrace/ModuleName.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/NamedObject.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageConvKernelConvert.c.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U16Func.c.i
+data/src/share/classes/sun/net/www/MimeLauncher.java.i
 data/test/javax/swing/JColorChooser/Test6977726.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiPanelUI.java.i
 data/test/java/math/BigDecimal/SerializationTests.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/minimize-pressed.gif.i
-data/src/share/classes/javax/swing/event/MenuListener.java.i
+data/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties.i
+data/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java.i
 data/src/share/javavm/include/sys_api.h.i
-data/src/share/classes/java/security/AlgorithmParametersSpi.java.i
+data/src/share/classes/javax/security/sasl/package.html.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java.i
-data/src/share/classes/sun/text/resources/FormatData_sk_SK.java.i
+data/src/share/classes/javax/sql/rowset/RowSetFactory.java.i
 data/test/com/sun/jdi/GetLocalVariables4Test.sh.i
 data/src/share/classes/sun/io/CharToByteCp1383.java.i
 data/test/java/nio/MappedByteBuffer/Force.java.i
-data/test/java/rmi/Naming/legalRegistryNames/Legal.java.i
-data/src/share/classes/java/util/concurrent/ThreadLocalRandom.java.i
+data/test/sun/nio/cs/TestStringCoding.java.i
+data/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java.i
 data/src/solaris/classes/sun/net/NetHooks.java.i
 data/src/share/classes/javax/naming/ldap/SortResponseControl.java.i
-data/src/share/classes/sun/management/counter/perf/PerfDataType.java.i
+data/src/share/classes/java/io/BufferedOutputStream.java.i
+data/src/share/classes/sun/net/NetworkServer.java.i
 data/test/sun/security/pkcs11/KeyStore/ClientAuth.sh.i
 data/test/java/util/prefs/SerializeExceptions.java.i
 data/test/java/io/InputStreamReader/One.java.i
 data/make/com/sun/sql/FILES_java.gmk.i
-data/test/javax/imageio/CachePremissionsTest/w.policy.i
+data/src/share/classes/com/sun/media/sound/SoftShortMessage.java.i
 data/test/java/util/Locale/ThaiGov.java.i
 data/test/javax/management/loading/SystemClassLoaderTest.java.i
-data/test/com/sun/nio/sctp/SctpChannel/Connect.java.i
-data/test/java/io/charStreams/RandomLines.java.i
+data/src/share/classes/com/sun/crypto/provider/CipherTextStealing.java.i
+data/test/java/awt/FontClass/CreateFont/DeleteFont.sh.i
 data/test/sun/security/ssl/javax/net/ssl/GetInstance.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_iw_IL.properties.i
+data/src/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java.i
 data/src/share/classes/com/sun/jdi/ClassNotLoadedException.java.i
 data/test/sun/security/ssl/etc/keystore.i
 data/src/share/demo/nbproject/jfc/TableExample/nbproject/file-targets.xml.i
 data/test/sun/net/www/ParseUtil_6380332.java.i
 data/test/javax/swing/JColorChooser/Test4887836.html.i
-data/src/solaris/classes/sun/awt/X11/XCustomCursor.java.i
-data/make/modules/jdk.depconfig.i
+data/test/sun/security/provider/PolicyFile/TrustedCert.keystore.i
 data/test/java/io/PrintWriter/ClearErrorWriter.java.i
 data/test/java/beans/XMLEncoder/java_util_Collections_CheckedSet.java.i
-data/test/com/sun/crypto/provider/Cipher/PBE/DecryptWithoutParameters.java.i
+data/test/sun/net/idn/nfscss.spp.i
 data/src/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java.i
 data/test/java/io/Serializable/6966692/README.i
 data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ScanManagerConfig.java.i
-data/test/java/rmi/activation/Activatable/checkActivateRef/security.policy.i
+data/test/java/util/zip/ZipFile/crash.jar.i
 data/test/java/io/BufferedInputStream/ReadZeroBytes.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java.i
-data/src/share/demo/jfc/Metalworks/resources/HelpFiles/metalworks.html.i
+data/test/java/util/Arrays/Sorting.java.i
 data/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java.i
-data/test/java/io/File/GetXSpace.sh.i
+data/src/share/classes/javax/naming/ldap/ExtendedRequest.java.i
+data/src/solaris/native/sun/awt/awt_Label.c.i
 data/src/share/demo/jfc/TableExample/README.txt.i
 data/test/java/nio/channels/DatagramChannel/NetworkConfiguration.java.i
-data/src/share/classes/sun/tools/tree/Context.java.i
+data/test/java/nio/channels/Selector/TemporarySelector.java.i
 data/src/share/classes/sun/font/FileFontStrike.java.i
-data/test/java/security/KeyPairGenerator/SolarisShortDSA.java.i
+data/test/javax/swing/JPopupMenu/6690791/bug6690791.java.i
 data/src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h.i
-data/make/common/Rules-SCCS.gmk.i
-data/src/share/classes/javax/sound/midi/Soundbank.java.i
-data/test/com/sun/java/swing/plaf/windows/Test6824600.java.i
+data/src/solaris/classes/sun/nio/ch/PollSelectorImpl.java.i
+data/src/share/classes/com/sun/crypto/provider/JarVerifier.java.i
+data/test/java/util/concurrent/ThreadPoolExecutor/ModifyCorePoolSize.java.i
 data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java.i
 data/src/windows/classes/sun/awt/windows/WWindowPeer.java.i
-data/test/com/sun/net/httpserver/bugs/6725892/Test.java.i
+data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Encoder.java.i
 data/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c.i
 data/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java.i
 data/src/share/classes/java/net/ProtocolFamily.java.i
+data/test/java/net/DatagramSocket/BindFailTest.java.i
 data/src/share/classes/sun/util/logging/resources/logging_ko.properties.i
-data/src/share/classes/java/util/jar/JarOutputStream.java.i
-data/make/tools/swing-beans/beaninfo/images/JRootPaneColor16.gif.i
+data/test/javax/naming/spi/DirectoryManager/DummyContext.java.i
+data/src/share/classes/sun/security/provider/VerificationProvider.java.i
 data/test/sun/security/util/DerInputBuffer/TimeParsing.java.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/p11-activcard.txt.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDefault.java.i
+data/src/windows/native/sun/windows/awt_Color.h.i
+data/src/share/classes/sun/tools/jconsole/VMInternalFrame.java.i
 data/test/java/net/URLConnection/xml/not-xml2.i
 data/test/org/openjdk/jigsaw/_RemoteRepository.java.i
 data/src/share/classes/javax/crypto/interfaces/DHPublicKey.java.i
-data/src/share/demo/applets/DrawTest/example1.html.i
-data/src/share/classes/javax/print/StreamPrintServiceFactory.java.i
+data/test/java/io/CharArrayReader/Constructor.java.i
+data/test/java/lang/instrument/TransformerManagementThreadAddTests.java.i
 data/src/share/classes/sun/reflect/ConstructorAccessorImpl.java.i
 data/test/java/awt/print/PrinterJob/ImagePrinting/ImageTypes.java.i
 data/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.java.i
-data/src/share/classes/javax/management/Query.java.i
+data/src/share/lib/security/java.policy.i
 data/src/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java.i
 data/src/share/classes/sun/io/CharToByteCp1252.java.i
 data/src/share/classes/sun/util/resources/LocaleNames_sv.properties.i
 data/src/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java.i
 data/src/share/sample/nio/chatserver/Client.java.i
 data/test/java/awt/Component/F10TopToplevel/F10TopToplevel.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/iconify-pressed.gif.i
 data/src/share/classes/java/lang/invoke/MethodHandleStatics.java.i
 data/src/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiMenuBarUI.java.i
@@ -18421,60 +18390,62 @@ data/test/sun/security/tools/policytool/UpdatePermissions.sh.i
 data/src/share/native/sun/font/layout/ThaiStateTables.cpp.i
 data/make/sun/javazic/tzdata/africa.i
 data/test/java/awt/Focus/NonFocusableResizableTooSmall/NonFocusableResizableTooSmall.java.i
-data/test/java/io/StringReader/ClosedReady.java.i
+data/src/share/classes/sun/java2d/pipe/RenderQueue.java.i
 data/src/share/classes/java/applet/Applet.java.i
 data/src/share/classes/javax/sound/sampled/spi/AudioFileReader.java.i
-data/test/java/beans/XMLEncoder/java_lang_reflect_Method.java.i
-data/src/share/classes/java/lang/StringBuffer.java.i
+data/test/java/beans/Introspector/Test6963811.java.i
+data/src/share/classes/javax/net/ssl/SSLException.java.i
 data/src/share/native/java/lang/fdlibm/src/s_ldexp.c.i
 data/src/share/classes/javax/smartcardio/ResponseAPDU.java.i
 data/test/java/net/URLClassLoader/GetURLsTest.java.i
 data/test/java/nio/channels/AsynchronousChannelGroup/Attack.java.i
 data/src/share/classes/sun/nio/cs/UTF_32LE.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/close-pressed.gif.i
+data/src/solaris/native/sun/security/pkcs11/j2secmod_md.h.i
+data/src/share/classes/java/sql/Blob.java.i
 data/src/share/classes/javax/crypto/interfaces/PBEKey.java.i
 data/src/share/native/java/lang/fdlibm/src/w_j1.c.i
 data/test/javax/management/openmbean/IsValueTest.java.i
-data/src/share/classes/com/sun/jmx/remote/util/ClassLoaderWithRepository.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/etsi.xsd.i
+data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/rmid.security.policy.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_f.c.i
 data/src/share/native/sun/java2d/opengl/OGLBufImgOps.h.i
 data/test/sun/security/provider/PolicyParser/p003.policy.i
-data/test/javax/management/eventService/CustomForwarderTest.java.i
-data/test/java/io/Serializable/oldTests/WritePrimitive.java.i
+data/test/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM420.java.i
 data/src/share/classes/java/awt/doc-files/GridBagLayout-2.gif.i
-data/test/java/net/ipv6tests/UdpTest.java.i
+data/src/share/classes/javax/sound/midi/SoundbankResource.java.i
+data/src/share/classes/com/sun/java/util/jar/pack/Package.java.i
 data/make/tools/swing-beans/beaninfo/images/JSeparatorColor16.gif.i
 data/test/java/io/OutputStreamWriter/NullCreate.java.i
 data/src/share/native/sun/rmi/server/MarshalInputStream.c.i
 data/test/sun/security/tools/jarsigner/oldsig/A.class.i
-data/src/share/back/eventFilter.c.i
+data/src/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java.i
+data/test/java/io/Serializable/noSuchFieldClarification/NoSuchFieldClarification.java.i
 data/make/tools/src/build/tools/javazic/Checksum.java.i
 data/test/sun/security/pkcs11/ec/TestECGenSpec.java.i
-data/src/share/classes/java/security/GuardedObject.java.i
+data/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java.i
 data/test/com/sun/awt/Translucency/WindowOpacity.java.i
 data/src/share/classes/sun/security/ec/SunEC.java.i
-data/src/share/demo/jvmti/heapViewer/heapViewer.c.i
+data/test/javax/management/MBeanServer/NewMBeanListenerTest.java.i
 data/test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
 data/test/sun/nio/cs/X11CNS11643P3.java.i
 data/src/share/classes/sun/security/pkcs11/P11KeyGenerator.java.i
 data/src/share/demo/jvmti/hprof/hprof_cpu.h.i
-data/test/sun/management/jmxremote/bootstrap/management_ssltest13_ko.properties.in.i
-data/src/solaris/native/sun/awt/awt_KeyboardFocusManager.c.i
-data/src/share/classes/java/util/SortedSet.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_nl_NL.properties.i
+data/src/windows/native/sun/java2d/d3d/D3DRenderer.h.i
+data/test/java/nio/channels/AsynchronousFileChannel/Lock.java.i
 data/test/javax/sound/midi/Gervill/ModelSource/NewModelSource.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapSchemaCtx.java.i
+data/src/share/classes/sun/util/logging/resources/logging_de.properties.i
 data/src/share/classes/java/sql/SQLTimeoutException.java.i
 data/src/share/classes/sun/security/action/GetIntegerAction.java.i
 data/src/share/classes/java/net/HttpCookie.java.i
 data/make/tools/src/build/tools/jdwpgen/RepeatNode.java.i
 data/src/share/classes/com/sun/awt/AWTUtilities.java.i
 data/make/tools/src/build/tools/charsetmapping/CharsetMapping.java.i
-data/src/solaris/doc/sun/man/man1/javac.1.i
-data/src/share/demo/nbproject/project.xml.i
+data/src/share/classes/sun/invoke/util/BytecodeDescriptor.java.i
+data/src/share/native/java/util/zip/zlib-1.1.3/inffast.h.i
 data/test/javax/swing/JLayer/6994419/bug6994419.java.i
 data/src/share/native/sun/misc/Version.c.i
 data/src/share/classes/javax/swing/filechooser/FileFilter.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_CL.java.i
 data/test/java/util/PluggableLocale/providersrc/DecimalFormatSymbolsProviderImpl.java.i
 data/test/javax/print/applet/applet1/Applet1PrintService.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java.i
@@ -18482,14 +18453,15 @@ data/src/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java.i
 data/make/sun/javazic/tzdata_jdk/jdk11_backward.i
 data/src/share/classes/sun/rmi/server/LoaderHandler.java.i
 data/test/javax/management/monitor/InstantiateMonitorNotificationTest.java.i
-data/make/tools/CharsetMapping/EUC_CN.map.i
-data/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties.i
-data/src/share/classes/sun/util/resources/LocaleNamesBundle.java.i
+data/test/java/util/WeakHashMap/ZeroInitCap.java.i
+data/src/windows/classes/sun/awt/windows/WSystemTrayPeer.java.i
+data/src/solaris/classes/java/net/PlainSocketImpl.java.i
 data/src/share/classes/com/sun/tools/jdi/LongTypeImpl.java.i
-data/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8ext.c.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java.i
 data/test/sun/security/util/asn1StringTypes/StringTypes.java.i
 data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod_Stub.java.i
+data/src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java.i
 data/src/share/classes/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java.i
 data/make/tools/src/build/tools/jdwpgen/NameNode.java.i
 data/test/java/util/zip/ZipInputStream/Skip.java.i
@@ -18497,10 +18469,10 @@ data/test/java/security/PrivilegedActionException/PrintWrappedException.java.i
 data/src/share/classes/javax/naming/directory/InitialDirContext.java.i
 data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain4.txt.i
 data/src/share/classes/javax/naming/NamingEnumeration.java.i
-data/test/com/sun/net/httpserver/bugs/B6744329.java.i
+data/src/share/classes/sun/rmi/transport/Channel.java.i
 data/src/share/classes/javax/naming/spi/ContinuationContext.java.i
 data/src/share/classes/sun/text/resources/CollationData_is.java.i
-data/src/share/classes/javax/swing/CellRendererPane.java.i
+data/test/sun/security/rsa/TestSignatures.java.i
 data/src/solaris/classes/sun/java2d/x11/X11Renderer.java.i
 data/src/share/classes/java/awt/print/Printable.java.i
 data/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp.i
@@ -18508,11 +18480,11 @@ data/src/share/classes/javax/swing/event/package.html.i
 data/src/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java.i
 data/make/tools/CharsetMapping/IBM1145.c2b.i
 data/src/share/native/sun/awt/medialib/mlib_ImageCreate.h.i
-data/make/netbeans/common/jtreg-view.ent.i
-data/src/share/classes/sun/font/FontUtilities.java.i
-data/src/share/classes/javax/swing/text/html/parser/DTDConstants.java.i
-data/src/share/classes/sun/security/x509/CertificateAlgorithmId.java.i
-data/test/java/text/Collator/Bug6970930.java.i
+data/src/share/classes/javax/swing/JToolBar.java.i
+data/test/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.java.i
+data/src/share/classes/java/util/AbstractCollection.java.i
+data/test/java/awt/xembed/server/RunTestXEmbed.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java.i
 data/src/share/classes/com/sun/jdi/event/EventSet.java.i
 data/src/share/classes/java/awt/dnd/peer/package.html.i
 data/test/java/nio/channels/Channels/TinyBuffers.java.i
@@ -18521,27 +18493,29 @@ data/src/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java.i
 data/make/tools/src/build/tools/generatenimbus/Shape.java.i
 data/src/share/classes/javax/net/ssl/X509KeyManager.java.i
 data/src/share/classes/java/nio/file/spi/FileSystemProvider.java.i
-data/src/share/native/sun/font/layout/HangulLayoutEngine.h.i
+data/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties.i
 data/make/tools/swing-beans/beaninfo/images/JTextAreaMono16.gif.i
 data/test/java/io/Serializable/writeObjectMemory/WriteObjectMemory.java.i
-data/src/share/classes/javax/print/event/PrintEvent.java.i
-data/make/tools/swing-beans/beaninfo/images/JMenuColor16.gif.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EmptyExtensionData.java.i
 data/test/java/util/WeakHashMap/GCDuringIteration.java.i
 data/src/share/classes/sun/awt/image/ImageFormatException.java.i
 data/src/solaris/native/sun/xawt/awt_Desktop.c.i
+data/test/javax/print/applet/YesNo.java.i
 data/src/solaris/sample/dtrace/hotspot/method_invocation_tree.d.i
+data/src/share/native/java/lang/fdlibm/src/e_exp.c.i
 data/test/java/util/prefs/ConflictInFlush.java.i
-data/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java.i
-data/src/share/classes/java/nio/file/attribute/FileAttributeView.java.i
-data/test/java/awt/event/MouseEvent/AcceptExtraButton/AcceptExtraButton.java.i
+data/src/share/classes/sun/misc/JavaUtilJarAccess.java.i
+data/make/javax/crypto/policy/unlimited/default_US_export.policy.i
+data/test/java/net/SocketPermission/ActionSpace.java.i
 data/test/java/io/Serializable/proxy/skipMissing/Read.java.i
 data/src/share/native/java/util/zip/zlib-1.1.3/zlib.h.i
 data/test/java/awt/geom/CubicCurve2D/SolveCubicTest.java.i
 data/make/sun/awt/Depend.mak.i
-data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnspr4.so.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java.i
 data/src/share/demo/jvmti/hprof/hprof_site.c.i
 data/src/share/classes/java/lang/instrument/ClassFileTransformer.java.i
 data/test/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java.i
+data/test/java/rmi/server/RMIClassLoader/spi/Property.java.i
 data/src/share/classes/sun/rmi/server/MarshalInputStream.java.i
 data/src/share/classes/com/sun/jmx/namespace/RoutingProxy.java.i
 data/test/java/nio/charset/coders/IsLegalReplacement.java.i
@@ -18549,188 +18523,192 @@ data/test/java/util/PluggableLocale/ProviderTest.java.i
 data/src/share/demo/jvmti/hprof/hprof_init.c.i
 data/src/share/demo/nbproject/jfc/Notepad/build.properties.i
 data/test/com/sun/security/auth/login/ConfigFile/InconsistentError.config.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java.i
+data/src/share/classes/com/sun/media/sound/RealTimeSequencer.java.i
 data/src/share/classes/sun/io/CharToByteMacTurkish.java.i
 data/src/share/classes/javax/smartcardio/TerminalFactorySpi.java.i
 data/src/share/classes/sun/tools/jconsole/inspector/XPlotter.java.i
-data/make/mksample/nbproject/Makefile.i
-data/src/share/classes/java/beans/ExceptionListener.java.i
+data/test/sun/security/pkcs11/Cipher/ReinitCipher.java.i
+data/src/share/classes/javax/accessibility/AccessibleResourceBundle.java.i
 data/src/share/demo/applets/MoleculeViewer/models/HyaluronicAcid.xyz.i
 data/test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java.i
 data/src/share/classes/java/awt/peer/MouseInfoPeer.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_1.c.i
-data/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java.i
-data/test/java/util/Vector/LastIndexOf.java.i
-data/src/share/classes/java/lang/reflect/UndeclaredThrowableException.java.i
+data/test/java/util/ResourceBundle/Test4314141A__DE.properties.i
+data/src/share/classes/javax/swing/event/PopupMenuListener.java.i
+data/src/share/classes/sun/io/ByteToCharEUC_JP_Solaris.java.i
+data/src/solaris/native/sun/awt/awt_util.c.i
 data/test/java/net/DatagramSocket/TestAfterClose.java.i
-data/test/com/sun/jdi/PopSynchronousTest.java.i
-data/src/solaris/classes/sun/nio/ch/Port.java.i
-data/src/share/classes/javax/management/event/EventReceiver.java.i
+data/test/javax/management/query/CustomQueryTest.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java.i
+data/make/modules/BuildPackages.gmk.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/RSAExport.java.i
 data/test/sun/security/pkcs11/Secmod/key3.db.i
 data/test/java/io/PushbackInputStream/ClosedStream.java.i
-data/test/tools/launcher/PrintVersion.java.i
+data/src/share/native/sun/awt/image/jpeg/jpeglib.h.i
 data/src/share/classes/javax/imageio/ImageTranscoder.java.i
-data/test/com/sun/security/auth/CreateLdapPrincipals.java.i
-data/src/share/classes/sun/dyn/Access.java.i
+data/test/java/awt/FullScreen/SetFSWindow/FSFrame.java.i
+data/src/share/classes/sun/net/www/http/KeepAliveCache.java.i
 data/test/com/sun/jdi/sde/TemperatureTableTest.java.i
 data/test/java/nio/Buffer/BasicLong.java.i
-data/test/com/sun/jdi/connect/spi/NullTransportService.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/README.update.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapBlock.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java.i
+data/src/share/classes/com/sun/jdi/InconsistentDebugInfoException.java.i
 data/src/share/classes/com/sun/jndi/ldap/pool/ConnectionsRef.java.i
 data/test/javax/swing/border/Test7034614.java.i
 data/src/share/classes/com/sun/beans/decoder/BooleanElementHandler.java.i
-data/src/share/classes/javax/imageio/ImageWriteParam.java.i
-data/src/share/classes/javax/net/ssl/SSLEngine.java.i
+data/src/solaris/native/sun/java2d/loops/vis_ByteGray_FromRgb.c.i
+data/src/share/classes/sun/text/resources/FormatData_ru.java.i
 data/src/share/classes/javax/swing/text/html/ImageView.java.i
 data/test/com/sun/jdi/FramesTest.java.i
-data/make/mkdemo/management/MemoryMonitor/Makefile.i
+data/test/java/security/cert/CertificateFactory/ReturnStream.java.i
 data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributes.java.i
 data/src/share/classes/com/sun/security/auth/PrincipalComparator.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/DynamicMBean2.java.i
 data/src/share/classes/com/sun/management/GarbageCollectorMXBean.java.i
 data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_ASCII_Decoder.java.i
-data/src/share/classes/javax/swing/undo/CompoundEdit.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/GetResponseCode.java.i
+data/test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in.i
+data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnspr4.so.i
+data/src/share/classes/javax/print/attribute/Attribute.java.i
 data/src/share/classes/java/util/jar/JarVerifier.java.i
-data/src/share/classes/sun/security/x509/CertificatePolicySet.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java.i
 data/test/java/io/Serializable/oldTests/CheckForException.java.i
 data/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java.i
 data/src/share/classes/com/sun/jmx/snmp/BerEncoder.java.i
 data/src/share/classes/sun/reflect/DelegatingMethodAccessorImpl.java.i
-data/src/share/classes/javax/swing/text/doc-files/Document-remove.gif.i
-data/test/com/sun/jdi/RedefineFinal.sh.i
-data/test/java/beans/XMLEncoder/Test6852574.java.i
+data/test/java/lang/System/SecurityRace.java.i
+data/test/sun/misc/Version/Version.java.i
+data/test/java/net/URLConnection/HandleContentTypeWithAttrs.java.i
 data/make/tools/swing-beans/beaninfo/images/JRootPaneMono16.gif.i
 data/src/share/native/java/lang/fdlibm/src/w_jn.c.i
 data/src/share/classes/sun/management/FileSystem.java.i
 data/src/share/classes/javax/management/relation/RoleUnresolvedList.java.i
-data/src/share/classes/java/security/AuthProvider.java.i
+data/test/java/lang/Throwable/NewChainedExceptions.java.i
 data/src/share/classes/javax/swing/plaf/nimbus/DerivedColor.java.i
 data/src/solaris/classes/sun/management/FileSystemImpl.java.i
 data/src/solaris/classes/sun/print/UnixPrintJob.java.i
 data/make/netbeans/common/unix-sources.ent.i
 data/src/share/classes/javax/xml/crypto/URIReferenceException.java.i
-data/make/tools/src/build/tools/javazic/BackEnd.java.i
-data/src/share/classes/sun/io/ByteToCharCp1143.java.i
+data/src/share/native/sun/font/layout/MorphTables.cpp.i
+data/test/java/net/URLConnection/GetLastModified.java.i
 data/src/share/classes/sun/misc/Timeable.java.i
 data/test/com/sun/jndi/ldap/LdapName/Case.java.i
-data/test/java/net/Socket/GetLocalAddress.java.i
-data/make/netbeans/common/share-view.ent.i
-data/make/sun/org/mozilla/Makefile.i
+data/test/java/io/Reader/NullLock.java.i
+data/test/com/sun/net/httpserver/bugs/B6433018.java.i
 data/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java.i
+data/src/share/classes/javax/management/NotificationInfos.java.i
 data/src/share/native/sun/awt/image/jpeg/jchuff.h.i
 data/test/javax/crypto/SecretKeyFactory/P2SecretKeyFactory.java.i
 data/test/java/lang/StringBuilder/EnsureCapacity.java.i
-data/src/share/classes/sun/security/util/Password.java.i
-data/src/share/classes/sun/tools/jstat/Arguments.java.i
-data/src/share/classes/java/awt/datatransfer/Clipboard.java.i
-data/src/share/classes/javax/swing/text/ParagraphView.java.i
-data/src/share/classes/java/awt/ComponentOrientation.java.i
-data/src/share/classes/sun/net/httpserver/ContextList.java.i
+data/src/windows/classes/sun/awt/windows/WFontMetrics.java.i
+data/make/tools/swing-beans/beaninfo/images/JTextPaneMono32.gif.i
+data/test/javax/management/MBeanInfo/NullInfoArraysTest.java.i
+data/src/share/classes/sun/text/resources/thai_dict.d
+data/src/share/javavm/export/jvmticmlr.h.i
 data/src/share/classes/sun/beans/editors/LongEditor.java.i
 data/src/share/classes/sun/text/resources/thai_dict.i
-data/test/java/util/ArrayList/EnsureCapacity.java.i
 data/src/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java.i
 data/src/share/classes/java/util/Comparator.java.i
 data/src/share/classes/sun/text/resources/FormatData_sk.java.i
-data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.java.i
-data/src/share/classes/com/sun/management/package.html.i
-data/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java.i
+data/src/share/classes/javax/swing/text/WhitespaceBasedBreakIterator.java.i
+data/test/java/lang/annotation/Missing/MissingTest.java.i
+data/src/share/classes/java/nio/channels/MembershipKey.java.i
 data/src/share/native/sun/font/bidi/ubidi.c.i
-data/test/sun/net/InetAddress/nameservice/chaining/Providers.java.i
+data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java.i
 data/src/share/classes/javax/management/openmbean/OpenType.java.i
 data/src/share/classes/com/sun/jmx/remote/util/EnvHelp.java.i
-data/make/java/java/reorder-sparc.i
-data/make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java.i
-data/src/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java.i
+data/src/share/classes/java/net/HttpRetryException.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgent.java.i
+data/test/javax/management/openmbean/OpenTypeDescriptorTest.java.i
 data/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password.i
 data/src/share/classes/sun/management/counter/perf/InstrumentationException.java.i
-data/src/share/classes/java/awt/event/WindowAdapter.java.i
+data/src/share/native/sun/font/layout/SinglePositioningSubtables.h.i
 data/src/solaris/bin/ergo.h.i
-data/test/java/net/URLClassLoader/closetest/test1/com/foo/TestClass1.java.i
+data/src/share/demo/jfc/Font2DTest/resources/TextResources_en_GB.properties.i
 data/test/java/lang/management/ThreadMXBean/SynchronizerLockingThread.java.i
 data/src/share/classes/javax/print/attribute/SetOfIntegerSyntax.java.i
 data/test/sun/security/ssl/etc/truststore.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/File.gif.i
-data/src/share/classes/javax/swing/text/doc-files/Document-insert.gif.i
+data/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java.i
+data/test/tools/launcher/Test7029048.java.i
 data/src/share/classes/java/security/acl/AclNotFoundException.java.i
 data/src/share/classes/sun/io/ByteToCharISO8859_5.java.i
 data/make/tools/dtdbuilder/dtds/public.map.i
 data/test/sun/security/tools/keytool/printssl.sh.i
 data/src/share/classes/sun/text/resources/FormatData_ar_DZ.java.i
 data/src/share/native/sun/font/layout/HanLayoutEngine.h.i
-data/test/java/util/IdentityHashMap/ToArray.java.i
-data/src/share/native/sun/java2d/loops/IntArgbPre.c.i
+data/test/java/util/logging/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java.i
+data/test/org/openjdk/jigsaw/cli/signed-modular-jar.sh.i
 data/test/java/net/MulticastSocket/SetLoopbackMode.java.i
 data/src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ar_SA.properties.i
-data/src/share/classes/com/sun/jndi/ldap/LdapName.java.i
+data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml.i
+data/test/java/io/charStreams/LineLengthsSource.java.i
 data/test/java/util/PluggableLocale/providersrc/java.util.spi.TimeZoneNameProvider.i
-data/src/share/classes/sun/font/FontScalerException.java.i
-data/test/java/beans/PropertyEditor/TestFloatClassNull.java.i
+data/src/share/sample/nio/chatserver/NameReader.java.i
+data/test/java/lang/instrument/PremainClass/PremainClassTest.sh.i
 data/src/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java.i
-data/src/share/classes/javax/sql/ConnectionEventListener.java.i
-data/test/java/nio/channels/FileChannel/Size.java.i
-data/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-0-attack.xml.i
-data/src/share/native/java/util/zip/zlib-1.1.3/inftrees.h.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressOutputStream.java.i
+data/src/share/classes/java/awt/geom/package.html.i
+data/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-0-attack.xml.i
+data/test/org/openjdk/jigsaw/repocat.sh.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S32Func.c.i
 data/test/java/awt/Toolkit/HeadlessTray/HeadlessTray.java.i
-data/test/sun/tools/jstat/usage.out.i
 data/test/java/lang/instrument/PremainClass/Agent.jar.i
-data/src/share/native/sun/awt/giflib/gif_err.c.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java.i
 data/make/netbeans/jarzip/README.i
 data/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java.i
-data/test/java/dyn/6991596/Test6991596.java.i
-data/test/sun/rmi/rmic/manifestClassPath/Util.sh.i
+data/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java.i
+data/src/windows/transport/shmem/shmem_md.h.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ar_SD.properties.i
 data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/Shutdown.java.i
 data/test/java/nio/channels/FileChannel/MapReadOnly.java.i
-data/src/share/lib/audio/soundbank.gm.i
-data/test/java/beans/XMLEncoder/Test5023550.java.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.password.in.i
-data/src/share/lib/audio/soundbank.gm.d
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv_8nw.c.i
+data/src/share/classes/sun/util/resources/LocaleNames_sq.properties.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.c.i
 data/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c.i
 data/test/java/lang/reflect/Field/4490864/StaticFieldTest.java.i
 data/test/sun/security/pkcs11/Mac/ReinitMac.java.i
-data/test/sun/security/krb5/auto/W83.java.i
+data/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java.i
 data/test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so.d
-data/test/java/io/Serializable/6559775/README.i
-data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties.i
+data/src/windows/native/sun/windows/jawt.cpp.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest11_ok.ssl.in.i
 data/make/tools/swing-beans/beaninfo/images/JButtonColor16.gif.i
-data/test/javax/management/modelmbean/InfoSupportTest.java.i
+data/src/share/classes/java/io/InvalidObjectException.java.i
+data/src/share/demo/jvmti/hprof/hprof_trace.h.i
 data/test/javax/imageio/plugins/wbmp/CanDecodeTest.java.i
-data/src/share/classes/sun/text/resources/FormatData_is_IS.java.i
+data/test/java/io/Serializable/PutField/Write2.java.i
 data/src/share/classes/java/awt/datatransfer/MimeTypeParseException.java.i
-data/src/windows/native/common/gdefs_md.h.i
+data/test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so.i
 data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties.i
 data/make/tools/src/build/tools/charsetmapping/EUC_TW.java.i
-data/src/share/native/sun/awt/image/cvutils/img_output16_32.h.i
+data/test/java/lang/Thread/GenerifyStackTraces.java.i
 data/test/java/rmi/server/useCustomRef/Ping.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/TestEnvironment.java.i
+data/test/java/lang/Class/forName/classes/period.class.i
+data/src/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java.i
+data/test/java/io/File/ListNull.java.i
 data/test/java/io/Serializable/enum/mismatchedTypecode/Test.java.i
 data/test/java/util/ResourceBundle/Bug4353454.java.i
-data/src/share/classes/sun/rmi/transport/tcp/TCPConnection.java.i
+data/src/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java.i
 data/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java.i
 data/test/sun/security/krb5/ktab/KeyTabIndex.java.i
 data/test/java/net/MulticastSocket/SetTTLTo0.java.i
-data/src/share/classes/com/sun/jmx/snmp/tasks/TaskServer.java.i
+data/make/tools/CharsetMapping/IBM424.c2b.i
 data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java.i
 data/src/share/classes/java/nio/channels/AsynchronousByteChannel.java.i
 data/src/windows/native/sun/windows/awt_Component.h.i
-data/src/share/classes/sun/security/util/DerIndefLenConverter.java.i
-data/src/share/classes/javax/imageio/ImageReader.java.i
-data/src/share/classes/sun/invoke/empty/Empty.java.i
+data/src/solaris/classes/sun/awt/motif/MRobotPeer.java.i
+data/src/linux/doc/man/apt.1.i
+data/src/share/classes/sun/nio/cs/ext/HKSCS.java.i
+data/src/share/classes/javax/swing/JWindow.java.i
 data/src/share/classes/sun/awt/image/PNGImageDecoder.java.i
-data/src/share/classes/sun/jkernel/BackgroundDownloader.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ca_ES.properties.i
+data/src/solaris/classes/sun/java2d/xr/XRPaints.java.i
+data/test/java/util/StringTokenizer/ResetPos.java.i
 data/test/sun/tools/jstat/gcNewCapacityOutput1.awk.i
 data/src/share/classes/com/sun/jmx/remote/internal/NotificationBuffer.java.i
 data/src/share/classes/java/security/spec/RSAPrivateKeySpec.java.i
-data/test/java/net/Inet6Address/IPv6AddressTypes.java.i
+data/src/share/classes/sun/java2d/loops/DrawRect.java.i
 data/src/share/classes/javax/management/namespace/JMXDomain.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_en_CA.properties.i
-data/src/share/classes/sun/nio/fs/AbstractWatchKey.java.i
+data/test/java/rmi/testlibrary/TestParams.java.i
+data/src/solaris/native/sun/net/spi/SdpProvider.c.i
 data/test/java/io/PrintStream/EncodingConstructor.java.i
 data/src/share/classes/javax/swing/OverlayLayout.java.i
 data/test/java/beans/XMLEncoder/Test4646747.java.i
@@ -18738,33 +18716,31 @@ data/src/windows/classes/sun/awt/windows/WFontPeer.java.i
 data/test/sun/tools/jps/jps-Vm_2.sh.i
 data/test/javax/swing/border/Test6981576.java.i
 data/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java.i
-data/test/javax/management/eventService/EventClientThreadTest.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java.i
 data/src/share/classes/sun/nio/cs/ext/MS932.java.i
-data/test/sun/security/krb5/RFC396xTest.java.i
-data/make/java/sql/Makefile.i
-data/src/share/classes/javax/security/auth/login/AccountLockedException.java.i
+data/src/share/classes/sun/tools/tree/ConditionalExpression.java.i
+data/src/share/native/java/lang/fdlibm/src/w_exp.c.i
 data/src/share/classes/org/openjdk/jigsaw/ContextBuilder.java.i
 data/src/share/classes/sun/tools/asm/ArrayData.java.i
-data/src/share/native/sun/awt/image/imageInitIDs.h.i
+data/src/share/native/sun/font/layout/ContextualGlyphSubstitution.h.i
 data/test/java/beans/XMLEncoder/javax_swing_JSplitPane.java.i
 data/test/com/sun/security/auth/callback/TextCallbackHandler/Confirm.java.i
-data/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java.i
-data/test/com/sun/servicetag/SystemRegistryTest.java.i
-data/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemMono32.gif.i
+data/test/java/security/cert/pkix/nameConstraintsMinMax/labs2isrg2.cer.i
+data/test/java/lang/reflect/Method/InheritedMethods.java.i
+data/src/share/classes/sun/java2d/pipe/RegionIterator.java.i
 data/test/java/net/URLClassLoader/URLParsing.java.i
 data/test/java/security/cert/CertPathBuilder/selfIssued/generate.sh.i
 data/test/java/lang/management/MemoryMXBean/MemoryManagement.java.i
 data/make/tools/swing-beans/beaninfo/images/JToggleButtonMono32.gif.i
 data/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java.i
-data/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java.i
+data/src/share/classes/sun/awt/CharsetString.java.i
 data/src/share/classes/javax/management/openmbean/MXBeanMapping.java.i
-data/test/tools/pack200/TimeStamp.java.i
+data/test/javax/management/remote/mandatory/passwordAccessFile/password.properties.i
 data/src/share/classes/com/sun/tools/hat/internal/server/QueryListener.java.i
-data/src/share/native/sun/awt/image/cvutils/img_icm.h.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java.i
 data/src/solaris/classes/sun/awt/X11/XModalityProtocol.java.i
-data/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java.i
-data/src/share/classes/java/awt/peer/MenuBarPeer.java.i
+data/src/share/native/java/lang/fdlibm/src/w_sinh.c.i
+data/test/java/net/URLClassLoader/closetest/Common.java.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java.i
 data/test/javax/swing/JTextArea/6925473/bug6925473.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapNum.java.i
@@ -18772,71 +18748,71 @@ data/src/share/classes/com/sun/tools/jdi/GenericAttachingConnector.java.i
 data/test/sun/management/jmxremote/bootstrap/management_test04_ok.properties.in.i
 data/test/sun/java2d/cmm/ColorConvertOp/ColCvtIntARGB.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ga_IE.properties.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java.i
+data/src/share/classes/java/nio/channels/ReadableByteChannel.java.i
 data/src/share/classes/sun/rmi/transport/ConnectionOutputStream.java.i
 data/src/share/classes/javax/crypto/spec/DHPublicKeySpec.java.i
-data/src/share/classes/com/sun/jdi/LongType.java.i
-data/test/java/io/File/WinSpecialFiles.java.i
-data/src/share/classes/javax/swing/plaf/ListUI.java.i
+data/test/java/util/ResourceBundle/Bug4177489_Resource_jf_JF.properties.i
+data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java.i
 data/src/share/native/java/util/zip/zlib-1.1.3/inflate.c.i
 data/src/solaris/classes/sun/awt/X11/XRepaintArea.java.i
 data/test/com/sun/net/httpserver/Test2.java.i
-data/test/com/sun/jdi/BreakpointTest.java.i
+data/test/java/beans/PropertyEditor/TestColorClassValue.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java.i
 data/src/share/classes/java/util/concurrent/Semaphore.java.i
 data/src/share/native/sun/java2d/cmm/lcms/cmssamp.c.i
-data/src/solaris/doc/sun/man/man1/jdb.1.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java.i
-data/src/share/classes/org/ietf/jgss/GSSName.java.i
+data/test/java/rmi/testlibrary/RegistryRunner.java.i
+data/test/javax/swing/JDialog/6639507/bug6639507.java.i
+data/test/java/io/Serializable/classDescFlagConflict/Read.java.i
 data/test/org/openjdk/jigsaw/circular-deps.sh.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java.i
-data/make/common/internal/Defs-corba.gmk.i
+data/src/share/classes/javax/swing/DefaultListModel.java.i
 data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java.i
-data/test/com/sun/nio/sctp/SctpServerChannel/NonBlockingAccept.java.i
+data/test/sun/security/ssl/sanity/pluggability/CheckSockFacExport2.java.i
 data/src/share/classes/java/security/PrivilegedExceptionAction.java.i
-data/src/share/native/sun/awt/image/jpeg/jdcolor.c.i
+data/test/java/net/InetSocketAddress/ToString.java.i
 data/src/share/classes/sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/ObjectCodeConvertors.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIState.java.i
 data/test/sun/rmi/rmic/newrmic/equivalence/AgentServer.java.i
 data/src/share/classes/sun/tools/attach/HotSpotVirtualMachine.java.i
 data/src/share/classes/java/text/CharacterIterator.java.i
 data/src/share/classes/javax/sound/midi/MidiDeviceReceiver.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolThreshdSupport.java.i
-data/test/javax/script/Test3.js.i
-data/src/share/classes/javax/sound/sampled/Clip.java.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.password.in.i
+data/test/javax/crypto/CryptoPermission/RC4AliasPermCheck.java.i
 data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties.i
-data/test/java/util/ArrayList/AddAll.java.i
+data/src/share/classes/com/sun/tools/hat/internal/server/FinalizerSummaryQuery.java.i
 data/test/sun/security/provider/PolicyFile/getinstance/OneArgPermission.java.i
 data/src/solaris/native/java/net/PlainDatagramSocketImpl.c.i
 data/src/share/classes/sun/security/util/SignatureFileManifest.java.i
 data/test/javax/management/loading/MLetContentTest.java.i
 data/src/share/native/sun/awt/image/cvutils/img_output8_16_24.h.i
-data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java.i
-data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManager.java.i
-data/src/share/classes/java/awt/event/FocusListener.java.i
-data/src/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java.i
-data/test/java/beans/PropertyEditor/TestFloatTypeJava.java.i
-data/src/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java.i
-data/src/windows/classes/sun/java2d/windows/WindowsFlags.java.i
-data/make/tools/src/build/tools/dtdbuilder/README.txt.i
-data/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c.i
+data/test/java/io/File/HashCodeEquals.java.i
+data/test/java/beans/Introspector/Test6194788.java.i
+data/test/sun/security/smartcardio/TestMultiplePresent.java.i
+data/test/java/security/Security/removing/RemoveStaticProvider.java.i
+data/test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java.i
+data/test/java/io/Reader/SkipNegative.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java.i
 data/src/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java.i
-data/src/windows/native/sun/java2d/d3d/D3DTextRenderer.cpp.i
+data/src/share/native/sun/awt/image/jpeg/jcinit.c.i
 data/src/share/sample/vm/jvm-clr/invoker.cpp.i
 data/src/share/classes/java/dyn/FromGeneric.java.i
 data/test/javax/xml/crypto/dsig/data/signature-enveloping-rsa.xml.i
 data/src/solaris/native/sun/awt/splashscreen/splashscreen_config.h.i
-data/test/org/openjdk/jigsaw/pubrepo.sh.i
+data/test/java/rmi/reliability/benchmark/bench/serial/ObjTrees.java.i
 data/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java.i
 data/test/java/io/InputStreamReader/NullCreate.java.i
 data/src/share/classes/com/sun/java/swing/Painter.java.i
-data/src/share/classes/sun/misc/resources/Messages_fr.java.i
+data/src/windows/native/sun/windows/awt_MouseEvent.cpp.i
 data/src/share/classes/java/awt/font/GlyphVector.java.i
-data/test/javax/naming/ldap/LdapName/RdnToAttrsTest.java.i
-data/src/share/classes/sun/tools/jstat/resources/jstat_options.i
-data/test/java/nio/charset/spi/charsetProvider.sp.i
-data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanMappingFactory.java.i
+data/test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.so.i
+data/make/java/java/FILES_java.gmk.i
+data/src/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java.i
+data/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java.i
+data/src/share/classes/com/sun/crypto/provider/AESKeyGenerator.java.i
 data/src/share/classes/javax/swing/colorchooser/SmartGridLayout.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/package.html.i
+data/src/share/classes/sun/security/x509/CertificatePolicySet.java.i
 data/src/solaris/native/com/sun/management/SolarisOperatingSystem.c.i
 data/src/share/classes/sun/tracing/package-info.java.i
 data/test/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.java.i
@@ -18848,195 +18824,198 @@ data/test/java/net/PortUnreachableException/OneExceptionOnly.java.i
 data/test/java/util/LinkedHashMap/EmptyMapIterator.java.i
 data/src/share/classes/java/awt/font/ImageGraphicAttribute.java.i
 data/src/share/classes/javax/crypto/NullCipher.java.i
-data/src/solaris/native/sun/awt/awt_Font.c.i
+data/test/sun/tools/jstatd/jstatdUsage1.sh.i
 data/test/sun/security/provider/PolicyFile/getinstance/TwoArgNullActionsPermission.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/AlgorithmAlreadyRegisteredException.java.i
-data/test/javax/management/ImplementationVersion/ImplVersionReader.java.i
-data/src/share/classes/sun/io/ByteToCharISO2022CN.java.i
+data/make/mksample/jmx/Makefile.i
+data/src/share/classes/sun/util/ResourceBundleEnumeration.java.i
 data/test/java/security/Policy/GetInstance/GetInstancePolicySpi.java.i
-data/src/share/sample/nio/server/RequestServicer.java.i
+data/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c.i
 data/make/modules/tools/src/com/sun/classanalyzer/ResourceFile.java.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/ShowDeps.java.i
-data/test/javax/security/auth/kerberos/KerberosTixDateTest.java.i
-data/src/share/classes/java/nio/charset/Charset-X-Coder.java.i
-data/src/share/classes/sun/security/util/DerEncoder.java.i
+data/src/share/native/java/util/zip/zlib-1.1.3/infblock.c.i
+data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpMibTree.java.i
+data/test/sun/security/tools/keytool/newhelp.sh.i
 data/src/share/classes/sun/io/CharToByteBig5_Solaris.java.i
-data/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear_f.c.i
-data/src/share/classes/sun/security/ssl/CipherSuite.java.i
+data/test/java/util/logging/LoggingDeadlock4.java.i
+data/test/java/text/Format/MessageFormat/Bug7003643.java.i
 data/src/share/classes/sun/misc/BASE64Decoder.java.i
-data/src/share/classes/sun/management/GcInfoCompositeData.java.i
+data/src/share/classes/sun/nio/cs/ISO_8859_9.java.i
 data/src/share/native/sun/java2d/loops/AlphaMath.c.i
+data/make/com/sun/jndi/Makefile.i
 data/test/java/nio/charset/coders/Errors.java.i
 data/src/share/hpi/include/vm_calls.h.i
-data/test/java/nio/channels/DatagramChannel/EmptyBuffer.java.i
-data/src/share/classes/sun/tools/asm/NameAndTypeData.java.i
-data/src/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java.i
-data/src/share/classes/sun/tools/tree/UnaryExpression.java.i
+data/src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java.i
+data/src/share/classes/java/security/AuthProvider.java.i
+data/test/java/net/SocketPermission/NoAction.java.i
+data/test/sun/security/tools/keytool/CloneKeyAskPassword.sh.i
 data/test/javax/management/mxbean/MXBeanFlagTest.java.i
 data/test/sun/tools/jstat/compilerOutput1.awk.i
-data/src/share/classes/java/lang/instrument/package.html.i
+data/test/java/lang/instrument/RedefineMethodAddInvokeTarget.java.i
 data/test/sun/security/tools/policytool/SaveAs.java.i
 data/src/windows/native/sun/security/pkcs11/j2secmod_md.c.i
 data/test/javax/swing/border/Test4760089.html.i
 data/src/share/classes/sun/io/CharToByteUTF8.java.i
 data/test/java/util/prefs/CommentsInXml.java.i
-data/src/share/classes/javax/management/namespace/JMXNamespace.java.i
+data/test/java/util/zip/GZIP/GZIPInputStreamRead.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java.i
 data/src/share/classes/sun/awt/image/ImageAccessException.java.i
 data/make/tools/CharsetMapping/IBM1148.map.i
 data/make/common/Subdirs.gmk.i
-data/src/share/classes/java/net/CookiePolicy.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputStreamTests.java.i
 data/test/java/io/pathNames/unix/TrailingSlash.java.i
+data/src/share/native/sun/java2d/opengl/OGLRenderQueue.c.i
 data/make/tools/swing-beans/beaninfo/images/JTextFieldColor32.gif.i
-data/src/share/demo/jvmti/hprof/hprof_trace.h.i
-data/src/share/classes/java/dyn/MethodHandleImpl.java.i
-data/src/share/native/java/lang/fdlibm/src/s_cbrt.c.i
-data/make/tools/swing-beans/beaninfo/images/JScrollBarMono32.gif.i
+data/test/sun/security/validator/CertReplace.java.i
+data/test/java/security/cert/CertPathValidatorException/cert_file.i
+data/src/solaris/classes/sun/awt/X11/XAtomList.java.i
+data/test/sun/security/ssl/sanity/pluggability/MySSLContextImpl.java.i
 data/src/solaris/doc/sun/man/man1/ja/rmic.1.i
 data/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java.i
 data/src/share/classes/com/sun/jdi/request/package.html.i
 data/test/java/lang/ClassLoader/LoadNullClass.java.i
+data/src/share/classes/java/nio/file/StandardWatchEventKinds.java.i
 data/src/share/classes/sun/io/CharToByteCp1097.java.i
 data/test/sun/tools/native2ascii/A2N_4630971.i
 data/test/java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass.java.i
-data/src/share/classes/javax/swing/ScrollPaneConstants.java.i
-data/test/java/nio/file/Files/TerminateWalk.java.i
+data/test/java/awt/PrintJob/PrintCheckboxTest/PrintCheckboxManualTest.java.i
+data/test/java/lang/management/ThreadMXBean/MonitorDeadlock.java.i
 data/test/java/nio/channels/Selector/WakeupSpeed.java.i
 data/src/share/classes/com/sun/crypto/provider/PBEKeyFactory.java.i
-data/src/share/instrument/PathCharsValidator.h.i
+data/src/windows/native/java/net/net_util_md.c.i
 data/make/tools/CharsetMapping/Big5.map.i
 data/src/share/classes/com/sun/security/ntlm/NTLM.java.i
-data/test/sun/tools/jps/jps-Vm_Output2.awk.i
-data/src/share/classes/java/awt/BorderLayout.java.i
-data/make/tools/src/build/tools/javazic/Rule.java.i
+data/src/share/classes/javax/swing/text/ZoneView.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java.i
+data/src/share/classes/javax/swing/text/html/parser/ParserDelegator.java.i
 data/test/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.html.i
-data/src/share/classes/sun/io/ByteToCharCp1146.java.i
+data/test/com/sun/crypto/provider/TLS/TestMasterSecret.java.i
 data/src/share/classes/sun/awt/image/NativeLibLoader.java.i
-data/src/windows/classes/sun/awt/windows/awtLocalization_ja.properties.i
-data/src/share/classes/sun/tools/jconsole/CreateMBeanDialog.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html.i
-data/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java.i
+data/test/java/beans/XMLEncoder/javax_swing_border_BevelBorder.java.i
+data/src/share/classes/com/sun/tools/jdi/VoidValueImpl.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java.i
+data/test/javax/smartcardio/HistoricalBytes.java.i
 data/src/solaris/sample/dtrace/hotspot/method_invocation_stat_filter.d.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmCompilationMBean.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsTableMeta.java.i
 data/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerTableMetaImpl.java.i
 data/test/javax/security/auth/Subject/Synch2.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java.i
-data/src/share/classes/java/awt/HeadlessException.java.i
-data/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java.i
-data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java.i
+data/test/javax/swing/JPopupMenu/6691503/bug6691503.java.i
+data/test/sun/security/krb5/auto/DynamicKeytab.java.i
+data/test/javax/imageio/EmptyFileTest.java.i
+data/test/java/util/Locale/serialized/java6locale_th_TH_TH.i
 data/test/javax/script/META-INF/services/javax.script.ScriptEngineFactory.i
-data/src/share/classes/javax/sound/midi/MetaMessage.java.i
+data/src/share/classes/javax/management/remote/JMXConnectorFactory.java.i
 data/src/share/classes/java/awt/peer/WindowPeer.java.i
 data/src/share/native/java/lang/fdlibm/src/w_lgamma.c.i
-data/test/sun/java2d/DirectX/IAEforEmptyFrameTest/IAEforEmptyFrameTest.java.i
+data/src/windows/classes/java/io/FileDescriptor.java.i
 data/make/sun/beans/Makefile.i
 data/test/sun/net/www/protocol/http/Modified.java.i
 data/make/mksample/scripting/Makefile.i
 data/src/share/classes/com/sun/jmx/snmp/internal/SnmpAccessControlModel.java.i
 data/src/share/classes/sun/nio/ch/SocketOptsImpl.java.i
-data/test/javax/management/relation/NonArrayListTest.java.i
-data/src/share/classes/sun/nio/fs/AbstractFileSystemProvider.java.i
+data/test/java/net/DatagramSocket/LocalSocketAddress.java.i
+data/test/java/rmi/server/RMIClassLoader/noSecurityManager/LocalDummy.java.i
 data/src/share/classes/javax/sound/midi/spi/SoundbankReader.java.i
 data/src/share/classes/java/awt/peer/ScrollbarPeer.java.i
-data/src/share/classes/java/io/Bits.java.i
+data/test/java/security/cert/CertPathBuilder/targetConstraints/ee.cer.i
 data/src/share/native/sun/font/layout/GlyphLookupTables.cpp.i
 data/test/java/lang/Runtime/exec/SleepyCat.java.i
 data/test/sun/management/jmxremote/bootstrap/management_ssltest06_ok.properties.in.i
 data/src/windows/native/sun/java2d/d3d/D3DMaskBlit.h.i
 data/test/javax/security/auth/Subject/Serial.policy.i
-data/test/sun/nio/cs/TestUTF_16.java.i
-data/test/javax/print/attribute/ServiceDialogTest.java.i
+data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java.i
+data/test/java/lang/Class/IsAnnotationType.java.i
 data/src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServerMBean.java.i
-data/src/share/classes/sun/io/CharToByteISO2022CN_GB.java.i
-data/src/share/classes/sun/security/provider/PolicySpiFile.java.i
+data/src/share/native/sun/security/ec/impl/ecl_curve.c.i
+data/test/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html.i
 data/src/windows/classes/sun/awt/windows/WInputMethodDescriptor.java.i
-data/test/java/lang/instrument/RedefineMethodAddInvokeTarget_1.java.i
-data/src/share/classes/javax/swing/event/TreeModelEvent.java.i
+data/test/java/io/File/Cons.java.i
+data/test/java/util/Collections/RacingCollections.java.i
 data/test/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java.i
-data/src/share/classes/java/util/concurrent/RejectedExecutionHandler.java.i
+data/src/share/classes/sun/reflect/generics/tree/ReturnType.java.i
 data/make/tools/CharsetMapping/MacCentralEurope.map.i
-data/make/java/java/reflect/Makefile.i
+data/test/com/sun/net/httpserver/Test6.java.i
 data/src/share/demo/jfc/FileChooserDemo/ExampleFileSystemView.java.i
 data/test/java/rmi/reliability/benchmark/bench/rmi/Makefile.i
-data/test/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.html.i
+data/test/javax/management/Introspector/ChangingNotifsTest.java.i
 data/src/share/classes/sun/misc/resources/Messages_zh_TW.java.i
-data/make/common/shared/Defs-solaris.gmk.i
 data/src/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties.i
-data/src/share/classes/sun/security/krb5/internal/UDPClient.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_is_IS.properties.i
+data/src/share/classes/sun/security/x509/X509CertImpl.java.i
+data/src/share/transport/socket/sysSocket.h.i
 data/src/share/classes/sun/nio/cs/ISO_8859_7.java.i
 data/test/java/net/PlainSocketImpl/SetBufferSize.java.i
 data/src/share/classes/java/awt/peer/ButtonPeer.java.i
-data/src/share/classes/sun/tracing/dtrace/JVM.java.i
+data/test/java/io/Serializable/enum/badResolve/Read.java.i
 data/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java.i
 data/src/share/classes/com/sun/media/sound/SoftMainMixer.java.i
 data/src/share/classes/sun/tools/tree/ArrayAccessExpression.java.i
 data/src/share/classes/javax/net/ssl/SSLSocket.java.i
-data/src/windows/native/sun/windows/awt_MenuItem.cpp.i
-data/src/solaris/bin/java-rmi.cgi.sh.i
+data/src/share/demo/jfc/Font2DTest/resources/TextResources_zh_CN.properties.i
+data/test/sun/java2d/pisces/Renderer/Test7019861.java.i
 data/src/share/classes/sun/util/calendar/AbstractCalendar.java.i
-data/src/share/classes/java/io/StringBufferInputStream.java.i
-data/test/javax/script/VersionTest.java.i
+data/test/java/util/ResourceBundle/Control/LoadingStrategiesTest.java.i
+data/src/linux/doc/man/orbd.1.i
 data/src/windows/native/sun/windows/awt_Event.h.i
 data/make/java/java/genlocales.gmk.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java.i
+data/test/java/util/TimeZone/OldIDMappingTest.sh.i
 data/test/sun/pisces/ScaleTest.java.i
-data/src/share/native/sun/font/layout/GlyphPositioningTables.h.i
+data/test/java/net/URLConnection/GetFileNameMap.java.i
 data/src/share/classes/sun/dyn/util/BytecodeDescriptor.java.i
-data/make/javax/security/Makefile.i
-data/src/share/classes/sun/net/www/protocol/http/Handler.java.i
+data/src/share/classes/sun/nio/cs/FastCharsetProvider.java.i
 data/test/javax/security/auth/Subject/doAs/Test.sh.i
 data/src/share/native/sun/awt/image/jpeg/jmorecfg.h.i
 data/test/java/beans/Introspector/6380849/TestBeanInfo.java.i
-data/src/share/classes/javax/sound/midi/SoundbankResource.java.i
+data/test/sun/net/www/protocol/http/B6518816.java.i
 data/test/javax/rmi/ssl/truststore.i
-data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml.i
+data/test/java/io/SequenceInputStream/ConstructorNull.java.i
 data/test/java/io/Serializable/illegalHandle/negativeHandle.ser.i
 data/test/javax/management/ImplementationVersion/ImplVersionTest.java.i
-data/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties.i
+data/src/solaris/classes/sun/awt/X11InputMethod.java.i
 data/src/share/classes/javax/management/relation/RelationNotFoundException.java.i
 data/src/share/native/sun/security/ec/mpmontg.c.i
-data/src/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java.i
-data/src/share/demo/nbproject/management/VerboseGC/nbproject/file-targets.xml.i
+data/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardMetaServer.java.i
 data/make/tools/swing-beans/beaninfo/images/JScrollPaneMono32.gif.i
-data/make/tools/swing-beans/beaninfo/images/JToggleButtonColor16.gif.i
-data/test/java/nio/channels/Channels/Write.java.i
-data/src/solaris/native/sun/awt/swing_GTKStyle.c.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U8Func.c.i
+data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableMap.java.i
+data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/FileListTransferable.java.i
 data/src/solaris/classes/sun/java2d/xr/GrowableByteArray.java.i
 data/make/tools/swing-beans/beaninfo/images/JSplitPaneColor16.gif.i
 data/src/share/classes/javax/management/GenericMBeanException.java.i
 data/make/java/hpi/Makefile.i
+data/test/java/beans/XMLEncoder/java_awt_Rectangle.java.i
 data/make/java/instrument/Makefile.i
 data/src/share/classes/sun/tracing/PrintStreamProviderFactory.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownSubSystemException.java.i
 data/test/javax/swing/text/NavigationFilter/6735293/bug6735293.java.i
-data/src/solaris/doc/sun/man/man1/rmiregistry.1.i
+data/test/javax/security/auth/Subject/Synch2.policy.i
 data/src/share/classes/sun/text/resources/FormatData_es_PE.java.i
 data/src/share/classes/java/io/IOException.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.h.i
 data/src/share/demo/applets/Blink/Blink.java.i
 data/src/solaris/doc/sun/man/man1/jar.1.i
-data/test/com/sun/jdi/ShellScaffold.sh.i
-data/src/share/native/sun/awt/splashscreen/splashscreen_gfx.h.i
+data/src/share/native/java/util/zip/zlib-1.2.3/uncompr.c.i
 data/test/sun/security/krb5/tools/ktmissing.sh.i
 data/src/share/classes/java/awt/dnd/DnDConstants.java.i
-data/test/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java.i
+data/test/sun/misc/JarIndex/metaInfFilenames/jarA/a/A.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java.i
 data/test/java/nio/channels/FileChannel/Lock.java.i
-data/src/share/javavm/export/classfile_constants.h.i
+data/test/sun/tools/jstat/jstatClassloadOutput1.sh.i
 data/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java.i
 data/test/com/sun/net/httpserver/bugs/B6526913.java.i
 data/src/share/classes/java/awt/event/HierarchyListener.java.i
 data/test/javax/crypto/EncryptedPrivateKeyInfo/GetAlgName.java.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduRequest.java.i
 data/test/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJob.java.i
-data/src/share/native/sun/java2d/pipe/RenderBuffer.c.i
+data/test/java/util/TreeMap/EmptyMapAndNulls.java.i
 data/test/sun/security/pkcs11/Cipher/TestRawRSACipher.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM500.java.i
 data/test/java/rmi/server/RemoteObject/notExtending/NotExtending.java.i
-data/src/share/classes/java/lang/reflect/package-info.java.i
-data/src/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java.i
+data/src/share/classes/sun/misc/PerformanceLogger.java.i
+data/test/java/beans/Introspector/Test4984912.java.i
 data/src/solaris/native/sun/awt/XDrawingArea.h.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/A.1.i
+data/src/share/classes/sun/util/resources/LocaleNames_no.properties.i
+data/test/javax/print/attribute/PSCopiesFlavorTest.java.i
 data/src/share/classes/javax/management/remote/JMXProviderException.java.i
 data/src/solaris/classes/sun/awt/X11/XUtilConstants.java.i
 data/src/solaris/native/sun/xawt/XToolkit.c.i
@@ -19048,245 +19027,248 @@ data/make/common/shared/Compiler-gcc.gmk.i
 data/src/share/sample/scripting/scriptpad/src/scripts/README.txt.i
 data/src/share/classes/sun/util/resources/LocaleNames_sl.properties.i
 data/src/share/classes/sun/security/krb5/internal/ccache/Tag.java.i
-data/test/java/beans/Introspector/memory/SimpleClassLoader.java.i
+data/test/com/sun/tools/attach/java.policy.allow.i
 data/src/share/classes/com/sun/naming/internal/NamedWeakReference.java.i
 data/test/sun/net/www/protocol/jar/jarbug/run.sh.i
-data/test/java/io/RandomAccessFile/OpsAfterClose.java.i
+data/test/sun/nio/cs/OLD/IBM1381_OLD.java.i
 data/src/share/classes/com/sun/crypto/provider/ConstructKeys.java.i
-data/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java.i
-data/src/share/classes/java/util/logging/ErrorManager.java.i
+data/test/java/beans/EventHandler/Test6788531.java.i
+data/src/share/classes/sun/tools/java/IdentifierToken.java.i
 data/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java.i
 data/test/sun/security/pkcs11/KeyStore/BasicData/p11-sca1000.txt.i
-data/src/share/classes/javax/swing/tree/TreeCellEditor.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_PY.properties.i
+data/test/java/nio/channels/Selector/CloseThenRegister.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java.i
 data/src/share/classes/javax/management/MBeanConstructorInfo.java.i
 data/test/com/sun/crypto/provider/Cipher/AES/TestShortBuffer.java.i
 data/make/sun/jdga/Makefile.i
 data/src/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java.i
-data/src/share/demo/applets/Fractal/CLSFractal.java.i
+data/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java.i
 data/src/share/classes/sun/security/util/ManifestEntryVerifier.java.i
 data/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c.i
 data/src/share/classes/sun/reflect/ReflectionFactory.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicButtonListener.java.i
-data/src/solaris/native/sun/awt/awt_util.c.i
+data/src/share/lib/audio/soundbank.gm.d
+data/test/java/security/SecureRandom/sha1prng-new.bin.i
 data/test/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java.i
 data/src/share/classes/sun/reflect/misc/FieldUtil.java.i
-data/make/sun/security/ec/FILES_c.gmk.i
-data/src/share/classes/javax/naming/ReferralException.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/package.html.i
-data/test/sun/nio/cs/Test6254467.java.i
-data/src/solaris/native/sun/java2d/loops/vis_UshortGray_FromRgb.c.i
+data/LICENSE.i
+data/test/java/lang/management/MemoryMXBean/LowMemoryTestSerialGC.sh.i
+data/src/share/native/common/jdk_util.c.i
 data/test/sun/security/krb5/confplusprop.conf.i
-data/src/share/classes/java/util/StringTokenizer.java.i
-data/test/java/security/Security/signedfirst/Dyn.sh.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclItem.java.i
-data/test/java/beans/Introspector/memory/Bean2.java.i
+data/test/java/net/URL/HashCode.java.i
+data/make/tools/swing-beans/beaninfo/images/JRadioButtonColor32.gif.i
+data/test/java/nio/channels/SocketChannel/BufferSize.java.i
+data/src/share/classes/javax/swing/text/PlainDocument.java.i
 data/test/java/nio/channels/Selector/ByteServer.java.i
-data/test/sun/net/www/http/KeepAliveCache/B5045306.java.i
-data/src/share/classes/sun/io/ByteToCharMS932.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Inform.gif.i
+data/test/sun/security/tools/policytool/i18n.sh.i
+data/src/share/native/java/lang/Float.c.i
+data/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java.i
 data/test/java/io/PipedInputStream/ClosedWriter.java.i
 data/src/share/classes/sun/management/counter/ByteArrayCounter.java.i
 data/src/share/classes/javax/imageio/metadata/IIOMetadataNode.java.i
 data/src/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties.i
 data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EtchedBorderUIResource.java.i
 data/test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java.i
-data/test/java/lang/Math/Expm1Tests.java.i
+data/src/share/classes/java/awt/PageAttributes.java.i
 data/test/javax/swing/JColorChooser/Test4193384.java.i
-data/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserConstants.java.i
-data/src/share/classes/com/sun/jmx/remote/internal/NotificationBufferFilter.java.i
-data/test/sun/net/www/protocol/http/HttpInputStream.java.i
+data/test/java/util/zip/ZipInputStream/Constructor.java.i
+data/make/tools/jarreorder/Makefile.i
+data/test/java/nio/file/Files/Misc.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8.c.i
 data/test/sun/security/ssl/sun/net/www/httpstest/HttpCallback.java.i
-data/src/share/classes/java/lang/ref/FinalReference.java.i
+data/test/java/nio/MappedByteBuffer/Truncate.java.i
 data/test/java/rmi/activation/ActivateFailedException/activateFails/security.policy.i
 data/src/share/classes/java/text/Annotation.java.i
 data/test/java/lang/instrument/PremainClass/NoPremainAgent.java.i
 data/src/share/classes/com/sun/jndi/toolkit/ctx/ComponentContext.java.i
 data/test/javax/security/auth/x500/X500Principal/Parse.java.i
 data/src/share/classes/sun/misc/CompoundEnumeration.java.i
-data/test/javax/script/ProviderTest.sh.i
+data/src/share/classes/javax/security/cert/CertificateEncodingException.java.i
 data/src/share/native/sun/security/ec/ecp_aff.c.i
-data/src/share/classes/javax/swing/text/StyleConstants.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_CheckedList.java.i
+data/src/solaris/doc/sun/man/man1/jrunscript.1.i
+data/test/sun/security/pkcs11/Signature/ReinitSignature.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java.i
-data/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh.i
+data/src/solaris/classes/sun/awt/X11/java-icon32.png.i
 data/src/share/classes/sun/util/resources/CurrencyNames_zh_HK.java.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/OriginServer.java.i
 data/src/share/classes/sun/java2d/loops/CompositeType.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthParser.java.i
+data/src/share/classes/org/openjdk/jigsaw/Launcher.java.i
 data/test/sun/security/pkcs11/sslecc/truststore.i
 data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpecTokenizer.java.i
-data/test/java/net/URLConnection/UNCTest.sh.i
-data/test/java/lang/ClassLoader/deadlock/SupBob.java.i
-data/src/share/classes/sun/text/IntHashtable.java.i
+data/src/share/classes/sun/text/resources/FormatData_sr_BA.java.i
+data/test/sun/security/provider/DSA/TestDSA.java.i
+data/src/share/native/sun/font/layout/KhmerReordering.cpp.i
 data/src/share/classes/com/sun/jmx/remote/protocol/rmi/ServerProvider.java.i
-data/test/java/beans/XMLEncoder/java_awt_Rectangle.java.i
-data/src/share/classes/javax/smartcardio/package.html.i
-data/make/tools/jarsplit/Makefile.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java.i
+data/make/sun/awt/FILES_export_windows.gmk.i
+data/src/share/native/sun/java2d/pipe/BufferedRenderPipe.c.i
 data/test/java/math/RoundingMode/RoundingModeTests.java.i
 data/test/java/lang/instrument/appendToClassLoaderSearch/Agent.java.i
 data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.SuSE.properties.i
-data/src/share/native/sun/awt/libpng/pngwtran.c.i
+data/test/java/net/InetAddress/GetLocalHostWithSM.java.i
 data/src/share/classes/javax/print/attribute/DateTimeSyntax.java.i
-data/src/share/native/sun/java2d/loops/ByteBinary4Bit.c.i
+data/test/java/lang/Math/CubeRootTests.java.i
 data/test/javax/swing/JFileChooser/6489130/bug6489130.java.i
 data/make/tools/swing-beans/beaninfo/images/JMenuBarColor32.gif.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java.i
+data/test/java/nio/file/attribute/FileTime/Basic.java.i
 data/make/sun/motif12/reorder-sparcv9.i
-data/src/share/classes/java/nio/channels/DatagramChannel.java.i
-data/src/share/classes/com/sun/pept/presentation/MessageStruct.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java.i
+data/test/java/security/Security/Nulls.java.i
+data/test/java/beans/Performance/TestVetoableChangeSupport.java.i
+data/test/sun/nio/cs/SurrogateTestEUCTW.plane4.surrogates.i
 data/test/java/lang/Integer/Decode.java.i
 data/test/java/util/zip/GZIP/ReadUByte.java.i
 data/test/java/util/Currency/PropertiesTest.sh.i
+data/src/share/classes/java/nio/channels/spi/AbstractSelectionKey.java.i
 data/src/share/classes/java/rmi/server/Skeleton.java.i
+data/test/java/io/BufferedReader/ReadLineSync.java.i
+data/test/java/io/File/WinDeviceName.java.i
 data/src/share/classes/org/openjdk/jigsaw/ContextFactory.java.i
 data/test/java/security/cert/CertPathValidatorException/ReasonTest.java.i
-data/src/share/classes/sun/util/locale/LanguageTag.java.i
-data/make/common/BuildPackages.gmk.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java.i
+data/test/sun/security/pkcs11/Cipher/TestRSACipher.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java.i
-data/src/share/classes/java/lang/SuppressWarnings.java.i
+data/src/share/classes/sun/tools/tree/AssignDivideExpression.java.i
 data/test/java/lang/Class/getDeclaringClass/Sanity.java.i
 data/make/netbeans/swing/nbproject/project.xml.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java.i
 data/test/javax/management/mxbean/CustomTypeTest.java.i
 data/src/share/classes/com/sun/jndi/ldap/EntryChangeResponseControl.java.i
-data/test/sun/net/sdp/ProbeIB.java.i
+data/src/solaris/native/sun/awt/list.h.i
 data/src/share/classes/java/lang/module/ModuleSystem.java.i
-data/make/netbeans/common/windows-view.ent.i
-data/src/share/classes/java/text/spi/BreakIteratorProvider.java.i
-data/src/share/classes/java/nio/file/StandardWatchEventKinds.java.i
+data/test/java/util/logging/GetGlobalTest.java.i
+data/src/windows/native/sun/security/mscapi/security.cpp.i
+data/src/share/classes/sun/java2d/SunGraphics2D.java.i
 data/test/javax/management/monitor/NonComparableAttributeValueTest.java.i
-data/test/java/net/CookieHandler/CookieHandlerTest.java.i
+data/src/share/classes/org/openjdk/jigsaw/Repository.java.i
 data/test/javax/management/timer/StartTest.java.i
 data/test/java/nio/channels/FileChannel/Mode.java.i
-data/src/share/classes/com/sun/java/util/jar/pack/Instruction.java.i
-data/test/java/io/Serializable/nonserializable/ExceptionDetail.java.i
+data/test/java/net/Socket/setReuseAddress/Restart.java.i
+data/make/tools/CharsetMapping/IBM868.map.i
 data/test/java/lang/instrument/NullTransformerAddTest.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/minimize.gif.i
+data/src/share/classes/javax/swing/Scrollable.java.i
 data/src/solaris/native/java/io/UnixFileSystem_md.c.i
-data/src/windows/native/sun/windows/awt_Toolkit.cpp.i
+data/test/javax/management/eventService/UsingEventService.java.i
 data/src/share/classes/java/security/cert/CRL.java.i
 data/src/share/native/sun/font/layout/NonContextualGlyphSubst.h.i
 data/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java.i
-data/src/share/native/sun/font/layout/LookupProcessor.cpp.i
+data/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java.i
 data/src/share/classes/javax/management/ValueExp.java.i
-data/src/share/back/invoker.h.i
+data/src/share/back/stream.c.i
 data/test/com/sun/jdi/GetLocalVariables.java.i
-data/src/share/classes/sun/rmi/server/resources/rmid_ja.properties.i
-data/src/share/classes/java/awt/TextComponent.java.i
-data/src/share/classes/sun/security/util/AuthResources.java.i
+data/src/share/classes/javax/security/auth/PrivateCredentialPermission.java.i
+data/src/share/classes/javax/print/attribute/standard/PrinterMakeAndModel.java.i
+data/test/sun/security/tools/jarsigner/diffend.sh.i
 data/src/share/classes/javax/naming/LinkException.java.i
-data/make/sun/awt/FILES_c_windows.gmk.i
+data/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandardMBean.java.i
 data/src/share/lib/net.properties.i
-data/src/share/native/sun/font/layout/LELanguages.h.i
+data/src/share/classes/sun/tools/jstat/resources/jstat_options.i
 data/make/modules/modules.properties.i
 data/src/share/classes/javax/swing/plaf/basic/BasicHTML.java.i
 data/src/share/sample/vm/clr-jvm/jinvokerExp.h.i
 data/src/share/classes/com/sun/jmx/mbeanserver/package.html.i
 data/test/javax/swing/JEditorPane/6917744/bug6917744.java.i
-data/src/share/classes/sun/font/TextLabelFactory.java.i
+data/src/share/classes/sun/java2d/SurfaceData.java.i
 data/test/com/sun/jdi/DebuggerThreadTest.java.i
 data/test/javax/script/Test8.java.i
 data/src/share/native/sun/font/layout/Features.h.i
 data/test/javax/naming/Name/Serialized13Name.java.i
 data/src/share/classes/java/awt/image/ImageObserver.java.i
 data/test/javax/swing/plaf/metal/MetalBorders/Test6657026.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_U16.c.i
-data/src/share/classes/javax/security/sasl/RealmChoiceCallback.java.i
-data/test/sun/security/pkcs11/Signature/ByteBuffers.java.i
-data/test/java/io/Serializable/unresolvedClassDesc/Foo.java.i
-data/test/java/nio/charset/coders/ref.windows-31j.i
-data/src/share/classes/com/sun/jndi/toolkit/dir/DirSearch.java.i
+data/src/share/classes/sun/nio/cs/MS1254.java.i
+data/test/javax/management/loading/MLetCLR/policy.i
+data/test/java/util/Locale/serialized/java6locale_iw_IL.i
+data/src/share/classes/sun/tools/jar/CommandLine.java.i
+data/src/windows/native/sun/windows/awt_Checkbox.h.i
 data/test/java/math/BigInteger/BigIntegerTest.java.i
 data/src/share/classes/sun/text/resources/FormatData_hu_HU.java.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpIpAddress.java.i
 data/src/solaris/classes/sun/nio/ch/SolarisEventPort.java.i
 data/src/share/classes/sun/net/idn/StringPrepDataReader.java.i
-data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java.i
+data/test/javax/swing/JScrollPane/6559589/bug6559589.java.i
 data/test/java/io/File/SetReadOnly.java.i
 data/test/java/util/logging/SimpleFormatterFormat.java.i
 data/src/share/classes/javax/print/attribute/standard/JobSheets.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java.i
 data/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp.i
 data/src/share/classes/javax/management/openmbean/CompositeType.java.i
 data/src/share/classes/sun/awt/FocusingTextField.java.i
 data/src/share/classes/sun/swing/icon/SortArrowIcon.java.i
 data/src/share/native/com/sun/java/util/jar/pack/jni.cpp.i
-data/make/tools/CharsetMapping/MacDingbat.map.i
+data/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/IndicInputMethodImpl.java.i
-data/src/share/classes/javax/swing/event/ListSelectionListener.java.i
+data/make/docs/Notes.html.i
+data/src/solaris/sample/dtrace/hotspot/method_compile_stat.d.i
 data/test/java/lang/invoke/RicochetTest.java.i
 data/src/share/classes/sun/rmi/transport/tcp/MultiplexOutputStream.java.i
-data/src/share/classes/sun/io/CharToByteMacIceland.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain1.txt.i
-data/test/javax/management/MBeanInfo/TooManyFooTest.java.i
-data/make/netbeans/swing/build.properties.i
+data/test/java/util/logging/LoggingDeadlock.java.i
+data/test/java/net/URLClassLoader/closetest/test1/com/foo/TestClass1.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy33.i
+data/src/share/native/java/lang/fdlibm/src/k_sin.c.i
 data/src/share/classes/sun/invoke/anon/InvalidConstantPoolFormatException.java.i
 data/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java.i
 data/src/share/classes/java/awt/doc-files/Scrollbar-1.gif.i
-data/src/share/demo/management/JTop/JTopPlugin.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so.i
+data/src/share/classes/sun/io/CharToByteCp1144.java.i
 data/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java.i
 data/test/java/lang/invoke/JavaDocExamplesTest.java.i
-data/src/share/classes/sun/nio/cs/ext/ISO_8859_8.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so.d
 data/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password-alt.i
-data/src/share/classes/javax/accessibility/AccessibleExtendedText.java.i
+data/test/sun/tools/jconsole/ResourceCheckTest.java.i
 data/test/java/io/Serializable/evolution/AddedField/ReadAddedField.java.i
-data/src/share/classes/javax/swing/JWindow.java.i
+data/test/javax/sound/midi/Gervill/SF2SoundbankReader/ding.sf2.i
 data/src/share/classes/com/sun/servicetag/UnauthorizedAccessException.java.i
 data/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java.i
 data/test/java/beans/XMLEncoder/java_awt_Dimension.java.i
-data/test/java/io/Serializable/noSuchFieldClarification/NoSuchFieldClarification.java.i
-data/src/share/classes/com/sun/media/sound/SoftSincResampler.java.i
-data/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy22.i
-data/make/tools/strip_properties/Makefile.i
+data/test/java/security/cert/pkix/policyChanges/ee.cer.i
+data/src/share/classes/java/dyn/MethodType.java.i
+data/src/share/classes/sun/reflect/generics/tree/TypeSignature.java.i
+data/test/java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java.i
 data/src/windows/classes/com/sun/tools/jdi/SunSDK.java.i
-data/test/java/rmi/registry/checkusage/CheckUsage.java.i
+data/test/java/awt/dnd/ImageDecoratedDnD/MyCursor.java.i
 data/test/java/io/charStreams/SmallReads.java.i
+data/test/com/sun/net/httpserver/Test7a.java.i
 data/src/windows/native/sun/windows/awt_BitmapUtil.h.i
 data/test/java/lang/annotation/loaderLeak/B.java.i
 data/src/solaris/classes/sun/awt/motif/MFontPeer.java.i
-data/make/tools/src/build/tools/generatecharacter/CharacterName.java.i
+data/test/java/nio/channels/Selector/ReadAfterConnect.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetPropertyInfo.java.i
 data/test/java/net/URLConnection/6212146/test.sh.i
-data/test/java/rmi/reliability/benchmark/bench/serial/SmallObjTrees.java.i
-data/test/java/lang/reflect/Array/ExceedMaxDim.java.i
+data/test/javax/crypto/CryptoPermission/AllPermCheck.java.i
+data/src/share/classes/sun/java2d/pipe/hw/AccelTypedVolatileImage.java.i
 data/test/java/beans/PropertyEditor/6380849/FirstBeanEditor.java.i
-data/test/javax/management/eventService/LeaseTest.java.i
-data/src/share/classes/sun/util/resources/CalendarData_be.properties.i
+data/src/share/classes/javax/swing/plaf/metal/MetalMenuBarUI.java.i
+data/src/share/classes/sun/beans/editors/ByteEditor.java.i
 data/src/share/classes/javax/swing/DefaultComboBoxModel.java.i
-data/src/share/classes/java/util/BitSet.java.i
+data/src/share/classes/javax/swing/colorchooser/CenterLayout.java.i
 data/src/share/classes/java/security/spec/ECPoint.java.i
-data/test/sun/nio/cs/OLD/IBM933_OLD.java.i
-data/src/share/classes/com/sun/beans/finder/ClassFinder.java.i
-data/test/sun/nio/cs/SurrogateTestEUCTW.plane3.surrogates.i
+data/test/sun/tools/jrunscript/jrunscript-fTest.sh.i
+data/src/share/classes/sun/io/ByteToCharCp970.java.i
+data/src/share/classes/java/awt/Component.java.i
+data/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java.i
 data/src/share/classes/sun/misc/JarFilter.java.i
 data/src/share/classes/javax/print/attribute/HashPrintServiceAttributeSet.java.i
-data/src/share/classes/javax/swing/text/html/BlockView.java.i
+data/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java.i
 data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java.i
-data/test/sun/security/tools/policytool/SaveAs.html.i
+data/src/share/demo/jvmti/hprof/hprof_tag.h.i
 data/test/sun/text/resources/Format/Bug5096553.java.i
-data/src/share/classes/javax/imageio/spi/IIOServiceProvider.java.i
+data/src/share/classes/sun/rmi/transport/TransportConstants.java.i
 data/test/java/net/InetAddress/Simple1NameServiceDescriptor.java.i
-data/src/share/demo/README.i
-data/src/share/native/sun/awt/image/cvutils/README.i
+data/test/sun/misc/Encode/DecodeBuffer.java.i
+data/test/org/openjdk/jigsaw/ModuleInfoBuilder.java.i
 data/src/solaris/native/sun/management/FileSystemImpl.c.i
 data/test/java/lang/annotation/UnitTest.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java.i
+data/src/share/classes/sun/print/PSStreamPrintJob.java.i
 data/src/share/classes/sun/security/ssl/SSLContextImpl.java.i
 data/src/share/native/sun/font/FontInstanceAdapter.cpp.i
-data/src/share/classes/sun/awt/resources/awt_ko.properties.i
+data/make/java/zip/reorder-i586.i
+data/src/share/classes/sun/util/resources/CalendarData_lt.properties.i
 data/src/share/sample/jmx/jmx-scandir/nbproject/netbeans-targets.xml.i
 data/test/sun/security/tools/keytool/i18n.sh.i
 data/src/share/native/java/lang/fdlibm/src/s_ilogb.c.i
 data/src/share/classes/overview-bundled.html.i
 data/src/solaris/classes/sun/awt/motif/MMouseDragGestureRecognizer.java.i
 data/src/share/classes/sun/security/provider/DSAPublicKey.java.i
-data/src/share/classes/java/security/interfaces/DSAPrivateKey.java.i
+data/test/java/nio/channels/Pipe/EmptyRead.java.i
 data/src/solaris/doc/sun/man/man1/policytool.1.i
 data/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java.i
 data/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java.i
@@ -19296,7 +19278,8 @@ data/test/java/beans/XMLDecoder/4676532/Test4676532.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh.i
 data/src/share/classes/sun/text/resources/FormatData_iw_IL.java.i
 data/src/share/classes/javax/management/NotificationEmitter.java.i
-data/src/share/classes/javax/naming/NameImpl.java.i
+data/test/sun/nio/cs/OLD/IBM948_OLD.java.i
+data/test/java/rmi/activation/CommandEnvironment/Doctor_Stub.java.i
 data/test/java/security/Security/ClassLoaderDeadlock/Deadlock.java.i
 data/test/java/io/Serializable/enum/constantSubclasses/Read.java.i
 data/test/java/rmi/activation/CommandEnvironment/Eliza.java.i
@@ -19304,42 +19287,41 @@ data/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java.i
 data/test/java/net/ProxySelector/NullArguments.java.i
 data/src/windows/hpi/src/memory_md.c.i
 data/test/sun/java2d/cmm/ColorConvertOp/SRGB.png.d
-data/test/java/awt/FileDialog/MultipleMode/MultipleMode.html.i
+data/src/share/classes/sun/tools/tree/AssignAddExpression.java.i
 data/src/share/sample/jmx/jmx-scandir/truststore.i
 data/test/javax/imageio/plugins/gif/GifTransparencyTest.java.i
-data/src/share/demo/jfc/CodePointIM/README_ja.html.i
+data/src/share/classes/com/sun/media/sound/AbstractLine.java.i
 data/src/share/classes/sun/nio/ch/NativeObject.java.i
 data/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java.i
 data/make/javax/swing/html32dtd/Makefile.i
-data/src/solaris/classes/sun/font/XMap.java.i
+data/src/share/classes/com/sun/net/httpserver/spi/package-info.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java.i
-data/test/java/net/Socket/asyncClose/AsyncCloseTest.java.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/DynamicTest.java.i
+data/test/javax/management/MBeanServer/MBeanServerNotificationTest.java.i
+data/test/sun/security/pkcs11/Secmod/secmod.db.i
 data/make/tools/swing-beans/beaninfo/images/JFileChooserMono16.gif.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/RemoveMarkReset.java.i
-data/src/share/classes/javax/management/remote/JMXConnectorServer.java.i
+data/src/solaris/classes/sun/java2d/xr/XRCompositeManager.java.i
 data/test/java/net/InetAddress/CheckJNI.java.i
 data/src/share/classes/sun/java2d/SunGraphicsEnvironment.java.i
-data/test/sun/security/rsa/GenKeyStore.java.i
+data/src/windows/hpi/src/path_md.c.i
 data/test/tools/launcher/libraryCaller.java.i
 data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/rmid.security.policy.i
 data/test/java/io/Serializable/validate/Validate.java.i
-data/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.i
-data/src/share/classes/java/sql/Blob.java.i
+data/test/java/beans/Beans/6669869/TestDesignTime.java.i
+data/test/java/io/Serializable/subclass/Test.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java.i
-data/test/java/awt/font/NumericShaper/ShapingTest.java.i
+data/src/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java.i
 data/src/share/classes/com/sun/crypto/provider/KeyProtector.java.i
-data/src/share/classes/java/awt/peer/package.html.i
+data/test/java/lang/Class/forName/Z.java.i
 data/src/share/classes/sun/misc/resources/Messages_sv.java.i
 data/src/share/classes/com/sun/jmx/snmp/tasks/Task.java.i
-data/test/javax/xml/crypto/dsig/data/certs/lugh.crt.i
+data/test/sun/nio/cs/EUCJPUnderflowDecodeTest.java.i
 data/test/org/openjdk/jigsaw/optional-base.sh.i
 data/src/share/classes/javax/xml/crypto/dsig/spec/XPathType.java.i
 data/src/share/classes/java/security/cert/CertStoreSpi.java.i
 data/test/java/nio/channels/DatagramChannel/SocketOptionTests.java.i
 data/test/javax/swing/UIDefaults/6795356/SwingLazyValueTest.java.i
 data/src/share/classes/sun/tools/tree/LongExpression.java.i
-data/test/java/awt/Toolkit/Headless/AWTEventListener/AWTListener.java.i
+data/test/java/io/Serializable/superclassDataLoss/run.sh.i
 data/src/windows/native/sun/windows/DllUtil.h.i
 data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.html.i
 data/test/java/lang/instrument/PremainClass/InheritAgent1100.java.i
@@ -19349,15 +19331,16 @@ data/test/java/lang/instrument/ManifestTestAgent.java.i
 data/test/java/nio/Buffer/CopyDirectCharMemory.java.i
 data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorDataException.java.i
 data/test/java/net/URLConnection/Redirect307Test.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_GT.properties.i
-data/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.java.i
-data/test/java/beans/Introspector/Test4918902.java.i
-data/test/java/math/BigDecimal/DivideMcTests.java.i
+data/test/com/sun/nio/sctp/SctpChannel/Connect.java.i
+data/test/java/net/URLClassLoader/getresourceasstream/test.jar.i
+data/src/share/classes/sun/io/CharToByteCp420.java.i
+data/src/share/classes/java/awt/font/LineMetrics.java.i
 data/src/share/classes/sun/tools/jconsole/Utilities.java.i
 data/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java.i
-data/src/share/classes/sun/io/CharToByteCp870.java.i
-data/src/share/classes/javax/sql/rowset/spi/XmlWriter.java.i
-data/src/share/classes/java/awt/geom/Arc2D.java.i
+data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Util.c.i
+data/src/share/instrument/Utilities.h.i
+data/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java.i
+data/src/share/classes/javax/management/relation/RelationServiceNotRegisteredException.java.i
 data/src/share/classes/javax/management/JMRuntimeException.java.i
 data/test/java/security/Security/signedfirst/DynSignedProvFirst.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/DelegatedTaskWrongException.java.i
@@ -19369,99 +19352,100 @@ data/src/share/classes/sun/security/x509/CertificateIssuerUniqueIdentity.java.i
 data/test/java/nio/file/Files/grantTopOnly.policy.i
 data/src/share/classes/java/sql/BatchUpdateException.java.i
 data/test/sun/security/pkcs11/nss/lib/linux-i586/libplds4.so.i
-data/src/share/classes/sun/nio/ch/NativeDispatcher.java.i
+data/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java.i
 data/src/share/classes/java/security/spec/RSAPrivateCrtKeySpec.java.i
-data/src/share/classes/com/sun/jmx/remote/internal/Unmarshal.java.i
-data/test/java/security/KeyStore/keystore.jks.i
+data/src/share/classes/com/sun/jdi/connect/LaunchingConnector.java.i
+data/test/tools/launcher/CreatePlatformFile.java.i
 data/src/share/classes/javax/swing/event/ChangeEvent.java.i
 data/src/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java.i
 data/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c.i
 data/src/share/classes/javax/xml/crypto/package.html.i
-data/src/windows/native/sun/windows/awt_Multimon.h.i
-data/test/com/sun/servicetag/InvalidServiceTag.java.i
+data/test/javax/management/Introspector/ImmutableNotificationInfoTest.java.i
+data/test/sun/tools/jrunscript/hello.js.i
 data/test/sun/security/pkcs11/KeyStore/ClientAuthData/ibutton.cert.i
 data/test/java/beans/Introspector/BeanUtils.java.i
-data/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java.i
+data/src/windows/native/sun/windows/awt_TextArea.h.i
 data/test/java/io/PipedInputStream/WriterLoop.java.i
 data/src/share/classes/javax/swing/plaf/nimbus/package.html.i
-data/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java.i
+data/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java.i
 data/src/windows/native/sun/tools/attach/WindowsVirtualMachine.c.i
 data/src/share/classes/sun/tools/jconsole/Tab.java.i
-data/make/common/Defs-solaris.gmk.i
-data/src/share/classes/sun/util/resources/CalendarData_sr_Latn_RS.properties.i
+data/src/share/classes/sun/java2d/pipe/AAShapePipe.java.i
+data/src/share/classes/sun/security/x509/AVA.java.i
+data/src/share/demo/jfc/Metalworks/resources/HelpFiles/javalogo.gif.i
 data/test/javax/swing/JScrollPane/Test6526631.java.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionCacheSizeTests.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java.i
+data/test/sun/rmi/transport/tcp/blockAccept/TestImpl_Stub.java.i
 data/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMBean.java.i
 data/src/share/classes/sun/security/ssl/KerberosClientKeyExchange.java.i
 data/src/share/classes/sun/security/ssl/RandomCookie.java.i
-data/src/share/classes/javax/sound/sampled/AudioInputStream.java.i
-data/src/share/native/com/sun/media/sound/DirectAudioDevice.c.i
+data/test/javax/rmi/ssl/SSLSocketParametersTest.sh.i
+data/src/solaris/native/sun/awt/awt_Button.c.i
 data/test/java/io/Serializable/unnamedPackageSwitch/run.sh.i
 data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libplds4.so.i
 data/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java.i
-data/src/share/native/sun/java2d/opengl/OGLFuncs.h.i
 data/test/sun/nio/cs/TestMiscEUC_JP.java.i
 data/test/java/beans/Introspector/memory/Test4508780.java.i
-data/src/share/classes/com/sun/tools/hat/internal/model/ReferenceChain.java.i
+data/src/share/native/sun/font/layout/ContextualSubstSubtables.h.i
 data/src/share/native/sun/java2d/opengl/OGLSurfaceData.h.i
-data/src/share/lib/security/java.security-solaris.i
+data/src/share/classes/javax/management/event/EventForwarder.java.i
 data/src/share/classes/sun/security/krb5/internal/crypto/Des3CbcHmacSha1KdEType.java.i
 data/test/sun/nio/cs/Test6275027.java.i
 data/src/share/classes/sun/tools/jconsole/HTMLPane.java.i
-data/src/share/classes/sun/util/calendar/CalendarDate.java.i
-data/make/mkdemo/applets/SpreadSheet/Makefile.i
+data/src/share/classes/sun/dyn/package-info.java.i
+data/make/com/sun/security/auth/module/FILES_export_windows.gmk.i
 data/test/java/net/DatagramSocket/DatagramTimeout.java.i
 data/test/sun/security/pkcs12/PKCS12SameKeyId.java.i
 data/src/share/demo/jvmti/compiledMethodLoad/README.txt.i
-data/test/javax/print/attribute/PSCopiesFlavorTest.java.i
+data/src/share/classes/sun/security/util/Password.java.i
 data/test/java/beans/XMLEncoder/java_awt_RadialGradientPaint.java.i
 data/src/share/classes/com/sun/jdi/IncompatibleThreadStateException.java.i
 data/src/share/classes/javax/naming/directory/InvalidSearchFilterException.java.i
 data/src/solaris/native/sun/awt/awt_xembed_server.c.i
-data/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java.i
+data/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java.i
 data/make/tools/src/build/tools/compileproperties/CompileProperties.java.i
-data/src/share/classes/com/sun/net/httpserver/Filter.java.i
+data/src/share/classes/javax/swing/plaf/multi/MultiProgressBarUI.java.i
 data/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_de_GR.properties.i
-data/test/com/sun/jdi/ControlFlow.java.i
+data/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java.i
 data/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c.i
 data/test/sun/security/pkcs11/Secmod/nss.cfg.i
 data/test/java/awt/font/NumericShaper/MTTest.java.i
 data/test/java/util/LinkedHashMap/Cache.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_ca.properties.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java.i
+data/test/java/net/URL/TestRFC2732.java.i
+data/src/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties.i
 data/src/share/native/com/sun/media/sound/MidiOutDeviceProvider.c.i
 data/src/share/classes/javax/swing/plaf/LayerUI.java.i
-data/src/share/classes/javax/swing/AbstractSpinnerModel.java.i
-data/src/share/classes/sun/awt/image/ImageWatched.java.i
+data/src/solaris/classes/sun/awt/X11/XRootWindow.java.i
+data/src/share/classes/sun/util/resources/TimeZoneNames_ko.java.i
 data/test/com/sun/jdi/FinalizerTest.java.i
-data/test/java/awt/Graphics2D/DrawString/AlphaSurfaceText.java.i
-data/src/share/classes/java/nio/file/LinkPermission.java.i
-data/test/java/awt/Modal/NpeOnClose/NpeOnCloseTest.java.i
+data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java.i
+data/src/share/classes/com/sun/media/sound/SimpleSoundbank.java.i
+data/test/com/sun/security/sasl/PropertiesFileCallbackHandler.java.i
 data/src/share/classes/com/sun/jdi/connect/spi/TransportService.java.i
-data/test/javax/print/applet/applet0/Applet0.java.i
-data/test/java/io/DataInputStream/ReadUTF.java.i
+data/test/javax/sound/midi/File/SMPTESequence.java.i
+data/src/share/classes/sun/security/x509/X509CRLEntryImpl.java.i
 data/test/java/lang/module/module-info-annotation.sh.i
 data/src/windows/native/sun/java2d/windows/Win32SurfaceData.h.i
-data/src/share/classes/sun/tools/asm/LocalVariableTable.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java.i
-data/test/java/nio/file/DirectoryStream/Basic.java.i
-data/make/sun/rmi/rmi/mapfile-vers.i
-data/test/sun/security/ssl/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_tr_TR.properties.i
+data/src/share/classes/sun/net/www/content/text/plain.java.i
+data/test/java/nio/Buffer/BasicChar.java.i
+data/src/share/classes/sun/tools/jconsole/LocalVirtualMachine.java.i
+data/make/tools/CharsetMapping/IBM863.map.i
 data/src/share/classes/sun/security/x509/CRLDistributionPointsExtension.java.i
 data/src/share/classes/sun/management/snmp/AdaptorBootstrap.java.i
+data/src/share/native/sun/font/layout/AnchorTables.cpp.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/AnnotationParser.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM285.java.i
+data/test/java/util/Locale/icuLocales.txt.i
 data/src/share/native/common/jio.c.i
-data/src/share/classes/sun/security/ssl/Record.java.i
+data/test/sun/java2d/cmm/ColorConvertOp/GRAY.png.i
 data/src/share/native/sun/font/layout/SunLayoutEngine.cpp.i
 data/src/windows/native/sun/jkernel/kernel_sv.rc.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java.i
-data/src/share/back/eventHandler.h.i
-data/src/share/classes/sun/java2d/pipe/LoopPipe.java.i
-data/src/share/classes/java/nio/channels/AsynchronousChannel.java.i
+data/src/solaris/native/sun/font/X11FontScaler.c.i
+data/src/share/instrument/EncodingSupport.c.i
+data/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java.i
+data/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java.i
 data/test/java/nio/file/Files/probeContentType/SimpleFileTypeDetector.java.i
 data/src/share/classes/org/openjdk/jigsaw/cli/Packager.java.i
 data/test/java/util/ResourceBundle/Control/StressTest.java.i
@@ -19469,342 +19453,350 @@ data/src/share/classes/javax/management/MBeanServerInvocationHandler.java.i
 data/src/windows/native/sun/jkernel/kernel.rc.i
 data/src/share/classes/java/util/ConcurrentModificationException.java.i
 data/src/solaris/native/sun/net/spi/DefaultProxySelector.c.i
-data/src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java.i
-data/src/share/classes/java/nio/channels/InterruptibleChannel.java.i
-data/src/solaris/sample/dtrace/hotspot_jni/hotspot_jni_calls_tree.d.i
-data/test/java/security/Policy/Dynamic/setpolicy.jp.i
+data/test/com/sun/jdi/VMDeathRequestTest.java.i
+data/src/share/classes/sun/text/resources/FormatData_uk_UA.java.i
+data/src/share/classes/java/dyn/FilterOneArgument.java.i
+data/test/java/awt/PrintJob/MultipleEnd/MultipleEnd.java.i
+data/make/netbeans/common/unix-view.ent.i
 data/src/share/classes/javax/naming/spi/NamingManager.java.i
-data/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java.i
+data/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java.i
 data/test/sun/net/www/protocol/http/B6641309.java.i
-data/src/share/classes/sun/tools/jar/resources/jar.properties.i
-data/make/java/zip/reorder-i586.i
+data/src/solaris/classes/sun/print/services/javax.print.PrintServiceLookup.i
+data/src/share/native/sun/java2d/loops/UshortIndexed.h.i
 data/test/sun/security/krb5/auto/NewSalt.java.i
-data/test/java/awt/Window/TranslucentShapedFrameTest/TSFrame.java.i
-data/test/sun/security/pkcs11/Secmod/Crypto.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java.i
 data/test/java/lang/instrument/PremainClass/InheritAgent0100.java.i
 data/test/javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java.i
-data/src/share/classes/java/nio/channels/Selector.java.i
-data/src/share/classes/sun/reflect/ByteVectorFactory.java.i
+data/src/windows/native/sun/java2d/windows/ddrawObject.h.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientTimeout.java.i
 data/src/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java.i
 data/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmsxform.c.i
+data/src/windows/native/sun/windows/security_warning_bw.ico.i
 data/src/windows/classes/sun/misc/OSEnvironment.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/font/Typeface.java.i
+data/src/share/native/sun/security/ec/ecp_jac.c.i
 data/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh.i
 data/src/windows/classes/sun/awt/windows/fontconfig.properties.i
-data/src/share/classes/sun/nio/cs/ext/MacCroatian.java.i
+data/test/javax/swing/JTable/6735286/bug6735286.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java.i
 data/test/javax/swing/JFileChooser/6738668/security.policy.i
-data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java.i
+data/src/share/classes/sun/text/normalizer/RangeValueIterator.java.i
 data/src/share/classes/javax/management/namespace/package-info.java.i
-data/src/share/classes/javax/imageio/metadata/package.html.i
+data/test/java/beans/XMLEncoder/Test5023550.java.i
 data/src/share/classes/javax/swing/text/DefaultHighlighter.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java.i
+data/test/javax/crypto/spec/DESKeySpec/CheckWeakKeys.java.i
 data/src/share/classes/java/awt/Canvas.java.i
-data/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java.i
-data/make/tools/src/build/tools/jarsplit/JarSplit.java.i
-data/make/sun/xawt/mapfile-vers.i
+data/test/javax/sound/midi/Gervill/DLSSoundbankReader/ding.dls.i
+data/src/share/native/sun/font/layout/LETypes.h.i
+data/test/java/io/charStreams/StringGenerator.java.i
 data/src/share/classes/javax/security/auth/callback/TextInputCallback.java.i
-data/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java.i
-data/src/linux/doc/man/rmic.1.i
+data/src/share/classes/java/lang/IllegalThreadStateException.java.i
+data/src/share/classes/sun/reflect/MethodAccessor.java.i
 data/src/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java.i
 data/test/java/beans/XMLEncoder/javax_swing_tree_TreePath.java.i
 data/test/java/io/Serializable/evolution/AddedExternField/ReadAddedField.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S16Func.c.i
-data/test/java/security/KeyRep/SerialOld.policy.i
+data/src/share/classes/com/sun/security/ntlm/Client.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java.i
-data/src/share/classes/sun/io/CharToByteCp277.java.i
+data/test/javax/swing/JInternalFrame/6726866/bug6726866.java.i
 data/src/share/classes/java/security/interfaces/package.html.i
+data/src/share/demo/jvmti/hprof/hprof_string.h.i
 data/src/share/demo/management/JTop/META-INF/services/com.sun.tools.jconsole.JConsolePlugin.i
-data/src/share/classes/java/lang/ArrayStoreException.java.i
-data/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java.i
+data/test/java/lang/reflect/Proxy/ClassRestrictions.java.i
+data/src/share/classes/javax/management/ClientContext.java.i
 data/test/javax/security/auth/Subject/Synch3.java.i
 data/src/share/classes/sun/security/action/GetBooleanSecurityPropertyAction.java.i
 data/src/share/classes/sun/io/ByteToCharCp857.java.i
-data/test/org/openjdk/jigsaw/InstallFromRepo.java.i
-data/src/share/classes/java/util/Enumeration.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/RemoveMarkReset.java.i
+data/src/share/classes/javax/management/AttributeChangeNotificationFilter.java.i
 data/src/share/classes/com/sun/jndi/ldap/BasicControl.java.i
-data/src/share/native/sun/awt/image/jpeg/jcdctmgr.c.i
-data/src/share/classes/com/sun/beans/finder/AbstractFinder.java.i
+data/src/share/classes/java/awt/color/CMMException.java.i
+data/test/javax/sound/midi/Gervill/SoftTuning/Load6.java.i
+data/src/share/classes/sun/text/resources/FormatData_ar_JO.java.i
+data/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java.i
 data/src/share/classes/java/io/BufferedWriter.java.i
 data/test/java/security/MessageDigest/ByteBuffers.java.i
-data/src/share/classes/com/sun/jdi/request/BreakpointRequest.java.i
-data/test/java/beans/XMLDecoder/spec/TestInt.java.i
+data/src/share/native/sun/java2d/loops/MaskBlit.c.i
+data/test/javax/management/ImplementationVersion/policy.i
 data/src/share/classes/java/awt/im/InputMethodRequests.java.i
 data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/TestUtils.java.i
 data/test/sun/net/www/http/ChunkedOutputStream/checkError.java.i
-data/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServerBuilder.java.i
+data/src/share/classes/sun/font/TextLineComponent.java.i
 data/src/share/native/java/lang/fdlibm/src/s_cos.c.i
 data/src/share/classes/com/sun/tools/hat/internal/oql/ObjectVisitor.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_DO.properties.i
-data/src/share/native/java/lang/Runtime.c.i
+data/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java.i
+data/test/java/text/Format/DateFormat/Bug4396385.java.i
 data/src/share/classes/sun/nio/ch/FileLockImpl.java.i
-data/test/tools/launcher/ChangeDataModel.sh.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/PainterGenerator.java.i
 data/src/share/classes/java/awt/image/ConvolveOp.java.i
 data/src/share/classes/sun/security/pkcs/PKCS8Key.java.i
-data/test/sun/security/krb5/NegativeNonce.java.i
+data/test/javax/imageio/plugins/jpeg/ConcurrentReadingTest.java.i
 data/test/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapBlock.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathContainer.java.i
 data/test/sun/tools/jhat/ParseTest.sh.i
 data/test/javax/security/auth/Subject/doAs/policy.i
-data/test/javax/crypto/Mac/TestGetInstance.java.i
+data/src/share/demo/nbproject/jfc/SampleTree/nbproject/file-targets.xml.i
 data/test/sun/security/x509/AVA/Allow.policy.i
 data/src/share/classes/javax/swing/plaf/metal/MetalButtonUI.java.i
-data/test/tools/jar/index/MetaInf.java.i
-data/src/share/classes/java/security/cert/CertStoreException.java.i
+data/test/javax/swing/JSlider/6348946/bug6348946.java.i
+data/src/solaris/classes/sun/awt/X11/XContentWindow.java.i
 data/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java.i
-data/src/share/classes/java/beans/PropertyChangeSupport.java.i
-data/make/java/jli/mapfile-vers.i
-data/test/java/net/URLClassLoader/sealing/Makefile.i
-data/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java.i
+data/test/com/sun/servicetag/environ.properties.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java.i
+data/test/demo/jvmti/hprof/StackMapTableTest.java.i
+data/test/java/io/Serializable/duplicateSerialFields/Setup.java.i
 data/test/java/nio/channels/FileChannel/ScatteringRead.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_ko.properties.i
-data/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java.i
+data/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt.i
+data/src/windows/native/sun/windows/awt_Scrollbar.h.i
+data/test/org/openjdk/jigsaw/hello-optional.sh.i
 data/src/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java.i
 data/src/share/classes/com/sun/nio/sctp/Notification.java.i
-data/src/share/classes/com/sun/media/sound/SF2Instrument.java.i
+data/test/sun/nio/cs/SurrogateTestEUCTW.plane6.surrogates.i
 data/test/java/util/Timer/Args.java.i
 data/src/share/classes/sun/io/ByteToCharISO8859_9.java.i
-data/src/share/classes/sun/text/resources/FormatData_sq.java.i
+data/test/java/rmi/server/RMIClassLoader/spi/TestProvider.java.i
 data/test/sun/util/resources/TimeZone/Bug6271396.java.i
 data/test/com/sun/crypto/provider/Cipher/DES/DesAPITest.java.i
-data/src/share/classes/sun/print/resources/serviceui_it.properties.i
-data/src/share/classes/java/util/prefs/package.html.i
-data/src/share/classes/sun/security/tools/JarSignerResources_ja.java.i
-data/src/share/classes/javax/net/ssl/TrustManagerFactory.java.i
+data/test/sun/security/pkcs11/fips/certs/anchor.cer.i
+data/test/javax/imageio/CachePremissionsTest/CachePermissionsTest.java.i
+data/src/share/classes/java/util/spi/LocaleServiceProvider.java.i
+data/test/sun/tools/native2ascii/A2N_4630463.i
 data/test/java/io/File/Create.java.i
 data/src/share/native/common/jlong.h.i
 data/src/share/native/sun/awt/image/cvutils/img_orddither.h.i
 data/test/sun/security/krb5/auto/MoreKvno.java.i
 data/src/solaris/classes/sun/nio/ch/SctpResultContainer.java.i
 data/src/share/classes/java/lang/Character.java.i
-data/src/share/classes/com/sun/jmx/defaults/package.html.i
+data/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.c.i
 data/src/solaris/classes/sun/java2d/opengl/GLXSurfaceData.java.i
-data/test/java/util/Formatter/BasicShort.java.i
-data/src/share/demo/nbproject/jfc/SwingApplet/build.xml.i
+data/test/java/io/Serializable/primitiveClasses/PrimitiveClasses.java.i
+data/test/java/rmi/registry/interfaceHash/InterfaceHash.java.i
 data/test/java/util/Formatter/BasicCharObject.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/BadKSProvider.java.i
 data/src/share/classes/java/lang/OutOfMemoryError.java.i
-data/src/share/classes/java/awt/doc-files/CheckboxGroup-1.gif.i
+data/src/windows/native/sun/windows/awt_PrintDialog.cpp.i
 data/src/share/classes/sun/util/resources/CalendarData_is.properties.i
 data/test/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html.i
-data/src/share/classes/java/math/package-info.java.i
-data/src/share/classes/com/sun/crypto/provider/DESParameters.java.i
-data/test/com/sun/tools/extcheck/TestExtcheckArgs.java.i
+data/src/solaris/classes/sun/awt/motif/MScrollPanePeer.java.i
+data/test/java/lang/instrument/bootreporter/StringIdCallbackReporter.java.i
+data/test/java/nio/file/Files/walkFileTree/MaxDepth.java.i
 data/test/java/lang/Class/getMethods/StarInheritance.java.i
-data/make/tools/CharsetMapping/KOI8_R.map.i
+data/test/java/awt/Color/OpacityChange/OpacityChange.java.i
 data/test/java/io/PushbackReader/MarkReset.java.i
 data/src/share/classes/sun/font/FileFont.java.i
-data/test/java/io/charStreams/LineLengthsSource.java.i
+data/test/sun/management/jmxremote/bootstrap/Utils.java.i
 data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_en.properties.i
-data/src/share/classes/java/awt/color/ColorSpace.java.i
-data/make/tools/src/build/tools/jdwpgen/ArrayObjectTypeNode.java.i
+data/src/solaris/native/sun/awt/awt_Selection.c.i
+data/test/sun/rmi/rmic/defaultStubVersion/G1.java.i
 data/src/share/classes/java/awt/EventFilter.java.i
 data/test/com/sun/jdi/RedefineImplementor.sh.i
-data/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java.i
+data/src/share/classes/sun/io/ByteToCharCp424.java.i
 data/test/java/nio/charset/coders/Surrogate.java.i
-data/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/minimize-pressed.gif.i
 data/src/share/classes/sun/awt/resources/awt_es.properties.i
-data/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh.i
 data/test/javax/crypto/SecretKeyFactory/Provider1.java.i
 data/src/share/back/StringReferenceImpl.c.i
 data/test/sun/nio/cs/TestIBM1364.java.i
 data/src/share/native/sun/awt/image/cvutils/img_scaleloop.h.i
-data/src/share/classes/sun/util/resources/CalendarData_pt.properties.i
-data/src/share/classes/java/util/TimerTask.java.i
+data/test/java/awt/font/NumericShaper/ShapingTest.java.i
+data/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java.i
 data/test/sun/security/krb5/tools/KtabCheck.java.i
 data/src/share/classes/sun/rmi/server/UnicastServerRef2.java.i
-data/test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java.i
+data/test/java/util/PluggableLocale/providersrc/DateFormatProviderImpl.java.i
 data/src/share/classes/sun/security/provider/SHA.java.i
 data/make/sun/awt/FILES_c_unix.gmk.i
-data/src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/SunJmxMBeanServer.java.i
 data/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java.i
-data/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java.i
-data/src/share/classes/sun/security/ssl/Krb5Proxy.java.i
+data/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java.i
+data/src/share/classes/sun/net/smtp/SmtpClient.java.i
 data/test/javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java.i
 data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMNetMaskV6.java.i
-data/src/share/classes/sun/reflect/generics/repository/MethodRepository.java.i
-data/src/share/classes/sun/management/VMManagement.java.i
+data/test/java/net/URLEncoder/URLEncodeDecode.java.i
+data/src/share/classes/sun/security/provider/certpath/ForwardState.java.i
 data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMib.java.i
 data/src/share/classes/javax/swing/event/InternalFrameEvent.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java.i
+data/test/java/nio/channels/Selector/KeysReady.java.i
 data/src/share/native/sun/font/layout/SegmentSingleProcessor.cpp.i
-data/test/java/io/StringWriter/NegativeBufferSize.java.i
-data/test/java/lang/Double/Constants.java.i
+data/test/sun/java2d/DirectX/DrawBitmaskToSurfaceTest.java.i
+data/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java.i
 data/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java.i
-data/src/share/classes/javax/sql/rowset/Joinable.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorVersionException.java.i
+data/src/share/classes/sun/text/normalizer/UnicodeMatcher.java.i
+data/src/share/sample/nio/server/BP.java.i
 data/test/com/sun/security/sasl/gsskerb/AuthOnly.java.i
-data/src/share/native/sun/java2d/opengl/OGLRenderQueue.c.i
-data/src/share/classes/javax/swing/border/BevelBorder.java.i
-data/src/share/classes/java/awt/GridLayout.java.i
-data/src/share/classes/sun/java2d/FontSupport.java.i
+data/test/java/io/Serializable/InvalidClassException/noargctor/DefaultPackage.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityException.java.i
+data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubBulkRequestHandler.java.i
+data/src/share/classes/sun/text/bidi/BidiRun.java.i
 data/src/share/instrument/InstrumentationImplNativeMethods.c.i
 data/test/javax/management/namespace/QueryNamesTest.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java.i
 data/src/share/classes/sun/net/idn/UCharacterEnums.java.i
-data/src/share/classes/sun/tools/tree/ByteExpression.java.i
+data/src/solaris/native/sun/awt/fontpath.c.i
 data/test/sun/rmi/rmic/newrmic/equivalence/OrangeImpl.java.i
 data/test/java/lang/instrument/bootreporter/StringIdCallback.java.i
-data/src/share/classes/sun/util/calendar/CalendarUtils.java.i
+data/test/java/awt/PrintJob/ConstrainedPrintingTest/ConstrainedPrintingTest.java.i
 data/src/share/native/sun/font/layout/GlyphSubstLookupProc.h.i
 data/src/windows/classes/sun/security/smartcardio/PlatformPCSC.java.i
-data/test/java/net/SocketInputStream/SocketClosedException.java.i
+data/test/java/security/BasicPermission/PermClass.1.4.i
 data/test/java/beans/PropertyChangeSupport/Test4682386.java.i
 data/src/solaris/native/sun/awt/awt_Plugin.h.i
+data/src/share/classes/javax/imageio/stream/package.html.i
 data/test/com/sun/security/sasl/ntlm/NTLMTest.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif.i
+data/test/sun/management/jmxremote/bootstrap/rmiregistryssl.properties.i
 data/src/share/back/eventHandlerRestricted.h.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java.i
+data/test/sun/security/provider/PolicyParser/ExtDirs.java.i
 data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy.i
 data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ConnectionTest.java.i
-data/src/share/classes/sun/net/httpserver/HttpsServerImpl.java.i
-data/src/share/classes/javax/naming/ldap/ManageReferralControl.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/IntArrayCalls.java.i
 data/test/sun/security/action/GetLongAction/ReturnNullIfNoDefault.java.i
 data/make/tools/CharsetMapping/IBM871.nr.i
 data/src/share/classes/sun/util/resources/CurrencyNames_fr_BE.properties.i
 data/test/javax/management/loading/GetMBeansFromURLTest.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java.i
-data/make/tools/swing-beans/beaninfo/images/JProgressBarColor16.gif.i
+data/make/com/sun/jndi/cosnaming/Makefile.i
 data/test/java/nio/channels/SocketChannel/CloseTimeoutChannel.java.i
 data/src/share/demo/jfc/TableExample/OldJTable.java.i
 data/src/share/classes/sun/io/CharToByteCp1251.java.i
-data/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java.i
-data/src/share/classes/java/awt/doc-files/Checkbox-1.gif.i
+data/src/share/classes/com/sun/naming/internal/VersionHelper.java.i
+data/make/netbeans/common/closed-share-view.ent.i
 data/test/com/sun/nio/sctp/SctpMultiChannel/Branch.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ClientThread.java.i
-data/test/sun/security/rsa/TestKeyPairGeneratorLength.java.i
-data/test/com/sun/net/httpserver/Test8a.java.i
+data/test/com/sun/jdi/RedefineCrossStart.java.i
+data/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java.i
 data/src/share/classes/org/ietf/jgss/package.html.i
 data/test/java/beans/PropertyEditor/6380849/ThirdBean.java.i
 data/src/share/classes/java/beans/PropertyDescriptor.java.i
-data/src/share/demo/jfc/Metalworks/UISwitchListener.java.i
+data/src/share/native/sun/awt/image/jpeg/jdapistd.c.i
+data/test/java/io/LineNumberReader/ReadReadLine.java.i
+data/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java.i
 data/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvIndex3_8_8nw.c.i
+data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipInfo.java.i
 data/src/share/sample/nio/server/Sendable.java.i
 data/src/solaris/classes/sun/nio/ch/SinkChannelImpl.java.i
 data/src/share/classes/com/sun/java/util/jar/pack/PropMap.java.i
 data/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c.i
 data/src/solaris/native/java/io/io_util_md.h.i
-data/src/solaris/native/sun/awt/CUPSfuncs.c.i
+data/test/java/nio/Buffer/BasicShort.java.i
 data/src/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java.i
-data/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java.i
-data/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java.i
+data/src/share/classes/javax/swing/JMenuBar.java.i
+data/test/javax/security/auth/login/Configuration/GetInstance.java.i
+data/src/solaris/classes/sun/awt/X11/XDesktopPeer.java.i
 data/make/sun/javazic/tzdata_jdk/gmt.i
 data/src/share/native/java/lang/fdlibm/src/s_erf.c.i
 data/test/javax/management/context/localizable/WhatsitMBean.java.i
 data/test/sample/mergesort/MergeSortTest.java.i
-data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiIn.cpp.i
+data/test/com/sun/crypto/provider/Cipher/KeyWrap/NISTWrapKAT.java.i
 data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties.i
-data/test/javax/swing/plaf/basic/BasicScrollPaneUI/Test6632810.java.i
+data/src/windows/classes/sun/awt/windows/WMenuBarPeer.java.i
 data/src/share/classes/sun/security/pkcs/PKCS9Attribute.java.i
 data/test/tools/launcher/DefaultLocaleTest.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/question.png.i
 data/test/java/io/PushbackInputStream/MarkReset.java.i
 data/test/com/sun/jndi/cosnaming/IiopUrlIPv6.java.i
 data/test/java/net/URL/ParseURL.java.i
-data/test/javax/management/mxbean/customtypes/IntegerIsStringFactory.java.i
-data/test/java/awt/regtesthelpers/process/ProcessResults.java.i
-data/src/share/classes/sun/tools/tree/BreakStatement.java.i
+data/make/sun/jawt/Depend.mak.i
+data/src/share/classes/java/awt/print/Paper.java.i
+data/src/solaris/classes/sun/print/AttributeClass.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java.i
-data/src/share/demo/jvmti/hprof/hprof_table.h.i
-data/test/com/sun/net/httpserver/Test12.java.i
+data/src/share/native/sun/java2d/opengl/OGLFuncs.h.i
+data/test/java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java.i
 data/src/solaris/classes/sun/nio/fs/UnixUriUtils.java.i
-data/src/share/classes/java/beans/DefaultPersistenceDelegate.java.i
-data/src/share/classes/javax/xml/crypto/dsig/dom/DOMSignContext.java.i
+data/make/modules/jdk.depconfig.i
+data/src/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java.i
 data/test/java/nio/file/Files/ContentType.java.i
 data/src/share/classes/sun/font/AttributeMap.java.i
 data/src/windows/classes/sun/awt/windows/WTextFieldPeer.java.i
 data/make/tools/swing-beans/beaninfo/images/JMenuBarMono16.gif.i
-data/src/share/classes/java/security/PolicySpi.java.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java.i
 data/src/share/classes/sun/text/resources/FormatData_es_CR.java.i
 data/src/share/classes/com/sun/jdi/ClassLoaderReference.java.i
 data/test/com/sun/jdi/SuspendThreadTest.java.i
-data/make/java/java/reorder-sparcv9.i
 data/src/share/classes/sun/nio/cs/ext/IBM942.java.i
-data/make/tools/CharsetMapping/IBM285.c2b.i
-data/src/windows/native/common/jlong_md.h.i
-data/src/share/classes/javax/naming/NameClassPair.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_en_GB.properties.i
-data/test/javax/management/namespace/SerialParamProcessorTest.java.i
-data/src/solaris/native/sun/java2d/loops/mlib_v_ImageXor.c.i
-data/make/tools/CharsetMapping/IBM1026.c2b.i
-data/test/com/sun/tools/attach/SimpleProvider.java.i
-data/src/share/classes/java/util/concurrent/ExecutorCompletionService.java.i
-data/test/sun/net/www/http/HttpClient/OpenServer.java.i
+data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/group.security.policy.i
+data/test/java/util/concurrent/CopyOnWriteArraySet/RacingCows.java.i
+data/test/demo/jvmti/hprof/HeapBinaryFormatTest.java.i
+data/test/javax/smartcardio/Serialize.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMSecurityDefs.java.i
+data/src/share/classes/sun/print/resources/serviceui_it.properties.i
+data/test/java/io/Serializable/oldTests/CheckingEquality.java.i
+data/src/share/classes/com/sun/tools/attach/AgentInitializationException.java.i
+data/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TSFrame.java.i
+data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties.i
 data/src/share/native/java/lang/fdlibm/src/w_atan2.c.i
 data/test/javax/naming/ldap/LdapName/RdnMisc.java.i
 data/src/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java.i
-data/src/share/classes/javax/swing/text/html/HTMLFrameHyperlinkEvent.java.i
-data/src/share/classes/javax/swing/text/NavigationFilter.java.i
+data/test/javax/print/attribute/GetCopiesSupported.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java.i
 data/test/sun/java2d/cmm/ColorConvertOp/ImageComparator.java.i
-data/src/share/classes/sun/instrument/InstrumentationImpl.java.i
+data/test/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.java.i
 data/src/share/javavm/include/typedefs.h.i
 data/src/share/classes/com/sun/beans/WeakCache.java.i
 data/src/windows/native/sun/windows/awt_DrawingSurface.cpp.i
 data/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java.i
+data/test/sun/rmi/rmic/newrmic/equivalence/CountServerImpl.java.i
 data/test/java/lang/reflect/Proxy/nonJavaNames/Test.java.i
-data/src/share/classes/java/awt/DisplayMode.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java.i
+data/src/share/classes/sun/util/calendar/ZoneInfoFile.java.i
+data/test/javax/script/CommonSetup.sh.i
 data/src/share/classes/javax/swing/event/DocumentEvent.java.i
 data/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java.i
-data/src/share/native/sun/font/layout/TrimmedArrayProcessor.h.i
-data/test/java/beans/Statement/Test6224433.java.i
-data/test/javax/management/monitor/MBeanServerForwarderInvocationHandler.java.i
-data/src/share/classes/com/sun/security/sasl/CramMD5Server.java.i
-data/test/java/awt/Mixing/MixingInHwPanel.java.i
+data/src/share/native/java/lang/fdlibm/src/e_gamma_r.c.i
+data/test/java/net/URLConnection/xml/xml3.i
+data/src/share/classes/javax/security/auth/login/AccountNotFoundException.java.i
+data/src/share/classes/sun/rmi/transport/tcp/TCPConnection.java.i
+data/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java.i
 data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/JarFileSystemProvider.java.i
 data/src/share/classes/sun/io/CharToByteEUC_CN.java.i
 data/src/share/classes/sun/dyn/JavaMethodHandle.java.i
-data/src/share/classes/sun/security/acl/AllPermissionsImpl.java.i
+data/test/javax/management/modelmbean/SimpleModelMBean/logging.properties.i
 data/test/sun/tools/common/CommonTests.sh.i
-data/make/tools/src/build/tools/fontchecker/README.txt.i
-data/src/share/classes/java/lang/CloneNotSupportedException.java.i
-data/test/javax/management/namespace/NamespaceCreationTest.java.i
-data/src/share/classes/java/net/URL.java.i
+data/test/java/rmi/activation/Activatable/restartLatecomer/rmid.security.policy.i
+data/test/java/beans/XMLEncoder/6329581/Test6329581.java.i
+data/src/share/classes/sun/tools/javac/BatchParser.java.i
+data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemMono32.gif.i
 data/src/solaris/doc/sun/man/man1/jinfo.1.i
-data/src/share/classes/sun/tools/tree/ForStatement.java.i
+data/test/java/util/ResourceBundle/Test4314141.java.i
 data/src/share/classes/java/util/regex/package.html.i
-data/src/share/instrument/JPLISAgent.c.i
+data/src/share/native/sun/security/ec/impl/ec.c.i
 data/test/java/beans/PropertyEditor/TestFontClassNull.java.i
-data/test/java/util/ResourceBundle/TestResource_it.java.i
+data/src/share/native/sun/java2d/loops/IntArgbBm.h.i
 data/src/share/native/sun/java2d/cmm/lcms/cmserr.c.i
-data/src/windows/classes/sun/java2d/windows/WinVolatileSurfaceManager.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/DoubleCalls.java.i
 data/make/sun/javazic/tzdata/asia.i
 data/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java.i
-data/src/share/classes/sun/tools/jconsole/OverviewTab.java.i
+data/test/java/awt/regtesthelpers/AbstractTest.java.i
 data/src/share/native/sun/awt/image/jpeg/jcapistd.c.i
 data/test/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.spi.TransportService.i
-data/src/share/classes/sun/nio/cs/UTF_16LE.java.i
 data/make/netbeans/common/closed-share-sources.ent.i
 data/make/com/sun/inputmethods/Makefile.i
-data/src/share/classes/java/awt/print/PrinterJob.java.i
-data/test/java/rmi/server/RMIClassLoader/spi/TestProvider2.java.i
+data/src/share/classes/java/security/Guard.java.i
+data/test/sun/net/www/http/HttpClient/ProxyTest.java.i
 data/src/share/classes/sun/awt/im/SimpleInputMethodWindow.java.i
+data/src/solaris/demo/jni/Poller/PollingServer.java.i
 data/src/solaris/classes/sun/java2d/xr/XRColor.java.i
-data/src/share/classes/java/awt/Component.java.i
+data/src/share/classes/sun/tools/java/AmbiguousClass.java.i
 data/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java.i
 data/src/share/classes/java/dyn/JavaMethodHandle.java.i
 data/make/tools/swing-beans/beaninfo/images/JSpinnerColor32.gif.i
-data/src/share/native/sun/security/ec/impl/secitem.c.i
-data/src/share/classes/sun/text/resources/FormatData_en_IN.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java.i
+data/src/windows/native/sun/windows/awt_Pen.h.i
 data/src/share/native/sun/font/layout/IndicReordering.cpp.i
 data/src/solaris/classes/java/lang/UNIXProcess.java.solaris.i
-data/src/share/demo/nbproject/management/FullThreadDump/nbproject/file-targets.xml.i
+data/src/share/classes/java/awt/event/ActionEvent.java.i
 data/src/solaris/classes/sun/awt/motif/MComponentPeer.java.i
 data/test/java/io/PipedOutputStream/DeadReader.java.i
-data/src/share/native/common/jni_util.h.i
+data/src/solaris/native/common/jlong_md.h.i
 data/test/com/sun/security/auth/callback/TextCallbackHandler/Default.java.i
 data/src/share/classes/sun/security/util/DerValue.java.i
-data/test/java/security/cert/CertPathValidator/targetConstraints/ValidateTargetConstraints.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_SV.properties.i
-data/src/share/native/java/lang/fdlibm/src/w_lgamma_r.c.i
-data/src/share/classes/com/sun/management/UnixOperatingSystemMXBean.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/crisubn.jks.i
+data/src/share/classes/javax/swing/table/TableColumn.java.i
+data/src/windows/native/sun/windows/awt_Toolkit.cpp.i
+data/test/sun/tools/jconsole/ImmutableResourceTest.sh.i
 data/src/share/classes/sun/util/resources/CurrencyNames_ja_JP.properties.i
-data/test/javax/security/auth/login/Configuration/GetInstanceSecurity.policy.i
-data/src/share/classes/javax/management/event/EventConsumer.java.i
+data/test/java/nio/file/Path/TemporaryFiles.java.i
+data/make/tools/src/build/tools/jdwpgen/CommandNode.java.i
 data/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties.i
 data/test/java/io/Externalizable/compatibility/ExternalizableBlockData.java.i
-data/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template.i
+data/src/share/classes/sun/net/www/protocol/http/Negotiator.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/package.html.i
 data/make/sun/security/smartcardio/FILES_c.gmk.i
 data/src/share/classes/javax/management/remote/JMXServiceURL.java.i
@@ -19826,11 +19818,11 @@ data/src/share/classes/sun/java2d/Spans.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java.i
 data/src/share/classes/javax/swing/plaf/metal/icons/ocean/expanded.gif.i
 data/test/java/io/FileOutputStream/FinalizeShdCallClose.java.i
-data/src/share/classes/sun/java2d/cmm/CMSManager.java.i
-data/src/share/demo/nbproject/management/JTop/nbproject/project.xml.i
-data/src/solaris/native/sun/java2d/loops/vis_ByteIndexed.c.i
-data/src/share/classes/javax/swing/KeyboardManager.java.i
-data/test/java/net/URLConnection/GetXmlContentType.java.i
+data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties.i
+data/test/java/nio/channels/FileChannel/AtomicAppend.java.i
+data/src/windows/classes/sun/net/NetHooks.java.i
+data/src/share/classes/sun/security/util/ByteArrayTagOrder.java.i
+data/test/javax/security/auth/login/LoginContext/ResetConfigModule.java.i
 data/test/java/util/ResourceBundle/Bug6355009.java.i
 data/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c.i
 data/src/windows/native/sun/windows/GDIHashtable.h.i
@@ -19843,87 +19835,88 @@ data/test/java/rmi/server/getRemoteClass/GetRemoteClass.java.i
 data/test/sun/nio/cs/SJISCanEncode.java.i
 data/src/share/classes/javax/swing/SpinnerDateModel.java.i
 data/src/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java.i
-data/src/share/classes/java/util/ArrayDeque.java.i
+data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java.i
 data/test/java/util/zip/NoExtensionSignature.java.i
-data/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java.i
-data/src/share/classes/javax/print/attribute/URISyntax.java.i
-data/src/share/native/java/util/zip/zlib-1.2.3/inftrees.c.i
+data/src/share/classes/javax/management/monitor/GaugeMonitorMBean.java.i
+data/src/share/classes/javax/swing/ListModel.java.i
 data/test/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java.i
 data/src/share/classes/sun/security/validator/EndEntityChecker.java.i
-data/src/share/demo/jvmti/hprof/hprof_init.h.i
+data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableRandomAccessList.java.i
 data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java.i
 data/test/java/lang/instrument/RedefineMethodAddInvokeApp.java.i
-data/test/java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java.i
-data/test/java/rmi/activation/Activatable/extLoadedImpl/security.policy.i
+data/test/javax/script/Test4.js.i
+data/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.i
 data/test/org/openjdk/jigsaw/cli/tsca-cert.pem.i
-data/src/share/classes/com/sun/crypto/provider/HmacCore.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedMap.java.i
+data/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java.i
+data/src/share/classes/com/sun/tools/hat/internal/model/ReferenceChain.java.i
 data/src/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java.i
 data/make/tools/CharsetMapping/IBM277.nr.i
 data/test/java/lang/instrument/NullTransformerRemoveTest.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java.i
+data/src/share/classes/java/util/logging/LoggingProxyImpl.java.i
 data/src/share/classes/javax/security/auth/login/CredentialExpiredException.java.i
-data/test/java/rmi/reliability/scripts/create_benchmark_jars.ksh.i
-data/src/windows/classes/sun/awt/windows/WPopupMenuPeer.java.i
+data/make/tools/GenerateCharacter/check_class.c.template.i
+data/make/sun/nio/Makefile.i
 data/src/share/classes/javax/swing/plaf/synth/ColorType.java.i
 data/src/windows/classes/sun/awt/windows/fontconfig.Me.properties.i
 data/make/modules/jdk7.depconfig.i
 data/src/windows/classes/com/sun/management/OperatingSystem.java.i
 data/src/windows/instrument/FileSystemSupport_md.h.i
 data/test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so.d
-data/test/java/util/concurrent/ConcurrentHashMap/DistinctEntrySetElements.java.i
-data/src/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java.i
-data/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp.i
+data/test/java/lang/ClassLoader/resource.jar.i
+data/test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so.i
+data/test/javax/management/namespace/JMXNamespaceViewTest.java.i
 data/src/share/classes/javax/management/namespace/JMXRemoteNamespace.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java.i
+data/test/javax/management/MBeanServer/PreRegisterTest.java.i
 data/test/com/sun/net/httpserver/Test.java.i
 data/src/share/classes/sun/io/ByteToCharGBK.java.i
 data/test/java/util/ResourceBundle/Control/Bug6530694_de_DE.properties.i
-data/src/share/classes/java/security/interfaces/DSAParams.java.i
-data/src/share/classes/sun/io/CharToByteISO8859_5.java.i
-data/src/share/classes/javax/swing/plaf/MenuBarUI.java.i
+data/test/java/rmi/registry/interfaceHash/ReferenceRegistryStub.java.i
+data/src/share/classes/sun/nio/cs/UTF_16LE.java.i
+data/src/share/classes/org/openjdk/jigsaw/ModuleFileFormat.java.i
 data/src/share/classes/sun/nio/ch/SocketChannelImpl.java.i
-data/src/share/native/java/lang/fdlibm/src/e_exp.c.i
+data/src/share/classes/sun/text/normalizer/UCharacterPropertyReader.java.i
 data/test/java/security/UnresolvedPermission/AccessorMethods.java.i
 data/src/share/classes/java/nio/file/AtomicMoveNotSupportedException.java.i
+data/src/share/classes/java/lang/module/ModuleView.java.i
+data/src/solaris/classes/sun/awt/X11/XInputMethodDescriptor.java.i
 data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ActivateMe.java.i
 data/src/share/classes/javax/security/cert/package.html.i
-data/src/share/classes/javax/crypto/BadPaddingException.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java.i
-data/src/share/classes/com/sun/jmx/namespace/package.html.i
-data/make/com/sun/java/pack/mapfile-vers.i
+data/src/share/classes/sun/beans/editors/IntegerEditor.java.i
+data/make/sun/jdbc/Makefile.i
+data/test/java/awt/EventQueue/SecondaryLoopTest/SecondaryLoopTest.java.i
+data/src/share/classes/javax/swing/WindowConstants.java.i
 data/test/javax/management/remote/mandatory/subjectDelegation/policy15.i
 data/src/share/classes/java/util/MissingFormatArgumentException.java.i
 data/test/java/security/KeyPairGenerator/GenerateRSAKeyPair.java.i
 data/src/share/classes/sun/dyn/SpreadGeneric.java.i
 data/src/share/back/debugDispatch.c.i
 data/src/solaris/demo/jigsaw/basic/env.sh.i
-data/src/share/classes/sun/security/provider/MD5.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c.i
 data/test/java/lang/Byte/Decode.java.i
 data/make/sun/awt/mawt.gmk.i
 data/test/java/io/Serializable/subclass/AbstractObjectOutputStream.java.i
 data/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java.i
-data/test/java/security/ProtectionDomain/RecursionDebug.java.i
-data/make/tools/CharsetMapping/IBM930.nr.i
-data/src/share/classes/javax/sound/sampled/UnsupportedAudioFileException.java.i
+data/test/org/openjdk/jigsaw/cli/prikey.pem.i
+data/src/share/sample/scripting/scriptpad/src/META-INF/manifest.mf.i
+data/test/java/text/Collator/Bug6970930.java.i
 data/src/share/classes/sun/tools/tree/AssignBitXorExpression.java.i
 data/src/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java.i
 data/make/modules/jdk.swing.ls.i
 data/test/javax/imageio/stream/StreamCloserLeak/testapp/Main.java.i
-data/src/share/classes/sun/net/www/http/ChunkedInputStream.java.i
+data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/Receiver.java.i
 data/src/share/classes/java/awt/font/ShapeGraphicAttribute.java.i
 data/test/org/openjdk/jigsaw/install-repo.sh.i
-data/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java.i
+data/src/share/classes/sun/security/krb5/KrbApRep.java.i
 data/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java.i
-data/test/com/sun/jdi/SourceNameFilterTest.java.i
+data/src/share/classes/javax/management/Description.java.i
 data/src/linux/doc/man/appletviewer.1.i
-data/src/share/classes/sun/launcher/resources/launcher_ja.properties.i
+data/src/share/classes/sun/management/LazyCompositeData.java.i
 data/test/javax/swing/SwingUtilities/6797139/bug6797139.java.i
 data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java.i
 data/src/share/classes/sun/reflect/generics/scope/MethodScope.java.i
 data/test/org/openjdk/jigsaw/resource.sh.i
 data/src/share/classes/sun/jvmstat/monitor/event/VmListener.java.i
-data/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java.i
+data/src/share/native/sun/security/ec/impl/ecl-curve.h.i
 data/test/sun/net/www/protocol/http/StackTraceTest.java.i
 data/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java.i
 data/test/java/util/ResourceBundle/Test4314141B.java.i
@@ -19932,7 +19925,7 @@ data/src/solaris/doc/sun/man/man1/apt.1.i
 data/test/javax/management/context/localizable/Whatsit.java.i
 data/src/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java.i
 data/test/java/io/BufferedWriter/Cleanup.java.i
-data/src/share/classes/sun/rmi/runtime/RuntimeUtil.java.i
+data/src/share/classes/sun/rmi/transport/ConnectionInputStream.java.i
 data/test/java/awt/PrintJob/Text/stringwidth.sh.i
 data/src/share/native/sun/management/ClassLoadingImpl.c.i
 data/make/tools/swing-beans/beaninfo/images/JScrollBarColor32.gif.i
@@ -19940,173 +19933,176 @@ data/src/share/classes/sun/util/calendar/TzIDOldMapping.java.i
 data/test/java/lang/instrument/RedefineMethodAddInvokeTarget_2.java.i
 data/test/sun/management/HotspotThreadMBean/GetInternalThreads.java.i
 data/test/sun/security/pkcs11/Provider/Login-nss.txt.i
-data/test/java/beans/XMLEncoder/EnumPrivate.java.i
-data/test/javax/security/auth/login/Configuration/GetInstance.java.i
-data/test/javax/management/loading/DocumentRootTest.java.i
-data/src/share/native/sun/java2d/loops/IntRgb.c.i
-data/src/share/native/common/gdefs.h.i
+data/src/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java.i
+data/test/java/awt/regtesthelpers/process/ProcessResults.java.i
+data/src/share/classes/sun/io/ByteToCharCp1253.java.i
+data/src/share/classes/sun/print/PrintJob2D.java.i
+data/test/java/util/ArrayList/EnsureCapacity.java.i
 data/src/share/classes/sun/java2d/pisces/LineSink.java.i
-data/src/share/native/sun/java2d/loops/AnyInt.c.i
-data/make/netbeans/common/file-view.ent.i
-data/make/java/redist/fonts/Makefile.i
+data/test/sun/net/www/http/HttpClient/StreamingRetry.java.i
+data/test/java/lang/ThreadLocal/ImmutableLocal.java.i
+data/test/sun/security/util/HostnameMatcher/cert4.crt.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java.i
+data/src/solaris/classes/sun/awt/motif/MCustomCursor.java.i
 data/src/windows/native/sun/jkernel/graphics/java-icon.ico.i
-data/src/share/classes/sun/awt/AWTAccessor.java.i
+data/test/java/util/TimSort/README.i
 data/src/share/classes/java/lang/UnsatisfiedLinkError.java.i
-data/src/share/classes/javax/accessibility/AccessibleBundle.java.i
+data/make/sun/Makefile.i
 data/src/share/classes/sun/security/provider/ParameterCache.java.i
-data/src/windows/native/sun/security/smartcardio/pcsc_md.h.i
-data/test/java/security/cert/CertPathBuilder/GetInstance.java.i
-data/make/tools/CharsetMapping/IBM420.map.i
+data/test/java/rmi/transport/checkFQDN/CheckFQDN_Stub.java.i
+data/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java.i
+data/src/share/classes/com/sun/jdi/LongType.java.i
 data/src/share/classes/java/security/NoSuchAlgorithmException.java.i
 data/src/share/classes/javax/swing/SpringLayout.java.i
 data/src/windows/classes/sun/awt/windows/WPageDialog.java.i
 data/test/java/net/Socket/DeadlockTest.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java.i
+data/test/javax/script/RhinoExceptionTest.java.i
 data/make/tools/src/build/tools/javazic/Timezone.java.i
 data/src/share/classes/sun/io/CharToByteCp1142.java.i
-data/test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java.i
-data/src/share/classes/com/sun/jndi/ldap/VersionHelper.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpIndex.java.i
+data/test/java/rmi/server/useCustomRef/UseCustomRef_Stub.java.i
 data/src/share/classes/sun/security/krb5/internal/Krb5.java.i
 data/src/share/classes/sun/reflect/generics/visitor/Visitor.java.i
 data/src/share/classes/javax/naming/ConfigurationException.java.i
 data/test/java/lang/management/ManagementFactory/ProxyExceptions.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java.i
+data/src/share/classes/javax/swing/plaf/SplitPaneUI.java.i
 data/test/java/beans/Statement/Test6707226.java.i
 data/test/java/lang/Class/forName/classes/plus.class.i
-data/src/solaris/demo/jigsaw/basic/setup.sh.i
+data/test/java/io/File/FileMethods.java.i
 data/test/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java.i
 data/src/share/classes/sun/text/resources/CollationData_zh.java.i
 data/test/java/io/Serializable/enum/classObject/Test.java.i
 data/src/share/classes/javax/sound/midi/VoiceStatus.java.i
-data/test/java/nio/channels/Selector/LotsOfUpdates.java.i
+data/test/java/io/Serializable/packageAccess/A.java.i
 data/src/share/classes/com/sun/media/sound/SoftLinearResampler.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/package.html.i
 data/test/javax/script/Test2.js.i
-data/test/sun/nio/cs/OLD/X11GB2312_OLD.java.i
-data/test/sun/tools/jps/jps-Vvml_Output1.awk.i
+data/test/java/rmi/Naming/RmiIsNoScheme.java.i
 data/make/tools/classanalyzer/src/com/sun/classanalyzer/PackageInfo.java.i
 data/src/windows/native/sun/windows/awt_Font.cpp.i
 data/make/tools/reorder/Makefile.i
 data/src/share/classes/com/sun/java/browser/dom/DOMAction.java.i
 data/src/share/demo/applets/BarChart/example1.html.i
-data/test/java/nio/channels/FileChannel/Pwrite.java.i
-data/test/java/security/SecureClassLoader/DefineClassByteBuffer.java.i
+data/test/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java.i
 data/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java.i
 data/src/share/classes/com/sun/media/sound/Toolkit.java.i
 data/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java.i
-data/src/windows/classes/sun/nio/fs/WindowsSecurity.java.i
+data/src/share/classes/sun/awt/resources/awt_pt_BR.properties.i
 data/src/share/classes/sun/reflect/NativeMethodAccessorImpl.java.i
 data/src/solaris/classes/sun/awt/X11/XMSelection.java.i
 data/src/share/classes/sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java.i
-data/src/share/classes/java/rmi/server/RMISocketFactory.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java.i
+data/src/solaris/classes/sun/awt/X11/XSelection.java.i
+data/src/windows/native/sun/java2d/windows/dxCapabilities.cpp.i
 data/test/sun/net/ftp/B6427768.java.i
-data/src/share/demo/jfc/Notepad/README.txt.i
+data/src/share/sample/vm/clr-jvm/invoker.cs.i
+data/make/tools/src/build/tools/jdwpgen/Main.java.i
 data/src/share/classes/java/io/FilenameFilter.java.i
 data/test/sun/security/pkcs11/nss/lib/solaris-i586/libnspr4.so.i
 data/src/share/native/sun/security/ec/impl/ecp_224.c.i
-data/test/java/net/URLClassLoader/ClassPathTest.java.i
+data/src/share/classes/java/util/logging/ErrorManager.java.i
 data/test/java/beans/XMLEncoder/java_awt_AWTKeyStroke.java.i
-data/src/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java.i
-data/src/share/classes/sun/management/MemoryNotifInfoCompositeData.java.i
+data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanManagerTest.java.i
+data/make/com/sun/sql/Makefile.i
 data/test/java/lang/Class/getEnclosingClass/EnclosingClass.java.i
-data/make/tools/src/build/tools/spp/Spp.java.i
+data/src/share/classes/sun/swing/text/TextComponentPrintable.java.i
 data/test/java/rmi/transport/dgcDeadLock/security.policy.i
-data/test/java/lang/Double/ParseHexFloatingPoint.java.i
-data/test/java/lang/instrument/ExampleRedefine.java.i
+data/test/java/rmi/activation/Activatable/restartCrashedService/ActivateMe.java.i
+data/src/windows/native/java/net/Inet6AddressImpl.c.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java.i
 data/test/java/nio/channels/spi/AsynchronousChannelProvider/CheckProvider.java.i
-data/src/share/classes/java/awt/image/CropImageFilter.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapResult.java.i
+data/src/share/classes/sun/text/resources/FormatData_lt_LT.java.i
+data/test/java/util/Vector/SerializationDeadlock.java.i
+data/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java.i
 data/test/sun/security/tools/policytool/UpdatePermissions.java.i
-data/test/java/util/ResourceBundle/Control/BadStaticInitRB.java.i
-data/src/share/classes/sun/tools/jstat/Identifier.java.i
-data/src/share/classes/sun/io/ByteToCharCp948.java.i
-data/make/mkdemo/jvmti/waiters/Makefile.i
+data/test/javax/swing/JLayer/6824395/bug6824395.java.i
+data/test/javax/management/eventService/EventClientThreadTest.java.i
+data/src/windows/native/sun/nio/ch/FileDispatcherImpl.c.i
+data/src/share/classes/sun/management/HotspotThreadMBean.java.i
 data/make/tools/CharsetMapping/IBM930.c2b.i
-data/src/share/classes/sun/tools/jconsole/resources/connected16.png.i
-data/test/java/net/InetAddress/HashSpread.java.i
+data/test/javax/crypto/spec/DESKeySpec/CheckParity.java.i
+data/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer_Stub.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_sr_RS.properties.i
 data/src/share/classes/sun/security/krb5/internal/crypto/Crc32CksumType.java.i
-data/make/common/shared/Compiler.gmk.i
 data/test/javax/xml/crypto/dsig/data/certs/nemain.crt.i
 data/src/solaris/classes/sun/awt/X11/XDnDConstants.java.i
-data/src/windows/classes/sun/awt/windows/awtLocalization_sv.properties.i
 data/src/share/native/sun/awt/medialib/mlib_ImageCheck.h.i
 data/make/sun/font/t2k/mapfile-vers.i
-data/src/share/native/com/sun/media/sound/Ports.h.i
-data/src/share/classes/java/lang/reflect/GenericSignatureFormatError.java.i
-data/src/share/classes/com/sun/jdi/event/ThreadStartEvent.java.i
-data/make/java/nio/genCoder.sh.i
+data/test/sun/security/krb5/auto/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
+data/test/sun/security/krb5/RFC396xTest.java.i
+data/src/share/classes/sun/java2d/SunCompositeContext.java.i
+data/test/java/util/Locale/bug6277243.java.i
 data/src/share/native/sun/font/layout/SingleSubstitutionSubtables.h.i
-data/test/sun/net/www/MarkResetTest.java.i
+data/test/java/util/PluggableLocale/providersrc/java.text.spi.DecimalFormatSymbolsProvider.i
 data/test/java/net/InetAddress/CachedUnknownHostName.java.i
 data/test/java/rmi/reliability/benchmark/bench/rmi/IntCalls.java.i
-data/src/share/classes/java/util/MissingResourceException.java.i
+data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Globals.java.i
 data/test/java/rmi/reliability/benchmark/bench/serial/BooleanArrays.java.i
 data/src/share/classes/java/awt/dnd/DragSourceListener.java.i
-data/src/share/classes/com/sun/crypto/provider/CipherTextStealing.java.i
-data/src/share/classes/java/awt/print/PrinterException.java.i
+data/test/java/security/Signature/NONEwithRSA.java.i
+data/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandard.java.i
 data/src/solaris/classes/sun/awt/X11/ToplevelStateListener.java.i
 data/src/share/classes/java/lang/ClassFormatError.java.i
-data/src/share/classes/com/sun/tools/jdi/LocationImpl.java.i
-data/src/share/classes/java/nio/charset/CoderMalfunctionError.java.i
-data/src/share/classes/sun/text/resources/CollationData_fr.java.i
+data/test/java/io/PipedReader/Ready.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/config.i
+data/make/tools/javazic/Makefile.i
+data/src/share/native/sun/awt/splashscreen/splashscreen_gif.c.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java.i
 data/src/share/native/com/sun/media/sound/PortMixer.c.i
 data/src/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java.i
-data/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_hu.properties.i
-data/src/share/classes/javax/imageio/stream/package.html.i
-data/src/share/native/sun/awt/libpng/pngstruct.h.i
+data/test/sun/net/www/protocol/jar/jarbug/src/jar1/GetResource.java.i
+data/test/java/lang/Short/ByteSwap.java.i
+data/src/share/classes/com/sun/net/httpserver/package-info.java.i
 data/src/share/classes/sun/util/resources/CalendarData_mt_MT.properties.i
 data/test/demo/jvmti/Context.java.i
 data/src/share/classes/javax/swing/text/AbstractWriter.java.i
-data/src/share/native/sun/awt/image/gif/gifdecoder.c.i
-data/src/share/classes/com/sun/servicetag/SolarisServiceTag.java.i
-data/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter.i
+data/src/share/native/sun/management/MemoryPoolImpl.c.i
+data/test/java/util/PluggableLocale/LocaleNameProviderTest.sh.i
+data/src/share/classes/javax/print/attribute/standard/NumberOfDocuments.java.i
 data/src/share/classes/java/awt/peer/CanvasPeer.java.i
 data/src/share/classes/sun/rmi/rmic/Main.java.i
-data/test/javax/management/generified/ListTypeCheckTest.java.i
+data/test/sun/security/pkcs11/KeyStore/Basic.policy.i
 data/test/java/rmi/reliability/benchmark/bench/XmlReporter.java.i
-data/test/java/rmi/server/RemoteObject/toStub/ToStub.java.i
+data/src/share/native/java/security/AccessController.c.i
 data/src/share/native/sun/java2d/opengl/OGLMaskBlit.h.i
-data/src/linux/doc/man/ja/jps.1.i
+data/src/share/native/sun/font/layout/ContextualGlyphInsertion.h.i
 data/test/java/security/Permission/ToString.java.i
 data/src/share/demo/jfc/TableExample/TableExample3.java.i
 data/test/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.html.i
-data/src/windows/resource/icons/awt.ico.i
+data/test/tools/pack200/pack200-verifier/src/xmlkit/ClassSyntax.java.i
 data/test/java/rmi/transport/dgcDeadLock/Test.java.i
-data/src/share/classes/com/sun/jdi/PrimitiveType.java.i
-data/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java.i
+data/src/share/classes/com/sun/jmx/remote/internal/ClientListenerInfo.java.i
+data/src/share/classes/com/sun/jndi/rmi/registry/RemoteReference.java.i
+data/src/share/classes/javax/management/MBeanServerDelegate.java.i
 data/test/java/awt/MultipleGradientPaint/MultiGradientTest.java.i
 data/test/sun/tools/jstat/snap1.awk.i
-data/src/share/classes/java/io/InputStreamReader.java.i
-data/test/sun/net/www/protocol/http/ResponseCacheStream.java.i
+data/src/share/classes/sun/security/krb5/internal/AuthContext.java.i
+data/test/java/rmi/testlibrary/README.jcov.i
 data/test/java/lang/instrument/ilib/Inject.java.i
 data/test/java/net/Socket/FDClose.java.i
 data/src/share/classes/javax/management/event/EventClientNotFoundException.java.i
 data/make/tools/CharsetMapping/IBM918.nr.i
-data/test/java/util/zip/input.jar.i
 data/src/share/native/sun/java2d/loops/AnyInt.h.i
-data/src/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java.i
-data/test/java/net/Authenticator/B4769350.java.i
-data/src/share/classes/java/net/CookieManager.java.i
+data/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties.i
+data/test/sun/tools/native2ascii/test3.i
+data/src/share/classes/java/awt/Rectangle.java.i
+data/src/windows/classes/sun/security/mscapi/Key.java.i
 data/src/share/native/sun/java2d/ShaderList.h.i
 data/src/share/classes/javax/swing/DebugGraphicsInfo.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java.i
+data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java.i
 data/src/share/classes/javax/swing/plaf/basic/BasicTransferable.java.i
+data/src/share/back/eventHandler.h.i
 data/test/sun/net/www/ftptest/FtpServer.java.i
 data/src/share/classes/sun/nio/ch/exceptions.i
 data/src/share/classes/javax/crypto/ShortBufferException.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_ME.properties.i
-data/test/javax/swing/text/html/TableView/7030332/sample2.png.i
-data/test/javax/swing/border/Test6978482.java.i
+data/src/solaris/classes/sun/awt/X11/generator/functions.txt.i
+data/src/share/classes/sun/security/util/DerInputStream.java.i
 data/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.java.i
 data/src/share/classes/sun/reflect/ClassDefiner.java.i
-data/test/java/awt/Mixing/Validating.java.i
-data/src/solaris/native/sun/awt/colordata.h.i
-data/test/java/security/cert/CertificateFactory/SlowStream.java.i
+data/test/com/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider.i
+data/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java.i
+data/make/java/redist/fonts/Makefile.i
+data/src/windows/native/sun/windows/awt_TrayIcon.cpp.i
 data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Delayed.java.i
 data/src/share/classes/javax/net/SocketFactory.java.i
 data/src/share/classes/javax/swing/text/DefaultCaret.java.i
@@ -20117,178 +20113,178 @@ data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java.i
 data/test/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java.i
 data/test/sun/rmi/rmic/newrmic/equivalence/ServerImpl.java.i
 data/src/solaris/native/sun/java2d/loops/vis_FuncArray.c.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain0.txt.i
-data/src/solaris/native/sun/java2d/loops/vis_AlphaMaskBlit.c.i
+data/src/share/classes/javax/management/openmbean/MXBeanMappingFactoryClass.java.i
+data/test/java/beans/Performance/TestPropertyChangeSupport.java.i
 data/src/share/classes/sun/tools/tree/InlineMethodExpression.java.i
-data/src/share/classes/javax/management/BetweenQueryExp.java.i
+data/test/java/net/InetAddress/WhiteSpaceHostTest.java.i
 data/test/javax/swing/JColorChooser/Test4759934.java.i
 data/src/share/demo/jfc/Font2DTest/resources/TextResources_de.properties.i
-data/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java.i
+data/make/tools/CharsetMapping/IBM737.map.i
+data/test/org/openjdk/jigsaw/_JigsawVersionQuery.java.i
 data/test/sun/security/krb5/confplusprop2.conf.i
 data/test/com/sun/jdi/sde/InstallSDE.java.i
 data/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java.i
-data/test/javax/swing/JTextArea/7049024/bug7049024.java.i
-data/src/share/classes/sun/io/ByteToCharISO2022.java.i
-data/src/share/classes/javax/swing/text/html/BRView.java.i
+data/src/linux/doc/man/jarsigner.1.i
+data/src/share/native/sun/font/layout/HangulLayoutEngine.h.i
+data/src/share/classes/sun/tools/tree/ConstantExpression.java.i
+data/src/share/native/java/util/zip/zlib-1.2.3/inffast.h.i
 data/test/java/util/zip/ZipFile/ShortRead.java.i
-data/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java.i
+data/test/com/sun/tools/attach/RedefineAgent.java.i
 data/src/share/classes/javax/management/remote/JMXAddressable.java.i
 data/src/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java.i
 data/src/share/classes/java/util/logging/FileHandler.java.i
-data/src/share/classes/com/sun/media/sound/SunFileReader.java.i
-data/make/tools/swing-beans/beaninfo/images/JLayeredPaneMono32.gif.i
-data/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java.i
-data/test/com/sun/jdi/CountFilterTest.java.i
-data/src/share/classes/com/sun/jdi/TypeComponent.java.i
-data/src/share/classes/java/nio/file/attribute/DosFileAttributeView.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java.i
+data/test/sun/security/provider/SeedGenerator/Priority_Inversion.java.i
+data/test/java/util/concurrent/ScheduledThreadPoolExecutor/DecorateTask.java.i
+data/test/com/sun/jdi/TemplateTest.java.i
+data/test/javax/management/query/QueryNotifFilterTest.java.i
+data/src/share/classes/java/rmi/activation/ActivationGroup.java.i
 data/src/windows/classes/sun/java2d/d3d/D3DBackBufferSurfaceData.java.i
-data/src/share/classes/java/rmi/ServerError.java.i
+data/test/com/sun/jdi/MixedSuspendTest.sh.i
 data/src/share/native/sun/awt/image/jpeg/jconfig.h.i
 data/src/share/classes/com/sun/jdi/event/WatchpointEvent.java.i
 data/test/com/sun/crypto/provider/Cipher/RSA/oaep-vect.txt.i
 data/test/java/beans/XMLEncoder/Test4625418.java.i
-data/src/share/classes/sun/io/CharToByteMacThai.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java.i
 data/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java.i
 data/src/share/sample/jmx/jmx-scandir/docfiles/connect-local-ant-run.jpg.i
+data/src/solaris/classes/sun/awt/X11/MWMConstants.java.i
 data/make/java/net/FILES_c.gmk.i
-data/src/share/classes/sun/tools/tree/BitOrExpression.java.i
-data/src/share/classes/sun/text/resources/FormatData_fi.java.i
-data/test/com/sun/net/httpserver/SelCacheTest.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ca_ES.properties.i
+data/test/tools/pack200/Pack200Props.java.i
+data/test/java/util/PluggableLocale/providersrc/LocaleNames_ja_JP_kyoto.properties.i
 data/src/share/classes/javax/management/loading/ClassLoaderRepository.java.i
 data/test/org/openjdk/jigsaw/cli/jmod-signed.sh.i
 data/test/com/sun/jdi/FilterMatch.java.i
-data/src/share/classes/javax/net/ssl/SSLContext.java.i
 data/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java.i
-data/test/sun/security/pkcs11/Secmod/nsstrust.cfg.i
+data/src/share/classes/javax/swing/text/html/parser/DTDConstants.java.i
 data/test/javax/security/auth/login/LoginContext/ConfigConstructor.policy.i
 data/src/share/native/sun/security/ec/ecp_mont.c.i
-data/src/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java.i
+data/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java.i
 data/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.java.i
 data/src/share/classes/javax/sound/midi/ControllerEventListener.java.i
-data/src/share/classes/sun/nio/cs/ext/MacRomania.java.i
-data/src/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java.i
+data/make/com/sun/security/auth/module/FILES_export_unix.gmk.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java.i
 data/src/share/native/java/lang/fdlibm/src/w_cosh.c.i
 data/src/share/classes/sun/management/resources/agent.properties.i
-data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnClass.java.i
+data/src/share/classes/java/sql/PreparedStatement.java.i
 data/test/com/sun/net/httpserver/bugs/B6401598.java.i
 data/src/share/classes/javax/security/auth/x500/package.html.i
 data/src/solaris/classes/sun/awt/motif/MCanvasPeer.java.i
-data/src/share/classes/java/lang/management/MemoryManagerMXBean.java.i
+data/test/javax/management/mxbean/RandomMXBeanTest.java.i
 data/src/share/classes/sun/net/idn/UCharacterDirection.java.i
 data/test/sun/net/www/protocol/jar/jarbug/src/test/JarTest.java.i
 data/src/share/classes/java/security/interfaces/RSAPrivateCrtKey.java.i
-data/src/share/classes/java/security/cert/CollectionCertStoreParameters.java.i
-data/src/share/classes/sun/text/resources/FormatData_ru_RU.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/LayerContainer.java.i
-data/src/windows/resource/version.rc.i
-data/src/share/classes/sun/tools/tree/IfStatement.java.i
-data/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so.d
-data/src/share/classes/java/awt/color/ICC_ColorSpace.java.i
-data/test/java/beans/XMLEncoder/Test6176120.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java.i
-data/src/share/native/sun/awt/image/jpeg/jdpostct.c.i
-data/src/share/demo/jvmti/hprof/hprof_check.c.i
-data/test/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java.i
-data/src/share/classes/sun/font/FontManagerFactory.java.i
-data/src/share/classes/java/awt/geom/PathIterator.java.i
-data/test/java/net/URLClassLoader/B6896088.java.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java.i
+data/test/java/lang/instrument/ilib/Injector.java.i
+data/test/java/util/EnumSet/SmallEnumIteratorRemoveResilience.java.i
+data/test/sun/security/krb5/ParseConfig.java.i
+data/test/java/io/File/MaxPathLength.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/ding.sf2.i
+data/src/share/classes/com/sun/rowset/RowSetFactoryImpl.java.i
+data/test/java/beans/XMLEncoder/Test6176120.java.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java.i
+data/src/share/native/sun/awt/image/jpeg/jdpostct.c.i
+data/src/share/demo/jvmti/hprof/hprof_check.c.i
+data/test/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java.i
+data/src/windows/classes/sun/awt/windows/awtLocalization_sv.properties.i
+data/test/java/security/KeyRep/RC5.pre.1.5.key.i
+data/test/java/rmi/Naming/UnderscoreHost_Stub.java.i
 data/test/java/lang/Boolean/MakeBooleanComparable.java.i
-data/src/solaris/native/sun/awt/awt_Scrollbar.c.i
+data/test/java/lang/reflect/Proxy/returnTypes/GetCloneable.java.i
 data/src/share/native/sun/font/layout/HebrewShaping.h.i
-data/src/share/classes/sun/print/PSPathGraphics.java.i
+data/src/share/classes/sun/security/pkcs11/Token.java.i
 data/src/share/classes/sun/misc/Signal.java.i
-data/src/share/classes/sun/nio/cs/ext/MS949.java.i
-data/src/share/classes/java/lang/annotation/Documented.java.i
+data/src/share/classes/com/sun/media/sound/SF2Soundbank.java.i
 data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java.i
 data/src/share/classes/sun/dyn/util/VerifyType.java.i
 data/src/share/classes/sun/tools/tree/FieldExpression.java.i
 data/test/javax/swing/JFileChooser/4150029/bug4150029.html.i
-data/src/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java.i
+data/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java.i
 data/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java.i
 data/test/sun/security/jgss/GssNPE.java.i
 data/src/share/classes/java/io/PipedReader.java.i
 data/test/java/util/concurrent/BlockingQueue/Interrupt.java.i
-data/src/share/classes/java/security/cert/CertSelector.java.i
-data/src/share/classes/javax/swing/event/MenuDragMouseListener.java.i
+data/test/java/util/Map/Get.java.i
+data/test/java/text/Format/DateFormat/WeekDateTest.java.i
 data/src/share/native/sun/awt/libpng/pngconf.h.i
-data/src/share/classes/sun/tools/tree/LessExpression.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/J2DBench.java.i
+data/src/solaris/javavm/export/jni_md.h.i
+data/src/solaris/classes/sun/awt/motif/X11SunUnicode_0.java.i
 data/src/share/classes/com/sun/tools/jdi/VMState.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Certificate.java.i
-data/src/share/native/sun/security/ec/impl/ec2_aff.c.i
+data/test/sun/security/krb5/ktab/HighestKvno.java.i
 data/test/java/awt/Container/ValidateRoot/InvalidateMustRespectValidateRoots.java.i
 data/test/java/util/zip/ZipFile/ReleaseInflater.java.i
-data/src/share/classes/sun/security/ssl/ServerHandshaker.java.i
+data/src/share/classes/javax/naming/event/NamespaceChangeListener.java.i
 data/make/tools/CharsetMapping/IBM1112.map.i
-data/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java.i
-data/test/sun/security/provider/PolicyParser/UnresolvedProperty.policy.i
-data/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/CloseTest.java.i
+data/src/windows/native/sun/windows/awt_Window.h.i
+data/test/sun/security/pkcs11/Provider/ConfigQuotedString.java.i
 data/test/java/beans/PropertyEditor/TestDoubleTypeNull.java.i
-data/src/share/classes/sun/text/resources/unorm.icu.i
-data/test/sun/security/krb5/auto/BadKdc4.java.i
+data/test/javax/management/ObjectName/SerialCompatTest.java.i
+data/test/java/util/TreeMap/NullAtEnd.java.i
 data/test/java/security/Security/signedfirst/StaticSignedProvFirst.java.i
 data/test/sun/security/util/HostnameMatcher/TestHostnameChecker.java.i
-data/src/share/classes/sun/rmi/server/ActivatableRef.java.i
-data/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java.i
+data/test/sun/security/util/BitArray/NamedBitList.java.i
+data/src/share/classes/java/math/SignedMutableBigInteger.java.i
 data/src/share/classes/com/sun/tools/attach/AttachPermission.java.i
 data/test/javax/script/Test7.js.i
 data/test/sun/nio/cs/TestISO2022CNDecoder.java.i
-data/src/share/classes/com/sun/media/sound/DLSInstrument.java.i
+data/src/windows/classes/sun/java2d/d3d/D3DContext.java.i
 data/src/share/classes/javax/swing/JLabel.java.i
-data/src/share/classes/sun/nio/ch/AllocatedNativeObject.java.i
+data/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so.i
 data/test/javax/xml/crypto/dsig/KeySelectors.java.i
-data/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java.i
 data/src/share/demo/nbproject/management/FullThreadDump/nbproject/project.xml.i
-data/src/share/classes/java/rmi/registry/LocateRegistry.java.i
-data/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java.i
-data/src/share/native/sun/font/layout/KernTable.h.i
-data/src/share/native/java/lang/fdlibm/src/w_gamma.c.i
-data/src/share/classes/sun/security/provider/DSAPrivateKey.java.i
+data/src/share/demo/nbproject/jfc/TableExample/build.xml.i
+data/test/com/sun/jdi/CatchPatternTest.sh.i
+data/test/javax/management/remote/mandatory/version/ImplVersionCommand.java.i
+data/test/com/sun/jdi/ShellScaffold.sh.i
 data/test/sun/security/util/Oid/S11N.sh.i
-data/src/share/classes/com/sun/imageio/stream/StreamCloser.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMeta.java.i
 data/test/java/io/Serializable/backRefCNFException/Read.java.i
 data/src/share/classes/sun/text/resources/FormatData_de_CH.java.i
 data/test/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java.i
-data/src/share/classes/sun/net/httpserver/LeftOverInputStream.java.i
-data/src/share/classes/java/util/prefs/NodeChangeEvent.java.i
+data/test/java/util/Hashtable/SimpleSerialization.java.i
+data/test/java/beans/PropertyEditor/TestEnumSubclassValue.java.i
 data/src/share/demo/nbproject/jfc/SampleTree/build.properties.i
 data/test/java/nio/charset/coders/FullRead.java.i
 data/src/share/classes/java/beans/Expression.java.i
-data/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher.i
+data/make/tools/swing-beans/beaninfo/images/JMenuColor16.gif.i
 data/test/java/util/ResourceBundle/RBTestFmwk.java.i
-data/test/com/sun/jdi/EnumTest.java.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpSecurityParameters.java.i
-data/test/java/rmi/server/RMIClassLoader/spi/Property.java.i
+data/src/share/classes/javax/swing/tree/TreeSelectionModel.java.i
 data/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java.i
 data/src/share/classes/java/rmi/activation/ActivationSystem.java.i
 data/src/share/classes/java/lang/invoke/MethodHandleImpl.java.i
-data/test/sun/security/pkcs11/ec/p12passwords.txt.i
-data/src/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java.i
+data/test/java/rmi/activation/Activatable/restartService/security.policy.i
+data/src/share/demo/nio/zipfs/src/META-INF/services/java.nio.file.spi.FileSystemProvider.i
+data/test/javax/print/PrintSubInputStream/Example.java.i
 data/src/share/native/sun/font/layout/LEScripts.h.i
 data/src/share/classes/sun/security/util/AuthResources_ko.java.i
-data/make/tools/reorder/tests/LoadToolkit.java.i
+data/src/share/classes/sun/io/CharToByteCp1112.java.i
 data/src/solaris/native/sun/awt/MouseInfo.c.i
 data/src/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java.i
-data/src/share/classes/sun/net/TelnetProtocolException.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/BootAnalyzer.java.i
 data/test/sun/security/provider/PolicyParser/ExpansionErrorMisleading.policy.i
+data/src/share/classes/java/awt/doc-files/modal-example1.gif.i
 data/test/java/awt/Graphics/DrawImageBG/SystemBgColorTest.java.i
 data/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html.i
 data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain3.txt.i
-data/src/share/classes/java/security/SecureRandomSpi.java.i
-data/src/share/classes/sun/security/jgss/LoginConfigImpl.java.i
-data/make/PatchList.solaris.i
+data/test/com/sun/jdi/ControlFlow.java.i
+data/test/tools/jar/ChangeDir.java.i
+data/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java.i
 data/src/share/classes/javax/swing/undo/UndoableEditSupport.java.i
-data/src/share/classes/javax/smartcardio/CommandAPDU.java.i
+data/test/sun/nio/cs/TestCompoundTest.java.i
 data/src/share/classes/sun/io/CharToByteCp861.java.i
-data/make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java.i
-data/src/windows/native/com/sun/management/OperatingSystem_md.c.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpInt.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties.i
+data/test/java/lang/String/Supplementary.java.i
+data/src/share/native/sun/awt/libpng/pngwio.c.i
+data/src/share/classes/javax/management/monitor/StringMonitor.java.i
 data/test/java/util/prefs/PrefsSpi.java.i
-data/src/share/classes/java/io/ObjectOutput.java.i
-data/src/share/classes/java/lang/RuntimeException.java.i
-data/src/share/classes/java/lang/ClassLoader.java.i
-data/test/java/io/InputStreamReader/GrowAfterEOF.java.i
+data/test/java/net/Authenticator/B6870935.java.i
+data/src/share/classes/java/awt/im/spi/InputMethodContext.java.i
+data/test/com/sun/crypto/provider/Cipher/RSA/TestRSA.java.i
+data/test/java/net/CookieHandler/B6791927.java.i
 data/test/java/rmi/reliability/benchmark/bench/serial/CustomObjTrees.java.i
 data/src/solaris/classes/sun/awt/motif/X11JIS0212.java.i
 data/make/java/sun_nio/Makefile.i
@@ -20298,31 +20294,32 @@ data/test/com/sun/jdi/CatchAllTest.sh.i
 data/src/share/classes/java/security/Provider.java.i
 data/src/share/classes/sun/tools/jconsole/Version-template.java.i
 data/src/share/classes/java/rmi/AccessException.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java.i
+data/src/share/back/util.c.i
+data/make/javax/Makefile.i
 data/src/share/classes/javax/security/auth/login/CredentialException.java.i
-data/src/share/native/sun/font/layout/CanonShaping.cpp.i
+data/src/share/native/sun/java2d/loops/UshortGray.c.i
 data/src/share/classes/sun/io/CharToByteCp856.java.i
-data/src/share/classes/sun/nio/cs/ext/ISO_8859_3.java.i
+data/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.html.i
 data/src/share/demo/jfc/CodePointIM/CodePointIM.java.i
 data/src/share/classes/sun/io/ByteToCharCp285.java.i
 data/test/java/lang/instrument/PremainClass/InheritAgent0111.java.i
-data/make/modules/BuildPackages.gmk.i
-data/src/share/classes/sun/util/resources/LocaleNames.properties.i
-data/test/sun/nio/cs/EuroConverter.java.i
-data/src/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java.i
+data/src/share/classes/sun/rmi/log/ReliableLog.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/ShowRefs.java.i
+data/test/java/rmi/activation/Activatable/nestedActivate/security.policy.i
+data/test/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java.i
 data/src/share/classes/java/security/KeyFactorySpi.java.i
-data/test/sun/text/resources/Format/Bug4807540.java.i
+data/test/java/nio/charset/Charset/Default.java.i
 data/src/solaris/doc/sun/man/man1/ja/javadoc.1.d
-data/test/java/util/PluggableLocale/CollatorProviderTest.sh.i
+data/test/javax/swing/JFileChooser/6342301/bug6342301.java.i
 data/src/share/classes/com/sun/servicetag/Installer.java.i
-data/src/share/sample/nio/server/Content.java.i
+data/make/tools/src/build/tools/javazic/Main.java.i
 data/test/sun/security/util/Oid/OidFormat.java.i
 data/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java.i
-data/src/windows/classes/sun/awt/windows/WScrollPanePeer.java.i
+data/test/sun/nio/cs/CheckICNE.java.i
 data/src/share/classes/sun/security/jgss/HttpCaller.java.i
 data/src/solaris/doc/sun/man/man1/ja/javadoc.1.i
-data/src/share/classes/javax/security/auth/login/Configuration.java.i
-data/src/share/classes/java/awt/geom/AffineTransform.java.i
+data/test/sun/security/ssl/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageColorTrue2Index.c.i
 data/src/share/native/sun/security/ec/impl/mpi-priv.h.i
 data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java.i
 data/src/share/native/sun/awt/debug/debug_mem.h.i
@@ -20332,42 +20329,42 @@ data/test/java/net/Socket/NullHost.java.i
 data/test/javax/management/context/RemoteContextTest.java.i
 data/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp.i
 data/src/share/classes/javax/swing/text/html/Map.java.i
-data/src/share/classes/java/awt/Frame.java.i
-data/src/share/classes/java/awt/KeyEventDispatcher.java.i
+data/make/tools/src/build/tools/automulti/TestALFGenerator.java.i
+data/src/windows/native/sun/jkernel/stdafx.h.i
 data/src/windows/classes/sun/tools/attach/WindowsAttachProvider.java.i
 data/src/share/classes/java/util/concurrent/TimeoutException.java.i
-data/src/share/classes/javax/swing/text/html/ResourceLoader.java.i
-data/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java.i
-data/test/java/net/CookieHandler/B6644726.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java.i
+data/src/share/classes/java/util/LinkedHashSet.java.i
+data/test/java/nio/Buffer/CopyDirectIntMemory.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties.i
 data/make/common/shared/Compiler-msvc.gmk.i
-data/src/solaris/doc/sun/man/man1/ja/jsadebugd.1.i
-data/test/java/rmi/activation/Activatable/downloadParameterClass/manual.security.policy.i
+data/test/sun/tools/jps/jps-Vvml_2.sh.i
+data/src/share/classes/sun/tools/asm/Assembler.java.i
 data/src/share/classes/java/awt/image/DataBuffer.java.i
 data/src/share/classes/javax/swing/text/html/parser/ContentModelState.java.i
 data/test/sun/nio/cs/CheckCaseInsensitiveEncAliases.java.i
-data/src/share/classes/sun/util/resources/TimeZoneNames.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.java.i
 data/test/javax/swing/JEditorPane/4492274/test.html.i
 data/src/windows/native/sun/windows/awt_Dimension.cpp.i
 data/src/share/native/java/lang/fdlibm/src/w_fmod.c.i
 data/src/share/classes/javax/management/BadAttributeValueExpException.java.i
 data/src/share/classes/javax/management/BooleanValueExp.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM949C.java.i
+data/test/java/util/logging/LoggingDeadlock2.java.i
 data/src/share/native/sun/java2d/opengl/OGLRenderer.h.i
 data/src/share/classes/sun/io/ByteToCharISO8859_1.java.i
-data/src/share/classes/java/util/Calendar.java.i
-data/test/java/io/Serializable/cloneArray/CloneArray.java.i
+data/src/share/classes/sun/java2d/pipe/OutlineTextRenderer.java.i
+data/src/solaris/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java.i
 data/src/share/classes/java/lang/module/ModuleInfoAnnotation.java.i
-data/src/share/classes/sun/text/normalizer/ICUBinary.java.i
+data/src/share/classes/sun/tools/serialver/serialver.properties.i
 data/test/java/util/Collection/IteratorAtEnd.java.i
 data/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java.i
+data/src/share/native/java/lang/fdlibm/src/s_tanh.c.i
+data/src/share/native/sun/java2d/loops/FillSpans.c.i
 data/test/sun/rmi/rmic/newrmic/equivalence/MyObject.java.i
 data/test/javax/management/loading/LibraryLoader/jar_src/UseNativeLib.java.i
-data/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.h.i
 data/src/solaris/classes/sun/awt/X11/XNETProtocol.java.i
-data/src/share/native/java/io/FileInputStream.c.i
-data/test/java/io/InputStream/Skip.java.i
-data/test/com/sun/jdi/UnpreparedByName.java.i
+data/src/share/classes/sun/io/CharToByteCp948.java.i
+data/src/share/native/sun/security/ec/impl/mpi.c.i
+data/test/com/sun/jdi/InnerTarg.java.i
 data/src/share/classes/com/sun/tools/example/trace/EventThread.java.i
 data/src/share/classes/java/util/DualPivotQuicksort.java.i
 data/src/share/classes/java/security/spec/RSAPublicKeySpec.java.i
@@ -20375,285 +20372,290 @@ data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKColorType.java.i
 data/src/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java.i
 data/src/share/classes/sun/security/pkcs11/P11DHKeyFactory.java.i
 data/test/java/awt/im/4959409/bug4959409.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java.i
+data/test/java/lang/Runtime/exec/WinCommand.java.i
 data/src/solaris/bin/ia64/jvm.cfg.i
-data/src/share/classes/sun/util/resources/CalendarData_ja.properties.i
+data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java.i
+data/src/share/classes/javax/swing/text/NumberFormatter.java.i
 data/test/java/nio/channels/SocketChannel/ExceptionTranslation.java.i
 data/test/java/io/Serializable/oldTests/BinaryTree.java.i
-data/test/com/sun/servicetag/servicetag2.properties.i
+data/src/share/classes/javax/management/relation/RoleStatus.java.i
 data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-start.jpg.i
-data/src/share/classes/javax/swing/DesktopManager.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c.i
 data/src/share/classes/sun/security/util/Resources_es.java.i
 data/src/share/classes/com/sun/tools/hat/internal/util/Comparer.java.i
-data/src/share/classes/java/nio/file/FileSystem.java.i
+data/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java.i
 data/src/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java.i
 data/test/sun/tools/jps/jps-m_Output2.awk.i
-data/test/com/sun/jdi/UnpreparedClasses.java.i
-data/test/java/io/Serializable/lookupAnyInvocation/LookupAnyInvocation.java.i
+data/test/java/lang/ref/SoftReference/Bash.java.i
+data/test/java/util/Locale/data/deflocale.sh.i
 data/test/java/rmi/activation/Activatable/unregisterInactive/group.security.policy.i
 data/make/sun/awt/README.i
 data/test/java/net/HttpURLConnection/HttpResponseCode.java.i
-data/test/javax/management/Introspector/MBeanDescriptionTest.java.i
+data/test/sun/security/ssl/README.i
 data/src/solaris/native/sun/awt/multiVis.h.i
 data/test/java/io/PrintWriter/OversynchronizedTest.java.i
-data/src/solaris/native/sun/nio/fs/genUnixConstants.c.i
-data/src/share/classes/javax/swing/Spring.java.i
+data/src/share/native/java/util/zip/zlib-1.2.3/inftrees.c.i
+data/src/share/classes/sun/tools/serialver/SerialVer.java.i
 data/src/windows/classes/sun/nio/ch/PendingIoCache.java.i
 data/src/share/classes/javax/swing/tree/TreeNode.java.i
 data/src/windows/native/sun/windows/GDIHashtable.cpp.i
 data/test/java/security/cert/CertPathValidator/OCSP/FailoverToCRL.java.i
-data/src/share/classes/sun/rmi/server/ActivationGroupInit.java.i
+data/src/windows/native/sun/windows/ThemeReader.cpp.i
 data/test/java/net/ServerSocket/ThreadStop.java.i
-data/src/share/classes/com/sun/tools/jdi/IntegerValueImpl.java.i
+data/make/tools/CharsetMapping/IBM037.nr.i
 data/src/share/classes/sun/print/AttributeUpdater.java.i
 data/test/java/beans/XMLEncoder/java_util_ArrayList.java.i
 data/src/share/classes/javax/net/ssl/HttpsURLConnection.java.i
-data/make/tools/CharsetMapping/IBM942.c2b.i
-data/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java.i
-data/src/share/classes/com/sun/tools/jdi/CharTypeImpl.java.i
+data/test/java/security/KeyRep/SerialDSAPubKey.policy.i
+data/test/java/security/KeyRep/RSA.pre.1.5.key.i
+data/test/com/sun/jdi/RefTypes.java.i
 data/test/java/util/zip/ZipFile/input.jar.i
-data/src/share/classes/javax/management/StandardEmitterMBean.java.i
+data/src/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java.i
 data/make/javax/rmi/Makefile.i
 data/src/share/classes/javax/management/event/RMIPushEventForwarder.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/Option.java.i
-data/src/share/classes/javax/xml/crypto/OctetStreamData.java.i
-data/make/modules/tools/src/com/sun/classanalyzer/ResolutionInfo.java.i
+data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_MS5022X_Encoder.java.i
+data/test/java/nio/channels/ServerSocketChannel/Basic.java.i
+data/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.java.i
 data/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java.i
 data/src/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java.i
 data/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts.mf.i
-data/src/share/classes/sun/java2d/pipe/hw/BufferedContextProvider.java.i
+data/test/sun/nio/cs/OLD/IBM949_OLD.java.i
 data/src/share/classes/sun/reflect/Reflection.java.i
 data/src/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java.i
 data/src/windows/native/sun/windows/awt_Dialog.cpp.i
-data/src/share/classes/javax/swing/SingleSelectionModel.java.i
-data/test/javax/crypto/Cipher/Turkish.java.i
-data/src/share/classes/java/applet/package.html.i
+data/src/share/classes/java/rmi/activation/Activator.java.i
+data/src/share/classes/javax/crypto/spec/RC2ParameterSpec.java.i
+data/src/share/classes/sun/text/normalizer/UCharacter.java.i
 data/test/java/security/AccessControlContext/CheckCtor.java.i
 data/src/share/demo/applets/MoleculeViewer/models/cyclohexane.xyz.i
 data/src/share/native/java/io/ObjectOutputStream.c.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoContent.java.i
-data/src/share/classes/sun/print/RasterPrinterJob.java.i
+data/test/javax/sound/sampled/AudioFormat/Matches_NOT_SPECIFIED.java.i
 data/src/share/classes/javax/swing/text/Utilities.java.i
-data/src/share/classes/org/openjdk/jigsaw/Hi.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java.i
-data/src/share/classes/java/nio/channels/SeekableByteChannel.java.i
-data/src/share/classes/sun/security/action/LoadLibraryAction.java.i
+data/src/share/classes/sun/java2d/pisces/Stroker.java.i
+data/src/share/classes/javax/swing/border/BevelBorder.java.i
+data/test/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.java.i
+data/src/share/classes/java/nio/channels/InterruptibleChannel.java.i
+data/src/share/classes/sun/text/resources/FormatData_en_PH.java.i
 data/test/javax/swing/JFileChooser/6698013/bug6698013.html.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert_34.c.i
 data/test/sun/util/resources/TimeZone/IntlTest.java.i
 data/test/javax/management/context/ContextTest.java.i
 data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java.i
 data/src/solaris/native/sun/awt/initIDs.c.i
-data/test/java/net/URLConnection/DisconnectAfterEOF.java.i
-data/test/javax/crypto/Mac/ByteBuffers.java.i
-data/test/java/awt/Paint/PgramUserBoundsTest.java.i
+data/test/sun/security/provider/certpath/ReverseBuilder/prjM2mgrM.i
+data/test/sun/security/pkcs11/Secmod/Crypto.java.i
+data/test/java/nio/channels/FileChannel/Transfer.java.i
+data/src/solaris/native/common/jdk_util_md.c.i
 data/src/share/demo/jfc/Metalworks/resources/HelpFiles/metal.html.i
 data/test/java/security/cert/X509Certificate/ExtKeyUsage.java.i
 data/src/share/classes/com/sun/pept/ept/ContactInfo.java.i
-data/src/share/demo/jfc/Notepad/resources/new.gif.i
+data/test/java/net/URLDecoder/B6463990.java.i
 data/test/java/lang/Math/Atan2Tests.java.i
-data/src/share/classes/java/rmi/dgc/Lease.java.i
-data/src/share/classes/java/util/ListIterator.java.i
+data/test/javax/management/Introspector/ParameterNameTest.java.i
+data/src/share/native/sun/java2d/loops/FillParallelogram.c.i
 data/src/windows/native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c.i
 data/test/java/io/Serializable/serialver/classpath/Test.java.i
-data/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java.i
+data/test/sun/security/provider/PolicyParser/ExtDirsB.java.i
 data/test/java/util/Formatter/BasicBooleanObject.java.i
 data/src/share/back/inStream.c.i
-data/src/share/classes/javax/imageio/stream/ImageOutputStream.java.i
-data/test/javax/swing/JLabel/7004134/bug7004134.java.i
+data/test/java/rmi/server/RMIClassLoader/spi/security.policy.i
+data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly_Stub.java.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpPdu.java.i
 data/test/java/util/ResourceBundle/Bug4168625Resource3_en.java.i
 data/src/share/native/sun/font/layout/StateTableProcessor.h.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java.i
+data/test/sun/net/www/http/HttpClient/OpenServer.java.i
+data/test/java/lang/ThreadLocal/TestThreadId.java.i
+data/test/com/sun/net/httpserver/Test8a.java.i
 data/test/javax/swing/JScrollBar/6542335/bug6542335.java.i
-data/src/share/classes/com/sun/jdi/event/ClassUnloadEvent.java.i
+data/test/sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java.i
 data/src/share/classes/javax/swing/plaf/metal/sounds/FrameMinimize.wav.i
 data/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java.i
-data/make/com/sun/tools/attach/FILES_java.gmk.i
-data/src/share/classes/java/text/AttributedCharacterIterator.java.i
-data/src/share/classes/com/sun/jdi/event/package.html.i
+data/test/com/sun/jdi/sde/MangleTest.java.i
+data/test/sun/tools/jstat/printCompilationOutput1.awk.i
+data/test/sun/security/ssl/sanity/pluggability/CheckSSLContextExport.java.i
 data/test/java/util/AbstractList/HasNextAfterException.java.i
 data/test/java/util/Deque/ChorusLine.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_lt.properties.i
-data/src/share/classes/sun/security/x509/GeneralSubtrees.java.i
-data/src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java.i
+data/src/share/classes/sun/text/resources/FormatData_es_CL.java.i
+data/src/share/classes/sun/text/resources/FormatData_th_TH_TH.java.i
+data/src/solaris/doc/sun/man/man1/rmid.1.i
 data/src/solaris/sample/dtrace/hotspot_jni/CriticalSection_slow.d.i
 data/test/sun/tools/jps/jps-l_1.sh.i
-data/src/share/classes/javax/swing/plaf/multi/MultiInternalFrameUI.java.i
-data/test/javax/print/applet/YesNo.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageClipping.h.i
+data/test/javax/script/ProviderTest.sh.i
 data/src/share/classes/sun/security/jgss/krb5/Krb5CredElement.java.i
-data/src/share/classes/javax/sound/midi/MidiDeviceTransmitter.java.i
+data/src/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java.i
 data/src/share/native/sun/font/layout/KhmerLayoutEngine.h.i
 data/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java.i
+data/src/solaris/doc/sun/man/man1/ja/jstatd.1.i
 data/test/sun/security/pkcs11/tls/TestKeyMaterial.java.i
-data/test/java/lang/management/ThreadMXBean/Utils.java.i
-data/src/share/classes/org/relaxng/datatype/Datatype.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/close-pressed.gif.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerGlowEffect.java.i
 data/test/sun/net/www/protocol/file/GetContentLength.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java.i
-data/src/share/demo/jfc/FileChooserDemo/FileChooserDemo.java.i
+data/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp.i
+data/test/sun/nio/cs/OLD/IBM970_OLD.java.i
 data/test/java/io/Serializable/modifyStaticFields/ModifyStaticFields.java.i
-data/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java.i
+data/src/share/classes/java/nio/channels/FileChannel.java.i
 data/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.chk.i
 data/src/share/classes/java/security/cert/CertificateEncodingException.java.i
 data/test/java/nio/file/attribute/AclFileAttributeView/Basic.java.i
-data/src/share/classes/java/security/acl/Group.java.i
+data/test/java/net/Authenticator/B4678055.java.i
 data/test/java/util/PluggableLocale/providersrc/FooNumberFormat.java.i
 data/src/share/native/com/sun/tools/jdi/SharedMemoryConnection.c.i
 data/test/java/lang/instrument/MakeJAR.sh.i
 data/test/org/openjdk/jigsaw/library.sh.i
-data/make/modules/tools/src/com/sun/classanalyzer/ClassAnalyzer.java.i
-data/src/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java.i
-data/src/share/classes/javax/security/auth/login/AccountException.java.i
-data/src/share/classes/javax/swing/text/WhitespaceBasedBreakIterator.java.i
+data/make/sun/org/mozilla/Makefile.i
+data/test/sun/security/x509/X500Name/NullX500Name.java.i
+data/test/com/sun/security/sasl/Cram.java.i
+data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.java.i
 data/src/share/classes/sun/jvmstat/monitor/IntegerMonitor.java.i
 data/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/PKIXExtendedTM.java.i
 data/src/share/classes/sun/tools/tree/CheckContext.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpPduBulkType.java.i
+data/src/share/bin/defines.h.i
 data/src/share/classes/java/awt/doc-files/RadialGradientPaint-1.png.i
-data/test/java/util/Vector/SerializationDeadlock.java.i
+data/test/sun/tools/jstat/usage.out.i
 data/test/javax/crypto/Cipher/ByteBuffersNull.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpIndex.java.i
+data/make/tools/src/build/tools/jdwpgen/ClassObjectTypeNode.java.i
 data/src/share/classes/java/lang/CharSequence.java.i
 data/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java.i
 data/test/java/beans/PropertyEditor/TestFloatClassValue.java.i
-data/src/share/demo/nbproject/jfc/Notepad/nbproject/file-targets.xml.i
-data/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java.i
+data/test/javax/management/mxbean/LeakTest.java.i
+data/src/share/demo/management/FullThreadDump/Deadlock.java.i
 data/src/solaris/classes/sun/tools/attach/SolarisVirtualMachine.java.i
 data/src/share/native/sun/font/AccelGlyphCache.h.i
 data/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java.i
-data/src/share/classes/java/awt/doc-files/modal-example1.gif.i
+data/src/share/classes/java/rmi/registry/RegistryHandler.java.i
 data/test/sun/tools/jstat/fileURITest1.awk.i
-data/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java.i
+data/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/ProtectedCtor.java.i
 data/src/share/classes/java/lang/Exception.java.i
 data/src/share/classes/sun/security/x509/X509AttributeName.java.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/p11-ibutton.txt.i
-data/src/share/classes/java/awt/image/TileObserver.java.i
-data/src/share/classes/sun/util/logging/resources/logging_ja.properties.i
+data/make/tools/swing-beans/beaninfo/images/JListMono16.gif.i
+data/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c.i
+data/test/java/lang/Class/forName/classes/Z.class.i
 data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/RenderTests.java.i
 data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_Ports.c.i
 data/src/share/demo/jvmti/waiters/Thread.cpp.i
 data/test/java/nio/Buffer/BasicByte.java.i
 data/test/sun/security/krb5/auto/CleanState.java.i
-data/src/share/sample/scripting/scriptpad/src/scripts/linewrap.js.i
+data/test/java/security/cert/CertPathValidator/targetConstraints/ValidateTargetConstraints.java.i
 data/test/java/lang/String/NonCharacterMapping.java.i
-data/src/solaris/doc/sun/man/man1/jmap.1.i
-data/src/share/classes/java/io/package.html.i
+data/src/share/classes/java/text/CollationKey.java.i
+data/make/common/shared/Defs-solaris.gmk.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U16Func.c.i
-data/src/share/classes/java/io/InterruptedIOException.java.i
+data/test/javax/management/mxbean/GenericTypeTest.java.i
 data/src/solaris/native/sun/awt/awt_util.h.i
 data/src/share/classes/sun/io/ByteToCharCp922.java.i
-data/src/share/classes/sun/management/MethodInfo.java.i
+data/src/share/classes/sun/io/CharToByteDoubleByte.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java.i
 data/src/share/classes/sun/io/CharToByteMS936.java.i
 data/src/share/demo/jfc/Metalworks/resources/HelpFiles/toc.html.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java.i
+data/src/share/native/java/util/zip/zlib-1.2.3/deflate.h.i
 data/src/share/demo/applets/NervousText/NervousText.java.i
 data/src/share/classes/sun/util/resources/CurrencyNames_de_AT.properties.i
 data/src/share/classes/com/sun/media/sound/UlawCodec.java.i
 data/src/share/classes/sun/security/jgss/krb5/Krb5Token.java.i
-data/src/share/classes/sun/awt/ModalityListener.java.i
-data/src/share/classes/sun/text/resources/FormatData_sr_ME.java.i
+data/test/tools/launcher/VerifyExceptions.java.i
+data/src/share/classes/java/lang/reflect/Constructor.java.i
 data/src/share/classes/javax/swing/plaf/InsetsUIResource.java.i
-data/test/javax/management/openmbean/MBeanFeatureInfoSerialStore.java.i
+data/src/share/classes/sun/net/NetworkClient.java.i
 data/src/share/classes/sun/awt/im/InputMethodAdapter.java.i
-data/src/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties.i
+data/make/sun/text/Makefile.i
 data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties.i
 data/src/share/classes/sun/tools/javac/SourceClass.java.i
 data/test/java/lang/management/ThreadMXBean/ThreadDump.java.i
-data/test/java/util/Locale/data/deflocale.rhel5.i
+data/test/sun/nio/cs/Test6254467.java.i
 data/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.java.i
 data/src/share/classes/java/io/FileOutputStream.java.i
 data/src/share/classes/sun/reflect/generics/visitor/TypeTreeVisitor.java.i
 data/src/share/classes/javax/net/ServerSocketFactory.java.i
-data/src/share/demo/jvmti/hprof/hprof_frame.c.i
+data/test/java/rmi/reliability/juicer/Orange.java.i
 data/src/share/classes/javax/swing/text/rtf/charsets/cpg437.txt.i
-data/src/share/classes/sun/util/resources/LocaleNames_no.properties.i
-data/src/share/classes/com/sun/media/sound/SoftProcess.java.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/A.1.i
+data/src/share/classes/sun/io/ByteToCharCp860.java.i
 data/test/java/rmi/activation/Activatable/forceLogSnapshot/rmid.security.policy.i
 data/src/share/classes/javax/security/auth/SubjectDomainCombiner.java.i
-data/src/share/classes/javax/swing/table/AbstractTableModel.java.i
+data/src/share/demo/applets/SpreadSheet/SpreadSheet.java.i
 data/test/java/io/charStreams/BufferSizes.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.so.i
+data/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java.i
 data/test/java/io/Externalizable/compatibility/old.ser.i
-data/src/share/classes/com/sun/security/sasl/ExternalClient.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl_Stub.java.i
+data/src/solaris/native/sun/java2d/loops/vis_UshortGray_FromRgb.c.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.policy.i
 data/src/share/classes/com/sun/jmx/defaults/ServiceName.java.i
 data/src/share/classes/javax/swing/text/StyleContext.java.i
-data/src/share/classes/sun/reflect/generics/reflectiveObjects/NotImplementedException.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmslut.c.i
 data/test/java/lang/ThreadLocal/InitialValue.java.i
 data/src/share/classes/java/awt/peer/ScrollPanePeer.java.i
-data/src/share/classes/com/sun/beans/decoder/FieldElementHandler.java.i
-data/make/tools/swing-beans/beaninfo/images/JProgressBarMono16.gif.i
-data/src/share/classes/javax/swing/text/NumberFormatter.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/ResultSet.java.i
+data/src/share/classes/com/sun/tools/jdi/PrimitiveValueImpl.java.i
+data/src/share/classes/javax/net/ssl/SSLSessionBindingListener.java.i
+data/test/java/math/BigDecimal/CompareToTests.java.i
 data/test/javax/sql/rowset/serial/SerialClob/SetCharacterStream.java.i
-data/make/tools/src/build/tools/jdwpgen/ReferenceIDTypeNode.java.i
+data/src/share/lib/images/cursors/motif_MoveDrop32x32.gif.i
 data/src/share/classes/sun/io/ByteToCharMacRomania.java.i
 data/test/java/lang/ThreadGroup/SetMaxPriority.java.i
 data/src/share/native/sun/security/ec/oid.c.i
 data/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll.d
 data/test/sun/security/pkcs11/KeyStore/ClientAuthData/cert8.db.i
-data/src/share/classes/javax/security/auth/PrivateCredentialPermission.java.i
+data/src/share/classes/sun/rmi/server/resources/rmid_ja.properties.i
+data/src/share/native/sun/java2d/cmm/lcms/cmsxform.c.i
 data/src/windows/native/sun/java2d/windows/GDIRenderer.cpp.i
-data/src/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java.i
+data/src/share/classes/sun/io/ByteToCharCp875.java.i
 data/src/solaris/native/sun/java2d/j2d_md.h.i
 data/src/share/classes/java/awt/AWTEventMulticaster.java.i
 data/test/java/util/Hashtable/SerializationDeadlock.java.i
-data/test/sun/security/provider/PolicyParser/ExtDirsDefaultPolicy.java.i
+data/src/share/native/sun/font/layout/ShapingTypeData.cpp.i
 data/src/share/classes/com/sun/java/swing/plaf/gtk/XColors.java.i
-data/test/java/security/cert/PKIXParameters/InvalidParameters.java.i
-data/test/com/sun/net/httpserver/Test7a.java.i
+data/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java.i
+data/test/sun/nio/cs/LeftOverSurrogate.java.i
+data/test/com/sun/security/auth/CreateLdapPrincipals.java.i
 data/test/java/util/PluggableLocale/GenericTest.sh.i
-data/src/share/classes/sun/tools/java/BinaryMember.java.i
-data/test/javax/management/openmbean/EqualsTest.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUp.c.i
+data/test/sun/tools/jrunscript/jrunscript-helpTest.sh.i
 data/test/sun/net/InetAddress/nameservice/SimpleNameService.java.i
-data/test/java/beans/XMLEncoder/javax_swing_plaf_FontUIResource.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_es.properties.i
-data/src/share/classes/sun/security/tools/JarSignerResources.java.i
+data/test/java/lang/reflect/Method/invoke/ErrorInInvoke.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_U16.c.i
+data/test/sun/security/krb5/auto/AcceptorSubKey.java.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java.i
 data/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/SetClientMode.java.i
-data/test/java/util/concurrent/Exchanger/LoopHelpers.java.i
+data/src/share/native/sun/font/layout/TrimmedArrayProcessor.h.i
 data/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiTableHeaderUI.java.i
-data/src/share/classes/sun/security/rsa/SunRsaSign.java.i
+data/test/sun/tools/jrunscript/jrunscript-argsTest.sh.i
 data/src/share/classes/java/awt/dnd/DragSourceAdapter.java.i
-data/src/solaris/doc/sun/man/man1/ja/native2ascii.1.i
+data/test/sun/tools/jstatd/jstatdDefaults.sh.i
 data/test/javax/swing/JLayer/6875716/bug6875716.java.i
 data/test/sun/nio/cs/Decode.java.i
-data/src/share/classes/sun/net/httpserver/HttpConnection.java.i
+data/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.h.i
 data/src/share/classes/sun/nio/ch/SelChImpl.java.i
 data/test/java/util/Collections/EmptyCollectionSerialization.java.i
 data/src/share/classes/sun/text/resources/FormatData_en_GB.java.i
-data/src/share/classes/com/sun/tools/jdi/ArrayReferenceImpl.java.i
+data/src/share/classes/com/sun/media/sound/SoftProcess.java.i
+data/src/share/classes/sun/security/rsa/RSAPadding.java.i
 data/src/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java.i
 data/test/java/beans/XMLEncoder/javax_swing_JTree.java.i
-data/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java.i
+data/test/java/util/EnumSet/EnumSetBash.java.i
 data/test/com/sun/jdi/MonitorEventTest.java.i
 data/make/netbeans/jmx/README.i
-data/test/javax/swing/JPopupMenu/6987844/bug6987844.java.i
-data/src/share/classes/javax/security/auth/callback/NameCallback.java.i
-data/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh.i
+data/test/com/sun/jdi/FetchLocals.java.i
+data/make/tools/swing-beans/beaninfo/images/JListColor16.gif.i
+data/src/share/native/sun/awt/image/jpeg/jcmarker.c.i
 data/src/share/classes/javax/print/attribute/standard/PageRanges.java.i
-data/src/share/classes/sun/java2d/pipe/GlyphListLoopPipe.java.i
-data/test/javax/management/MBeanInfo/SerializationTest.java.i
+data/test/java/util/Collections/CheckedIdentityMap.java.i
+data/src/share/classes/sun/java2d/pipe/hw/ExtendedBufferCapabilities.java.i
 data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/trusted.jks.i
-data/src/share/classes/sun/text/resources/FormatData_uk_UA.java.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java.i
-data/make/sun/awt/Depend.sed.i
+data/make/tools/buildmetaindex/Makefile.i
+data/test/sun/security/provider/PolicyFile/Comparator.java.i
+data/test/javax/swing/border/Test4243289.java.i
 data/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java.i
 data/test/sun/tools/jstat/gcOutput1.awk.i
 data/test/sun/nio/cs/TestCp834_SBCS.java.i
 data/test/java/beans/PropertyEditor/TestFloatTypeValue.java.i
-data/src/share/classes/javax/management/AttributeChangeNotificationFilter.java.i
-data/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java.i
+data/src/share/classes/java/util/Enumeration.java.i
+data/test/java/rmi/testlibrary/RMID.java.i
 data/src/share/classes/com/sun/jdi/connect/VMStartException.java.i
 data/src/share/classes/sun/tools/tree/NegativeExpression.java.i
 data/src/share/classes/sun/io/CharToByteCp918.java.i
-data/test/java/io/charStreams/ABCOutputStream.java.i
 data/src/share/classes/java/text/DecimalFormatSymbols.java.i
 data/src/share/classes/java/lang/AbstractStringBuilder.java.i
 data/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneInformation.wav.i
@@ -20664,205 +20666,208 @@ data/make/tools/CharsetMapping/IBM838.map.i
 data/test/javax/management/remote/mandatory/version/ImplVersionReader.java.i
 data/src/share/classes/com/sun/crypto/provider/DHParameters.java.i
 data/src/share/classes/javax/management/MBeanServerDelegateMBean.java.i
-data/src/share/classes/com/sun/jmx/mbeanserver/SunJmxMBeanServer.java.i
+data/src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java.i
 data/test/sun/security/tools/keytool/standard.sh.i
-data/src/share/native/sun/awt/splashscreen/splashscreen_gif.c.i
+data/src/share/classes/javax/naming/NamingException.java.i
 data/src/share/sample/scripting/scriptpad/nbproject/file-targets.xml.i
-data/src/share/classes/sun/reflect/generics/scope/ClassScope.java.i
+data/test/java/lang/Compare.java.i
 data/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN_Bit.c.i
-data/src/share/classes/javax/swing/text/rtf/RTFAttributes.java.i
+data/src/share/classes/sun/tools/tree/ShortExpression.java.i
 data/test/java/util/StringTokenizer/FormFeed.java.i
 data/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp.i
 data/src/share/classes/com/sun/jdi/VoidType.java.i
-data/make/java/java/reorder-i586.i
-data/test/sun/security/pkcs11/nss/lib/linux-amd64/libplds4.so.i
-data/src/share/classes/java/util/ServiceLoader.java.i
+data/src/share/native/sun/font/layout/GXLayoutEngine.cpp.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_UY.properties.i
+data/src/share/classes/javax/swing/DelegatingDefaultFocusManager.java.i
 data/test/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java.i
-data/src/share/classes/sun/jkernel/StandaloneByteArrayAccess.java.i
+data/test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableStreamCipher.java.i
 data/src/share/classes/com/sun/jndi/ldap/pool/PooledConnectionFactory.java.i
-data/src/share/demo/jvmti/index.html.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHostClient.java.i
+data/test/javax/swing/JTable/6777378/bug6777378.java.i
+data/test/java/net/MulticastSocket/Test.java.i
 data/src/share/classes/com/sun/jmx/namespace/RoutingMBeanServerConnection.java.i
 data/test/sun/security/provider/PolicyFile/SelfExpansion.policy.i
-data/src/share/classes/sun/nio/cs/ext/SJIS_0213.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMSecurityDefs.java.i
-data/src/share/classes/com/sun/tools/attach/AgentInitializationException.java.i
-data/src/share/classes/com/sun/security/jgss/jgss-overview.html.i
+data/make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java.i
+data/make/java/java/reorder-sparcv9.i
+data/test/javax/management/namespace/SerialParamProcessorTest.java.i
+data/test/sun/security/pkcs11/nss/lib/linux-amd64/libplds4.so.i
+data/test/java/awt/dnd/URIListBetweenJVMsTest/InterprocessMessages.java.i
 data/test/sun/nio/cs/FindASCIIReplBugs.java.i
-data/src/share/classes/sun/security/provider/certpath/X509CertPath.java.i
+data/test/sun/security/provider/certpath/ReverseBuilder/prjM2divE.i
 data/src/share/classes/javax/swing/text/IconView.java.i
-data/src/share/classes/javax/swing/event/MenuEvent.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java.i
 data/test/javax/management/query/InstanceOfExpTest.java.i
 data/test/com/sun/jdi/CompatibleConnectors.java.i
-data/src/share/classes/sun/net/www/URLConnection.java.i
+data/test/sun/tools/jps/jps-help.sh.i
 data/test/java/lang/management/ThreadMXBean/ThreadLists.java.i
 data/src/share/classes/sun/management/jmxremote/SingleEntryRegistry.java.i
-data/src/share/classes/java/awt/Rectangle.java.i
-data/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java.i
-data/test/java/util/ResourceBundle/Bug6204853_Utf8.properties.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java.i
+data/test/java/util/ResourceBundle/RestrictedBundleTest.html.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathAPIHolder.java.i
+data/test/java/security/SecureClassLoader/DefineClassByteBuffer.java.i
 data/test/javax/security/auth/login/LoginContext/ConfigConstructor.java.i
-data/test/java/io/BufferedReader/ReadLineSync.java.i
+data/test/java/io/RandomAccessFile/OpenSync.java.i
 data/src/solaris/lib/sdp/sdp.conf.template.i
 data/src/share/classes/sun/nio/cs/ext/GBK.java.i
 data/src/solaris/npt/utf_md.h.i
 data/test/java/lang/instrument/ilib/Info.java.i
 data/make/common/BuildNativePackages.gmk.i
 data/test/java/beans/XMLEncoder/java_awt_BasicStroke.java.i
-data/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java.i
-data/test/java/lang/ClassLoader/resource.jar.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh.i
+data/test/java/util/concurrent/ConcurrentHashMap/DistinctEntrySetElements.java.i
 data/test/sun/tools/jstat/options1.out.i
 data/src/windows/classes/sun/java2d/d3d/D3DPaints.java.i
 data/test/java/nio/file/Path/SBC.java.i
-data/src/share/classes/com/sun/tools/extcheck/ExtCheck.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java.i
 data/test/java/util/jar/JarFile/test.jar.i
-data/src/share/classes/com/sun/jndi/ldap/LdapReferralException.java.i
+data/make/tools/swing-beans/beaninfo/images/JLayeredPaneColor16.gif.i
 data/src/share/classes/com/sun/jmx/snmp/SnmpPduFactory.java.i
 data/src/share/classes/sun/nio/ch/Cancellable.java.i
+data/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java.i
 data/src/share/classes/sun/reflect/generics/reflectiveObjects/WildcardTypeImpl.java.i
 data/src/solaris/hpi/include/largefile.h.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java.i
+data/test/com/sun/jdi/EnumTest.java.i
 data/src/share/modules/jdk.boot/module-info.java.i
 data/src/share/classes/sun/util/PreHashedMap.java.i
 data/src/windows/instrument/FileSystemSupport_md.c.i
-data/src/share/classes/sun/util/resources/CalendarData_pl.properties.i
+data/make/tools/src/build/tools/stripproperties/StripProperties.java.i
 data/src/share/classes/sun/font/FontStrikeDisposer.java.i
-data/test/java/nio/channels/SocketChannel/Stream.java.i
+data/test/javax/xml/crypto/dsig/data/xml-stylesheet.b64.i
 data/test/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java.i
 data/test/java/awt/im/JTextFieldTest.html.i
 data/test/java/awt/Frame/FrameSize/TestFrameSize.java.i
 data/src/share/classes/java/net/FileNameMap.java.i
-data/src/share/classes/java/lang/reflect/ParameterizedType.java.i
+data/make/mkdemo/management/README.txt.i
 data/test/sun/security/rsa/InvalidBitString.java.i
 data/src/share/classes/sun/security/x509/ReasonFlags.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java.i
-data/src/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java.i
-data/test/sun/security/pkcs11/rsa/TestCACerts.java.i
+data/src/share/classes/com/sun/pept/presentation/Tie.java.i
+data/test/sun/rmi/rmic/defaultStubVersion/run.sh.i
 data/src/share/sample/vm/clr-jvm/README.txt.i
-data/src/share/classes/javax/swing/text/Keymap.java.i
+data/src/share/classes/java/awt/Composite.java.i
 data/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java.i
 data/src/share/classes/java/lang/StackOverflowError.java.i
-data/test/java/io/Serializable/unnamedPackageSwitch/A.java.i
+data/test/javax/swing/text/html/TableView/7030332/sample1.png.i
 data/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls.java.i
-data/test/java/util/Locale/Bug4184873_he.i
 data/src/share/classes/sun/io/CharToByteBig5_HKSCS.java.i
-data/make/tools/CharsetMapping/IBM737.map.i
-data/src/share/classes/java/nio/channels/AsynchronousFileChannel.java.i
+data/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java.i
+data/make/sun/jpeg/mapfile-vers.i
 data/test/java/rmi/reliability/benchmark/bench/rmi/DoubleArrayCalls.java.i
 data/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java.i
-data/make/com/sun/jndi/Makefile.i
-data/src/solaris/classes/sun/awt/X11/MWMConstants.java.i
+data/test/java/util/concurrent/ConcurrentQueues/GCRetention.java.i
+data/src/windows/classes/sun/awt/windows/WDesktopProperties.java.i
 data/src/share/classes/sun/security/krb5/internal/crypto/Nonce.java.i
 data/make/sun/org/Makefile.i
 data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java.i
 data/test/sun/security/tools/keytool/CloseFile.java.i
-data/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java.i
+data/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c.i
 data/src/share/classes/sun/text/resources/FormatData_sr_Latn_BA.java.i
-data/test/java/rmi/activation/Activatable/restartService/security.policy.i
+data/src/share/classes/java/io/ByteArrayOutputStream.java.i
 data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_S16.c.i
 data/make/mksample/Makefile.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java.i
-data/src/solaris/native/sun/awt/awt_motif.h.i
-data/make/netbeans/jarzip/build.xml.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy.i
+data/src/share/demo/applets/GraphicsTest/AppletFrame.java.i
 data/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader.i
 data/src/share/classes/sun/java2d/pipe/AATileGenerator.java.i
+data/test/java/io/LineNumberInputStream/Skip.java.i
 data/src/share/classes/javax/swing/event/ListSelectionEvent.java.i
 data/test/com/sun/security/sasl/digest/log.properties.i
-data/src/share/demo/jvmti/minst/sample.makefile.txt.i
+data/test/java/awt/GraphicsEnvironment/PreferLocaleFonts.java.i
 data/src/solaris/classes/sun/awt/motif/MTextFieldPeer.java.i
-data/make/netbeans/jmx/build.properties.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java.i
-data/src/share/classes/java/awt/print/PrinterIOException.java.i
+data/src/share/classes/javax/swing/text/PlainView.java.i
+data/test/sun/security/pkcs11/Secmod/nsstrust.cfg.i
+data/test/java/beans/XMLEncoder/javax_swing_border_TitledBorder.java.i
+data/src/share/classes/sun/reflect/misc/MethodUtil.java.i
 data/src/share/classes/javax/sql/rowset/CachedRowSet.java.i
-data/test/java/util/zip/StreamIOAfterClose.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionImpl/HashCodeMissing.java.i
 data/test/java/lang/Math/PowTests.java.i
 data/test/java/net/ServerSocket/TestAfterClose.java.i
 data/src/linux/doc/man/ja/schemagen.1.i
-data/test/java/security/UnresolvedPermission/AccessorMethods.signer1.i
+data/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java.i
 data/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java.i
 data/src/share/classes/sun/java2d/loops/DrawGlyphListAA.java.i
-data/src/share/classes/sun/nio/ch/SctpMessageInfoImpl.java.i
+data/test/java/nio/charset/StandardCharsets/Standard.java.i
 data/src/share/classes/javax/swing/doc-files/BoxLayout-1.gif.i
 data/test/java/lang/StringCoding/Enormous.java.i
 data/test/java/net/Socket/InheritHandle.java.i
-data/src/share/classes/sun/io/CharToByteCp948.java.i
-data/test/sun/nio/cs/OLD/IBM948_OLD.java.i
+data/src/share/native/java/io/FileInputStream.c.i
+data/src/share/classes/sun/reflect/FieldInfo.java.i
 data/test/java/text/Bidi/Bug7042148.java.i
 data/src/solaris/native/sun/jdga/jdga.h.i
 data/make/tools/Makefile.i
 data/src/share/classes/java/util/AbstractList.java.i
-data/src/share/native/sun/awt/medialib/mlib_c_ImageBlendTable.h.i
-data/src/share/classes/com/sun/media/sound/JSSecurityManager.java.i
-data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_MS5022X_Encoder.java.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/Option.java.i
 data/src/share/native/sun/java2d/pipe/Region.c.i
-data/src/share/classes/sun/util/resources/LocaleNames_pl.properties.i
+data/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java.i
 data/src/solaris/native/sun/java2d/loops/vis_SrcOverMaskBlit.c.i
-data/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_AWT.java.i
-data/src/share/classes/javax/print/attribute/Size2DSyntax.java.i
-data/make/common/Release.gmk.i
+data/src/share/back/ThreadGroupReferenceImpl.h.i
+data/test/java/rmi/activation/Activatable/downloadParameterClass/group.security.policy.i
+data/src/share/classes/javax/sound/midi/spi/package.html.i
 data/src/share/classes/java/lang/reflect/Modifier.java.i
-data/src/share/classes/sun/reflect/UnsafeByteFieldAccessorImpl.java.i
-data/src/share/native/common/check_version.c.i
+data/test/sun/java2d/cmm/ColorConvertOp/LRGB555.png.i
+data/test/java/beans/PropertyEditor/TestByteTypeValue.java.i
 data/test/java/util/ResourceBundle/Bug6299235Test.java.i
 data/src/share/classes/javax/sql/StatementEvent.java.i
 data/src/share/classes/sun/reflect/UnsafeQualifiedCharacterFieldAccessorImpl.java.i
-data/src/share/classes/com/sun/media/sound/WaveFileReader.java.i
-data/src/share/classes/java/awt/datatransfer/FlavorMap.java.i
-data/src/share/classes/javax/print/attribute/standard/OrientationRequested.java.i
-data/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.access.in.i
+data/test/sun/security/provider/PolicyParser/EncodeURL.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java.i
+data/test/javax/script/Test7.java.i
 data/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties.i
-data/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/ProtectedCtor.java.i
-data/make/tools/swing-beans/beaninfo/images/JListMono16.gif.i
+data/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/p11-ibutton.txt.i
 data/test/java/beans/XMLEncoder/Test4822050.java.i
 data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/AbstractGradient.java.i
 data/test/java/beans/PropertyChangeSupport/1.5.0_10.ser.i
 data/src/share/classes/javax/naming/directory/SearchControls.java.i
 data/src/solaris/classes/sun/awt/X11/MotifDnDConstants.java.i
-data/src/windows/classes/sun/awt/windows/WDefaultFontCharset.java.i
+data/make/java/jexec/Makefile.i
 data/test/javax/sound/midi/Gervill/SoftTuning/Load5.java.i
-data/make/modules/modularize.i
-data/src/share/classes/javax/print/attribute/PrintServiceAttribute.java.i
+data/src/share/classes/sun/nio/fs/AbstractPath.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/ResultSet.java.i
+data/src/share/classes/sun/util/resources/CalendarData_cs.properties.i
 data/test/java/util/BitSet/PreviousBits.java.i
 data/src/share/classes/com/sun/media/sound/AiffFileWriter.java.i
-data/src/share/classes/java/nio/channels/spi/AbstractSelectionKey.java.i
+data/test/tools/pack200/dyn.jar.i
 data/src/solaris/native/common/gdefs_md.h.i
-data/src/windows/lib/tzmappings.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java.i
+data/test/com/sun/jdi/ArrayRangeTest.java.i
+data/test/sun/security/pkcs11/sslecc/CipherTest.java.i
 data/src/share/classes/java/awt/DefaultKeyboardFocusManager.java.i
 data/src/windows/native/sun/windows/awt_GDIObject.cpp.i
 data/test/java/nio/channels/FileChannel/MapOverEnd.java.i
 data/src/share/classes/javax/naming/ldap/SortControl.java.i
 data/test/com/sun/crypto/provider/TLS/TestKeyMaterial.java.i
-data/test/java/util/zip/FlaterCriticalArray.java.i
-data/make/javax/Makefile.i
-data/src/share/demo/jvmti/agent_util/README.txt.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java.i
+data/test/javax/swing/border/Test6978482.java.i
+data/test/java/io/charStreams/ABCOutputStream.java.i
+data/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java.i
 data/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java.i
 data/src/share/classes/java/util/LinkedHashMap.java.i
 data/src/share/classes/javax/swing/plaf/multi/MultiRootPaneUI.java.i
 data/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathTableMeta.java.i
 data/test/java/security/BasicPermission/Homogeneity.java.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh.i
-data/make/tools/reorder/tools/util-i586.il.i
+data/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java.i
+data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java.i
 data/src/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java.i
 data/test/java/beans/PropertyChangeSupport/TestSynchronization.java.i
 data/src/share/classes/sun/management/snmp/util/SnmpNamedListTableCache.java.i
 data/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy.c.i
-data/src/share/classes/sun/security/x509/AVA.java.i
+data/test/java/util/Locale/Bug4184873_he.i
 data/src/share/classes/com/sun/script/javascript/JavaAdapter.java.i
-data/src/share/classes/sun/misc/RegexpTarget.java.i
+data/src/share/classes/sun/tools/jstat/Scale.java.i
 data/src/share/classes/com/sun/tools/attach/package.html.i
 data/src/share/classes/sun/tools/tree/AssignUnsignedShiftRightExpression.java.i
 data/src/share/classes/sun/io/ByteToCharCp737.java.i
-data/src/share/classes/java/io/BufferedOutputStream.java.i
-data/src/share/classes/sun/nio/fs/AbstractPath.java.i
+data/test/java/util/zip/input.jar.i
+data/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java.i
 data/src/share/classes/sun/nio/cs/IBM437.java.i
-data/test/java/net/Inet6Address/B4923906.java.i
-data/make/tools/swing-beans/beaninfo/BeanInfoUtils.java.i
-data/test/sun/security/ssl/sanity/interop/CipherTest.java.i
-data/test/java/text/Format/DateFormat/ISO8601ZoneTest.java.i
-data/src/share/classes/java/security/cert/CertPathValidator.java.i
-data/test/javax/swing/JColorChooser/Test4461329.java.i
+data/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java.i
+data/src/share/classes/sun/nio/cs/MS1251.java.i
+data/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java.i
+data/test/sun/security/mscapi/KeyStoreCompatibilityMode.java.i
+data/test/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java.i
+data/src/share/sample/jmx/jmx-scandir/index.html.i
 data/test/java/io/LineNumberInputStream/MarkReset.java.i
 data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java.i
 data/src/share/classes/sun/nio/cs/ext/IBM1148.java.i
diff --git a/jdk/.hg/store/undo b/jdk/.hg/store/undo
index fa033b7..222d341 100644
Binary files a/jdk/.hg/store/undo and b/jdk/.hg/store/undo differ
diff --git a/jdk/.hg/undo.desc b/jdk/.hg/undo.desc
index b2060d0..e278f5d 100644
--- a/jdk/.hg/undo.desc
+++ b/jdk/.hg/undo.desc
@@ -1,3 +1,3 @@
-5001
+5002
 pull
 http://hg.openjdk.java.net/jigsaw/jigsaw/jdk
diff --git a/jdk/.hg/undo.dirstate b/jdk/.hg/undo.dirstate
index 0191fda..5f3dca8 100644
Binary files a/jdk/.hg/undo.dirstate and b/jdk/.hg/undo.dirstate differ
diff --git a/jdk/make/common/Defs-modules.gmk b/jdk/make/common/Defs-modules.gmk
index a1bf4bb..23ffeb0 100644
--- a/jdk/make/common/Defs-modules.gmk
+++ b/jdk/make/common/Defs-modules.gmk
@@ -65,8 +65,8 @@ else
 endif
 
 # Modules for imports
-CORBA_MODULE             = sun.corba
-JTA_MODULE               = sun.jta
+CORBA_MODULE             = jdk.corba
+JTA_MODULE               = jdk.jta
 XML_MODULE               = jdk.jaxp
 XERCES_MODULE            = jdk.jaxp
 XALAN_MODULE             = jdk.jaxp
@@ -74,24 +74,24 @@ JAXWS_MODULE             = jdk.jaxws
 JX_ANNOTATION_MODULE     = jdk.jx.annotations
 RMIC_MODULE              = jdk.tools
 COMPILER_MODULE          = jdk.compiler
-JAVAC_MODULE             = jdk.javac
-JAVAP_MODULE             = jdk.javap
-JAVAH_MODULE             = jdk.javah
-JAVADOC_MODULE           = jdk.javadoc
+JAVAC_MODULE             = jdk.devtools
+JAVAP_MODULE             = jdk.devtools
+JAVAH_MODULE             = jdk.devtools
+JAVADOC_MODULE           = jdk.devtools
 APT_MODULE               = jdk.apt
 MIRROR_MODULE            = jdk.mirror
 
 # idlj is grouped with the corba runtime
-IDLJ_MODULE              = sun.corba
+IDLJ_MODULE              = jdk.corba
 
 JDK_BASE_MODULE          = jdk.base
 BASE_TOOLS_MODULE        = jdk.tools.base
 JRE_TOOLS_MODULE         = jdk.tools.jre
 TOOLS_MODULE             = jdk.tools
 JAXWS_TOOLS_MODULE       = jdk.tools.jaxws
-CORBA_TOOLS_MODULE       = sun.corba
-RMI_TOOLS_MODULE         = sun.rmi
-KERBEROS_TOOLS_MODULE    = sun.kerberos
+CORBA_TOOLS_MODULE       = jdk.corba
+RMI_TOOLS_MODULE         = jdk.rmi
+KERBEROS_TOOLS_MODULE    = jdk.kerberos
 
 
 # Modules for JDK only
diff --git a/jdk/make/common/Defs.gmk b/jdk/make/common/Defs.gmk
index c63de54..7e173fd 100644
--- a/jdk/make/common/Defs.gmk
+++ b/jdk/make/common/Defs.gmk
@@ -500,8 +500,8 @@ $(MAKE) -f Makefile.launcher \
         MAIN_CLASS=$(strip $2) \
         MAIN_JAVA_ARGS="$(strip $3)" \
         MAIN_ARGS="$(strip $4)" \
-        MODULE="$(strip $5)" \
-        PROGRAM_MODULE="$(strip $5)"
+        MODULE="tools.$(strip $1)" \
+        PROGRAM_MODULE="jdk.$(strip $1)"
 endef
 
 #
diff --git a/jdk/make/common/Modules.gmk b/jdk/make/common/Modules.gmk
index 6f74bd2..07ee121 100644
--- a/jdk/make/common/Modules.gmk
+++ b/jdk/make/common/Modules.gmk
@@ -171,8 +171,8 @@ define copy-jre-image
 from=$(strip $1); dest=$(strip $2); \
 ($(CD) $(MODULE_IMAGES_DIR)/$$from && $(FIND) . -depth -print \
               | $(CPIO) -pdum $(MODULE_IMAGES_DIR)/$$dest) ; \
-if [ -d "$(ABS_MODULEPATH_DIR)/jdk.boot/include" ] ; then \
-   $(CP) -rf $(ABS_MODULEPATH_DIR)/jdk.boot/include $(MODULE_IMAGES_DIR)/$$dest; \
+if [ -d "$(ABS_MODULEPATH_DIR)/jdk.base/include" ] ; then \
+   $(CP) -rf $(ABS_MODULEPATH_DIR)/jdk.base/include $(MODULE_IMAGES_DIR)/$$dest; \
 fi
 endef
 
@@ -202,7 +202,13 @@ endef
 # Rules for building packages
 include $(BUILDDIR)/common/BuildNativePackages.gmk
 
+# set BUILD_PACKAGES=false to skip building jmod packages
+# 
 PKG_TYPES = jmod-pkgs
+ifeq ($(BUILD_PACKAGES), false)
+  PKG_TYPES =
+endif
+
 DEBIAN := $(shell \
                if [ -f /etc/debian_version ] ; then \
                   $(ECHO) true; \
@@ -210,21 +216,23 @@ DEBIAN := $(shell \
                   $(ECHO) false; \
                fi)
 
+# FIXME: turn on building debian packages by default once
+#        the debian-related issues are fixed (e.g. views, version).
+#
+BUILD_NATIVE_PACKAGES=false
 
-# set BUILD_PACKAGES=false to skip building jmod and native packages
+# set BUILD_NATIVE_PACKAGES=false to skip building native packages
 # 
-ifeq ($(BUILD_PACKAGES), false)
-PKG_TYPES =
-DEBIAN = false
+ifeq ($(BUILD_NATIVE_PACKAGES), false)
+  DEBIAN = false
 endif
 
 ifeq ($(DEBIAN), true)
-PKG_TYPES += deb-pkgs
+  PKG_TYPES += deb-pkgs
 endif
 
 gen-pkgs: $(PKG_TYPES)
 
-
 %-setup:
 	$(RM) -r $(MODULE_IMAGES_DIR)/$*
 	$(MKDIR) $(MODULE_IMAGES_DIR)/$*
diff --git a/jdk/make/common/Rules.gmk b/jdk/make/common/Rules.gmk
index 9a9b0fd..f9bd6a3 100644
--- a/jdk/make/common/Rules.gmk
+++ b/jdk/make/common/Rules.gmk
@@ -234,12 +234,12 @@ classes : $(CLASSES_INIT) .delete.classlist .compile.classlist
 	@$(RM) $<.filtered
 	@$(CAT) $< | $(NAWK) 'length>0' | $(SORT) -u > $<.filtered
 	@if [ `$(CAT) $<.filtered | $(WC) -l` -ge 1 ] ; then \
+          $(TouchModule); \
 	  $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
 	  $(CAT) $<.filtered; \
 	  $(ECHO) "# Running javac:"; \
 	  $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
 	  $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
-          $(TouchModule); \
 	fi
 	@$(java-vm-cleanup)
 
diff --git a/jdk/make/docs/Makefile b/jdk/make/docs/Makefile
index 8517654..61756ea 100644
--- a/jdk/make/docs/Makefile
+++ b/jdk/make/docs/Makefile
@@ -71,7 +71,7 @@ include $(BUILDDIR)/common/internal/ImportComponents.gmk
 ifeq ($(ARCH_DATA_MODEL),64)
   MAX_VM_MEMORY = 1024
 else
-  MAX_VM_MEMORY = 512
+  MAX_VM_MEMORY = 612
 endif
 
 # List of all possible directories for javadoc to look for sources
diff --git a/jdk/make/java/java/FILES_java.gmk b/jdk/make/java/java/FILES_java.gmk
index eaf071d..e93bcc9 100644
--- a/jdk/make/java/java/FILES_java.gmk
+++ b/jdk/make/java/java/FILES_java.gmk
@@ -501,14 +501,15 @@ JAVA_JAVA_jigsaw = \
     java/lang/module/ModuleId.java \
     java/lang/module/ModuleIdQuery.java \
     java/lang/module/ModuleInfo.java \
-    java/lang/module/ModuleInfoAnnotation.java \
     java/lang/module/ModuleInfoReader.java \
     java/lang/module/ModuleSystem.java \
+    java/lang/module/ModuleView.java \
     java/lang/module/ModuleNotPresentException.java \
     java/lang/module/RequireOptionalModule.java \
+    java/lang/module/ServiceDependence.java \
     java/lang/module/Version.java \
     java/lang/module/VersionQuery.java \
-    java/lang/module/UnsupportedElementTypeException.java \
+    java/lang/module/ViewDependence.java \
     java/lang/reflect/Module.java \
     \
     org/openjdk/jigsaw/BaseContext.java \
diff --git a/jdk/make/modules/Makefile b/jdk/make/modules/Makefile
index 0475edc..8d7c0ca 100644
--- a/jdk/make/modules/Makefile
+++ b/jdk/make/modules/Makefile
@@ -125,17 +125,17 @@ $(MODULES_LIST):: $(MODULES_CONFIG) $(MODULES_GROUP) \
 # files for all or just the updated modules are generated.
 $(MODULES_LIST):: $(MODULES_UPDATE_MARKER)
 	@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
+	$(clean-build)
 	$(HOST_JAVA_CMD) \
                 -jar $(CLASSANALYZER_JAR_FILE) \
                 -jdkhome $(OUTPUTDIR) \
-                -platform \
                 -config $(MODULES_CONFIG) \
                 -config $(MODULES_GROUP) \
                 -depconfig $(DEP_CONFIG) \
                 -depconfig $(OPTIONAL_DEP_CONFIG) \
                 -properties $(MODULES_PROPERTIES) \
                 -version $(MODULE_VERSION) \
-                -update \
+                -base $(BASE_MODULE) \
                 -output $(MODULE_CLASSLIST_DIR) \
                 -moduleinfo $(MODULEINFO_SRC)
 	@$(java-vm-cleanup)
@@ -146,16 +146,15 @@ $(MODULES_LIST):: $(MODULES_UPDATE_MARKER)
 # if JDK_HOST_PATH is a legacy jdk and the main class
 # for some modules are not in rt.jar (or $outputdir/classes)
 BOOTCLASSPATH := $(shell bcp="$(OUTPUTDIR)/classes"; \
-                      $(CD) $(OUTPUTDIR)/lib && ( \
-                      jfiles=`$(FIND) . -name \*.jar -print`) ; \
+                      jfiles=`$(FIND) $(OUTPUTDIR)/lib -name \*.jar -print` ; \
 	              for jf in  $$jfiles ; do \
                           if [ -f $$jf ] ; then \
-                              bcp="$$bcp$(CLASSPATH_SEPARATOR)$(OUTPUTDIR)/lib/$$jf"; \
+                              bcp="$$bcp$(CLASSPATH_SEPARATOR)$$jf"; \
                           fi \
                       done; \
                       $(ECHO) $$bcp)
-JAVAC_CMD = $(HOST_JAVAC_CMD) \
-                    -Xbootclasspath:$(BOOTCLASSPATH) \
+JAVAC_CMD := $(HOST_JAVAC_CMD) \
+                    -Xbootclasspath:"$(BOOTCLASSPATH)" \
                     -modulepath $(MODULEPATH_DIR) \
                     -sourcepath $(MODULEINFO_SRC)
 FILES_java := $(shell $(NAWK) '{print $$1 "/module-info.java"}' ${MODULES_LIST})
@@ -188,13 +187,13 @@ modularize: $(MODULES_LIST)
                 -cp $(CLASSANALYZER_JAR_FILE) \
                 com.sun.classanalyzer.Modularizer \
                 -jdkhome $(OUTPUTDIR) \
-                -update \
                 -classlistdir $(MODULE_CLASSLIST_DIR) \
                 -modulepath $(ABS_MODULEPATH_DIR)
 	@$(java-vm-cleanup)
 	$(MAKE) `$(NAWK) '{print "$(JIGSAW_MODULE_LIB)/" $$1 "/$(MODULE_VERSION)/info" }' $<` || exit 1
 	@$(ECHO) ">>>Finished making "$@" @ `$(DATE)` ..."
 
+
 # copy-module-content
 #    $1 - module
 #
@@ -227,10 +226,21 @@ define install-module
   $(RM) -r $(JIGSAW_MODULE_LIB)/$$m ; \
   $(ECHO) "Installing module $$m" ; \
   $(CD) $(MODULEPATH_DIR) && \
-  $(HOST_JMOD_CMD) install $$m/classes $$m -L $(JIGSAW_MODULE_LIB) $(JMOD_INSTALL_ARGS) || exit 1 ; 
+  $(HOST_JMOD_CMD) -J-esa install $$m/classes $$m -L $(JIGSAW_MODULE_LIB) $(JMOD_INSTALL_ARGS) || exit 1 ; 
 endef
 
-#
+define patch-module-classes
+  m=$(strip $*); \
+  tmp=$(ABS_MODULES_TEMPDIR)/$$m.files ; \
+  $(SED) -e 's%\\%\/%g' $(MODULE_CLASSLIST_DIR)/$$m.classlist > $$tmp || exit 1 ; \
+  if [ -f $(MODULE_CLASSLIST_DIR)/$$m.resources ] ; then \
+    $(SED) -e 's%\\%\/%g' $(MODULE_CLASSLIST_DIR)/$$m.resources | \
+       $(EGREP) -v "default_US_export.policy|default_local.policy|exempt_local.policy" \
+       >> $$tmp || exit 1 ; \
+  fi ; \
+  $(ECHO) "Patching classes for module $$m" ; \
+  rsync -v -t --files-from=$$tmp $(ABS_OUTPUTDIR)/classes $(ABS_MODULEPATH_DIR)/$$m/classes || exit 1;
+endef
 
 #
 # Install the module if module-info.class is updated
@@ -272,14 +282,7 @@ clean clobber:: classes.clean
 	    $(ECHO) 'Invalid target: "$@" expected a valid module name' ; \
 	    exit 1; \
 	fi
-	$(HOST_JAVA_CMD) \
-                -cp $(CLASSANALYZER_JAR_FILE) \
-                com.sun.classanalyzer.Modularizer \
-                -jdkhome $(OUTPUTDIR) \
-                -update \
-                -classlistdir $(MODULE_CLASSLIST_DIR) \
-                -modulepath $(ABS_MODULEPATH_DIR)
-	@$(call copy-module-content,$@)
+	$(call patch-module-classes,$@)
 	$(call install-module,$@)
 	@$(java-vm-cleanup)
 	@if [ -d $(OUTPUTDIR)/jdk-module-image/lib/modules ] ; then \
diff --git a/jdk/make/modules/jdk.depconfig b/jdk/make/modules/jdk.depconfig
index f0c3dfd..06dde2c 100644
--- a/jdk/make/modules/jdk.depconfig
+++ b/jdk/make/modules/jdk.depconfig
@@ -511,3 +511,5 @@
   javax.management.remote.rmi.RMIConnector -> com.sun.jmx.remote.protocol.iiop.PInputStream
   com.sun.jmx.remote.internal.IIOPHelper -> com.sun.jmx.remote.protocol.iiop.IIOPProxyImpl
 
+ at ClassForName(optional)
+  javax.tools.ToolProvider -> com.sun.tools.javac.api.JavacTool
diff --git a/jdk/make/modules/modules.config b/jdk/make/modules/modules.config
index bafcde6..2cc83d2 100644
--- a/jdk/make/modules/modules.config
+++ b/jdk/make/modules/modules.config
@@ -39,16 +39,18 @@
 // remove them for compatibility reason.  Define this module
 // first so that other modules don't need to exclude these clases
 module private-legacy {
-    include sun.misc.Cache*,
-            sun.misc.ClassLoaderUtil,
+     // ## They reference sun.misc.Ref and sun.misc.Queue. 
+     // ## Move them to client to eliminate access to internal API.
+     // include sun.misc.Cache*,
+     //         sun.misc.Request,
+     //         sun.misc.RequestProcessor;
+      include sun.misc.ClassLoaderUtil,
             sun.misc.Compare,
             sun.misc.ConditionLock,
             sun.misc.CRC16,
             sun.misc.Lock,
             sun.misc.Regexp,
-            sun.misc.RequestProcessor,
             sun.misc.Sort,
-            sun.misc.Request,
             sun.misc.Timeable,
             sun.misc.Timer,
             sun.misc.TimerThread,
@@ -208,6 +210,8 @@ module base {
 
     // US_en locale
     include sun.text.resources.BreakIteratorInfo,
+            sun.text.resources.CollationData,
+            sun.text.resources.CollationData_en,
             sun.text.resources.FormatData,
             sun.text.resources.FormatData_en_US,
             sun.util.resources.CalendarData,
@@ -510,7 +514,6 @@ module security-sunmscapi {
 module security-kerberos {
     include javax.security.auth.kerberos.*,
             com.sun.security.jgss.**,
-            com.sun.security.auth.module.Krb5LoginModule,
             com.sun.security.sasl.gsskerb.**,             // GSSAPI SASL mechanism
             sun.security.jgss.**,
             sun.security.ssl.krb5.**,
@@ -563,6 +566,10 @@ module sun.auth.jndi {
     include com.sun.security.auth.module.JndiLoginModule;
 }
 
+module sun.auth.kerberos {
+    include com.sun.security.auth.module.Krb5LoginModule;
+}
+
 module security-auth {
     include com.sun.security.auth.**;
 }
@@ -751,7 +758,25 @@ module jdk.tools.jaxws {
     include tools.xjc;
     include tools.wsgen;
     include tools.wsimport;
-    class sun.launcher.LauncherHelper;   // module entry point to invoke the tool
+
+    view jdk.schemagen {
+        class com.sun.tools.internal.jxc.SchemaGenerator;
+    }
+    
+    view jdk.xjc {
+        class com.sun.tools.internal.xjc.Driver;
+    }
+    
+    
+    view jdk.wsgen {
+        class com.sun.tools.internal.ws.WsGen;
+    }
+    
+    view jdk.wsimport {
+        class com.sun.tools.internal.ws.WsImport;
+    }
+
+// Implementation for xjc, wsgen, wsimport, and schemagen tools
 }
 
 module jaxws {
@@ -876,6 +901,11 @@ module client {
             sun.misc.FIFOQueueEnumerator,
             sun.misc.LIFOQueueEnumerator;
 
+     // Legacy dead code but references sun.misc types
+     include sun.misc.Cache*,
+             sun.misc.Request,
+             sun.misc.RequestProcessor;
+
     // content handlers
     include sun.net.www.content.audio.**,
             sun.net.www.content.image.**;
@@ -936,7 +966,7 @@ module jdk.mirror {
     include com.sun.mirror.**;
 }
 
-module jdk.javac {
+module tools.javac {
     include com.sun.tools.javac.**,
             com.sun.source.**;
     exclude com.sun.tools.javac.Launcher;
@@ -944,12 +974,12 @@ module jdk.javac {
 }
 
 // EOL in jdk 8
-module jdk.apt {
+module tools.apt {
     include com.sun.tools.apt.**;
     class com.sun.tools.apt.Main;
 }
 
-module jdk.javadoc {
+module tools.javadoc {
     include com.sun.tools.doclets.**;
     include com.sun.tools.javadoc.**,
             com.sun.javadoc.**;
diff --git a/jdk/make/modules/modules.group b/jdk/make/modules/modules.group
index ee4b6f9..fda872e 100644
--- a/jdk/make/modules/modules.group
+++ b/jdk/make/modules/modules.group
@@ -40,44 +40,45 @@
  *    }
  */
 
-// Workaround: jigsaw depends on the existence of
-// both jdk.boot and jdk.base modules.
-//
-// Move classes and resources from the base module
-// to the boot module.  The module-info.java for
-// the boot module is already output in the
-// platform module list.
-
-module jdk.boot {
+module jdk.base {
+    provides java.base;
+
     include base;
     include unpack200-tool;
     include tools.jmod;
 
-    // FIXME: sun.net.NetHooks -> sun.net.sdp.SdpProvider
-    include sdp;
-    class org.openjdk.jigsaw.Hi;    // testing
-}
-
-// base module
-module jdk.base {
     // Workaround: include the policy files for now.
     // They have to be bundled in signed jars.
     include US_export_policy;
     include local_policy;
 
-    requires public local jdk.boot;
-
     // explicit optional dependences
     requires optional jdk.jaxp;
     requires optional jdk.desktop;
     requires optional sun.resources;
     requires optional sun.localedata;
     requires optional sun.charsets;
+
+/* ### uncomment below when javac NPE bug is fixed
+    view jdk.base.oracle {
+        exports com.oracle.nio.*;
+        exports com.oracle.net.*;
+    }
+
+    view jdk.base.unsafe {
+        exports sun.misc.Unsafe;
+    }
+*/
+
+    view jdk.jmod {
+        class org.openjdk.jigsaw.cli.Librarian;
+    }
+
     class org.openjdk.jigsaw.Hi;    // testing
 }
 
 module jdk.instrument {
-    requires local jdk.boot;
+    requires local jdk.base;
     include instrument;
 }
 
@@ -98,8 +99,8 @@ module jdk.instrument {
  * Rename all private internal modules with "sun." prefix
  */
 
-module sun.desktop {
-    requires local jdk.boot;   // ensure loaded by bootstrap class loader
+module jdk.desktop {
+    requires local jdk.base;   // ensure loaded by bootstrap class loader
 
     include beans;
     include client;
@@ -110,9 +111,8 @@ module sun.desktop {
 
     // com.sun.security.auth callback dialog
     include sun.callback.dialog;
-}
 
-module jdk.desktop {
+
     // ## To be revisited: 
     // There are packages splitted between sun.desktop, jdk.boot, and 
     // other modules.  sun.desktop only permits certain modules to 
@@ -123,7 +123,6 @@ module jdk.desktop {
     // the same context with sun.desktop; otherwise, packages be defined in
     // the boot context and exported by jdk.jaxp context.
  
-    requires public local sun.desktop;
     requires optional jdk.jaxp;
 }
 
@@ -131,30 +130,31 @@ module jdk.desktop {
 // ## once we eliminate the Preferences implementation for Unix
 // ## to XML (currently stored as a XML file).
 module jdk.prefs {
-    requires local jdk.boot;   // ensure loaded by bootstrap class loader
+    requires local jdk.base;   // ensure loaded by bootstrap class loader
     include prefs;
 }
 
-module sun.management {
-    requires local jdk.boot;   // ensure loaded by bootstrap class loader
+module jdk.management {
+    requires local jdk.base;   // ensure loaded by bootstrap class loader
     include management;
-    requires optional sun.management.iiop;
+
+    requires optional jdk.management.iiop;
 }
 
 // JMX RMI-IIOP connector
-module sun.management.iiop {
-    requires local jdk.boot;   // ensure loaded by bootstrap class loader
+module jdk.management.iiop {
+    requires local jdk.base;   // ensure loaded by bootstrap class loader
 
     include management-iiop;
 }
 
-module sun.snmp {
-    requires local jdk.boot;   // ensure loaded by bootstrap class loader
+module jdk.snmp {
+    requires local jdk.base;   // ensure loaded by bootstrap class loader
     include management-snmp;
 }
 
-module sun.corba {
-    requires local jdk.boot;   // ensure loaded by bootstrap class loader
+module jdk.corba {
+    requires local jdk.base;   // ensure loaded by bootstrap class loader
 
     include corba;
 
@@ -163,50 +163,87 @@ module sun.corba {
     include tools.servertool;
     include tools.tnameserv;
 
+    view jdk.orbd {
+        class com.sun.corba.se.impl.activation.ORBD;
+    }
+    
+    view jdk.servertool {
+        class com.sun.corba.se.impl.activation.ServerTool;
+    }
+    
+    view jdk.tnameserv {
+        class com.sun.corba.se.impl.naming.cosnaming.TransientNameServer;
+    }
+
     // development tools
     include tools.idlj;
-    class sun.launcher.LauncherHelper;   // module entry point to invoke the tool
+
+    view jdk.idlj {
+        class com.sun.tools.corba.se.idl.toJavaPortable.Compile;
+    }
 }
 
-module sun.jdbc {
-    requires local jdk.boot;   // ensure loaded by bootstrap class loader
+module jdk.jdbc {
+    requires local jdk.base;   // ensure loaded by bootstrap class loader
     include jdbc;
 }
 
-module sun.jdbc.rowset {
-    requires local jdk.boot;
+module jdk.jdbc.rowset {
+    requires local jdk.base;   // ensure loaded by bootstrap class loader
     include jdbc-rowset;
 }
 
-module sun.compat {
-    requires local jdk.boot;   // ensure loaded by bootstrap class loader
+module jdk.compat {
+    requires local jdk.base;   // ensure loaded by bootstrap class loader
     include private-legacy;
     include net-compat;
     include deprecated;
     include jdbc-odbc;
+
+    // ## avoid com.sun.security.auth be splitted among many modules
+    // ## most of the com.sun.security.auth should be deprecated.
+    // ## need to sort out which one is still needed
+    //
+    // include sun.callback.dialog;
+    // include sun.auth.ldap;
+    // include sun.auth.kerberos;
+    // include sun.auth.jndi;
+    // include security-auth;
+
 }
 
 // Deprecated APIs used by snmp
-module sun.security.acl {
-    requires local jdk.boot;   // ensure loaded by bootstrap class loader
+module jdk.security.acl {
+    requires local jdk.base;   // ensure loaded by bootstrap class loader
     include security-acl;
 }
 
-module sun.kerberos {
-    requires local jdk.boot;   // ensure loaded by bootstrap class loader
+module jdk.kerberos {
+    requires local jdk.base;   // ensure loaded by bootstrap class loader
     include security-kerberos;
+    include sun.auth.kerberos;
 
     // kerberos-related tools (windows only)
     include tools.kinit;
     include tools.klist;
     include tools.ktab;
 
-    class sun.launcher.LauncherHelper;   // module entry point to invoke the tool
+    view jdk.kinit {
+        class sun.security.krb5.internal.tools.Kinit;
+    }
+
+    view jdk.klist {
+        class sun.security.krb5.internal.tools.Klist;
+    }
+
+    view jdk.ktab {
+        class sun.security.krb5.internal.tools.Ktab;
+    }
 }
 
-module sun.sunec {
+module jdk.sunec {
     // split sun.security.ec package with sun.security
-    requires local jdk.boot;
+    requires local jdk.base;
     include security-sunec;
 }
 
@@ -253,15 +290,15 @@ module jdk.jaxp {
     // Otherwise, javax.xml and other packages would be defined in
     // the boot context and exported by jdk.jaxp context.
     //
-    requires local jdk.boot;
+    requires local jdk.base;
 
     include sun.xml;
     include sun.xalan;
     include sun.xerces;
 }
 
-module sun.jndi {
-    requires local jdk.boot;   // loaded by bootstrap class loader
+module jdk.jndi {
+    requires local jdk.base;   // loaded by bootstrap class loader
     include jndi;
 
     // ## jndi providers
@@ -272,25 +309,33 @@ module sun.jndi {
     include sun.auth.jndi;
 }
 
-module sun.cosnaming {
+module jdk.cosnaming {
     // include COS naming service provider for JNDI 
     // that pulls in jndi module
     include jndi-cosnaming;
 }
 
-module sun.rmi {
-    requires local jdk.boot;   // ensure loaded by bootstrap class loader
+module jdk.rmi {
+    requires local jdk.base;   // ensure loaded by bootstrap class loader
     include rmi;
     include rmi-activation;
 
     // rmi runtime tools
     include tools.rmiregistry;
     include tools.rmid;
-    class sun.launcher.LauncherHelper;   // module entry point to invoke the tool
+
+    view jdk.rmiregistry {
+        class sun.rmi.registry.RegistryImpl;
+    }
+
+    view jdk.rmid {
+        class sun.rmi.server.Activation;
+    }
+
 }
 
-module sun.auth {
-    requires local jdk.boot;   // ensure loaded by bootstrap class loader
+module jdk.auth {
+    requires local jdk.base;   // ensure loaded by bootstrap class loader
     include security-auth;
     include sun.callback.text;
 
@@ -299,8 +344,8 @@ module sun.auth {
     include security-sasl-ntlm;
 }
 
-module sun.tls {
-    requires local jdk.boot;   // ensure loaded by bootstrap class loader
+module jdk.tls {
+    requires local jdk.base;   // ensure loaded by bootstrap class loader
     include security-jsse;
 }
 
@@ -326,37 +371,37 @@ module jdk.scripting {
 // ## corba and jdbc depends on javax.transaction.
 // ## jigsaw resolver fails if any of its transitive dependencies
 // ## doesn't require jdk.boot
-module sun.jta {
-    requires local jdk.boot;   // ensure loaded by bootstrap class loader
+module jdk.jta {
+    requires local jdk.base;   // ensure loaded by bootstrap class loader
     include jta;
 }
 
+module jdk.logging {
+    requires local jdk.base;   // loaded by bootstrap class loader
+    include logging;
+    include tracing;
+}
+
 // ## localedata is loaded by the extension class loader
 // ## for now, in the same connected graph loaded by the bootstrap class loader
 module sun.localedata {
-    requires local jdk.boot;
+    requires local jdk.base;
     include localedata;
 }
 
-module sun.logging {
-    requires local jdk.boot;   // loaded by bootstrap class loader
-    include logging;
-    include tracing;
-}
-
 module sun.charsets {
-    requires local jdk.boot;   // loaded by bootstrap class loader
+    requires local jdk.base;   // loaded by bootstrap class loader
     include charsets;
 }
 
 module sun.resources {
-    requires local jdk.boot;   // loaded by bootstrap class loader
+    requires local jdk.base;   // loaded by bootstrap class loader
     include resources;
 }
 
 // Oracle's platform extension (supported APIs)
 module jdk.sctp {
-    requires local jdk.boot;   // loaded by bootstrap class loader
+    requires local jdk.base;   // loaded by bootstrap class loader
     include sctp;
 }
 
@@ -368,25 +413,33 @@ module jdk.httpserver {
     include httpserver;
 }
 
-// ## langtools maintains the list of modules and names
-// ## keep jdk.javah and jdk.javap for now
-module jdk.javah {
-    include tools.javah;
+module jdk.apt {
+    include tools.apt;
 }
 
-module jdk.javap {
+module jdk.devtools {
+    include tools.javac;
+    include tools.javah;
     include tools.javap;
+    include tools.javadoc;
+
+    view jdk.javac {
+        class com.sun.tools.javac.Main;
+    }
+    view jdk.javah {
+        class com.sun.tools.javah.Main;
+    }
+    view jdk.javap {
+        class com.sun.tools.javap.Main;
+    }
+    view jdk.javadoc {
+        class com.sun.tools.javadoc.Main;
+    }
 }
 
 // developer tools to be included in the jdk-base-image
 module jdk.tools.base {
-    requires jdk.javac;   // public module
-
-    // include tools.javah;
-    // include tools.javap;
-
-    requires jdk.javah;
-    requires jdk.javap;
+    requires jdk.devtools;
 
     include tools.jar;
     include tools.jarsigner;
@@ -396,7 +449,34 @@ module jdk.tools.base {
     include tools.keytool;
     include tools.pack200;
 
-    class sun.launcher.LauncherHelper;   // module entry point to invoke the tool
+
+    view jdk.jar {
+        class sun.tools.jar.Main;
+    }
+
+    view jdk.jarsigner {
+       class sun.security.tools.JarSigner;
+    }
+
+    view jdk.jpkg {
+        class org.openjdk.jigsaw.cli.Packager;
+    }
+
+    view jdk.jrepo {
+        class org.openjdk.jigsaw.cli.Repositor;
+    }
+
+    view jdk.jsign {
+        class org.openjdk.jigsaw.cli.Signer;
+    }
+
+    view jdk.keytool {
+       class sun.security.tools.KeyTool;
+    }
+
+    view jdk.pack200 {
+        class com.sun.java.util.jar.pack.Driver;
+    }
 }
 
 // JRE tools to be included in the jdk-module-image and jre-module-image
@@ -407,17 +487,16 @@ module jdk.tools.jre {
 
     // JRE tools
     include tools.policytool;
-
-    class sun.launcher.LauncherHelper;   // module entry point to invoke the tool
+    view jdk.policytool {
+         class sun.security.tools.policytool.PolicyTool;
+    }
 }
 
 // Other developer tools to be included in the jdk-module-image
 module jdk.tools {
-    requires public jdk.tools.base;
-    requires public jdk.tools.jre;
-
-    requires public jdk.apt;  // EOL in jdk 8
-    requires public jdk.javadoc;
+    requires public jdk.tools.jre;     // Tools in JRE
+    requires public jdk.tools.base;    // developer tools for the base module
+    requires public jdk.tools.jaxws;   // developer tools for the jaxws module
 
     include attach;
     include jdi;
@@ -443,5 +522,123 @@ module jdk.tools {
     include tools.rmic;
     include tools.serialver;
 
-    class sun.launcher.LauncherHelper;   // module entry point to invoke the tool
+    view jdk.attach {
+        exports com.sun.tools.attach.*;
+        exports com.sun.tools.attach.spi.*;
+
+        // ## workaround javac NPE
+        class org.openjdk.jigsaw.Hi;
+    }
+
+    view jdk.jconsole {
+        exports com.sun.tools.jconsole.*;
+        class sun.tools.jconsole.JConsole;
+    }
+
+    view jdk.serialver {
+        class sun.tools.serialver.SerialVer;
+    }
+   
+    view jdk.jdb {
+        class com.sun.tools.example.debug.tty.TTY;
+    }
+
+    view jdk.jps {
+        class sun.tools.jps.Jps;
+    }
+
+    view jdk.jstatd {
+        class sun.tools.jstatd.Jstatd;
+    }
+
+    view jdk.jstat {
+        class sun.tools.jstat.Jstat;
+    }
+
+    view jdk.jhat {
+        class com.sun.tools.hat.Main;
+    }
+
+    view jdk.jinfo {
+        class sun.tools.jinfo.JInfo;
+    }
+    view jdk.jmap {
+        class sun.tools.jmap.JMap;
+    }
+
+    view jdk.jrunscript {
+        class com.sun.tools.script.shell.Main;
+    }
+
+    view jdk.jstack {
+         class sun.tools.jstack.JStack;
+    }
+
+    view jdk.extcheck {
+        class com.sun.tools.extcheck.Main;
+    }
+
+    view jdk.native2ascii {
+        class sun.tools.native2ascii.Main;
+    }
+
+    view jdk.jsadebugd {
+         class sun.jvm.hotspot.jdi.SADebugServer;
+    }
+
+    view jdk.appletviewer {
+        class sun.applet.Main;
+    }
+
+    view jdk.rmic {
+        class sun.rmi.rmic.Main;
+    }
+}
+
+module jdk.jre {
+    requires public jdk.tools.jre;
+    requires public jdk.base;
+    requires public jdk.auth;
+    requires public jdk.compat;
+    requires public jdk.compiler;
+    requires public jdk.corba;
+    requires public jdk.cosnaming;
+    requires public jdk.crypto;
+    requires public jdk.deploy;
+    requires public jdk.desktop;
+    requires public jdk.httpserver;
+    requires public jdk.instrument;
+    requires public jdk.jaxp;
+    requires public jdk.jaxws;
+    requires public jdk.jdbc;
+    requires public jdk.jdbc.rowset;
+    requires public jdk.jndi;
+    requires public jdk.jta;
+    requires public jdk.jx.annotations;
+    requires public jdk.kerberos;
+    requires public jdk.logging;
+    requires public jdk.management;
+    requires public jdk.management.iiop;
+    requires public jdk.prefs;
+    requires public jdk.rmi;
+    requires public jdk.scripting;
+    requires public jdk.sctp;
+    requires public jdk.security.acl;
+    requires public jdk.smartcardio;
+    requires public jdk.sunec;
+    requires public jdk.sunpkcs11;
+    requires public jdk.sunmscapi;
+    requires public jdk.tls;
+    requires public jdk.xmldsig;
+    requires public jdk.zipfs;
+
+    // charsets, resource bundles and data for other locales 
+    requires sun.charsets;
+    requires sun.resources;
+    requires sun.localedata;
+}
+
+module jdk {
+    requires public jdk.jre;
+    requires public jdk.tools;
 }
diff --git a/jdk/make/modules/modules.properties b/jdk/make/modules/modules.properties
index a68a008..d1c8d18 100644
--- a/jdk/make/modules/modules.properties
+++ b/jdk/make/modules/modules.properties
@@ -23,35 +23,41 @@
 # questions.
 #
 
-# The following modules must be defined in the input modules.config files
-platform.boot.module = jdk.boot
-platform.base.module = jdk.base
-
-# ClassAnalyzer will create the platform.jdk.module and platform.jre.module
-# when analyzing the jdk.
+#
+# supported properties of a module (default is false)
+#   <module-name>.allows.empty :
+#       include the module even if it's empty
+#   <module-name>.modules.list :
+#       print an ordered list of its required modules
+#   <module-name>.exports.all :
+#       exports all APIs
+#   <module-name>.allows.permits :
+#       allows permits on the default view (i.e. no internal view)
+#
 
-platform.jdk.module = jdk
-platform.jre.module = jdk.jre
-platform.jre.tools.module = jdk.tools.jre
+jdwp.allows.empty =  true
 
-# For legacy support:
-# platform.legacy.module = jdk.legacy
+## workaround until services are implemented
+sun.resources.exports.all = true
+sun.charsets.exports.all = true
+sun.localedata.exports.all = true
 
+## for compatibility
+jdk.compat.exports.all = true
 
-#
-# supported properties of a module
-#   <module-name>.allow.empty:  include the module even if it's empty (default = false)
-#   <module-name>.modules.list: print an ordered list of its required modules (default = false)
-#   <module-name>.exports.all:  exports all local APIs or not (default = true)
-#
-
-jdwp.allow.empty =  true
+# default view allows permits (i.e. no internal view generated)
+sun.resources.allows.permits = true
+sun.charsets.allows.permits = true
+sun.localedata.allows.permits = true
 
 jdk.modules.list = true
 jdk.jre.modules.list = true
 jdk.base.modules.list = true
 jdk.tools.base.modules.list = true
 
+# suffix represents a view name
+module.view.suffix = internal
+
 # List of external exported packages
 # Copied from jdk/make/docs/CORE_PKGS.gmk
 #
@@ -277,17 +283,7 @@ exported.packages = \
    org.xml.sax.ext \
    org.xml.sax.helpers \
    com.sun.java.browser.dom \
-   com.sun.javadoc \
-   com.sun.jdi \
-   com.sun.jdi.connect \
-   com.sun.jdi.connect.spi \
-   com.sun.jdi.event \
-   com.sun.jdi.request \
    com.sun.management \
-   com.sun.mirror.apt \
-   com.sun.mirror.declaration \
-   com.sun.mirror.type \
-   com.sun.mirror.util \
    com.sun.net.httpserver \
    com.sun.net.httpserver.spi \
    com.sun.net.ssl \
@@ -298,11 +294,6 @@ exported.packages = \
    com.sun.security.auth.login \
    com.sun.security.auth.module \
    com.sun.security.jgss \
-   com.sun.source.tree \
-   com.sun.source.util \
-   com.sun.tools.attach \
-   com.sun.tools.attach.spi \
-   com.sun.tools.jconsole \
    javax.smartcardio \
    org.w3c.dom \
    org.w3c.dom.bootstrap \
@@ -315,5 +306,20 @@ exported.packages = \
    org.w3c.dom.traversal \
    org.w3c.dom.views \
    org.openjdk.jigsaw \
-   sun.reflect.annotation
-
+   sun.reflect.annotation \
+   com.sun.jdi \
+   com.sun.jdi.connect \
+   com.sun.jdi.connect.spi \
+   com.sun.jdi.event \
+   com.sun.jdi.request \
+   com.sun.mirror.apt \
+   com.sun.mirror.declaration \
+   com.sun.mirror.type \
+   com.sun.mirror.util \
+   com.sun.javadoc \
+   com.sun.tools.doclets \
+   com.sun.source.tree \
+   com.sun.source.util \
+   com.sun.tools.attach \
+   com.sun.tools.attach.spi \
+   com.sun.tools.jconsole
diff --git a/jdk/make/tools/classanalyzer/nbproject/project.properties b/jdk/make/tools/classanalyzer/nbproject/project.properties
index 3ede69f..e3ac7bf 100644
--- a/jdk/make/tools/classanalyzer/nbproject/project.properties
+++ b/jdk/make/tools/classanalyzer/nbproject/project.properties
@@ -57,16 +57,14 @@ endorsed.classpath=
 excludes=
 
 file.reference.tools-src=src
-file.reference.tools.jar=/jigsaw/j2sdk-image/lib/tools.jar
 includes=**
 jar.compress=false
-javac.classpath=\
-    ${file.reference.tools.jar}
+javac.classpath=
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
+javac.source=1.8
+javac.target=1.8
 javac.test.classpath=
 javadoc.author=false
 javadoc.noindex=false
@@ -79,7 +77,8 @@ javadoc.version=false
 main.class=com.sun.classanalyzer.ClassAnalyzer
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
-platform.active=JDK_1.7
+mkdist.disabled=false
+platform.active=views
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/AnnotatedDependency.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/AnnotatedDependency.java
index 0c67038..a242328 100644
--- a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/AnnotatedDependency.java
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/AnnotatedDependency.java
@@ -38,7 +38,6 @@ import java.util.List;
 import java.util.Set;
 
 import com.sun.classanalyzer.Module.Reference;
-import com.sun.classanalyzer.ModuleInfo.Dependence;
 
 /**
  */
@@ -372,7 +371,6 @@ public abstract class AnnotatedDependency implements Comparable<AnnotatedDepende
     }
 
     static class OptionalDependency extends AnnotatedDependency {
-
         static boolean isOptional(Klass from, Klass to) {
             synchronized (OptionalDependency.class) {
                 if (optionalDepsMap == null) {
@@ -563,7 +561,7 @@ public abstract class AnnotatedDependency implements Comparable<AnnotatedDepende
 
         Map<Reference, Set<AnnotatedDependency>> result = new HashMap<Reference, Set<AnnotatedDependency>>();
         for (Reference ref : annotatedDepsMap.keySet()) {
-            if (m.contains(ref.referrer()) && m.isModuleDependence(ref.referree())) {
+            if (m.contains(ref.referrer()) && m.requiresModuleDependence(ref.referree())) {
                 result.put(ref, annotatedDepsMap.get(ref));
             }
         }
@@ -577,12 +575,13 @@ public abstract class AnnotatedDependency implements Comparable<AnnotatedDepende
         Set<Dependence> deps = new HashSet<Dependence>();
         for (Reference ref : annotatedDepsMap.keySet()) {
             if (m.contains(ref.referrer())) {
-                Module other = m.getModuleDependence(ref.referree());
+                Module other = m.getRequiresModule(ref.referree());
                 if (other != null) {
+                    boolean optional = false;
                     for (AnnotatedDependency ad : annotatedDepsMap.get(ref)) {
-                        Dependence d = new Dependence(other, ad.isOptional());
-                        deps.add(d);
+                        optional = optional || ad.isOptional();
                     }
+                    deps.add(Dependence.newDependence(ref.referree(), optional));
                 }
             }
         }
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassAnalyzer.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassAnalyzer.java
index edf1a30..3a49be9 100644
--- a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassAnalyzer.java
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassAnalyzer.java
@@ -66,7 +66,6 @@ public class ClassAnalyzer {
         String minfoDir = null;
         String jigsawLibrary = null;
         ClassPath cpath = null;
-        boolean usePlatformModuleBuilder = false;
         boolean mergeModules = true;
         boolean apiOnly = false;
         boolean showDynamic = false;
@@ -82,6 +81,9 @@ public class ClassAnalyzer {
                 }
                 jdkhome = getOption(args, i++);
                 cpath = ClassPath.newJDKClassPath(jdkhome);
+            } else if (arg.equals("-base")) {
+                String base = getOption(args, i++);
+                Module.setBaseModule(base);
             } else if (arg.equals("-classpath")) {
                 if (jdkhome != null) {
                     error("Both -jdkhome and -classpath are set");
@@ -102,9 +104,6 @@ public class ClassAnalyzer {
                 minfoDir = getOption(args, i++);
             } else if (arg.equals("-version")) {
                 version = getOption(args, i++);
-            } else if (arg.equals("-platform")) {
-                // a special case for generating JDK modules
-                usePlatformModuleBuilder = true;
             } else if (arg.equals("-jigsawLibrary")) {
                 jigsawLibrary = getOption(args, i++);
             } else if (arg.equals("-api")) {
@@ -132,13 +131,7 @@ public class ClassAnalyzer {
             error("-version not set");
         }
 
-        ModuleBuilder builder;
-        if (usePlatformModuleBuilder) {
-            builder =
-                new PlatformModuleBuilder(configs, depconfigs, mergeModules, version);
-        } else {
-            builder = new ModuleBuilder(configs, depconfigs, mergeModules, version);
-        }
+        ModuleBuilder builder = new ModuleBuilder(configs, depconfigs, mergeModules, version);
 
         File systemLib;
         if (jigsawLibrary != null) {
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassListWriter.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassListWriter.java
index 1ac1c88..078469a 100644
--- a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassListWriter.java
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassListWriter.java
@@ -42,19 +42,25 @@ import com.sun.classanalyzer.Module.*;
 public class ClassListWriter {
     private final Module module;
     private final File dir;
+    private final Set<Klass> classes;
+    private final Set<ResourceFile> resources;
+
     ClassListWriter(File dir, Module m) {
         this.module = m;
         this.dir = dir;
+        // ordered list for printing
+        this.classes = new TreeSet<>(m.classes());
+        this.resources = new TreeSet<>(m.resources());
     }
 
     void printClassList() throws IOException {
-        if (module.classes().isEmpty()) {
+        if (classes.isEmpty()) {
             return;
         }
 
         PrintWriter writer = new PrintWriter(Files.resolve(dir, module.name(), "classlist"));
         try {
-            for (Klass c : module.classes()) {
+            for (Klass c : classes) {
                 writer.format("%s\n", c.getClassFilePathname());
             }
         } finally {
@@ -65,13 +71,13 @@ public class ClassListWriter {
 
     void printResourceList() throws IOException {
         // no file created if the module doesn't have any resource file
-        if (module.resources().isEmpty()) {
+        if (resources.isEmpty()) {
             return;
         }
 
         PrintWriter writer = new PrintWriter(Files.resolve(dir, module.name(), "resources"));
         try {
-            for (ResourceFile res : module.resources()) {
+            for (ResourceFile res : resources) {
                 writer.format("%s\n", res.getPathname());
             }
 
@@ -92,7 +98,7 @@ public class ClassListWriter {
             Map<Reference, Set<AnnotatedDependency>> annotatedDeps =
                 AnnotatedDependency.getReferences(module);
 
-            for (Klass klass : module.classes()) {
+            for (Klass klass : classes) {
                 Set<Klass> references = klass.getReferencedClasses();
                 for (Klass other : references) {
                     String classname = klass.getClassName();
@@ -101,7 +107,7 @@ public class ClassListWriter {
                         classname = "[optional] " + classname;
                     }
 
-                    Module m = module.getModuleDependence(other);
+                    Module m = module.getRequiresModule(other);
                     if (m != null || other.getModule() == null) {
                         writer.format("%-40s -> %s (%s)", classname, other, m);
                         Reference ref = new Reference(klass, other);
@@ -121,7 +127,7 @@ public class ClassListWriter {
             if (annotatedDeps.size() > 0) {
                 for (Map.Entry<Reference, Set<AnnotatedDependency>> entry : annotatedDeps.entrySet()) {
                     Reference ref = entry.getKey();
-                    Module m = module.getModuleDependence(ref.referree);
+                    Module m = module.getRequiresModule(ref.referree);
                     if (m != null || ref.referree.getModule() == null) {
                         String classname = ref.referrer.getClassName();
                         boolean optional = true;
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassPath.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassPath.java
index d309bdc..7661181 100644
--- a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassPath.java
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassPath.java
@@ -45,6 +45,7 @@ public class ClassPath {
     protected final List<ClassPathEntry> entries = new LinkedList<ClassPathEntry>();
     private final Set<Klass> classes = new LinkedHashSet<Klass>();
     private final Set<ResourceFile> resources = new LinkedHashSet<ResourceFile>();
+    private long parseTime;
 
     private ClassPath() {
     }
@@ -117,14 +118,16 @@ public class ClassPath {
     }
 
     public void parse(Filter filter, boolean deps, boolean apiOnly) throws IOException {
+        long start = System.nanoTime();
         ClassResourceVisitor crv = new ClassResourceVisitor(classes, resources, deps, apiOnly);
         ClassPathVisitor cpvisitor = new ClassPathVisitor(crv, filter);
         visit(cpvisitor, filter, null);
+        parseTime = System.nanoTime() - start;
     }
 
     public void printStats() {
-        System.out.format("%d classes %d resource files processed%n",
-                classes.size(), resources.size());
+        System.out.format("%d classes %d resource files processed in %d ms%n",
+                classes.size(), resources.size(), ((long) parseTime/1000000));
     }
 
     protected void addJarFileEntries(File f) throws IOException {
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/Dependence.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/Dependence.java
new file mode 100644
index 0000000..3c36bc3
--- /dev/null
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/Dependence.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+package com.sun.classanalyzer;
+
+import java.util.Set;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.TreeSet;
+
+public class Dependence implements Comparable<Dependence> {
+
+    static enum Modifier {
+
+        PUBLIC("public"),
+        OPTIONAL("optional"),
+        LOCAL("local");
+        private final String name;
+
+        Modifier(String n) {
+            this.name = n;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+    }
+
+    private static EnumSet<Modifier> modifier(boolean optional) {
+        return optional ? EnumSet.of(Modifier.OPTIONAL)
+                : EnumSet.noneOf(Modifier.class);
+    }
+
+    final String module;
+    private final EnumSet<Modifier> mods;
+    final Set<Module.View> views = new HashSet<>();
+
+    public static Dependence newDependence(Klass k, boolean optional) {
+        Module dm = k.getModule().group();      
+        Dependence dep = new Dependence(dm.name(), optional);
+        Module.View view = dm.getView(k);
+        if (view == null)
+            throw new RuntimeException("No view exporting " + k);
+        dep.addView(view);
+        return dep;
+    }
+    
+    public Dependence(String module, boolean optional) {
+        this(module, modifier(optional));
+    }
+
+    public Dependence(String module, EnumSet<Modifier> mods) {
+        this.module = module;
+        this.mods = mods;
+    }
+
+    public Dependence(String module, boolean optional, boolean reexport, boolean local) {
+        Set<Modifier> ms = new TreeSet<>();
+        if (optional) {
+            ms.add(Modifier.OPTIONAL);
+        }
+        if (reexport) {
+            ms.add(Modifier.PUBLIC);
+        }
+        if (local) {
+            ms.add(Modifier.LOCAL);
+        }
+        this.module = module;
+        this.mods = ms.isEmpty()
+                ? EnumSet.noneOf(Modifier.class)
+                : EnumSet.copyOf(ms);
+    }
+    
+    void requiresLocal(Module m) {
+        mods.add(Modifier.LOCAL);
+        Module.View v = m.getView(module);
+        if (v == m.defaultView() && !m.moduleProperty("allows.permits")) {
+            // requires local should use the internal view unless the
+            // default view permits it.
+            v = m.internalView();
+        }
+        addView(v);
+    }
+    
+    void requiresOptional(Module m) {        
+        mods.add(Modifier.OPTIONAL);
+    }
+
+    void addView(Module.View v) {
+        views.add(v);
+        v.addRefCount();
+    }
+
+    private Module.View view;
+    synchronized Module.View getModuleView() {
+        if (view == null) {
+            // if this dependency requires a view name rather than a module name
+            // uses that view; otherwise, return the internal view if exists.
+            Module.View mv = null;
+            for (Module.View v : views) {
+                if (v.name.equals(module)) {
+                    mv = v;
+                    if (v.module.defaultView() != v) {
+                        view = v;
+                        break;
+                    }
+                } else if (v.module.internalView() == v) {
+                    view = v;   // continue to match the view name
+                }
+            }
+            if (view == null) {
+                if (mv == null)
+                    throw new RuntimeException("requires module view not found: " + this);
+                view = mv;
+            }
+        }
+        return view;
+    }
+
+    // ## remove it once clean up
+    Module getModule() {
+        return getModuleView().module;
+    }
+
+    public boolean isOptional() {
+        return mods.contains(Modifier.OPTIONAL);
+    }
+
+    public boolean isLocal() {
+        return mods.contains(Modifier.LOCAL);
+    }
+
+    public boolean isPublic() {
+        return mods.contains(Modifier.PUBLIC);
+    }
+
+    public EnumSet<Modifier> modifiers() {
+        return mods;
+    }
+
+    static interface Filter {
+
+        public boolean accept(Dependence d);
+    }
+
+    @Override
+    public int compareTo(Dependence d) {
+        if (this.equals(d)) {
+            return 0;
+        }
+        return module.compareTo(d.module);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof Dependence)) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+
+        Dependence d = (Dependence) obj;
+        return this.module.equals(d.module) && mods.equals(d.mods);
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        hash = 19 * hash + this.module.hashCode();
+        return hash;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        for (Dependence.Modifier mod : mods) {
+            sb.append(mod).append(" ");
+        }
+        sb.append(module).append(" (");
+        sb.append("view ");
+        for (Module.View v : views)
+            sb.append(v.name).append(" ");
+        sb.append(")");
+        return sb.toString();
+    }
+}
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/JigsawModuleBuilder.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/JigsawModuleBuilder.java
index 3261a13..f7b910b 100644
--- a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/JigsawModuleBuilder.java
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/JigsawModuleBuilder.java
@@ -125,7 +125,7 @@ public class JigsawModuleBuilder extends ClassListReader {
         }
 
         @Override
-        boolean allowEmpty() {
+        boolean allowsEmpty() {
             // jdk.* module that reexports sun.* module is empty
             return true;
         }
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/Module.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/Module.java
index a3ea60d..643fe3b 100644
--- a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/Module.java
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/Module.java
@@ -23,14 +23,15 @@
  */
 package com.sun.classanalyzer;
 
-import com.sun.classanalyzer.ModuleInfo.Dependence;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayDeque;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Deque;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -38,7 +39,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.TreeSet;
 
 /**
  * Module contains a list of classes and resources.
@@ -65,7 +65,6 @@ public class Module implements Comparable<Module> {
             return value;
     }
 
-
     static void setModuleProperties(String file) throws IOException {
         File f = new File(file);
         BufferedReader reader = null;
@@ -86,27 +85,41 @@ public class Module implements Comparable<Module> {
     private final Set<ResourceFile> resources;
     private final Set<Reference> unresolved;
     private final Set<Module> members;
-    // update during the analysis
+    private final Map<String,View> views;
+    private final View defaultView;
+    private final View internalView;
+    private final Map<String, PackageInfo> packageForClass;
+    private final Map<String, PackageInfo> packageForResource;
+    private final Set<Dependence> requires; // requires came from ModuleConfig
 
+    // update during the analysis
+    private boolean isBaseModule;
     private Module group;
     private ModuleInfo minfo;
-    private Set<PackageInfo> pkgInfos;
-    private Set<PackageInfo> resourcePkgInfos;
-
-    private boolean isBaseModule;
-    protected String mainClassName;
-
     protected Module(ModuleConfig config) {
         this.name = config.module;
         this.version = config.version;
         this.isBaseModule = name.equals(baseModuleName);
-        this.classes = new TreeSet<Klass>();
-        this.resources = new TreeSet<ResourceFile>();
+        this.classes = new HashSet<Klass>();
+        this.resources = new HashSet<ResourceFile>();
+        this.packageForClass = new HashMap<>();
+        this.packageForResource = new HashMap<>();
+        this.requires = new HashSet<>(config.requires());
         this.config = config;
-        this.mainClassName = config.mainClass();
         this.unresolved = new HashSet<Reference>();
         this.members = new HashSet<Module>();
         this.group = this; // initialize to itself
+
+        this.views = new LinkedHashMap<>();
+        for (ModuleConfig.View mcv : config.viewForName.values()) {
+            View v = new View(this, mcv, mcv.name);
+            views.put(mcv.name, v);
+        }
+        this.defaultView = views.get(name);
+
+        // create an internal view
+        this.internalView = View.getInternalView(this, name + ".internal");
+        views.put(internalView.name, internalView);
     }
 
     String name() {
@@ -133,48 +146,82 @@ public class Module implements Comparable<Module> {
         return Collections.unmodifiableSet(classes);
     }
 
-    synchronized Set<PackageInfo> packages() {
-        if (pkgInfos == null) {
-            pkgInfos = new TreeSet<PackageInfo>();
-            resourcePkgInfos = new TreeSet<PackageInfo>();
-            for (PackageInfo pi : PackageInfo.getPackageInfos(this)) {
-                if (pi.classCount > 0) {
-                    pkgInfos.add(pi);
-                }
-                if (pi.resourceCount > 0) {
-                    resourcePkgInfos.add(pi);
-                }
-            }
-        }
-        return Collections.unmodifiableSet(pkgInfos);
+    Collection<PackageInfo> packages() {
+        return packageForClass.values();
     }
 
     Set<ResourceFile> resources() {
         return Collections.unmodifiableSet(resources);
     }
 
+    Set<Dependence> configRequires() {
+        return requires;
+    }
+
     Set<Module> members() {
         return Collections.unmodifiableSet(members);
     }
 
+    Module.View defaultView() {
+        return defaultView;
+    }
+
+    Module.View internalView() {
+        return internalView;     
+    }
+
+    Collection<View> views() {
+        return views.values();
+    }
+
+    Module.View getView(String name) {
+        return views.get(name);
+    }
+    
+    Module.View getView(Klass k) {
+        String pn = k.getPackageName();
+        for (View v : views.values()) {
+            if (v.exports.contains(pn))
+                return v;
+        }
+        PackageInfo pinfo = packageForClass.get(pn);
+        if (contains(k) && !pinfo.isExported) {
+            internalView.exports.add(pn);
+            return internalView;
+        }
+        
+        throw new RuntimeException("No view found for " + k +
+                (contains(k) ? " exists" : " does not exists") +
+                " in " + name);
+    }
+
     boolean contains(Klass k) {
         return k != null && classes.contains(k);
     }
 
-    boolean isEmpty() {
-        return classes.isEmpty()
-                && resources.isEmpty()
-                && mainClass() == null;
+    // returns true if a property named <module-name>.<key> is set to "true"
+    // otherwise; return false
+    boolean moduleProperty(String key) {
+        String value = moduleProps.getProperty(name + "." + key);
+        if (value == null)
+            return false;
+        else
+            return Boolean.parseBoolean(value);
     }
 
-    boolean allowEmpty() {
-        return moduleProps.getProperty(name + ".allow.empty") != null;
+    boolean isEmpty() {
+        if (!classes.isEmpty() || !resources.isEmpty())
+            return false;
+
+        for (View v : views.values()) {
+            if (v.mainClass() != null)
+                return false;
+        }
+        return true;
     }
 
-    boolean exportAllPackages() {
-        // default - only exported packages
-        String value = moduleProps.getProperty(name + ".exports.all");
-        return value != null && Boolean.valueOf(value);
+    boolean allowsEmpty() {
+        return moduleProperty("allows.empty");
     }
 
     protected boolean isTopLevel() {
@@ -185,13 +232,7 @@ public class Module implements Comparable<Module> {
             reexports = reexports || d.isPublic();
         }
         return this.group() == this
-                && (isBase() || !isEmpty() || allowEmpty() || reexports);
-    }
-
-    Klass mainClass() {
-        Klass k = mainClassName != null ?
-                      Klass.findKlass(mainClassName) : null;
-        return k;
+                && (isBase() || !isEmpty() || allowsEmpty() || reexports);
     }
 
     @Override
@@ -210,11 +251,33 @@ public class Module implements Comparable<Module> {
     void addKlass(Klass k) {
         classes.add(k);
         k.setModule(this);
+
+        // add PackageInfo
+        String pkg = k.getPackageName();
+        PackageInfo pkginfo = getPackageInfo(pkg, packageForClass);
+        pkginfo.addKlass(k);
+    }
+
+    private PackageInfo getPackageInfo(String pkg, Map<String, PackageInfo> packageMap) {
+        PackageInfo pkginfo = packageMap.get(pkg);
+        if (pkginfo == null) {
+            pkginfo = new PackageInfo(this, pkg);
+            packageMap.put(pkg, pkginfo);
+        }
+        return pkginfo;
     }
 
     void addResource(ResourceFile res) {
         resources.add(res);
         res.setModule(this);
+
+        String pkg = "";
+        int i = res.getName().lastIndexOf('/');
+        if (i > 0) {
+            pkg = res.getName().substring(0, i).replace('/', '.');
+        }
+        PackageInfo pkginfo = getPackageInfo(pkg, packageForResource);
+        pkginfo.addResource(res);
     }
 
     void processRootsAndReferences() {
@@ -283,15 +346,34 @@ public class Module implements Comparable<Module> {
                 }
             }
         }
+
+        buildExports();
     }
 
-    boolean isModuleDependence(Klass k) {
-        Module m = k.getModule();
-        return m == null || (!classes.contains(k) && !m.isBase());
+    private void buildExports() {
+        boolean all = moduleProperty("exports.all");
+        for (PackageInfo pi : packageForClass.values()) {
+            if (all || pi.isExported)
+                defaultView.exports.add(pi.pkgName);
+        }
+    }
+
+
+    boolean requiresModuleDependence(Klass k) {
+        if (classes.contains(k))
+            return false;
+
+        if (k.getModule() == null)
+            return true;
+
+        // Returns true if class k is exported from another module
+        // and not from the base's default view
+        Module m = k.getModule().group();
+        return !(m.isBase() && m.defaultView.exports.contains(k.getPackageName()));
     }
 
-    Module getModuleDependence(Klass k) {
-        if (isModuleDependence(k)) {
+    Module getRequiresModule(Klass k) {
+        if (requiresModuleDependence(k)) {
             Module m = k.getModule();
             if (group() == this && m != null) {
                 // top-level module
@@ -299,7 +381,6 @@ public class Module implements Comparable<Module> {
             } else {
                 return m;
             }
-
         }
         return null;
     }
@@ -319,28 +400,133 @@ public class Module implements Comparable<Module> {
     }
 
     void addMember(Module m) {
-        // merge class list
-        for (Klass k : m.classes) {
-            classes.add(k);
-        }
 
-        // merge resource list
-        for (ResourceFile res : m.resources) {
-            resources.add(res);
+        // merge class list and resource list
+        classes.addAll(m.classes);
+        resources.addAll(m.resources);
+
+        // merge package infos
+        for (Map.Entry<String,PackageInfo> e : m.packageForClass.entrySet()) {
+            String pn = e.getKey();
+            PackageInfo pinfo = getPackageInfo(pn, packageForClass);
+            pinfo.add(e.getValue());
         }
 
-        // propagate the main entry point
-        if (m.mainClassName != null) {
-            if (mainClassName == null) {
-                mainClassName = m.mainClassName;
+        for (Map.Entry<String,PackageInfo> e : m.packageForResource.entrySet()) {
+            String pn = e.getKey();
+            PackageInfo pinfo = getPackageInfo(pn, packageForResource);
+            pinfo.add(e.getValue());
+        }
+                
+        // rebuild default view's exports after PackageInfo are merged
+        buildExports();
+
+        // merge requires from module configs
+        requires.addAll(m.requires);
+        
+        // merge views
+        for (View v : m.views.values()) {
+            if (views.containsKey(v.name)) {
+                throw new RuntimeException(name + " and member " + m.name
+                        + " already has view " + v.name);
+            }
+            if (v == m.defaultView) {
+                // merge default view
+                defaultView.merge(v);
+            } else if (v == m.internalView) {
+                internalView.merge(v);
             } else {
-                Trace.trace("Module %s already has an entry point: " +
-                    "%s member: %s class %s%n",
-                    name, mainClassName, m.name, m, m.name);
+                views.put(v.name, v);
             }
         }
     }
 
+    public static class View {
+        final Module module;
+        final String name;
+        private final Set<String> exports;
+        private final Set<String> permitNames;
+        private final Set<String> aliases;
+        private String mainClass;
+        private final Set<Module> permits;
+        private int refCount;
+
+        static View getInternalView(Module m, String name) {
+            View v = new View(m, null, name);
+            v.refCount = -1;  // internal view is initialized to be -1
+            return v;
+        }
+
+        public View(Module m, ModuleConfig.View mcv, String name) {
+            this.module = m;
+            this.name = name;
+            this.refCount = 0;
+            this.exports = new HashSet<>();
+            this.permits = new HashSet<>();
+            this.permitNames = new HashSet<>();
+            this.aliases = new HashSet<>();
+            if (mcv != null) {
+                exports.addAll(mcv.exports);
+                permitNames.addAll(mcv.permits);
+                aliases.addAll(mcv.aliases);
+                this.mainClass = mcv.mainClass;
+            }
+        }
+
+        boolean isEmpty() {
+            // Internal view may have non-empty exports but it's only
+            // non-empty if any module requires it
+            return mainClass() == null &&
+                    (refCount < 0 || exports.isEmpty()) &&
+                    permits.isEmpty() &&
+                    aliases.isEmpty();
+        }
+        
+        Set<String> permitNames() {
+            return Collections.unmodifiableSet(permitNames);
+        }
+        
+        Set<Module> permits() {
+            return Collections.unmodifiableSet(permits);
+        }
+        
+        Set<String> aliases() {
+            return Collections.unmodifiableSet(aliases);
+        }
+        
+        Set<String> exports() {
+            return Collections.unmodifiableSet(exports);
+        }
+        
+        void addPermit(Module m) {
+            permits.add(m);
+        }
+
+        void merge(View v) {
+            // main class is not propagated to the default view            
+            this.aliases.addAll(v.aliases);
+            this.permitNames.addAll(v.permitNames);
+        }
+
+        Klass mainClass() {
+            Klass k = mainClass != null
+                    ? Klass.findKlass(mainClass) : null;
+            return k;
+        }
+
+        void addRefCount() {
+            refCount++;
+        }
+
+        String id() {
+            return name + "@" + module.version();
+        }
+
+        public String toString() {
+            return id();
+        }
+    }
+
     private static Factory INSTANCE = new Factory();
     public static Factory getFactory() {
         return INSTANCE;
@@ -349,6 +535,7 @@ public class Module implements Comparable<Module> {
     static class Factory {
         protected Map<String, Module> modules =
                 new LinkedHashMap<String, Module>();
+
         protected final void addModule(Module m) {
             // ## For now, maintain the static all modules list.
             // ## Need to revisit later
@@ -363,7 +550,33 @@ public class Module implements Comparable<Module> {
             return modules.get(name);
         }
 
+        public final Module findModuleForView(String name) {
+            Module m = findModule(name);
+            if (m != null)
+                return m;
+            
+            String[] suffices = getModuleProperty("module.view.suffix", "").split("\\s+");
+            for (String s : suffices) {
+                int i = name.lastIndexOf("." + s);
+                if (i != -1 && name.endsWith("." + s)) {
+                    String mn = name.substring(0, i);
+                    if ((m = findModule(mn)) != null) {
+                        if (m.getView(name) == null)
+                            throw new RuntimeException("module view " + name + " doesn't exist");
+                        return m;
+                    }
+                }
+            }
+            return null;
+        }
+        
+        public final Module baseModule() {
+            return findModule(Module.baseModuleName);
+        }
+        
         public final Set<Module> getAllModules() {
+            // initialize unknown module (last to add to the list)
+            unknownModule();
             Set<Module> ms = new LinkedHashSet<Module>(modules.values());
             return ms;
         }
@@ -388,12 +601,11 @@ public class Module implements Comparable<Module> {
                 addModule(m);
             }
         }
-
         private static Module unknown;
         Module unknownModule() {
             synchronized (Factory.class) {
                 if (unknown == null) {
-                    unknown = this.newModule(new ModuleConfig("unknown", "unknown"));
+                    unknown = this.newModule(ModuleConfig.moduleConfigForUnknownModule());
                     addModule(unknown);
                 }
             }
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleBuilder.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleBuilder.java
index 1714a01..f810341 100644
--- a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleBuilder.java
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleBuilder.java
@@ -24,9 +24,6 @@ package com.sun.classanalyzer;
 
 import com.sun.classanalyzer.AnnotatedDependency.OptionalDependency;
 import com.sun.classanalyzer.Module.Factory;
-import com.sun.classanalyzer.Module.ModuleVisitor;
-import com.sun.classanalyzer.ModuleInfo.Dependence;
-import static com.sun.classanalyzer.ModuleInfo.Dependence.Modifier.*;
 import java.io.IOException;
 import java.util.*;
 
@@ -92,6 +89,7 @@ public class ModuleBuilder {
      * This method can be overridden in a subclass implementation.
      */
     public Set<Module> run() throws IOException {
+        long start = System.nanoTime();
         // assign classes and resource files to the modules and
         // group fine-grained modules per configuration files
         buildModules();
@@ -99,9 +97,14 @@ public class ModuleBuilder {
         // generate package infos and determine if there is any split package
         buildPackageInfos();
 
+        long moduleBuildTime = (System.nanoTime() - start)/1000000;
+
         // analyze cross-module dependencies and generate ModuleInfo
         List<ModuleInfo> minfos = buildModuleInfos();
 
+        long total = (System.nanoTime() - start)/1000000;
+        System.out.format("ModuleBuilder %d ms (module build time %s ms dependency analysis %d ms%n",
+            total, moduleBuildTime, (total-moduleBuildTime));
         // generate an ordered list from the module dependency graph
         result = Collections.unmodifiableSet(orderedModuleList(minfos));
         return result;
@@ -124,12 +127,6 @@ public class ModuleBuilder {
             m.processRootsAndReferences();
         }
 
-        // add classes with null module to the default unknown module
-        for (Klass k : Klass.getAllClasses()) {
-            if (k.getModule() == null)
-                getFactory().unknownModule().addKlass(k);
-        }
-
         if (mergeModules) {
             // group fine-grained modules
             getFactory().buildModuleMembers();
@@ -140,7 +137,6 @@ public class ModuleBuilder {
      * Build ModuleInfo for the top level modules.
      */
     protected List<ModuleInfo> buildModuleInfos() {
-
         List<ModuleInfo> minfos = new LinkedList<ModuleInfo>();
         Set<Module> ms = new LinkedHashSet<Module>();
         // analyze the module's dependences and create ModuleInfo
@@ -160,8 +156,8 @@ public class ModuleBuilder {
 
     private void fixupPermits(List<ModuleInfo> minfos) {
         // backedges (i.e. reverse dependences)
-        Map<Module, Set<Module>> backedges = new HashMap<Module, Set<Module>>();
-        Map<Module, ModuleInfo> map = new LinkedHashMap<Module, ModuleInfo>();
+        Map<Module.View, Set<Module>> backedges = new HashMap<>();
+        Map<Module, ModuleInfo> map = new LinkedHashMap<>();
 
         // fixup permits after all ModuleInfo are created in two passes:
         // 1. permits the requesting module if it requires local dependence
@@ -172,11 +168,11 @@ public class ModuleBuilder {
             map.put(mi.getModule(), mi);
             for (Dependence d : mi.requires()) {
                 // only add the top level modules
-                Module dep = d.getModule();
-                Set<Module> set = backedges.get(dep);
+                Module.View mv = d.getModuleView();
+                Set<Module> set = backedges.get(mv);
                 if (set == null) {
                     set = new HashSet<Module>();
-                    backedges.put(dep, set);
+                    backedges.put(mv, set);
                 }
                 set.add(mi.getModule());
             }
@@ -185,21 +181,21 @@ public class ModuleBuilder {
         for (ModuleInfo mi : minfos) {
             for (Dependence d : mi.requires()) {
                 if (d.isLocal()) {
-                    Module dm = d.getModule();
-                    map.get(dm).addPermit(mi.getModule());
+                    Module.View dmv = d.getModuleView();
+                    dmv.addPermit(mi.getModule());
                 }
             }
         }
 
-        for (Map.Entry<Module, Set<Module>> e : backedges.entrySet()) {
-            Module dm = e.getKey();
-            ModuleInfo dmi = map.get(dm);
+        for (Map.Entry<Module.View, Set<Module>> e : backedges.entrySet()) {
+            Module.View dmv = e.getKey();
+            ModuleInfo dmi = map.get(dmv.module);
             if (dmi == null) {
-                throw new RuntimeException(dm + " null moduleinfo");
+                throw new RuntimeException("View " + dmv + " null moduleinfo");
             }
-            if (dmi.permits().size() > 0) {
+            if (dmv.permits().size() > 0) {
                 for (Module m : e.getValue()) {
-                    dmi.addPermit(m);
+                    dmv.addPermit(m);
                 }
             }
         }
@@ -281,15 +277,41 @@ public class ModuleBuilder {
             }
         }
     }
-
+    
     protected ModuleInfo buildModuleInfo(Module m) {
         Map<Module, Dependence> requires = new LinkedHashMap<Module, Dependence>();
-        Set<Module> permits = new HashSet<Module>();
+
+        Module base = getFactory().baseModule();
+        boolean requiresBase = true;
+        for (Dependence d : m.configRequires()) {
+            Module dm = getFactory().findModuleForView(d.module);
+            
+            // check if the base module is listed in the config
+            if (base != null && dm == base)
+                requiresBase = false;
+            
+            // add to requires only if it's a non-empty module or not aggregating modules
+            if (dm.isTopLevel()) {
+                if (d.isLocal()) {
+                    d.requiresLocal(dm);
+                } else {
+                    d.addView(dm.getView(d.module));
+                }
+                addDependence(requires, d);
+            }
+        }
+        
+        // add "requires" of the base module
+        if (!m.isBase() && base != null && requiresBase) {
+            Dependence d = new Dependence(base.name(), false);
+            d.addView(base.defaultView());
+            addDependence(requires, d);
+        }
 
         // add static dependences
         for (Klass from : m.classes()) {
             for (Klass to : from.getReferencedClasses()) {
-                if (m.isModuleDependence(to)) {
+                if (m.requiresModuleDependence(to)) {
                     // is this dependence overridden as optional?
                     boolean optional = OptionalDependency.isOptional(from, to);
                     addDependence(requires, to, optional);
@@ -297,23 +319,30 @@ public class ModuleBuilder {
             }
         }
 
-        // add requires and permits specified in the config files
-        processModuleConfigs(m, requires, permits);
+        // add dependencies due to the AnnotatedDependency
+        for (Dependence d : AnnotatedDependency.getDependencies(m)) {
+            // filter optional dependencies to the base module
+            if (!m.isBase() || !d.isOptional())
+                addDependence(requires, d);
+        }
 
         // add dependency due to the main class
-        Klass k = m.mainClass();
-        if (k != null && m.isModuleDependence(k)) {
-            addDependence(requires, k);
-        }
+        for (Module.View v : m.views()) {
+            Klass k = v.mainClass();
+            if (k != null && m.requiresModuleDependence(k)) {
+                addDependence(requires, k, false);
+            }
 
-        // add dependencies due to the AnnotatedDependency
-        for (Dependence d : AnnotatedDependency.getDependencies(m)) {
-            if (d.isOptional()) {
-                Trace.trace("Warning: annotated dependency from %s to %s ignored%n",
-                        m.name(), d.toString());
-                continue;
+            for (String name : v.permitNames()) {
+                Module pm = getFactory().findModuleForView(name);
+                if (pm != null) {
+                    v.addPermit(pm.group());
+                } else {
+                    throw new RuntimeException("module " + name
+                            + " specified in the permits rule for " + m.name()
+                            + " doesn't exist");
+                }
             }
-            addDependence(requires, d);
         }
 
         // Add LOCAL to the dependence and permits will be added
@@ -327,83 +356,54 @@ public class ModuleBuilder {
             assert mset.contains(m);
             for (Module sm : mset) {
                 // is the package splitted with its dependence?
-                if (requires.containsKey(sm)) {
+                Dependence dep = requires.get(sm);
+                if (dep != null) {
                     // If so, the dependence has to be LOCAL
-                    requires.get(sm).addModifier(LOCAL);
+                    dep.requiresLocal(sm);
                 }
             }
         }
 
-        ModuleInfo mi = new ModuleInfo(m,
-                new HashSet<Dependence>(requires.values()),
-                permits);
+        ModuleInfo mi = new ModuleInfo(m, requires.values());
         return mi;
     }
 
-    private void addDependence(Map<Module, Dependence> requires, Klass k) {
-        addDependence(requires, k, false);
-    }
-
     private void addDependence(Map<Module, Dependence> requires, Klass k, boolean optional) {
-        Dependence d = new Dependence(k.getModule(), optional);
-        d.setInternal(PackageInfo.isExportedPackage(k.getPackageName()) == false);
-        addDependence(requires, d);
-    }
-
-    private void addDependence(Map<Module, Dependence> requires, Dependence d) {
-        Module dm = d.getModule();
+        Module dm = k.getModule().group();      
         Dependence dep = requires.get(dm);
-        if (dep != null && !dep.equals(d)) {
-            if (dep.getModule() != d.getModule()) {
-                throw new RuntimeException("Unexpected dependence " + dep + " != " + d);
-            }
-
+        if (dep == null) {
+            dep = new Dependence(dm.name(), optional);
+            requires.put(dm, dep);
+        } else {
             // update the modifiers
-            dep.update(d);
-            d = dep;
+            if (optional)
+                dep.requiresOptional(dm);
         }
-        requires.put(dm, d);
+        Module.View view = dm.getView(k);
+        if (view == null)
+            throw new RuntimeException("No view exporting " + k);
+        dep.addView(view);
     }
 
-    private void processModuleConfigs(final Module module,
-            final Map<Module, Dependence> requires,
-            final Set<Module> permits) {
-        ModuleVisitor<Void> v = new ModuleVisitor<Void>() {
-            public void preVisit(Module p, Void dummy) {
-            }
-
-            public void visited(Module p, Module m, Void dummy) {
-                for (Dependence d : m.config().requires()) {
-                    if (d.getModule() == null) {
-                        // set the module in the Dependence as it
-                        // was unknown when ModuleConfig was initialized.
-                        Module dm = getFactory().findModule(d.id);
-                        if (dm == null)
-                            throw new RuntimeException("Module " + d.id + " doesn't exist");
-                        d.setModule(dm);
-                    }
-                    addDependence(requires, d);
-                }
-                for (String name : m.config().permits()) {
-                    Module pm = getFactory().findModule(name);
-                    if (pm != null) {
-                        permits.add(pm.group());
-                    } else {
-                        throw new RuntimeException("module " + name
-                                + " specified in the permits rule for " + m.name()
-                                + " doesn't exist");
-                    }
-                }
-            }
+    private void addDependence(Map<Module, Dependence> requires, Dependence d) {
+        Module dm = getFactory().findModuleForView(d.module);
+        // not a dependence if it's an empty module and not aggregating modules
+        if (!dm.isTopLevel())
+            return;
 
-            public void postVisit(Module p, Void dummy) {
+        Dependence dep = requires.get(dm);
+        if (dep == null) {
+            requires.put(dm, d);
+        } else if (!dep.equals(d)) {
+            if (dep.module.equals(d.module) &&
+                !dep.isOptional() &&
+                !d.isLocal() && !d.isPublic() &&
+                dep.views.containsAll(d.views)) {
+                // the static dependence can override the optional dependence
+                return;
             }
-        };
-
-        Set<Module> visited = new HashSet<Module>();
-        // first add requires and permits for the module
-        v.visited(module, module, null);
-        // then visit their members
-        module.visitMembers(visited, v, null);
+            throw new RuntimeException("mismatch input requires: "
+                    + dep + " and " + d);
+        }
     }
 }
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleConfig.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleConfig.java
index ce940d6..4817929 100644
--- a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleConfig.java
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleConfig.java
@@ -33,27 +33,44 @@ import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.regex.Pattern;
-import java.util.EnumSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import com.sun.classanalyzer.ModuleInfo.Dependence;
-import com.sun.classanalyzer.ModuleInfo.Dependence.Modifier;
+import java.util.HashSet;
 
 /**
  *
  */
 public class ModuleConfig {
+    public static class View {
+        final String modulename;
+        final String name;
+        final Set<String> exports;
+        final Set<String> permits;
+        final Set<String> aliases;
+        String mainClass;
+
+        public View(String modulename, String name) {
+            this.modulename = modulename;
+            this.name = name;
+            this.exports = new HashSet<>();
+            this.permits = new HashSet<>();
+            this.aliases = new HashSet<>();
+        }
+
+        void addPermit(Module m) {
+            permits.add(m.name());
+        }
+    }
 
     private final Set<String> roots;
     protected final Set<String> includes;
-    protected final Set<String> permits;
     protected final Map<String, Dependence> requires;
-    protected final Set<String> exports;
     private final Filter filter;
     private List<String> members;
-    private String mainClass;
     final String module;
     final String version;
+    final View defaultView;
+    final Map<String,View> viewForName;
 
     ModuleConfig(String name, String version) {
         this(name, version, null);
@@ -65,18 +82,23 @@ public class ModuleConfig {
 
         this.module = name;
         this.version = version;
-        this.roots = new TreeSet<String>();
-        this.includes = new TreeSet<String>();
-        this.permits = new TreeSet<String>();
-        this.exports = new TreeSet<String>();
-        this.requires = new LinkedHashMap<String, Dependence>();
+        this.roots = new TreeSet<>();
+        this.includes = new TreeSet<>();
+        this.requires = new LinkedHashMap<>();
         this.filter = new Filter(this);
-        this.mainClass = mainClass;
+        this.viewForName = new LinkedHashMap<>();
+        this.defaultView = newView(name);
+    }
+
+    static ModuleConfig moduleConfigForUnknownModule() {
+        ModuleConfig mc = new ModuleConfig("unknown", "unknown");
+        mc.includes.add("**");
+        return mc;
     }
 
     List<String> members() {
         if (members == null) {
-            members = new LinkedList<String>();
+            members = new LinkedList<>();
 
             for (String s : includes) {
                 if (!s.contains("*")) {
@@ -88,40 +110,14 @@ public class ModuleConfig {
         return members;
     }
 
-    Set<String> permits() {
-        return permits;
-    }
-
-    Set<String> exports() {
-        return exports;
-    }
-
     Collection<Dependence> requires() {
         return requires.values();
     }
 
-    void reexportModule(Module m) {
-        reexportModule(m, false);
-    }
-
-    void reexportModule(Module m, boolean optional) {
-        Dependence d = requires.get(m.name());
-        if (d == null) {
-            EnumSet<Modifier> mods = optional ?
-                EnumSet.of(Modifier.PUBLIC, Modifier.OPTIONAL) :
-                EnumSet.of(Modifier.PUBLIC);
-            requires.put(m.name(), new Dependence(m, mods));
-        } else if (!d.isPublic()){
-            throw new RuntimeException(module + " should require public " + m.name());
-        }
-    }
-
-    void addPermit(Module m) {
-        permits.add(m.name());
-    }
-
-    String mainClass() {
-        return mainClass;
+    private View newView(String name) {
+         View view = new View(module, name);
+         viewForName.put(name, view);
+         return view;
     }
 
     boolean matchesRoot(String name) {
@@ -274,8 +270,8 @@ public class ModuleConfig {
     static class Filter {
 
         final ModuleConfig config;
-        final Set<String> exclude = new TreeSet<String>();
-        final Set<String> allow = new TreeSet<String>();
+        final Set<String> exclude = new TreeSet<>();
+        final Set<String> allow = new TreeSet<>();
 
         Filter(ModuleConfig config) {
             this.config = config;
@@ -431,13 +427,12 @@ public class ModuleConfig {
     static final Pattern classNamePattern = Pattern.compile("[\\w\\.\\*_$-/]+");
 
     static List<ModuleConfig> readConfigurationFile(String file, String version) throws IOException {
-        List<ModuleConfig> result = new ArrayList<ModuleConfig>();
+        List<ModuleConfig> result = new ArrayList<>();
         // parse configuration file
-        FileInputStream in = new FileInputStream(file);
-        try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+        try (FileInputStream in = new FileInputStream(file);
+             BufferedReader reader = new BufferedReader(new InputStreamReader(in)))
+        {
             String line;
-
             int lineNumber = 0;
             boolean inRoots = false;
             boolean inIncludes = false;
@@ -445,12 +440,15 @@ public class ModuleConfig {
             boolean inExcludes = false;
             boolean inPermits = false;
             boolean inRequires = false;
+            boolean inProvides = false;
+            boolean inView = false;
             boolean optional = false;
             boolean reexport = false;
             boolean local = false;
 
             boolean inBlockComment = false;
             ModuleConfig config = null;
+            View view = null;
 
             while ((line = reader.readLine()) != null) {
                 lineNumber++;
@@ -488,7 +486,10 @@ public class ModuleConfig {
                                     lineNumber + ", is malformed");
                         }
                         // use the given version
-                        config = new ModuleConfig(s[1].trim(), version);
+                        String name = s[1].trim();
+                        config = new ModuleConfig(name, version);
+                        view = config.defaultView;
+
                         result.add(config);
                         // switch to a new module; so reset the flags
                         inRoots = false;
@@ -497,13 +498,15 @@ public class ModuleConfig {
                         inAllows = false;
                         inRequires = false;
                         inPermits = false;
+                        inProvides = false;
+                        inView = false;
                         continue;
                     } else if (keyword.equals("class")) {
                         if (s.length != 2 || !s[1].trim().endsWith(";")) {
                             throw new RuntimeException(file + ", line "
                                     + lineNumber + ", is malformed");
                         }
-                        config.mainClass = s[1].substring(0, s[1].length() - 1);
+                        view.mainClass = s[1].substring(0, s[1].length() - 1);
                         continue;
                     } else if (keyword.equals("roots")) {
                         inRoots = true;
@@ -515,13 +518,18 @@ public class ModuleConfig {
                         inAllows = true;
                     } else if (keyword.equals("permits")) {
                         inPermits = true;
-                    } else if (keyword.equals("export")) {
+                    } else if (keyword.equals("provides")) {
+                        inProvides = true;
+                    } else if (keyword.equals("exports")) {
                         // only support one class/package/wildcard in each export statement
-                        if (s.length != 2 || !s[1].trim().endsWith(";")) {
+                        String n = s[1].trim();
+                        if (s.length != 2 || (!n.equals("**;") && !n.endsWith(".*;"))) {
                             throw new RuntimeException(file + ", line "
                                     + lineNumber + ", is malformed");
                         }
-                        config.exports.add(s[1].substring(0, s[1].length() - 1));
+                        // remove ".*" and ';'
+                        String e = n.equals("**;") ? "*" : n.substring(0, n.length() - 3);
+                        view.exports.add(e);
                         continue;
                     } else if (keyword.equals("requires")) {
                         inRequires = true;
@@ -543,15 +551,30 @@ public class ModuleConfig {
                                 break;
                             }
                         }
+                    } else if (keyword.equals("view")) {
+                        if (s.length != 3 || !s[2].trim().equals("{")) {
+                            throw new RuntimeException(file + ", line " +
+                                    lineNumber + ", is malformed");
+                        }
+
+                        // use the given version
+                        inView = true;
+                        String name = s[1].trim();
+                        view = config.newView(name);
+                        continue;
                     } else if (keyword.equals("}")) {
                         if (config == null || s.length != 1) {
                             throw new RuntimeException(file + ", line " +
                                     lineNumber + ", is malformed");
+                        } else if (inView) {
+                            inView = false;
+                            view = config.defaultView;
                         } else {
                             // end of a module
                             config = null;
-                            continue;
+                            view = null;
                         }
+                         continue;
                     } else {
                         throw new RuntimeException(file + ", \"" + keyword + "\" on line " +
                                 lineNumber + ", is not recognized");
@@ -593,7 +616,9 @@ public class ModuleConfig {
                         } else if (inAllows) {
                             config.filter.allow(s);
                         } else if (inPermits) {
-                            config.permits.add(s);
+                            view.permits.add(s);
+                        } else if (inProvides) {
+                            view.aliases.add(s);
                         } else if (inRequires) {
                             if (config.requires.containsKey(s)) {
                                 throw new RuntimeException(file + ", line " +
@@ -610,7 +635,9 @@ public class ModuleConfig {
                     inExcludes = false;
                     inAllows = false;
                     inPermits = false;
+                    inProvides = false;
                     inRequires = false;
+                    inView = false;
                 }
             }
 
@@ -623,20 +650,18 @@ public class ModuleConfig {
                         lineNumber + ", missing \"}\" to end module definition" +
                         " for \"" + config.module + "\"");
             }
-        } finally {
-            in.close();
         }
 
         return result;
     }
 
-    private String format(String keyword, Collection<String> values) {
+    private String format(int level, String keyword, Collection<String> values) {
         if (values.size() == 0) {
             return "";
         }
 
         StringBuilder sb = new StringBuilder();
-        String format = "%4s%-9s";
+        String format = level == 1 ? "%4s%-9s" : "%8s%-9s";
         String spaces = String.format(format, "", "");
         sb.append(String.format(format, "", keyword));
         int count = 0;
@@ -658,16 +683,21 @@ public class ModuleConfig {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("module " + module).append(" {\n");
-        sb.append(format("include", includes));
-        sb.append(format("root", roots));
-        sb.append(format("allow", filter.allow));
-        sb.append(format("exclude", filter.exclude));
-        Set<String> reqs = new TreeSet<String>();
+        sb.append(format(1, "include", includes));
+        sb.append(format(1, "root", roots));
+        sb.append(format(1, "allow", filter.allow));
+        sb.append(format(1, "exclude", filter.exclude));
+        Set<String> reqs = new TreeSet<>();
         for (Dependence rm : requires.values()) {
             reqs.add(rm.toString());
         }
-        sb.append(format("requires", reqs));
-        sb.append(format("permits", permits));
+        sb.append(format(1, "requires", reqs));
+        for (View v : viewForName.values()) {
+            sb.append("    ").append("view ").append(v.name).append(" {\n");
+            sb.append(format(2, "permits", v.permits));
+            sb.append(format(2, "exports", v.exports));
+            sb.append(format(2, "provides", v.aliases));
+        }
         sb.append("}\n");
         return sb.toString();
     }
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleInfo.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleInfo.java
index ca6736d..fdc0f29 100644
--- a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleInfo.java
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleInfo.java
@@ -33,20 +33,11 @@ public class ModuleInfo {
 
     private final Module module;
     private final Set<Dependence> requires;
-    private final Set<Module> permits;
 
     ModuleInfo(Module m,
-            Collection<Dependence> reqs,
-            Collection<Module> permits) {
+               Collection<Dependence> reqs) {
         this.module = m;
-        this.permits = new TreeSet<Module>(permits);
-        this.requires = new TreeSet<Dependence>();
-        // filter non-top level module
-        for (Dependence d : reqs) {
-            if (d.getModule().isTopLevel()) {
-                requires.add(d);
-            }
-        }
+        this.requires = new TreeSet<Dependence>(reqs);
     }
 
     public Module getModule() {
@@ -71,25 +62,6 @@ public class ModuleInfo {
         return Collections.unmodifiableSet(requires);
     }
 
-    /**
-     * The modules that are permitted to require this module
-     */
-    public Set<Module> permits() {
-        return Collections.unmodifiableSet(permits);
-    }
-
-    public void addPermit(Module m) {
-        permits.add(m);
-    }
-
-    /**
-     * The fully qualified name of the main class of this module
-     */
-    public String mainClass() {
-        Klass k = module.mainClass();
-        return k != null ? k.getClassName() : "";
-    }
-
     void visitDependence(Dependence.Filter filter, Set<Module> visited, Set<Module> result) {
         if (!visited.contains(module)) {
             visited.add(module);
@@ -134,7 +106,7 @@ public class ModuleInfo {
             if (dm != module) {
                 // exports all local packages
                 for (PackageInfo p : dm.packages()) {
-                    if (PackageInfo.isExportedPackage(p.pkgName)) {
+                    if (p.isExported) {
                         reexports.add(p.pkgName + ".*");
                     }
                 }
@@ -144,12 +116,12 @@ public class ModuleInfo {
         return reexports;
     }
 
-    // a system property to specify to use "requires public"
-    // or the "exports" statement
-    private static final boolean requiresPublic =
-        Boolean.parseBoolean(System.getProperty("classanalyzer.requiresPublic", "true"));
-    private static final String INDENT = "    ";
+    private static final boolean noRequiresPublic =
+        Boolean.getBoolean("classanalyzer.useExports.reexport");
+    private static final boolean useCommaSeparator =
+        Boolean.getBoolean("classanalyzer.permits.list");
 
+    private static final String INDENT = "    ";
 
     /**
      * Returns a string representation of module-info.java for
@@ -162,46 +134,22 @@ public class ModuleInfo {
 
         for (Dependence d : requires()) {
             String mods = "";
-            for (Dependence.Modifier mod : d.mods) {
-                if (requiresPublic || mod != Dependence.Modifier.PUBLIC) {
+            for (Dependence.Modifier mod : d.modifiers()) {
+                if (!noRequiresPublic || mod != Dependence.Modifier.PUBLIC) {
                     mods += mod.toString() + " ";
                 }
             }
-            sb.append(String.format("%srequires %s%s;%n", INDENT,
-                                    mods,
-                                    d.getModule().getModuleInfo().id()));
+            Module.View v = d.getModuleView();
+            if (v == null)
+                throw new RuntimeException("module " + module + " requires " + d + " has null view");
+            sb.append(format(1, "requires %s%s;%n", mods, d.getModuleView().id()));
         }
 
-        String permits = INDENT + "permits ";
-        int i = 0;
-        for (Module pm : permits()) {
-            if (i > 0) {
-                permits += ", ";
-                if ((i % 5) == 0) {
-                    permits += "\n" + INDENT + "        "; // "permits"
-                }
-            }
-            permits += pm.name();
-            i++;
+        for (Module.View v : module.views()) {
+            printModuleView(v == module.defaultView() ? 0 : 1, sb, v);
         }
 
-        if (permits().size() > 0) {
-            sb.append(permits).append(";\n");
-        }
-        if (module.mainClass() != null) {
-            sb.append(String.format("%sclass %s;%n", INDENT, mainClass()));
-        }
-
-        if (!requiresPublic)
-            printExports(sb);
-
-        sb.append("}\n");
-        return sb.toString();
-    }
-
-    private void printExports(StringBuilder sb) {
-        Set<Module> modules = dependences(new Dependence.Filter() {
-
+        Set<Module> reexportedModules = dependences(new Dependence.Filter() {
             @Override
             public boolean accept(Dependence d) {
                 // filter itself
@@ -209,38 +157,40 @@ public class ModuleInfo {
             }
         });
 
-        // explicit exports in the given config file
-        Set<String> cexports = new TreeSet<String>();
-        for (Module m : modules) {
-            cexports.addAll(m.config().exports());
+        if (noRequiresPublic) {
+            printReexports(reexportedModules, sb);
         }
 
-        if (cexports.size() > 0) {
-            sb.append("\n" + INDENT + "// explicit exports\n");
-            for (String e : cexports) {
-                sb.append(String.format("%sexport %s;%n", INDENT, e));
-            }
-        }
-
-        // exports all local packages
-        Set<String> pkgs = new TreeSet<String>();
-        for (PackageInfo pi : module.packages()) {
-            String p = pi.pkgName;
-            if (module.exportAllPackages() || PackageInfo.isExportedPackage(p))
-                pkgs.add(p);
-        }
+        sb.append("}\n");
+        return sb.toString();
+    }
 
-        if (pkgs.size() > 0) {
-            sb.append(String.format("%n%s// exports %s packages%n", INDENT,
-                                    module.exportAllPackages() ? "all local" : "supported"));
-            for (String p : pkgs) {
-                sb.append(String.format("%sexport %s.*;%n", INDENT, p));
+    private void printCommaSepPermits(StringBuilder sb, int level, Set<Module> permits) {
+        assert useCommaSeparator == true;
+        if (permits.isEmpty())
+            return;
+        
+        Set<Module> list = new TreeSet<>(permits);
+        sb.append(format(level, "permits "));
+        int i = 0;
+        for (Module pm : list) {
+            if (i > 0) {
+                sb.append(", ");
+                if ((i % 5) == 0) {
+                    sb.append("\n");
+                    sb.append(format(level, "       "));
+                }
             }
+            sb.append(pm.name());
+            i++;
         }
+        sb.append(";\n");
+    }
 
+    private void printReexports(Set<Module> modules, StringBuilder sb) {
         // reexports
         if (reexports().size() > 0) {
-            Set<String> rexports = new TreeSet<String>();
+            Set<String> rexports = new TreeSet<>();
             if (modules.size() == 2) {
                 // special case?
                 rexports.addAll(reexports());
@@ -252,169 +202,88 @@ public class ModuleInfo {
             }
             sb.append("\n" + INDENT + "// reexports\n");
             for (String p : rexports) {
-                sb.append(String.format("%sexport %s;%n", INDENT, p));
+                sb.append(String.format("%sexports %s;%n", INDENT, p));
             }
         }
     }
 
-    static class Dependence implements Comparable<Dependence> {
-
-        static enum Modifier {
-
-            PUBLIC("public"),
-            OPTIONAL("optional"),
-            LOCAL("local");
-            private final String name;
-
-            Modifier(String n) {
-                this.name = n;
-            }
-
-            @Override
-            public String toString() {
-                return name;
-            }
-        }
-        final String id;
-        private EnumSet<Modifier> mods;
-        private Module dm = null;
-        private boolean internal = false;
-
-        public Dependence(Module dm) {
-            this(dm, false);
-        }
-
-        public Dependence(Module dm, boolean optional) {
-            this(dm, modifier(optional));
-        }
-
-        public Dependence(Module dm, EnumSet<Modifier> mods) {
-            this.dm = dm.group();
-            this.id = dm.name();
-            this.mods = mods;
-        }
-
-        public Dependence(String name, boolean optional) {
-            this(name, optional, false, false);
-        }
-
-        public Dependence(String name, boolean optional, boolean reexport, boolean local) {
-            Set<Modifier> ms = new TreeSet<Modifier>();
-            if (optional) {
-                ms.add(Modifier.OPTIONAL);
-            }
-            if (reexport) {
-                ms.add(Modifier.PUBLIC);
-            }
-            if (local) {
-                ms.add(Modifier.LOCAL);
-            }
-            this.id = name;
-            this.mods = ms.isEmpty()
-                    ? EnumSet.noneOf(Modifier.class)
-                    : EnumSet.copyOf(ms);
-        }
-
-        private static EnumSet<Modifier> modifier(boolean optional) {
-            return optional ? EnumSet.of(Modifier.OPTIONAL)
-                    : EnumSet.noneOf(Modifier.class);
-        }
-
-        void setModule(Module m) {
-            assert dm == null && m != null;
-            dm = m.group();
-        }
-
-        void setInternal(boolean b) {
-            internal = b;
-        }
-
-        boolean isInternal() {
-            return internal;
-        }
-
-        Module getModule() {
-            return dm;
-        }
-
-        public boolean isOptional() {
-            return mods.contains(Modifier.OPTIONAL);
-        }
-
-        public boolean isLocal() {
-            return mods.contains(Modifier.LOCAL);
-        }
-
-        public boolean isPublic() {
-            return mods.contains(Modifier.PUBLIC);
-        }
-
-        public void addModifier(Modifier e) {
-            mods.add(e);
-        }
-
-        public void update(Dependence d) {
-            // static dependence overrides the optional
-            if (isOptional() && !d.isOptional()) {
-                mods.remove(Modifier.OPTIONAL);
-            }
-            // local dependence overrides non-local dependence
-            if (!isLocal() && d.isLocal()) {
-                mods.add(Modifier.LOCAL);
-            }
-
-            // reexport
-            if (!isPublic() && d.isPublic()) {
-                mods.add(Modifier.PUBLIC);
-            }
-            internal = internal || d.internal;
-        }
-
-        public EnumSet<Modifier> modifiers() {
-            return mods;
-        }
-
-        static interface Filter {
-
-            public boolean accept(Dependence d);
-        }
+    private String format(String fmt, Object... args) {
+        return format(0, fmt, args);
+    }
 
-        @Override
-        public int compareTo(Dependence d) {
-            if (this.equals(d)) {
-                return 0;
-            }
-            return id.compareTo(d.id);
+    private String format(int level, String fmt, Object... args) {
+        String s = "";
+        for (int i=0; i < level; i++) {
+            s += INDENT;
         }
+        return s + String.format(fmt, args);
+    }
+    
+    private StringBuilder formatList(StringBuilder sb, int level, String fmt, Collection<?> c) {
+        return formatList(sb, level, fmt, c, false);
+    }
 
-        @Override
-        public boolean equals(Object obj) {
-            if (!(obj instanceof Dependence)) {
-                return false;
+    private StringBuilder formatList(StringBuilder sb, int level, String fmt, Collection<?> c, boolean newline) {
+        if (c.isEmpty())
+            return sb;
+     
+        if (newline)
+            sb.append("\n");
+        
+        TreeSet<?> ls = new TreeSet<>(c);
+        for (Object o : ls) {
+            sb.append(format(level, fmt, o));
+        }
+        return sb;
+    }
+    
+    private void printModuleView(int level, StringBuilder sb, Module.View view) {
+        if (view.isEmpty())
+            return;
+
+        if (level > 0) {
+            // non-default view
+            sb.append("\n");
+            sb.append(format(level, "view %s {%n", view.name));
+        }
+
+        formatList(sb, level+1, "provides %s @ 8;%n", view.aliases());
+        if (view.mainClass() != null) {
+            sb.append(format(level+1, "class %s;%n", view.mainClass()));
+        }
+        
+        boolean newline = !view.aliases().isEmpty() || view.mainClass() != null;
+        if (!view.exports().isEmpty()) {
+            if (level == 0) {
+                sb.append(newline ? "\n" : "");
+                sb.append(format(level+1, "// default view exports%n"));
+                newline = false;
             }
-            if (this == obj) {
-                return true;
+            Set<String> exports = view.exports();
+            String s = exports.iterator().next();
+            if (s.equals("*")) {
+                // exports all public types that are not exported in the default view
+                exports = new TreeSet<>();
+                for (PackageInfo pi : module.packages()) {
+                    String pn = pi.pkgName;
+                    if (pi.publicClassCount > 0 && 
+                            !module.defaultView().exports().contains(pn)) {
+                        exports.add(pn);
+                    }
+                }
             }
-
-            Dependence d = (Dependence) obj;
-            return this.id.equals(d.id) && mods.equals(d.mods);
+            formatList(sb, level+1, "exports %s.*;%n", exports, newline);
+            newline = true;
         }
 
-        @Override
-        public int hashCode() {
-            int hash = 3;
-            hash = 19 * hash + this.id.hashCode();
-            return hash;
+        if (useCommaSeparator) {
+            printCommaSepPermits(sb, level + 1, view.permits());
+        } else {
+            formatList(sb, level + 1, "permits %s;%n", view.permits(), newline);
         }
 
-        @Override
-        public String toString() {
-            StringBuilder sb = new StringBuilder();
-            for (Dependence.Modifier mod : mods) {
-                sb.append(mod).append(" ");
-            }
-            sb.append(getModule().name());
-            return sb.toString();
-        }
+        if (level > 0)
+            sb.append(format(level, "}%n"));
     }
 }
+
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/PackageInfo.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/PackageInfo.java
index 8c38257..18205df 100644
--- a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/PackageInfo.java
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/PackageInfo.java
@@ -22,10 +22,7 @@
  */
 package com.sun.classanalyzer;
 
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -35,7 +32,7 @@ public class PackageInfo implements Comparable<PackageInfo> {
 
     final Module module;
     final String pkgName;
-    final boolean exportPkg;
+    final boolean isExported;
     int  classCount;
     long classBytes;
     int  publicClassCount;
@@ -46,7 +43,7 @@ public class PackageInfo implements Comparable<PackageInfo> {
     PackageInfo(Module m, String name) {
         this.module = m;
         this.pkgName = name;
-        this.exportPkg = isExportedPackage(name);
+        this.isExported = isExportedPackage(name);
         this.classCount = 0;
         this.classBytes = 0;
         this.publicClassCount = 0;
@@ -55,7 +52,7 @@ public class PackageInfo implements Comparable<PackageInfo> {
         this.resourceBytes = 0;
     }
 
-    private void add(PackageInfo pkg) {
+    void add(PackageInfo pkg) {
         this.classCount += pkg.classCount;
         this.classBytes += pkg.classBytes;
         this.publicClassCount += pkg.publicClassCount;
@@ -75,15 +72,11 @@ public class PackageInfo implements Comparable<PackageInfo> {
         }
     }
 
-    private void addResource(ResourceFile r) {
+    void addResource(ResourceFile r) {
         resourceCount++;
         resourceBytes += r.getFileSize();
     }
 
-    boolean isExported() {
-        return exportPkg;
-    }
-
     @Override
     public int hashCode() {
         int hash = 5;
@@ -112,44 +105,6 @@ public class PackageInfo implements Comparable<PackageInfo> {
         }
     }
 
-    public static Collection<PackageInfo> getPackageInfos(final Module m) {
-        Map<String, PackageInfo> packages = new HashMap<String, PackageInfo>();
-        Module.Visitor<Void, Map<String, PackageInfo>> visitor =
-                new Module.Visitor<Void, Map<String, PackageInfo>>() {
-                    private PackageInfo getPackageInfo(Map<String, PackageInfo> packages, String pkg) {
-                        PackageInfo pkginfo = packages.get(pkg);
-                        if (pkginfo == null) {
-                            pkginfo = new PackageInfo(m, pkg);
-                            packages.put(pkg, pkginfo);
-                        }
-                        return pkginfo;
-                    }
-                    @Override
-                    public Void visitClass(Klass k, Map<String, PackageInfo> packages) {
-                        // update package statistics
-                        String pkg = k.getPackageName();
-                        PackageInfo pkginfo = getPackageInfo(packages, pkg);
-                        // only count the class that is parsed
-                        pkginfo.addKlass(k);
-                        return null;
-                    }
-
-                    @Override
-                    public Void visitResource(ResourceFile r, Map<String, PackageInfo> packages) {
-                        String pkg = "";
-                        int i = r.getName().lastIndexOf('/');
-                        if (i > 0) {
-                            pkg = r.getName().substring(0, i).replace('/', '.');
-                        }
-                        PackageInfo pkginfo = getPackageInfo(packages, pkg);
-                        pkginfo.addResource(r);
-                        return null;
-                    }
-                };
-
-        m.visit(visitor, packages);
-        return packages.values();
-    }
     final static Set<String> exportedPackages = new HashSet<String>();
 
     static {
diff --git a/jdk/src/share/bin/java.c b/jdk/src/share/bin/java.c
index 16d6f69..d897977 100644
--- a/jdk/src/share/bin/java.c
+++ b/jdk/src/share/bin/java.c
@@ -336,7 +336,7 @@ JLI_Launch(int argc, char ** argv,              /* main argc, argc */
         SetModuleProp(what);    /* sun.java.launcher.module */
         // ## Store boot module in %jigsaw-library?
         // ## hardcoded path is temporary
-        SetModuleBootProp("lib/modules/jdk.boot/8-ea/classes:lib/modules/jdk.boot/8-ea/resources"); /* s.j.l.m.boot */
+        SetModuleBootProp("lib/modules/jdk.base/8-ea/classes"); /* s.j.l.m.boot */
     } else {
         if (mode == LM_JAR) {
             SetClassPath(what);     /* Override class path */
diff --git a/jdk/src/share/classes/java/lang/module/Dependence.java b/jdk/src/share/classes/java/lang/module/Dependence.java
index 88fb3cb..9ac56e9 100644
--- a/jdk/src/share/classes/java/lang/module/Dependence.java
+++ b/jdk/src/share/classes/java/lang/module/Dependence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -29,42 +29,26 @@ import java.util.EnumSet;
 import java.util.Set;
 
 
-public final class Dependence {
+public class Dependence {
 
     public static enum Modifier { LOCAL, OPTIONAL, PUBLIC, SYNTHETIC; }
 
     private final Set<Modifier> mods;
-    private final ModuleIdQuery midq;
 
-    public Dependence(Set<Modifier> mods, ModuleIdQuery midq) {
+    public Dependence(Set<Modifier> mods) {
         this.mods = (mods != null) ? mods : EnumSet.noneOf(Modifier.class);
-        this.midq = midq;
     }
 
-    public ModuleIdQuery query() { return midq; }
-
     public Set<Modifier> modifiers() { return mods; }
 
     public boolean equals(Object ob) {
         if (!(ob instanceof Dependence))
             return false;
         Dependence that = (Dependence)ob;
-        return (midq.equals(that.midq) && mods.equals(that.mods));
+        return mods.equals(that.mods);
     }
 
     public int hashCode() {
-        return midq.hashCode() * 43 + mods.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("requires");
-        for (Modifier m : mods) {
-            sb.append(" ").append(m.toString().toLowerCase());
-        }
-        sb.append(" ").append(midq);
-        return sb.toString();
+        return mods.hashCode();
     }
-
 }
diff --git a/jdk/src/share/classes/java/lang/module/ModuleInfo.java b/jdk/src/share/classes/java/lang/module/ModuleInfo.java
index 1474954..2b195a1 100644
--- a/jdk/src/share/classes/java/lang/module/ModuleInfo.java
+++ b/jdk/src/share/classes/java/lang/module/ModuleInfo.java
@@ -22,18 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package java.lang.module;
 
 import java.util.Set;
-import java.lang.annotation.*;
 
 /**
  * <p> Information about a module, as found in a {@code module-info.java}
  * source file or a {@code module-info.class} class file </p>
  *
  */
-
 public interface ModuleInfo {
 
     /**
@@ -42,82 +39,35 @@ public interface ModuleInfo {
     public ModuleId id();
 
     /**
-     * <p> The identifiers of the virtual modules provided by this module </p>
-     *
-     * @return  A possibly-empty unmodifiable set of {@link ModuleId ModuleIds}
-     */
-    public Set<ModuleId> provides();
-
-    /**
-     * <p> The dependences of this module </p>
-     *
-     * @return  A possibly-empty unmodifiable set of {@link Dependence Dependences}
-     */
-    public Set<Dependence> requires();
-
-    /**
-     * <p> The names of modules that are permitted to require this module </p>
+     * <p> The module dependences of this module </p>
      *
-     * @return  A possibly-empty unmodifiable set of module names
+     * @return  A possibly-empty unmodifiable set of {@link ViewDependence ViewDependences}
      */
-    public Set<String> permits();
+    public Set<ViewDependence> requiresModules();
 
     /**
-     * <p> The fully qualified name of the main class of this module </p>
+     * <p> The service dependences of this module </p>
      *
-     * @return  The fully qualified name of the main class of this module, or {@code null}
-     *          if this module does not have a main class
+     * @return  A possibly-empty unmodifiable set of
+     *          {@link ServiceDependence ServiceDependences}
      */
-    public String mainClass();
-
-    //  -- AnnotatedElement methods --
+    public Set<ServiceDependence> requiresServices();
 
     /**
-     * Returns true if an annotation for the specified type
-     * is present on this module, else false.
-     *
-     * @param annotationClass the Class object corresponding to the
-     *        annotation type
-     * @return true if an annotation for the specified annotation
-     *     type is present on this module, else false
+     * <p> The default view of this module.</p>
+     * Each module has a default view whose 
+     * {@linkplain ModuleView#id() identifier} is the same as
+     * its {@linkplain ModuleId module's identifier}.
      *
-     * @see java.lang.reflect.AnnotatedElement#isAnnotationPresent
+     * @return A default {@link ModuleView ModuleView}
      */
-    public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass);
+    public ModuleView defaultView();
 
     /**
-     * Returns an annotation for the specified type on this module,
-     * if such an annotation is present, else {@code null}.
+     * <p> The views of this module.</p>
      *
-     * <p> The annotation returned by this method could contain an element
-     * whose value is of type {@code Class}.
-     * This value cannot be returned directly:  information necessary to
-     * locate and load a class (such as the class loader to use) is
-     * not available, and the class might not be loadable at all.
-     * Attempting to read a {@code Class} object by invoking the relevant
-     * method on the returned annotation
-     * will result in a {@link UnsupportedElementTypeException},
-     * from which the corresponding type may be extracted.
-     * Similarly, attempting to read a {@code Class[]}-valued element
-     * will result in a {@link UnsupportedElementTypeException},
-     *
-     * <p> Calling methods on the returned annotation object
-     * can throw many of the exceptions that can be thrown when calling
-     * methods on an annotation object returned by {@link
-     * java.lang.reflect.AnnotatedElement core reflection}.
-     *
-     * @param <A>  the annotation type
-     * @param annotationType  the {@code Class} object corresponding to
-     *          the annotation type
-     * @return this module's annotation for the
-     *         specified annotation type if present on this element,
-     *         else {@code null}
-     *
-     * @see java.lang.reflect.AnnotatedElement#getAnnotation
-     * @see EnumConstantNotPresentException
-     * @see AnnotationTypeMismatchException
-     * @see IncompleteAnnotationException
+     * @return  An unmodifiable set of {@link ModuleView ModuleViews}
+     *          that includes the {@linkplain #defaultView() default view}.
      */
-    public <A extends Annotation> A getAnnotation(Class<A> annotationType);
-
+    public Set<ModuleView> views();
 }
diff --git a/jdk/src/share/classes/java/lang/module/ModuleInfoReader.java b/jdk/src/share/classes/java/lang/module/ModuleInfoReader.java
index 96616f6..98277b3 100644
--- a/jdk/src/share/classes/java/lang/module/ModuleInfoReader.java
+++ b/jdk/src/share/classes/java/lang/module/ModuleInfoReader.java
@@ -28,20 +28,14 @@ package java.lang.module;
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.module.Dependence;
-import java.lang.module.ModuleId;
-import java.lang.module.ModuleIdQuery;
-import java.lang.module.ModuleInfo;
-import java.lang.module.VersionQuery;
-import java.security.AccessController;
 import java.util.Collections;
-import java.util.LinkedHashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.EnumSet;
 import java.util.Set;
 import java.util.Map;
 
+import java.lang.module.Dependence.Modifier;
 
 /**
  * Read a module-info class file.
@@ -63,14 +57,10 @@ import java.util.Map;
     private DataInputStream in;
     private ConstantPool cpool;
     private ModuleId moduleId;
-    private Set<ModuleId> provides = new LinkedHashSet<ModuleId>();
-    private Set<Dependence> requires = new LinkedHashSet<Dependence>();
-    private Set<String> permits = new LinkedHashSet<String>();
-    private String mainClass;
-    private Map<String, ModuleInfoAnnotation> annotationTypes = new LinkedHashMap<String, ModuleInfoAnnotation>();
-
-    // ## Not surfaced in ModuleInfo interface; should probably be removed
-    private Set<String> mainClassModifiers = new LinkedHashSet<String>();
+    private Set<ViewDependence> requiresModules = new LinkedHashSet<>();
+    private Set<ServiceDependence> requiresServices = new LinkedHashSet<>();
+    private Set<ModuleView> views = new LinkedHashSet<>();
+    private ModuleView defaultView;
 
     private ModuleInfoReader(ModuleSystem ms, byte[] data) {
 
@@ -106,10 +96,25 @@ import java.util.Map;
                 throw new IllegalArgumentException("bad #methods");
 
             readAttributes();
-
-            moduleInfo = new ModuleInfoImpl(moduleId, provides,
-                    requires, permits, mainClass,
-                    annotationTypes);
+            
+            if (defaultView == null) {
+                defaultView =
+                    new ModuleViewImpl(moduleId,
+                                       null,
+                                       Collections.<ModuleId>emptySet(),
+                                       Collections.<String>emptySet(),
+                                       Collections.<String>emptySet(),
+                                       Collections.<String, Set<String>>emptyMap());
+                views.add(defaultView);
+            }
+            moduleInfo = new ModuleInfoImpl(moduleId,
+                                            defaultView,
+                                            views,
+                                            requiresModules,
+                                            requiresServices);
+            for (ModuleView mv : views) {
+                ((ModuleViewImpl)mv).mi = moduleInfo;
+            }
 
         } catch (IOException e) {
             throw new Error(e);
@@ -121,31 +126,26 @@ import java.util.Map;
     private static final String MODULE = "Module";
     private static final String MODULE_PROVIDES = "ModuleProvides";
     private static final String MODULE_REQUIRES = "ModuleRequires";
-    private static final String MODULE_PERMITS = "ModulePermits";
-    private static final String MODULE_CLASS = "ModuleClass";
-    private static final String RUNTIME_VISABLE_ANNOTATION = "RuntimeVisibleAnnotations";
-    private static final String RUNTIME_INVISABLE_ANNOTATION = "RuntimeInvisibleAnnotations";
-
+    private static final String MODULE_DATA = "ModuleData";
+    
     private void readAttributes() throws IOException {
         int count = in.readUnsignedShort();
         for (int i = 0; i < count; i++) {
             int nameIndex = in.readUnsignedShort();
             String name = cpool.getUtf8(nameIndex);
             int length = in.readInt();
-            if (name.equals(MODULE))
-                readModule();
-            else if (name.equals(MODULE_PROVIDES))
-                readModuleProvides();
-            else if (name.equals(MODULE_REQUIRES))
-                readModuleRequires();
-            else if (name.equals(MODULE_PERMITS))
-                readModulePermits();
-            else if (name.equals(MODULE_CLASS))
-                readModuleClass();
-            else if (name.equals(RUNTIME_VISABLE_ANNOTATION)) {
-                readAnnotations();
-            } else {
-                in.skip(length);
+            switch (name) {
+                case MODULE:
+                    readModule();
+                    break;
+                case MODULE_PROVIDES:
+                    readModuleProvides();
+                    break;
+                case MODULE_REQUIRES:
+                    readModuleRequires();
+                    break;
+                default:
+                    in.skip(length);
             }
         }
     }
@@ -155,133 +155,244 @@ import java.util.Map;
         moduleId = cpool.getModuleId(index);
     }
 
-    private void readModuleProvides() throws IOException {
+    private void readModuleRequires() throws IOException {
         int count = in.readUnsignedShort();
         for (int i = 0; i < count; i++) {
-            provides.add(cpool.getModuleId(in.readUnsignedShort()));
+            int index = in.readUnsignedShort();
+            int flags = in.readUnsignedShort();
+            EnumSet<Modifier> mods = EnumSet.noneOf(Modifier.class);
+
+            if ((flags & 0x0001) != 0) {
+                mods.add(Modifier.OPTIONAL);
+            }
+            if ((flags & 0x0002) != 0) {
+                mods.add(Modifier.LOCAL);
+            }
+            if ((flags & 0x0004) != 0) {
+                mods.add(Modifier.PUBLIC);
+            }
+            requiresModules.add(new ViewDependence(mods, cpool.getModuleIdQuery(index)));
+        }
+                       
+        count = in.readUnsignedShort();
+        for (int i = 0; i < count; i++) {
+            String cn = readClassName();
+            int flags = in.readUnsignedShort();
+            boolean optional = (flags & 0x0001) != 0;
+
+            requiresServices.add(new ServiceDependence(cn, optional));
         }
     }
 
-    private void readModuleRequires() throws IOException {
+    private void readModuleProvides() throws IOException {
         int count = in.readUnsignedShort();
         for (int i = 0; i < count; i++) {
+            Set<String> exports = new LinkedHashSet<>();
+            Set<ModuleId> aliases = new LinkedHashSet<>();
+            Map<String,Set<String>> services = new LinkedHashMap<>();
+            Set<String> permits = new LinkedHashSet<>();
+
             int index = in.readUnsignedShort();
-            int length = in.readUnsignedShort();
-            EnumSet<Dependence.Modifier> mods = EnumSet.noneOf(Dependence.Modifier.class);
-            for (int q = 0; q < length; q++) {
-                mods.add(Enum.valueOf(Dependence.Modifier.class,
-                                      cpool.getUtf8(in.readUnsignedShort()).toUpperCase()));
+            String viewname = index == 0 ? moduleId.name() : cpool.getUtf8(index);
+            ModuleId id = new ModuleId(viewname, moduleId.version());
+            String mainClass = readClassName();
+
+            readModuleAliases(aliases);
+            readModuleServices(services);
+            readModuleExports(exports);
+            readModulePermits(permits);
+            
+            // ## workaround javac bug
+            // ## inherit exports from the default view to the non-default views
+            ModuleView view = new ModuleViewImpl(id,
+                                                 mainClass,
+                                                 aliases,
+                                                 exports,
+                                                 permits,
+                                                 services);
+            if (index == 0) {
+                defaultView = view;
+                // ## see workaround above
+                assert views.isEmpty();
+            } else if (defaultView != null) {
+                // ## REMOVE this workaround when javac fixes its exports
+                exports.addAll(defaultView.exports());
             }
-            requires.add(new Dependence(mods, cpool.getModuleIdQuery(index)));
+            views.add(view);
         }
     }
-
-    private void readModulePermits() throws IOException {
+    
+    private String readClassName() throws IOException {
+        int index = in.readUnsignedShort();
+        if (index == 0)
+            return null;
+        
+        return cpool.getClassName(index).replace('/', '.');
+    }
+    
+    private void readModuleExports(Set<String> exports) throws IOException {
         int count = in.readUnsignedShort();
         for (int i = 0; i < count; i++) {
-            permits.add(cpool.getUtf8(in.readUnsignedShort()));
+            int index = in.readUnsignedShort();
+            int flags = in.readUnsignedShort();
+            int source = in.readUnsignedShort();
+            exports.add(cpool.getUtf8(index));
         }
     }
-
-    private void readModuleClass() throws IOException {
-        int index = in.readUnsignedShort();
-        mainClass = cpool.getClassName(index).replace('/', '.');
+        
+    private void readModuleServices(Map<String,Set<String>> services) throws IOException {
+        int count = in.readUnsignedShort();
+        for (int i = 0; i < count; i++) {
+            String sn = readClassName();
+            String impl = readClassName();
+            if (sn == null || impl == null)
+                throw new NullPointerException("Service name: " + sn +
+                        " Implementation class: " + impl);
+            Set<String> providers = services.get(sn);
+            if (providers == null) {
+                providers = new LinkedHashSet<>();
+                services.put(sn, providers); 
+            }
+            providers.add(impl);
+        }
+    }
+    
+    private void readModulePermits(Set<String> permits) throws IOException {
         int count = in.readUnsignedShort();
         for (int i = 0; i < count; i++) {
-            mainClassModifiers.add(cpool.getUtf8(in.readUnsignedShort()));
+            ModuleId mid = cpool.getModuleId(in.readUnsignedShort());
+            permits.add(mid.name());
         }
     }
-
-    private void readAnnotations() throws IOException {
+    
+    private void readModuleAliases(Set<ModuleId> aliases) throws IOException {
         int count = in.readUnsignedShort();
-        for (int i=0; i < count; i++) {
-            ModuleInfoAnnotation at = new ModuleInfoAnnotation(in, cpool);
-            annotationTypes.put(at.getName(), at);
+        for (int i = 0; i < count; i++) {
+            aliases.add(cpool.getModuleId(in.readUnsignedShort()));
         }
     }
 
-    public static class ModuleInfoImpl
+    static class ModuleInfoImpl
         implements ModuleInfo
     {
 
-        private ModuleId id;
-        private Set<Dependence> requires;
-        private Set<ModuleId> provides;
-        private Set<String> permits;
-        private String mainClass;
-        private Map<String, ModuleInfoAnnotation> annotationTypes;
+        private final ModuleId id;
+        private final ModuleView defaultView;
+        private final Set<ModuleView> views;
+        private final Set<ViewDependence> requiresModules;
+        private final Set<ServiceDependence> requiresServices;
 
         ModuleInfoImpl(ModuleId id,
-                Set<ModuleId> provides,
-                Set<Dependence> requires,
-                Set<String> permits,
-                String mainClass,
-                Map<String, ModuleInfoAnnotation> annotationTypes)
+                       ModuleView defaultView,
+                       Set<ModuleView> views,
+                       Set<ViewDependence> viewDeps,
+                       Set<ServiceDependence> serviceDeps)
         {
             this.id = id;
-            this.provides = provides;
-            this.requires = requires;
-            this.permits = permits;
-            this.mainClass = mainClass;
-            this.annotationTypes = annotationTypes;
+            this.defaultView = defaultView;
+            this.views = Collections.unmodifiableSet(views);
+            this.requiresModules = Collections.unmodifiableSet(viewDeps);
+            this.requiresServices = Collections.unmodifiableSet(serviceDeps);
         }
 
         public ModuleId id() {
             return id;
         }
+        
+        public Set<ViewDependence> requiresModules() {
+            return requiresModules;
+        }
 
-        public Set<Dependence> requires() {
-            // ## Temporarily allow this to be modifiable so that
-            // ## platform-default dependences can be added at
-            // ## configuration time.  Undo this once we start
-            // ## adding those defaults at compile time.
-            //return Collections.unmodifiableSet(requires);
-            return requires;
+        public Set<ServiceDependence> requiresServices() {
+            return requiresServices;
+        }
+        
+        public ModuleView defaultView() {
+            return defaultView;
         }
 
-        public Set<ModuleId> provides() {
-            return Collections.unmodifiableSet(provides);
+        public Set<ModuleView> views() {
+            return views;
         }
+                
+        @Override
+        public String toString() {
+            Set<String> names = new LinkedHashSet<>();
+            for (ModuleView mv : views) {
+                names.add(mv.id().name());
+            }    
+            return "ModuleInfo { id: " + id
+                    + ", requires: " + requiresModules
+                    + ", requires service:" + requiresServices
+                    + ", views: " + names
+                    + " }";
+        }
+    }
 
-        public Set<String> permits() {
-            return Collections.unmodifiableSet(permits);
+    static class ModuleViewImpl
+        implements ModuleView
+    {
+        private final ModuleId id;
+        private final Set<String> exports;
+        private final Set<ModuleId> aliases;
+        private final Map<String,Set<String>> services;
+        private final Set<String> permits;
+        private final String mainClass;
+        ModuleInfo mi;
+
+        ModuleViewImpl(ModuleId id,
+                       String mainClass,
+                       Set<ModuleId> aliases,
+                       Set<String> exports,
+                       Set<String> permits,
+                       Map<String,Set<String>> serviceProviders) {
+            this.id = id;
+            this.mainClass = mainClass;
+            this.aliases = Collections.unmodifiableSet(aliases);
+            this.exports = Collections.unmodifiableSet(exports);
+            this.permits = Collections.unmodifiableSet(permits);
+            this.services = Collections.unmodifiableMap(serviceProviders);
         }
 
-        public String mainClass() {
-            return mainClass;
+        public ModuleInfo moduleInfo() {
+            return mi;
         }
 
-        public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
-            if (annotationClass == null)
-                throw new NullPointerException("Argument annotationClass is null");
-            return annotationTypes.containsKey(annotationClass.getName());
+        public ModuleId id() {
+            return id;
         }
 
-        public <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
-            if (annotationClass == null)
-                throw new NullPointerException("Argument annotationClass is null");
-            ModuleInfoAnnotation at = annotationTypes.get(annotationClass.getName());
-            if (at == null) {
-                return null;
-            }
-            return at.generateAnnotation(annotationClass);
+        public Set<ModuleId> aliases() {
+            return aliases;
+        }
+
+        public Set<String> exports() {
+            return exports;
+        }
+        
+        public Set<String> permits() {
+            return permits;
+        }
+
+        public Map<String,Set<String>> services() {
+            return services;
+        }
+
+        public String mainClass() {
+            return mainClass;
         }
 
         @Override
         public String toString() {
-            return "ModuleInfo { id: " + id
-                    + ", " + requires
-                    + ", provides: " + provides
+            return "View { id: " + id
+                    + ", provides: " + aliases
+                    + ", provides service: " + services
                     + ", permits: " + permits
                     + ", mainClass: " + mainClass
                     + " }";
         }
-
-        Iterable<ModuleInfoAnnotation> getAnnotationTypes() {
-            return annotationTypes.values();
-        }
     }
-
+    
     static class ConstantPool {
 
         private static class Entry {
@@ -330,7 +441,10 @@ import java.util.Map;
         private static final int CONSTANT_Methodref = 10;
         private static final int CONSTANT_InterfaceMethodref = 11;
         private static final int CONSTANT_NameAndType = 12;
-        private static final int CONSTANT_ModuleId = 13;
+        private final static int CONSTANT_MethodHandle = 15;
+        private final static int CONSTANT_MethodType = 16;
+        private final static int CONSTANT_InvokeDynamic = 18;
+        private final static int CONSTANT_ModuleId = 19;
 
         private final ModuleSystem ms;
 
@@ -436,22 +550,4 @@ import java.util.Map;
             return ((ValueEntry) e).value;
         }
     }
-
-    private static void setJavaLangModuleAccess() {
-        // Allow privileged classes outside of java.lang
-        sun.misc.SharedSecrets.setJavaLangModuleAccess(new sun.misc.JavaLangModuleAccess() {
-            public Iterable<Annotation> getAnnotations(ModuleInfo mi, java.lang.reflect.Module m) {
-                Set<Annotation> result = new LinkedHashSet<Annotation>();
-                ModuleInfoImpl miImpl = (ModuleInfoImpl) mi;
-                for (ModuleInfoAnnotation mia : miImpl.getAnnotationTypes()) {
-                    result.add(mia.getAnnotation(m));
-                }
-                return result;
-            }
-        });
-    }
-
-    static {
-        setJavaLangModuleAccess();
-    }
 }
diff --git a/jdk/src/share/classes/java/lang/module/ModuleView.java b/jdk/src/share/classes/java/lang/module/ModuleView.java
new file mode 100644
index 0000000..9b00a58
--- /dev/null
+++ b/jdk/src/share/classes/java/lang/module/ModuleView.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+package java.lang.module;
+
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Information about a module view.
+ */
+public interface ModuleView  {
+    /**
+     * {@link ModuleInfo} of this view's containing module.
+     */
+    public ModuleInfo moduleInfo();
+    
+    /**
+     * <p> This view's identifier.</p>
+     * This view's identifier has the view's name and its containing
+     * module's {@linkplain ModuleId#version() version}.
+     */
+    public ModuleId id();
+
+    /**
+     * <p> The identifiers of the virtual modules provided by this view </p>
+     *
+     * @return  A possibly-empty unmodifiable set of {@link ModuleId ModuleIds}
+     */
+    public Set<ModuleId> aliases();
+
+    /**
+     * <p> The exported packages of this view </p>
+     *
+     * @return  A possibly-empty unmodifiable set of exported packages
+     */
+    public Set<String> exports();
+
+    /**
+     * <p> The names of modules that are permitted to require this view </p>
+     *
+     * @return  A possibly-empty unmodifiable set of module names
+     */
+    public Set<String> permits();
+
+    /**
+     * <p> The services that this view provides </p>
+     *
+     * @return  A possibly-empty unmodifiable map of a fully-qualified
+     *          name of a service type to the class names of its providers
+     *          provided by this view.
+     */
+    public Map<String,Set<String>> services();
+
+    /**
+     * <p> The fully qualified name of the main class of this view </p>
+     *
+     * @return  The fully qualified name of the main class of this module, or {@code null}
+     *          if this module does not have a main class
+     */
+    public String mainClass();
+}
diff --git a/jdk/src/share/classes/java/lang/module/ServiceDependence.java b/jdk/src/share/classes/java/lang/module/ServiceDependence.java
new file mode 100644
index 0000000..120935c
--- /dev/null
+++ b/jdk/src/share/classes/java/lang/module/ServiceDependence.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+package java.lang.module;
+
+import java.lang.module.Dependence.Modifier;
+import java.util.EnumSet;
+
+/**
+ * Information about a service dependence specified in a {@link ModuleInfo}.
+ */
+public final class ServiceDependence extends Dependence {
+    private final String service;
+
+    /**
+     * Constructs a {@code ServiceDependence} of a given name.
+     *
+     * @param name the fully-qualified name of a service
+     */
+    public ServiceDependence(String name) {
+        this(name, false);
+    }
+
+    /**
+     * Constructs a {@code ServiceDependence} of a given name.
+     *
+     * @param name the fully-qualified name of a service
+     * @param optional {@code true} if the dependence is optional.
+     */
+    public ServiceDependence(String name, boolean optional) {
+        super(optional ? EnumSet.of(Modifier.OPTIONAL)
+                       : null);
+        this.service = name;
+    }
+
+    /**
+     * Returns the fully qualified name of the service.
+     * @return the fully qualified name of the service
+     */
+    public String service() {
+        return service;
+    }
+
+    @Override
+    public boolean equals(Object ob) {
+        if (!(ob instanceof ServiceDependence)) {
+            return false;
+        }
+        ServiceDependence that = (ServiceDependence) ob;
+        return (service.equals(that.service)
+                && modifiers().equals(that.modifiers()));
+    }
+    
+    @Override
+    public int hashCode() {
+        return service.hashCode() * 43 + modifiers().hashCode();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("requires service");
+        for (Modifier m : modifiers()) {
+            sb.append(m.toString().toLowerCase());
+        }
+        sb.append(" ").append(service);
+        return sb.toString();
+    }
+}
diff --git a/jdk/src/share/classes/java/lang/module/ViewDependence.java b/jdk/src/share/classes/java/lang/module/ViewDependence.java
new file mode 100644
index 0000000..05c2fc0
--- /dev/null
+++ b/jdk/src/share/classes/java/lang/module/ViewDependence.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2009, 2010, 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.
+ */
+
+package java.lang.module;
+
+import java.lang.module.Dependence.Modifier;
+import java.util.Set;
+
+
+public final class ViewDependence extends Dependence {
+    private final ModuleIdQuery midq;
+
+    public ViewDependence(Set<Modifier> mods, ModuleIdQuery midq) {
+        super(mods);
+        this.midq = midq;
+    }
+
+    public ModuleIdQuery query() { return midq; }
+
+    public boolean equals(Object ob) {
+        if (!(ob instanceof ViewDependence))
+            return false;
+        ViewDependence that = (ViewDependence)ob;
+        return (midq.equals(that.midq)
+                && modifiers().equals(that.modifiers()));
+    }
+
+    public int hashCode() {
+        return midq.hashCode() * 43 + modifiers().hashCode();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("requires");
+        for (Modifier m : modifiers()) {
+            sb.append(" ").append(m.toString().toLowerCase());
+        }
+        sb.append(" ").append(midq);
+        return sb.toString();
+    }
+
+}
diff --git a/jdk/src/share/classes/java/lang/reflect/Module.java b/jdk/src/share/classes/java/lang/reflect/Module.java
index ecea295..d90ab22 100644
--- a/jdk/src/share/classes/java/lang/reflect/Module.java
+++ b/jdk/src/share/classes/java/lang/reflect/Module.java
@@ -26,19 +26,17 @@
 package java.lang.reflect;
 
 import java.lang.annotation.Annotation;
-import java.lang.annotation.AnnotationFormatError;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.module.ModuleClassLoader;
 import java.lang.module.ModuleId;
 import java.lang.module.ModuleInfo;
 import java.lang.module.Version;
 import java.security.CodeSource;
-import java.util.Map;
-import java.util.LinkedHashMap;
-import sun.reflect.annotation.AnnotationType;
 
+//
+// ## Module is an AccessibleObject but it may not be annotated?
+//
 public final class Module
-    implements AnnotatedElement
+    extends AccessibleObject
 {
 
     private ModuleInfo moduleInfo;
@@ -89,7 +87,7 @@ public final class Module
      * {@inheritDoc}
      */
     public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
-        return getAnnotation(annotationClass) != null;
+        return false;
     }
 
     /**
@@ -99,7 +97,7 @@ public final class Module
         if (annotationClass == null)
             throw new NullPointerException();
 
-        return (A) annotationsMap().get(annotationClass);
+        return null;
     }
 
     /**
@@ -114,30 +112,7 @@ public final class Module
      * {@inheritDoc}
      */
     public Annotation[] getDeclaredAnnotations() {
-        return annotationsMap.values().toArray(new Annotation[0]);
-    }
-
-    private transient Map<Class<? extends Annotation>, Annotation> annotationsMap;
-    // Returns the cached annotations
-    private synchronized  Map<Class<? extends Annotation>, Annotation> annotationsMap() {
-        if (annotationsMap != null)
-            return annotationsMap;
-
-        // module-info.class is not loaded in the VM as a Class object
-        // we can't use sun.reflect.annotation.AnnotationParser here
-        annotationsMap = new LinkedHashMap<Class<? extends Annotation>, Annotation>();
-        for (Annotation a: sun.misc.SharedSecrets.
-                               getJavaLangModuleAccess().getAnnotations(moduleInfo, this)) {
-            Class<? extends Annotation> klass = a.annotationType();
-            AnnotationType type = AnnotationType.getInstance(klass);
-            if (type.retention() == RetentionPolicy.RUNTIME) {
-                if (annotationsMap.put(klass, a) != null) {
-                    throw new AnnotationFormatError(
-                        "Duplicate annotation for class: "+klass+": " + a);
-                }
-            }
-        }
-        return annotationsMap;
+        return new Annotation[0];
     }
 
     // ## EHS
diff --git a/jdk/src/share/classes/java/util/ResourceBundle.java b/jdk/src/share/classes/java/util/ResourceBundle.java
index a4a4d55..cb2cd97 100644
--- a/jdk/src/share/classes/java/util/ResourceBundle.java
+++ b/jdk/src/share/classes/java/util/ResourceBundle.java
@@ -436,7 +436,7 @@ public abstract class ResourceBundle {
     private static native Class[] getClassContext();
 
     /**
-     * A wrapper of ClassLoader.getSystemClassLoader().
+     * A wrapper for a class loader to load the system classes. 
      */
     private static class RBClassLoader extends ClassLoader {
         private static final RBClassLoader INSTANCE = AccessController.doPrivileged(
@@ -445,7 +445,16 @@ public abstract class ResourceBundle {
                             return new RBClassLoader();
                         }
                     });
-        private static final ClassLoader loader = ClassLoader.getSystemClassLoader();
+
+        // For legacy JDK, RBClassLoader just delegates to 
+        // ClassLoader.getSystemClassLoader() that always delegates to
+        // the null class loader.
+        // 
+        // For modular JDK, the BootLoader is the module class loader
+        // loading classes & resource files in the java.base module.
+        // 
+        private static final ClassLoader loader =
+            org.openjdk.jigsaw.BootLoader.getSystemLoader();
 
         private RBClassLoader() {
         }
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/BaseContext.java b/jdk/src/share/classes/org/openjdk/jigsaw/BaseContext.java
index a1d236b..8108791 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/BaseContext.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/BaseContext.java
@@ -40,28 +40,37 @@ public class BaseContext {
 
     protected BaseContext() { }
 
-    // The set of modules in this context
+    // A map from a module to its views in this context
     //
-    protected Set<ModuleId> modules = new HashSet<ModuleId>();
-
+    protected Map<ModuleId,Set<ModuleId>> modules = new HashMap<>();
+    
     /**
-     * Add the given module to this context.
+     * Add the given module and its views to this context.
      */
-    protected void add(ModuleId mid) {
-        modules.add(mid);
+    protected void add(ModuleId mid, Set<ModuleId> views) {
+        modules.put(mid, new HashSet<>(views));
     }
-
-    private Set<ModuleId> roModules;
+    
+    private Map<ModuleId,Set<ModuleId>> roModules;
 
     /**
      * The set of modules in this context (read-only).
      */
     public final Set<ModuleId> modules() {
         if (roModules == null)
-            roModules = Collections.unmodifiableSet(modules);
-        return roModules;
+            roModules = Collections.unmodifiableMap(modules);
+        return roModules.keySet();
     }
-
+    
+    /**
+     * The set of module view's id of a given module in this context (read-only).
+     */
+    public final Set<ModuleId> views(ModuleId mid) {
+        if (roModules == null)
+            roModules = Collections.unmodifiableMap(modules);
+        return roModules.get(mid);
+    }
+    
     // This context's name
     //
     private String name;
@@ -76,8 +85,8 @@ public class BaseContext {
     public void freeze() {
         if (name != null)
             throw new IllegalStateException("Context already frozen");
-        name = makeName();
-        modules = Collections.unmodifiableSet(modules);
+        name = makeName().intern();
+        modules = Collections.unmodifiableMap(modules);
     }
 
     protected boolean isFrozen() {
@@ -88,7 +97,7 @@ public class BaseContext {
     //
     private String makeName() {
         StringBuilder sb = new StringBuilder();
-        ModuleId[] mids = modules.toArray(new ModuleId[] { });
+        ModuleId[] mids = modules.keySet().toArray(new ModuleId[] { });
         Arrays.sort(mids);
         for (ModuleId mid : mids)
             sb.append("+").append(mid.name());
@@ -127,7 +136,7 @@ public class BaseContext {
         hash = hc;
         return hc;
     }
-
+    
     public boolean equals(Object ob) {
         if (!(ob instanceof BaseContext))
             return false;
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/BootLoader.java b/jdk/src/share/classes/org/openjdk/jigsaw/BootLoader.java
index 2aba6d8..9a34384 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/BootLoader.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/BootLoader.java
@@ -28,7 +28,6 @@ package org.openjdk.jigsaw;
 import java.lang.module.*;
 import java.lang.reflect.Module;
 import java.io.*;
-import java.util.*;
 
 import static org.openjdk.jigsaw.Trace.*;
 
@@ -59,7 +58,7 @@ public final class BootLoader    // ## TEMPORARY should be package-private
         // to the VM's boot class path
         //
         for (ModuleId mid : cx.modules()) {
-            if (mid.equals(Platform.bootModule()))
+            if (mid.equals(Platform.baseModule()))
                 continue;
             try {
                 File p = pool.library().classPath(mid);
@@ -90,7 +89,7 @@ public final class BootLoader    // ## TEMPORARY should be package-private
     private static BootLoader bootLoader;
     static BootLoader newLoader(LoaderPool p, Context cx) {
         if (bootLoader != null)
-            throw new AssertionError("Not supporting multiple LoaderPool yet");
+            throw new InternalError("Not supporting multiple LoaderPool yet");
 
         bootLoader = new BootLoader(p, cx);
         return bootLoader;
@@ -103,6 +102,24 @@ public final class BootLoader    // ## TEMPORARY should be package-private
     }
 
     /**
+     * Returns a ClassLoader that loads the system classes.
+     * 
+     * In legacy mode, it returns ClassLoader.getSystemClassLoader()
+     * that always delegates to the null class loader.
+     *
+     * In module mode, it returns the BootLoader that is the module class loader
+     * loading classes & resource files in the java.base module.
+     * 
+     */
+    public static ClassLoader getSystemLoader() {
+        // ## will this be called during VM startup in which
+        // ## the boot loader has not been initialized?
+        assert sun.misc.VM.isBooted() == true;
+        ClassLoader cl = getLoader();       
+        return cl != null ? cl : ClassLoader.getSystemClassLoader();
+    }
+    
+    /**
      * Returns the Module for the given class loaded by the VM
      * bootstrap class loader. 
      */
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/Catalog.java b/jdk/src/share/classes/org/openjdk/jigsaw/Catalog.java
index f3007d9..d822e3b 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/Catalog.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/Catalog.java
@@ -77,23 +77,23 @@ public abstract class Catalog {
 
     /**
      * <p> Gather the {@link java.lang.module.ModuleId ModuleIds} of the
-     * modules available locally in this catalog, ignoring any parent
+     * module views available locally in this catalog, ignoring any parent
      * catalogs. </p>
      *
-     * @param  moduleName
+     * @param  name
      *         The name of the module being sought; if {@code null} then all
      *         module ids will be gathered
      *
      * @param  mids
      *         A mutable set to which the gathered ids will be added
      */
-    protected abstract void gatherLocalModuleIds(String moduleName,
+    protected abstract void gatherLocalModuleIds(String name,
                                                  Set<ModuleId> mids)
         throws IOException;
-
+    
     /**
-     * <p> List all of the modules present locally in this catalog, without
-     * regard to any parent catalogs. </p>
+     * <p> List all of the module views present locally in this catalog,
+     * without regard to any parent catalogs. </p>
      *
      * @return  The list of requested module ids, sorted in their natural
      *          order ## why?
@@ -109,8 +109,8 @@ public abstract class Catalog {
     }
 
     /**
-     * <p> List all of the modules present in this catalog and in any parent
-     * catalogs. </p>
+     * <p> List all of the module views present in this catalog and in
+     * any parent catalogs. </p>
      *
      * @return  The list of requested module ids, sorted in their natural
      *          order
@@ -130,24 +130,24 @@ public abstract class Catalog {
     }
 
     /**
-     * <p> Find all modules with the given name in this catalog and in any
+     * <p> Find all module views with the given name in this catalog and in any
      * parent catalogs. </p>
      *
-     * @param   moduleName
+     * @param   name
      *          The name of the modules being sought
      *
      * @return  An unsorted list containing the module identifiers of the
      *          found modules; if no modules were found then the list will
      *          be empty
      */
-    public List<ModuleId> findModuleIds(String moduleName)
+    public List<ModuleId> findModuleIds(String name)
         throws IOException
     {
-        ModuleSystem.checkModuleName(moduleName);
+        ModuleSystem.checkModuleName(name);
         Set<ModuleId> mids = new HashSet<ModuleId>();
         Catalog c = this;
         while (c != null) {
-            c.gatherLocalModuleIds(moduleName, mids);
+            c.gatherLocalModuleIds(name, mids);
             c = c.parent();
         }
         // ## Perhaps this method should return a set after all?
@@ -155,8 +155,8 @@ public abstract class Catalog {
     }
 
     /**
-     * <p> Find all modules matching the given query in this catalog and in any
-     * parent catalogs. </p>
+     * <p> Find all module views matching the given query in this catalog and
+     * in any parent catalogs. </p>
      *
      * @param   midq
      *          The query to match against
@@ -187,7 +187,7 @@ public abstract class Catalog {
      * <p> Find the most recently-versioned module matching the given query in
      * this catalog or in any parent catalogs. </p>
      *
-     * @param   midq
+     * @param   midq 
      *          The query to match against
      *
      * @return  The identification of the latest module matching the given
@@ -253,5 +253,38 @@ public abstract class Catalog {
         }
         return null;
     }
-
+    
+    /**
+     * <p> Find the {@link java.lang.module.ModuleView ModuleView} object for
+     * the module with the given identifier, in this catalog or in any parent
+     * catalogs. </p>
+     *
+     * @param   mid
+     *          The identifier of the module view being sought
+     *
+     * @return  The requested {@link java.lang.module.ModuleView ModuleView},
+     *          or {@code null} if no such module is present in this catalog
+     *
+     * @throws  IllegalArgumentException
+     *          If the given module identifier is not a Jigsaw module
+     *          identifier
+     */
+    public ModuleView readModuleView(ModuleId mid)
+        throws IOException
+    {
+        Catalog c = this;
+        while (c != null) {
+            ModuleInfo mi = c.readLocalModuleInfo(mid);
+            if (mi != null) {
+                for (ModuleView mv : mi.views()) {
+                    if (mv.id().equals(mid)) {
+                        return mv;
+                    }
+                }
+                throw new InternalError("Should not reach here");
+            }
+            c = c.parent();
+        }
+        return null;
+    }
 }
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/ClassInfo.java b/jdk/src/share/classes/org/openjdk/jigsaw/ClassInfo.java
index 3054f88..71caf47 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/ClassInfo.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/ClassInfo.java
@@ -146,7 +146,10 @@ public class ClassInfo {
     private final static int CONSTANT_Double = 6;
     private final static int CONSTANT_NameAndType = 12;
     private final static int CONSTANT_Utf8 = 1;
-    private final static int CONSTANT_ModuleId = 13;
+    private final static int CONSTANT_MethodHandle = 15;
+    private final static int CONSTANT_MethodType = 16;
+    private final static int CONSTANT_InvokeDynamic = 18;
+    private final static int CONSTANT_ModuleId = 19;
 
     private Object[] constantPool;
 
@@ -362,7 +365,7 @@ public class ClassInfo {
 
     // -- Entry points --
 
-    static ClassInfo read(File f)
+    public static ClassInfo read(File f)
         throws IOException
     {
         ClassInfo ci = new ClassInfo();
@@ -374,7 +377,7 @@ public class ClassInfo {
         return ci;
     }
 
-    static ClassInfo read(InputStream in, long size, String path)
+    public static ClassInfo read(InputStream in, long size, String path)
         throws IOException
     {
         assert size > 1 && size <= Integer.MAX_VALUE
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/Configuration.java b/jdk/src/share/classes/org/openjdk/jigsaw/Configuration.java
index fdb2beb..b6351e8 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/Configuration.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/Configuration.java
@@ -84,13 +84,13 @@ public final class Configuration<Cx extends BaseContext> {
         return cx;
     }
 
-    private Map<String,Cx> contextForModule;
+    private Map<String,Cx> contextForModuleView;
 
     /**
      * Associate the given context with the given module name.
      */
     protected void put(String mn, Cx cx) {
-        contextForModule.put(mn, cx);
+        contextForModuleView.put(mn, cx);
     }
 
     /**
@@ -100,7 +100,7 @@ public final class Configuration<Cx extends BaseContext> {
      *          context exists in this configuration
      */
     public Cx findContextForModuleName(String mn) {
-        return contextForModule.get(mn);
+        return contextForModuleView.get(mn);
     }
 
     /**
@@ -111,24 +111,24 @@ public final class Configuration<Cx extends BaseContext> {
      *          in this configuration
      */
     public Cx getContextForModuleName(String mn) {
-        Cx cx = contextForModule.get(mn);
+        Cx cx = contextForModuleView.get(mn);
         if (cx == null)
             throw new IllegalArgumentException(mn + ": Unknown module");
         return cx;
     }
-
+    
     /**
      * Construct a new configuration from an existing context set and
-     * module-name-to-context map.
+     * module-view-name-to-context map.
      */
     public Configuration(Collection<ModuleId> roots,
                          Set<? extends Cx> contexts,
-                         Map<String,? extends Cx> contextForModule)
+                         Map<String,? extends Cx> contextForModuleView)
     {
         this.roots = new HashSet<>(roots);
-        this.contexts = new HashSet<Cx>(contexts);
-        this.contextForModule = new HashMap<String,Cx>(contextForModule);
-        this.contextForName = new HashMap<String,Cx>();
+        this.contexts = new HashSet<>(contexts);
+        this.contextForModuleView = new HashMap<>(contextForModuleView);
+        this.contextForName = new HashMap<>();
         for (Cx cx : contexts) {
             this.contextForName.put(cx.name(), cx);
         }
@@ -137,35 +137,36 @@ public final class Configuration<Cx extends BaseContext> {
     /**
      * Construct a new, empty configuration for the given root module.
      */
-    public Configuration(ModuleId root) {
-        this.roots = Collections.singleton(root);
+    public Configuration(Collection<ModuleId> roots) {
+        this.roots = new HashSet<>(roots);
         this.contexts = new HashSet<Cx>();
-        this.contextForModule = new HashMap<String,Cx>();
+        this.contextForModuleView = new HashMap<String,Cx>();
         this.contextForName = new HashMap<String,Cx>();
     }
 
     private void dump(Context cx, boolean all, PrintStream out) {
         if (!cx.localClasses().isEmpty()) {
-            Set<Map.Entry<String,ModuleId>> mflcmes
-                = cx.moduleForLocalClassMap().entrySet();
-            out.format("    local (%d)", mflcmes.size());
+            Set<String> classes = new TreeSet<>(cx.localClasses());
+            out.format("    local (%d)", classes.size());
             if (!all && Platform.isPlatformContext(cx)) {
                 out.format(" ...%n");
             } else {
                 out.format("%n");
-                for (Map.Entry<String,ModuleId> me : mflcmes)
-                    out.format("      %s:%s%n", me.getKey(), me.getValue());
+                Map<String,ModuleId> mflcm = cx.moduleForLocalClassMap();
+                for (String cn : classes)
+                    out.format("      %s:%s%n", cn, mflcm.get(cn));
             }
         }
         if (!cx.remotePackages().isEmpty()) {
-            Set<Map.Entry<String,String>> cfrpes
-                = cx.contextForRemotePackageMap().entrySet();
-            out.format("    remote (%d)%n", cfrpes.size());
-            for (Map.Entry<String,String> me : cfrpes) {
-                Cx dcx = getContext(me.getValue());
+            Set<String> rpkgs = new TreeSet<>(cx.remotePackages());
+            out.format("    remote (%d)%n", rpkgs.size());
+            Map<String,String> cfrpm = cx.contextForRemotePackageMap();
+            for (String pn : rpkgs) {
+                String cxn = cfrpm.get(pn);
+                Cx dcx = getContext(cxn);
                 if (!all && Platform.isPlatformContext(dcx))
                     continue;
-                out.format("      %s=%s%n", me.getKey(), me.getValue());
+                out.format("      %s=%s%n", pn, cxn);
             }
         }
     }
@@ -194,7 +195,11 @@ public final class Configuration<Cx extends BaseContext> {
                         out.format(" [%s]", lp);
                 }
                 out.format("%n");
+                for (ModuleId id : cx.views(mid)) {
+                    out.format("      view %s%n", id);
+                }
             }
+
             if (cx instanceof Context)
                 dump((Context)cx, all, out);
             else if (cx instanceof PathContext)
@@ -209,7 +214,7 @@ public final class Configuration<Cx extends BaseContext> {
     public int hashCode() {
         int hc = roots.hashCode();
         hc = hc * 43 + contexts.hashCode();
-        hc = hc * 43 + contextForModule.hashCode();
+        hc = hc * 43 + contextForModuleView.hashCode();
         return hc;
     }
 
@@ -219,7 +224,7 @@ public final class Configuration<Cx extends BaseContext> {
         Configuration that = (Configuration)ob;
         return (roots.equals(that.roots)
                 && contexts.equals(that.contexts)
-                && contextForModule.equals(that.contextForModule));
+                && contextForModuleView.equals(that.contextForModuleView));
     }
 
 }
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/Configurator.java b/jdk/src/share/classes/org/openjdk/jigsaw/Configurator.java
index d21490e..3ca06cb 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/Configurator.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/Configurator.java
@@ -28,9 +28,7 @@ package org.openjdk.jigsaw;
 import java.lang.module.*;
 import java.io.*;
 import java.util.*;
-import java.util.regex.*;
 
-import static java.lang.module.Dependence.Modifier;
 import static org.openjdk.jigsaw.Trace.*;
 
 
@@ -189,7 +187,7 @@ public final class Configurator {
         if (tracing) {
             List<ModuleId> rids = new ArrayList<>();
             for (ModuleIdQuery midq : res.rootQueries)
-                rids.add(cxs.moduleForName.get(midq.name()).id());
+                rids.add(cxs.moduleViewForName.get(midq.name()).id());
             trace(0, "Configured for %s", rids);
             if (traceLevel >= 3)
                 cf.dump(System.out);
@@ -281,7 +279,7 @@ public final class Configurator {
         if (tracing) {
             List<ModuleId> rids = new ArrayList<>();
             for (ModuleIdQuery midq : rootQueries)
-                rids.add(cxs.moduleForName.get(midq.name()).id());
+                rids.add(cxs.moduleViewForName.get(midq.name()).id());
             trace(0, "Configured paths for %s", rids);
             if (traceLevel >= 3)
                 cf.dump(System.out);
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/ContextBuilder.java b/jdk/src/share/classes/org/openjdk/jigsaw/ContextBuilder.java
index 04069a2..d83df6d 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/ContextBuilder.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/ContextBuilder.java
@@ -29,9 +29,8 @@ import java.lang.module.*;
 import java.io.*;
 import java.net.URI;
 import java.util.*;
-import java.util.regex.*;
 
-import static java.lang.module.Dependence.Modifier;
+import static java.lang.module.ViewDependence.Modifier;
 import static org.openjdk.jigsaw.Trace.*;
 
 
@@ -81,15 +80,15 @@ final class ContextBuilder<Cx extends BaseContext> {
     //
     private void findLocalRequestors() {
         for (ModuleInfo mi : res.modules) {
-            for (Dependence d : mi.requires()) {
+            for (ViewDependence d : mi.requiresModules()) {
                 if (d.modifiers().contains(Modifier.LOCAL)) {
-                    ModuleInfo smi = res.moduleForName.get(d.query().name());
-                    if (smi == null) {
+                    ModuleView smv = res.moduleViewForName.get(d.query().name());
+                    if (smv == null) {
                         // smi can be null if dependence is optional
                         assert d.modifiers().contains(Modifier.OPTIONAL);
                         continue;
                     }
-                    addLocalRequestor(mi.id().name(), smi.id().name());
+                    addLocalRequestor(mi.id().name(), smv.id().name());
                 }
             }
         }
@@ -98,72 +97,82 @@ final class ContextBuilder<Cx extends BaseContext> {
     // All of our contexts
     //
     private Set<Cx> contexts = new IdentityHashSet<>();
-
-    // For each module, its assigned context; this also serves
+    
+    // For each module view, its assigned context; this also serves
     // as the visited-node set during context construction
     //
-    private Map<String,Cx> contextForModule
-        = new HashMap<String,Cx>();
-
-    // Add the given module to the given context, or create a new context for
-    // that module if none is given, and then add all the other modules in the
+    private Map<String,Cx> contextForModuleView
+        = new HashMap<>();
+    
+    // Add the given module view to the given context, or create a new context for
+    // that module view if none is given, and then add all the other modules in the
     // module's locally-connected component to the same context
     //
-    private void build(Cx pcx, ModuleInfo mi) {
-
-        assert !contextForModule.containsKey(mi.id().name());
+    private void build(Cx pcx, ModuleView mv, ModuleInfo mi) {
+        assert !contextForModuleView.containsKey(mv.id().name());
 
         Cx cx = pcx;
         if (cx == null) {
             cx = cxf.create();
             contexts.add(cx);
         }
-        cx.add(mi.id());
-        if (cx instanceof LinkingContext)
-            ((LinkingContext)cx).moduleInfos().add(mi);
-        if (cx instanceof Context) {
-            URI lp = res.locationForName.get(mi.id().name());
-            if (lp != null) {
-                String s = lp.getScheme();
-                if (s == null || !s.equals("file"))
-                    throw new AssertionError(s);
-                ((Context)cx).putLibraryPathForModule(mi.id(), new File(lp));
+        if (!cx.modules.containsKey(mi.id())) {
+            Set<ModuleId> views = new HashSet<>();
+            for (ModuleView v : mi.views()) {
+                views.add(v.id());
             }
+            cx.add(mi.id(), views);
+            if (cx instanceof LinkingContext) {
+                ((LinkingContext) cx).addModule(mi);
+            }
+            if (cx instanceof Context) {
+                URI lp = res.locationForName.get(mi.id().name());
+                if (lp != null) {
+                    String s = lp.getScheme();
+                    if (s == null || !s.equals("file")) {
+                        throw new AssertionError(s);
+                    }
+                    ((Context) cx).putLibraryPathForModule(mi.id(), new File(lp));
+                }
+            }
+            contextForModuleView.put(mi.id().name(), cx);
         }
-        contextForModule.put(mi.id().name(), cx);
+        contextForModuleView.put(mv.id().name(), cx);
 
         // Forward edges
-        for (Dependence d : mi.requires()) {
+        for (ViewDependence d : mi.requiresModules()) {
             if (d.modifiers().contains(Modifier.LOCAL)) {
-                Cx scx = contextForModule.get(d.query().name());
-                if (scx != null) {
-                    assert cx == scx;
-                    continue;
-                }
-                ModuleInfo smi = res.moduleForName.get(d.query().name());
-                assert smi != null;
-                if (smi == null) {
+                ModuleView smv = res.moduleViewForName.get(d.query().name());
+                if (smv == null) {
                     // Unsatisfied optional dependence
                     assert d.modifiers().contains(Modifier.OPTIONAL);
                     continue;
                 }
-                build(cx, smi);
+                Cx scx = contextForModuleView.get(smv.id().name());
+                ModuleInfo smi = smv.moduleInfo();
+                if (scx != null) {
+                    assert cx == scx;
+                    continue;
+                }
+                
+                build(cx, smv, smi);
             }
         }
 
         // Back edges
         List<String> localRequestors
-            = localRequestorsOfName.get(mi.id().name());
+            = localRequestorsOfName.get(mv.id().name());
         if (localRequestors != null) {
             for (String rmn : localRequestors) {
-                Cx rcx = contextForModule.get(rmn);
+                Cx rcx = contextForModuleView.get(rmn);
                 if (rcx != null) {
                     assert cx == rcx;
                     continue;
                 }
-                ModuleInfo rmi = res.moduleForName.get(rmn);
-                assert rmi != null;
-                build(cx, rmi);
+                // requestor must be a module name
+                ModuleView rmv = res.moduleViewForName.get(rmn);
+                assert rmv != null;
+                build(cx, rmv, rmv.moduleInfo());
             }
         }
 
@@ -172,9 +181,12 @@ final class ContextBuilder<Cx extends BaseContext> {
     private void run() {
         findLocalRequestors();
         for (ModuleInfo mi : res.modules) {
-            if (contextForModule.containsKey(mi.id().name()))
-                continue;
-            build(null, mi);
+            for (ModuleView mv : mi.views()) {
+                if (contextForModuleView.containsKey(mv.id().name()))
+                    continue;
+                Cx cx = contextForModuleView.get(mi.id().name());
+                build(cx, mv, mi);
+            }
         }
         for (Cx cx : contexts)
             cx.freeze();
@@ -187,17 +199,18 @@ final class ContextBuilder<Cx extends BaseContext> {
     {
 
         for (ModuleIdQuery rq : res.rootQueries)
-            assert res.moduleForName.get(rq.name()) != null : rq;
+            assert res.moduleViewForName.get(rq.name()) != null : rq;
+        
         ContextBuilder<Cx> cb = new ContextBuilder<Cx>(res, cxf);
         cb.run();
         for (ModuleIdQuery rq : res.rootQueries)
-            assert cb.contextForModule.get(rq.name()) != null : rq;
+            assert cb.contextForModuleView.get(rq.name()) != null : rq;
 
         // Rehash the contexts so that the resulting ContextSet
         // doesn't contain an IdentityHashSet
         Set<Cx> rehashedContexts = new HashSet<>(cb.contexts);
-
-        return new ContextSet<Cx>(res, rehashedContexts, cb.contextForModule);
+        return new ContextSet<Cx>(res, rehashedContexts,
+                                  cb.contextForModuleView);
 
     }
 
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/ContextSet.java b/jdk/src/share/classes/org/openjdk/jigsaw/ContextSet.java
index 016ca61..75164e0 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/ContextSet.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/ContextSet.java
@@ -35,18 +35,17 @@ final class ContextSet<Cx extends BaseContext> {
 
     final Set<ModuleInfo> modules;
 
-    final Map<String,ModuleInfo> moduleForName;
-
+    final Map<String,ModuleView> moduleViewForName;
+            
     final Set<Cx> contexts;
 
-    final Map<String,Cx> contextForModule;
+    final Map<String,Cx> contextForModuleView;
 
-    ContextSet(Resolution res, Set<Cx> cxs, Map<String,Cx> cxfm) {
+    ContextSet(Resolution res, Set<Cx> cxs, Map<String,Cx> cxfmv) {
         rootQueries = res.rootQueries;
         modules = res.modules;
-        moduleForName = res.moduleForName;
+        moduleViewForName = res.moduleViewForName;
         contexts = cxs;
-        contextForModule = cxfm;
+        contextForModuleView = cxfmv;
     }
-
 }
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/Hi.java b/jdk/src/share/classes/org/openjdk/jigsaw/Hi.java
index 56fb9bc..5ee3241 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/Hi.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/Hi.java
@@ -22,21 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package org.openjdk.jigsaw;
 
-
 // Trivial main class for the JDK boot module, for testing only
 //
 //   $ java -m jdk
 //   The JDK boot module is brought to you by the letter 'J' and the number 8.
 //   $
-
 public final class Hi {
 
-    public static void main(String[] args) {
+    public static void main(String[] argv) {
         System.out.println("The JDK boot module is brought to you by"
-                           + " the letter 'J' and the number 8.");
+                + " the letter 'J' and the number 8.");
     }
-
 }
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/Launcher.java b/jdk/src/share/classes/org/openjdk/jigsaw/Launcher.java
index d640e1e..fece861 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/Launcher.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/Launcher.java
@@ -27,7 +27,6 @@ package org.openjdk.jigsaw;
 
 import java.io.*;
 import java.lang.module.*;
-import java.lang.reflect.*;
 
 import static org.openjdk.jigsaw.Trace.*;
 
@@ -49,10 +48,10 @@ public final class Launcher {
         if (mid == null)
             throw new Error(midq + ": No installed module"
                             + " satisfies this query");
-        ModuleInfo mi = lb.readModuleInfo(mid);
-        if (mi == null)
+        ModuleView mv = lb.readModuleView(mid);
+        if (mv == null)
             throw new InternalError(midq + ": Can't read module-info");
-        String cn = mi.mainClass();
+        String cn = mv.mainClass();
         if (cn == null)
             throw new Error(mid + ": Module does not specify"
                             + " a main class");
@@ -64,9 +63,13 @@ public final class Launcher {
             throw new InternalError(mid + ": Cannot find context");
         LoaderPool lp = new LoaderPool(lb, cf, cn);
 
+        // initialize the BootLoader
+        // ## probably the VM should do this?
+        lp.initBootLoader();
+        
         return lp.findLoader(cx);
     }
-
+    
     public static ClassLoader launch(String midqs) {
         // ## What about the extension class loader?
         // ## Delete these and other sjlm properties when done with them
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/Library.java b/jdk/src/share/classes/org/openjdk/jigsaw/Library.java
index d061557..99cb92a 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/Library.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/Library.java
@@ -80,26 +80,27 @@ public abstract class Library
     public abstract Library parent();
 
     /**
-     * <p> List all of the root modules installed in this library.  A root
-     * module is any module that declares a main class. </p>
+     * <p> List all of the root module views installed in this library.  A root
+     * module view is any module view that declares a main class. </p>
      *
-     * <p> This method does not include root modules installed in this
+     * <p> This method does not include root module views installed in this
      * library's parent, if any. </p>
      *
-     * @return  An unsorted list of module-info objects
+     * @return  An unsorted list of {@link ModuleView} objects
      */
-    public List<ModuleInfo> listLocalRootModuleInfos()
+    public List<ModuleView> listLocalRootModuleViews()
         throws IOException
     {
-        final List<ModuleInfo> mis = new ArrayList<ModuleInfo>();
+        final List<ModuleView> mvs = new ArrayList<>();
         for (ModuleId mid : listLocalModuleIds()) {
-            ModuleInfo mi = readModuleInfo(mid);
-            if (mi.mainClass() != null)
-                mis.add(mi);
+            ModuleView mv = readModuleView(mid);
+            if (mv.mainClass() != null) {
+                mvs.add(mv);
+            }   
         }
-        return mis;
+        return mvs;
     }
-
+    
     /**
      * <p> Read the module-info class bytes for the module with the given
      * identifier, from this library only. </p>
@@ -284,7 +285,7 @@ public abstract class Library
      *
      * @param   res
      *          A {@link Resolution} previously computed by the
-     *          {@link Library#install() install()} method
+     *          {@link Library#install install()} method
      *
      * @param   verifySignature
      *          Perform signature verification, if true
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/Linker.java b/jdk/src/share/classes/org/openjdk/jigsaw/Linker.java
index 4a56cc0..b276def 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/Linker.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/Linker.java
@@ -28,7 +28,6 @@ package org.openjdk.jigsaw;
 import java.lang.module.*;
 import java.io.*;
 import java.util.*;
-import java.util.regex.*;
 
 import static java.lang.module.Dependence.Modifier;
 import static org.openjdk.jigsaw.Trace.*;
@@ -52,31 +51,60 @@ final class Linker {
         // rather than context names as in the superclass
         //
         private Map<String,Context> contextForPackage
-            = new HashMap<String,Context>();
+            = new HashMap<>();
 
         // The ModuleInfos of the modules in this context
         //
-        Set<ModuleInfo> moduleInfos = new HashSet<ModuleInfo>(); // ## private?
+        private Set<ModuleInfo> moduleInfos = new HashSet<>();
 
         public Set<ModuleInfo> moduleInfos() { return moduleInfos; }
-
-        // This context's supplying contexts
+        
+        // This context's supplying context views
         //
-        private Set<Context> suppliers = new IdentityHashSet<>();
-
-        // This context's re-exported supplying contexts
+        private Set<ContextView> suppliers = new IdentityHashSet<>();
+                
+        // This context's re-exported supplying context views
         //
-        private Set<Context> reExportedSuppliers = new IdentityHashSet<>();
-
+        private Set<ContextView> reExportedSuppliers = new IdentityHashSet<>();
+        
         // The set of packages defined by this context
         //
-        private Set<String> packages = new HashSet<String>();
+        private Set<String> packages = new HashSet<>();
+        
+        // The set of re-exported packages to this context.
+        //
+        private Set<String> reexports = new HashSet<>();
+
+        // The set of views in this context, each maintains the list of
+        // exported packages that can be accessed by another context
+        private Map<String, ContextView> views = new HashMap<>();
+        
+        public void addModule(ModuleInfo mi) {
+            moduleInfos.add(mi);
+            for (ModuleView mv : mi.views()) {
+                ContextView cxv = new ContextView(this, mv);
+                views.put(mv.id().name(), cxv);
+            }
+        }
+    }
+
+    static class ContextView {
+        final Context context;
+        final ModuleView view;
+        ContextView(Context cx, ModuleView view) {
+            this.context = cx;
+            this.view = view;
+        }
 
-        // The set of packages exported by this context,
+        // The set of packages exported by this context view,
         // either directly or indirectly
         //
-        private Set<String> exports = new HashSet<String>();
-
+        Set<String> exports = new HashSet<>();
+        
+        @Override
+        public String toString() {
+            return context.toString() + "(" + view.id().name() + ")";
+        }
     }
 
     private final Library lib;
@@ -147,28 +175,40 @@ final class Linker {
     // --
 
     private boolean propagatePackage(boolean changed,
-                                     Context cx, Context scx, String pn)
+                                     Context cx, ContextView scxv, String pn)
         throws ConfigurationException
     {
         if (cx.packages.contains(pn)) {
             fail("Package %s defined in %s but exported by supplier %s",
-                 pn, cx, scx);
+                 pn, cx, scxv);
         }
+        
         Context dcx = cx.contextForPackage.get(pn);
+        Context scx = scxv.context;
+        if (!scx.packages.contains(pn)) {
+            scx = scx.contextForPackage.get(pn);  // a re-exported package
+        } 
         if (dcx == null) {
-            if (scx.packages.contains(pn))
-                dcx = scx;
-            else
-                dcx = scx.contextForPackage.get(pn);
+            dcx = scx;
             cx.contextForPackage.put(pn, dcx);
             if (tracing && !Platform.isPlatformContext(dcx))
                 trace(1, 1, "adding %s:%s to %s", dcx, pn, cx);
-            if (cx.reExportedSuppliers.contains(scx))
-                cx.exports.add(pn);
             changed = true;
         } else if (dcx != scx) {
-            if (dcx != scx.contextForPackage.get(pn))
-                fail("Package %s defined in both %s and %s", pn, scx, dcx);
+            fail("Package %s defined in both %s and %s", pn, scx, dcx);
+        }
+
+        // a supplier and a re-exported supplier can be two different 
+        // views of the same module
+        if (cx.reExportedSuppliers.contains(scxv) && !cx.reexports.contains(pn)) {
+            cx.reexports.add(pn);
+            changed = true;
+            if (tracing && !Platform.isPlatformContext(dcx))
+                trace(1, 1, "re-exporting %s:%s to %s", dcx, pn, cx);
+
+            // re-exports a package to all its context views
+            for (ContextView cxv : cx.views.values())
+                cxv.exports.add(pn);
         }
         return changed;
     }
@@ -183,31 +223,45 @@ final class Linker {
                 trace(1, "propagating suppliers (pass %d)", n);
             boolean changed = false;
             for (Context cx : cxs.contexts) {
-                for (Context scx : cx.suppliers) {
-                    for (String pn : scx.exports)
-                        changed = propagatePackage(changed, cx, scx, pn);
+                for (ContextView scxv : cx.suppliers) {
+                    for (String pn : scxv.exports)
+                        changed = propagatePackage(changed, cx, scxv, pn);
                 }
             }
+                        
             if (!changed)
                 return;
         }
+        
     }
 
     private void resolveRemoteSuppliers()
         throws ConfigurationException, IOException
     {
-
-        // Prepare export and supplier sets
+        // prepare exports
         for (Context cx : cxs.contexts) {
             for (ModuleInfo mi : cx.moduleInfos) {
                 Library l = libPool.get(cx, mi.id());
                 for (String cn : l.listLocalClasses(mi.id(), false)) {
                     String pn = packageName(cn);
                     cx.packages.add(pn);
-                    cx.exports.add(pn);
                 }
-                for (Dependence d : mi.requires()) {
-                    Context scx = cxs.contextForModule.get(d.query().name());
+            }
+            for (ContextView cxv : cx.views.values()) {
+                ModuleView mv = cxv.view;
+                for (String pn : mv.exports()) {
+                    if (cx.packages.contains(pn)) {
+                        cxv.exports.add(pn);
+                    }
+                }
+            }
+        }
+        
+        // Prepare supplier sets
+        for (Context cx : cxs.contexts) {       
+            for (ModuleInfo mi : cx.moduleInfos) {
+                for (ViewDependence d : mi.requiresModules()) {
+                    Context scx = cxs.contextForModuleView.get(d.query().name());
                     if (scx == null) {
                         // Unsatisfied optional dependence
                         assert d.modifiers().contains(Modifier.OPTIONAL);
@@ -217,14 +271,15 @@ final class Linker {
                         // Same context
                         continue;
                     }
-
+                    ContextView scxv = scx.views.get(d.query().name());
+                    assert scxv != null;
                     if (!d.modifiers().contains(Modifier.LOCAL)) {
                         // Dependence upon some other context
-                        cx.suppliers.add(scx);
+                        cx.suppliers.add(scxv);
                     }
                     if (d.modifiers().contains(Modifier.PUBLIC)) {
                         // Required publicly, so re-export it
-                        cx.reExportedSuppliers.add(scx);
+                        cx.reExportedSuppliers.add(scxv);
                     }
                 }
             }
@@ -245,8 +300,8 @@ final class Linker {
 
         // Synchronize the supplier-name maps and context-for-package maps
         for (Context cx : cxs.contexts) {
-            for (Context scx : cx.suppliers) {
-                cx.addSupplier(scx.name());
+            for (ContextView scxv : cx.suppliers) {
+                cx.addSupplier(scxv.context.name());
             }
             for (Map.Entry<String,Context> me
                      : cx.contextForPackage.entrySet())
@@ -267,10 +322,11 @@ final class Linker {
         new Linker(lib, cxs).run();
         List<ModuleId> rids = new ArrayList<>();
         for (ModuleIdQuery rq : cxs.rootQueries)
-            rids.add(cxs.moduleForName.get(rq.name()).id());
+            rids.add(cxs.moduleViewForName.get(rq.name()).id());
+        
         return new Configuration<org.openjdk.jigsaw.Context>(rids,
                                    cxs.contexts,
-                                   cxs.contextForModule);
+                                   cxs.contextForModuleView);
     }
 
 }
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/LinkingContext.java b/jdk/src/share/classes/org/openjdk/jigsaw/LinkingContext.java
index a89d250..3906e10 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/LinkingContext.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/LinkingContext.java
@@ -39,5 +39,7 @@ interface LinkingContext {
     // The ModuleInfos of the modules in this context
     //
     public Set<ModuleInfo> moduleInfos();
+    
+    public void addModule(ModuleInfo mi);
 
 }
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/Loader.java b/jdk/src/share/classes/org/openjdk/jigsaw/Loader.java
index 33e929b..2877cb6 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/Loader.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/Loader.java
@@ -110,7 +110,7 @@ public class Loader
                     trace(0, "%s: load %s:%s", this, rcxn, cn);
             }
             if (ld == null) {
-                throw new ClassNotFoundException(cn);
+                throw new ClassNotFoundException(cn + " : requested by " + context);
             }
             c = ld.findClass(lmid, cn);
         }
@@ -129,7 +129,7 @@ public class Loader
     }
 
     private ClassNotFoundException cnf(String mn, String cn, IOException x) {
-        return new ClassNotFoundException(mn + ":" + cn, x);
+        return new ClassNotFoundException(cn + " in module " + mn, x);
     }
 
     Class<?> findClass(ModuleId mid, String cn)
@@ -354,6 +354,9 @@ public class Loader
 
     public URL getResource(String rn) {
         try {
+            if (tracing)
+                trace(0, "%s: get resource %s", this, rn);
+            
             URI u = visitResources(rn, new ResourceVisitor() {
                     public URI accept(URI u) {
                         return u;
@@ -371,6 +374,9 @@ public class Loader
     public Enumeration<URL> getResources(String rn)
         throws IOException
     {
+        if (tracing)
+            trace(0, "%s: get resources %s", this, rn);
+        
         final List<URL> us = new ArrayList<>();
         visitResources(rn, new ResourceVisitor() {
                 public URI accept(URI u) throws IOException {
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/LoaderPool.java b/jdk/src/share/classes/org/openjdk/jigsaw/LoaderPool.java
index 2ab4f33..c5db2a5 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/LoaderPool.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/LoaderPool.java
@@ -113,4 +113,11 @@ public final class LoaderPool {
         return findLoader(cx);
     }
 
+    void initBootLoader() {
+        ModuleId mid = Platform.baseModule();
+        Context cx = config().getContextForModuleName(mid.name());
+        if (cx == null)
+            throw new InternalError(mid + ": Cannot find context");
+        findLoader(cx);
+    }
 }
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/PathContext.java b/jdk/src/share/classes/org/openjdk/jigsaw/PathContext.java
index 33d40fb..7e49014 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/PathContext.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/PathContext.java
@@ -48,6 +48,11 @@ public class PathContext
     Set<ModuleInfo> moduleInfos = new HashSet<>();
 
     public Set<ModuleInfo> moduleInfos() { return moduleInfos; }
+    
+    // ## should jigsaw provide the list of exported types to the compiler?
+    public void addModule(ModuleInfo mi) {
+        moduleInfos.add(mi);
+    }
 
     // This context's supplying contexts
     //
@@ -89,7 +94,7 @@ public class PathContext
      * @return This context's remote-context set
      */
     public Set<PathContext> remoteContexts() { return suppliers; }
-
+        
     public boolean equals(Object ob) {
         if (!(ob instanceof PathContext))
             return false;
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/PathLinker.java b/jdk/src/share/classes/org/openjdk/jigsaw/PathLinker.java
index 9cd9c7a..4466d58 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/PathLinker.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/PathLinker.java
@@ -28,7 +28,6 @@ package org.openjdk.jigsaw;
 import java.lang.module.*;
 import java.io.*;
 import java.util.*;
-import java.util.regex.*;
 
 import static java.lang.module.Dependence.Modifier;
 import static org.openjdk.jigsaw.Trace.*;
@@ -62,10 +61,11 @@ final class PathLinker {
         throws ConfigurationException, IOException
     {
         for (PathContext cx : cxs.contexts) {
-            if (cx.modules.size() == 1) {
-                cx.localPath.addAll(cx.modules);
+            if (cx.modules().size() == 1) {
+                cx.localPath.addAll(cx.modules());
                 continue;
             }
+            
             // Order suppliers according to dominance ## Not yet implemented
             cx.localPath.addAll(cx.modules());
             Collections.sort(cx.localPath);
@@ -145,9 +145,9 @@ final class PathLinker {
             trace(1, "preparing export and supplier sets");
         for (PathContext cx : cxs.contexts) {
             for (ModuleInfo mi : cx.moduleInfos) {
-                for (Dependence d : mi.requires()) {
+                for (ViewDependence d : mi.requiresModules()) {
                     trace(1, 3, "dep %s", d);
-                    PathContext scx = cxs.contextForModule.get(d.query().name());
+                    PathContext scx = cxs.contextForModuleView.get(d.query().name());
                     if (scx == null) {
                         // Unsatisfied optional dependence
                         assert d.modifiers().contains(Modifier.OPTIONAL);
@@ -204,10 +204,10 @@ final class PathLinker {
 
         List<ModuleId> rids = new ArrayList<>();
         for (ModuleIdQuery rq : cxs.rootQueries)
-            rids.add(cxs.moduleForName.get(rq.name()).id());
+            rids.add(cxs.moduleViewForName.get(rq.name()).id());
         return new Configuration<>(rids,
                                    cxs.contexts,
-                                   cxs.contextForModule);
+                                   cxs.contextForModuleView);
 
     }
 
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/Platform.java b/jdk/src/share/classes/org/openjdk/jigsaw/Platform.java
index e560385..f54987e 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/Platform.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/Platform.java
@@ -26,7 +26,6 @@
 package org.openjdk.jigsaw;
 
 import java.lang.module.*;
-import java.io.*;
 import java.util.*;
 
 import static java.lang.module.Dependence.Modifier;
@@ -47,10 +46,10 @@ public final class Platform {
         return DEFAULT_PLATFORM_MID;
     }
 
-    private static final ModuleId BOOT_MID
+    private static final ModuleId BASE_MID
         = jms.parseModuleId("jdk.base at 8-ea");
 
-    public static ModuleId bootModule() { return BOOT_MID; }
+    public static ModuleId baseModule() { return BASE_MID; }
 
     public static boolean isPlatformModuleName(String mn) {
         return (mn.equals("jdk") || mn.startsWith("jdk.") ||
@@ -67,23 +66,24 @@ public final class Platform {
     }
 
     static boolean isBootContext(BaseContext cx) {
+        String boot = baseModule().name();
         for (ModuleId mid : cx.modules()) {
-            if (mid.name().equals("jdk.boot"))
+            if (mid.name().equals(boot))
                 return true;
         }
         return false;
     }
 
-    // ## Workaround: Compiler should not add synthetic dependences
-    // ## to platform modules themselves
+    // ## Workaround: Compiler should add synthesized dependence
+    // ## for platform modules except jdk.base
     //
     public static void adjustPlatformDependences(ModuleInfo mi) {
         if (!isPlatformModuleName(mi.id().name()))
             return;
-        for (Iterator<Dependence> i = mi.requires().iterator();
+        for (Iterator<ViewDependence> i = mi.requiresModules().iterator();
              i.hasNext();)
         {
-            Dependence d = i.next();
+            ViewDependence d = i.next();
             if (d.modifiers().contains(Modifier.SYNTHETIC)) {
                 if (tracing)
                     trace(1, "removing %s -> %s", mi.id(), d);
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/PublishedRepository.java b/jdk/src/share/classes/org/openjdk/jigsaw/PublishedRepository.java
index 1930761..4601628 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/PublishedRepository.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/PublishedRepository.java
@@ -346,7 +346,7 @@ public class PublishedRepository
 
             StreamedRepositoryCatalog cat = loadCatalog();
             Set<ModuleId> cmids = new HashSet<>();
-            cat.gatherModuleIds(null, cmids);
+            cat.gatherModuleIds(cmids);
 
             Set<ModuleId> fmids = new HashSet<>();
             gatherModuleIdsFromDirectoryWhileLocked(fmids);
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/RepositoryCatalog.java b/jdk/src/share/classes/org/openjdk/jigsaw/RepositoryCatalog.java
index d8a48ed..50ed810 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/RepositoryCatalog.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/RepositoryCatalog.java
@@ -26,7 +26,6 @@
 package org.openjdk.jigsaw;
 
 import java.io.*;
-import java.net.URI;
 import java.lang.module.*;
 import java.util.*;
 
@@ -44,6 +43,9 @@ public abstract class RepositoryCatalog {
     private static final JigsawModuleSystem jms
         = JigsawModuleSystem.instance();
 
+    public abstract void gatherModuleIds(Set<ModuleId> mids)
+        throws IOException;
+    
     public abstract void gatherModuleIds(String moduleName, Set<ModuleId> mids)
         throws IOException;
 
@@ -89,30 +91,45 @@ public abstract class RepositoryCatalog {
         static final int MINOR_VERSION = 0;
 
         private Map<ModuleId,Entry> modules = new HashMap<>();
+        private Map<ModuleId,ModuleId> moduleForViewId= new HashMap<>();
 
+        public void gatherModuleIds(Set<ModuleId> mids) {
+            mids.addAll(modules.keySet());
+        }
+        
         public void gatherModuleIds(String moduleName, Set<ModuleId> mids) {
-            for (ModuleId mid : modules.keySet()) {
+            for (ModuleId mid : moduleForViewId.keySet()) {
                 if (moduleName == null || mid.name().equals(moduleName))
                     mids.add(mid);
             }
         }
 
         public byte[] readModuleInfoBytes(ModuleId mid) {
-            Entry e = modules.get(mid);
+            Entry e = modules.get(moduleForViewId.get(mid));
             return (e != null) ? e.mibs : null;
         }
 
         public void add(Entry e) {
-            ModuleId mid = jms.parseModuleInfo(e.mibs).id(); // ## Need fast path
-            modules.put(mid, e);
+            ModuleInfo mi = jms.parseModuleInfo(e.mibs); // ## Need fast path
+            modules.put(mi.id(), e);
+            for (ModuleView mv : mi.views())
+                moduleForViewId.put(mv.id(), mi.id());
         }
 
         public boolean remove(ModuleId mid) {
+            for (Iterator<ModuleId> i = moduleForViewId.values().iterator();
+                 i.hasNext();)
+            {
+                ModuleId id = i.next();
+                if (id.equals(mid)) {
+                    i.remove();
+                }
+            }
             return modules.remove(mid) != null;
         }
 
         Entry get(ModuleId mid) {
-            return modules.get(mid);
+            return modules.get(moduleForViewId.get(mid));
         }
 
         /* ##
@@ -156,6 +173,11 @@ public abstract class RepositoryCatalog {
                 out.writeShort(e.mibs.length);
                 out.write(e.mibs);
             }
+            out.writeInt(moduleForViewId.size());
+            for (Map.Entry<ModuleId,ModuleId> me : moduleForViewId.entrySet()) {
+                out.writeUTF(me.getKey().toString());
+                out.writeUTF(me.getValue().toString());
+            }
             out.close();
         }
 
@@ -180,6 +202,12 @@ public abstract class RepositoryCatalog {
                 in.readFully(mibs);
                 modules.put(mid, new Entry(mibs, cs, us, ht, hash));
             }
+            int nmids = in.readInt();
+            for (int i = 0; i < nmids; i++) {
+                ModuleId id = jms.parseModuleId(in.readUTF());
+                ModuleId mid = jms.parseModuleId(in.readUTF());
+                moduleForViewId.put(id, mid);
+            }
             return this;
         }
 
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/Resolution.java b/jdk/src/share/classes/org/openjdk/jigsaw/Resolution.java
index 98f07ba..fa5fd87 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/Resolution.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/Resolution.java
@@ -35,8 +35,8 @@ public final class Resolution {
     final Collection<ModuleIdQuery> rootQueries;
 
     final Set<ModuleInfo> modules;
-
-    final Map<String,ModuleInfo> moduleForName;
+    
+    final Map<String,ModuleView> moduleViewForName;
 
     final Map<String,URI> locationForName;
 
@@ -63,16 +63,16 @@ public final class Resolution {
      * install the needed modules </p>
      */
     public long spaceRequired() { return spaceRequired; }
-
+    
     Resolution(Collection<ModuleIdQuery> rqs,
                Set<ModuleInfo> mis,
-               Map<String,ModuleInfo> mfn,
+               Map<String,ModuleView> mvfn,
                Map<String,URI> lfn,
                long dr, long sr)
     {
         rootQueries = rqs;
         modules = mis;
-        moduleForName = mfn;
+        moduleViewForName = mvfn;
         locationForName = lfn;
         downloadRequired = dr;
         spaceRequired = sr;
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/Resolver.java b/jdk/src/share/classes/org/openjdk/jigsaw/Resolver.java
index a49848e..4091664 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/Resolver.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/Resolver.java
@@ -29,7 +29,6 @@ import java.lang.module.*;
 import java.io.*;
 import java.net.URI;
 import java.util.*;
-import java.util.regex.*;
 
 import static java.lang.module.Dependence.Modifier;
 import static org.openjdk.jigsaw.Repository.ModuleSize;
@@ -71,11 +70,10 @@ final class Resolver {
         rootQueries = rqs;
     }
 
-    private Set<ModuleInfo> modules = new HashSet<ModuleInfo>();
-
-    private Map<String,ModuleInfo> moduleForName
-        = new HashMap<String,ModuleInfo>();
+    private Set<ModuleInfo> modules = new HashSet<>();
 
+    private Map<String,ModuleView> moduleViewForName
+        = new HashMap<>();
     private Map<String,URI> locationForName = new HashMap<>();
 
     private long spaceRequired = 0;
@@ -90,13 +88,13 @@ final class Resolver {
     // Does the supplying module smi permit the requesting module rmi
     // to require it?
     //
-    private boolean permits(ModuleInfo rmi, Dependence dep, ModuleInfo smi) {
-        assert dep.query().matches(smi.id());
+    private boolean permits(ModuleInfo rmi, ViewDependence dep, ModuleView smv) {
+        assert dep.query().matches(smv.id());
         if (rmi == null) {
             // Special case: Synthetic root dependence
             return true;
         }
-        Set<String> ps = smi.permits();
+        Set<String> ps = smv.permits();
         if (ps.isEmpty() && !dep.modifiers().contains(Modifier.LOCAL)) {
             // Non-local dependences are implicitly permitted
             // when the permit set is empty
@@ -115,15 +113,15 @@ final class Resolver {
     //
     private static final class Choice {
         private final ModuleInfo rmi;   // Requesting module
-        private final Dependence dep;   // Dependence to be satisfied
+        private final ViewDependence dep;   // Dependence to be satisfied
         private final Choice next;      // Next choice in stack
-        private Choice(ModuleInfo mi, Dependence d, Choice ch) {
+        private Choice(ModuleInfo mi, ViewDependence d, Choice ch) {
             rmi = mi;
             dep = d;
             next = ch;
         }
     }
-
+    
     // Resolve the given choice
     //
     private boolean resolve(int depth, Choice choice)
@@ -136,7 +134,7 @@ final class Resolver {
         }
 
         ModuleInfo rmi = choice.rmi;
-        Dependence dep = choice.dep;
+        ViewDependence dep = choice.dep;
 
         if (tracing)
             trace(1, depth, "resolving %s %s",
@@ -148,14 +146,15 @@ final class Resolver {
         // the given name.  If so then it must satisfy the constraints, else
         // we fail since we don't support side-by-side versioning at run time.
         //
-        ModuleInfo mi = moduleForName.get(mn);
+        ModuleView mv = moduleViewForName.get(mn);
+        ModuleInfo mi = mv != null ? mv.moduleInfo() : null;
         if (mi != null) {
-            boolean rv = (dep.query().matches(mi.id())
-                          && permits(rmi, dep, mi));
+            boolean rv = (dep.query().matches(mv.id())
+                          && permits(rmi, dep, mv));
             if (!rv) {
                 if (tracing)
-                    trace(1, depth, "fail: previously-resolved %s unacceptable",
-                          mi.id());
+                    trace(1, depth, "fail: previously-resolved %s (module %s) unacceptable",
+                          mv.id(), mi.id());
                 return false;
             }
             return resolve(depth + 1, choice.next);
@@ -215,7 +214,7 @@ final class Resolver {
     // dependence
     //
     private boolean resolve(int depth, Choice nextChoice,
-                            ModuleInfo rmi, Dependence dep,
+                            ModuleInfo rmi, ViewDependence dep,
                             Catalog cat, ModuleId mid)
         throws IOException
     {
@@ -228,7 +227,8 @@ final class Resolver {
         }
 
         assert dep.query().matches(mid);
-        assert moduleForName.get(mid.name()) == null;
+        
+        assert moduleViewForName.get(mid.name()) == null;
 
         // Find and read the ModuleInfo, saving its location
         // and size data, if any
@@ -256,22 +256,34 @@ final class Resolver {
 
         // Check this module's permits constraints
         //
-        if (!permits(rmi, dep, mi)) {
+        ModuleView smv = null;
+        for (ModuleView mv : mi.views()) {
+            if (mv.id().equals(mid)) {
+                smv = mv;
+                break;
+            }
+        }
+        if (!permits(rmi, dep, smv)) {
             if (tracing)
-                trace(1, depth, "fail: permits %s", mi.permits());
+                trace(1, depth, "fail: permits %s", smv.permits());
             return false;
         }
 
-        // Save the ModuleInfo in the moduleForName map,
+        // Save the ModuleView in the moduleViewForName map,
         // which also serves as our visited-node set
         //
+        String smn = mi.id().name();
         modules.add(mi);
-        moduleForName.put(mid.name(), mi);
+        
+        // add module views
+        for (ModuleView mv : mi.views()) {
+            moduleViewForName.put(mv.id().name(), mv);
+        }
 
         // Save the module's location, if known
         //
         if (ml != null)
-            locationForName.put(mid.name(), ml);
+            locationForName.put(smn, ml);
 
         // Save the module's download and install sizes, if any
         //
@@ -286,9 +298,9 @@ final class Resolver {
         //
         Choice ch = nextChoice;
         // ## ModuleInfo.requires() should be a list, not a set
-        List<Dependence> dl = new ArrayList<Dependence>(mi.requires());
+        List<ViewDependence> dl = new ArrayList<>(mi.requiresModules());
         Collections.reverse(dl);
-        for (Dependence d : dl)
+        for (ViewDependence d : dl)
             ch = new Choice(mi, d, ch);
 
         // Recursively examine the next choice
@@ -297,9 +309,11 @@ final class Resolver {
 
             // Revert maps, then fail
             modules.remove(mi);
-            moduleForName.remove(mid.name());
+            for (ModuleView mv : mi.views()) {
+                moduleViewForName.remove(mv.id().name());
+            }
             if (ml != null)
-                locationForName.remove(mid.name());
+                locationForName.remove(smn);
             if (ms != null) {
                 downloadRequired -= ms.download();
                 spaceRequired -= ms.install();
@@ -311,7 +325,6 @@ final class Resolver {
         }
 
         return true;
-
     }
 
     private boolean run()
@@ -319,7 +332,7 @@ final class Resolver {
     {
         Choice ch = null;
         for (ModuleIdQuery midq : rootQueries) {
-            Dependence dep = new Dependence(EnumSet.noneOf(Modifier.class),
+            ViewDependence dep = new ViewDependence(EnumSet.noneOf(Modifier.class),
                                             midq);
             ch = new Choice(null, dep,  ch);
         }
@@ -338,7 +351,8 @@ final class Resolver {
                   ? rootQueries.iterator().next()
                   : rootQueries));
         return new Resolution(rootQueries, r.modules,
-                              r.moduleForName, r.locationForName,
+                              r.moduleViewForName,
+                              r.locationForName,
                               r.downloadRequired, r.spaceRequired);
     }
 
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java b/jdk/src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java
index fc64a37..2d113ce 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java
@@ -104,7 +104,7 @@ public final class SimpleLibrary
         protected void load() throws IOException {
             try (InputStream fis = new FileInputStream(file);
                  BufferedInputStream bis = new BufferedInputStream(fis);
-                 DataInputStream in = new DataInputStream(fis)) {
+                 DataInputStream in = new DataInputStream(bis)) {
                 if (in.readInt() != FileConstants.MAGIC)
                     throw new IOException(file + ": Invalid magic number");
                 if (in.readShort() != type.value())
@@ -164,7 +164,7 @@ public final class SimpleLibrary
         }
 
         private Header(File root) {
-             super(MAJOR_VERSION, MINOR_VERSION,
+            super(MAJOR_VERSION, MINOR_VERSION,
                   FileConstants.Type.LIBRARY_HEADER,
                   new File(root, FILE));
         }
@@ -451,8 +451,11 @@ public final class SimpleLibrary
         protected void storeRest(DataOutputStream out)
             throws IOException
         {
-            assert cf.roots().size() == 1;
-            out.writeUTF(cf.roots().iterator().next().toString());
+            // Roots
+            out.writeInt(cf.roots().size());
+            for (ModuleId mid : cf.roots()) {
+                out.writeUTF(mid.toString());
+            }
             // Contexts
             out.writeInt(cf.contexts().size());
             for (Context cx : cf.contexts()) {
@@ -466,7 +469,14 @@ public final class SimpleLibrary
                         out.writeUTF("");
                     else
                         out.writeUTF(lp.toString());
+
+                    // Module views
+                    out.writeInt(cx.views(mid).size());
+                    for (ModuleId id : cx.views(mid)) {
+                        out.writeUTF(id.toString());
+                    }
                 }
+
                 // Local class map
                 out.writeInt(cx.localClasses().size());
                 for (Map.Entry<String,ModuleId> me
@@ -474,6 +484,7 @@ public final class SimpleLibrary
                     out.writeUTF(me.getKey());
                     out.writeUTF(me.getValue().toString());
                 }
+
                 // Remote package map
                 out.writeInt(cx.contextForRemotePackageMap().size());
                 for (Map.Entry<String,String> me
@@ -481,20 +492,28 @@ public final class SimpleLibrary
                     out.writeUTF(me.getKey());
                     out.writeUTF(me.getValue());
                 }
+
                 // Suppliers
                 out.writeInt(cx.remoteContexts().size());
                 for (String cxn : cx.remoteContexts()) {
                     out.writeUTF(cxn);
                 }
+
             }
         }
 
         protected void loadRest(DataInputStream in)
             throws IOException
         {
-            String root = in.readUTF();
-            ModuleId rmid = jms.parseModuleId(root);
-            cf = new Configuration<Context>(rmid);
+            // Roots
+            int nRoots = in.readInt();
+            List<ModuleId> roots = new ArrayList<>();
+            for (int i = 0; i < nRoots; i++) {
+                String root = in.readUTF();
+                ModuleId rmid = jms.parseModuleId(root);
+                roots.add(rmid);
+            }
+            cf = new Configuration<Context>(roots);
             // Contexts
             int nContexts = in.readInt();
             for (int i = 0; i < nContexts; i++) {
@@ -504,11 +523,18 @@ public final class SimpleLibrary
                 int nModules = in.readInt();
                 for (int j = 0; j < nModules; j++) {
                     ModuleId mid = jms.parseModuleId(in.readUTF());
-                    cx.add(mid);
-                    cf.put(mid.name(), cx);
                     String lps = in.readUTF();
                     if (lps.length() > 0)
                         cx.putLibraryPathForModule(mid, new File(lps));
+                    // Module Views
+                    int nViews = in.readInt();
+                    Set<ModuleId> views = new HashSet<>();
+                    for (int k = 0; k < nViews; k++) {
+                        ModuleId id = jms.parseModuleId(in.readUTF());
+                        views.add(id);
+                        cf.put(id.name(), cx);
+                    }
+                    cx.add(mid, views);
                 }
                 cx.freeze();
                 assert cx.name().equals(cxn);
@@ -655,8 +681,8 @@ public final class SimpleLibrary
         if (!(v instanceof JigsawVersion))
             throw new IllegalArgumentException(mid + ": Not a Jigsaw module id");
     }
-
-    private File moduleDir(ModuleId mid) {
+        
+    private File moduleDir(File root, ModuleId mid) {
         Version v = mid.version();
         String vs = (v != null) ? v.toString() : "default";
         return new File(new File(root, mid.name()), vs);
@@ -675,27 +701,88 @@ public final class SimpleLibrary
         throws IOException
     {
         checkModuleId(mid);
-        File md = moduleDir(mid);
+        File md = moduleDir(root, mid);
         if (!md.exists())
             return null;
         checkModuleDir(md);
+                
+        // mid may be a view or alias of a module
+        byte[] mib = Files.load(new File(md, "info"));
+        ModuleInfo mi = jms.parseModuleInfo(mib);
+        if (!mid.equals(mi.id())) {
+            md = moduleDir(root, mi.id());
+            if (!md.exists())
+                throw new IOException(mid + ": " + md + " does not exist");
+            checkModuleDir(md);
+        }
         return md;
     }
 
+    private File makeModuleDir(File root, ModuleInfo mi)
+        throws ConfigurationException, IOException
+    {
+        // view name is unique
+        for (ModuleView mv : mi.views()) {
+            File md = moduleDir(root, mv.id());
+            if (md.exists()) {
+                throw new ConfigurationException("module view " +
+                    mv.id() + " already installed");
+            }
+            if (!md.mkdirs()) {
+                throw new IOException(md + ": Cannot create");
+            }
+        }
+
+        return moduleDir(root, mi.id());
+    }
+    
+    private void deleteModuleDir(File root, ModuleInfo mi)
+        throws IOException
+    {
+        // delete the default view and the module content
+        ModuleId mid = mi.defaultView().id();
+        File md = moduleDir(root, mid);
+        if (md.exists())
+            ModuleFile.Reader.remove(md);
+        // delete all views
+        for (ModuleView mv : mi.views()) {
+            md = moduleDir(root, mv.id());
+            if (md.exists()) {
+                Files.deleteTree(md);
+            }
+        }
+    }
+
     private void deleteModuleDir(ModuleId mid)
         throws IOException
     {
-        File md = findModuleDir(mid);
-        if (md == null)
+        checkModuleId(mid);
+        File md = moduleDir(root, mid);
+        if (!md.exists())
             return;
-        Files.deleteTree(md);
-        File mnd = md.getParentFile();
-        if (mnd.list().length == 0) {
-            if (!mnd.delete())
-                throw new IOException(mnd + ": Cannot delete");
+        checkModuleDir(md);
+
+        // mid may be a view or alias of a module
+        byte[] mib = Files.load(new File(md, "info"));
+        ModuleInfo mi = jms.parseModuleInfo(mib);
+        if (!mid.equals(mi.id())) {
+            throw new IOException(mi.id() + " found in the module directory for " + mid);
         }
+        deleteModuleDir(root, mi);
     }
 
+    private void copyModuleInfo(File root, ModuleInfo mi, byte[] mib)
+        throws IOException
+    {
+        for (ModuleView mv : mi.views()) {
+            if (mv.id().equals(mi.id())) {
+                continue;
+            }
+
+            File mvd = moduleDir(root, mv.id());
+            Files.store(mib, new File(mvd, "info"));
+        }
+    }
     public byte[] readLocalModuleInfoBytes(ModuleId mid)
         throws IOException
     {
@@ -953,10 +1040,17 @@ public final class SimpleLibrary
         String m = mi.id().name();
         JigsawVersion v = (JigsawVersion)mi.id().version();
         String vs = (v == null) ? "default" : v.toString();
-        File mdst = new File(new File(dst, m), vs);
-        if (mdst.exists())
-            Files.deleteTree(mdst);
-        Files.mkdirs(mdst, "module");
+        deleteModuleDir(dst, mi);
+
+         // view name is unique
+        for (ModuleView mv : mi.views()) {
+            File md = moduleDir(dst, mv.id());
+            if (!md.mkdirs()) {
+                throw new IOException(md + ": Cannot create");
+            }
+        }
+
+        File mdst = moduleDir(dst, mi.id());
         Files.store(bs, new File(mdst, "info"));
         File cldst = new File(mdst, "classes");
 
@@ -982,12 +1076,9 @@ public final class SimpleLibrary
                     }});
             ix.store();
         } else {
-            FileOutputStream fos
-                = new FileOutputStream(new File(mdst, "classes"));
-            JarOutputStream jos
-                = new JarOutputStream(new BufferedOutputStream(fos));
-            try {
-
+            try (FileOutputStream fos = new FileOutputStream(new File(mdst, "classes"));
+                 JarOutputStream jos = new JarOutputStream(new BufferedOutputStream(fos)))
+            {
                 // Copy class files and build index
                 final Index ix = new Index(mdst);
                 Files.storeTree(src, jos, isDeflated(), new Files.Filter<File>() {
@@ -1001,8 +1092,7 @@ public final class SimpleLibrary
                             }
                         }});
                 ix.store();
-            } finally {
-                jos.close();
+                copyModuleInfo(dst, mi, bs);
             }
             if (strip)
                 strip(mdst);
@@ -1032,23 +1122,16 @@ public final class SimpleLibrary
     }
 
     private ModuleFileVerifier.Parameters mfvParams;
-
     private ModuleId install(InputStream is, boolean verifySignature, boolean strip)
         throws ConfigurationException, IOException, SignatureException
     {
         BufferedInputStream bin = new BufferedInputStream(is);
         DataInputStream in = new DataInputStream(bin);
-        File md = null;
+        ModuleInfo mi = null;
         try (ModuleFile.Reader mr = new ModuleFile.Reader(in)) {
             byte[] mib = mr.readStart();
-            ModuleInfo mi = jms.parseModuleInfo(mib);
-            md = moduleDir(mi.id());
-            ModuleId mid = mi.id();
-            if (md.exists())
-                throw new ConfigurationException(mid + ": Already installed");
-            if (!md.mkdirs())
-                throw new IOException(md + ": Cannot create");
-
+            mi = jms.parseModuleInfo(mib);        
+            File md = makeModuleDir(root, mi);
             if (verifySignature && mr.hasSignature()) {
                 ModuleFileVerifier mfv = new SignedModule.PKCS7Verifier(mr);
                 if (mfvParams == null) {
@@ -1076,13 +1159,16 @@ public final class SimpleLibrary
 
             if (strip)
                 strip(md);
-            reIndex(mid);         // ## Could do this while reading module file
-            return mid;
+            reIndex(mi.id());         // ## Could do this while reading module file
+
+            // copy module-info.class to each view
+            copyModuleInfo(root, mi, mib);
+            return mi.id();
 
         } catch (IOException | SignatureException x) {
-            if (md != null && md.exists()) {
+            if (mi != null) {
                 try {
-                   ModuleFile.Reader.remove(md);
+                    deleteModuleDir(root, mi);
                 } catch (IOException y) {
                     y.initCause(x);
                     throw y;
@@ -1095,18 +1181,14 @@ public final class SimpleLibrary
     private ModuleId installFromJarFile(File mf, boolean verifySignature, boolean strip)
         throws ConfigurationException, IOException, SignatureException
     {
-        File md = null;
+        ModuleInfo mi = null;
         try (JarFile jf = new JarFile(mf, verifySignature)) {
-            ModuleInfo mi = jf.getModuleInfo();
+            mi = jf.getModuleInfo();
             if (mi == null)
                 throw new ConfigurationException(mf + ": not a modular JAR file");
 
-            md = moduleDir(mi.id());
+            File md = makeModuleDir(root, mi);
             ModuleId mid = mi.id();
-            if (md.exists())
-                throw new ConfigurationException(mid + ": Already installed");
-            if (!md.mkdirs())
-                throw new IOException(md + ": Cannot create");
 
             boolean signed = false;
 
@@ -1121,7 +1203,7 @@ public final class SimpleLibrary
                 while (entries.hasMoreElements()) {
                     JarEntry je = entries.nextElement();
                     try (InputStream is = jf.getInputStream(je)) {
-                       if (je.getName().equals(JarFile.MODULEINFO_NAME)) {
+                        if (je.getName().equals(JarFile.MODULEINFO_NAME)) {                            
                             java.nio.file.Files.copy(is, md.toPath().resolve("info"));
                         } else {
                             writeJarEntry(is, je, jos);
@@ -1150,11 +1232,15 @@ public final class SimpleLibrary
             if (strip)
                 strip(md);
             reIndex(mid);
+            
+            // copy module-info.class to each view
+            byte[] mib = java.nio.file.Files.readAllBytes(md.toPath().resolve("info"));
+            copyModuleInfo(root, mi, mib);
             return mid;
         } catch (IOException | SignatureException x) {
-            if (md != null && md.exists()) {
+            if (mi != null) {
                 try {
-                    Files.deleteTree(md);
+                    deleteModuleDir(root, mi);
                 } catch (IOException y) {
                     y.initCause(x);
                     throw y;
@@ -1252,16 +1338,14 @@ public final class SimpleLibrary
     private ModuleId install(File mf, boolean verifySignature, boolean strip)
         throws ConfigurationException, IOException, SignatureException
     {
-        ModuleId mid;
         if (mf.getName().endsWith(".jar"))
-            mid = installFromJarFile(mf, verifySignature, strip);
+            return installFromJarFile(mf, verifySignature, strip);
         else {
             // Assume jmod file
             try (FileInputStream in = new FileInputStream(mf)) {
-                mid = install(in, verifySignature, strip);
+                return install(in, verifySignature, strip);
             }
         }
-        return mid;
     }
 
     public void install(Collection<File> mfs, boolean verifySignature, boolean strip)
@@ -1314,9 +1398,10 @@ public final class SimpleLibrary
         assert res.rootQueries.size() == 1;
         ModuleIdQuery midq = res.rootQueries.iterator().next();
         ModuleInfo root = null;
-        for (ModuleInfo mi : res.modules) {
-            if (midq.matches(mi.id())) {
-                root = mi;
+        for (String mn : res.moduleViewForName.keySet()) {
+            ModuleView mv = res.moduleViewForName.get(mn);
+            if (midq.matches(mv.id())) {
+                root = mv.moduleInfo();
                 break;
             }
         }
@@ -1338,7 +1423,7 @@ public final class SimpleLibrary
         //
         Configuration<Context> cf
             = Configurator.configure(this, res);
-        new StoredConfiguration(moduleDir(root.id()), cf).store();
+        new StoredConfiguration(findModuleDir(root.id()), cf).store();
     }
 
     @Override
@@ -1392,11 +1477,19 @@ public final class SimpleLibrary
         throws ConfigurationException, IOException
     {
         // ## mids not used yet
-        for (ModuleInfo mi : listLocalRootModuleInfos()) {
+        List<ModuleId> roots = new ArrayList<>();
+        for (ModuleView mv : listLocalRootModuleViews()) {
+            // each module can have multiple entry points
+            // only configure once for each module.
+            if (!roots.contains(mv.moduleInfo().id()))
+                roots.add(mv.moduleInfo().id());
+        }
+
+        for (ModuleId mid : roots) {
             // ## We could be a lot more clever about this!
             Configuration<Context> cf
-                = Configurator.configure(this, mi.id().toQuery());
-            new StoredConfiguration(moduleDir(mi.id()), cf).store();
+                = Configurator.configure(this, mid.toQuery());
+            new StoredConfiguration(findModuleDir(mid), cf).store();
         }
     }
 
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/cli/Commands.java b/jdk/src/share/classes/org/openjdk/jigsaw/cli/Commands.java
index ef5c012..7121f8e 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/cli/Commands.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/cli/Commands.java
@@ -47,7 +47,8 @@ class Commands {
         = JigsawModuleSystem.instance();
 
     private static void formatCommaList(PrintStream out,
-                                        String prefix, Collection<?> list)
+                                        String prefix,
+                                        Collection<?> list)
     {
         if (list.isEmpty())
             return;
@@ -64,6 +65,39 @@ class Commands {
         out.format("%n");
     }
 
+    private static void formatModuleView(PrintStream out,
+                                         ModuleView view,
+                                         String indent) {
+        formatCommaList(out, indent + "provides",
+                        view.aliases());
+        formatCommaList(out, indent + "permits",
+                        view.permits());
+        Map<String, Set<String>> services = view.services();
+        if (!services.isEmpty()) {
+            Set<String> names = new HashSet<>();
+            StringBuilder sb = new StringBuilder();
+            for (Map.Entry<String, Set<String>> e : services.entrySet()) {
+                String s = e.getKey();
+                for (String impl : e.getValue()) {
+                    sb.append(s);
+                    sb.append(" with ");
+                    sb.append(impl);
+                }
+            }
+            names.add(sb.toString());
+            formatCommaList(out,
+                            indent + "provides service",
+                            names);
+        }
+        if (!view.exports().isEmpty()) {
+            out.format("  %sexports%n", indent);
+            Set<String> exports = new TreeSet<>(view.exports());
+            for (String pn : exports) {
+                out.format("  %s  %s%n", indent, pn);
+            }
+        }
+    }
+    
     private static void listCommand(Catalog cat, ModuleIdQuery midq,
                                     boolean parents, boolean verbose)
         throws Command.Exception
@@ -76,17 +110,30 @@ class Commands {
                 if (midq != null && !midq.matches(mid))
                     continue;
                 ModuleInfo mi = cat.readModuleInfo(mid);
-                if (verbose)
-                    out.format("%n");
-                out.format("%s%n", mi.id());
-                n++;
-                if (verbose) {
-                    formatCommaList(out, "provides", mi.provides());
-                    Platform.adjustPlatformDependences(mi); // ##
-                    for (Dependence d : mi.requires()) {
-                        out.format("  %s%n", d);
+                if (mid.equals(mi.id())) {
+                    if (verbose)
+                        out.format("%n");
+                    
+                    // print module and its views
+                    out.format("%s%n", mi.id());
+                    n++;
+                    if (verbose) {
+                        Platform.adjustPlatformDependences(mi); // ##
+                        for (ViewDependence d : mi.requiresModules()) {
+                            out.format("  %s%n", d);
+                        }
+                        for (ServiceDependence sd: mi.requiresServices()) {
+                            out.format("  %s%n", sd);
+                        }
+                        formatModuleView(out, mi.defaultView(), "");
+                        
+                        for (ModuleView mv : mi.views()) {
+                            if (mv == mi.defaultView())
+                                continue;
+                            out.format("  view %s%n", mv.id().name());
+                            formatModuleView(out, mv, "  ");
+                        }
                     }
-                    formatCommaList(out, "permits", mi.permits());
                 }
             }
         } catch (IOException x) {
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/cli/Packager.java b/jdk/src/share/classes/org/openjdk/jigsaw/cli/Packager.java
index ec21946..3112c74 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/cli/Packager.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/cli/Packager.java
@@ -129,7 +129,7 @@ public class Packager {
     private Integer installedSize = null;
 
     // Platform boot module
-    private static final String BOOT_MODULE = "jdk.boot";
+    private static final String BOOT_MODULE = "jdk.base";
 
     private static void createTempWorkDir()
         throws Command.Exception
@@ -268,8 +268,8 @@ public class Packager {
         {
             StringBuilder deps = new StringBuilder();
 
-            for (Dependence d : info.requires()) {
-                if (d.modifiers().contains(Dependence.Modifier.OPTIONAL))
+            for (ViewDependence d : info.requiresModules()) {
+                if (d.modifiers().contains(ViewDependence.Modifier.OPTIONAL))
                     continue; // skip optional dependency
 
                 deps.append(", ")
@@ -289,7 +289,7 @@ public class Packager {
         {
             StringBuilder deps = new StringBuilder();
 
-            for (ModuleId id : info.provides())
+            for (ModuleId id : info.defaultView().aliases())
                 deps.append(", ")
                     .append(id.name());
 
@@ -360,9 +360,9 @@ public class Packager {
                                    default_long_description);
                 }
 
-                if (!bootmodule && !info.requires().isEmpty())
+                if (!bootmodule && !info.requiresModules().isEmpty())
                     control.format("Depends: %s\n", computeDependencies(info));
-                if (!info.provides().isEmpty())
+                if (!info.defaultView().aliases().isEmpty())
                     control.format("Provides: %s\n", computeProvides(info));
                 if (null != extra_metadata)
                     control.format("%s\n", new String(Files.load(extra_metadata)));
@@ -376,7 +376,7 @@ public class Packager {
 
 
                 // Generate the launcher script, if a main class exists
-                if (!bootmodule && info.mainClass() != null) {
+                if (!bootmodule && info.defaultView().mainClass() != null) {
                     // If no command name is given, use module name
                     if (null == bincmd)
                         bincmd = info.id().name();
diff --git a/jdk/src/share/classes/sun/security/jca/ProviderConfig.java b/jdk/src/share/classes/sun/security/jca/ProviderConfig.java
index 62f8bdd..1e6b8b2 100644
--- a/jdk/src/share/classes/sun/security/jca/ProviderConfig.java
+++ b/jdk/src/share/classes/sun/security/jca/ProviderConfig.java
@@ -209,7 +209,17 @@ final class ProviderConfig {
                     debug.println("Loading provider: " + ProviderConfig.this);
                 }
                 try {
-                    ClassLoader cl = ClassLoader.getSystemClassLoader();
+                    // ## Revisit this to use the services for modules
+                    // ## In legacy mode, the service provider will be searched
+                    // ## from the bootclasspath first.  In module mode, 
+                    // ## a module loader can only see the classes locally
+                    // ## or the exported types from its dependencies.
+                    // ## 
+                    // ## Workaround now to load providers by the boot loader
+                    // ## in module mode.  Won't find other "ext" providers such
+                    // ## as sunpkcs11, smartcardio, xmldsig. 
+                    // ## 
+                    ClassLoader cl = org.openjdk.jigsaw.BootLoader.getSystemLoader();
                     Class<?> provClass;
                     if (cl != null) {
                         provClass = cl.loadClass(className);
diff --git a/jdk/src/share/classes/sun/tools/jar/Main.java b/jdk/src/share/classes/sun/tools/jar/Main.java
index a1c88ec..ac877c1 100644
--- a/jdk/src/share/classes/sun/tools/jar/Main.java
+++ b/jdk/src/share/classes/sun/tools/jar/Main.java
@@ -157,7 +157,6 @@ class Main {
             }
             if (cflag) {
                 Manifest manifest = null;
-                ModuleInfo minfo = null;
                 InputStream in = null;
 
                 if (!Mflag) {
@@ -205,12 +204,8 @@ class Main {
                             return false;
                         }
                     }
-                    minfo = new ModuleInfo(moduleid, getMainClass(manifest));
-                    if (manifest != null) {
-                        addModuleRequires(minfo, getClassPath(manifest));
-                    }
                 }
-                create(new BufferedOutputStream(out, 4096), manifest, minfo);
+                create(new BufferedOutputStream(out, 4096), manifest);
                 if (in != null) {
                     in.close();
                 }
@@ -480,7 +475,7 @@ class Main {
     /**
      * Creates a new JAR file.
      */
-    void create(OutputStream out, Manifest manifest, ModuleInfo minfo)
+    void create(OutputStream out, Manifest manifest)
         throws IOException
     {
         ZipOutputStream zos = new JarOutputStream(out);
@@ -501,15 +496,22 @@ class Main {
             }
             writeManifest(manifest, zos, System.currentTimeMillis());
         }
+
+        ModuleInfo minfo = moduleid != null
+                               ? new ModuleInfo(moduleid) : null;
+        for (File file: entries) {
+            addFile(zos, file, minfo);
+        }
+
         if (minfo != null) {
+            minfo.setMainClass(getMainClass(manifest));
+            addModuleRequires(minfo, getClassPath(manifest));
+
             if (vflag) {
                 output(getMsg("out.added.moduleinfo"));
             }
             writeModuleInfo(minfo, zos, System.currentTimeMillis());
         }
-        for (File file: entries) {
-            addFile(zos, file);
-        }
         zos.close();
     }
 
@@ -538,7 +540,7 @@ class Main {
                     JarFile jf = new JarFile(f);
                     java.lang.module.ModuleInfo mi = jf.getModuleInfo();
                     if (mi != null) {
-                        minfo.addRequire(mi.id());
+                        minfo.addRequires(mi.id());
                         continue;
                     }
                 }
@@ -598,6 +600,8 @@ class Main {
                    InputStream newManifest,
                    JarIndex jarIndex) throws IOException
     {
+        ModuleInfo minfo = moduleid != null
+                               ? new ModuleInfo(moduleid) : null;
         try (ZipInputStream zis = new ZipInputStream(in);
              ZipOutputStream zos = new JarOutputStream(out)) {
             ZipEntry e = null;
@@ -658,13 +662,14 @@ class Main {
 
                 if (!entryMap.containsKey(name)) { // copy the old stuff
                     if (!name.equals(MODULEINFO_NAME) || moduleid == null) {
+                        // add exports in the generated module-info.java
                         copyZipEntry(e, zos);
-                        copy(zis, zos);   // copy the content
+                        copy(e, zis, zos, minfo);   // copy the content
                         zos.closeEntry();
-                    } 
+                    }
                 } else { // replace with the new files
                     File f = entryMap.get(name);
-                    addFile(zos, f);
+                    addFile(zos, f, minfo);
                     entryMap.remove(name);
                     entries.remove(f);
                 }
@@ -672,7 +677,7 @@ class Main {
 
             // add the remaining new files
             for (File f : entries) {
-                addFile(zos, f);
+                addFile(zos, f, minfo);
             }
 
             if (mf == null) {
@@ -686,12 +691,10 @@ class Main {
                 }
             }
 
-            if (moduleid != null) {
+            if (minfo != null) {
                 // -I is specified
-                ModuleInfo minfo = new ModuleInfo(moduleid, getMainClass(mf));
-                if (mf != null) {
-                    addModuleRequires(minfo, getClassPath(mf));
-                }
+                minfo.setMainClass(getMainClass(mf));
+                addModuleRequires(minfo, getClassPath(mf));
                 writeModuleInfo(minfo, zos, System.currentTimeMillis());
                 if (vflag) {
                     output(getMsg("out.update.moduleinfo"));
@@ -826,6 +829,13 @@ class Main {
         return false;
     }
 
+    void addFile(ZipOutputStream zos, File file, ModuleInfo minfo) throws IOException {
+        addFile(zos, file);
+        // add exports in the generated module-info.java
+        if (minfo != null && file.getName().endsWith(".class"))
+            minfo.addExports(file);
+    }
+
     /**
      * Adds a new file entry to the ZIP output stream.
      */
@@ -884,7 +894,7 @@ class Main {
             }
         }
     }
-
+    
     /**
      * A buffer for use only by copy(InputStream, OutputStream).
      * Not as clean as allocating a new buffer as needed by copy,
@@ -900,12 +910,52 @@ class Main {
      * @param to the output stream to write to
      * @throws IOException if an I/O error occurs
      */
-    private void copy(InputStream from, OutputStream to) throws IOException {
+    void copy(InputStream from, OutputStream to) throws IOException {
         int n;
-        while ((n = from.read(copyBuf)) != -1)
+        while ((n = from.read(copyBuf)) != -1) {
             to.write(copyBuf, 0, n);
+        }
+    }
+    
+    /**
+     * Copies all bytes from the input stream to the output stream.
+     * Does not close or flush either stream.  Also, add exports
+     * to the given ModuleInfo.
+     */
+    void copy(ZipEntry e, InputStream from, OutputStream to,
+              ModuleInfo minfo) throws IOException {
+        String path = e.getName();
+        if (minfo == null || !path.endsWith(".class")) {
+            copy(from, to);
+        } else {
+            // avoid reading the input stream twice
+            // the ByteStreamHelper saves the bytes in a buffer
+            // for writing to the output stream and also loaded
+            // to determine if it's a public class and get its classname.
+            helper.copyFrom(from);
+            helper.copyTo(to);
+            helper.addExports(minfo, e);
+        }
+    }
+    
+    private ByteStreamHelper helper = new ByteStreamHelper();
+    class ByteStreamHelper extends ByteArrayOutputStream {
+        void copyFrom(InputStream from) throws IOException {
+            reset();
+            
+            int n;
+            while ((n = from.read(copyBuf)) != -1) {
+                this.write(copyBuf, 0, n);
+            }
+        }
+        void copyTo(OutputStream to) throws IOException {
+            to.write(buf);
+        }
+        
+        void addExports(ModuleInfo minfo, ZipEntry e) throws IOException {
+            minfo.addExports(new ByteArrayInputStream(buf), e.getSize(), e.getName());
+        }
     }
-
     /**
      * Copies all bytes from the input file to the output stream.
      * Does not close or flush the output stream.
@@ -1152,6 +1202,8 @@ class Main {
     private HashSet<String> jarPaths = new HashSet<String>();
 
     String getClassPath(Manifest m) {
+        if (m == null) return null;
+
         Attributes attr = m.getMainAttributes();
         if (attr != null) {
             return attr.getValue(Attributes.Name.CLASS_PATH);
@@ -1159,6 +1211,7 @@ class Main {
             return null;
         }
     }
+
     /**
      * Generates the transitive closure of the Class-Path attribute for
      * the specified jar file.
diff --git a/jdk/src/share/classes/sun/tools/jar/ModuleInfo.java b/jdk/src/share/classes/sun/tools/jar/ModuleInfo.java
index 82ef400..03a2aa3 100644
--- a/jdk/src/share/classes/sun/tools/jar/ModuleInfo.java
+++ b/jdk/src/share/classes/sun/tools/jar/ModuleInfo.java
@@ -27,12 +27,13 @@ package sun.tools.jar;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
-import java.nio.file.Files;
 import java.lang.module.*;
 import java.lang.module.Dependence.Modifier;
 import java.util.*;
 import com.sun.tools.classfile.*;
+import org.openjdk.jigsaw.ClassInfo;
 import static com.sun.tools.classfile.ConstantPool.*;
 
 /**
@@ -41,20 +42,21 @@ import static com.sun.tools.classfile.ConstantPool.*;
 class ModuleInfo {
     private static ModuleSystem ms = ModuleSystem.base();
     private final ModuleId moduleId;
-    private final String mainClass;
-    private final Set<Dependence> requires;
+    private final Set<ViewDependence> requiresModules;
+    private final Set<String> exports;
     private final ModuleInfoWriter writer;
+    private String mainClass;
     private byte[] bytes;
 
-    ModuleInfo(String mid, String mainclass) {
+    ModuleInfo(String mid) {
         this.moduleId = ms.parseModuleId(mid);
-        this.mainClass = mainclass;
-        this.requires = new HashSet<>();
+        this.requiresModules = new HashSet<>();
+        this.exports = new TreeSet<>();
         this.writer = new ModuleInfoWriter();
-        addRequire(org.openjdk.jigsaw.Platform.defaultPlatformModule(),
-                   EnumSet.of(Modifier.SYNTHETIC));
+        addRequires(org.openjdk.jigsaw.Platform.defaultPlatformModule(),
+                    EnumSet.of(Modifier.SYNTHETIC));
     }
-
+    
     ModuleId id() {
         return moduleId;
     }
@@ -63,17 +65,17 @@ class ModuleInfo {
         return mainClass;
     }
 
-    void addRequire(ModuleId mid) {
-        addRequire(mid, Collections.EMPTY_SET);
+    void setMainClass(String mainclass) {
+        this.mainClass = mainclass;
     }
 
-    void addRequire(ModuleId mid, Set<Modifier> mods) {
-        ModuleIdQuery midq = ms.parseModuleIdQuery(mid.name() + "@" + mid.version());
-        requires.add(new Dependence(mods, midq));
+    void addRequires(ModuleId mid) {
+        addRequires(mid, Collections.EMPTY_SET);
     }
 
-    void addRequire(Dependence d) {
-        requires.add(d);
+    void addRequires(ModuleId mid, Set<Modifier> mods) {
+        ModuleIdQuery midq = ms.parseModuleIdQuery(mid.name() + "@" + mid.version());
+        requiresModules.add(new ViewDependence(mods, midq));
     }
 
     void write(OutputStream os) throws IOException {
@@ -86,12 +88,35 @@ class ModuleInfo {
         os.write(bytes);
     }
 
+    private void addExports(ClassInfo ci) {
+        // exports the package of this class if it's public
+        if (ci.isPublic() && !ci.isModuleInfo()) {
+            int i = ci.name().lastIndexOf('.');
+            if (i > 0) {
+                String pn = ci.name().substring(0, i);
+                exports.add(pn);
+            }
+        }
+    }
+    
+    void addExports(File f) throws IOException {
+        ClassInfo ci = ClassInfo.read(f);
+        addExports(ci);
+    }
+    
+    void addExports(InputStream in, long size, String path) throws IOException {
+        ClassInfo ci = ClassInfo.read(in, size, path);
+        addExports(ci);
+    }
+
     class ModuleInfoWriter {
         final List<CPInfo> cpinfos = new ArrayList<>();
         final List<Attribute> attrs = new ArrayList<>();
         int cpidx = 1;
         int this_class_idx;
-
+        int moduleNameIndex;
+        int moduleIndex;
+        
         ModuleInfoWriter() {
             cpinfos.add(0, new CONSTANT_Utf8_info("dummy"));
         }
@@ -101,6 +126,8 @@ class ModuleInfo {
             this_class_idx = cpidx;
             cpinfos.add(cpidx, new CONSTANT_Class_info(null, cpidx+3));
             cpinfos.add(cpidx+1, new CONSTANT_Utf8_info(mname));
+            moduleNameIndex = cpidx+1;
+
             cpinfos.add(cpidx+2, new CONSTANT_Utf8_info(moduleId.version().toString()));
             cpinfos.add(cpidx+3, new CONSTANT_Utf8_info(mname + "/module-info"));
             cpinfos.add(cpidx+4, new CONSTANT_ModuleId_info(null, cpidx+1, cpidx+2));
@@ -110,77 +137,101 @@ class ModuleInfo {
             cpidx += 6;
         }
 
-        void addModuleRequireAttribute() {
-            // add constant pool entries for the modifiers
-            List<Modifier> modifiers = new ArrayList<>();
-            int modifierIdx = cpidx;
-            for (Dependence d: requires) {
-                for (Modifier m : d.modifiers()) {
-                    int i = modifiers.indexOf(m);
-                    if (i >= 0)
-                        continue;
-
-                    modifiers.add(m);
-                    String s = m.name().toLowerCase(Locale.ENGLISH);
-                    cpinfos.add(cpidx++, new CONSTANT_Utf8_info(s));
-                }
-            }
-
-            ModuleRequires_attribute.Entry[] reqs =
-                new ModuleRequires_attribute.Entry[requires.size()];
-            int i = 0, j = 0;
-            for (Dependence d: requires) {
+        void addModuleRequiresAttribute() {
+            ModuleRequires_attribute.Entry[] moduleEntries =
+                new ModuleRequires_attribute.Entry[requiresModules.size()];
+            ModuleRequires_attribute.Entry[] serviceEntries =
+                new ModuleRequires_attribute.Entry[0];
+            int i=0;
+            for (ViewDependence d: requiresModules) {
                 // ## specify a version range in CONSTANT_ModuleId_info? 
                 String version = d.query().versionQuery().toString();
                 cpinfos.add(cpidx, new CONSTANT_Utf8_info(d.query().name()));
                 cpinfos.add(cpidx+1, new CONSTANT_Utf8_info(version));
                 cpinfos.add(cpidx+2, new CONSTANT_ModuleId_info(null, cpidx, cpidx+1));
-                int[] attrs = new int[d.modifiers().size()];
-                j = 0;
+                int flags = 0;
                 for (Modifier m : d.modifiers()) {
-                    attrs[j++] = modifierIdx + modifiers.indexOf(m);
+                    switch (m) {
+                        case OPTIONAL:
+                            flags |= ModuleRequires_attribute.MR_OPTIONAL;
+                            break;
+                        case LOCAL:
+                            flags |= ModuleRequires_attribute.MR_LOCAL;
+                            break;
+                        case PUBLIC:
+                            flags |= ModuleRequires_attribute.MR_PUBLIC;
+                            break;
+                        case SYNTHETIC:
+                            flags |= ModuleRequires_attribute.MR_SYNTHETIC;
+                            break;
+                    }
                 }
-                reqs[i++] = new ModuleRequires_attribute.Entry(cpidx+2, attrs);
+                moduleEntries[i++] = new ModuleRequires_attribute.Entry(cpidx+2, flags);
                 cpidx += 3;
             }
             cpinfos.add(cpidx, new CONSTANT_Utf8_info(Attribute.ModuleRequires));
-            Attribute attr = new ModuleRequires_attribute(cpidx, reqs);
+            Attribute attr = new ModuleRequires_attribute(cpidx, moduleEntries, serviceEntries);
             attrs.add(attr);
             cpidx++;
         }
- 
-        void addModuleClassAttribute() {
-            String cname = mainClass.replace('.', '/');
-            cpinfos.add(cpidx, new CONSTANT_Utf8_info(Attribute.ModuleClass));
-            cpinfos.add(cpidx+1, new CONSTANT_Utf8_info(cname));
-            cpinfos.add(cpidx+2, new CONSTANT_Class_info(null, cpidx+1));
-            Attribute attr = new ModuleClass_attribute(cpidx, cpidx+2, new int[0]);
+        
+        void addModuleProvidesAttribute() {
+            // ## multiple views support
+            ModuleProvides_attribute.View[] views =
+                new ModuleProvides_attribute.View[1];
+            
+            int entryPointIndex = mainClass() == null ? 0 : addClassInfo(mainClass());
+            ModuleProvides_attribute.Export[] providesAttrExports =
+                new ModuleProvides_attribute.Export[exports.size()];
+            
+            int i = 0;
+            for (String pn : exports) {
+                int index = cpidx++;
+                cpinfos.add(index, new CONSTANT_Utf8_info(pn));
+                providesAttrExports[i++] = 
+                    new ModuleProvides_attribute.Export(index,
+                            ModuleProvides_attribute.Export.PACKAGE, 
+                            moduleIndex);
+            }
+            
+            views[0] = new ModuleProvides_attribute.View(0,
+                            entryPointIndex, 
+                            new int[0],
+                            new ModuleProvides_attribute.Service[0],
+                            providesAttrExports,
+                            new int[0]);
+           
+            cpinfos.add(cpidx, new CONSTANT_Utf8_info(Attribute.ModuleProvides));
+            Attribute attr = new ModuleProvides_attribute(cpidx, views);
             attrs.add(attr);
-            cpidx += 3;
+            cpidx++;
         }
-
-        void addModuleExportAttribute() {
-            cpinfos.add(cpidx, new CONSTANT_Utf8_info(Attribute.ModuleExport));
-            cpinfos.add(cpidx+1, new CONSTANT_Utf8_info("**"));
-            cpinfos.add(cpidx+2, new CONSTANT_Class_info(null, cpidx+1));
-            ModuleExport_attribute.Entry[] entry = 
-                new ModuleExport_attribute.Entry[] {
-                    new ModuleExport_attribute.Entry(cpidx+2, 0)
-                };
-            Attribute attr = new ModuleExport_attribute(cpidx, entry);
-            attrs.add(attr);
+ 
+        int addClassInfo(String cn) {
+            String cname = cn.replace('.', '/');
+            cpinfos.add(cpidx, new CONSTANT_Utf8_info(cname));
+            cpinfos.add(cpidx+1, new CONSTANT_Class_info(null, cpidx));
+            int index = cpidx+1;
+            cpidx += 2;
+            return index;
+        }
+        
+        int addModuleId(ModuleIdQuery query) {
+            String version = query.versionQuery().toString();
+            cpinfos.add(cpidx, new CONSTANT_Utf8_info(query.name()));
+            cpinfos.add(cpidx + 1, new CONSTANT_Utf8_info(version));
+            cpinfos.add(cpidx + 2, new CONSTANT_ModuleId_info(null, cpidx, cpidx + 1));
+            int index = cpidx + 2;
             cpidx += 3;
+            return index;
         }
 
         byte[] getModuleInfoBytes() throws IOException {
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             ClassWriter cw = new ClassWriter();
             addModuleAttribute();
-            addModuleRequireAttribute();
-            addModuleExportAttribute();
-
-            if (mainClass != null)
-                addModuleClassAttribute();
+            addModuleRequiresAttribute();
+            addModuleProvidesAttribute();
 
             ConstantPool cpool = new ConstantPool(cpinfos.toArray(new CPInfo[0]));
             Attributes attributes = new Attributes(cpool, attrs.toArray(new Attribute[0]));
diff --git a/jdk/test/Makefile b/jdk/test/Makefile
index e685455..8cc2452 100644
--- a/jdk/test/Makefile
+++ b/jdk/test/Makefile
@@ -625,7 +625,7 @@ ifeq ($(MODULE_BUILD),true)
 endif
 
 JDK_ALL_TARGETS += jdk_jigsaw
-jdk_jigsaw: java/lang/module java/lang/reflect/Module $(JIGSAW_TESTS)
+jdk_jigsaw: java/lang/module $(JIGSAW_TESTS)
 	$(call RunOthervmBatch)
 
 # ------------------------------------------------------------------
diff --git a/jdk/test/java/lang/module/_ModuleInfoReader.java b/jdk/test/java/lang/module/_ModuleInfoReader.java
index 9e92985..dc7eea0 100644
--- a/jdk/test/java/lang/module/_ModuleInfoReader.java
+++ b/jdk/test/java/lang/module/_ModuleInfoReader.java
@@ -58,37 +58,39 @@ public class _ModuleInfoReader {
         eq(mi.id(), ms.parseModuleId("M at 1.0"));
 
         // provides
-        Set<ModuleId> ps = new HashSet<ModuleId>();
+        Set<ModuleId> ps = new HashSet<>();
         ps.add(ms.parseModuleId("M1 @ 2.0"));
         ps.add(ms.parseModuleId("M2 @ 2.1"));
-        eq(mi.provides(), ps);
+        eq(mi.defaultView().aliases(), ps);
 
         // requires
-        Set<Dependence> ds = new HashSet<Dependence>();
-        ds.add(new Dependence(EnumSet.of(OPTIONAL, LOCAL),
-                              new ModuleIdQuery("N",
-                                                ms.parseVersionQuery("9.0"))));
-        ds.add(new Dependence(EnumSet.of(OPTIONAL, LOCAL),
-                              new ModuleIdQuery("P",
-                                                // ## Should be >=9.1, but
-                                                // ## javac can't compile
-                                                // ## that at the moment
-                                                ms.parseVersionQuery("9.1"))));
-        ds.add(new Dependence(EnumSet.of(PUBLIC),
-                              new ModuleIdQuery("Q",
-                                                ms.parseVersionQuery("5.11"))));
+        Set<ViewDependence> ds = new HashSet<>();
+        ds.add(new ViewDependence(EnumSet.of(OPTIONAL, LOCAL),
+                                  new ModuleIdQuery("N",
+                                                     ms.parseVersionQuery("9.0"))));
+        ds.add(new ViewDependence(EnumSet.of(OPTIONAL, LOCAL),
+                                  new ModuleIdQuery("P",
+                                                      // ## Should be >=9.1, but
+                                                      // ## javac can't compile
+                                                      // ## that at the moment
+                                                      ms.parseVersionQuery("9.1"))));
+        ds.add(new ViewDependence(EnumSet.of(PUBLIC),
+                                  new ModuleIdQuery("Q",
+                                                    ms.parseVersionQuery("5.11"))));
         // ## need a better way to verify independent of the version
-        ds.add(new Dependence(EnumSet.of(SYNTHETIC),
-                              new ModuleIdQuery("jdk",
-                                                ms.parseVersionQuery("8-ea"))));
-        eq(mi.requires(), ds);
+        // ## javac bug: synthetic not set
+        // ## This test needs update anyway when default platform module is changed
+        ds.add(new ViewDependence(EnumSet.noneOf(Dependence.Modifier.class),
+                                  new ModuleIdQuery("jdk",
+                                                    ms.parseVersionQuery("8-ea"))));
+        eq(mi.requiresModules(), ds);
 
         // permits
-        eq(mi.permits(),
-           new HashSet<String>(Arrays.asList("A", "B")));
+        eq(mi.defaultView().permits(),
+           new HashSet<>(Arrays.asList("A", "B")));
 
         // main class
-        ok(mi.mainClass().equals("M.X.Y.Main"));
+        ok(mi.defaultView().mainClass().equals("M.X.Y.Main"));
 
     }
 
diff --git a/jdk/test/java/lang/module/module-info-reader.sh b/jdk/test/java/lang/module/module-info-reader.sh
index dcb6409..7f1160f 100644
--- a/jdk/test/java/lang/module/module-info-reader.sh
+++ b/jdk/test/java/lang/module/module-info-reader.sh
@@ -41,13 +41,15 @@ exit 0
 
 : setup pass compile
 
-module M @ 1.0
-    provides M1 @ 2.0, M2 @ 2.1
-{
-    requires optional local N @ 9.0, P @ 9.1;
+module M @ 1.0 {
+    provides M1 @ 2.0;
+    provides M2 @ 2.1;
+    requires optional local N @ 9.0;
+    requires optional local P @ 9.1;
     requires public Q @ 5.11;
-    permits A, B;
-    class act M.X.Y.Main;
+    permits A;
+    permits B;
+    class M.X.Y.Main;
 }
 
 package M.X.Y;
diff --git a/jdk/test/org/openjdk/jigsaw/ConfigurationBuilder.java b/jdk/test/org/openjdk/jigsaw/ConfigurationBuilder.java
index f893f13..8489137 100644
--- a/jdk/test/org/openjdk/jigsaw/ConfigurationBuilder.java
+++ b/jdk/test/org/openjdk/jigsaw/ConfigurationBuilder.java
@@ -27,9 +27,6 @@ import java.util.*;
 import java.lang.module.*;
 import org.openjdk.jigsaw.*;
 
-import static java.lang.module.Dependence.Modifier;
-
-
 public class ConfigurationBuilder {
 
     private static JigsawModuleSystem jms = JigsawModuleSystem.instance();
@@ -37,10 +34,10 @@ public class ConfigurationBuilder {
     private List<ModuleId> roots = new ArrayList<>();
 
     private Set<Context> contexts = new HashSet<>();
-    private Map<String,Context> contextForModule = new HashMap<>();
+    private Map<String,Context> contextForModuleView = new HashMap<>();
 
     private Set<PathContext> pathContexts = new HashSet<>();
-    private Map<String,PathContext> pathContextForModule = new HashMap<>();
+    private Map<String,PathContext> pathContextForModuleView = new HashMap<>();
 
     private ConfigurationBuilder(String[] rmids) {
         for (String s : rmids)
@@ -54,22 +51,28 @@ public class ConfigurationBuilder {
     public ConfigurationBuilder add(ContextBuilder cb) {
         Context cx = cb.build();
         contexts.add(cx);
-        for (ModuleId mid : cx.modules())
-            contextForModule.put(mid.name(), cx);
+        for (ModuleId mid : cx.modules()) {
+            for (ModuleId id : cx.views(mid)) {
+                contextForModuleView.put(id.name(), cx);
+            }
+        }
         PathContext pcx = cb.buildPath();
         pathContexts.add(pcx);
-        for (ModuleId mid : pcx.modules())
-            pathContextForModule.put(mid.name(), pcx);
+        for (ModuleId mid : pcx.modules()) {
+            for (ModuleId id : pcx.views(mid)) {
+                pathContextForModuleView.put(id.name(), pcx);
+            }
+        }
         return this;
     }
 
     public Configuration<Context> build() {
-        return new Configuration<>(roots, contexts, contextForModule);
+        return new Configuration<>(roots, contexts, contextForModuleView);
     }
 
     public Configuration<PathContext> buildPath() {
         Configuration<PathContext> cf
-            = new Configuration<>(roots, pathContexts, pathContextForModule);
+            = new Configuration<>(roots, pathContexts, pathContextForModuleView);
         for (PathContext pcx : pathContexts)
             ((ContextBuilder.MockPathContext)pcx).linkRemoteContexts(cf);
         return cf;
diff --git a/jdk/test/org/openjdk/jigsaw/ContextBuilder.java b/jdk/test/org/openjdk/jigsaw/ContextBuilder.java
index 618d84a..b47d9ec 100644
--- a/jdk/test/org/openjdk/jigsaw/ContextBuilder.java
+++ b/jdk/test/org/openjdk/jigsaw/ContextBuilder.java
@@ -35,16 +35,19 @@ public class ContextBuilder {
     private static class MockContext extends Context {
         private Map<String,ModuleId> moduleForName
             = new HashMap<String,ModuleId>();
-        public void add(ModuleId mid) {
-            super.add(mid);
+        void add(ModuleId mid) {
             moduleForName.put(mid.name(), mid);
         }
+        public void add(ModuleId mid, Set<ModuleId> views) {
+            super.add(mid, views);
+        }
         public void putModuleForLocalClass(String cn, String mn) {
             super.putModuleForLocalClass(cn, moduleForName.get(mn));
         }
         public void putContextForRemotePackage(String pn, String cxn) {
             super.putContextForRemotePackage(pn, cxn);
         }
+
     }
 
     private MockContext cx = new MockContext();
@@ -52,10 +55,12 @@ public class ContextBuilder {
     static class MockPathContext extends PathContext {
         private Map<String,ModuleId> moduleForName
             = new HashMap<String,ModuleId>();
-        public void add(ModuleId mid) {
-            super.add(mid);
+        void add(ModuleId mid) {
             moduleForName.put(mid.name(), mid);
         }
+        public void add(ModuleId mid, Set<ModuleId> views) {
+            super.add(mid, views);
+        }
         private void extend(List<ModuleId> pl, ModuleId mid) {
             if (pl.size() == 0 || !pl.get(pl.size() - 1).equals(mid))
                 pl.add(mid);
@@ -73,11 +78,18 @@ public class ContextBuilder {
 
     private MockPathContext pcx = new MockPathContext();
 
+    private Map<ModuleId,Set<ModuleId>> modules = new HashMap<>();
     private ContextBuilder(String[] mids) {
         for (String s : mids) {
             ModuleId mid = jms.parseModuleId(s);
-            if (cx.modules().contains(mid))
+            if (modules.containsKey(mid)) {
                 throw new IllegalArgumentException(mid + ": Duplicate");
+            }
+            
+            Set<ModuleId> views = new HashSet<>();
+            views.add(mid);
+            modules.put(mid, views);
+
             cx.add(mid);
             pcx.add(mid);
             pcx.extendLocalPath(mid);
@@ -88,6 +100,19 @@ public class ContextBuilder {
         return new ContextBuilder(mids);
     }
 
+    public ContextBuilder views(String m, String... vns) {
+        ModuleId mid = jms.parseModuleId(m);
+        if (!modules.containsKey(mid)) {
+            throw new IllegalArgumentException(mid + ": not in this context");
+        }
+            
+        Set<ModuleId> views = modules.get(mid);
+        for (String name : vns) {
+            views.add(new ModuleId(name, mid.version()));
+        }
+        return this;
+    }
+    
     public ContextBuilder localClass(String cn, String mn) {
         cx.putModuleForLocalClass(cn, mn);
         return this;
@@ -106,13 +131,19 @@ public class ContextBuilder {
         }
         return this;
     }
-
+    
     public Context build() {
+        for (Map.Entry<ModuleId,Set<ModuleId>> e : modules.entrySet()) {
+            cx.add(e.getKey(), e.getValue());
+        }
         cx.freeze();
         return cx;
     }
 
     public PathContext buildPath() {
+        for (Map.Entry<ModuleId,Set<ModuleId>> e : modules.entrySet()) {
+            pcx.add(e.getKey(), e.getValue());
+        }
         pcx.freeze();
         return pcx;
     }
diff --git a/jdk/test/org/openjdk/jigsaw/MockLibrary.java b/jdk/test/org/openjdk/jigsaw/MockLibrary.java
index 5a82e8b..46d906e 100644
--- a/jdk/test/org/openjdk/jigsaw/MockLibrary.java
+++ b/jdk/test/org/openjdk/jigsaw/MockLibrary.java
@@ -30,9 +30,6 @@ import java.lang.module.*;
 import java.security.CodeSigner;
 import org.openjdk.jigsaw.*;
 
-import static java.lang.module.Dependence.Modifier;
-
-
 class MockLibrary
     extends Library
 {
@@ -48,13 +45,16 @@ class MockLibrary
         = new HashMap<ModuleId,ModuleInfo>();
 
     MockLibrary add(ModuleInfo mi) {
-        infoForId.put(mi.id(), mi);
-        List<ModuleId> ls = idsForName.get(mi.id().name());
-        if (ls == null) {
-            ls = new ArrayList<ModuleId>();
-            idsForName.put(mi.id().name(), ls);
+        for (ModuleView mv : mi.views()) {
+            String name = mv.id().name();
+            infoForId.put(mv.id(), mi);
+            List<ModuleId> ls = idsForName.get(name);
+            if (ls == null) {
+                ls = new ArrayList<ModuleId>();
+                idsForName.put(name, ls);
+            }
+            ls.add(mv.id());
         }
-        ls.add(mi.id());
         return this;
     }
 
@@ -62,6 +62,10 @@ class MockLibrary
         return add(mib.build());
     }
 
+    MockLibrary add(ModuleInfoBuilder.ModuleViewBuilder mvb) {
+        return add(mvb.mib);
+    }
+    
     private Map<ModuleId,List<String>> publicClassesForId
         = new HashMap<ModuleId,List<String>>();
 
diff --git a/jdk/test/org/openjdk/jigsaw/ModuleInfoBuilder.java b/jdk/test/org/openjdk/jigsaw/ModuleInfoBuilder.java
index b805cf8..78aa2d0 100644
--- a/jdk/test/org/openjdk/jigsaw/ModuleInfoBuilder.java
+++ b/jdk/test/org/openjdk/jigsaw/ModuleInfoBuilder.java
@@ -25,7 +25,6 @@
 
 import java.util.*;
 import java.lang.module.*;
-import java.lang.annotation.Annotation;
 import org.openjdk.jigsaw.*;
 
 import static java.lang.module.Dependence.Modifier;
@@ -39,48 +38,70 @@ public class ModuleInfoBuilder {
         implements ModuleInfo
     {
 
-        private ModuleId mid;
+        private final ModuleId mid;
         public ModuleId id() { return mid; }
 
         private MI(ModuleId mid) {
             this.mid = mid;
         }
-
-        private Set<ModuleId> provides = new HashSet<ModuleId>();
-        public Set<ModuleId> provides() { return provides; }
-
-        private Set<Dependence> requires
+       
+        private Set<ViewDependence> requires
             // We use a linked hash set so as to guarantee deterministic order
-            = new LinkedHashSet<Dependence>();
-        public Set<Dependence> requires() { return requires; }
-
-        private Set<String> permits = new HashSet<String>();
-        public Set<String> permits() { return permits; }
-
-        private String mainClass;
-        public String mainClass() { return mainClass; }
-
-        public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
-            return false;
+            = new LinkedHashSet<>();
+        public Set<ViewDependence> requiresModules() { return requires; }
+                
+        private Set<ServiceDependence> requiredServices = new LinkedHashSet<>();
+        public Set<ServiceDependence> requiresServices() {
+            return Collections.unmodifiableSet(requiredServices);
         }
-
-        public <A extends Annotation> A getAnnotation(Class<A> annotationType) {
-            return null;
+        
+        Map<String, ModuleViewBuilder> viewBuilders = new HashMap<>();
+        
+        ModuleView defaultView;
+        Set<ModuleView> moduleViews;
+        public ModuleView defaultView() {
+            return defaultView;
+        }
+        
+        public Set<ModuleView> views() {
+            return moduleViews;
+        }
+        
+        ModuleInfo build() {
+            moduleViews = new HashSet<>();
+            for (ModuleViewBuilder mvb : viewBuilders.values()) {
+                ModuleView mv = mvb.build(this);
+                moduleViews.add(mv);
+                if (mv.id().equals(mid)) {
+                    defaultView = mv;
+                }
+            }
+            return this;
         }
 
         public String toString() { return mid.toString(); }
     }
 
-    private MI mi;
+    private final MI mi;
+    private final ModuleViewBuilder defaultView;
 
     private ModuleInfoBuilder(String id) {
         mi = new MI(jms.parseModuleId(id));
+        this.defaultView =  new ModuleViewBuilder(this, mi.mid);
+        mi.viewBuilders.put(mi.mid.name(), defaultView);
     }
 
     public static ModuleInfoBuilder module(String id) {
         return new ModuleInfoBuilder(id);
     }
 
+    public ModuleViewBuilder view(String name) {
+         ModuleId id = new ModuleId(name, mi.mid.version());
+         ModuleViewBuilder mvb = new ModuleViewBuilder(this, id);
+         mi.viewBuilders.put(id.name(), mvb);
+         return mvb;
+    }
+    
     public ModuleInfoBuilder requires(EnumSet<Modifier> mods, String mnvq) {
         int i = mnvq.indexOf('@');
         String mn;
@@ -91,8 +112,8 @@ public class ModuleInfoBuilder {
             mn = mnvq.substring(0, i);
             vq = jms.parseVersionQuery(mnvq.substring(i + 1));
         }
-        mi.requires.add(new Dependence(mods,
-                                       new ModuleIdQuery(mn, vq)));
+        mi.requires.add(new ViewDependence(mods,
+                                           new ModuleIdQuery(mn, vq)));
         return this;
     }
 
@@ -111,26 +132,151 @@ public class ModuleInfoBuilder {
     public ModuleInfoBuilder requiresPublic(String mnvq) {
         return requires(EnumSet.of(Modifier.PUBLIC), mnvq);
     }
-
-    public ModuleInfoBuilder provides(String mnv) {
-        mi.provides.add(jms.parseModuleId(mnv));
+   
+    public ModuleInfoBuilder aliases(String mnv) {
+        defaultView.aliases(mnv);
         return this;
     }
 
+    public ModuleInfoBuilder exports(String pn) {
+        defaultView.exports(pn);
+        return this;
+    }
+    
     public ModuleInfoBuilder permits(String s) {
-        if (s.indexOf('@') >= 0)
-            throw new IllegalArgumentException(s);
-        mi.permits.add(s);
+        defaultView.permits(s);
         return this;
     }
 
     public ModuleInfoBuilder mainClass(String cn) {
-        mi.mainClass = cn;
+        defaultView.mainClass = cn;
         return this;
     }
-
+    
     public ModuleInfo build() {
-        return mi;
+        return mi.build();
     }
 
+    class ModuleViewBuilder {
+        final ModuleInfoBuilder mib;
+        final ModuleId id;
+        final Set<String> exports = new HashSet<>();
+        final Set<ModuleId> aliases = new HashSet<>();
+        final Set<String> permits = new HashSet<>();
+        final Map<String,Set<String>> services = new HashMap<>();
+        String mainClass;
+        
+        private ModuleViewBuilder(ModuleInfoBuilder mib, ModuleId id) {
+            this.mib = mib;
+            this.id = id;
+        }
+        
+        public ModuleViewBuilder view(String name) {
+            Version version = mib.mi.mid.version();
+            ModuleId id = new ModuleId(name, version);
+            ModuleViewBuilder mvb = new ModuleViewBuilder(mib, id);
+            mib.mi.viewBuilders.put(id.name(), mvb);
+            return mvb;
+        }
+        
+        public ModuleViewBuilder aliases(String mnv) {
+            aliases.add(jms.parseModuleId(mnv));
+            return this;
+        }
+
+        public ModuleViewBuilder exports(String pn) {
+            exports.add(pn);
+            return this;
+        }
+
+        public ModuleViewBuilder permits(String s) {
+            if (s.indexOf('@') >= 0) {
+                throw new IllegalArgumentException(s);
+            }
+            permits.add(s);
+            return this;
+        }
+
+        public ModuleViewBuilder mainClass(String cn) {
+            mainClass = cn;
+            return this;
+        }
+        
+        ModuleView build(ModuleInfo mi) {
+            return new ModuleViewImpl(mi,
+                                      id,
+                                      mainClass,
+                                      aliases,
+                                      exports,
+                                      permits,
+                                      services);
+        }
+    }
+    
+    class ModuleViewImpl
+        implements ModuleView
+    {
+        private final ModuleInfo mi;
+        private final ModuleId id;
+        private final Set<String> exports;
+        private final Set<ModuleId> aliases;
+        private final Map<String,Set<String>> services;
+        private final Set<String> permits;
+        private final String mainClass;
+
+        ModuleViewImpl(ModuleInfo mi,
+                       ModuleId id,
+                       String mainClass,
+                       Set<ModuleId> aliases,
+                       Set<String> exports,
+                       Set<String> permits,
+                       Map<String,Set<String>> serviceProviders) {
+            this.mi = mi;
+            this.id = id;
+            this.mainClass = mainClass;
+            this.aliases = aliases;
+            this.exports = exports;
+            this.permits = permits;
+            this.services = serviceProviders;
+        }
+
+        public ModuleInfo moduleInfo() {
+            return mi;
+        }
+
+        public ModuleId id() {
+            return id;
+        }
+
+        public Set<ModuleId> aliases() {
+            return Collections.unmodifiableSet(aliases);
+        }
+
+        public Set<String> exports() {
+            return Collections.unmodifiableSet(exports);
+        }
+        
+        public Set<String> permits() {
+            return Collections.unmodifiableSet(permits);
+        }
+
+        public Map<String,Set<String>> services() {
+            return Collections.unmodifiableMap(services);
+        }
+
+        public String mainClass() {
+            return mainClass;
+        }
+
+        @Override
+        public String toString() {
+            return "view " + id.name() + " {"
+                    + ", provides: " + aliases
+                    + ", provides service: " + services
+                    + ", permits: " + permits
+                    + ", mainClass: " + mainClass
+                    + " }";
+        }
+    }
+ 
 }
diff --git a/jdk/test/org/openjdk/jigsaw/_Configurator.java b/jdk/test/org/openjdk/jigsaw/_Configurator.java
index 9044f7e..23c20be 100644
--- a/jdk/test/org/openjdk/jigsaw/_Configurator.java
+++ b/jdk/test/org/openjdk/jigsaw/_Configurator.java
@@ -258,7 +258,7 @@ public class _Configurator {
         new Test("simple", true, "x at 1") {
             void init(MockLibrary mlib) {
                 mlib.add(module("x at 1").requiresPublic("y at 1"))
-                    .add(module("y at 1"))
+                    .add(module("y at 1").exports("y"))
                     .addPublic("x at 1", "x.A")
                     .addOther("x at 1", "x.B")
                     .addPublic("y at 1", "y.C")
@@ -276,11 +276,11 @@ public class _Configurator {
 
         new Test("publicity", true, "x at 1") {
             void init(MockLibrary mlib) {
-                mlib.add(module("x at 1").requires("y at 1").requires("v at 1"))
-                    .add(module("y at 1").requiresPublic("z at 1").requires("w at 1"))
-                    .add(module("z at 1"))
-                    .add(module("w at 1"))
-                    .add(module("v at 1"))
+                mlib.add(module("x at 1").requires("y at 1").requires("v at 1").exports("x"))
+                    .add(module("y at 1").requiresPublic("z at 1").requires("w at 1").exports("y"))
+                    .add(module("z at 1").exports("z"))
+                    .add(module("w at 1").exports("w"))
+                    .add(module("v at 1").exports("v"))
                     .addPublic("x at 1", "x.P")
                     .addOther("x at 1", "x.O")
                     .addPublic("y at 1", "y.P")
@@ -314,8 +314,8 @@ public class _Configurator {
         new Test("dup", false, "x at 1") {
             void init(MockLibrary mlib) {
                 mlib.add(module("x at 1").requires("y at 1").requires("z at 1"))
-                    .add(module("y at 1"))
-                    .add(module("z at 1"))
+                    .add(module("y at 1").exports("a"))
+                    .add(module("z at 1").exports("a"))
                     .addPublic("y at 1", "a.B")
                     .addPublic("z at 1", "a.B");
             }
@@ -396,7 +396,92 @@ public class _Configurator {
                          .localClass("p.R", "lr"));
             }
         };
+        
+        new Test("simple-view", true, "x at 1") {
+            void init(MockLibrary mlib) {
+                mlib.add(module("x at 1").requiresPublic("yv at 1"))
+                    .add(module("y at 1").view("yv").exports("y"))
+                    .addPublic("x at 1", "x.A")
+                    .addOther("x at 1", "x.B")
+                    .addPublic("y at 1", "y.C")
+                    .addOther("y at 1", "y.D");
+            }
+            void ref(ConfigurationBuilder cfbd) {
+                cfbd.add(context("x at 1")
+                         .remote("+y")
+                         .localClass("x.A", "x").localClass("x.B", "x")
+                         .remotePackage("y", "+y"))
+                    .add(context("y at 1").views("y at 1", "yv")
+                         .localClass("y.D", "y").localClass("y.C", "y"));
+            }
+        };
+        
+        new Test("view-reexports", true, "x at 1") {
+            void init(MockLibrary mlib) {
+                mlib.add(module("x at 1").requires("yv at 1"))
+                    .add(module("y at 1").requiresPublic("zv at 1").requires("z at 1")
+                         .view("yv").exports("y"))
+                    .add(module("z at 1").view("zv").exports("z"))
+                    .addPublic("x at 1", "x.A")
+                    .addOther("x at 1", "x.B")
+                    .addPublic("y at 1", "y.C")
+                    .addOther("y at 1", "y.D")
+                    .addPublic("z at 1", "z.E")
+                    .addOther("z at 1", "z.F");
+            }
+            void ref(ConfigurationBuilder cfbd) {
+                cfbd.add(context("x at 1")
+                         .remote("+y", "+z")
+                         .localClass("x.A", "x").localClass("x.B", "x")
+                         .remotePackage("y", "+y")
+                         .remotePackage("z", "+z"))
+                    .add(context("y at 1").views("y at 1", "yv")
+                         .remote("+z")
+                         .localClass("y.D", "y").localClass("y.C", "y")
+                         .remotePackage("z", "+z"))
+                    .add(context("z at 1").views("z at 1", "zv")
+                         .localClass("z.E", "z").localClass("z.F", "z"));
+            }
+        };
 
+  
+        new Test("view-permits", true, "x at 1", "y at 1", "lc at 1") {
+            void init(MockLibrary mlib) {
+                mlib.add(module("ll at 1").requiresLocal("lr at 1")
+                         .permits("lc").permits("x").exports("l"))
+                    .add(module("lc at 1").requiresLocal("ll at 1")
+                         .requires("r at 1").exports("c"))
+                    .add(module("r at 1").exports("r")
+                         .view("lr").permits("ll").permits("y").exports("r.v"))
+                    .add(module("x at 1").requires("ll at 1").requires("r at 1"))
+                    .add(module("y at 1").requires("lr at 1").requires("r at 1"))
+                    .addPublic("x at 1",  "x.X")
+                    .addOther("y at 1",  "y.Y")
+                    .addPublic("ll at 1", "l.L")
+                    .addPublic("lc at 1", "c.C")
+                    .addPublic("r at 1",  "r.R")
+                    .addPublic("r at 1",  "r.v.V");
+            }
+            void ref(ConfigurationBuilder cfbd) {
+                cfbd.add(context("x at 1")
+                         .remote("+lc+ll+r")
+                         .localClass("x.X", "x")
+                         .remotePackage("l", "+lc+ll+r")
+                         .remotePackage("r", "+lc+ll+r"))
+                    .add(context("y at 1")
+                         .remote("+lc+ll+r")
+                         .localClass("y.Y", "y")
+                         .remotePackage("r", "+lc+ll+r")
+                         .remotePackage("r.v", "+lc+ll+r"))
+                    .add(context("lc at 1", "ll at 1", "r at 1")
+                         .views("r at 1", "lr")
+                         .localClass("l.L", "ll")
+                         .localClass("c.C", "lc")
+                         .localClass("r.R", "r")
+                         .localClass("r.v.V", "r"));               
+            }
+        };
+        
         /* ## Not yet
 
         new Test("cycle", true, "x at 1") {
diff --git a/jdk/test/org/openjdk/jigsaw/_Library.java b/jdk/test/org/openjdk/jigsaw/_Library.java
index 78f9d9d..1cf2674 100644
--- a/jdk/test/org/openjdk/jigsaw/_Library.java
+++ b/jdk/test/org/openjdk/jigsaw/_Library.java
@@ -105,8 +105,9 @@ public class _Library {
         eq(mids, emids);
 
         // Find module ids by query
-        mids = new HashSet<ModuleId>(lib.findModuleIds(new ModuleIdQuery("org.multi",
-                                                                         ms.parseVersionQuery(">1.1"))));
+        mids = new HashSet<ModuleId>(
+                       lib.findModuleIds(new ModuleIdQuery("org.multi",
+                                         ms.parseVersionQuery(">1.1"))));
         out.format("query: %s%n", mids);
         emids = new HashSet<ModuleId>();
         for (String v : multiVersions) {
diff --git a/jdk/test/org/openjdk/jigsaw/_RemoteRepository.java b/jdk/test/org/openjdk/jigsaw/_RemoteRepository.java
index 65df94d..5b28ed3 100644
--- a/jdk/test/org/openjdk/jigsaw/_RemoteRepository.java
+++ b/jdk/test/org/openjdk/jigsaw/_RemoteRepository.java
@@ -29,14 +29,9 @@ import java.io.*;
 import java.util.*;
 import java.lang.module.*;
 import java.net.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.nio.file.*;
 import org.openjdk.jigsaw.*;
 
 import static java.lang.System.out;
-import static java.nio.file.StandardOpenOption.*;
-
 
 public class _RemoteRepository {
 
@@ -51,15 +46,23 @@ public class _RemoteRepository {
     }
 
     private static boolean equals(ModuleInfo mi1, ModuleInfo mi2) {
+        // ## TODO multiple views
         return (mi1.id().equals(mi2.id())
-                && mi1.provides().equals(mi2.provides())
-                && mi1.requires().equals(mi2.requires())
-                && mi1.permits().equals(mi2.permits())
-                && ((mi1.mainClass() == mi2.mainClass())
-                    || (mi1.mainClass() != null
-                        && mi1.mainClass().equals(mi2.mainClass()))));
+                && mi1.requiresModules().equals(mi2.requiresModules())
+                && mi1.requiresServices().equals(mi2.requiresServices())
+                && equals(mi1.defaultView(), mi2.defaultView()));
     }
 
+    private static boolean equals(ModuleView mv1, ModuleView mv2) {
+        return (mv1.id().equals(mv2.id())
+                && mv1.aliases().equals(mv2.aliases())
+                && mv1.services().equals(mv2.services())
+                && mv1.permits().equals(mv2.permits())
+                && ((mv1.mainClass() == mv2.mainClass())
+                    || (mv1.mainClass() != null
+                        && mv1.mainClass().equals(mv2.mainClass()))));
+    }
+    
     static final File REM_REPO = new File("z.remote");
 
     static Set<ModuleId> mids = null;
diff --git a/jdk/test/org/openjdk/jigsaw/_RemoteRepositoryList.java b/jdk/test/org/openjdk/jigsaw/_RemoteRepositoryList.java
index c262237..4067831 100644
--- a/jdk/test/org/openjdk/jigsaw/_RemoteRepositoryList.java
+++ b/jdk/test/org/openjdk/jigsaw/_RemoteRepositoryList.java
@@ -29,15 +29,11 @@ import java.io.*;
 import java.util.*;
 import java.lang.module.*;
 import java.net.*;
-import java.nio.*;
-import java.nio.channels.*;
 import java.nio.file.*;
 import org.openjdk.jigsaw.*;
 import org.openjdk.jigsaw.SimpleLibrary.StorageOption;
 
 import static java.lang.System.out;
-import static java.nio.file.StandardOpenOption.*;
-
 
 public class _RemoteRepositoryList {
 
@@ -62,13 +58,21 @@ public class _RemoteRepositoryList {
     }
 
     private static boolean equals(ModuleInfo mi1, ModuleInfo mi2) {
+        // ## TODO multiple views
         return (mi1.id().equals(mi2.id())
-                && mi1.provides().equals(mi2.provides())
-                && mi1.requires().equals(mi2.requires())
-                && mi1.permits().equals(mi2.permits())
-                && ((mi1.mainClass() == mi2.mainClass())
-                    || (mi1.mainClass() != null
-                        && mi1.mainClass().equals(mi2.mainClass()))));
+                && mi1.requiresModules().equals(mi2.requiresModules())
+                && mi1.requiresServices().equals(mi2.requiresServices())
+                && equals(mi1.defaultView(), mi2.defaultView()));
+    }
+
+    private static boolean equals(ModuleView mv1, ModuleView mv2) {
+        return (mv1.id().equals(mv2.id())
+                && mv1.aliases().equals(mv2.aliases())
+                && mv1.services().equals(mv2.services())
+                && mv1.permits().equals(mv2.permits())
+                && ((mv1.mainClass() == mv2.mainClass())
+                    || (mv1.mainClass() != null
+                        && mv1.mainClass().equals(mv2.mainClass()))));
     }
 
     static final File REM_REPO = new File("z.remote");
diff --git a/jdk/test/org/openjdk/jigsaw/_RepositoryCatalog.java b/jdk/test/org/openjdk/jigsaw/_RepositoryCatalog.java
index 69ad174..f0e88b1 100644
--- a/jdk/test/org/openjdk/jigsaw/_RepositoryCatalog.java
+++ b/jdk/test/org/openjdk/jigsaw/_RepositoryCatalog.java
@@ -90,7 +90,7 @@ public class _RepositoryCatalog {
             in.close();
         }
         Set<ModuleId> mids = new HashSet<>();
-        rc.gatherModuleIds(null, mids);
+        rc.gatherModuleIds(mids);
         assert eq(mids, modules.keySet());
         for (ModuleId mid : mids) {
             assert Arrays.equals(rc.readModuleInfoBytes(mid),
diff --git a/jdk/test/org/openjdk/jigsaw/circular-deps.sh b/jdk/test/org/openjdk/jigsaw/circular-deps.sh
index 5f5d944..ed1d8a3 100644
--- a/jdk/test/org/openjdk/jigsaw/circular-deps.sh
+++ b/jdk/test/org/openjdk/jigsaw/circular-deps.sh
@@ -43,6 +43,7 @@ rm -rf z.*
 mk z.src/org.gee/module-info.java <<EOF
 module org.gee @ 1 {
     requires net.baz.aar;
+    exports org.gee.spi.*;
 }
 EOF
 
@@ -65,6 +66,7 @@ EOF
 mk z.src/net.baz.aar/module-info.java <<EOF
 module net.baz.aar @ 2 {
     requires org.gee;
+    exports net.baz.aar.*;
     class net.baz.aar.Ness;
 }
 EOF
diff --git a/jdk/test/org/openjdk/jigsaw/cli/jmod-basic.sh b/jdk/test/org/openjdk/jigsaw/cli/jmod-basic.sh
index 7e0631e..cfc42bb 100644
--- a/jdk/test/org/openjdk/jigsaw/cli/jmod-basic.sh
+++ b/jdk/test/org/openjdk/jigsaw/cli/jmod-basic.sh
@@ -39,10 +39,11 @@ mk() {
 rm -rf z.src
 
 mk z.src/com.foo.bar/module-info.java <<EOF
-module com.foo.bar @ 1.2.3_01-4a
-    provides baz @ 2.0, biz @ 3.4a
-{
-    permits com.foo.top, com.foo.bottom;
+module com.foo.bar @ 1.2.3_01-4a {
+    provides baz @ 2.0;
+    provides biz @ 3.4a;
+    permits com.foo.top;
+    permits com.foo.bottom;
     class com.foo.bar.Main;
 }
 EOF
diff --git a/jdk/test/org/openjdk/jigsaw/cli/signed-modular-jar.sh b/jdk/test/org/openjdk/jigsaw/cli/signed-modular-jar.sh
index 5215eaa..5b12cd2 100755
--- a/jdk/test/org/openjdk/jigsaw/cli/signed-modular-jar.sh
+++ b/jdk/test/org/openjdk/jigsaw/cli/signed-modular-jar.sh
@@ -45,7 +45,7 @@ $BIN/keytool -import -keystore keystore.jks -file ${TESTSRC}/ca-cert.pem \
              -noprompt -storepass test123 -alias ca 
 
 # Import the signer's private key and cert
-$BIN/javac -source 7 -d  . ${TESTSRC}/ImportPrivateKey.java
+$BIN/javac -source 8 -d  . ${TESTSRC}/ImportPrivateKey.java
 $BIN/java -Dtest.src=${TESTSRC} ImportPrivateKey signer signer-prikey.pem \
           RSA signer-cert.pem
 
diff --git a/jdk/test/org/openjdk/jigsaw/hello-jar.sh b/jdk/test/org/openjdk/jigsaw/hello-jar.sh
index 2162e34..5ad047d 100644
--- a/jdk/test/org/openjdk/jigsaw/hello-jar.sh
+++ b/jdk/test/org/openjdk/jigsaw/hello-jar.sh
@@ -56,7 +56,9 @@ public class Hello {
 EOF
 
 mk z.src/org.astro/module-info.java <<EOF
-module org.astro @ 1.2 { }
+module org.astro @ 1.2 {
+    exports org.astro.*;
+}
 EOF
 
 mk z.src/org.astro/org/astro/World.java <<EOF
@@ -92,13 +94,12 @@ public class Test {
         ModuleInfo mi = jf.getModuleInfo();
         if (mi == null)
             throw new RuntimeException("null ModuleInfo in " + jfname);
-        if (!mi.mainClass().equals("com.greetings.Hello")) {
+        if (!mi.defaultView().mainClass().equals("com.greetings.Hello")) {
             throw new RuntimeException("Unexpected main class " + mi);
         }
-        if (mi.requires().size() != 3)
+        if (mi.requiresModules().size() != 3)
             throw new RuntimeException("requires.length != 3");
-        Dependence[] ds = mi.requires().toArray(new Dependence[0]);
-        for (Dependence d : mi.requires()) {
+        for (ViewDependence d : mi.requiresModules()) {
             String n = d.query().name();
             if (n.startsWith("jdk")) continue;
             if (!n.equals("org.astro") && !n.equals("test"))
diff --git a/jdk/test/org/openjdk/jigsaw/hello-native.sh b/jdk/test/org/openjdk/jigsaw/hello-native.sh
index cf97b28..95f4568 100644
--- a/jdk/test/org/openjdk/jigsaw/hello-native.sh
+++ b/jdk/test/org/openjdk/jigsaw/hello-native.sh
@@ -110,7 +110,9 @@ public class Hello {
     }
 }
 
-module org.astro @ 1.2 { }
+module org.astro @ 1.2 {
+    exports org.astro.*;
+}
 
 package org.astro;
 public class World {
diff --git a/jdk/test/org/openjdk/jigsaw/hello-optional.sh b/jdk/test/org/openjdk/jigsaw/hello-optional.sh
index fdbb045..3ff05f4 100644
--- a/jdk/test/org/openjdk/jigsaw/hello-optional.sh
+++ b/jdk/test/org/openjdk/jigsaw/hello-optional.sh
@@ -51,7 +51,9 @@ public class Hello {
     }
 }
 
-module org.astro @ 1.2 { }
+module org.astro @ 1.2 {
+    exports org.astro.*;
+}
 
 package org.astro;
 public class World {
@@ -60,7 +62,9 @@ public class World {
     }
 }
 
-module com.foo @ 2.0 { }
+module com.foo @ 2.0 {
+    exports com.foo.*;
+}
 
 package com.foo;
 public class Foo {
@@ -104,7 +108,9 @@ public class Hello {
     }
 }
 
-module org.astro @ 1.2 { }
+module org.astro @ 1.2 {
+    exports org.astro.*;
+}
 
 package org.astro;
 import java.lang.reflect.Module;
@@ -134,6 +140,7 @@ public class Hello {
 
 module org.astro @ 2.0 {
     requires optional com.foo;
+    exports org.astro.*;
 }
 
 package org.astro;
@@ -146,7 +153,9 @@ public class World {
     }
 }
 
-module com.foo @ 2.0 { }
+module com.foo @ 2.0 {
+    exports com.foo.*;
+}
 
 package com.foo;
 public class Foo {
diff --git a/jdk/test/org/openjdk/jigsaw/hello-view.sh b/jdk/test/org/openjdk/jigsaw/hello-view.sh
new file mode 100644
index 0000000..d800484
--- /dev/null
+++ b/jdk/test/org/openjdk/jigsaw/hello-view.sh
@@ -0,0 +1,158 @@
+#! /bin/sh
+
+# Copyright (c) 2009, 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.
+
+# @test
+# @summary Hello
+
+exec sh ${TESTSRC:-.}/tester.sh $0
+
+: hello-view pass
+
+module com.greetings @ 0.1 {
+    requires org.astro.internal @ 1.2;
+    class com.greetings.Hello;
+}
+
+package com.greetings;
+import org.astro.internal.World;
+public class Hello {
+    public static void main(String[] args) {
+        System.out.println("Hello, " + World.name() + "!");
+    }
+}
+
+module org.astro @ 1.2 {
+    exports org.astro.*;
+    view org.astro.internal {
+        exports org.astro.internal.*;
+        permits com.greetings;
+    }
+    view org.astro.main {
+        class org.astro.World;
+    }
+}
+
+package org.astro;
+public class World {
+    public static void main(String[] args) {
+        System.out.println("Welcome to this " + name());
+    }
+    public static String name() {
+	return "world";
+    }
+}
+
+package org.astro.internal;
+public class World {
+    public static String name() {
+	return "internal world";
+    }
+}
+
+: reexports-view pass
+
+module com.greetings @ 0.1 {
+    requires foo.internal @ 1;
+    class com.greetings.Hello;
+}
+
+package com.greetings;
+import org.astro.internal.World;
+public class Hello {
+    public static void main(String[] args) {
+        System.out.println("Hello, " + World.name() + "!");
+    }
+}
+
+module foo @ 1 {
+    requires public org.astro.internal @ 1.2;
+    requires org.astro @ 1.2;
+    view foo.internal {
+        permits com.greetings;
+    }
+}
+
+module org.astro @ 1.2 {
+    exports org.astro.*;
+    view org.astro.internal {
+        exports org.astro.internal.*;
+    }
+}
+
+package org.astro;
+public class World {
+    public static void main(String[] args) {
+        System.out.println("Welcome to this " + name());
+    }
+    public static String name() {
+	return "world";
+    }
+}
+
+package org.astro.internal;
+public class World {
+    public static String name() {
+	return "internal world";
+    }
+}
+
+: multi-views pass
+
+module foo @ 1 {
+    requires bar @ 1.2;
+    requires baz;
+    class foo.Main;
+}
+
+package foo;
+import bar.Bar;
+import baz.Baz;
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("foo, " + 
+             bar.Bar.name() + ", " +
+             baz.Baz.name()); 
+    }
+}
+
+module bar @ 1.2 {
+    exports bar.*;
+    view baz {
+        exports baz.*;
+    }
+}
+
+package bar;
+public class Bar {
+    public static String name() {
+	return "bar";
+    }
+}
+
+package baz;
+public class Baz {
+    public static String name() {
+	return "baz";
+    }
+}
+
diff --git a/jdk/test/org/openjdk/jigsaw/hello.sh b/jdk/test/org/openjdk/jigsaw/hello.sh
index 0529661..abad782 100644
--- a/jdk/test/org/openjdk/jigsaw/hello.sh
+++ b/jdk/test/org/openjdk/jigsaw/hello.sh
@@ -41,7 +41,9 @@ public class Hello {
     }
 }
 
-module org.astro @ 1.2 { }
+module org.astro @ 1.2 {
+    exports org.astro.*;
+}
 
 package org.astro;
 public class World {
diff --git a/jdk/test/org/openjdk/jigsaw/library.sh b/jdk/test/org/openjdk/jigsaw/library.sh
index aef604d..e749a58 100644
--- a/jdk/test/org/openjdk/jigsaw/library.sh
+++ b/jdk/test/org/openjdk/jigsaw/library.sh
@@ -42,9 +42,11 @@ rm -rf z.*
 
 mk z.src/com.foo.bar/module-info.java <<EOF
 module com.foo.bar @ 1.2.3_04-5a
-    provides com.foo.baz @ 2.0, com.foo.bez @ 3.4a-9
 {
-    permits com.foo.buz, com.oof.byz;
+    provides com.foo.baz @ 2.0;
+    provides com.foo.bez @ 3.4a-9;
+    permits com.foo.buz;
+    permits com.oof.byz;
     class com.foo.bar.Main;
 }
 EOF
@@ -69,13 +71,15 @@ mkdir z.modules z.classes
 
 $BIN/javac -source 8 -d z.classes $SRC/_Library.java
 
-$BIN/javac -source 7 -d z.modules -modulepath z.modules \
+$BIN/javac -source 8 -d z.modules -modulepath z.modules \
   `find z.src -name '*.java'`
 
 for v in 1 1.2 2 3; do
   m=org.multi@$v
   mk z.src.$m/org.multi/module-info.java <<EOF
-module org.multi @ $v { }
+module org.multi @ $v {
+  exports org.multi.*;
+}
 EOF
 mk z.src.$m/org.multi/org/multi/Tudinous.java <<EOF
 package org.multi;
@@ -83,7 +87,7 @@ public class Tudinous { }
 EOF
   md=z.modules.$m
   mkdir -p $md
-  $BIN/javac -source 7 -d $md -modulepath $md `find z.src.$m -name '*.java'`
+  $BIN/javac -source 8 -d $md -modulepath $md `find z.src.$m -name '*.java'`
 done
 
 mk z.src/net.baz.aar/module-info.java <<EOF
@@ -123,7 +127,7 @@ case "$OS" in
     ;;
 esac
 
-$BIN/javac -source 7 -d z.modules -modulepath z.modules${PS}z.modules.org.multi at 1 \
+$BIN/javac -source 8 -d z.modules -modulepath z.modules${PS}z.modules.org.multi at 1 \
    `find z.src/net.baz.aar -name '*.java'`
 
 $BIN/java -ea -cp z.classes _Library
diff --git a/jdk/test/org/openjdk/jigsaw/maze.sh b/jdk/test/org/openjdk/jigsaw/maze.sh
index cbc312f..e2edc7f 100644
--- a/jdk/test/org/openjdk/jigsaw/maze.sh
+++ b/jdk/test/org/openjdk/jigsaw/maze.sh
@@ -46,6 +46,7 @@ public class Are {
 
 module in @ 1 {
     requires public maze @ 1;
+    exports in.*;
 }
 
 package in;
@@ -55,6 +56,7 @@ public class A {
 
 module maze @ 1 {
     requires public twisty @ 1;
+    exports maze.*;
 }
 
 package maze;
@@ -70,6 +72,7 @@ public class Alike {
 module twisty @ 1 {
     requires local passages @ 1;
     requires all @ 1;
+    exports twisty.*;
 }
 
 package twisty;
@@ -90,6 +93,7 @@ package twisty;
 
 module all @ 1 {
     requires in @ 1;
+    exports all.*;
 }
 
 package all;
diff --git a/jdk/test/org/openjdk/jigsaw/optional-base.sh b/jdk/test/org/openjdk/jigsaw/optional-base.sh
index 3e4126e..80acc9c 100644
--- a/jdk/test/org/openjdk/jigsaw/optional-base.sh
+++ b/jdk/test/org/openjdk/jigsaw/optional-base.sh
@@ -66,7 +66,9 @@ public class WorldWrapper {
     }
 }
 
-module org.astro @ 2.0 { }
+module org.astro @ 2.0 {
+    exports org.astro.*;
+}
 
 package org.astro;
 import java.lang.reflect.Module;
@@ -79,7 +81,9 @@ public class World {
     }
 }
 
-module com.foo @ 3.0 { }
+module com.foo @ 3.0 {
+    exports com.foo.*;
+}
 
 package com.foo;
 public class Foo {
diff --git a/jdk/test/org/openjdk/jigsaw/optional-deps.sh b/jdk/test/org/openjdk/jigsaw/optional-deps.sh
index 3563924..db335ec 100644
--- a/jdk/test/org/openjdk/jigsaw/optional-deps.sh
+++ b/jdk/test/org/openjdk/jigsaw/optional-deps.sh
@@ -44,6 +44,8 @@ mk z.src/org.foo/module-info.java <<EOF
 module org.foo @ 1 {
     requires jdk.base;
     requires optional net.bar;
+    exports org.foo.*;
+    exports org.foo.spi.*;
     class org.foo.Main;
 }
 EOF
@@ -96,7 +98,7 @@ mk z.src/org.foo/org/foo/DefaultImpl.java <<EOF
 package org.foo;
 import org.foo.spi.Service;
 
-public class DefaultImpl implements Service {
+class DefaultImpl implements Service {
     public DefaultImpl() {};
 }
 EOF
@@ -105,6 +107,7 @@ mk z.src/net.bar/module-info.java <<EOF
 module net.bar @ 2 {
     requires jdk.base;
     requires org.foo;
+    exports net.bar.*;
     class net.bar.Ness;
 }
 EOF
diff --git a/jdk/test/org/openjdk/jigsaw/optional-jaxp.sh b/jdk/test/org/openjdk/jigsaw/optional-jaxp.sh
index 399f5cf..05bf01b 100644
--- a/jdk/test/org/openjdk/jigsaw/optional-jaxp.sh
+++ b/jdk/test/org/openjdk/jigsaw/optional-jaxp.sh
@@ -43,7 +43,9 @@ public class Hello {
     }
 }
 
-module org.astro @ 2.0 { }
+module org.astro @ 2.0 {
+    exports org.astro.*;
+}
 
 package org.astro;
 import java.io.*;
diff --git a/jdk/test/org/openjdk/jigsaw/optional-reexport.sh b/jdk/test/org/openjdk/jigsaw/optional-reexport.sh
index 0b1b266..ad4ccf3 100644
--- a/jdk/test/org/openjdk/jigsaw/optional-reexport.sh
+++ b/jdk/test/org/openjdk/jigsaw/optional-reexport.sh
@@ -65,7 +65,9 @@ public class WorldWrapper {
     }
 }
 
-module org.astro @ 2.0 { }
+module org.astro @ 2.0 {
+    exports org.astro.*;
+}
 
 package org.astro;
 import java.lang.reflect.Module;
@@ -79,7 +81,9 @@ public class World {
     }
 }
 
-module com.foo @ 3.0 {}
+module com.foo @ 3.0 {
+    exports com.foo.*;
+}
 
 package com.foo;
 import java.lang.reflect.*;
@@ -91,4 +95,5 @@ public class Foo {
 
 module com.foobar @ 1.0 {
     requires public com.foo @ 3.0;
+    exports com.foobar.*;
 }
diff --git a/jdk/test/org/openjdk/jigsaw/preinstall.sh b/jdk/test/org/openjdk/jigsaw/preinstall.sh
index eaaf825..9f02c69 100644
--- a/jdk/test/org/openjdk/jigsaw/preinstall.sh
+++ b/jdk/test/org/openjdk/jigsaw/preinstall.sh
@@ -76,7 +76,9 @@ public class X {
     }
 }
 
-module y @ 1 { }
+module y @ 1 {
+    exports y.*;
+}
 
 package y;
 public class Y {
diff --git a/jdk/test/org/openjdk/jigsaw/resolver.sh b/jdk/test/org/openjdk/jigsaw/resolver.sh
index 0a79165..1574163 100644
--- a/jdk/test/org/openjdk/jigsaw/resolver.sh
+++ b/jdk/test/org/openjdk/jigsaw/resolver.sh
@@ -28,8 +28,8 @@ exec sh ${TESTSRC:-.}/tester.sh $0
 : trivial pass
 
 module x @ 1 {
-  requires y @ 1;
-  class x.X;
+    requires y @ 1;
+    class x.X;
 }
 
 package x;
@@ -39,7 +39,9 @@ public class X {
     }
 }
 
-module y @ 1 { }
+module y @ 1 {
+    exports y.*;
+}
 
 package y;
 public class Y {
@@ -49,14 +51,16 @@ public class Y {
 : trivial2 fail compile
 
 module x @ 1 {
-  requires y @ 1;
-  class x.X;
+    requires y @ 1;
+    class x.X;
 }
 
 package x;
 public class X { }
 
-module y @ 2 { }
+module y @ 2 {
+    exports y.*;
+}
 
 package y;
 public class Y { }
@@ -64,8 +68,8 @@ public class Y { }
 : package-private fail invoke
 
 module x @ 1 {
-  requires y @ 1;
-  class x.X;
+    requires y @ 1;
+    class x.X;
 }
 
 package x;
@@ -75,7 +79,9 @@ public class X {
     }
 }
 
-module y @ 1 { }
+module y @ 1 {
+    exports y.*;
+}
 
 package y;
 class Y { }
diff --git a/jdk/test/org/openjdk/jigsaw/tester.sh b/jdk/test/org/openjdk/jigsaw/tester.sh
index 025c864..baff1ec 100644
--- a/jdk/test/org/openjdk/jigsaw/tester.sh
+++ b/jdk/test/org/openjdk/jigsaw/tester.sh
@@ -180,7 +180,7 @@ compile() {
 install() {
   mlist=`cd modules; echo *`
   $BIN/jmod create -L z.mlib \
-  && $BIN/jmod $VM_FLAGS_INSTALL install modules $mlist -L z.mlib
+  && $BIN/jmod -J-esa $VM_FLAGS_INSTALL install modules $mlist -L z.mlib
 #  && $BIN/jmod list -L z.mlib
 }
 
@@ -191,7 +191,7 @@ catfile() {
 invoke() {
   if [ -f main ] ; then
     modulename=`catfile main`
-    $BIN/java $VM_FLAGS \
+    $BIN/java $VM_FLAGS -esa \
               -Dtest.src=${TESTSRC} -Dtest.classes=${TESTCLASSES} \
               -ea -L z.mlib -m $modulename
   else
diff --git a/langtools/.hg/cache/branchheads b/langtools/.hg/cache/branchheads
index a961040..cfc8b5a 100644
--- a/langtools/.hg/cache/branchheads
+++ b/langtools/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-1e829edfb3409f02c21227bce696a0610d91bf38 1168
-1e829edfb3409f02c21227bce696a0610d91bf38 default
+583ebefb8aad26cb89b185d3a6c8de1dc0bcf096 1257
+583ebefb8aad26cb89b185d3a6c8de1dc0bcf096 default
diff --git a/langtools/.hg/dirstate b/langtools/.hg/dirstate
index 749c1bd..fb62821 100644
Binary files a/langtools/.hg/dirstate and b/langtools/.hg/dirstate differ
diff --git a/langtools/.hg/store/00changelog.d b/langtools/.hg/store/00changelog.d
index be51023..ed31860 100644
Binary files a/langtools/.hg/store/00changelog.d and b/langtools/.hg/store/00changelog.d differ
diff --git a/langtools/.hg/store/00changelog.i b/langtools/.hg/store/00changelog.i
index a8d0db1..c0c0ba0 100644
Binary files a/langtools/.hg/store/00changelog.i and b/langtools/.hg/store/00changelog.i differ
diff --git a/langtools/.hg/store/00manifest.d b/langtools/.hg/store/00manifest.d
index 536559f..ca6c6c1 100644
Binary files a/langtools/.hg/store/00manifest.d and b/langtools/.hg/store/00manifest.d differ
diff --git a/langtools/.hg/store/00manifest.i b/langtools/.hg/store/00manifest.i
index c1811f1..80faaa0 100644
Binary files a/langtools/.hg/store/00manifest.i and b/langtools/.hg/store/00manifest.i differ
diff --git a/langtools/.hg/store/data/make/build.properties.i b/langtools/.hg/store/data/make/build.properties.i
index e0697d4..5ad1ea1 100644
Binary files a/langtools/.hg/store/data/make/build.properties.i and b/langtools/.hg/store/data/make/build.properties.i differ
diff --git a/langtools/.hg/store/data/make/build.xml.i b/langtools/.hg/store/data/make/build.xml.i
index 735bc10..1df5dba 100644
Binary files a/langtools/.hg/store/data/make/build.xml.i and b/langtools/.hg/store/data/make/build.xml.i differ
diff --git a/langtools/.hg/store/data/make/conf/checkstyle-emacs.xsl.i b/langtools/.hg/store/data/make/conf/checkstyle-emacs.xsl.i
new file mode 100644
index 0000000..9c7d685
Binary files /dev/null and b/langtools/.hg/store/data/make/conf/checkstyle-emacs.xsl.i differ
diff --git a/langtools/.hg/store/data/make/conf/checkstyle-langtools.xml.i b/langtools/.hg/store/data/make/conf/checkstyle-langtools.xml.i
new file mode 100644
index 0000000..d08ff98
Binary files /dev/null and b/langtools/.hg/store/data/make/conf/checkstyle-langtools.xml.i differ
diff --git a/langtools/.hg/store/data/make/jprt.properties.i b/langtools/.hg/store/data/make/jprt.properties.i
index 962d56f..00a1088 100644
Binary files a/langtools/.hg/store/data/make/jprt.properties.i and b/langtools/.hg/store/data/make/jprt.properties.i differ
diff --git a/langtools/.hg/store/data/make/tools/_gen_stubs/_gen_stubs.java.i b/langtools/.hg/store/data/make/tools/_gen_stubs/_gen_stubs.java.i
index 952c50b..8588a8e 100644
Binary files a/langtools/.hg/store/data/make/tools/_gen_stubs/_gen_stubs.java.i and b/langtools/.hg/store/data/make/tools/_gen_stubs/_gen_stubs.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_entrypoint_directive_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_entrypoint_directive_tree.java.i
new file mode 100644
index 0000000..05e0858
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_entrypoint_directive_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_export_directive_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_export_directive_tree.java.i
new file mode 100644
index 0000000..25626df
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_export_directive_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_lambda_expression_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_lambda_expression_tree.java.i
new file mode 100644
index 0000000..3eec553
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_lambda_expression_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_member_reference_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_member_reference_tree.java.i
new file mode 100644
index 0000000..b634621
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_member_reference_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_module_directive_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_module_directive_tree.java.i
new file mode 100644
index 0000000..7b2c441
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_module_directive_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_module_id_query_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_module_id_query_tree.java.i
new file mode 100644
index 0000000..f4dc3ea
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_module_id_query_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_module_id_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_module_id_tree.java.i
index 414b75d..50f6687 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_module_id_tree.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_module_id_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_module_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_module_tree.java.i
index aac2fae..f906d0f 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_module_tree.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_module_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_permits_directive_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_permits_directive_tree.java.i
new file mode 100644
index 0000000..33bf6bd
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_permits_directive_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_provides_module_directive_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_provides_module_directive_tree.java.i
new file mode 100644
index 0000000..3258d1a
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_provides_module_directive_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_provides_service_directive_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_provides_service_directive_tree.java.i
new file mode 100644
index 0000000..fdaa345
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_provides_service_directive_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_requires_flag.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_requires_flag.java.i
new file mode 100644
index 0000000..9cdcfe4
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_requires_flag.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_requires_module_directive_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_requires_module_directive_tree.java.i
new file mode 100644
index 0000000..7fc267e
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_requires_module_directive_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_requires_service_directive_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_requires_service_directive_tree.java.i
new file mode 100644
index 0000000..af9a105
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_requires_service_directive_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_tree.java.i
index da2dae5..850310f 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_tree.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_tree_visitor.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_tree_visitor.java.i
index ec7a8a8..6054735 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_tree_visitor.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_tree_visitor.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_view_declaration_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_view_declaration_tree.java.i
new file mode 100644
index 0000000..fc2bd25
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_view_declaration_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/util/_simple_tree_visitor.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/util/_simple_tree_visitor.java.i
index 3457637..a41bb69 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/source/util/_simple_tree_visitor.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/source/util/_simple_tree_visitor.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/util/_tree_scanner.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/util/_tree_scanner.java.i
index 8dd71da..f9a972a 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/source/util/_tree_scanner.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/source/util/_tree_scanner.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/apt/comp/_apt.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/apt/comp/_apt.java.i
index ac421a1..f442cb0 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/apt/comp/_apt.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/apt/comp/_apt.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/apt/main/_apt_java_compiler.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/apt/main/_apt_java_compiler.java.i
index 8edc641..299315a 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/apt/main/_apt_java_compiler.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/apt/main/_apt_java_compiler.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/apt/main/_main.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/apt/main/_main.java.i
index dc8f595..70048d2 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/apt/main/_main.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/apt/main/_main.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_attribute.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_attribute.java.i
index 3a9dd57..8737ba2 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_attribute.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_attribute.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_class_writer.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_class_writer.java.i
index e5bbad6..6d1f0ef 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_class_writer.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_class_writer.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_constant_pool.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_constant_pool.java.i
index 307c376..ee76c6b 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_constant_pool.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_constant_pool.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_module__attribute.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_module__attribute.java.i
index 7fd2e1a..a0cae1c 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_module__attribute.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_module__attribute.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_module_data__attribute.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_module_data__attribute.java.i
new file mode 100644
index 0000000..75f295e
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_module_data__attribute.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_module_provides__attribute.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_module_provides__attribute.java.i
index 0ed6cc9..a3edd1f 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_module_provides__attribute.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_module_provides__attribute.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_module_requires__attribute.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_module_requires__attribute.java.i
index 1c0cb37..4c033b8 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_module_requires__attribute.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/classfile/_module_requires__attribute.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties.i
index cce4c15..909bb3d 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_task_impl.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_task_impl.java.i
index 5f82843..f3177f7 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_task_impl.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_task_impl.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_tool.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_tool.java.i
index abac33c..da0745d 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_tool.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_tool.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_trees.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_trees.java.i
index 0524bbc..6447ac1 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_trees.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_trees.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_directive.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_directive.java.i
new file mode 100644
index 0000000..39e31ad
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_directive.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_module_id.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_module_id.java.i
new file mode 100644
index 0000000..206f340
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_module_id.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_module_id_query.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_module_id_query.java.i
new file mode 100644
index 0000000..c262c28
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_module_id_query.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_printer.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_printer.java.i
index bf6f139..2c464a1 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_printer.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_printer.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_source.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_source.java.i
index 6bf5e80..fdcedee 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_source.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_source.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_symbol.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_symbol.java.i
index 70da616..d8b9b77 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_symbol.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_symbol.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_types.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_types.java.i
index 1a5bd2f..f745be2 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_types.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_types.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_annotate.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_annotate.java.i
index 8f87841..b53070d 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_annotate.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_annotate.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_attr.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_attr.java.i
index 331268a..41d58bd 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_attr.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_attr.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_attr_context.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_attr_context.java.i
index f72f525..24e683e 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_attr_context.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_attr_context.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_check.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_check.java.i
index 237aa42..8094727 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_check.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_check.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_enter.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_enter.java.i
index b349555..6ef9e52 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_enter.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_enter.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_env.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_env.java.i
index ceb4328..c402f2d 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_env.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_env.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_flow.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_flow.java.i
index c646ccc..c82352b 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_flow.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_flow.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_infer.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_infer.java.i
index 2f05372..707afd8 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_infer.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_infer.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_lower.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_lower.java.i
index 63a0fff..bb105c9 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_lower.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_lower.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_member_enter.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_member_enter.java.i
index 11f0eb1..437115c 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_member_enter.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_member_enter.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_modules.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_modules.java.i
index df867bc..339a0af 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_modules.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_modules.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_resolve.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_resolve.java.i
index 2e2bb34..61bf502 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_resolve.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_resolve.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_composite_location.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_composite_location.java.i
index 854f6ff..370e841 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_composite_location.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_composite_location.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_javac_file_manager.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_javac_file_manager.java.i
index 598ed98..8a90e45 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_javac_file_manager.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_javac_file_manager.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_locations.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_locations.java.i
new file mode 100644
index 0000000..46bda71
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_locations.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_paths.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_paths.java.i
index 351680d..5a8c468 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_paths.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_paths.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_javac_catalog.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_javac_catalog.java.i
index 5730eb0..150eb08 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_javac_catalog.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_javac_catalog.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_jigsaw_module_resolver.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_jigsaw_module_resolver.java.i
index 573f26c..27dbb77 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_jigsaw_module_resolver.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_jigsaw_module_resolver.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_c_r_table.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_c_r_table.java.i
index 26b080f..07b8936 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_c_r_table.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_c_r_table.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_file.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_file.java.i
index c735f0e..ec28f1f 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_file.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_file.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_reader.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_reader.java.i
index 8bb6b8c..62b47b6 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_reader.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_reader.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_writer.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_writer.java.i
index 501bb68..98856fc 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_writer.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_writer.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_code.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_code.java.i
index 0dfd1fc..35df26a 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_code.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_code.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_gen.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_gen.java.i
index 0473c0c..756deaf 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_gen.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_gen.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_pool.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_pool.java.i
index f152dea..224866f 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_pool.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_pool.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_target.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_target.java.i
index 496f61f..7c5ffad 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_target.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_target.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_java_compiler.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_java_compiler.java.i
index 080ea77..0859be4 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_java_compiler.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_java_compiler.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_javac_option.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_javac_option.java.i
index 0ff2c6f..80ae675 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_javac_option.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_javac_option.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_main.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_main.java.i
index 31d8258..5e44447 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_main.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_main.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_option.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_option.java.i
new file mode 100644
index 0000000..1bba9b4
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_option.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_option_helper.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_option_helper.java.i
new file mode 100644
index 0000000..2089fe6
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_option_helper.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_recognized_options.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_recognized_options.java.i
index dc3c913..d5e55b7 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_recognized_options.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_recognized_options.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/model/_javac_elements.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/model/_javac_elements.java.i
index 4148484..f53a38b 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/model/_javac_elements.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/model/_javac_elements.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/nio/_javac_path_file_manager.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/nio/_javac_path_file_manager.java.i
index f860d6f..3a1de89 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/nio/_javac_path_file_manager.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/nio/_javac_path_file_manager.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_end_pos_parser.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_end_pos_parser.java.i
index de75545..12b914f 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_end_pos_parser.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_end_pos_parser.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_end_pos_table.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_end_pos_table.java.i
new file mode 100644
index 0000000..2afd82b
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_end_pos_table.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_java_tokenizer.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_java_tokenizer.java.i
new file mode 100644
index 0000000..ecf3d90
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_java_tokenizer.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_javac_parser.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_javac_parser.java.i
index 04f45c6..31c93e9 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_javac_parser.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_javac_parser.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_javadoc_tokenizer.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_javadoc_tokenizer.java.i
new file mode 100644
index 0000000..d7e89ac
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_javadoc_tokenizer.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_lexer.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_lexer.java.i
index ee22f71..58d7ed8 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_lexer.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_lexer.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_parser_factory.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_parser_factory.java.i
index 008b1ad..5495607 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_parser_factory.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_parser_factory.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_scanner.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_scanner.java.i
index 6d7c5b0..4adb01b 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_scanner.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_scanner.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_scanner_factory.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_scanner_factory.java.i
index 10da771..9695188 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_scanner_factory.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_scanner_factory.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_tokens.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_tokens.java.i
new file mode 100644
index 0000000..1a77897
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_tokens.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_unicode_reader.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_unicode_reader.java.i
new file mode 100644
index 0000000..5609002
Binary files /dev/null and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/parser/_unicode_reader.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/processing/_javac_processing_environment.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/processing/_javac_processing_environment.java.i
index a5daca4..bbb6593 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/processing/_javac_processing_environment.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/processing/_javac_processing_environment.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/resources/compiler.properties.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/resources/compiler.properties.i
index 2875d80..ef94163 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/resources/compiler.properties.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/resources/compiler.properties.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_j_c_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_j_c_tree.java.i
index 2dc4846..c91046b 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_j_c_tree.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_j_c_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_pretty.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_pretty.java.i
index bdbee4c..8f4ed22 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_pretty.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_pretty.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_copier.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_copier.java.i
index 669e75b..19769ab 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_copier.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_copier.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_info.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_info.java.i
index e8075b1..537a08b 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_info.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_info.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_maker.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_maker.java.i
index bc3cf38..025f890 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_maker.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_maker.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_scanner.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_scanner.java.i
index 4912434..a6f35c5 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_scanner.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_scanner.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_translator.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_translator.java.i
index bb134db..8680aae 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_translator.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_translator.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_base_file_manager.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_base_file_manager.java.i
index d7d72e3..31218c8 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_base_file_manager.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_base_file_manager.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_debug.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_debug.java.i
index 0bc1fdf..414debf 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_debug.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_debug.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_diagnostic_source.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_diagnostic_source.java.i
index eb99ab8..8148306 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_diagnostic_source.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_diagnostic_source.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_j_c_diagnostic.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_j_c_diagnostic.java.i
index deb2884..c9a53f5 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_j_c_diagnostic.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_j_c_diagnostic.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_javac_messages.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_javac_messages.java.i
index ccc9d06..91f54e8 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_javac_messages.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_javac_messages.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_log.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_log.java.i
index 96fc973..f8b9494 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_log.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_log.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_names.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_names.java.i
index 3dd062f..8becff1 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_names.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_names.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_options.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_options.java.i
index bb2625a..a97658a 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_options.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_options.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_class_doc_impl.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_class_doc_impl.java.i
index dd50029..85d8f1e 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_class_doc_impl.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_class_doc_impl.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_doclet_invoker.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_doclet_invoker.java.i
index 7c1e3b6..4ed3a83 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_doclet_invoker.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_doclet_invoker.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_javadoc_tool.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_javadoc_tool.java.i
index 3cb38c7..e23af4d 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_javadoc_tool.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_javadoc_tool.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_start.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_start.java.i
index 422a8f5..08a87dd 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_start.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javadoc/_start.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javap/_attribute_writer.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javap/_attribute_writer.java.i
index 3e86451..f05faec 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javap/_attribute_writer.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javap/_attribute_writer.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javap/_class_writer.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javap/_class_writer.java.i
index a64c0dc..3e1c325 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javap/_class_writer.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javap/_class_writer.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/javax/lang/model/element/_module_element.java.i b/langtools/.hg/store/data/src/share/classes/javax/lang/model/element/_module_element.java.i
index b78b401..ba6d263 100644
Binary files a/langtools/.hg/store/data/src/share/classes/javax/lang/model/element/_module_element.java.i and b/langtools/.hg/store/data/src/share/classes/javax/lang/model/element/_module_element.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/javax/tools/_module_file_manager.java.i b/langtools/.hg/store/data/src/share/classes/javax/tools/_module_file_manager.java.i
index 567ab34..7b45a00 100644
Binary files a/langtools/.hg/store/data/src/share/classes/javax/tools/_module_file_manager.java.i and b/langtools/.hg/store/data/src/share/classes/javax/tools/_module_file_manager.java.i differ
diff --git a/langtools/.hg/store/data/test/_makefile.i b/langtools/.hg/store/data/test/_makefile.i
index 3dfd141..afa58d0 100644
Binary files a/langtools/.hg/store/data/test/_makefile.i and b/langtools/.hg/store/data/test/_makefile.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/4846262/_test.sh.i b/langtools/.hg/store/data/test/tools/javac/4846262/_test.sh.i
index 217f753..4f8769b 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/4846262/_test.sh.i and b/langtools/.hg/store/data/test/tools/javac/4846262/_test.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/6304921/_test_log.java.i b/langtools/.hg/store/data/test/tools/javac/6304921/_test_log.java.i
index a4b61ec..d5ebb61 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/6304921/_test_log.java.i and b/langtools/.hg/store/data/test/tools/javac/6304921/_test_log.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/6410653/_t6410653.java.i b/langtools/.hg/store/data/test/tools/javac/6410653/_t6410653.java.i
index 4fdd1d8..36950ae 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/6410653/_t6410653.java.i and b/langtools/.hg/store/data/test/tools/javac/6410653/_t6410653.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/7102515/_t7102515.java.i b/langtools/.hg/store/data/test/tools/javac/7102515/_t7102515.java.i
new file mode 100644
index 0000000..073285f
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/7102515/_t7102515.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/7102515/_t7102515.out.i b/langtools/.hg/store/data/test/tools/javac/7102515/_t7102515.out.i
new file mode 100644
index 0000000..348ce16
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/7102515/_t7102515.out.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/_t7093325.java.i b/langtools/.hg/store/data/test/tools/javac/_t7093325.java.i
new file mode 100644
index 0000000..4c38a3f
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/_t7093325.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/_t7120266.java.i b/langtools/.hg/store/data/test/tools/javac/_t7120266.java.i
new file mode 100644
index 0000000..702a6e7
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/_t7120266.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/api/_t6838467.java.i b/langtools/.hg/store/data/test/tools/javac/api/_t6838467.java.i
index a35ea43..f46102d 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/api/_t6838467.java.i and b/langtools/.hg/store/data/test/tools/javac/api/_t6838467.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/api/_test_javac_task_scanner.java.i b/langtools/.hg/store/data/test/tools/javac/api/_test_javac_task_scanner.java.i
index c12706d..b689325 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/api/_test_javac_task_scanner.java.i and b/langtools/.hg/store/data/test/tools/javac/api/_test_javac_task_scanner.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/dep_doc_comment/_deprecated_doc_comment3.java.i b/langtools/.hg/store/data/test/tools/javac/dep_doc_comment/_deprecated_doc_comment3.java.i
new file mode 100644
index 0000000..240225b
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/dep_doc_comment/_deprecated_doc_comment3.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/dep_doc_comment/_deprecated_doc_comment4.java.i b/langtools/.hg/store/data/test/tools/javac/dep_doc_comment/_deprecated_doc_comment4.java.i
new file mode 100644
index 0000000..7e60fb4
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/dep_doc_comment/_deprecated_doc_comment4.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/dep_doc_comment/_deprecated_doc_comment4.out.i b/langtools/.hg/store/data/test/tools/javac/dep_doc_comment/_deprecated_doc_comment4.out.i
new file mode 100644
index 0000000..de2fa3e
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/dep_doc_comment/_deprecated_doc_comment4.out.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/_arg_type_compiler_factory.java.i b/langtools/.hg/store/data/test/tools/javac/diags/_arg_type_compiler_factory.java.i
index 8b04490..98a917e 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/diags/_arg_type_compiler_factory.java.i and b/langtools/.hg/store/data/test/tools/javac/diags/_arg_type_compiler_factory.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/examples/_applicable_method_found.java.i b/langtools/.hg/store/data/test/tools/javac/diags/examples/_applicable_method_found.java.i
new file mode 100644
index 0000000..1d6f0ab
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/diags/examples/_applicable_method_found.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/examples/_applicable_method_found1.java.i b/langtools/.hg/store/data/test/tools/javac/diags/examples/_applicable_method_found1.java.i
new file mode 100644
index 0000000..e695fdd
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/diags/examples/_applicable_method_found1.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/examples/_catch_without_try.java.i b/langtools/.hg/store/data/test/tools/javac/diags/examples/_catch_without_try.java.i
index 1291d68..958efa5 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/diags/examples/_catch_without_try.java.i and b/langtools/.hg/store/data/test/tools/javac/diags/examples/_catch_without_try.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/examples/_deferred_method_inst.java.i b/langtools/.hg/store/data/test/tools/javac/diags/examples/_deferred_method_inst.java.i
new file mode 100644
index 0000000..141871b
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/diags/examples/_deferred_method_inst.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/examples/_full_inst_sig.java.i b/langtools/.hg/store/data/test/tools/javac/diags/examples/_full_inst_sig.java.i
new file mode 100644
index 0000000..f003ff1
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/diags/examples/_full_inst_sig.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/examples/_illegal_char.java.i b/langtools/.hg/store/data/test/tools/javac/diags/examples/_illegal_char.java.i
index ee3fb09..bea8afc 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/diags/examples/_illegal_char.java.i and b/langtools/.hg/store/data/test/tools/javac/diags/examples/_illegal_char.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/examples/_illegal_dot.java.i b/langtools/.hg/store/data/test/tools/javac/diags/examples/_illegal_dot.java.i
new file mode 100644
index 0000000..27bc7fa
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/diags/examples/_illegal_dot.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/examples/_lambda_not_supported.java.i b/langtools/.hg/store/data/test/tools/javac/diags/examples/_lambda_not_supported.java.i
new file mode 100644
index 0000000..09302e8
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/diags/examples/_lambda_not_supported.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/examples/_method_references_not_supported.java.i b/langtools/.hg/store/data/test/tools/javac/diags/examples/_method_references_not_supported.java.i
new file mode 100644
index 0000000..0734cfe
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/diags/examples/_method_references_not_supported.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/examples/_not_a_statement.java.i b/langtools/.hg/store/data/test/tools/javac/diags/examples/_not_a_statement.java.i
new file mode 100644
index 0000000..c937d11
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/diags/examples/_not_a_statement.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/examples/_not_applicable_method_found.java.i b/langtools/.hg/store/data/test/tools/javac/diags/examples/_not_applicable_method_found.java.i
new file mode 100644
index 0000000..922d265
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/diags/examples/_not_applicable_method_found.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/examples/_partial_inst_sig.java.i b/langtools/.hg/store/data/test/tools/javac/diags/examples/_partial_inst_sig.java.i
new file mode 100644
index 0000000..e2b35c6
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/diags/examples/_partial_inst_sig.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/examples/_unsupported_encoding.java.i b/langtools/.hg/store/data/test/tools/javac/diags/examples/_unsupported_encoding.java.i
index 8450558..5b34af9 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/diags/examples/_unsupported_encoding.java.i and b/langtools/.hg/store/data/test/tools/javac/diags/examples/_unsupported_encoding.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/examples/_verbose_resolve_multi.java.i b/langtools/.hg/store/data/test/tools/javac/diags/examples/_verbose_resolve_multi.java.i
new file mode 100644
index 0000000..687dc5e
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/diags/examples/_verbose_resolve_multi.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/examples/_verbose_resolve_multi1.java.i b/langtools/.hg/store/data/test/tools/javac/diags/examples/_verbose_resolve_multi1.java.i
new file mode 100644
index 0000000..4c26c23
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/diags/examples/_verbose_resolve_multi1.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/failover/_check_attributed_tree.java.i b/langtools/.hg/store/data/test/tools/javac/failover/_check_attributed_tree.java.i
index e5d76fa..a69b876 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/failover/_check_attributed_tree.java.i and b/langtools/.hg/store/data/test/tools/javac/failover/_check_attributed_tree.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/generics/diamond/7046778/_diamond_and_inner_class_test.java.i b/langtools/.hg/store/data/test/tools/javac/generics/diamond/7046778/_diamond_and_inner_class_test.java.i
index b7e2232..affe529 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/generics/diamond/7046778/_diamond_and_inner_class_test.java.i and b/langtools/.hg/store/data/test/tools/javac/generics/diamond/7046778/_diamond_and_inner_class_test.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/generics/inference/7086601/_t7086601b.java.i b/langtools/.hg/store/data/test/tools/javac/generics/inference/7086601/_t7086601b.java.i
index 12929ed..849f5d7 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/generics/inference/7086601/_t7086601b.java.i and b/langtools/.hg/store/data/test/tools/javac/generics/inference/7086601/_t7086601b.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/generics/rare/6665356/_t6665356.out.i b/langtools/.hg/store/data/test/tools/javac/generics/rare/6665356/_t6665356.out.i
index 611f776..c6ba2eb 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/generics/rare/6665356/_t6665356.out.i and b/langtools/.hg/store/data/test/tools/javac/generics/rare/6665356/_t6665356.out.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/generics/raw_override/7062745/_generic_override_test.java.i b/langtools/.hg/store/data/test/tools/javac/generics/raw_override/7062745/_generic_override_test.java.i
index 949523f..715c0d9 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/generics/raw_override/7062745/_generic_override_test.java.i and b/langtools/.hg/store/data/test/tools/javac/generics/raw_override/7062745/_generic_override_test.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/javazip/_test.sh.i b/langtools/.hg/store/data/test/tools/javac/javazip/_test.sh.i
index c6f9e2f..7dbf3e7 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/javazip/_test.sh.i and b/langtools/.hg/store/data/test/tools/javac/javazip/_test.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/lambda/_lambda_parser_test.java.i b/langtools/.hg/store/data/test/tools/javac/lambda/_lambda_parser_test.java.i
new file mode 100644
index 0000000..8e2c8a8
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/lambda/_lambda_parser_test.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/lambda/_method_reference_parser_test.java.i b/langtools/.hg/store/data/test/tools/javac/lambda/_method_reference_parser_test.java.i
new file mode 100644
index 0000000..1519106
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/lambda/_method_reference_parser_test.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/parser/_javac_parser_test.java.i b/langtools/.hg/store/data/test/tools/javac/parser/_javac_parser_test.java.i
new file mode 100644
index 0000000..765816a
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/parser/_javac_parser_test.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/parser/_t4881269.java.i b/langtools/.hg/store/data/test/tools/javac/parser/_t4881269.java.i
new file mode 100644
index 0000000..381b7b5
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/parser/_t4881269.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/parser/_t4881269.out.i b/langtools/.hg/store/data/test/tools/javac/parser/_t4881269.out.i
new file mode 100644
index 0000000..841a56c
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/parser/_t4881269.out.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/parser/netbeans/_javac_parser_test.java.i b/langtools/.hg/store/data/test/tools/javac/parser/netbeans/_javac_parser_test.java.i
index 8f44035..9b94bbe 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/parser/netbeans/_javac_parser_test.java.i and b/langtools/.hg/store/data/test/tools/javac/parser/netbeans/_javac_parser_test.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/processing/options/test_print_processor_info/_test_with_xstdout.java.i b/langtools/.hg/store/data/test/tools/javac/processing/options/test_print_processor_info/_test_with_xstdout.java.i
new file mode 100644
index 0000000..900606c
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/processing/options/test_print_processor_info/_test_with_xstdout.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/quid/_t6999438.out.i b/langtools/.hg/store/data/test/tools/javac/quid/_t6999438.out.i
index 2e25b68..0a5f879 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/quid/_t6999438.out.i and b/langtools/.hg/store/data/test/tools/javac/quid/_t6999438.out.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/resolve/_candidate.java.i b/langtools/.hg/store/data/test/tools/javac/resolve/_candidate.java.i
new file mode 100644
index 0000000..afeb9ee
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/resolve/_candidate.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/resolve/_pos.java.i b/langtools/.hg/store/data/test/tools/javac/resolve/_pos.java.i
new file mode 100644
index 0000000..ff4da77
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/resolve/_pos.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/resolve/_resolve_harness.java.i b/langtools/.hg/store/data/test/tools/javac/resolve/_resolve_harness.java.i
new file mode 100644
index 0000000..9963dfd
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/resolve/_resolve_harness.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/resolve/_trace_resolve.java.i b/langtools/.hg/store/data/test/tools/javac/resolve/_trace_resolve.java.i
new file mode 100644
index 0000000..e8067cc
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/resolve/_trace_resolve.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/resolve/tests/_boxed_return_type_inference.java.i b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_boxed_return_type_inference.java.i
new file mode 100644
index 0000000..fab3e48
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_boxed_return_type_inference.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/resolve/tests/_primitive_over_reference_over_inferred.java.i b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_primitive_over_reference_over_inferred.java.i
new file mode 100644
index 0000000..071fbc7
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_primitive_over_reference_over_inferred.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/resolve/tests/_primitive_over_reference_over_varargs.java.i b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_primitive_over_reference_over_varargs.java.i
new file mode 100644
index 0000000..3bb492b
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_primitive_over_reference_over_varargs.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/resolve/tests/_primitive_over_reference_varargs_ambiguous.java.i b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_primitive_over_reference_varargs_ambiguous.java.i
new file mode 100644
index 0000000..9de2b23
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_primitive_over_reference_varargs_ambiguous.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/resolve/tests/_primitive_overload.java.i b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_primitive_overload.java.i
new file mode 100644
index 0000000..d240889
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_primitive_overload.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/resolve/tests/_primitive_return_type_inference.java.i b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_primitive_return_type_inference.java.i
new file mode 100644
index 0000000..8587396
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_primitive_return_type_inference.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/resolve/tests/_reference_over_inferred.java.i b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_reference_over_inferred.java.i
new file mode 100644
index 0000000..ef5c803
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_reference_over_inferred.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/resolve/tests/_reference_over_varargs.java.i b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_reference_over_varargs.java.i
new file mode 100644
index 0000000..aacf0c0
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_reference_over_varargs.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/resolve/tests/_reference_overload.java.i b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_reference_overload.java.i
new file mode 100644
index 0000000..e121460
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/resolve/tests/_reference_overload.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/tree/_abstract_tree_scanner_test.java.i b/langtools/.hg/store/data/test/tools/javac/tree/_abstract_tree_scanner_test.java.i
index 108b6ee..47ed5d5 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/tree/_abstract_tree_scanner_test.java.i and b/langtools/.hg/store/data/test/tools/javac/tree/_abstract_tree_scanner_test.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/tree/_doc_comment_toplevel_test.java.i b/langtools/.hg/store/data/test/tools/javac/tree/_doc_comment_toplevel_test.java.i
new file mode 100644
index 0000000..d468a6a
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/tree/_doc_comment_toplevel_test.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/tree/_tree_pos_test.java.i b/langtools/.hg/store/data/test/tools/javac/tree/_tree_pos_test.java.i
index 5934f07..27fbcad 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/tree/_tree_pos_test.java.i and b/langtools/.hg/store/data/test/tools/javac/tree/_tree_pos_test.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/util/_t6597678.java.i b/langtools/.hg/store/data/test/tools/javac/util/_t6597678.java.i
index 3feb7d3..bd17006 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/util/_t6597678.java.i and b/langtools/.hg/store/data/test/tools/javac/util/_t6597678.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/varargs/7097436/_t7097436.java.i b/langtools/.hg/store/data/test/tools/javac/varargs/7097436/_t7097436.java.i
new file mode 100644
index 0000000..5a0b07a
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/varargs/7097436/_t7097436.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/varargs/7097436/_t7097436.out.i b/langtools/.hg/store/data/test/tools/javac/varargs/7097436/_t7097436.out.i
new file mode 100644
index 0000000..0b33fb3
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/varargs/7097436/_t7097436.out.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/varargs/warning/_warn5.java.i b/langtools/.hg/store/data/test/tools/javac/varargs/warning/_warn5.java.i
index 1a2341b..7364da6 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/varargs/warning/_warn5.java.i and b/langtools/.hg/store/data/test/tools/javac/varargs/warning/_warn5.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/warnings/7090499/_t7090499.java.i b/langtools/.hg/store/data/test/tools/javac/warnings/7090499/_t7090499.java.i
new file mode 100644
index 0000000..f9d4fc9
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/warnings/7090499/_t7090499.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/warnings/7090499/_t7090499.out.i b/langtools/.hg/store/data/test/tools/javac/warnings/7090499/_t7090499.out.i
new file mode 100644
index 0000000..c180a91
Binary files /dev/null and b/langtools/.hg/store/data/test/tools/javac/warnings/7090499/_t7090499.out.i differ
diff --git a/langtools/.hg/store/data/~2ehgtags.i b/langtools/.hg/store/data/~2ehgtags.i
index 641f44c..4c80969 100644
Binary files a/langtools/.hg/store/data/~2ehgtags.i and b/langtools/.hg/store/data/~2ehgtags.i differ
diff --git a/langtools/.hg/store/fncache b/langtools/.hg/store/fncache
index 2a6c23e..de885bb 100644
--- a/langtools/.hg/store/fncache
+++ b/langtools/.hg/store/fncache
@@ -8,7 +8,6 @@ data/src/share/classes/javax/lang/model/type/ReferenceType.java.i
 data/src/share/classes/com/sun/tools/javac/code/TargetType.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/util/SourcePositionImpl.java.i
 data/test/tools/javac/diags/examples/UnreachableCatch.java.i
-data/test/tools/javac/generics/6245699/T6245699a.java.i
 data/test/tools/javac/generics/diamond/7002837/T7002837.java.i
 data/test/tools/javac/multicatch/model/Model01.java.i
 data/test/com/sun/javadoc/AccessFrameTitle/AccessFrameTitle.java.i
@@ -18,7 +17,6 @@ data/test/tools/javac/cast/6548436/T6548436b.java.i
 data/test/tools/javadoc/6958836/errs/Errors.java.i
 data/test/tools/javac/diags/examples/ErrSyntheticNameConflict.java.i
 data/test/tools/javac/InterfaceFieldParsing_1.java.i
-data/test/com/sun/javadoc/testTypeParams/pkg/ParamTest2.java.i
 data/test/tools/javac/T5024091/T5024091.java.i
 data/test/com/sun/javadoc/testUseOption/UsedInC.java.i
 data/src/share/opensource/javac/src/bin/javac.sh.i
@@ -26,15 +24,13 @@ data/make/test/lib/apt.sh.i
 data/test/com/sun/javadoc/T6735320/SerialFieldTest.java.i
 data/test/tools/javac/typeAnnotations/newlocations/ClassExtends.java.i
 data/test/tools/javac/T6247324.out.i
-data/test/tools/javac/generics/7007615/acc1/AccessibilityCheck01.java.i
 data/test/tools/javap/typeAnnotations/Visibility.java.i
 data/src/share/classes/com/sun/mirror/declaration/EnumDeclaration.java.i
 data/test/tools/apt/mirror/declaration/GetAnno.java.i
 data/test/tools/javac/generics/typeargs/ThisArg.java.i
 data/src/share/classes/com/sun/mirror/util/SimpleTypeVisitor.java.i
-data/src/share/classes/com/sun/tools/javac/code/Symtab.java.i
 data/test/tools/javac/DefiniteAssignment/DUTry.java.i
-data/src/share/classes/com/sun/mirror/type/VoidType.java.i
+data/test/tools/javac/ExtDirs/ext3/pkg2.jar.i
 data/test/tools/javac/generics/7007615/acc2/p2/E.java.i
 data/test/tools/javac/Diagnostics/7010608/Test.java.i
 data/test/tools/javac/diags/examples/LocalEnum.java.i
@@ -43,86 +39,90 @@ data/test/tools/javac/4846262/Test.out.i
 data/test/tools/javac/processing/model/element/TestMissingElement2/Generator.java.i
 data/test/tools/javac/danglingDep/DepX.java.i
 data/test/tools/javac/api/6598108/T6598108.java.i
-data/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java.i
-data/test/com/sun/javadoc/testIndex/pkg/Coin.java.i
+data/test/tools/javac/processing/6430209/test1.java.i
 data/test/tools/javac/cast/6295056/T6295056.java.i
 data/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootTag.java.i
 data/test/tools/javac/generics/6372782/AdditiveClosure.java.i
-data/src/share/classes/com/sun/javadoc/DocErrorReporter.java.i
+data/test/tools/javah/T6893943.java.i
 data/test/tools/javac/diags/examples/WarnProcMessager/processors/AnnoProc.java.i
+data/test/tools/javac/api/T6345974.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ParamTest2.java.i
-data/test/tools/javac/synthesize/Integer.java.i
-data/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded2/testfile.txt.i
+data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out.i
 data/test/tools/javac/api/ToolProvider/ToolProviderTest1.java.i
 data/make/netbeans/langtools/nbproject/standard-ide-actions.ent.i
 data/make/tools/Jigsaw/JmodTask.java.i
-data/test/tools/javac/6400872/C.java.i
-data/test/tools/javac/NullStaticQualifier.java.i
+data/test/tools/javac/NonStaticFieldExpr1.java.i
+data/test/tools/javac/generics/typevars/T7040883.java.i
 data/test/tools/javac/enum/LocalEnum.java.i
 data/test/tools/javac/HexThree.java.i
 data/src/share/classes/com/sun/tools/javac/code/TypeTags.java.i
 data/test/tools/javac/api/T6419926.java.i
 data/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java.i
 data/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java.i
-data/test/tools/javac/api/TestGetTree.java.i
+data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes6.java.i
 data/src/share/classes/com/sun/tools/javac/util/Abort.java.i
 data/test/tools/javac/T6663588.java.i
 data/test/tools/javac/api/6431257/package-info.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java.i
 data/test/tools/javac/api/guide/TestMe.java.i
 data/test/tools/javac/api/guide/Test.java.i
 data/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java.i
-data/test/tools/javac/treeannotests/TA.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_10.java.i
+data/test/tools/javac/warnings/Deprecation.java.i
+data/test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.out.i
 data/src/share/classes/com/sun/tools/javac/util/Bits.java.i
 data/src/share/classes/javax/tools/DiagnosticListener.java.i
+data/test/tools/javadoc/badSuper/BadSuper.java.i
 data/test/tools/javac/T6294589.java.i
 data/test/tools/javac/generics/inference/6278587/T6278587Neg.java.i
 data/test/tools/javac/mandatoryWarnings/unchecked/Test4c.out.i
 data/test/com/sun/javadoc/testNestedInlineTag/testtaglets/GreenTaglet.java.i
 data/test/tools/javap/NotPackagePrivateInterface.java.i
-data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C4.java.i
+data/test/tools/javac/protectedAccess/ProtectedMemberAccess4.java.i
+data/test/tools/javac/diags/examples/LongSVUID.java.i
 data/test/tools/javac/processing/model/util/elements/TestGetPackageOf.java.i
 data/test/tools/javac/diags/examples/DuplicateCaseLabel.java.i
 data/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java.i
 data/test/tools/javac/processing/werror/WErrorGen.java.i
+data/test/tools/javac/generics/T4784219.java.i
 data/test/tools/javac/Paths/Util.sh.i
 data/src/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java.i
 data/test/tools/javac/generics/7007615/acc2/p1/D.java.i
 data/test/tools/javac/policy/test1/bytodo.ABD.out.i
 data/make/tools/GenStubs/GenStubs.java.i
-data/test/tools/javac/OverrideChecks/T4720359b.java.i
+data/test/tools/javac/5017953/T5017953.out.i
+data/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java.i
 data/src/share/classes/com/sun/tools/classfile/OpCodes.java.i
 data/test/tools/javac/mandatoryWarnings/deprecated/Test3b.out.i
 data/test/tools/javac/generics/inference/6611449/T6611449.out.i
 data/make/jprt.config.i
 data/src/share/classes/javax/lang/model/overview.html.i
-data/src/share/classes/com/sun/source/tree/MemberSelectTree.java.i
 data/test/tools/javac/generics/6227936/Orig.java.i
 data/test/tools/javac/api/T6407011.java.i
 data/test/com/sun/javadoc/testDupParamWarn/pkg/Foo.java.i
 data/test/tools/javac/typeAnnotations/failures/IndexArray.java.i
 data/test/tools/javac/diags/examples/KindnameClass.java.i
-data/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java.i
 data/test/tools/javac/diags/examples/WarnProcMessager/WarnProcMessager.java.i
-data/test/tools/javac/6917288/GraphicalInstallerTest.java.i
+data/test/tools/javadoc/6964914/Test.java.i
+data/test/tools/javac/warnings/FallThrough.lintAll.out.i
 data/test/tools/javac/generics/inference/6650759/T6650759a.java.i
 data/test/tools/javac/importContext/anonPackage/bar/Baz.java.i
+data/test/tools/javac/api/6733837/T6733837.java.i
+data/test/tools/javac/annotations/neg/Cycle2.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java.i
+data/src/share/classes/com/sun/tools/javac/util/AbstractLog.java.i
 data/test/tools/javac/diags/examples/PkgClashWithClass/p/q/C.java.i
-data/test/tools/javac/6464451/ManyExitsInTry.java.i
 data/test/tools/javac/api/T6265137.java.i
 data/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TaggedMethodFinder.java.i
 data/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-used1/testfile.txt.i
-data/test/com/sun/javadoc/testOverridenMethods/pkg2/SubClass.java.i
+data/test/com/sun/javadoc/testUnnamedPackage/package.html.i
 data/test/tools/javac/ConstBoolAppend.java.i
 data/test/tools/javac/diags/examples/UnclosedCharLiteral.java.i
 data/test/tools/javac/capture/Capture4.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletOutput.java.i
+data/test/tools/javac/T6224167.out.i
 data/test/tools/javac/T6227617.out.i
 data/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java.i
 data/src/share/classes/com/sun/javadoc/ConstructorDoc.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java.i
 data/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.out.i
 data/test/com/sun/javadoc/testHtmlTableTags/pkg1/package-info.java.i
 data/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java.i
@@ -132,7 +132,6 @@ data/test/tools/apt/Compile/golden.txt.i
 data/test/tools/javac/diags/examples/OverrideStatic.java.i
 data/src/share/classes/com/sun/source/tree/IfTree.java.i
 data/test/tools/javadoc/annotations/shortcuts/pkg1/A.java.i
-data/test/tools/javac/T6366196.java.i
 data/test/tools/javac/T6759996.java.i
 data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java.i
 data/test/tools/javac/generics/6985719/T6985719e.java.i
@@ -142,12 +141,14 @@ data/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java.i
 data/test/com/sun/javadoc/testHtmlTag/pkg1/C1.java.i
 data/src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java.i
 data/test/tools/javac/T5090006/compiler.sh.i
-data/test/tools/javac/6257443/T6257443.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_3.java.i
 data/test/tools/javac/T6370653.java.i
 data/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java.i
 data/test/tools/javac/failover/FailOver09.out.i
 data/test/tools/javac/diags/examples/IncompatibleTypes1.java.i
 data/test/com/sun/javadoc/testPackageDeprecation/FooDepr.java.i
+data/test/tools/javap/T6716452.java.i
+data/src/share/classes/com/sun/source/tree/EntrypointDirectiveTree.java.i
 data/test/tools/javac/innerClassFile/y/R2.java.i
 data/test/tools/javac/generics/T5011073.java.i
 data/test/com/sun/javadoc/testHtmlTableTags/pkg2/C4.java.i
@@ -157,32 +158,30 @@ data/test/tools/javac/diags/examples/CantRefBeforeConstr.java.i
 data/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out.i
 data/test/tools/javac/api/T6265137a.java.i
 data/test/tools/javac/generics/6294779/T6294779c.java.i
-data/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java.i
+data/test/tools/javac/processing/T6439826.java.i
 data/test/tools/javac/api/evalexpr/MemoryFileManager.java.i
-data/test/tools/javac/diags/examples/Error.java.i
-data/test/tools/javah/6572945/TestClass1.java.i
 data/test/tools/javac/6863465/T6863465d.out.i
 data/test/tools/javadoc/annotations/annotateMethodsFields/pkg1/E.java.i
 data/test/tools/javac/BadOptimization/Switch1.java.i
 data/test/tools/javac/T6180021/AbstractSub.java.i
 data/test/tools/javac/SuperNew.java.i
 data/src/share/classes/javax/tools/FileObject.java.i
-data/test/tools/javac/multicatch/Neg06.out.i
+data/test/tools/javac/varargs/5088429/T5088429Neg02.out.i
 data/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java.i
 data/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java.i
+data/test/tools/javac/typeAnnotations/newlocations/ClassParameters.java.i
 data/test/tools/javac/quid/T6999438.java.i
 data/test/tools/javac/4980495/static/p1/A1.java.i
 data/test/tools/javac/modules/ModulePathTest02.java.i
 data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes8.java.i
-data/src/share/classes/javax/lang/model/element/Element.java.i
+data/test/tools/javac/generics/diamond/7030687/T7030687.out.i
 data/test/tools/javac/protectedAccess/ProtectedMemberAccess2.out.i
 data/test/tools/javac/T6410706.java.i
 data/src/share/classes/com/sun/tools/javadoc/DocEnv.java.i
 data/test/tools/javac/generics/inference/7086586/T7086586b.java.i
 data/test/tools/javac/failover/FailOver14.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeElementDeclarationImpl.java.i
-data/test/tools/javac/T6394563.warn.out.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java.i
+data/test/tools/javac/depDocComment/SuppressDeprecation.java.i
 data/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java.i
 data/test/tools/javac/generics/wildcards/6886247/T6886247_2.java.i
 data/test/tools/javac/cast/6795580/T6795580.out.i
@@ -190,21 +189,25 @@ data/src/share/classes/com/sun/tools/javadoc/Comment.java.i
 data/src/share/classes/com/sun/tools/javah/resources/SunOS_sparc.properties.i
 data/src/share/classes/com/sun/tools/javac/api/JavacScope.java.i
 data/test/tools/javac/generics/typevars/6182630/T6182630c.java.i
+data/test/tools/javac/diags/examples/AnonymousClass.java.i
 data/src/share/classes/com/sun/source/tree/StatementTree.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java.i
-data/src/share/classes/com/sun/tools/javah/TypeSignature.java.i
+data/test/tools/javac/TryWithResources/TwrFlow.out.i
 data/test/tools/javac/quid/QuotedIdent_BAD62.java.i
 data/test/tools/javadoc/generics/supertypes/Main.java.i
-data/test/tools/javadoc/annotations/defaults/expected.out.i
+data/test/tools/javac/generics/inference/5003431/T5003431.java.i
 data/test/tools/javac/diags/examples/ProcCantFindClass/ProcCantFindClass.java.i
 data/test/tools/javac/Diagnostics/6862608/T6862608b.out.i
-data/test/tools/javap/T4884240.java.i
+data/test/tools/javah/6572945/TestClass1.java.i
+data/test/tools/javac/generics/bridge1/C.java.i
+data/test/tools/javac/generics/inference/5042462/T5042462.java.i
 data/test/tools/javac/TryWithResources/ResourceOutsideTry.out.i
 data/test/tools/javac/generics/6372782/State.java.i
-data/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java.i
+data/test/tools/javac/processing/6634138/ExerciseDependency.java.i
 data/test/tools/javac/generics/T4784207a.java.i
+data/make/conf/checkstyle-langtools.xml.i
 data/test/tools/javac/DefiniteAssignment/DUAssert.java.i
-data/test/tools/javac/diags/examples/TryWithoutCatchOrFinallyOrResource.java.i
+data/test/tools/javac/types/CastTest.java.i
 data/test/tools/javac/generics/6723444/T6723444.java.i
 data/test/tools/javac/SynchronizedClass.sh.i
 data/test/tools/apt/Options/Marker.java.i
@@ -212,55 +215,50 @@ data/test/tools/javac/enum/forwardRef/TestEnum6.java.i
 data/test/tools/javac/generics/typevars/5060485/Pos.java.i
 data/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.out.i
 data/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java.i
-data/test/tools/javac/CyclicInheritance.java.i
-data/src/share/classes/com/sun/javadoc/Doc.java.i
+data/src/share/classes/com/sun/tools/javac/code/Types.java.i
 data/test/tools/javac/api/6437349/T6437349.java.i
 data/test/tools/javac/ClassCycle/ClassCycle3a.java.i
 data/test/tools/javac/MissingInclude.java.i
-data/test/tools/javac/annotations/neg/Z11.java.i
+data/test/tools/javac/multicatch/Neg01eff_final.java.i
 data/test/tools/javac/generics/inference/6650759/T6650759f.java.i
+data/test/tools/javac/generics/6677785/T6677785.out.i
 data/src/share/classes/sun/tools/javap/TrapData.java.i
 data/test/tools/javac/generics/typevars/6569404/T6569404b.out.i
 data/test/tools/javac/generics/wildcards/pos/CastTest.java.i
 data/test/tools/javac/InnerTruth.java.i
 data/test/tools/javac/api/6440528/package-info.java.i
-data/test/com/sun/javadoc/testLinkOption/java/lang/StringBuilderChild.java.i
-data/src/share/classes/com/sun/tools/classfile/Descriptor.java.i
-data/test/tools/javadoc/6958836/Test.java.i
+data/test/tools/javac/diags/examples/DuplicateAnnotation.java.i
+data/test/tools/javac/generics/inference/6638712/T6638712d.out.i
 data/test/tools/javac/generics/6476118/T6476118a.out.i
-data/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java.i
+data/test/tools/javac/FlatnameClash2.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java.i
 data/src/share/classes/com/sun/mirror/type/EnumType.java.i
 data/test/tools/javac/generics/Casting4.java.i
-data/test/tools/apt/mirror/type/EnumTyp.java.i
 data/test/tools/javac/enum/ExplicitlyAbstractEnum1.java.i
 data/src/share/classes/com/sun/mirror/declaration/AnnotationValue.java.i
 data/test/tools/javac/Diagnostics/6862608/T6862608a.java.i
-data/src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java.i
 data/test/tools/javac/generics/InheritanceConflict3.java.i
 data/test/tools/javac/unicode/Unmappable.java.i
-data/test/com/sun/javadoc/AccessAsciiArt/p1/C.java.i
 data/test/tools/javac/T5003235/T5003235a.out.i
-data/test/com/sun/javadoc/testThrowsTag/pkg/T1.java.i
 data/test/tools/javac/ConstantValues/test_ff1.java.i
 data/test/tools/javac/T5003235/T5003235b.java.i
-data/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java.i
+data/test/tools/javac/diags/examples/ProcUnclosedTypeFiles/processors/AnnoProc.java.i
 data/test/tools/javac/generics/wildcards/neg/CastWarn8.java.i
 data/test/tools/javac/T6326754.out.i
 data/test/tools/javac/enum/6384542/T6384542a_5.out.i
 data/test/tools/javac/ClassLit.java.i
 data/test/com/sun/javadoc/testThrowsInheritence/I.java.i
-data/test/tools/javac/OverrideChecks/T4720359a.java.i
-data/test/com/sun/javadoc/testHtmlTableTags/pkg1/C1.java.i
-data/test/tools/javac/generics/T6557954.java.i
+data/test/tools/javac/DefiniteAssignment/T4720379.java.i
+data/test/tools/javac/OverrideChecks/InterfaceImplements.java.i
+data/test/tools/javac/generics/wildcards/neg/CastWarn3.java.i
 data/test/tools/javac/enum/enumSwitch/EnumSwitch.java.i
 data/test/tools/javac/ClassFileModifiers/ClassModifiers.java.i
-data/test/tools/javac/7085024/T7085024.java.i
 data/test/tools/javac/generics/inference/T7015715.java.i
 data/test/tools/javadoc/generics/wildcards/expected.out.i
 data/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java.i
 data/test/tools/javac/diags/examples/AlreadyDefined.java.i
 data/test/tools/javac/abstract/T4717181b.java.i
+data/test/tools/javac/diags/examples/ProcFileReopening/processors/AnnoProc.java.i
 data/src/share/classes/com/sun/tools/apt/resources/apt_ja.properties.i
 data/test/tools/javac/annotations/default/A.java.i
 data/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.java.i
@@ -269,10 +267,10 @@ data/test/tools/javac/6521805/T6521805c.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java.i
 data/src/share/classes/com/sun/source/tree/VariableTree.java.i
 data/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java.i
 data/test/tools/javac/Ambig3.java.i
+data/test/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java.i
 data/src/share/classes/javax/lang/model/element/ModuleElement.java.i
-data/test/tools/javac/HexFloatLiterals.java.i
+data/test/tools/javac/generics/wildcards/AssignmentSameType1.java.i
 data/test/tools/javac/multicatch/7030606/T7030606.java.i
 data/test/tools/javac/nested/5009484/X.java.i
 data/test/tools/javac/generics/6487370/T6487370.java.i
@@ -280,58 +278,59 @@ data/test/tools/javac/generics/syntax/6318240/Bar.java.i
 data/test/tools/javac/tree/TreeKindTest.java.i
 data/test/tools/javac/annotations/6550655/T6550655.java.i
 data/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java.i
-data/test/tools/javac/api/6418694/T6418694.java.i
 data/test/tools/javac/protectedAccess/p/SuperClass.java.i
 data/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java.i
 data/src/share/classes/com/sun/tools/javac/comp/Resolve.java.i
 data/test/tools/javac/processing/werror/WErrorLast.java.i
 data/test/tools/javac/processing/warnings/UseImplicit/C1.java.i
-data/test/tools/javah/T6893943.java.i
+data/src/share/classes/com/sun/javadoc/DocErrorReporter.java.i
 data/src/share/classes/javax/lang/model/element/PackageElement.java.i
 data/test/tools/javac/processing/environment/TestSourceVersion.java.i
 data/test/tools/apt/Compile/src/AndAhTwoClass.java.i
+data/test/tools/javac/diags/examples/MulticatchMustBeFinal.java.i
 data/test/com/sun/javadoc/_template/Template.java.i
-data/src/share/classes/com/sun/source/tree/BreakTree.java.i
-data/src/share/classes/com/sun/mirror/type/AnnotationType.java.i
+data/test/tools/javac/6394683/A.java.i
+data/test/tools/javac/generics/inference/6638712/T6638712b.out.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationMirrorImpl.java.i
 data/test/tools/javac/generics/RefEqual.java.i
 data/src/share/classes/com/sun/source/tree/BinaryTree.java.i
 data/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java.i
-data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C1.java.i
+data/test/tools/javac/DefiniteAssignment/T4725725.java.i
 data/test/tools/javac/generics/UncheckedConstructor.java.i
 data/src/share/classes/com/sun/tools/javac/jigsaw/JigsawModuleResolver.java.i
 data/test/tools/javac/mandatoryWarnings/deprecated/Q.java.i
 data/test/tools/javac/6840059/T6840059.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java.i
 data/test/tools/javac/generics/diamond/neg/Neg02.out.i
-data/test/tools/javac/processing/warnings/UseImplicit/TestProcUseImplicitWarning.java.i
-data/test/tools/javac/varargs/6199075/T6199075.java.i
-data/src/share/classes/sun/tools/javap/AttrData.java.i
-data/test/tools/javac/cast/6795580/T6795580.java.i
-data/test/tools/javac/diags/examples/ExceptAlreadyCaught.java.i
+data/test/tools/javac/generics/GetClass2.java.i
+data/src/share/classes/com/sun/tools/javac/code/ModuleIdQuery.java.i
+data/test/tools/javac/staticQualifiedNew/StaticQualifiedNew.java.i
+data/test/tools/javadoc/6964914/TestUserDoclet.java.i
+data/test/tools/javac/generics/inference/7086586/T7086586.out.i
 data/test/tools/javac/6734819/T6734819b.out.i
 data/test/tools/javac/BadOptimization/Switch2.java.i
-data/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo2.java.i
+data/test/tools/javac/ProtectedInnerClass/p1/ProtectedInnerClass1.java.i
 data/test/tools/javac/policy/C.java.i
 data/test/tools/javac/diags/examples/SunApiPluralAdditional/SunApiPluralAdditional.java.i
-data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out.i
+data/test/tools/javac/synthesize/Integer.java.i
 data/test/tools/javac/diags/examples/InexactVarargsCall.java.i
 data/test/tools/javac/mixedTarget/CompatibleAbstracts3.java.i
+data/test/tools/javac/ImportUnnamed/Dummy.java.i
 data/test/tools/javac/scope/6225935/Estatico4.java.i
 data/test/tools/javac/diags/examples/InapplicableSymbols.java.i
-data/test/tools/javac/annotations/neg/NoAnnotationMethods.java.i
+data/test/tools/javac/ClassLiterals/InnerClassLiterals.java.i
 data/test/tools/javac/diags/examples/KindnameConstructor.java.i
-data/test/tools/javac/mandatoryWarnings/unchecked/B.java.i
 data/test/tools/javac/enum/T5081785.java.i
-data/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java.i
+data/test/com/sun/javadoc/testMemberInheritence/pkg/BaseInterface.java.i
 data/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java.i
 data/test/tools/javac/generics/wildcards/T5097548.java.i
 data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/package-info.java.i
 data/test/tools/javac/BadOptimization/DeadCode5.java.i
-data/test/tools/javac/multicatch/Neg02eff_final.out.i
+data/test/tools/javac/diags/examples/AssertAsIdentifier2.java.i
 data/test/tools/javac/6341866/A.java.i
 data/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java.i
+data/test/tools/javac/modules/ModulePermitsAttributeTest01.java.i
 data/test/tools/javac/diags/examples/EnumLabelUnqualified.java.i
 data/test/tools/javac/generics/7007615/acc2/AccessibilityCheck02.out.i
 data/test/tools/javac/T5048776a.out.i
@@ -341,15 +340,13 @@ data/src/share/classes/javax/lang/model/UnknownEntityException.java.i
 data/src/share/classes/com/sun/source/tree/ModuleExportTree.java.i
 data/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.out.i
 data/test/tools/javac/typeAnnotations/attribution/Scopes.java.i
-data/test/tools/javac/foreach/StaticBlock.java.i
+data/test/tools/javac/generics/T6481655.java.i
 data/test/tools/javac/api/T6357331.java.i
 data/src/share/classes/com/sun/tools/javac/jvm/Items.java.i
-data/test/tools/javac/6402516/Checker.java.i
-data/test/tools/javac/ClassLiterals/LiteralInterfaceImpl.java.i
 data/test/tools/javac/generics/inference/6302954/T6476073.java.i
 data/test/tools/javac/modules/ModuleRequiresAttributeTest01.java.i
 data/test/tools/javac/generics/diamond/neg/Neg10.out.i
-data/src/share/classes/com/sun/mirror/type/TypeMirror.java.i
+data/test/tools/javac/processing/messager/6362067/T6362067.java.i
 data/test/tools/javac/annotations/pos/Members.java.i
 data/test/tools/javac/generics/6910550/T6910550a.java.i
 data/src/share/classes/javax/lang/model/type/TypeKind.java.i
@@ -359,23 +356,21 @@ data/test/tools/javac/6402516/CheckIsAccessible.java.i
 data/test/com/sun/javadoc/MetaTag/p1/C1.java.i
 data/test/tools/javac/generics/T6751514.java.i
 data/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java.i
-data/test/tools/javac/api/6437999/Utf8.java.i
-data/test/tools/apt/mirror/declaration/pkg1/AnInterface.java.i
 data/src/share/classes/com/sun/source/tree/Tree.java.i
 data/test/tools/javac/QualifiedAccess/pack1/P1.java.i
 data/test/tools/javac/generics/typevars/6569404/T6569404c.java.i
 data/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java.i
-data/test/com/sun/javadoc/testHtmlTag/pkg2/C2.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java.i
 data/src/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java.i
 data/test/tools/javap/typeAnnotations/NewArray.java.i
 data/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java.i
+data/test/tools/javac/Paths/6638501/HelloLib/test/HelloImpl.java.i
+data/test/tools/javac/generics/rare/Rare2.java.i
 data/test/tools/javac/AccessMethods/ConstructorAccess.java.i
 data/test/tools/javac/ForwardReference/T6676362b.java.i
 data/test/tools/apt/Discovery/servicesPhantomTouch.i
-data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes6.java.i
-data/test/tools/javac/generics/typevars/6486430/T6486430a.java.i
-data/test/tools/javac/cast/6558559/T6558559b.java.i
+data/test/tools/javac/completion/C.out.i
+data/test/tools/javac/processing/6430209/test0.java.i
 data/test/tools/javac/inheritedAccess/P1/pub.java.i
 data/test/tools/javac/T6361619.java.i
 data/test/tools/javac/generics/diamond/pos/Pos07.java.i
@@ -390,7 +385,6 @@ data/test/tools/javac/implicitThis/WhichImplicitThis4.java.i
 data/test/tools/apt/Misc/servicesMisc.i
 data/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java.i
 data/make/netbeans/doclets/README.i
-data/src/share/classes/com/sun/tools/apt/main/Main.java.i
 data/src/share/classes/com/sun/tools/javah/JavahTask.java.i
 data/test/tools/javac/7003595/T7003595b.java.i
 data/test/tools/javac/api/T6437138.java.i
@@ -398,12 +392,10 @@ data/test/tools/javac/ConditionalArgTypes_1.java.i
 data/test/tools/javac/boxing/NoBoxingByte.java.i
 data/test/tools/javac/NonStaticFieldExpr2.sh.i
 data/src/share/classes/com/sun/tools/javap/Options.java.i
-data/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java.i
+data/test/tools/javac/miranda/6964669/pkg/B.java.i
 data/src/share/classes/com/sun/source/tree/AnnotatedTypeTree.java.i
 data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/C3.java.i
-data/test/tools/javac/boxing/NoBoxingFloat.java.i
-data/test/tools/javac/generics/6956758/T6956758pos.java.i
-data/test/tools/javac/AnonInnerException_2.java.i
+data/test/tools/javac/ConstCharAppend.java.i
 data/test/tools/apt/Basics/p1/p2/C1.java.i
 data/test/tools/javac/SynthName2.java.i
 data/test/tools/javac/annotations/neg/Constant.java.i
@@ -414,37 +406,37 @@ data/test/tools/javac/LabelHiding_1.java.i
 data/src/share/classes/com/sun/tools/javac/code/Kinds.java.i
 data/src/share/classes/com/sun/source/tree/Scope.java.i
 data/test/tools/javac/6330997/T6330997.java.i
+data/test/tools/javadoc/enum/docComments/pkg1/Operation.java.i
 data/test/tools/javac/ClassLiterals/LiteralInterface_3.java.i
 data/test/tools/javac/util/list/TList.java.i
 data/test/com/sun/javadoc/testParamTaglet/pkg/Parent.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java.i
+data/test/tools/javac/diags/examples/ApplicableMethodFound1.java.i
 data/test/tools/javac/rawDiags/Note.java.i
-data/test/tools/javac/generics/diamond/neg/Neg02.java.i
 data/test/com/sun/javadoc/testBadSourceFile/C1.java.i
-data/test/tools/javac/treepostests/TreePosTest.java.i
-data/test/com/sun/javadoc/testAnnotationTypes/pkg/AnnotationType.java.i
 data/test/tools/javac/diags/examples/ProcPackageDoesNotExist/ProcPackageDoesNotExist.java.i
 data/test/tools/javac/diags/examples/EmptyIf.java.i
 data/test/tools/javac/InheritedPrivateImpl.java.i
 data/src/share/classes/javax/annotation/processing/FilerException.java.i
-data/test/tools/javac/fatalErrors/NoJavaLang.sh.i
+data/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out.i
 data/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.out.i
+data/test/tools/javac/EmptyBreak.java.i
 data/test/tools/javac/InterfaceMemberClassModifiers.java.i
 data/test/tools/javac/api/6557752/T6557752.java.i
-data/test/tools/javac/generics/inference/7086601/T7086601a.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_6.java.i
 data/test/tools/javac/generics/inference/6650759/T6650759h.java.i
-data/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java.i
-data/src/share/classes/javax/annotation/processing/SupportedOptions.java.i
+data/test/tools/javac/processing/model/type/MirroredTypeEx/OverEager.java.i
 data/test/tools/javac/generics/GenericMerge.java.i
 data/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.java.i
 data/test/tools/javac/util/filemanager/TestName.java.i
-data/test/tools/apt/mirror/type/AnnoTyp.java.i
+data/test/tools/apt/Scanners/Scanner.java.i
 data/test/tools/javac/depOverrides/doccomment/R.java.i
-data/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out.i
+data/test/tools/apt/Compile/Rounds.java.i
 data/test/com/sun/javadoc/testJavascript/TestJavascript.java.i
 data/test/tools/javac/diags/examples/ImportRequiresCanonical/p/Base.java.i
 data/test/tools/javac/policy/test1/D.java.i
 data/test/tools/javac/depOverrides/doccomment/B3.java.i
+data/test/tools/javac/lambda/LambdaParserTest.java.i
 data/test/tools/javac/scope/6225935/T6381787.java.i
 data/src/share/classes/com/sun/tools/apt/util/Bark.java.i
 data/test/tools/javac/PackageClassClash/PackageClassClash.java.i
@@ -458,26 +450,25 @@ data/src/share/classes/com/sun/tools/javac/jvm/CRTFlags.java.i
 data/test/tools/javac/DefiniteAssignment/DefAssignAfterThis_2.java.i
 data/test/tools/javac/diags/examples/IllegalNonAsciiDigit.java.i
 data/test/tools/javac/processing/errors/TestFatalityOfParseErrors.java.i
-data/test/tools/javac/api/6431435/A.java.i
+data/src/share/opensource/javac/nbproject/project.xml.i
 data/test/tools/javac/diags/examples/OperatorCantBeApplied1.java.i
+data/test/tools/javac/diags/examples/PrintRounds/processors/AnnoProc.java.i
 data/test/tools/javac/annotations/neg/Z15.java.i
 data/src/share/classes/com/sun/tools/javac/api/JavacTool.java.i
 data/test/com/sun/javadoc/testGroupOption/pkg2/C.java.i
 data/test/tools/javac/depOverrides/annotation/I.java.i
 data/test/tools/apt/Misc/misc.sh.i
-data/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationMaker.java.i
 data/test/tools/javac/depOverrides/doccomment/I.java.i
 data/test/tools/javac/ExtDirs/ExtDirs.sh.i
-data/test/tools/javac/generics/wildcards/pos/InstanceOf.java.i
-data/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java.i
+data/test/tools/javac/varargs/T7013865.java.i
 data/src/share/classes/com/sun/tools/javah/JavahFileManager.java.i
 data/test/tools/javac/annotations/neg/Z16.java.i
 data/test/tools/javac/processing/options/testPrintProcessorInfo/Test.out.i
 data/src/share/classes/com/sun/javadoc/MemberDoc.java.i
-data/test/tools/javac/failover/FailOver12.java.i
+data/test/tools/javac/boxing/NoBoxingLong.java.i
 data/src/share/classes/com/sun/tools/javac/util/FatalError.java.i
 data/test/tools/javac/diags/examples/DiamondNotSupported.java.i
-data/test/tools/javac/OverrideChecks/T4720356b.java.i
+data/test/tools/javac/innerClassFile/x/C.java.i
 data/src/share/classes/javax/tools/OptionChecker.java.i
 data/test/tools/javac/diags/examples/UnclosedComment.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java.i
@@ -490,72 +481,78 @@ data/test/tools/javac/jvm/T7024096.java.i
 data/test/com/sun/javadoc/testMemberInheritence/diamond/X.java.i
 data/test/tools/javac/capture/Capture3.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java.i
+data/test/tools/javac/generics/6207386/T6207386.java.i
 data/test/tools/javac/cast/6219964/T6219964.java.i
+data/test/tools/javac/6668794/badSource/Test.java.i
 data/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.java.i
 data/test/tools/javac/StringsInSwitch/StringSwitches.java.i
 data/test/tools/javac/ObjectMethodRefFromInterface.java.i
-data/src/share/classes/com/sun/tools/javac/resources/legacy.properties.i
+data/test/tools/javac/links/T.java.i
 data/test/com/sun/javadoc/AccessAsciiArt/p1/subpkg/SSC.java.i
 data/test/tools/javac/cast/6211853/T6211853.java.i
 data/test/tools/javac/generics/wildcards/neg/Capture.java.i
 data/test/tools/javac/generics/7007615/T7007615.java.i
 data/test/tools/javac/typeAnnotations/newlocations/MethodTypeParameters.java.i
-data/test/tools/javac/diags/examples/ArrayAndVarargs.java.i
+data/test/tools/javac/diags/examples/InitializerMustComplete.java.i
 data/test/tools/javac/generics/7034511/T7034511b.out.i
 data/test/tools/javac/mandatoryWarnings/deprecated/Test5b.out.i
 data/test/tools/javac/generics/compat/OverrideBridge1.java.i
+data/test/tools/apt/mirror/declaration/AnnoTypeElemDecl.java.i
 data/test/tools/javac/generics/Multibound1.java.i
-data/test/tools/javac/7079713/TestCircularClassfile.java.i
+data/test/tools/javac/diags/examples/WhereTypeVar.java.i
 data/test/tools/javac/diags/examples/OverrideUncheckedThrown.java.i
 data/src/share/classes/com/sun/tools/classfile/ModuleMemberTable_attribute.java.i
 data/test/tools/javac/processing/errors/TestReturnCode.java.i
+data/test/tools/javac/cast/6558559/T6558559a.java.i
+data/test/tools/javac/TryWithResources/BadTwrSyntax.out.i
 data/test/tools/javac/TryWithResources/TwrSuppression.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java.i
 data/test/tools/javac/generics/typevars/5061359/Base.java.i
+data/test/tools/javac/ClassFileModifiers/MemberModifiers.out.i
 data/test/tools/javac/CyclicInheritance6/p1/A.java.i
-data/test/com/sun/javadoc/testHrefInDocComment/pkg/I1.java.i
+data/test/tools/javac/DuplicateClass2.java.i
 data/test/tools/javac/generics/6245699/T6245699c.java.i
 data/test/tools/javac/varargs/7042566/T7042566.java.i
 data/test/tools/javac/7023703/T7023703pos.java.i
-data/test/tools/javac/diags/examples/WarnForwardRef.java.i
+data/test/tools/javac/protectedAccess/ProtectedMemberAccess4.out.i
 data/test/tools/javap/classfile/6888367/T6888367.java.i
-data/test/tools/javac/generics/6985719/T6985719b.java.i
+data/test/tools/javac/policy/test1/A.java.i
 data/test/tools/javac/generics/6531075/T6531075.java.i
 data/test/com/sun/javadoc/testBadSourceFile/C2.java.i
 data/test/tools/javac/diags/examples/ElseWithoutIf.java.i
 data/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java.i
+data/test/tools/javac/warnings/7090499/T7090499.java.i
 data/test/tools/javac/MemberTypeInheritance.java.i
 data/test/tools/javac/ClassIsAbstract.java.i
 data/test/tools/javac/generics/diamond/neg/Neg05.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java.i
 data/test/tools/javac/diags/examples/BadSourceFileHeader/sourcepath/p/A.java.i
 data/src/share/classes/com/sun/mirror/type/ClassType.java.i
-data/test/com/sun/javadoc/testHref/pkg/C3.java.i
+data/test/tools/javac/processing/filer/TestValidRelativeNames.java.i
+data/test/tools/javac/depOverrides/annotation/B3.java.i
 data/src/share/classes/com/sun/mirror/util/TypeVisitor.java.i
 data/test/tools/javap/stackmap/T6271292.out.i
 data/test/tools/javac/TryWithResources/ResourceOutsideTry.java.i
 data/test/com/sun/javadoc/testMemberInheritence/pkg/SubClass.java.i
 data/src/share/classes/com/sun/tools/javac/file/ZipFileIndexEntry.java.i
 data/test/com/sun/javadoc/testTitleInHref/pkg/Interface.java.i
-data/test/tools/apt/mirror/declaration/PackageDecl.java.i
 data/test/tools/javac/mandatoryWarnings/deprecated/Test4c.out.i
 data/src/share/classes/javax/lang/model/element/ElementKind.java.i
 data/src/share/classes/com/sun/mirror/apt/AnnotationProcessorFactory.java.i
 data/test/tools/javac/depOverrides/doccomment/P.java.i
 data/test/tools/apt/mirror/util/Overrides.java.i
 data/test/tools/javac/generics/CyclicInheritance5.java.i
-data/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java.i
+data/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out.i
 data/test/tools/javac/diags/examples/CyclicInheritance.java.i
 data/test/tools/javac/6402516/TestLocalElements.java.i
 data/test/tools/javac/depOverrides/annotation/A.java.i
 data/test/tools/javac/typeAnnotations/failures/AnnotationVersion.java.i
-data/test/tools/apt/mirror/declaration/ConstructorDecl.java.i
 data/test/tools/javac/Diagnostics/6722234/T6722234a.java.i
 data/test/tools/javac/api/T6877206.java.i
 data/test/tools/javac/generics/T6391995.java.i
 data/test/tools/javac/mixedTarget/CompatibleAbstracts5.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java.i
 data/make/netbeans/common/standard-ide-actions-no-javadoc.ent.i
+data/test/tools/javac/depDocComment/DeprecatedDocComment4.java.i
 data/test/tools/javac/cast/6932571/T6932571a.java.i
 data/test/tools/javac/generics/rawSeparate/Hashtable.java.i
 data/src/share/classes/com/sun/source/util/TreeScanner.java.i
@@ -563,44 +560,47 @@ data/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotation
 data/src/share/classes/com/sun/tools/classfile/Dependencies.java.i
 data/test/tools/javac/api/6400303/T6400303.java.i
 data/test/tools/javac/miranda/4711056/T3.java.i
-data/test/tools/javac/InitializerCompletion_3.java.i
 data/test/tools/apt/mirror/declaration/pkg1/AnAnnoType.java.i
 data/test/tools/javac/FaultySignature.java.i
 data/test/com/sun/javadoc/ValidHtml/p1/C.java.i
 data/test/tools/javac/InconsistentInheritedSignature.java.i
 data/src/share/classes/com/sun/source/tree/TryTree.java.i
 data/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.java.i
-data/src/share/classes/com/sun/source/tree/LabeledStatementTree.java.i
+data/test/tools/javac/generics/wildcards/neg/CastWarn11.java.i
+data/test/tools/javac/Diagnostics/6722234/T6722234d.java.i
 data/test/tools/javac/warnings/6747671/T6747671.java.i
 data/make/tools/CompileProperties/CompilePropertiesTask.java.i
 data/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java.i
+data/src/share/classes/com/sun/tools/javac/code/ModuleId.java.i
 data/test/tools/apt/mirror/declaration/InterfaceDecl.java.i
 data/test/tools/javadoc/annotations/annotateParams/pkg1/A.java.i
-data/src/share/classes/com/sun/source/tree/ImportTree.java.i
-data/test/com/sun/javadoc/AccessSummary/AccessSummary.java.i
+data/test/tools/javac/api/TestGetTree.java.i
 data/test/tools/javac/enum/forwardRef/T6425594.java.i
 data/test/tools/javac/DefiniteAssignment/DALoop1.java.i
 data/test/tools/javac/staticImport/Shadow.java.i
+data/test/tools/javac/processing/6350124/Marker.java.i
 data/test/tools/javac/CompoundBox.java.i
+data/test/tools/javap/typeAnnotations/Presence.java.i
 data/test/tools/apt/Discovery/servicesTweedle.i
+data/test/tools/javac/resolve/Candidate.java.i
 data/test/tools/javac/diags/examples/KindnameInstanceInit.java.i
 data/test/tools/javac/generics/6192945/Neg2.java.i
-data/test/com/sun/javadoc/testDupParamWarn/pkg/Bar.java.i
+data/test/tools/javac/miranda/6964669/pkg/C.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java.i
-data/test/com/sun/javadoc/testModifier/Interface.java.i
+data/test/tools/javac/TryWithResources/T7022711.java.i
+data/test/tools/javac/diags/examples/SunApiFilename.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/util/TypesImpl.java.i
 data/src/share/classes/javax/lang/model/util/Types.java.i
 data/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out.i
-data/test/tools/javac/T5048776.java.i
 data/src/share/classes/com/sun/tools/javac/code/Scope.java.i
 data/src/share/classes/com/sun/tools/javap/Main.java.i
 data/src/share/classes/com/sun/tools/javac/jvm/ByteCodes.java.i
 data/src/share/classes/com/sun/source/tree/SynchronizedTree.java.i
 data/test/tools/javac/diags/examples/TryResourceThrowsInterruptedExc.java.i
-data/test/tools/apt/Compile/servicesRound1.i
+data/test/tools/javac/processing/environment/round/BuriedAnnotations.java.i
 data/test/tools/javac/diags/examples/EnumCantBeInstantiated.java.i
 data/test/tools/javac/diags/examples/NeitherConditionalSubtype.java.i
-data/test/tools/javac/generics/GenericAnonCtor.java.i
+data/test/tools/javac/InnerNamedConstant_1.java.i
 data/test/tools/apt/Basics/ParameterAnnotations.java.i
 data/src/share/classes/com/sun/tools/classfile/ClassFile.java.i
 data/test/tools/javac/generics/inference/6638712/T6638712b.java.i
@@ -611,41 +611,39 @@ data/test/tools/javac/generics/inference/6938454/T6938454b.java.i
 data/test/tools/javac/6902720/Test.java.i
 data/test/tools/javac/diags/examples/InnerClassCantHaveStatic.java.i
 data/test/tools/javac/mandatoryWarnings/deprecated/Test4b.out.i
-data/test/tools/javac/CyclicInheritance.out.i
+data/src/share/classes/com/sun/tools/javah/Mangle.java.i
 data/test/tools/javac/diags/examples/EnumAsIdentifier2.java.i
 data/test/com/sun/javadoc/testSupplementary/TestSupplementary.java.i
 data/src/share/classes/com/sun/tools/javac/jvm/Pool.java.i
-data/src/share/classes/javax/tools/StandardJavaFileManager.java.i
+data/test/com/sun/javadoc/testThrowsInheritence/C.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java.i
 data/test/tools/javac/6400872/T6400872.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/VarArgs.java.i
-data/test/tools/javac/StringsInSwitch/RepeatedStringCaseLabels1.java.i
+data/test/tools/javac/failover/FailOver11.java.i
 data/test/tools/javac/DefiniteAssignment/T4718134.java.i
 data/make/test/bootstrap/javac.sh.i
 data/src/share/classes/com/sun/source/util/package-info.java.i
 data/test/tools/javac/diags/examples/CantReturnValueForVoid.java.i
-data/test/tools/javac/annotations/neg/Z1.java.i
 data/test/tools/javac/generics/6359951/T6359951.out.i
 data/test/tools/javac/varargs/6313164/T6313164.out.i
 data/src/share/bin/launcher.sh-template.i
 data/test/tools/javac/DefiniteAssignment/7003744/T7003744b.java.i
-data/test/com/sun/javadoc/testValueTag/TestValueTag.java.i
 data/src/share/classes/com/sun/tools/javac/parser/JavacParser.java.i
 data/test/tools/javac/diags/examples/UnmatchedProcessorOptions/UnmatchedProcessorOptions.java.i
 data/test/com/sun/javadoc/JavascriptWinTitle/package-list.i
 data/test/tools/javac/6734819/T6734819a.java.i
-data/test/tools/javac/generics/syntax/6318240/BarNeg2a.java.i
 data/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java.i
 data/test/tools/javac/6342411/a/Pub.java.i
-data/test/com/sun/javadoc/testMemberInheritence/diamond/Z.java.i
 data/test/tools/apt/Discovery/Dee.java.i
-data/src/share/classes/com/sun/tools/javac/comp/AttrContext.java.i
-data/test/tools/javac/enum/enumSwitch/Color2.java.i
+data/test/tools/javac/generics/inference/6838943/T6838943.java.i
+data/test/tools/javac/modules/ModuleProvidesAttributeTest01.java.i
+data/test/tools/javac/annotations/neg/MemberOver.java.i
 data/test/tools/javac/danglingDep/Test1.out.i
-data/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java.i
+data/test/com/sun/javadoc/testBackSlashInLink/C.java.i
 data/test/tools/javap/T6305779.java.i
-data/test/tools/javadoc/parser/7091528/T7091528.java.i
+data/test/tools/javac/diags/examples/ApplicableMethodFound.java.i
 data/test/tools/javac/generics/diamond/7030150/Pos02.java.i
+data/test/tools/javac/api/T6430241.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/package.html.i
 data/test/tools/javac/TryWithResources/TwrLint.out.i
 data/test/tools/javac/ClassLiterals/InitializeTarget.java.i
@@ -653,34 +651,35 @@ data/src/share/classes/com/sun/tools/javac/main/Main.java.i
 data/src/share/classes/com/sun/mirror/apt/Filer.java.i
 data/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/Wildcards.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_16.java.i
-data/test/tools/javac/T7042623.java.i
-data/test/com/sun/javadoc/testRelativeLinks/pkg/C.java.i
+data/test/tools/javac/processing/model/util/Superless.java.i
+data/test/tools/javah/6572945/gold/jni.file.3.i
+data/test/com/sun/javadoc/testRelativeLinks/pkg/C.java.i
 data/test/tools/javac/enum/FauxSpecialEnum1.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java.i
+data/test/tools/javac/NonStaticFinalVar.java.i
+data/test/tools/javah/ConstMacroTest.sh.i
 data/test/tools/javah/6572945/gold/jni.file.2.i
-data/test/tools/javac/fatalErrors/NoJavaLang.out.i
-data/src/share/classes/com/sun/source/util/AbstractTypeProcessor.java.i
+data/test/tools/javac/protectedInner/mypackage/Superclass.java.i
+data/test/tools/javac/ClassPathTest/ClassPathTest2.java.i
 data/test/tools/javap/T4501661.java.i
 data/test/com/sun/javadoc/testPackagePage/TestPackagePage.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java.i
 data/test/tools/javac/ExtDirs/ext3/pkg1.jar.i
-data/src/share/classes/com/sun/tools/javadoc/SerializedForm.java.i
+data/test/com/sun/javadoc/testTaglets/TestTaglets.java.i
 data/test/tools/javac/diags/examples/VarMightAlreadyBeAssigned.java.i
 data/test/tools/javac/T6557865.java.i
 data/test/com/sun/javadoc/testTagInheritence/firstSentence/B.java.i
 data/test/tools/javac/depOverrides/annotation/Test2.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java.i
-data/test/tools/javac/generics/6294779/T6294779a.java.i
 data/test/tools/javac/6440583/T6440583.java.i
 data/test/tools/javac/InnerClassesAttribute/Outside.class.i
 data/test/tools/javac/typeAnnotations/failures/AnnotationVersion.out.i
 data/src/share/classes/com/sun/tools/javah/MainDoclet.java.i
 data/test/tools/javac/cast/6467183/T6467183a.out.i
 data/test/tools/javac/generics/T4695415.java.i
+data/test/tools/javac/generics/inference/6650759/T6650759e.java.i
 data/test/tools/javac/generics/inference/6638712/T6638712e.java.i
-data/src/share/classes/com/sun/tools/javac/api/Messages.java.i
-data/test/tools/apt/Compile/ErrorAPF.java.i
+data/test/tools/javac/diags/examples/ProcessorNotFound.java.i
 data/src/share/classes/javax/annotation/processing/Messager.java.i
 data/test/tools/javac/LocalClasses_2.sh.i
 data/test/tools/javac/staticImport/ImportInherit.java.i
@@ -695,30 +694,33 @@ data/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java.i
 data/test/tools/javac/generics/6711619/T6711619a.java.i
 data/test/tools/javac/generics/inference/6356673/T6365166.java.i
 data/test/tools/javac/enum/DA1.java.i
-data/test/tools/apt/Compile/HelloWorld.java.i
+data/test/tools/javac/diags/examples/MethodDoesNotOverride.java.i
 data/make/netbeans/apt/README.i
 data/make/test/HelloWorld.apt.gold.txt.i
 data/test/tools/javac/diags/examples/VarargsPlural/VarargsFilename.java.i
 data/test/com/sun/javadoc/testUseOption/pkg1/UsedClass.java.i
 data/src/share/classes/javax/lang/model/type/PrimitiveType.java.i
-data/test/tools/javac/T6356217/T6356217.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java.i
+data/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java.i
+data/test/tools/javac/classreader/T7031108.java.i
+data/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java.i
+data/test/tools/javac/6402516/CheckClass.java.i
 data/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java.i
 data/test/tools/apt/Basics/goldenAggregate.txt.i
 data/test/tools/javac/processing/model/element/TestAnonClassNames.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_13.java.i
+data/test/tools/javac/generics/6245699/T6245699a.java.i
 data/src/share/classes/com/sun/source/tree/CatchTree.java.i
 data/make/test/bootstrap/javadoc.sh.i
-data/src/share/classes/com/sun/source/util/TaskListener.java.i
-data/test/tools/javac/generics/GenLit1.java.i
-data/test/tools/javac/diags/examples/CannotCreateArrayWithDiamond.java.i
-data/test/com/sun/javadoc/testHtmlTableTags/pkg2/package-info.java.i
+data/test/tools/apt/Compile/WarnAPF.java.i
+data/test/tools/javac/meth/XlintWarn.java.i
 data/test/tools/javac/varargs/Varargs1.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java.i
 data/src/share/classes/com/sun/tools/javah/resources/Linux_sparc.properties.i
+data/test/tools/javac/EmptyDocComments.java.i
 data/test/tools/javac/T6435291/T.class.i
+data/test/tools/javac/TryWithResources/TwrInference.java.i
 data/test/tools/javac/diags/examples/UncheckedFilename.java.i
-data/src/share/classes/com/sun/tools/javac/util/Context.java.i
+data/test/tools/javadoc/dupOk/sp1/p/A.java.i
+data/test/tools/javadoc/dupOk/sp2/p/B.java.i
 data/test/tools/javac/processing/filer/foo/bar/package-info.java.i
 data/test/tools/javac/api/TestResolveIdent.java.i
 data/test/tools/javac/T6247324.java.i
@@ -729,12 +731,14 @@ data/test/tools/javac/annotations/neg/Z4.java.i
 data/test/tools/javac/StoreClass.java.i
 data/test/tools/javac/cast/6358534/T6358534.java.i
 data/test/tools/javac/T6458749.java.i
-data/test/tools/javac/T6406771.java.i
-data/test/tools/javac/DefiniteAssignment/DUBeforeDefined2.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_9.java.i
+data/test/tools/javac/generics/inference/6638712/T6638712a.out.i
+data/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java.i
+data/test/tools/javac/diags/examples/ImproperTypeInnerRawParam.java.i
 data/test/tools/javadoc/generics/wildcards/Main.java.i
 data/test/tools/javac/cast/6507317/T6507317.java.i
 data/test/tools/javac/annotations/pos/Primitives.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/background.gif.i
+data/test/tools/javac/generics/wildcards/AssignmentSameType6.java.i
 data/test/tools/javac/ImportUnnamed/foo/A.java.i
 data/test/tools/javac/api/TestResolveError.java.i
 data/test/tools/javac/ArrayCloneCodeGen.java.i
@@ -743,30 +747,31 @@ data/test/tools/javac/processing/6994946/SyntaxErrorTest.java.i
 data/src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java.i
 data/test/tools/javac/synthesize/Void.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java.i
-data/test/tools/javac/generics/wildcards/UnboundArray.java.i
+data/test/tools/javac/p1/BS.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java.i
 data/test/tools/javac/abstract/T3.java.i
-data/test/tools/javac/generics/diamond/neg/Neg01.out.i
 data/test/com/sun/javadoc/testSourceTab/SingleTab/C.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java.i
-data/test/tools/javac/generics/Nonlinear.java.i
-data/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded1/testfile.txt.i
+data/test/tools/javac/InterfaceOverrideFinal.java.i
+data/test/tools/javac/generics/7022054/T7022054neg1.java.i
+data/test/tools/javadoc/annotations/defaults/expected.out.i
 data/test/tools/apt/Basics/apt.sh.i
 data/src/share/classes/com/sun/tools/javac/util/Filter.java.i
 data/test/tools/javac/miranda/T4666866.out.i
 data/test/tools/javac/nested/5009484/Y.java.i
 data/test/tools/javac/diags/examples/ExceptNeverThrown.java.i
-data/test/tools/javac/BadAnnotation.java.i
+data/test/tools/javac/InnerNamedConstant_2.out.i
 data/test/tools/javac/unicode/UnicodeCommentDelimiter.java.i
 data/test/tools/apt/Compile/servicesStaticApf.i
 data/test/tools/javadoc/generics/tparamCycle/Main.java.i
 data/test/tools/javac/diags/examples/InvalidHexNumber.java.i
 data/test/tools/javac/6521805/T6521805a_1.out.i
 data/test/tools/javadoc/annotations/elementTypes/expected.out.i
-data/test/tools/javac/AccessMethods/UplevelPrivateConstants.java.i
+data/test/tools/javac/generics/BridgeClash.java.i
 data/test/tools/javac/diags/examples/ImportRequiresCanonical/ImportRequiresCanonical.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java.i
 data/test/tools/javac/ExtendsAccess/p/ExtendsAccess.java.i
+data/test/tools/javap/typeAnnotations/ClassLiterals.java.i
 data/test/tools/javac/IllegallyOptimizedException.java.i
 data/test/tools/apt/Discovery/Empty.java.i
 data/test/tools/javac/diags/examples/WarnSyntheticNameConflict.java.i
@@ -778,52 +783,52 @@ data/test/tools/javac/generics/CyclicInheritance3.java.i
 data/test/tools/javac/apt.sh.i
 data/test/com/sun/javadoc/testEmptyClass/src/Empty.java.i
 data/src/share/classes/javax/lang/model/element/Name.java.i
-data/test/tools/javac/cast/6467183/T6467183a.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java.i
+data/test/tools/javac/multicatch/Pos10.java.i
 data/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties.i
 data/test/tools/javac/multicatch/Pos06.java.i
-data/test/tools/javac/generics/MissingCast.java.i
 data/test/tools/javac/NonAmbiguousField/two/Child.java.i
+data/src/share/classes/com/sun/tools/javac/main/Option.java.i
 data/src/share/classes/com/sun/tools/javah/LLNI.java.i
 data/test/tools/javac/DefiniteAssignment/T4718142.java.i
 data/test/tools/javac/6342411/a/Base.java.i
 data/test/tools/javac/meth/InvokeDynTrans.out.i
 data/test/tools/javac/typeAnnotations/failures/LintCast.out.i
-data/test/tools/javac/ClassToTypeParm.java.i
+data/test/tools/javac/generics/Covar2.java.i
 data/test/tools/javac/miranda/4686148/AbstractTest.java.i
 data/test/tools/javac/ImportCycle/foo/Middle.java.i
 data/src/share/classes/com/sun/tools/classfile/StackMap_attribute.java.i
 data/test/com/sun/javadoc/testSourceTab/TestSourceTab.java.i
 data/test/tools/javadoc/annotations/shortcuts/pkg1/Marker.java.i
-data/test/tools/javac/diags/examples/IllegalComboModifiers.java.i
 data/test/tools/javac/meth/MakeNegTests.sh.i
 data/test/tools/javac/OverrideChecks/6199153/T6199153.out.i
+data/test/tools/javac/SynthName1.java.i
 data/test/com/sun/javadoc/testCmndLineClass/pkg1/C1.java.i
-data/test/tools/javac/SuperNew2.java.i
-data/test/tools/javac/api/6421756/T6421756.java.i
+data/test/tools/apt/Options/OptionChecker.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/declaration/ExecutableDeclarationImpl.java.i
 data/test/tools/javac/InterfaceInInner.out.i
-data/make/netbeans/apt/nbproject/project.xml.i
 data/test/tools/javac/ForwardReference/ForwardReference_4.java.i
 data/test/tools/javac/diags/examples/NotWithinBounds.java.i
 data/test/tools/javac/enum/T6675483.java.i
 data/make/build.properties.i
-data/test/tools/javac/DefiniteAssignment/T4720379.java.i
+data/test/tools/javac/OverrideChecks/T4720359a.java.i
 data/test/tools/javac/ExprQualifiedType.java.i
 data/test/tools/javac/generics/syntax/6318240/Foo.java.i
-data/test/tools/javac/6410653/T6410653.java.i
+data/test/tools/javac/T5003235/T5003235b.out.i
+data/test/tools/javac/T6873849.java.i
 data/test/tools/javac/diags/examples/VarargsNonReifiableType.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/type/VoidTypeImpl.java.i
 data/test/tools/javac/NonStaticFieldExpr3.sh.i
 data/src/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java.i
 data/test/tools/javac/file/T7068451.java.i
 data/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignAfterIf_2.java.i
-data/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java.i
+data/test/tools/javac/cast/6932571/T6932571neg.java.i
 data/test/tools/javac/4880220/T4880220.empty.out.i
 data/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.java.i
-data/test/com/sun/javadoc/testJavascript/pkg/C.java.i
+data/test/tools/javac/cast/5034609/T5034609.java.i
 data/test/tools/javac/Parens2.java.i
 data/test/tools/javac/cast/6932571/T6932571b.java.i
+data/src/share/classes/com/sun/tools/javac/util/Log.java.i
 data/src/share/classes/com/sun/source/tree/ArrayAccessTree.java.i
 data/test/tools/apt/Basics/annot/AnnotSimple.java.i
 data/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.java.i
@@ -837,54 +842,54 @@ data/test/tools/javac/ExtDirs/ExtDirTest_2.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/package.html.i
 data/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java.i
 data/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java.i
+data/test/tools/javac/quid/MakeNegTests.sh.i
 data/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateInterface.java.i
 data/test/tools/javac/api/6406133/T6406133.java.i
-data/test/tools/javac/generics/Covar2.java.i
 data/test/tools/javac/unit/T6198196.java.i
-data/src/share/classes/com/sun/tools/classfile/package.html.i
+data/test/tools/javac/generics/ErasureClashCrash.java.i
+data/test/tools/javac/processing/model/util/elements/doccomments/a/First.java.i
 data/test/tools/javac/6835430/T6835430.java.i
 data/test/com/sun/javadoc/testNestedInlineTag/testtaglets/BoldTaglet.java.i
-data/src/share/opensource/javac/nbproject/project.xml.i
+data/test/tools/javac/api/6431435/A.java.i
 data/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedPlural.java.i
 data/test/tools/javap/T6587786.java.i
-data/test/tools/javac/diags/examples/ProcUseImplicit/processors/AnnoProc.java.i
 data/make/test/lib/src.sh.i
 data/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java.i
 data/test/tools/apt/Scanners/servicesScanner.i
-data/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java.i
 data/test/com/sun/javadoc/PackagesHeader/p1/C1.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/declaration/MethodDeclarationImpl.java.i
 data/test/com/sun/javadoc/AuthorDD/p1/C1.java.i
-data/test/com/sun/javadoc/testHiddenMembers/pkg/SubClass.java.i
-data/test/tools/javac/generics/wildcards/T5097548b.java.i
-data/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java.i
+data/src/share/classes/com/sun/tools/javac/code/Source.java.i
+data/test/tools/javac/7086595/T7086595.java.i
 data/test/tools/javac/diags/examples/ProcIllegalFileName/ProcIllegalFileName.java.i
 data/test/tools/javac/generics/inference/6356673/Test.java.i
 data/test/tools/javac/diags/examples/NotEnclClass.java.i
-data/test/tools/javac/api/TestJavacTask.java.i
-data/test/com/sun/javadoc/testThrowsInheritence/C.java.i
+data/test/tools/javac/varargs/warning/Warn5.java.i
 data/test/tools/javac/generics/6182950/T6182950c.java.i
 data/test/tools/javac/depOverrides/annotation/R.java.i
+data/test/tools/javac/generics/wildcards/ContraArg.java.i
 data/test/tools/javac/generics/6910550/T6910550c.out.i
 data/test/tools/javac/api/TestContainTypes.java.i
 data/test/tools/javac/expression/ObjectAppend.java.i
-data/src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java.i
+data/test/com/sun/javadoc/AccessSummary/AccessSummary.java.i
 data/test/tools/javac/generics/compat/CovariantCompat1.java.i
-data/src/share/classes/com/sun/tools/javac/code/Lint.java.i
+data/test/tools/javap/classfile/deps/GetDeps.java.i
 data/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java.i
+data/test/com/sun/javadoc/AccessFrameTitle/p2/C2.java.i
 data/test/tools/javac/6902720/E1.java.i
 data/test/tools/javac/diags/examples/IllegalForwardRef.java.i
 data/test/tools/javac/6547131/p/Outer$I.jasm.i
+data/test/tools/javadoc/FlagsTooEarly.java.i
 data/test/com/sun/javadoc/testPackagePage/com/pkg/package.html.i
 data/test/tools/javac/diags/examples/CantResolveLocationArgsParams.java.i
-data/test/tools/javac/OuterParameter_1.java.i
+data/test/tools/javac/T4093617/T4093617.java.i
+data/test/tools/javac/ExtDirs/ext2/pkg2.jar.i
 data/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccess/p/C.java.i
 data/test/tools/javac/depOverrides/doccomment/Test2R.out.i
 data/test/tools/javac/T6534287.java.i
 data/src/share/opensource/javac/Makefile.i
 data/test/tools/javac/multicatch/7005371/SubTest.java.i
 data/test/tools/javac/api/6731573/T6731573.java.i
-data/test/tools/apt/Compile/WrappedStaticApf.java.i
 data/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java.i
 data/test/tools/javac/6668794/badSource/Test.out.i
 data/test/tools/javac/IllDefinedOrderOfInit.java.i
@@ -892,10 +897,11 @@ data/test/tools/javac/Paths/6638501/JarFromManifestFailure.java.i
 data/test/tools/javac/diags/examples/ProcCantFindClass/processors/AnnoProc.java.i
 data/test/tools/javac/generics/typevars/4856983/T4856983a.java.i
 data/test/tools/javac/processing/filer/TestFilerConstraints.java.i
+data/test/tools/javac/varargs/5088429/T5088429Neg02.java.i
 data/test/tools/javac/generics/diamond/6996914/T6996914b.java.i
 data/test/tools/javac/generics/BridgeOrder.java.i
 data/test/tools/javac/CloneableProblem.java.i
-data/test/tools/javac/multicatch/Pos10.java.i
+data/test/tools/javac/api/TestGetElement.java.i
 data/test/tools/javac/mandatoryWarnings/deprecated/Test4d.out.i
 data/test/tools/apt/mirror/declaration/AnnoVal.java.i
 data/test/tools/javac/diags/examples/InaccessibleVarargsType/p1/B.java.i
@@ -903,14 +909,13 @@ data/test/tools/javac/diags/examples/TypesIncompatible.java.i
 data/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java.i
 data/test/tools/apt/Basics/Milk.java.i
 data/test/tools/javac/failover/FailOver09.java.i
-data/test/com/sun/javadoc/testThrowsTag/pkg/T3.java.i
 data/test/tools/javac/jvm/6397652/com/test/Test.java.i
 data/test/com/sun/javadoc/testClassTree/TestClassTree.java.i
-data/src/share/opensource/javac/doc/javac_lifecycle/contents.html.i
 data/src/share/classes/com/sun/tools/apt/comp/BootstrapAPF.java.i
 data/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java.i
 data/test/com/sun/javadoc/testTopOption/pkg/Cl.java.i
 data/src/share/classes/com/sun/source/tree/ModulePermitsTree.java.i
+data/test/tools/javac/generics/parametricException/J.java.i
 data/test/tools/javac/generics/5086027/T5086027pos.java.i
 data/test/tools/javac/T5048776b.out.i
 data/test/tools/javac/protectedAccess/ProtectedMemberAccess1.java.i
@@ -923,6 +928,7 @@ data/test/tools/javac/QualifiedAccess/QualifiedAccess_1.java.i
 data/src/share/classes/com/sun/tools/javadoc/DocImpl.java.i
 data/test/tools/javac/varargs/5088429/T5088429Pos01.java.i
 data/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java.i
+data/test/tools/javac/resolve/tests/PrimitiveOverReferenceOverVarargs.java.i
 data/test/tools/javac/diags/examples/UnclosedStringLiteral.java.i
 data/test/tools/javac/diags/examples/PackageInfoAlreadySeen/p/package-info.java.i
 data/test/tools/javac/diags/examples/IllegalEscapeChar.java.i
@@ -930,33 +936,30 @@ data/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java.i
 data/test/tools/javac/enum/FauxEnum1.java.i
 data/test/tools/javac/DefiniteAssignment/DUSwitch2.java.i
 data/src/share/classes/com/sun/source/tree/ReturnTree.java.i
-data/test/tools/javac/diags/examples/SuperNotAllowedInEnum.java.i
 data/src/share/classes/com/sun/tools/javac/comp/TransTypes.java.i
 data/src/share/classes/javax/tools/ForwardingJavaFileManager.java.i
-data/test/tools/javadoc/generics/genericClass/Main.java.i
 data/test/tools/javac/6199662/Tree.java.i
-data/test/tools/javac/generics/odersky/Test2.java.i
 data/test/tools/javac/api/6415780/T6415780.java.i
+data/test/tools/javac/generics/inference/4942040/T4942040.java.i
 data/test/tools/javac/generics/Casting.java.i
+data/test/tools/javac/typeAnnotations/newlocations/ConstructorTypeArgs.java.i
+data/test/tools/javac/generics/diamond/neg/Neg03.out.i
 data/test/com/sun/javadoc/testInterface/pkg/Child.java.i
-data/test/com/sun/javadoc/testUseOption/pkg2/C3.java.i
-data/test/tools/javac/T6942649.java.i
 data/test/tools/javac/unicode/TripleQuote.java.i
+data/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java.i
 data/test/tools/javac/javazip/Test.sh.i
 data/test/tools/javac/processing/model/element/TestResourceElement.java.i
 data/test/tools/javac/Diagnostics/6722234/T6722234d_2.out.i
-data/test/tools/javac/InstanceInitException_1.java.i
 data/test/tools/javac/diags/examples/RefAmbiguous.java.i
 data/test/tools/javac/BadOptimization/DeadCode3.java.i
 data/test/tools/javac/api/6410643/T6410643.java.i
-data/test/tools/javac/6402516/CheckLocalElements.java.i
+data/test/tools/javac/6668794/badClass/B.java.i
 data/test/tools/javac/mandatoryWarnings/deprecated/Test.java.i
 data/test/tools/javac/file/T7068437.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java.i
 data/test/tools/javac/diags/examples/VarargsArgumentMismatch.java.i
-data/test/tools/javac/diags/examples/DiamondRedundantArgs.java.i
+data/test/tools/javac/varargs/5088429/T5088429Neg01.java.i
 data/test/tools/javac/diags/examples/FinallyWithoutTry.java.i
-data/test/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java.i
 data/test/com/sun/javadoc/testClassTree/pkg/Coin.java.i
 data/make/netbeans/doclets/build.xml.i
 data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_7.java.i
@@ -965,79 +968,84 @@ data/test/tools/javah/SubClassConsts.out.i
 data/test/tools/javac/4917091/Test256b.out.i
 data/test/tools/javac/processing/model/element/TestNames.java.i
 data/test/tools/javac/typeAnnotations/newlocations/TypeCasts.java.i
-data/test/com/sun/javadoc/testLinkOption/testNewLineInLink/C.java.i
-data/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java.i
+data/test/tools/javac/staticImport/StaticImport2.java.i
+data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass1.java.i
+data/test/com/sun/javadoc/testWarnings/pkg/package.html.i
+data/test/tools/javadoc/annotations/defaults/pkg1/B.java.i
 data/test/tools/javac/6400872/A.java.i
 data/test/tools/javac/diags/examples/CantInheritDiffArg.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/package.html.i
-data/test/tools/javac/Diagnostics/6722234/T6722234b_2.out.i
+data/test/tools/javac/TryWithResources/TwrIntersection.java.i
 data/test/tools/apt/Discovery/servicesTouch.i
 data/test/tools/javac/enum/FauxEnum2.java.i
-data/test/tools/javac/falseCycle/FalseCycle.java.i
-data/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out.i
+data/test/tools/javac/annotations/T7043371.java.i
+data/test/tools/javac/api/6431257/T6431257.java.i
 data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_12.java.i
-data/test/tools/javac/generics/typevars/6968793/T6968793.out.i
 data/test/tools/javac/lib/JavacTestingAbstractProcessor.java.i
-data/test/tools/javac/processing/T6920317.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml.i
 data/src/share/classes/com/sun/javadoc/SourcePosition.java.i
-data/test/tools/javac/generics/wildcards/BoundBug.java.i
+data/test/tools/apt/mirror/declaration/pkg1/AnInterface.java.i
 data/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java.i
 data/test/tools/javac/generics/wildcards/neg/CastFail3.java.i
-data/test/com/sun/javadoc/constantValues/TestConstantValues.java.i
-data/test/tools/javac/depOverrides/doccomment/Test1A.out.i
+data/src/share/classes/javax/annotation/processing/RoundEnvironment.java.i
+data/test/tools/javac/depOverrides/doccomment/Test3.out.i
 data/test/tools/javac/annotations/6881115/T6881115.out.i
 data/test/tools/javac/Diagnostics/6862608/T6862608b.java.i
 data/test/tools/javac/processing/model/util/elements/Foo.java.i
-data/test/tools/javac/UnreachableVar.java.i
-data/test/tools/javac/cast/7005671/T7005671.out.i
+data/test/tools/javac/Diagnostics/6862608/T6862608a.out.i
+data/test/tools/javac/missingSuperRecovery/MissingSuperRecovery.out.i
 data/test/tools/javac/generics/wildcards/pos/AmbiguousCast2.java.i
 data/test/tools/javac/boxing/NoBoxingDouble.java.i
 data/ASSEMBLY_EXCEPTION.i
 data/test/tools/javac/miranda/6964669/T6964669.java.i
-data/test/tools/apt/Compile/HelloAnnotation.java.i
+data/test/tools/javac/multicatch/Neg02eff_final.java.i
 data/test/tools/apt/Basics/foo/bar/Baz.java.i
-data/src/share/classes/com/sun/tools/javah/resources/Linux_ppc.properties.i
 data/test/com/sun/javadoc/testDocRootLink/pkg1/C1.java.i
 data/test/tools/apt/Basics/ClassAnnotations.java.i
 data/test/com/sun/javadoc/testThrowsTag/pkg/T6.java.i
 data/test/tools/javac/PrivateLocalConstructor.java.i
 data/test/tools/javac/6491592/T6491592.java.i
 data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestAnnotationType.java.i
-data/test/tools/javac/TryWithResources/T7022711.out.i
+data/test/tools/javac/generics/6213818/T6213818.java.i
 data/test/tools/javac/diags/examples/Location.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java.i
-data/test/tools/apt/Discovery/PhantomUpdate.java.i
+data/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java.i
+data/test/tools/javac/BoundClassError.java.i
 data/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java.i
-data/test/tools/javac/file/zip/Utils.java.i
+data/test/tools/javac/generics/rawOverride/6557199/T6557199.java.i
 data/src/share/opensource/javac/build.properties.i
 data/src/share/classes/javax/lang/model/util/ModuleResolver.java.i
 data/test/tools/javac/diags/examples/WarnSelfRef.java.i
 data/test/tools/javac/NameCollision.out.i
 data/test/tools/javac/6863465/T6863465d.java.i
 data/test/tools/javac/DefiniteAssignment/T4721998.java.i
+data/make/netbeans/javah/nbproject/project.xml.i
 data/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java.i
 data/test/tools/javac/diags/examples/ErrProcMessager/ErrProcMessager.java.i
 data/test/tools/javac/InterfaceMemberClassModifiers.out.i
-data/test/tools/javac/FinalInitializer_2.java.i
+data/test/com/sun/javadoc/testHrefInDocComment/pkg/I2.java.i
+data/test/tools/javac/tree/DocCommentToplevelTest.java.i
 data/test/tools/javac/Object2.java.i
 data/src/share/classes/com/sun/tools/javac/util/Name.java.i
-data/test/com/sun/javadoc/testPackagePage/pkg2/C.java.i
+data/test/tools/javac/policy/test1/byfile.ACD.out.i
 data/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java.i
 data/test/tools/javac/diags/examples/OverrideIncompatibleReturn.java.i
 data/test/tools/javac/diags/examples/OverrideVarargsMissing.java.i
+data/test/tools/javac/warnings/7090499/T7090499.out.i
 data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out.i
 data/test/tools/javac/annotations/6365854/test2.out.i
 data/test/tools/javac/6717241/T6717241b.java.i
 data/test/tools/javac/TryWithResources/TwrOnNonResource.java.i
 data/test/tools/javac/DefiniteAssignment/DABlock.java.i
 data/test/com/sun/javadoc/AccessSkipNav/p2/C2.java.i
+data/test/tools/javac/generics/inference/T6835428.java.i
 data/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java.i
 data/test/tools/javac/AnonClsInIntf.java.i
 data/test/tools/javac/typeAnnotations/newlocations/Receivers.java.i
+data/test/tools/javac/processing/6350124/T6350124.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java.i
 data/src/share/classes/com/sun/source/tree/LineMap.java.i
 data/test/tools/javac/importContext/namedPackage/foo/Foo.java.i
-data/test/tools/javac/StringsInSwitch/BadlyTypedLabel2.java.i
+data/test/tools/javac/varargs/6569633/T6569633.out.i
 data/test/tools/javac/diags/examples/NoteProcMessager/NoteProcMessager.java.i
 data/src/share/classes/com/sun/tools/javap/DisassemblerTool.java.i
 data/test/tools/javac/p1/CS.java.i
@@ -1045,10 +1053,8 @@ data/test/tools/javac/ImportCycle/foo/Bottom2.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java.i
 data/test/tools/javac/processing/TestWarnErrorCount.java.i
 data/test/tools/javac/generics/wildcards/neg/CastFail7.java.i
-data/test/com/sun/javadoc/DocRootSlash/p2/C2.java.i
-data/test/tools/javac/6758789/T6758789a.java.i
+data/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java.i
 data/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java.i
-data/test/com/sun/javadoc/testUseOption/pkg2/package.html.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java.i
 data/test/tools/javac/failover/FailOver13.java.i
 data/src/share/classes/com/sun/tools/javac/util/Debug.java.i
@@ -1061,7 +1067,6 @@ data/test/tools/javac/6863465/T6863465a.out.i
 data/test/tools/javac/processing/errors/TestOptionSyntaxErrors.java.i
 data/test/com/sun/javadoc/testTitleInHref/pkg/Class.java.i
 data/test/tools/javac/6979683/TestCast6979683_BAD38.java.errlog.i
-data/test/tools/javac/diags/examples/DefaultAllowedInIntfAnnotationMember.java.i
 data/test/tools/javac/diags/examples/CountWarn.java.i
 data/test/tools/javac/generics/wildcards/neg/CastFail12.java.i
 data/test/tools/javac/generics/6910550/T6910550e.java.i
@@ -1070,7 +1075,6 @@ data/test/tools/javac/limits/StringLength.java.i
 data/src/share/classes/com/sun/tools/javac/parser/Scanner.java.i
 data/test/tools/javac/diags/examples/AnonClassImplInterfaceNoQualForNew.java.i
 data/test/tools/javac/7024568/T7024568.java.i
-data/test/tools/javac/Diagnostics/6799605/T6799605.out.i
 data/test/tools/javac/depOverrides/annotation/Test1B.out.i
 data/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java.i
 data/src/share/classes/com/sun/source/tree/ForLoopTree.java.i
@@ -1079,7 +1083,7 @@ data/test/tools/javac/generics/wildcards/pos/Capture.java.i
 data/test/tools/javadoc/generics/genericInnerAndOuter/expected.out.i
 data/test/tools/javac/diags/examples/UnsupportedBinaryLiteral.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java.i
+data/src/share/classes/com/sun/tools/javac/file/CloseableURLClassLoader.java.i
 data/test/com/sun/javadoc/testUseOption/pkg1/C8.java.i
 data/test/tools/javac/diags/examples/UncheckedCall.java.i
 data/test/tools/javac/generics/wildcards/neg/CastFail20.java.i
@@ -1090,7 +1094,7 @@ data/src/share/classes/com/sun/mirror/util/DeclarationVisitors.java.i
 data/test/tools/javac/multicatch/Neg07.out.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo3.java.i
 data/test/com/sun/javadoc/testHref/pkg/C2.java.i
-data/test/tools/javac/5017953/T5017953.out.i
+data/test/tools/javac/modules/ModuleAccessTest01.java.i
 data/test/tools/javac/enum/Enum3.java.i
 data/test/com/sun/javadoc/testUseOption/pkg1/C4.java.i
 data/test/tools/javac/SynchronizedClass.out.i
@@ -1101,29 +1105,28 @@ data/test/tools/javac/generics/5086027/T5086027.java.i
 data/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java.i
 data/test/tools/javac/mixedTarget/CompatibleAbstracts1.java.i
 data/src/share/classes/javax/annotation/processing/SupportedSourceVersion.java.i
-data/make/test/contents.gold.txt.i
+data/test/com/sun/javadoc/testParamTaglet/pkg/C.java.i
 data/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java.i
 data/test/tools/javadoc/varArgs/expected.out.i
-data/test/tools/javac/generics/T4661029.java.i
 data/test/tools/javac/T6403466.out.i
+data/test/tools/javap/T4075403.java.i
 data/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java.i
 data/test/tools/javac/processing/model/util/BinaryName.java.i
+data/test/tools/javac/generics/rawOverride/Fail1.java.i
 data/test/com/sun/javadoc/testRelativeLinks/pkg/package.html.i
 data/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java.i
 data/test/tools/javac/diags/examples/InaccessibleVarargsType/InaccessibleVarargsType.java.i
 data/src/share/classes/com/sun/mirror/apt/Messager.java.i
-data/test/tools/javac/6734819/T6734819a.out.i
+data/test/tools/javac/multicatch/Neg02.java.i
 data/test/tools/javac/generics/LoadOrder.java.i
 data/test/tools/javac/generics/wildcards/AssignmentSameType8.java.i
 data/test/tools/javac/implicitThis/WhichImplicitThis6.java.i
-data/test/tools/javac/annotations/neg/MixedSource.java.i
 data/test/tools/javac/generics/rare/Rare3.java.i
-data/test/tools/javac/generics/rawOverride/7062745/T7062745neg.out.i
+data/test/tools/javac/ClassCycle/ClassCycle2a.java.i
 data/test/tools/javac/5045412/out.i
-data/test/tools/javac/scope/6225935/Bar.java.i
 data/test/com/sun/javadoc/testHeadings/TestHeadings.java.i
 data/test/tools/javac/ExtendArray.out.i
-data/test/tools/javac/enum/6384542/T6384542a.java.i
+data/test/tools/javac/generics/Crash02.java.i
 data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C2.java.i
 data/test/tools/javac/annotations/neg/WrongValue.java.i
 data/test/tools/javac/4880220/T4880220.java.i
@@ -1132,112 +1135,115 @@ data/test/com/sun/javadoc/5093723/DocumentedClass.java.i
 data/test/tools/javac/ExtDirs/ExtDirTest_3.java.i
 data/test/tools/javac/api/7086261/T7086261.java.i
 data/test/tools/javac/annotations/pos/Z1.java.i
-data/test/tools/javac/enum/NoFinal.java.i
+data/test/tools/javac/generics/diamond/T6939780.java.i
 data/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java.i
 data/test/tools/javac/enum/6350057/TestEnum.java.i
 data/test/tools/javac/implicitThis/WhichImplicitThis9.java.i
 data/make/tools/SelectTool/SelectToolTask.java.i
 data/make/netbeans/javap/README.i
 data/test/tools/javac/warnings/DepAnn.java.i
-data/test/tools/javac/diags/examples/FinalParamCantBeAssigned.java.i
+data/test/tools/javac/generics/wildcards/neg/CastWarn6.java.i
+data/test/tools/javac/varargs/6313164/T6313164.java.i
 data/test/tools/javac/unicode/UnicodeNewline.java.i
 data/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties.i
 data/test/tools/javadoc/6942366/T6942366.java.i
-data/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java.i
-data/test/tools/javac/lint/NoWarn2.out.i
+data/test/tools/javac/UplevelFromAnonInSuperCall.java.i
+data/test/tools/javac/6390045/T6390045b.java.i
+data/src/share/classes/com/sun/tools/javac/comp/Annotate.java.i
 data/test/tools/javac/generics/wildcards/neg/CastFail16.java.i
 data/test/tools/javac/treeannotests/Test.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java.i
 data/test/tools/javac/NullQualifiedSuper1.java.i
 data/test/com/sun/javadoc/testSupplementary/C.java.i
+data/test/tools/javac/diags/examples/LambdaNotSupported.java.i
 data/test/tools/javac/generics/wildcards/neg/CastFail15.java.i
 data/test/tools/javac/policy/bytodo.ABD.out.i
 data/test/tools/javac/diags/CheckResourceKeys.java.i
 data/test/com/sun/javadoc/testThrowsTag/pkg/T4.java.i
-data/test/tools/javac/implicitThis/NewBeforeOuterConstructed.java.i
 data/src/share/classes/javax/lang/model/util/Elements.java.i
 data/test/tools/javac/generics/inference/6215213/T6215213.java.i
 data/test/tools/javac/mandatoryWarnings/unchecked/Test2.out.i
 data/test/com/sun/javadoc/testWarnings/pkg/X.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeParameterDeclarationImpl.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUsage.java.i
-data/test/tools/javac/generics/wildcards/neg/AmbiguousCast.java.i
+data/test/tools/javac/limits/ArrayDims5.java.i
 data/src/share/classes/javax/lang/model/type/ExecutableType.java.i
 data/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out.i
 data/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java.i
-data/make/test/HelloWorld.javap.gold.txt.i
+data/test/tools/javac/ImportPackagePrivateInner/Dummy.java.i
+data/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedPluralAdditional.java.i
 data/test/tools/javac/DefiniteAssignment/DefAssignAfterThis_1.java.i
-data/src/share/classes/com/sun/tools/classfile/CompilationID_attribute.java.i
 data/src/share/classes/com/sun/source/tree/ClassTree.java.i
 data/test/tools/javac/generics/typeargs/Basic.java.i
 data/test/tools/javac/warnings/Unchecked.java.i
 data/test/tools/javac/annotations/neg/Dep.java.i
 data/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh.i
-data/test/tools/javac/NestedDuplicateLabels.java.i
 data/test/tools/javap/T6622260.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java.i
 data/test/tools/javac/annotations/pos/AnnoteElideBraces.java.i
 data/make/test/HelloWorld.gold.h.i
 data/test/tools/javac/generics/6359951/T6359951.java.i
 data/src/share/classes/com/sun/tools/apt/main/CommandLine.java.i
+data/test/tools/javac/generics/Varargs.java.i
 data/test/tools/javac/generics/typevars/6569404/T6569404b.java.i
-data/test/com/sun/javadoc/testOverridenMethods/pkg1/BaseClass.java.i
+data/test/tools/javac/modules/ModuleVersionQueryTest01.java.i
 data/src/share/classes/com/sun/mirror/util/SourcePosition.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/declaration/ConstructorDeclarationImpl.java.i
-data/test/tools/javac/generics/6985719/T6985719h.out.i
 data/test/tools/javac/generics/rawOverride/6557199/T6557199.out.i
 data/src/share/classes/com/sun/source/tree/package-info.java.i
 data/test/tools/javac/varargs/6313164/p1/B.java.i
-data/test/tools/javac/proprietary/WarnMethod.java.i
-data/test/tools/javac/diags/examples/DirPathElementNotFound.java.i
+data/test/tools/javadoc/generics/genericClass/expected.out.i
+data/test/tools/javac/annotations/pos/AnnotationMethods.java.i
 data/test/tools/javac/StringsInSwitch/NonConstantLabel.out.i
 data/test/tools/javac/Diagnostics/6864382/T6864382.out.i
+data/src/share/classes/com/sun/mirror/declaration/Declaration.java.i
 data/test/tools/javac/protectedAccess/pkg/SuperClass.java.i
 data/test/tools/javac/enum/NoFinal4.java.i
 data/test/com/sun/javadoc/testNonFrameWarning/pkg/C.java.i
-data/test/com/sun/javadoc/testDocRootInlineTag/pkg/C.java.i
+data/test/tools/javac/6948381/npe/A.java.i
 data/src/share/classes/com/sun/tools/classfile/Signature_attribute.java.i
 data/make/Makefile.i
 data/test/tools/javac/assert/DU2.java.i
 data/test/tools/javac/4917091/Test255.java.i
-data/test/tools/javac/generics/6182950/T6182950b.out.i
+data/test/tools/javac/mixedTarget/ExtendCovariant1.java.i
 data/src/share/classes/com/sun/tools/javac/comp/Env.java.i
 data/test/tools/javac/Parens1.java.i
 data/test/tools/javac/importChecks/ImportIsFullyQualified.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java.i
 data/test/tools/javac/api/6411333/T6411333.java.i
 data/test/tools/javac/6304921/T6304921.java.i
-data/test/tools/javac/TryWithResources/TwrIntersection02.java.i
 data/test/tools/javac/diags/examples/IllegalSelfRef.java.i
 data/test/com/sun/javadoc/AccessFrameTitle/p1/C1.java.i
 data/test/com/sun/javadoc/ValidHtml/p2/C2.java.i
-data/test/tools/javac/processing/6634138/ExerciseDependency.java.i
+data/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java.i
+data/test/tools/javac/T6654037.java.i
 data/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.out.i
 data/test/tools/javac/nio/compileTest/HelloPathWorld.java.i
 data/src/share/classes/sun/tools/javap/ClassData.java.i
 data/.hgtags.i
 data/test/tools/javac/NameCollision.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java.i
+data/test/tools/javac/multicatch/Neg05.java.i
 data/make/netbeans/doclets/nbproject/project.xml.i
 data/test/tools/javac/diags/examples/CantApplyDiamond.java.i
+data/test/tools/javac/api/ToolProvider/ToolProviderTest2.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java.i
 data/test/tools/javap/PublicInterfaceTest.sh.i
 data/test/tools/javac/diags/examples/IllegalUnicodeEscape.java.i
 data/test/tools/javac/DefiniteAssignment/T4717165.java.i
+data/test/tools/javac/diags/examples/DeferredMethodInst.java.i
 data/test/tools/javac/failover/FailOver07.java.i
 data/src/share/classes/com/sun/source/tree/ExpressionTree.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/SuperInterface.java.i
-data/test/com/sun/javadoc/ValidHtml/overview.html.i
+data/test/tools/javac/diags/examples/UncheckedMethodInvocation.java.i
 data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_4.java.i
 data/test/tools/javac/diags/examples/VarargsPluralAdditional/VarargsPluralAdditional.java.i
 data/src/share/classes/com/sun/tools/javah/Main.java.i
 data/test/tools/javac/diags/examples/ReturnOutsideMethod.java.i
-data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSuperClass.java.i
+data/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java.i
 data/src/share/classes/javax/tools/JavaFileManager.java.i
 data/test/tools/javac/api/Sibling.java.i
 data/test/com/sun/javadoc/AccessAsciiArt/p1/I.java.i
 data/src/share/classes/com/sun/tools/javap/InternalError.java.i
-data/src/share/classes/com/sun/mirror/util/Declarations.java.i
+data/test/tools/javac/annotations/6214965/T6214965.out.i
 data/make/netbeans/langtools/nbproject/standard-context-menu-items.ent.i
 data/test/tools/javac/depDocComment/DeprecatedDocComment.sh.i
 data/src/share/classes/com/sun/source/tree/ThrowTree.java.i
@@ -1245,13 +1251,15 @@ data/test/com/sun/javadoc/AccessSummary/p2/C2.java.i
 data/test/tools/javah/compareTest/CompareTest.java.i
 data/test/tools/javac/diags/examples/DoesntExist.java.i
 data/src/share/classes/javax/lang/model/type/TypeVisitor.java.i
+data/test/tools/javac/T6435291/T.jcod.i
 data/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java.i
+data/test/tools/javac/resolve/tests/PrimitiveReturnTypeInference.java.i
 data/test/tools/javac/api/evalexpr/ByteArrayClassLoader.java.i
 data/src/share/classes/com/sun/tools/javac/util/List.java.i
 data/test/tools/javac/ExtDirs/ext1/pkg1.jar.i
 data/src/share/classes/com/sun/tools/javap/SourceWriter.java.i
 data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestEnum.java.i
-data/test/tools/javac/annotations/T7043371.java.i
+data/test/tools/javac/falseCycle/FalseCycle.java.i
 data/src/share/classes/javax/lang/model/util/ElementScanner7.java.i
 data/test/tools/javac/T6241723.out.i
 data/test/tools/javac/NonStaticFieldExpr1.sh.i
@@ -1264,28 +1272,26 @@ data/test/tools/javac/processing/6499119/package-info.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java.i
 data/.jcheck/conf.i
 data/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E1.java.i
-data/test/tools/javac/Diagnostics/6860795/T6860795.out.i
-data/test/tools/javac/6464451/DeepNestedFinally.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java.i
-data/src/share/classes/com/sun/tools/javac/code/Types.java.i
-data/test/tools/javac/ClassLiterals/p1/SuperClass.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java.i
+data/test/tools/javac/CyclicInheritance.java.i
+data/test/tools/javac/lint/NoWarn1.out.i
+data/src/share/classes/com/sun/tools/classfile/ModuleData_attribute.java.i
 data/src/share/classes/com/sun/tools/classfile/ModuleExportTable_attribute.java.i
-data/test/tools/javac/SuperNew3.java.i
 data/test/tools/javac/cast/6548436/T6548436c.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml.i
+data/test/tools/javac/processing/T6920317.java.i
+data/test/tools/javadoc/InlineTagsWithBraces.java.i
 data/test/tools/javac/enum/EnumSwitch3.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java.i
+data/test/com/sun/javadoc/testValueTag/pkg1/Class2.java.i
 data/test/tools/javac/depOverrides/annotation/empty.i
 data/test/tools/javac/innerClassFile/x/B.java.i
 data/test/tools/javac/ClassCycle/ClassCycle1a.java.i
+data/src/share/classes/com/sun/tools/javac/parser/Tokens.java.i
 data/test/tools/javac/staticImport/Ambig1.java.i
 data/test/tools/javac/DeepStringConcat.java.i
 data/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java.i
 data/test/tools/javac/OverridePosition.java.i
-data/test/tools/javac/GoodCovar.java.i
 data/test/tools/javac/6394683/B.java.i
-data/test/tools/javac/T6855236.java.i
 data/test/tools/javac/processing/environment/round/C1.java.i
 data/test/tools/javac/generics/diamond/neg/Neg08.java.i
 data/test/tools/javac/ExtendsAccess/ExtendsAccess.java.i
@@ -1293,18 +1299,18 @@ data/test/tools/javac/generics/typevars/5060485/Compatibility02.java.i
 data/test/tools/javac/T6180021/Sub.java.i
 data/test/tools/javac/Diagnostics/6722234/T6722234a_2.out.i
 data/test/tools/javac/api/TestJavacTask_Multiple.java.i
-data/test/tools/javac/diags/examples/CountWarnPlural.java.i
 data/test/tools/apt/verifyVariables.sh.i
+data/test/tools/javac/ForwardReference/UseBeforeDeclaration.java.i
 data/test/tools/javac/SuperNew4.java.i
 data/test/tools/javac/generics/diamond/neg/Neg07.out.i
 data/test/tools/javac/ThrowsIntersection_1.java.i
 data/test/tools/javac/StringConversion2.java.i
 data/test/tools/javac/ImplicitToString.java.i
-data/test/tools/javac/generics/rawOverride/7062745/T7062745pos.java.i
+data/test/tools/javac/processing/model/element/TypeParamBounds.java.i
 data/test/com/sun/javadoc/testUseOption/pkg1/C6.java.i
 data/test/com/sun/javadoc/testClassCrossReferences/C.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/declaration/ParameterDeclarationImpl.java.i
-data/test/tools/javac/depOverrides/doccomment/Test3.out.i
+data/test/tools/javac/depOverrides/doccomment/Test1A.out.i
 data/src/share/classes/com/sun/tools/javap/TryBlockWriter.java.i
 data/test/tools/javac/6302184/T6302184.java.i
 data/test/tools/javac/enum/6424358/T6424358.java.i
@@ -1313,14 +1319,12 @@ data/test/tools/javac/overload/T4494762.java.i
 data/test/com/sun/javadoc/testHtmlComments/C.java.i
 data/test/tools/javac/diags/examples/ProcUnclosedTypeFiles/ProcUnclosedTypeFiles.java.i
 data/src/share/classes/com/sun/mirror/declaration/Modifier.java.i
-data/src/share/classes/com/sun/tools/javac/code/Attribute.java.i
+data/test/tools/javac/diags/examples/ProcIncompatibleSourceVersion/ProcIncompatibleSourceVersion.java.i
 data/src/share/classes/com/sun/mirror/declaration/ExecutableDeclaration.java.i
 data/test/tools/javac/InitializerCompletion_4.java.i
 data/test/tools/javac/api/T6397104.java.i
-data/src/share/classes/com/sun/tools/javah/resources/SunOS_sparcv9.properties.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java.i
 data/test/tools/apt/Compile/servicesRound2.i
-data/src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties.i
 data/test/tools/javac/Closure6.java.i
 data/test/tools/javac/enum/ExplicitlyFinalEnum1.java.i
 data/test/tools/javac/diags/examples/NoteProcMessager/processors/AnnoProc.java.i
@@ -1329,18 +1333,18 @@ data/src/share/classes/javax/tools/Tool.java.i
 data/src/share/classes/com/sun/tools/javac/main/OptionName.java.i
 data/test/tools/javac/T6224167.java.i
 data/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedFilename2.java.i
-data/src/share/classes/javax/tools/SimpleJavaFileObject.java.i
+data/test/tools/javac/generics/diamond/neg/Neg06.out.i
 data/test/tools/javac/warnings/6885255/T6885255.java.i
-data/test/tools/javac/Diagnostics/6862608/T6862608a.out.i
+data/test/tools/javac/UnreachableVar.java.i
 data/test/tools/javac/diags/examples/RecursiveConstrInvocation.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java.i
-data/test/tools/javac/6394683/A.java.i
-data/test/tools/javac/generics/rawOverride/7062745/T7062745neg.java.i
-data/src/share/classes/com/sun/tools/javac/resources/compiler.properties.i
+data/test/tools/javac/processing/options/TestImplicitNone.java.i
+data/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java.i
 data/test/tools/javap/T6271787.java.i
 data/src/share/classes/com/sun/tools/javadoc/SerialFieldTagImpl.java.i
 data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C5.java.i
-data/test/tools/javac/missingSuperRecovery/MissingSuperRecovery.out.i
+data/test/tools/javac/cast/7005671/T7005671.out.i
+data/test/tools/javac/processing/6512707/TestEnum.java.i
 data/test/tools/javac/BreakAcrossClass.java.i
 data/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java.i
 data/test/tools/javac/cast/5064736/T5064736.java.i
@@ -1355,34 +1359,33 @@ data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/pkg3/C5.java.i
 data/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java.i
 data/make/tools/CompileProperties/CompileProperties.java.i
 data/test/tools/javac/generics/inference/6718364/T6718364.java.i
-data/test/tools/javac/diags/examples/DuplicateAnnotation.java.i
-data/test/tools/javac/enum/6384542/T6384542.out.i
+data/test/com/sun/javadoc/testLinkOption/java/lang/StringBuilderChild.java.i
 data/test/tools/javac/generics/inference/5049523/T5049523.java.i
 data/test/tools/javac/DeadInnerClass.java.i
 data/test/tools/javac/ClassPathTest/foo/pkg/ClassPathTestAux1.java.i
 data/test/com/sun/javadoc/testTagInheritence/pkg/TestInterfaceForAbstractClass.java.i
-data/test/tools/javac/generics/inference/6638712/T6638712d.out.i
+data/test/tools/javadoc/6958836/Test.java.i
 data/test/tools/javac/typeAnnotations/failures/StaticFields.out.i
 data/test/tools/javac/generics/6985719/T6985719g.java.i
 data/test/tools/javac/T6956462/T6956462.java.i
 data/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.java.i
 data/test/tools/javadoc/generics/tparamTagOnType/Main.java.i
+data/test/tools/javadoc/generics/genericInnerAndOuter/pkg1/X.java.i
 data/test/tools/javac/typeAnnotations/failures/VoidGenericMethod.java.i
 data/test/tools/javac/6304921/T6304921.out.i
 data/test/tools/javac/6521805/T6521805e.out.i
 data/test/tools/javac/TryWithResources/ImplicitFinal.out.i
 data/test/tools/javac/api/6400303/Test1.java.i
-data/test/tools/apt/Basics/Lacuna.java.i
+data/test/tools/javac/protectedAccess/ProtectedMemberAccess5/Main.java.i
 data/test/tools/javac/6521805/T6521805b.java.i
-data/test/tools/javac/generics/inference/6468384/T6468384.java.i
 data/test/com/sun/javadoc/testPrivateClasses/pkg2/C.java.i
 data/src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java.i
 data/test/tools/javac/synthesize/Number.java.i
 data/src/share/classes/javax/lang/model/type/DisjunctiveType.java.i
-data/src/share/classes/javax/lang/model/element/AnnotationMirror.java.i
+data/src/share/classes/com/sun/mirror/declaration/package-info.java.i
 data/test/tools/javac/generics/typeargs/Newarg1.java.i
 data/test/tools/javac/diags/examples/StaticImportOnlyClassesAndInterfaces/StaticImportOnlyClassesAndInterfaces.java.i
-data/test/tools/javac/SwitchFence.java.i
+data/test/tools/javac/unicode/UnicodeNewline.out.i
 data/test/tools/javac/synthesize/Boolean.java.i
 data/src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java.i
 data/test/tools/javac/NameClash/b/One.java.i
@@ -1390,12 +1393,14 @@ data/test/tools/javac/T6403466.byfile.out.i
 data/test/com/sun/javadoc/testNavagation/pkg/C.java.i
 data/test/tools/javac/quid/QuotedIdent2.java.i
 data/test/tools/javac/staticImport/StaticImport.java.i
+data/src/share/classes/javax/lang/model/element/package-info.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java.i
 data/test/tools/javac/tree/SourceTreeScannerTest.java.i
-data/test/tools/javac/annotations/6365854/TestCore.java.i
+data/src/share/classes/com/sun/source/tree/RequiresModuleDirectiveTree.java.i
+data/test/tools/javac/diags/examples/EnumAsIdentifier.java.i
 data/test/tools/javac/warnings/Unchecked.lintUnchecked.out.i
 data/make/test/README.i
-data/test/com/sun/javadoc/testUseOption/TestUseOption.java.i
+data/src/share/classes/com/sun/mirror/type/VoidType.java.i
 data/test/tools/javac/failover/FailOver05.out.i
 data/test/tools/javac/diags/examples/SunApiPlural/SunApiFilename.java.i
 data/make/netbeans/javadoc/build.xml.i
@@ -1403,34 +1408,33 @@ data/test/tools/javac/AnonymousType.java.i
 data/test/com/sun/javadoc/testGroupOption/pkg3/C.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java.i
 data/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java.i
-data/src/share/classes/com/sun/javadoc/SeeTag.java.i
+data/test/tools/javap/4870651/Test.java.i
 data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C2.java.i
 data/src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties.i
-data/test/tools/javac/generics/Varargs2.java.i
-data/test/tools/javac/6996626/Main.java.i
 data/test/tools/javac/generics/wildcards/AssignmentSameType2.java.i
 data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_1.java.i
 data/test/tools/javac/processing/model/util/elements/doccomments/z/Last.java.i
 data/test/tools/javadoc/parser/7091528/p/q/C2.java.i
 data/src/share/classes/com/sun/tools/javap/resources/version.properties-template.i
 data/test/tools/javac/generics/inference/6650759/T6650759i.java.i
-data/test/tools/javac/generics/abstract/T4717181c.java.i
+data/test/tools/javac/processing/6350124/Marked.java.i
 data/test/tools/javac/generics/wildcards/6437894/T6437894.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/package.html.i
 data/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java.i
+data/test/tools/javac/api/T6358786.java.i
 data/test/tools/javac/AnonymousProtect/P1/pubExposePriv.java.i
 data/test/tools/javac/generics/Crash01.java.i
 data/src/share/classes/com/sun/tools/javadoc/Messager.java.i
 data/test/tools/javac/diags/examples/Verbose.java.i
 data/test/tools/javac/diags/examples/MalformedSupported/MalformedSupported.java.i
-data/test/tools/javac/OverrideChecks/6738538/T6738538b.java.i
+data/test/tools/javac/diags/examples/AnnoNotValidForType.java.i
 data/test/tools/javac/generics/rawOverride/T6846972.java.i
-data/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java.i
+data/test/tools/javac/6979683/TestCast6979683_BAD39.java.i
 data/test/tools/javac/enum/6384542/T6384542a_1_4.out.i
 data/test/com/sun/javadoc/AccessH1/p2/C2.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/StylesheetWriter.java.i
+data/test/tools/javac/annotations/neg/Z13.java.i
 data/test/tools/javac/generics/inference/6273455/T6273455.java.i
-data/test/tools/javac/InnerNamedConstant_2.java.i
+data/test/tools/javac/cast/6665356/T6665356.java.i
 data/test/tools/javac/varargs/Warn1.java.i
 data/test/tools/javac/generics/diamond/7030150/Neg03.java.i
 data/test/tools/javac/generics/inference/5073060/T5073060a.java.i
@@ -1438,43 +1442,42 @@ data/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java.i
 data/test/com/sun/javadoc/PackagesHeader/p2/C2.java.i
 data/src/share/classes/com/sun/source/tree/IdentifierTree.java.i
 data/test/tools/javac/enum/forwardRef/TestEnum3.java.i
-data/test/tools/javac/diags/examples/StringSwitchNotSupported.java.i
-data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C3.java.i
+data/test/tools/javac/protectedAccess/ProtectedMemberAccess3.java.i
+data/test/tools/javadoc/generics/tparamTagOnMethod/expected.out.i
 data/test/tools/javac/enum/forwardRef/TestEnum2.java.i
 data/test/tools/javac/treeannotests/TestProcessor.java.i
 data/test/tools/javac/depOverrides/doccomment/Test3.java.i
 data/test/tools/javac/annotations/6881115/T6881115.java.i
 data/test/com/sun/javadoc/testTagInheritence/firstSentence2/A.java.i
-data/test/tools/javac/generics/odersky/BadTest3.java.i
+data/test/tools/javadoc/BooleanConst.java.i
+data/test/tools/javap/typeAnnotations/T6855990.java.i
 data/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java.i
-data/test/tools/javac/diags/examples/AnnoNotApplicable.java.i
+data/test/tools/javac/TryWithResources/ResourceTypeVar.java.i
+data/test/tools/javac/T6567414.java.i
 data/test/tools/javac/enum/EnumPrivateConstructor.java.i
 data/src/share/classes/com/sun/source/tree/ArrayTypeTree.java.i
-data/test/tools/apt/Misc/Marked.java.i
 data/test/tools/javac/6857948/T6857948.out.i
 data/test/tools/javac/limits/NumArgs2.java.i
 data/test/com/sun/javadoc/testIndex/NoPackage.java.i
 data/test/tools/apt/mirror/declaration/AnnoMirror.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java.i
 data/test/tools/javac/diags/examples/InvalidAnnoMemberType.java.i
 data/test/tools/javac/scope/6225935/T6225935.java.i
 data/test/tools/javac/quid/QuotedIdent_BAD63.java.i
-data/test/tools/javac/InvalidIntfCast.java.i
+data/test/tools/javac/NestedDuplicateLabels.java.i
 data/test/tools/javac/4980495/static/p2/A2.java.i
 data/make/netbeans/javah/README.i
 data/test/tools/javadoc/generics/genericMethod/pkg1/A.java.i
 data/test/tools/javac/enum/SynthValues.java.i
-data/test/tools/javac/depOverrides/annotation/Q.java.i
 data/src/share/classes/com/sun/tools/javac/api/Formattable.java.i
 data/src/share/classes/com/sun/javadoc/LanguageVersion.java.i
-data/src/share/classes/com/sun/tools/javac/util/JavacMessages.java.i
+data/test/tools/javac/generics/wildcards/6330931/T6330931.java.i
 data/src/share/classes/com/sun/tools/javac/util/JavacFileManager.java.i
+data/test/tools/javac/InitializerCompletion_2.java.i
 data/src/share/classes/com/sun/tools/classfile/ClassReader.java.i
 data/test/tools/javadoc/generics/genericSuper/Main.java.i
-data/test/tools/javac/diags/examples/AssertAsIdentifier.java.i
 data/test/com/sun/javadoc/testHtmlTableTags/pkg2/C2.java.i
 data/test/tools/javac/enum/forwardRef/TestEnum4.java.i
-data/test/com/sun/javadoc/testBreakIterator/pkg/BreakIteratorTest.java.i
+data/test/tools/javac/processing/options/Xprint.java.i
 data/test/tools/javac/failover/FailOver03.java.i
 data/src/share/classes/com/sun/source/tree/CaseTree.java.i
 data/test/tools/javac/boxing/T6348760.java.i
@@ -1483,42 +1486,40 @@ data/test/tools/javac/synthesize/Short.java.i
 data/test/tools/javac/TryWithResources/ImplicitFinal.java.i
 data/test/tools/javac/foreach/ListOfListTest.java.i
 data/src/share/classes/javax/annotation/processing/Completion.java.i
-data/src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java.i
+data/test/tools/javac/enum/6384542/T6384542.out.i
 data/test/tools/javac/mandatoryWarnings/unchecked/Test4b.out.i
 data/test/tools/javac/generics/diamond/neg/Neg01.java.i
 data/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.out.i
 data/test/tools/javac/InterfaceOverrideCheck.java.i
 data/make/netbeans/common/standard-context-menu-items-no-javadoc.ent.i
 data/test/tools/javac/generics/typevars/6182630/T6182630b.java.i
-data/test/tools/javac/api/T6483788.java.i
+data/test/tools/javac/generics/genericAbstract/B.java.i
 data/test/com/sun/javadoc/testTitleInHref/package-list.i
-data/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.java.i
-data/test/tools/javac/NestedInnerClassNames.java.i
+data/test/tools/javac/diags/examples/Error.java.i
 data/src/share/classes/com/sun/tools/javadoc/DocLocale.java.i
 data/test/tools/javac/6330920/T6330920.out.i
-data/src/share/classes/javax/lang/model/util/ElementScanner6.java.i
+data/test/com/sun/javadoc/testModifier/TestModifier.java.i
 data/test/tools/javac/generics/typeargs/Superarg1.java.i
 data/test/tools/javac/links/links.sh.i
 data/test/tools/javac/enum/FauxEnum3.java.i
 data/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java.i
-data/src/share/classes/com/sun/tools/javah/JNI.java.i
+data/test/com/sun/javadoc/testThrowsTag/pkg/T3.java.i
 data/test/tools/javac/6402516/A.java.i
 data/test/tools/javac/generics/rare/Rare4.java.i
 data/test/tools/javac/proprietary/WarnVariable.java.i
-data/test/tools/javac/positions/T6253161a.out.i
+data/test/tools/javadoc/sourceOnly/Test.java.i
 data/test/tools/apt/mirror/declaration/MethodDecl.java.i
 data/test/tools/javac/diags/examples/SunApiFilenameAdditional.java.i
 data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/pkg3/C6.java.i
 data/src/share/classes/com/sun/mirror/type/MirroredTypesException.java.i
 data/test/tools/javap/T6824493.java.i
-data/test/tools/javac/api/T6501502.java.i
-data/test/tools/javac/generics/inference/7086601/T7086601a.out.i
+data/test/tools/javadoc/generics/tparamCycle/pkg1/LikeEnum.java.i
 data/test/com/sun/javadoc/testCmndLineClass/pkg2/package.html.i
 data/test/tools/javac/enum/NoFinal5.java.i
 data/test/tools/javac/boxing/T5082929.java.i
 data/test/tools/javac/diags/examples/ProcessorCantInstantiate/ProcessorCantInstantiate.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java.i
+data/test/tools/javac/implicitThis/NewBeforeOuterConstructed3.java.i
 data/test/com/sun/javadoc/testMemberSummary/pkg/PublicChild.java.i
 data/test/tools/javac/generics/inference/5073060/NegHelper.java.i
 data/test/tools/javac/boxing/BoxingCaching.java.i
@@ -1530,38 +1531,32 @@ data/test/tools/javac/diags/examples/DoesNotOverride.java.i
 data/test/tools/javac/processing/model/type/MirroredTypeEx/NpeTest.java.i
 data/test/tools/javac/Diagnostics/6769027/tester.properties.i
 data/make/netbeans/javap/nbproject/project.xml.i
-data/src/share/classes/com/sun/tools/classfile/Signature.java.i
 data/test/tools/javac/generics/typevars/5061359/T5061359.java.i
-data/test/tools/javac/accessVirtualInner/a/A.java.i
 data/src/share/classes/com/sun/javadoc/Doclet.java.i
 data/test/tools/javac/conditional/Conditional.java.i
 data/test/tools/javac/varargs/6730476/T6730476a.java.i
 data/test/tools/javac/T4848619/T4848619b.java.i
 data/test/tools/javac/importscope/B.java.i
 data/test/tools/javac/AccessMethods/AccessMethodsLHS.java.i
-data/test/tools/javah/MissingParamClassTest.sh.i
 data/test/tools/javah/6572945/TestClass3.java.i
 data/test/tools/javac/cast/6557182/T6557182.out.i
 data/test/tools/javac/annotations/pos/OverrideOK.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumDeclarationImpl.java.i
+data/test/tools/javac/TestPkgInfo.java.i
 data/test/tools/javah/TestHelpOpts.java.i
-data/src/share/classes/com/sun/javadoc/ProgramElementDoc.java.i
-data/test/tools/javac/processing/options/testCommandLineClasses/Test.java.i
+data/test/tools/javac/diags/examples/InheritFromFinal.java.i
 data/test/tools/javac/generics/6372782/AbstractPlanarVector.java.i
-data/test/tools/javac/scope/6225935/StaticImportAccess.java.i
-data/test/tools/javac/processing/6350124/T6350124.java.i
+data/test/tools/javac/diags/examples/AnnoNotApplicable.java.i
+data/test/tools/javac/generics/Varargs2.java.i
 data/test/tools/javac/protectedInner/pkg2/Sub.java.i
-data/test/tools/javac/generics/typevars/T7040883.java.i
+data/test/tools/javac/NullStaticQualifier.java.i
 data/test/tools/javac/T6882235.java.i
 data/test/tools/javac/api/6423003/T6423003.java.i
-data/make/netbeans/compiler/README.i
 data/test/tools/apt/Basics/print.sh.i
-data/test/tools/javac/diags/examples/LongSVUID.java.i
-data/test/com/sun/javadoc/testUseOption/pkg1/package.html.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java.i
+data/test/tools/javac/OverrideChecks/T4720359b.java.i
+data/test/tools/javadoc/BreakIteratorWarning.java.i
 data/test/tools/javac/generics/rawOverride/Warn2.java.i
-data/src/share/classes/com/sun/source/tree/UnaryTree.java.i
-data/test/com/sun/javadoc/testUnnamedPackage/package.html.i
+data/test/tools/javac/generics/T6657499.java.i
+data/test/com/sun/javadoc/testOverridenMethods/pkg2/SubClass.java.i
 data/test/tools/javac/generics/classreader/HMember.java.i
 data/test/tools/javac/ClassCycle/ClassCycle3b.java.i
 data/test/tools/javac/failover/FailOver15.java.i
@@ -1571,162 +1566,159 @@ data/src/share/classes/com/sun/mirror/apt/package.html.i
 data/test/tools/javadoc/XWerror.java.i
 data/test/tools/javac/api/6440528/T6440528.java.i
 data/test/tools/javac/6889255/T6889255.java.i
-data/test/tools/javac/varargs/5088429/T5088429Neg02.out.i
-data/test/tools/javac/generics/diamond/7030687/T7030687.out.i
+data/test/tools/javac/multicatch/Neg06.out.i
+data/src/share/classes/javax/lang/model/element/Element.java.i
 data/test/tools/javac/T6214885.java.i
 data/test/tools/javac/policy/test1/bytodo.ACD.out.i
-data/test/tools/javac/annotations/neg/Z3.java.i
+data/test/tools/javap/T4884240.java.i
 data/test/tools/apt/Discovery/servicesBadTouch.i
 data/test/tools/javac/T6405099.java.i
 data/src/share/classes/javax/lang/model/element/Modifier.java.i
+data/test/tools/javac/processing/model/type/TestTypeKind.java.i
 data/test/tools/javac/diags/examples/ContinueOutsideLoop.java.i
+data/src/share/classes/com/sun/source/tree/ModuleIdQueryTree.java.i
 data/test/tools/javac/typeAnnotations/failures/target/Constructor.out.i
-data/test/tools/javac/typeAnnotations/failures/Scopes.java.i
-data/test/tools/javac/T7040104.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/declaration/PackageDeclarationImpl.java.i
-data/test/tools/javac/T4994049/DeprecatedYES.java.i
-data/test/tools/javac/CyclicInheritance.sh.i
-data/test/tools/apt/Scanners/scanner.sh.i
+data/test/com/sun/javadoc/testHtmlTag/pkg2/C2.java.i
+data/test/tools/javac/TryWithResources/ResourceInterface.out.i
+data/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass_2.java.i
+data/test/tools/javac/annotations/neg/Dup.java.i
 data/test/com/sun/javadoc/testDocRootLink/pkg2/C2.java.i
-data/test/tools/javac/generics/wildcards/AssignmentSameType1.java.i
+data/test/tools/javac/HexFloatLiterals.java.i
+data/test/tools/javac/resolve/tests/PrimitiveOverload.java.i
 data/test/tools/javac/generics/diamond/7030150/Neg01.out.i
-data/test/tools/javac/6547131/T.java.i
 data/test/tools/javadoc/completionFailure/CompletionFailure.java.i
-data/test/tools/javac/ProtectedInnerClass/p1/ProtectedInnerClass1.java.i
+data/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo2.java.i
 data/test/tools/javac/mandatoryWarnings/unchecked/A.java.i
-data/test/tools/javac/diags/examples/TryResourceNotSupported.java.i
-data/src/share/classes/com/sun/tools/classfile/Type.java.i
-data/test/tools/javac/varargs/6569633/T6569633.out.i
+data/test/tools/javac/warnings/T6763518.java.i
+data/test/tools/javac/foreach/T6500701.java.i
 data/test/tools/apt/mirror/declaration/pkg1/pkg2/AnInterface.java.i
 data/test/tools/apt/mirror/declaration/pkg1/AnEnum.java.i
 data/test/tools/javadoc/T6968833.java.i
-data/test/tools/javac/processing/messager/6362067/T6362067.java.i
+data/src/share/classes/com/sun/mirror/type/TypeMirror.java.i
 data/test/tools/javac/diags/examples/DiamondInvalidArgs.java.i
+data/test/tools/javac/generics/wildcards/6437894/T6437894.out.i
 data/test/tools/javac/4917091/Test256b.java.i
 data/test/tools/javac/generics/7020657/T7020657neg.java.i
-data/test/tools/javac/completion/C.out.i
+data/test/tools/javac/cast/6558559/T6558559b.java.i
 data/test/tools/javac/T7042623.out.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java.i
-data/src/share/classes/javax/lang/model/element/TypeElement.java.i
-data/test/tools/javac/processing/model/util/deprecation/ExpectedDeprecation.java.i
+data/test/tools/javac/generics/7007615/acc1/AccessibilityCheck01.java.i
+data/test/tools/javac/diags/examples/NonStaticCantBeRef.java.i
+data/test/tools/javac/synthesize/Cloneable.java.i
 data/test/tools/javac/depOverrides/doccomment/B.java.i
 data/test/tools/javac/NullQualifiedSuper2.java.i
+data/test/tools/javac/SerialWarn.java.i
 data/src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java.i
 data/test/tools/javac/6627362/x/Object.java.i
 data/test/tools/apt/Basics/Misc.java.i
 data/test/com/sun/javadoc/testThrowsTag/pkg/T7.java.i
-data/src/share/classes/javax/lang/model/type/WildcardType.java.i
 data/test/tools/javac/diags/examples/UndeterminedType1.java.i
 data/test/tools/javac/MissingInclude.sh.i
 data/test/tools/javac/6948381/T6948381.java.i
-data/test/tools/javac/innerClassFile/x/C.java.i
+data/test/tools/javac/OverrideChecks/T4720356b.java.i
+data/test/tools/javac/api/6431435/T6431435.java.i
 data/test/tools/javac/failover/FailOver03.out.i
-data/test/tools/javac/links/T.java.i
-data/test/tools/javac/diags/examples/InitializerMustComplete.java.i
+data/src/share/classes/com/sun/tools/javac/resources/legacy.properties.i
+data/test/tools/javac/diags/examples/ArrayAndVarargs.java.i
 data/test/com/sun/javadoc/testIndex/pkg/C.java.i
 data/test/tools/javac/modules/ModuleModeTests/DerbyTest.java.i
 data/test/tools/javadoc/generics/genericInterface/pkg1/A.java.i
+data/test/tools/javac/generics/inference/6943278/T6943278.java.i
 data/src/share/classes/com/sun/tools/javac/file/Old199.java.i
-data/test/tools/javac/depOverrides/annotation/B3.java.i
+data/test/com/sun/javadoc/testHref/pkg/C3.java.i
 data/test/tools/javac/versions/check.sh.i
+data/test/tools/javac/resolve/tests/BoxedReturnTypeInference.java.i
 data/test/tools/javac/Digits.out.i
-data/test/tools/javac/generics/6711619/T6711619b.java.i
+data/test/tools/javac/api/TestClientCodeWrapper.java.i
+data/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java.i
 data/src/share/classes/com/sun/mirror/type/InterfaceType.java.i
 data/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.out.i
 data/test/tools/javac/T6306967.java.i
 data/test/tools/javac/api/6412656/T6412656.java.i
-data/test/tools/javac/OverrideChecks/6400189/T6400189c.java.i
 data/test/tools/javac/missingSuperRecovery/impl.class.i
-data/test/tools/javac/enum/EnumSwitch1.java.i
 data/test/tools/javac/generics/ReverseOrder.java.i
-data/test/tools/javac/accessVirtualInner/c/C.java.i
-data/test/tools/javac/TryWithResources/PlainTry.java.i
 data/test/tools/javac/diags/examples/RawClassUse.java.i
 data/test/tools/javac/QualifiedAccess/QualifiedAccess_2.out.i
-data/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java.i
 data/test/tools/javac/T4994049/T4994049.java.i
-data/test/tools/javac/generics/inference/6838943/T6838943.java.i
-data/test/com/sun/javadoc/testBackSlashInLink/C.java.i
+data/src/share/classes/com/sun/tools/javac/comp/AttrContext.java.i
+data/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java.i
 data/src/share/classes/com/sun/javadoc/Tag.java.i
 data/test/tools/javac/protectedAccess/ProtectedMemberAccess5/z1/Z1.java.i
-data/test/tools/javac/generics/6946618/T6946618c.out.i
+data/test/tools/javac/unit/util/list/FromArray.java.i
 data/test/tools/javac/NameClash/a/One.java.i
 data/test/tools/javac/diags/examples/IllegalQualNotIcls.java.i
 data/test/tools/javac/quid/QuotedIdent_BAD61.java.i
-data/test/com/sun/javadoc/testTaglets/TestTaglets.java.i
+data/src/share/classes/com/sun/tools/javadoc/SerializedForm.java.i
+data/src/share/classes/com/sun/source/tree/NewClassTree.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java.i
-data/test/tools/javac/diags/examples/ProcessorNotFound.java.i
+data/src/share/classes/com/sun/tools/javac/api/Messages.java.i
 data/test/tools/javac/6402516/TestIsAccessible.java.i
 data/test/tools/javac/generics/inference/6611449/T6611449.java.i
 data/test/tools/javac/LocalClasses_2.java.i
 data/test/tools/javac/failover/FailOver02.out.i
-data/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java.i
 data/test/tools/javac/6521805/T6521805d.out.i
 data/test/tools/javac/processing/errors/TestParseErrors/ParseErrors.java.i
+data/src/share/classes/sun/tools/javap/CPX2.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java.i
 data/test/tools/javac/TryWithResources/TwrOnNonResource.out.i
-data/test/tools/javac/diags/examples/ImproperTypeInnerRawParam.java.i
+data/test/tools/javac/DefiniteAssignment/DUBeforeDefined2.java.i
 data/test/tools/javac/FinalIntConcatenation.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java.i
+data/make/netbeans/langtools/nbproject/project.xml.i
 data/src/share/classes/com/sun/source/tree/ErroneousTree.java.i
 data/test/tools/javac/BadOptimization/DeadCode6.java.i
 data/test/tools/javac/NullQualifiedNew2.java.i
 data/test/tools/javac/AnonymousConstructorExceptions.java.i
-data/test/tools/javac/warnings/FallThrough.java.i
 data/test/tools/javac/generics/inference/6943278/T6943278.out.i
 data/test/tools/javac/processing/6511613/DummyProcessor.java.i
 data/test/com/sun/javadoc/AuthorDD/AuthorDD.java.i
 data/test/tools/javac/generics/rare/Rare9.java.i
 data/test/com/sun/javadoc/testTagInheritence/pkg/TestSuperSuperClass.java.i
-data/test/tools/javac/T6873849.java.i
-data/test/tools/javac/6734819/T6734819c.out.i
+data/test/tools/javac/6410653/T6410653.java.i
 data/test/tools/javac/generics/Covar4.java.i
 data/test/tools/javac/diags/README.examples.txt.i
-data/test/tools/javac/completion/C.java.i
+data/test/tools/javac/generics/diamond/7030687/ParserTest.java.i
 data/test/tools/javac/generics/Covar3.java.i
-data/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.java.i
-data/test/tools/javac/generics/ErasureClashCrash.java.i
+data/test/tools/javac/diags/examples/OverrideWeakerAccess.java.i
+data/src/share/classes/com/sun/tools/classfile/package.html.i
 data/test/tools/javac/4241573/T4241573.java.i
 data/test/tools/apt/Basics/Indirect.java.i
 data/test/com/sun/javadoc/testInterface/TestInterface.java.i
 data/make/netbeans/README.i
 data/src/share/classes/com/sun/javadoc/FieldDoc.java.i
-data/test/tools/javac/T4093617/T4093617.java.i
-data/src/share/classes/sun/tools/javap/FieldData.java.i
+data/test/tools/javac/OuterParameter_1.java.i
 data/test/tools/javac/overload/T6776289.java.i
 data/test/tools/javac/mixedTarget/CompatibleAbstracts4.java.i
 data/test/tools/javac/diags/examples/UncheckedPlural/UncheckedFilename.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java.i
-data/src/share/classes/com/sun/tools/javac/comp/Lower.java.i
+data/test/tools/apt/mirror/util/TypeCreation.java.i
 data/src/share/classes/com/sun/tools/javac/comp/Flow.java.i
-data/test/tools/javac/enum/TrailingComma.java.i
+data/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.java.i
 data/test/tools/javac/generics/typevars/6680106/T6680106.out.i
 data/make/jprt.properties.i
-data/test/tools/javap/4870651/T4870651.java.i
+data/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java.i
 data/test/tools/javac/generics/diamond/pos/Pos04.java.i
 data/test/tools/javac/6400872/B.java.i
 data/test/tools/javac/generics/ExtendedRaw3.java.i
 data/test/tools/javadoc/badSuper/p/B.java.i
-data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass1.java.i
+data/test/com/sun/javadoc/testLinkOption/testNewLineInLink/C.java.i
 data/src/share/classes/com/sun/source/tree/UnionTypeTree.java.i
 data/test/tools/javah/6572945/gold/jni.file.1.i
 data/test/tools/javac/implicitThis/WhichImplicitThis11.java.i
 data/test/tools/apt/lib/Tester.java.i
 data/test/tools/javac/modules/ModuleResolverTest01.java.i
-data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestClass.java.i
-data/test/tools/javac/generics/6213818/T6213818.java.i
+data/test/tools/javac/diags/examples/TypeVarMayNotBeFollowedByOtherBounds.java.i
+data/test/tools/javac/TryWithResources/T7022711.out.i
 data/test/tools/javac/QualifiedNew.out.i
-data/test/tools/javac/enum/forwardRef/T6425594.out.i
-data/test/tools/javac/limits/ArrayDims3.java.i
-data/test/tools/javac/policy/test1/byfile.ACD.out.i
+data/test/tools/javac/T6595666.java.i
+data/test/tools/javac/varargs/warning/Warn2.java.i
+data/test/com/sun/javadoc/testPackagePage/pkg2/C.java.i
 data/test/tools/javac/generics/wildcards/neg/CastWarn10.java.i
 data/test/tools/javac/diags/examples/PrematureEOF.java.i
 data/test/com/sun/javadoc/AccessH1/p1/C.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java.i
 data/test/tools/javac/QualifiedAccess/QualifiedAccess_2.sh.i
-data/test/tools/javac/generics/wildcards/neg/CastFail9.java.i
 data/src/share/classes/sun/tools/javap/Tables.java.i
-data/test/tools/javah/4942232/Test.java.i
+data/test/tools/javac/diags/examples/ProcUseImplicit/processors/AnnoProc.java.i
 data/test/tools/javac/generics/inference/6650759/T6650759k.java.i
 data/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.out.i
 data/test/tools/javac/TryWithResources/TwrLint.java.i
@@ -1735,163 +1727,169 @@ data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateA
 data/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/testfile.txt.i
 data/test/com/sun/javadoc/testPackageDeprecation/pkg1/ClassUseTest1.java.i
 data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java.i
+data/test/tools/javac/DefiniteAssignment/UncaughtException.java.i
 data/test/tools/javac/6403424/B.java.i
-data/src/share/classes/com/sun/tools/javac/parser/Keywords.java.i
-data/test/tools/javac/generics/Crash02.java.i
+data/test/tools/javap/pathsep.sh.i
+data/test/tools/javac/enum/6384542/T6384542a.java.i
+data/test/tools/javac/processing/filer/TestLastRound.java.i
 data/test/tools/javac/literals/T6891079.java.i
 data/test/tools/javac/diags/examples/InvalidInferredTypes.java.i
-data/test/tools/javac/varargs/6313164/T6313164.java.i
-data/test/tools/javac/UplevelFromAnonInSuperCall.java.i
+data/test/tools/javac/diags/examples/FinalParamCantBeAssigned.java.i
+data/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java.i
 data/test/tools/javac/BoolArray.java.i
 data/test/tools/javac/processing/options/XprintDocComments.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg1/B.java.i
-data/test/tools/javac/limits/ArrayDims5.java.i
-data/test/tools/javac/ImportPackagePrivateInner/Dummy.java.i
+data/test/tools/javac/generics/wildcards/neg/AmbiguousCast.java.i
+data/make/test/HelloWorld.javap.gold.txt.i
 data/test/tools/javac/generics/6372782/PlanarVector.java.i
 data/test/tools/javac/generics/RawClient.java.i
 data/test/tools/javac/diags/examples/MissingSVUID.java.i
-data/test/tools/javac/modules/ModuleVersionQueryTest01.java.i
+data/test/com/sun/javadoc/testOverridenMethods/pkg1/BaseClass.java.i
+data/test/tools/javadoc/annotations/badVals/pkg1/A.java.i
 data/test/tools/javac/4980495/static/Test.out.i
 data/src/share/classes/sun/tools/javap/Constants.java.i
-data/test/tools/javac/mixedTarget/ExtendCovariant1.java.i
+data/test/tools/javac/generics/6182950/T6182950b.out.i
+data/test/tools/javac/diags/ArgTypeCompilerFactory.java.i
 data/test/tools/javac/modules/ModuleModeTests/HelloAWTTest.java.i
 data/make/test/bootstrap/javah.sh.i
 data/test/tools/javac/types/BoxingConversionTest.java.i
 data/test/com/sun/javadoc/testPrivateClasses/pkg/PublicChild.java.i
 data/test/com/sun/javadoc/testConstructorIndent/C.java.i
-data/test/tools/javac/diags/examples/UncheckedMethodInvocation.java.i
+data/test/com/sun/javadoc/ValidHtml/overview.html.i
 data/test/tools/javac/diags/examples/CountError.java.i
-data/test/tools/javac/6835430/A.java.i
-data/test/tools/javac/annotations/6214965/T6214965.out.i
+data/src/share/classes/com/sun/mirror/util/Declarations.java.i
 data/test/tools/javac/policy/test1/C.java.i
 data/test/tools/javac/diags/examples/DuplicateAnnotationMemberValue.java.i
-data/test/tools/javac/generics/compat/CovariantCompat2.java.i
-data/test/tools/javac/NestedFinallyReturn.java.i
 data/test/tools/javac/cast/5043020/T5043020.java.i
 data/src/share/classes/com/sun/source/util/Trees.java.i
 data/test/tools/javac/policy/test1/Test1b.java.i
 data/test/tools/javac/6302184/T6302184.out.i
 data/test/tools/javac/diags/examples/IllegalUnderscore.java.i
 data/src/share/classes/com/sun/tools/javac/file/Paths.java.i
-data/src/share/classes/com/sun/tools/classfile/Attributes.java.i
+data/test/com/sun/javadoc/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java.i
 data/test/tools/javac/6979683/TestCast6979683_BAD34.java.i
 data/src/share/classes/com/sun/tools/apt/resources/apt_zh_CN.properties.i
 data/test/tools/javac/api/ToolProvider/HelloWorldTest.java.i
 data/test/tools/javac/T6397044.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java.i
-data/test/tools/javac/generics/diamond/neg/Neg06.out.i
-data/test/tools/javac/processing/options/TestImplicitNone.java.i
+data/src/share/classes/javax/tools/SimpleJavaFileObject.java.i
+data/test/tools/javac/generics/rawOverride/7062745/T7062745neg.java.i
 data/test/tools/javac/miranda/T4711325.java.i
-data/test/tools/javac/javazip/A.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/background.gif.i
 data/test/tools/javac/TryWithResources/BadTwr.java.i
 data/test/tools/javac/T6265400.java.i
-data/test/com/sun/javadoc/testLinkOption/TestLinkOption.java.i
+data/src/share/classes/com/sun/javadoc/ClassDoc.java.i
 data/test/tools/javac/stackmap/UninitThis.java.i
 data/test/tools/javac/policy/byfile.ABD.out.i
 data/test/tools/javac/enum/NoFinal3.java.i
+data/test/tools/javac/T6458823/MyProcessor.java.i
 data/test/tools/javac/generics/Conditional.java.i
 data/test/tools/javac/diags/examples/WhereIntersection.java.i
 data/test/tools/javac/multicatch/Pos07.java.i
 data/test/tools/javac/enum/FauxSpecialEnum2.java.i
 data/src/share/classes/sun/tools/javap/JavapEnvironment.java.i
 data/src/share/classes/javax/lang/model/package-info.java.i
-data/test/tools/javap/4870651/Test.java.i
-data/test/tools/javac/api/6431257/T6431257.java.i
+data/src/share/classes/com/sun/javadoc/SeeTag.java.i
+data/test/tools/javac/annotations/pos/Parameter.java.i
+data/test/tools/javac/NonStaticFieldExpr1.out.i
 data/test/tools/javac/Diagnostics/6860795/T6860795.java.i
 data/test/tools/javac/abstract/U2.java.i
-data/test/tools/javadoc/generics/tparamTagOnMethod/expected.out.i
-data/test/tools/javadoc/annotations/defaults/pkg1/B.java.i
-data/test/tools/javap/typeAnnotations/T6855990.java.i
+data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C3.java.i
+data/test/tools/javac/generics/typevars/6968793/T6968793.out.i
+data/test/tools/javac/generics/odersky/BadTest3.java.i
 data/test/tools/javac/Object1.java.i
 data/test/tools/apt/Scanners/Counter.java.i
 data/test/tools/javac/T6397286.java.i
 data/test/tools/javac/diags/examples/InferArgsLengthMismatch.java.i
 data/test/tools/javac/6558548/T6558548.java.i
-data/test/tools/javac/DepParam.java.i
-data/test/tools/javac/annotations/neg/Recovery1.java.i
+data/test/tools/javac/packone/Secret.java.i
+data/test/tools/javac/enum/T6509042.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/CommentedMethodFinder.java.i
 data/test/tools/javac/synthesize/Character.java.i
 data/test/tools/javac/typeAnnotations/newlocations/Fields.java.i
 data/src/share/classes/javax/lang/model/element/NestingKind.java.i
+data/test/tools/javac/generics/UncheckedArray.java.i
 data/test/tools/javac/T4994049/T4994049.out.i
-data/test/com/sun/javadoc/testThrowsTag/pkg/C.java.i
-data/test/tools/javadoc/sourceOnly/Test.java.i
-data/test/com/sun/javadoc/testSimpleTagExclude/DummyClass.java.i
+data/test/tools/javac/positions/T6253161a.out.i
+data/test/tools/javac/6979683/TestCast6979683_BAD34.java.errlog.i
 data/test/tools/javac/T6472751.java.i
 data/test/tools/javac/generics/InnerInterface1.java.i
-data/test/tools/javac/implicitThis/NewBeforeOuterConstructed3.java.i
-data/test/tools/javac/diags/examples/NoInterfaceExpected.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java.i
+data/src/share/classes/com/sun/source/tree/BreakTree.java.i
 data/test/tools/javac/enum/EnumInit.java.i
+data/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java.i
 data/src/share/classes/com/sun/tools/classfile/ClassWriter.java.i
 data/test/com/sun/javadoc/VersionNumber/VersionNumber.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/AptEnv.java.i
-data/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java.i
+data/test/com/sun/javadoc/testLinkToSerialForm/pkg/C.java.i
 data/src/share/classes/com/sun/mirror/apt/package-info.java.i
 data/test/tools/javac/generics/odersky/Test3.java.i
 data/test/tools/javac/warnings/6747671/T6747671.out.i
 data/test/tools/javac/boxing/NoBoxingShort.java.i
-data/test/tools/javac/6840059/T6840059.out.i
+data/test/tools/javac/diags/examples/IntfAnnotationMemberClash.java.i
 data/test/com/sun/javadoc/testTagInheritence/pkg/TestInterface.java.i
 data/test/com/sun/javadoc/lib/JavadocTester.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java.i
-data/test/com/sun/javadoc/testThrowsHead/C.java.i
-data/test/tools/javac/policy/test1/simple.ABD.out.i
+data/test/tools/javac/depOverrides/annotation/Test3.java.i
+data/test/tools/javac/processing/6512707/T6512707.java.i
 data/test/tools/apt/mirror/declaration/AnnoTypeDecl.java.i
 data/test/tools/javac/generics/inference/6278587/T6278587.java.i
 data/test/tools/javac/NonStaticFieldExpr2.java.i
-data/test/tools/javac/unit/util/list/FromArray.java.i
-data/src/share/classes/com/sun/tools/javadoc/Start.java.i
+data/test/tools/apt/mirror/declaration/ClassDecl.java.i
+data/test/tools/javac/generics/6946618/T6946618c.out.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java.i
 data/test/tools/javac/generics/6476118/T6476118b.java.i
-data/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java.i
+data/test/tools/javac/unicode/SupplementaryJavaID4.java.i
 data/test/tools/javac/generics/typeargs/Newarg2.java.i
 data/test/tools/javac/diags/examples/ImproperTypeParamMissing.java.i
+data/test/tools/javap/T6715753.java.i
 data/test/tools/javac/inheritedAccess/P1/priv.java.i
 data/test/tools/javac/ClassPathTest/ClassPathTest3.java.i
-data/test/tools/javac/TryWithResources/T7022711.java.i
+data/src/share/classes/sun/tools/javap/FieldData.java.i
 data/src/share/classes/com/sun/mirror/declaration/ParameterDeclaration.java.i
-data/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java.i
+data/test/tools/javap/4870651/T4870651.java.i
+data/test/tools/javac/abstract/T2.java.i
 data/test/tools/javac/generics/rawOverride/Warn1.java.i
 data/src/share/classes/com/sun/tools/javac/util/DiagnosticFormatter.java.i
 data/test/tools/javac/multicatch/Pos03.java.i
 data/test/tools/javac/ClassLiterals/InitializeOuter.java.i
+data/test/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties.i
-data/src/share/classes/com/sun/tools/javac/comp/Modules.java.i
+data/test/tools/javac/synthesize/Byte.java.i
 data/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound2.java.i
 data/test/tools/javadoc/generics/supertypes/expected.out.i
 data/test/tools/javac/diags/examples/DuplicateDefaultLabel.java.i
 data/test/tools/javac/diags/examples/StringConstRequired.java.i
 data/test/tools/javac/generics/6292765/T6292765.java.i
-data/src/share/classes/com/sun/javadoc/ClassDoc.java.i
+data/test/com/sun/javadoc/testLinkOption/TestLinkOption.java.i
 data/src/share/classes/com/sun/tools/classfile/ClassTranslator.java.i
 data/test/tools/javac/enum/T5081785b.java.i
 data/test/tools/javac/generics/inference/6365166/NewTest.java.i
-data/test/tools/javac/packone/Secret.java.i
-data/test/tools/javac/6979683/TestCast6979683_BAD34.java.errlog.i
+data/test/tools/javac/DepParam.java.i
+data/test/com/sun/javadoc/testSimpleTagExclude/DummyClass.java.i
 data/test/tools/javac/tree/T6963934.java.i
-data/test/com/sun/javadoc/testLinkToSerialForm/pkg/C.java.i
+data/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java.i
 data/src/share/classes/com/sun/mirror/declaration/TypeDeclaration.java.i
 data/test/tools/javac/generics/inference/5073060/GenericsAndPackages.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java.i
+data/src/share/classes/com/sun/tools/javadoc/Start.java.i
 data/test/tools/javac/links/b/B.java.i
 data/test/tools/javac/diags/examples/EnumNoFinalize.java.i
+data/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java.i
 data/test/tools/javac/generics/SilentUnchecked.java.i
 data/test/tools/javac/diags/examples/MissingDeprecatedAnnotation.java.i
 data/test/tools/javac/meth/InvokeMHTrans.java.i
+data/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html.i
 data/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java.i
 data/test/com/sun/javadoc/testMemberInheritence/diamond/B.java.i
 data/test/tools/javac/generics/inference/5081782/Neg.java.i
 data/test/tools/javac/EOI.java.i
-data/test/tools/javac/generics/rare/Rare8.java.i
+data/test/tools/javac/processing/environment/round/SurfaceAnnotations.java.i
 data/test/tools/javac/capture/T6594284.java.i
-data/test/tools/javac/7003595/T7003595.java.i
 data/test/tools/javadoc/generics/throwsGeneric/Main.java.i
 data/test/tools/javadoc/outputRedirect/p/OutputRedirect.java.i
 data/test/tools/javac/binaryCompat/T2.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java.i
 data/test/tools/javac/warnings/DivZero.noLint.out.i
 data/test/tools/apt/Basics/golden.txt.i
-data/test/tools/apt/Compile/ClassDeclApf2.java.i
-data/test/tools/javac/diags/examples/ImproperSVUID.java.i
 data/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java.i
 data/test/tools/javac/generics/diamond/neg/Neg11.java.i
 data/test/tools/javac/6863465/T6863465b.java.i
@@ -1901,10 +1899,12 @@ data/test/tools/javac/diags/examples/StaticImportOnlyClassesAndInterfaces/Other.
 data/test/tools/javac/diags/examples/ForeachNotSupported.java.i
 data/test/tools/javac/T6340549.java.i
 data/test/tools/javac/danglingDep/Test1.java.i
+data/src/share/classes/com/sun/tools/javap/resources/javap.properties.i
 data/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties.i
 data/test/tools/javac/generics/wildcards/AssignmentSameType3.java.i
 data/src/share/classes/com/sun/tools/javac/api/JavacTrees.java.i
 data/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.out.i
+data/test/tools/javac/processing/werror/WError1.java.i
 data/test/tools/javac/generics/6294779/T6294779b.java.i
 data/src/share/classes/com/sun/tools/classfile/Code_attribute.java.i
 data/test/tools/javac/6440583/A.java.i
@@ -1912,16 +1912,17 @@ data/test/tools/javac/processing/warnings/UseImplicit/err.out.i
 data/test/TEST.ROOT.i
 data/test/tools/javac/failover/FailOver05.java.i
 data/make/netbeans/compiler/build.xml.i
-data/test/tools/javac/annotations/pos/OverrideCheck.java.i
+data/test/tools/javac/generics/6294779/T6294779a.java.i
 data/src/share/classes/javax/tools/JavaCompiler.java.i
 data/test/tools/javac/T6234077.java.i
 data/test/tools/javac/diags/examples/PrintRounds/PrintRounds.java.i
 data/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java.i
-data/src/share/classes/com/sun/tools/javac/util/Options.java.i
-data/test/tools/javac/processing/6348499/A.java.i
+data/test/tools/javac/depDocComment/DeprecatedDocComment3.java.i
 data/test/tools/javah/6572945/T6572945.java.i
-data/test/tools/javac/6304921/TestLog.java.i
+data/src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties.i
+data/test/tools/javac/warnings/6594914/T6594914b.java.i
 data/test/tools/javac/enum/UserValue.java.i
+data/test/tools/javac/DefiniteAssignment/ThrowBeforeTryFinally.java.i
 data/test/tools/javac/diags/examples/VarargsPluralAdditional/VarargsFilename.java.i
 data/test/tools/javac/generics/typevars/6569404/T6569404a.java.i
 data/src/share/classes/com/sun/javadoc/package.html.i
@@ -1929,85 +1930,90 @@ data/test/tools/javac/generics/inference/6938454/T6938454a.java.i
 data/test/tools/javac/CastInterface2Array.java.i
 data/test/tools/javac/NewGeneric.java.i
 data/test/tools/javac/diags/examples/DiamondInvalidArg.java.i
-data/test/tools/javac/api/6411310/T6411310.java.i
+data/test/tools/javac/generics/wildcards/6437894/A.java.i
 data/test/tools/javac/proprietary/WarnStaticImport.java.i
 data/test/tools/javadoc/annotations/elementTypes/pkg1/A.java.i
 data/test/tools/javac/annotations/default/Eerr.java.i
 data/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java.i
-data/test/tools/javac/T6407066.java.i
 data/test/tools/javac/generics/typevars/6182630/T6182630e.java.i
 data/src/share/classes/com/sun/javadoc/PackageDoc.java.i
 data/test/com/sun/javadoc/AccessAsciiArt/p1/SC.java.i
 data/test/tools/javac/failover/FailOver01.out.i
 data/test/tools/javac/diags/examples/CantDeref.java.i
 data/test/tools/javac/diags/examples/UnnamedPackage.java.i
-data/make/netbeans/langtools/nbproject/project.xml.i
+data/test/tools/javac/FinallyWarn.java.i
 data/test/tools/apt/Basics/Aggregate.java.i
 data/test/tools/javadoc/annotations/elementTypes/Main.java.i
 data/test/tools/javac/generics/6332204/T6332204.java.i
 data/test/tools/javac/generics/7007615/acc1/p1/C.java.i
 data/test/tools/javac/OverrideChecks/6400189/T6400189b.java.i
-data/test/tools/javac/processing/model/util/Superless.java.i
 data/test/tools/javac/6341866/B.java.i
 data/test/tools/javac/generics/7015430/T7015430.java.i
-data/test/tools/javac/6521805/T6521805d.java.i
 data/test/tools/javac/typeAnnotations/classfile/DeadCode.java.i
+data/test/tools/javac/depDocComment/DeprecatedDocComment.out.i
 data/test/com/sun/javadoc/testThrowsTag/pkg/P.java.i
-data/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java.i
 data/test/tools/javap/T6622216.java.i
 data/test/tools/javac/synthesize/Object.java.i
 data/test/com/sun/javadoc/testUseOption/pkg1/C1.java.i
 data/test/tools/javac/diags/examples/DivZero.java.i
 data/test/tools/javac/crossPackageImpl/CrossPackageImplB.java.i
+data/test/tools/javac/processing/model/util/OverridesSpecEx.java.i
 data/src/share/classes/com/sun/source/tree/PackageTree.java.i
 data/src/share/classes/com/sun/mirror/type/DeclaredType.java.i
 data/src/share/classes/com/sun/tools/javac/comp/Check.java.i
 data/test/tools/javac/generics/wildcards/pos/ParamCast.java.i
+data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out.i
 data/test/tools/javac/generics/T4739399.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/inherit.gif.i
-data/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java.i
+data/test/tools/javac/policy/test2/byfile.BA.out.i
 data/test/tools/javac/NameCollision2.java.i
-data/src/share/classes/com/sun/tools/javah/resources/l10n.properties.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java.i
 data/test/tools/javac/T6394563.note.out.i
 data/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java.i
 data/test/tools/javac/4880220/T4880220.warn.out.i
+data/test/tools/javac/diags/examples/IntfMethodCantHaveBody.java.i
 data/test/tools/javac/diags/examples/VarargsFilename.java.i
 data/test/tools/javadoc/T4994049/T4994049.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java.i
-data/test/com/sun/javadoc/testSuperclassInSerialForm/pkg/SubClass.java.i
-data/test/tools/javac/generics/6372782/T6372782.java.i
+data/test/tools/javac/ClassToTypeParm.java.i
+data/test/tools/javac/7003595/T7003595.java.i
 data/test/tools/javac/typeAnnotations/failures/Scopes.out.i
+data/test/tools/javac/generics/inference/4972073/T4972073a.java.i
 data/test/tools/apt/Compile/src/Round1Class.java.i
 data/test/tools/javac/enum/EnumSwitch4.java.i
 data/test/tools/javac/jvm/6397652/com/test/Test$Test.java.i
-data/src/share/classes/com/sun/mirror/apt/RoundCompleteListener.java.i
 data/test/com/sun/javadoc/WindowTitles/p2/C2.java.i
 data/test/tools/javac/typeAnnotations/newlocations/BasicTest.java.i
-data/test/tools/javac/diags/examples/OperatorCantBeApplied.java.i
+data/make/netbeans/common/shared.xml.i
+data/test/tools/javadoc/annotations/missing/Main.java.i
 data/test/tools/javac/cast/6256789/T6256789.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java.i
 data/src/share/classes/com/sun/mirror/declaration/package.html.i
 data/src/share/classes/com/sun/tools/javac/zip/ZipFileIndex.java.i
-data/test/tools/javac/Digits.java.i
+data/test/tools/javac/diags/examples/ProcSuspiciousClassName/processors/AnnoProc.java.i
+data/src/share/classes/com/sun/tools/javac/parser/EndPosTable.java.i
 data/src/share/classes/com/sun/tools/javac/util/Old199.java.i
-data/src/share/classes/com/sun/tools/classfile/Module_attribute.java.i
 data/test/tools/javac/varargs/5088429/T5088429Pos02.java.i
 data/test/tools/javac/T4906100.java.i
+data/test/tools/javac/expression/NullAppend2.java.i
 data/src/share/classes/com/sun/tools/classfile/AccessFlags.java.i
 data/test/tools/javac/diags/examples/ThrowsNotAllowedInAnno.java.i
 data/test/tools/javac/limits/FinallyNesting.java.i
-data/test/tools/javac/AnonymousNull.java.i
+data/test/tools/javac/Closure3.java.i
+data/test/tools/apt/mirror/type/AnnoTyp.java.i
 data/test/tools/javac/stackmap/T4955930.java.i
 data/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java.i
+data/test/tools/javac/unicode/SupplementaryJavaID1.java.i
 data/test/tools/javac/6403424/A.java.i
 data/test/tools/javac/generics/6910550/T6910550d.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/TagletOutputImpl.java.i
+data/test/tools/javac/sourcePath2/SourcePath2.java.i
 data/test/tools/javac/diags/examples/ProcTypeRecreate/ProcTypeRecreate.java.i
 data/test/tools/javac/annotations/neg/Z2.java.i
 data/test/tools/javac/typeAnnotations/failures/OldArray.java.i
 data/test/tools/javac/generics/ArrayTypearg.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java.i
 data/src/share/classes/javax/lang/model/util/ElementKindVisitor6.java.i
-data/test/tools/javac/BadOptimization/DeadCode1.java.i
+data/test/tools/javac/diags/examples/ProcessorWrongType/processors/AnnoProc.java.i
 data/test/tools/javac/staticImport/6695838/T6695838.java.i
 data/test/tools/javac/diags/examples/SunApiPluralAdditional/SunApiPlural.java.i
 data/test/com/sun/javadoc/DocRootSlash/p1/C1.java.i
@@ -2017,54 +2023,60 @@ data/src/share/classes/com/sun/source/tree/DisjointTypeTree.java.i
 data/make/netbeans/compiler/nbproject/project.xml.i
 data/test/tools/javac/multicatch/model/ModelChecker.java.i
 data/test/tools/javac/AnonStaticMember_3.java.i
+data/test/tools/javac/generics/typevars/6968793/T6968793.java.i
 data/test/com/sun/javadoc/testPackageDeprecation/pkg/A.java.i
-data/test/tools/javac/QualifiedThisAndSuper_1.java.i
 data/test/tools/javac/generics/syntax/6318240/BarNeg2.java.i
 data/src/share/classes/javax/annotation/processing/SupportedAnnotationTypes.java.i
 data/test/com/sun/javadoc/WindowTitles/p1/C1.java.i
-data/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedFilename1.java.i
+data/test/tools/javac/failover/FailOver15.out.i
 data/src/share/classes/com/sun/source/util/TreePathScanner.java.i
-data/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java.i
-data/test/tools/javac/diags/examples/IdentifierExpected.java.i
+data/test/tools/javac/diags/examples/ForeachNotApplicable.java.i
+data/test/tools/javac/processing/model/util/elements/TestGetConstantExpression.java.i
 data/test/tools/javac/diags/examples/CatchWithoutTry.java.i
 data/test/tools/javac/limits/NumArgs3.java.i
 data/test/tools/javac/diags/examples/KindnameVariable.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties.i
 data/test/tools/javac/annotations/neg/WrongTarget.java.i
+data/test/tools/javac/ignored.jtx.i
+data/test/tools/javac/positions/T6253161a.java.i
 data/test/tools/javac/generics/wildcards/neg/CastFail13.java.i
-data/test/tools/javadoc/completionFailure/pkg/A.java.i
-data/test/tools/javac/QualifiedAccess/QualifiedAccess_1.out.i
+data/src/share/classes/com/sun/tools/apt/mirror/declaration/PackageDeclarationImpl.java.i
+data/test/tools/javac/T5003235/T5003235c.out.i
 data/test/tools/javac/generics/6985719/T6985719g.out.i
+data/src/share/classes/com/sun/mirror/type/WildcardType.java.i
 data/test/tools/javac/generics/6372782/PlainPlanarVector.java.i
 data/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java.i
 data/test/tools/javac/4980495/static/Test.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java.i
 data/test/tools/javac/6717241/T6717241a.java.i
 data/test/tools/javac/modules/ModuleModeTests/HelloWorldTest.java.i
 data/test/tools/javac/ClassPathTest/ClassPathTest1.java.i
 data/test/tools/javac/generics/wildcards/6762569/T6762569a.java.i
 data/test/tools/javac/policy/test1/Test1a.java.i
+data/test/tools/javac/multicatch/Neg04eff_final.out.i
+data/test/tools/javac/generics/6476118/T6476118c.out.i
 data/test/tools/javac/diags/examples/RepeatedModifier.java.i
-data/test/tools/javac/NestedInnerClassNames.sh.i
+data/test/tools/javac/generics/rawOverride/7062745/T7062745neg.out.i
 data/test/tools/javac/processing/model/TestSourceVersion.java.i
 data/test/tools/apt/Basics/MySimple.java.i
 data/test/com/sun/javadoc/testMemberInheritence/diamond/A.java.i
+data/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java.i
 data/test/tools/javadoc/annotations/annotatePackage/pkg1/A.java.i
 data/src/share/classes/com/sun/tools/javac/resources/version.properties-template.i
 data/test/tools/javac/processing/model/TestSymtabItems.java.i
-data/test/tools/javac/generics/inference/6315770/T6315770.java.i
+data/test/tools/javac/scope/6225935/StaticImportAccess.java.i
 data/test/tools/javac/policy/test2/bytodo.BA.out.i
 data/src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java.i
 data/src/share/classes/com/sun/tools/javap/ClassWriter.java.i
 data/test/tools/javac/generics/7034019/T7034019c.out.i
 data/test/tools/javac/InitializerCompletion_1.java.i
-data/test/tools/javac/QualifiedAccess/QualifiedAccess_2.java.i
 data/test/tools/javac/boxing/T6816548.java.i
 data/test/tools/javac/generics/InstanceOf3.java.i
 data/test/tools/javac/generics/diamond/7030150/Neg03.out.i
 data/test/tools/javac/QualifiedThisAndSuper_3.java.i
 data/test/tools/javac/diags/examples/AbstractCantBeAccessed.java.i
-data/test/tools/javac/typeAnnotations/newlocations/Wildcards.java.i
+data/test/tools/javac/Diagnostics/6722234/T6722234b_2.out.i
 data/test/com/sun/javadoc/testTypeParams/pkg/C.java.i
 data/test/tools/javac/6402516/TestMethod.java.i
 data/src/share/opensource/javac/doc/document.css.i
@@ -2073,40 +2085,42 @@ data/test/tools/javadoc/nestedClass/NestedClass.java.i
 data/test/tools/apt/Misc/Marker.java.i
 data/test/tools/javac/4980495/std/Test.java.i
 data/test/tools/javac/diags/examples/CannotCreateArrayWithTypeArgs.java.i
-data/test/tools/javac/diags/examples/EnumAnnoValueMustBeEnumConst.java.i
+data/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java.i
 data/src/share/opensource/javac/doc/javac_lifecycle/style.css.i
 data/test/tools/javac/diags/examples/AnonClassImplInterfaceNoTypeArgs.java.i
+data/src/share/classes/com/sun/source/tree/ExportDirectiveTree.java.i
 data/test/tools/javac/diags/examples/InvalidMethodDecl.java.i
 data/test/tools/javac/ExtendArray.java.i
 data/test/tools/javac/generics/T4695847.java.i
-data/test/tools/javac/generics/6245699/T6245699.java.i
+data/test/tools/javah/ReadOldClass.sh.i
 data/test/tools/javac/failover/FailOver06.java.i
 data/src/share/classes/com/sun/tools/javac/Main.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/package.html.i
 data/test/tools/javac/T6214885b.out.i
 data/test/com/sun/javadoc/testThrowsTag/pkg/T8.java.i
-data/test/tools/javac/FloatingPointChanges/Test.java.i
+data/src/share/classes/com/sun/tools/classfile/Attributes.java.i
 data/src/share/classes/com/sun/tools/classfile/Opcode.java.i
 data/src/share/classes/com/sun/source/tree/ModuleIdTree.java.i
 data/src/share/classes/com/sun/tools/classfile/Field.java.i
-data/test/tools/javac/generics/typevars/5060485/Neg2.java.i
+data/test/tools/javac/annotations/pos/OverrideCheck.java.i
 data/src/share/classes/com/sun/source/tree/ModuleRequiresTree.java.i
-data/test/tools/javac/6302184/T6302184.sh.i
+data/test/tools/javac/Increment.java.i
 data/test/tools/javac/innerClassFile/Driver.java.i
 data/test/tools/javac/ClassCycle/ClassCycle2b.java.i
 data/test/tools/javac/warnings/6594914/DeprecatedClass.java.i
 data/test/tools/javac/T6985181.java.i
 data/test/tools/javac/annotations/6214965/CompilerAnnotationTest2.java.i
-data/test/com/sun/javadoc/JavascriptWinTitle/p1/C.java.i
+data/test/tools/javac/diags/examples/ProcUseImplicit/ProcUseImplicit.java.i
 data/test/tools/javac/generics/wildcards/AssignmentSameType5.java.i
+data/test/tools/javac/PackageClassAmbiguity/Bad.java.i
 data/test/tools/javac/api/T6431879.java.i
+data/test/tools/javac/generics/diamond/6996914/T6996914a.java.i
 data/src/share/classes/com/sun/source/util/TreePath.java.i
 data/test/tools/javac/generics/parametricException/K.java.i
-data/test/tools/javac/diags/examples/AnnosWithoutProcessors/AnnosWithoutProcessors.java.i
 data/test/tools/javac/ReturnAfterIfThenElse.java.i
-data/test/tools/javac/generics/6207386/Test.java.i
+data/test/tools/javac/assert/DU1.java.i
 data/src/share/classes/com/sun/tools/javah/Gen.java.i
-data/test/tools/javac/OverrideChecks/6738538/T6738538a.java.i
+data/test/tools/javac/generics/MissingCast.java.i
 data/test/tools/javadoc/sourceOption/p/A.java.i
 data/test/tools/javac/generics/diamond/pos/Pos03.java.i
 data/test/tools/javac/generics/6476118/T6476118a.java.i
@@ -2117,6 +2131,7 @@ data/test/tools/javac/6508981/p/A.java.i
 data/test/tools/javac/6627362/x/E.java.i
 data/test/tools/javah/6257087/foo.sh.i
 data/test/com/sun/javadoc/testHtmlStrongTag/pkg1/C1.java.i
+data/src/share/classes/com/sun/javadoc/SerialFieldTag.java.i
 data/test/tools/javac/api/T6306137.java.i
 data/test/tools/javac/generics/7034511/T7034511b.java.i
 data/test/tools/javac/generics/diamond/7030687/T7030687.java.i
@@ -2126,49 +2141,46 @@ data/test/tools/javac/boxing/NoBoxingBool.java.i
 data/src/share/classes/com/sun/tools/javac/file/FSInfo.java.i
 data/test/tools/javac/implicitThis/WhichImplicitThis7.java.i
 data/test/tools/javac/miranda/4686811/p2/B.java.i
-data/test/tools/javac/modules/ModuleResolverTest05.java.i
+data/test/tools/javac/diags/examples/NotApplicableMethodFound.java.i
+data/test/tools/javac/6304921/TestLog.java.i
 data/test/tools/javac/lib/CompileFail.java.i
-data/test/tools/javac/StringAppendAccessMethodOnLHS.java.i
+data/test/tools/javac/diags/examples/AlreadyDefinedClinit.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/type/ArrayTypeImpl.java.i
 data/src/share/opensource/javac/doc/javac_lifecycle/Context.html.i
-data/test/tools/javac/Paths/6638501/test/SayHello.java.i
 data/test/tools/javac/TryWithResources/TwrFlow.java.i
 data/test/tools/javac/api/T6392782.java.i
 data/test/tools/apt/Compile/src/AhOneClass.java.i
 data/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java.i
-data/test/tools/javac/annotations/pos/TrailingComma.java.i
+data/src/share/classes/com/sun/source/tree/ProvidesModuleDirectiveTree.java.i
 data/test/com/sun/javadoc/testBaseClass/Bar.java.i
-data/test/tools/javac/implicitThis/6541876/T6541876a.java.i
-data/test/tools/javac/literals/BadBinaryLiterals.java.i
+data/make/netbeans/compiler/README.i
 data/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java.i
 data/test/tools/javac/generics/inference/5044646/p2/A2.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java.i
 data/test/tools/javac/positions/T6264029.java.i
 data/test/tools/javac/annotations/neg/WrongTarget2.java.i
-data/test/tools/javac/generics/SuperTypeargs.java.i
 data/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java.i
 data/test/tools/javac/generics/wildcards/neg/CastFail8.java.i
 data/test/com/sun/javadoc/testTagHolderMethod/pkg/C.java.i
 data/test/tools/javac/6979683/TestCast6979683_BAD36.java.errlog.i
 data/test/tools/javac/processing/warnings/gold_unsp_warn.out.i
-data/test/tools/javac/generics/inference/5021635/T5021635.java.i
 data/test/tools/javac/warnings/Deprecation.lintDeprecation.out.i
-data/test/tools/javac/enum/AbstractEmptyEnum.java.i
-data/src/share/classes/com/sun/tools/javap/JavapFileManager.java.i
+data/test/tools/javac/ClassFileModifiers/MemberModifiers.java.i
 data/test/tools/javac/generics/GetClass.java.i
 data/test/tools/javac/QualifiedAccess/QualifiedAccess_3.sh.i
 data/src/share/classes/com/sun/javadoc/Parameter.java.i
 data/test/tools/javac/T6241723.java.i
+data/test/tools/javac/T6326754.java.i
 data/test/tools/apt/Discovery/PhantomTouch.java.i
 data/test/tools/javac/abstract/U3.java.i
 data/src/share/classes/com/sun/tools/classfile/ModuleProvides_attribute.java.i
 data/test/tools/javac/proprietary/WarnWildcard.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java.i
 data/test/tools/javac/diags/examples/Location1.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/package.html.i
 data/test/com/sun/javadoc/testLinkOption/pkg/C.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java.i
 data/test/tools/javadoc/annotations/annotateMethodsFields/Main.java.i
-data/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java.i
 data/test/tools/javac/generics/diamond/pos/Pos06.java.i
 data/test/com/sun/javadoc/testStylesheet/TestStylesheet.java.i
 data/test/tools/javac/generics/ExtendedRaw1.java.i
@@ -2191,7 +2203,7 @@ data/test/com/sun/javadoc/AccessSummary/p1/C1.java.i
 data/src/share/classes/com/sun/mirror/util/Types.java.i
 data/src/share/classes/javax/lang/model/type/ArrayType.java.i
 data/test/tools/javac/enum/OkFinal.java.i
-data/test/tools/javac/NonStaticFieldExpr4d.java.i
+data/test/tools/javac/generics/6182950/T6182950b.java.i
 data/test/tools/javac/diags/examples/ProcTypeRecreate/processors/AnnoProc.java.i
 data/test/tools/javac/processing/model/testgetallmembers/Main.java.i
 data/test/tools/javac/diags/examples/MissingMethodBody.java.i
@@ -2203,7 +2215,7 @@ data/test/tools/javac/generics/6372782/VariableForm.java.i
 data/test/tools/javac/unicode/FirstChar.java.i
 data/test/tools/javadoc/generics/genericSuper/expected.out.i
 data/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java.i
-data/test/tools/javac/ImportCycle/foo/Top2.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties.i
 data/src/share/classes/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java.i
 data/test/tools/javadoc/sourceOnly/p/NonSource.class.i
 data/test/tools/javac/processing/6994946/SemanticErrorTest.1.out.i
@@ -2220,7 +2232,7 @@ data/test/tools/javac/protectedInner/AnonInnerClass.java.i
 data/test/tools/javac/generics/inference/6359106/T6359106.java.i
 data/test/tools/apt/Compile/Round2Apf.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg1/A.java.i
-data/test/tools/javac/abstract/T4717181a.java.i
+data/test/tools/javac/generics/typevars/6182630/T6182630d.java.i
 data/src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java.i
 data/test/tools/javac/incompatibleNoninherited/B.java.i
 data/src/share/classes/com/sun/mirror/declaration/PackageDeclaration.java.i
@@ -2229,11 +2241,11 @@ data/test/tools/javac/processing/model/util/deprecation/Dep1.java.i
 data/test/tools/javac/lint/Unchecked.java.i
 data/test/tools/javac/diags/examples/GenericsNotSupported.java.i
 data/test/tools/javadoc/generics/genericMethod/expected.out.i
-data/src/share/classes/sun/tools/javap/InnerClassData.java.i
+data/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateParent.java.i
 data/test/tools/javac/NonAmbiguousField/one/Parent2.java.i
 data/src/share/classes/javax/tools/ForwardingJavaFileObject.java.i
 data/src/share/classes/com/sun/tools/javac/jvm/Target.java.i
-data/test/tools/javac/annotations/neg/MemberOver.java.i
+data/test/tools/javac/6521805/T6521805d.java.i
 data/test/tools/javac/generics/inference/6650759/T6650759m.out.i
 data/test/tools/javac/typeAnnotations/failures/target/VoidMethod.out.i
 data/test/tools/javac/binaryCompat/T3.java.i
@@ -2246,43 +2258,48 @@ data/test/tools/javac/processing/model/util/GetTypeElemBadArg.java.i
 data/test/tools/javac/failover/FailOver04.out.i
 data/test/tools/javac/diags/examples/ProcIncompatibleSourceVersion/processors/AnnoProc.java.i
 data/src/share/classes/com/sun/tools/classfile/AttributeException.java.i
+data/src/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java.i
 data/test/tools/javac/diags/examples/NotDefPublicCantAccess/p/C.java.i
-data/test/tools/javac/annotations/neg/Z12.java.i
-data/test/com/sun/javadoc/testHeadings/pkg1/C1.java.i
+data/test/tools/javac/diags/examples/CountWarnPlural.java.i
 data/test/com/sun/javadoc/testNestedGenerics/pkg/NestedGenerics.java.i
-data/test/com/sun/javadoc/testMemberInheritence/diamond/C.java.i
+data/test/tools/javac/generics/InnerInterface2.java.i
 data/test/tools/javac/generics/7022054/T7022054neg2.out.i
 data/src/share/classes/com/sun/tools/apt/mirror/declaration/ClassDeclarationImpl.java.i
 data/src/share/classes/com/sun/mirror/type/PrimitiveType.java.i
+data/test/com/sun/javadoc/testIndex/pkg/AnnotationType.java.i
 data/test/tools/javac/generics/6372782/Element.java.i
 data/test/tools/javac/processing/6430209/T6430209.java.i
 data/test/tools/javac/generics/wildcards/AssignmentSameType4.java.i
 data/test/tools/javac/miranda/4686811/p1/C.java.i
 data/test/tools/javac/processing/environment/round/AnnotatedElementInfo.java.i
+data/test/tools/javac/cast/6467183/T6467183a.java.i
 data/test/tools/javac/api/6431435/p/B.java.i
 data/test/tools/javac/6917288/GraphicalInstaller.java.i
 data/test/tools/javac/annotations/pos/ClassB.java.i
 data/test/tools/javac/T6993301.java.i
 data/src/share/classes/com/sun/tools/classfile/ConstantPoolException.java.i
 data/make/netbeans/common/standard-ide-actions.ent.i
+data/test/tools/javac/varargs/7097436/T7097436.java.i
 data/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/markup/package.html.i
 data/test/tools/javac/BadOptimization/DeadCode4.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java.i
-data/src/share/classes/com/sun/tools/doclets/standard/Standard.java.i
+data/test/tools/javac/generics/classreader/HMethod.java.i
 data/test/tools/javac/generics/syntax/6318240/BarNeg1a.java.i
-data/test/com/sun/javadoc/testTaglets/Parent.java.i
+data/make/conf/checkstyle-emacs.xsl.i
 data/test/tools/javadoc/generics/tparamTagOnMethod/Main.java.i
+data/src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java.i
 data/test/tools/javac/TryWithResources/DuplicateResource.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties.i
 data/test/tools/javac/diags/examples/RepeatedAnnotationTarget.java.i
 data/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-used2/testfile.txt.i
 data/src/share/classes/com/sun/javadoc/ParamTag.java.i
 data/src/share/opensource/javac/doc/javac_lifecycle/Enter.html.i
+data/test/tools/javac/enum/AbstractEnum1.java.i
 data/test/tools/javac/generics/diamond/neg/Neg06.java.i
 data/src/share/classes/com/sun/mirror/declaration/FieldDeclaration.java.i
 data/test/tools/javac/ClassLiterals/ClassLiteralHelperContext.java.i
-data/test/com/sun/javadoc/testPrivateClasses/pkg/PublicInterface.java.i
+data/test/tools/javadoc/parser/7091528/T7091528.java.i
 data/make/netbeans/javadoc/README.i
 data/test/com/sun/javadoc/testOverridenMethods/pkg3/I2.java.i
 data/test/tools/javac/protectedAccess/ProtectedAccess_2.java.i
@@ -2295,9 +2312,8 @@ data/test/com/sun/javadoc/testOverridenMethods/pkg1/SubClass.java.i
 data/test/tools/javac/foreach/SpecIterable.java.i
 data/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties.i
 data/test/tools/javac/generics/6985719/T6985719d.java.i
-data/test/com/sun/javadoc/5093723/UndocumentedClass.java.i
-data/test/com/sun/javadoc/testHtmlTableTags/pkg1/I1.java.i
-data/test/tools/javac/6668794/badSource/p/A.java.i
+data/test/tools/javac/javazip/A.java.i
+data/test/tools/javac/processing/model/TestExceptions.java.i
 data/test/tools/apt/mirror/declaration/ParameterDecl.java.i
 data/src/share/classes/com/sun/tools/javac/code/Type.java.i
 data/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java.i
@@ -2309,25 +2325,24 @@ data/test/tools/javac/SynchronizedClass.java.i
 data/test/tools/javac/generics/classreader/HMethodImpl.java.i
 data/test/tools/javac/generics/6372782/Ring.java.i
 data/test/tools/javac/generics/PrimitiveVariant.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/tab.gif.i
 data/src/share/classes/com/sun/source/tree/DisjunctiveTypeTree.java.i
 data/test/tools/javac/diags/examples/UnsupportedFpLit.java.i
-data/src/share/classes/com/sun/source/util/SourcePositions.java.i
+data/test/tools/javadoc/completionFailure/pkg/B.java.i
 data/test/tools/javac/FlatnameClash.java.i
-data/test/tools/javac/StringsInSwitch/OneCaseSwitches.java.i
+data/test/tools/javac/diags/examples/TypeParameterOnPolymorphicSignature.java.i
+data/test/tools/javac/parser/T4881269.out.i
 data/test/tools/javac/generics/inference/6650759/T6650759m.java.i
 data/test/tools/javac/ClassLiterals/p1/C.java.i
-data/test/tools/javac/generics/CatchTyparam.java.i
 data/test/tools/javac/api/6422215/T6422215.java.i
 data/src/share/classes/com/sun/tools/classfile/SourceID_attribute.java.i
 data/test/tools/javac/processing/filer/foo/Foo.java.i
-data/test/tools/javac/enum/DA2.java.i
-data/test/tools/javac/processing/filer/TestLastRound.java.i
+data/test/tools/javac/typeAnnotations/newlocations/Wildcards.java.i
+data/test/tools/javac/multicatch/Neg02eff_final.out.i
 data/test/tools/javac/incompatibleNoninherited/A.java.i
-data/test/tools/javac/annotations/6365854/T6365854.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java.i
 data/src/share/classes/com/sun/source/tree/TypeCastTree.java.i
 data/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java.i
+data/test/tools/javac/generics/6476118/T6476118b.out.i
 data/test/tools/javac/importChecks/ImportOfOwnClass.java.i
 data/test/com/sun/javadoc/AccessAsciiArt/p1/SI.java.i
 data/test/tools/javac/diags/examples/CantAssignToFinal.java.i
@@ -2344,18 +2359,19 @@ data/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedPlural
 data/test/tools/javac/ImportCycle/Dummy.java.i
 data/test/tools/javac/api/6437999/T6437999.java.i
 data/test/tools/javac/generics/diamond/7030150/Neg02.java.i
+data/test/tools/javac/ClassLiterals/LiteralInterface_1.java.i
 data/test/tools/javac/T6882235.out.i
-data/test/com/sun/javadoc/WindowTitles/WindowTitles.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java.i
+data/test/com/sun/javadoc/testValueTag/TestValueTag.java.i
+data/test/tools/javac/T6407066.java.i
 data/test/tools/javac/generics/6356636/T6356636.java.i
 data/test/tools/javac/DefiniteAssignment/T4721062b.java.i
-data/test/tools/javac/StringConversion.java.i
+data/test/tools/javac/annotations/neg/NoClone.java.i
 data/test/tools/javadoc/badSuper/p/A.java.i
+data/test/tools/javac/constDebug/ConstDebug.sh.i
 data/test/com/sun/javadoc/testHeadings/pkg2/C2.java.i
-data/src/share/classes/com/sun/source/tree/EmptyStatementTree.java.i
-data/test/tools/javac/ImportCycle/foo/Middle2.java.i
+data/test/tools/javac/generics/diamond/T6951833.java.i
 data/src/share/classes/com/sun/source/util/TaskEvent.java.i
-data/test/tools/javac/boxing/T6614974.java.i
+data/test/tools/javac/unicode/UnicodeAtEOL.java.i
 data/src/share/classes/com/sun/tools/javac/util/SharedNameTable.java.i
 data/test/tools/javac/generics/InheritanceConflict.java.i
 data/test/Makefile.i
@@ -2365,118 +2381,122 @@ data/test/tools/javac/policy/test1/byfile.ABD.out.i
 data/test/tools/javac/policy/bytodo.ACD.out.i
 data/test/tools/javac/diags/examples/InferredDoNotConformToBounds.java.i
 data/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.out.i
+data/test/tools/javac/varargs/7043922/T7043922.java.i
 data/test/tools/javac/processing/warnings/UseImplicit/warn.out.i
 data/test/tools/javac/cast/7005095/T7005095pos.java.i
-data/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java.i
+data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSuperClass.java.i
 data/test/tools/javac/QualifiedOuterThis.java.i
 data/test/tools/javac/generics/Casting5.java.i
 data/test/tools/apt/Compile/goldenWarn.txt.i
-data/test/tools/javadoc/6964914/Test.java.i
+data/test/tools/javac/6917288/GraphicalInstallerTest.java.i
 data/test/tools/javac/sourcePath2/p/SourcePath2A.java.i
 data/src/share/classes/com/sun/mirror/type/ArrayType.java.i
 data/test/tools/javac/policy/test1/simple.ACD.out.i
-data/test/tools/javac/cast/6665356/T6665356.out.i
+data/test/tools/javac/generics/diamond/neg/Neg12.java.i
+data/test/tools/javac/generics/MultipleInheritance.java.i
 data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes7.java.i
 data/test/tools/javac/BadBreak.java.i
 data/test/tools/javac/diags/examples/VarargsImplement.java.i
 data/test/tools/apt/Basics/NullAPF.java.i
 data/test/tools/javadoc/6227454/Test.java.i
+data/test/tools/javac/diags/examples/FullInstSig.java.i
 data/test/com/sun/javadoc/testCmndLineClass/pkg1/C2.java.i
-data/test/tools/javac/TryWithResources/TwrFlow.out.i
+data/src/share/classes/com/sun/tools/javah/TypeSignature.java.i
 data/test/tools/javac/generics/wildcards/neg/CastWarn5.java.i
+data/test/tools/javac/Closure5.java.i
 data/src/share/classes/com/sun/tools/javac/util/Paths.java.i
 data/test/tools/apt/Compile/ClassDeclApf.java.i
 data/test/tools/javadoc/6176978/T6176978.java.i
-data/test/tools/javac/FlatnameClash2.java.i
+data/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java.i
 data/test/com/sun/javadoc/testTopOption/overview.html.i
 data/src/share/classes/com/sun/tools/javap/JavapTask.java.i
 data/src/share/classes/com/sun/source/tree/ParenthesizedTree.java.i
 data/test/tools/javac/enum/ExplicitlyAbstractEnum2.java.i
 data/src/share/classes/com/sun/tools/classfile/ModulePermits_attribute.java.i
 data/test/tools/javac/InnerMethSig.java.i
-data/test/tools/javac/ClassPathTest/bar/pkg/ClassPathTestAux2.java.i
-data/src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java.i
+data/src/share/classes/javax/lang/model/element/AnnotationValue.java.i
+data/test/tools/javac/UncaughtOverflow.java.i
+data/test/tools/javac/generics/typeargs/Metharg2.java.i
 data/test/tools/javac/processing/model/element/TestPackageElement.java.i
-data/test/tools/javac/unicode/SupplementaryJavaID6.sh.i
+data/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out.i
 data/test/tools/javac/generics/6985719/T6985719f.java.i
-data/test/tools/javadoc/6964914/TestUserDoclet.java.i
+data/test/tools/javac/7102515/T7102515.out.i
+data/src/share/classes/sun/tools/javap/AttrData.java.i
 data/test/tools/javac/ExtDirs/ExtDirTest_1.java.i
 data/test/tools/javac/generics/6985719/T6985719c.java.i
-data/test/tools/javac/generics/diamond/neg/Neg12.java.i
+data/test/tools/javac/annotations/neg/NoAnnotationMethods.java.i
 data/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out.i
-data/test/tools/javac/types/PrimitiveConversionTest.java.i
-data/test/tools/javac/generics/T6481655.java.i
+data/test/tools/javac/foreach/StaticBlock.java.i
 data/test/tools/javac/NoNoClassDefFoundErrorError.java.i
 data/test/tools/javac/diags/examples/IllegalChar.java.i
+data/test/tools/javac/generics/rawOverride/AttributeSet.java.i
 data/test/tools/javac/processing/model/element/TestMissingElement/InvalidSource.java.i
 data/test/tools/javac/generics/typevars/5060485/Neg1.java.i
 data/test/tools/javac/unicode/SupplementaryJavaID5.java.i
 data/test/tools/javac/6342411/T6342411.java.i
 data/test/tools/javac/NonStaticFieldExpr2.out.i
 data/test/tools/apt/mirror/declaration/FieldDecl.java.i
-data/test/tools/javac/generics/6192945/MethodNeg.out.i
-data/test/tools/javac/ConstCharAppend.java.i
-data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest2.java.i
-data/test/tools/javac/T6326754.java.i
-data/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java.i
+data/test/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner2.h.i
+data/test/tools/javac/AnonInnerException_2.java.i
+data/test/tools/javac/generics/typevars/6182630/T6182630f.java.i
+data/test/tools/javac/4917091/Test256a.java.i
+data/test/com/sun/javadoc/testAnnotationTypes/pkg/AnnotationType.java.i
+data/test/tools/javac/fatalErrors/NoJavaLang.sh.i
+data/test/tools/javadoc/generics/genericClass/pkg1/A.java.i
 data/test/tools/javac/api/6400303/Test2.java.i
 data/test/tools/javac/OverrideChecks/6400189/T6400189a.out.i
-data/test/com/sun/javadoc/AccessSkipNav/p1/C1.java.i
+data/src/share/classes/com/sun/tools/javah/resources/l10n.properties.i
 data/test/tools/javadoc/parser/7091528/p/C1.java.i
 data/test/tools/javac/lint/FallThrough.java.i
 data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/packageToExclude/DummyClass.java.i
 data/test/tools/javac/depOverrides/annotation/Test2Q.out.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java.i
-data/src/share/classes/com/sun/tools/javap/ConstantWriter.java.i
 data/test/tools/javac/generics/diamond/7030150/Neg02.out.i
 data/test/tools/javac/generics/inference/4972073/T4972073.java.i
 data/test/tools/javac/diags/examples/ProcessorCantInstantiate/processors/AnnoProc.java.i
-data/test/tools/javac/DuplicateClass2.java.i
+data/test/com/sun/javadoc/testHrefInDocComment/pkg/I1.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSubClass.java.i
-data/test/tools/javac/policy/test1/A.java.i
+data/test/tools/javac/generics/6985719/T6985719b.java.i
 data/test/tools/javac/mandatoryWarnings/unchecked/Test4.out.i
-data/test/tools/javac/enum/EnumImplicitPrivateConstructor.java.i
 data/test/tools/javac/generics/odersky/BadTest2.java.i
 data/test/tools/javac/CyclicInheritance6/Main.java.i
 data/test/tools/javac/generics/wildcards/neg/Readonly.java.i
 data/test/tools/javadoc/6964914/Error.java.i
 data/test/tools/apt/Options/options.sh.i
 data/test/tools/apt/Basics/annot/AnnotShangri_la.java.i
-data/test/tools/javac/generics/wildcards/neg/CastWarn11.java.i
+data/src/share/classes/com/sun/source/tree/LabeledStatementTree.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/type/PrimitiveTypeImpl.java.i
 data/test/tools/javac/generics/GenericOverride.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java.i
 data/test/tools/javac/diags/examples/MissingReturnValue.java.i
-data/test/tools/javac/generics/6985719/T6985719d.out.i
-data/test/tools/javac/6341866/Anno.java.i
 data/test/tools/javac/generics/T4711694.java.i
 data/test/tools/javac/diags/examples/VarMightNotHaveBeenInitialized.java.i
-data/test/tools/javac/failover/FailOver11.java.i
+data/test/tools/javac/StringsInSwitch/RepeatedStringCaseLabels1.java.i
 data/test/tools/javac/protectedAccess/ProtectedAccess_1.java.i
-data/test/tools/javac/DefiniteAssignment/T4704365.java.i
 data/test/tools/javac/generics/wildcards/neg/CastFail6.java.i
 data/test/com/sun/javadoc/testIndex/pkg/Interface.java.i
 data/test/tools/javac/generics/UncheckedCovariance.java.i
-data/src/share/classes/com/sun/tools/javac/parser/Parser.java.i
+data/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java.i
 data/test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java.i
 data/test/tools/javah/ParamClassTest.java.i
-data/test/tools/javac/diags/examples/NoInterfaceHere.java.i
 data/test/tools/javac/7023703/T7023703neg.java.i
 data/test/tools/javac/StringsInSwitch/RepeatedStringCaseLabels2.java.i
 data/src/share/classes/javax/annotation/processing/package-info.java.i
 data/test/tools/javac/packone/Mediator.java.i
-data/test/tools/javac/classreader/T7031108.java.i
+data/test/tools/javac/T6356217/T6356217.java.i
 data/test/tools/javac/generics/odersky/Test4.java.i
-data/test/tools/javadoc/dupOk/sp2/p/B.java.i
+data/src/share/classes/com/sun/tools/javac/util/Context.java.i
+data/test/tools/javac/typeAnnotations/failures/OldArray.out.i
 data/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties.i
 data/test/tools/javac/generics/wildcards/6762569/T6762569b.java.i
 data/test/tools/javap/T4501660.java.i
 data/test/tools/javac/DefiniteAssignment/DASwitch.java.i
 data/test/tools/javadoc/annotations/annotatePackage/pkg1/package-info.java.i
+data/test/tools/javac/generics/inference/6569789/T6569789.java.i
 data/test/tools/javac/warnings/6885255/T6885255.out.i
 data/test/tools/javac/ClassModifiers/InterfaceAndInnerClsCtor.java.i
-data/test/tools/javac/InnerNamedConstant_2.out.i
-data/test/tools/javac/generics/wildcards/6651719/T6651719a.java.i
+data/test/tools/javac/BadAnnotation.java.i
+data/test/tools/javac/generics/6372782/T6372782.java.i
 data/test/tools/javac/lint/Deprecation.java.i
 data/test/tools/javac/types/TypeHarness.java.i
 data/test/tools/javac/modules/ModuleResolverTest02.java.i
@@ -2486,17 +2506,16 @@ data/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java.i
 data/test/tools/javac/depDocComment/DeprecatedDocComment.java.i
 data/test/com/sun/javadoc/testTitleInHref/pkg/Links.java.i
 data/test/tools/javac/varargs/T6746184.java.i
-data/test/tools/javac/cast/6932571/T6932571neg.java.i
-data/test/tools/javac/cast/5034609/T5034609.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignAfterIf_2.java.i
+data/test/com/sun/javadoc/testJavascript/pkg/C.java.i
 data/test/tools/javac/Closure2.java.i
 data/test/tools/javac/7085024/T7085024.out.i
 data/test/tools/javac/limits/ArrayDims1.java.i
 data/test/tools/javac/api/6421111/T6421111.java.i
-data/test/tools/javac/7086595/T7086595.java.i
+data/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java.i
 data/test/tools/javac/miranda/4686811/p1/A.java.i
-data/src/share/classes/javax/tools/overview.html.i
-data/test/tools/javap/classfile/deps/GetDeps.java.i
-data/test/tools/javac/generics/wildcards/neg/CastWarn6.java.i
+data/src/share/classes/com/sun/tools/javac/code/Lint.java.i
+data/test/tools/javac/T6855236.java.i
 data/test/tools/javac/foreach/SuperfluousAbstract.java.i
 data/test/tools/javac/diags/MessageFile.java.i
 data/test/tools/javac/typeAnnotations/TypeParameterTarget.java.i
@@ -2506,197 +2525,195 @@ data/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java.i
 data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass2.java.i
 data/test/com/sun/javadoc/testUseOption/pkg1/C5.java.i
 data/test/tools/javac/6558548/T6558548_6.out.i
-data/src/share/classes/com/sun/tools/javac/main/JavacOption.java.i
+data/test/tools/javac/multicatch/Neg04.java.i
 data/test/tools/javac/6330997/T2.java.i
 data/test/tools/javac/T6900037.java.i
-data/test/com/sun/javadoc/testTagInheritence/pkg/TestAbstractClass.java.i
-data/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java.i
+data/test/com/sun/javadoc/constantValues/TestConstantValues2.java.i
+data/test/tools/javac/policy/test2/bytodo.AB.out.i
 data/src/share/classes/com/sun/source/tree/ModuleClassTree.java.i
-data/test/tools/javac/FinalInitializer.java.i
-data/test/tools/apt/Compile/Rounds.java.i
+data/test/tools/javac/TryInInstanceInit.java.i
 data/src/share/classes/com/sun/tools/classfile/Instruction.java.i
 data/test/tools/javac/cast/BoxedArray.java.i
-data/test/tools/javac/multicatch/Neg02eff_final.java.i
+data/test/tools/apt/Compile/HelloAnnotation.java.i
 data/test/tools/javac/StringsInSwitch/NonConstantLabel.java.i
-data/test/tools/javac/generics/rawOverride/6557199/T6557199.java.i
+data/test/tools/javac/file/zip/Utils.java.i
+data/src/share/classes/com/sun/tools/javadoc/TagImpl.java.i
 data/test/tools/javac/generics/inference/4972073/T4972073b.java.i
 data/test/tools/javac/HiddenAbstractMethod/one/Parent.java.i
 data/test/tools/javac/ForwardReference/ForwardReference_2.java.i
-data/test/tools/javac/warnings/Deprecation.noLint.out.i
+data/test/tools/javac/StringsInSwitch/BadlyTypedLabel2.java.i
 data/src/share/classes/com/sun/mirror/declaration/EnumConstantDeclaration.java.i
 data/src/share/classes/com/sun/tools/javadoc/JavadocTool.java.i
 data/test/tools/javac/generics/7007615/T7007615.out.i
-data/test/com/sun/javadoc/testInlineLinkLabel/pkg/C1.java.i
 data/test/com/sun/javadoc/testThrowsTag/pkg/T2.java.i
 data/test/tools/javac/cast/6270087/T6270087neg.out.i
 data/test/tools/javac/depOverrides/doccomment/B2.java.i
-data/test/tools/javac/staticImport/StaticImport2.java.i
-data/src/share/classes/com/sun/tools/javac/file/CloseableURLClassLoader.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/tab.gif.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java.i
 data/test/tools/javac/StaticBlockScope.java.i
 data/test/tools/javac/generics/wildcards/6651719/T6651719b.java.i
-data/test/tools/javac/processing/model/TestExceptions.java.i
+data/test/tools/javac/generics/SuperTypeargs.java.i
 data/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java.i
 data/test/tools/javac/LabeledDeclaration.java.i
 data/test/tools/javac/typeAnnotations/newlocations/MethodReturnType.java.i
 data/test/tools/javac/processing/filer/TestInvalidRelativeNames.java.i
 data/test/tools/javac/diags/examples/ConstExprRequired.java.i
 data/test/tools/javac/javazip/bad/B.java.i
+data/test/tools/javac/T6227617.java.i
 data/test/tools/javac/processing/6359313/Foo.java.i
-data/test/tools/javac/T6231847.java.i
+data/test/tools/javac/diags/examples/PartialInstSig.java.i
 data/test/tools/javac/6521805/T6521805a.java.i
 data/test/tools/javac/DefiniteAssignment/DUParam2.java.i
 data/src/share/classes/com/sun/tools/javac/file/ZipFileIndexCache.java.i
 data/test/tools/javac/OverrideChecks/T6326485.java.i
 data/test/tools/javac/Source5.java.i
 data/src/share/classes/com/sun/tools/javac/jvm/Gen.java.i
-data/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java.i
+data/test/tools/javac/TryWithResources/TwrIntersection02.java.i
 data/test/tools/javac/mandatoryWarnings/deprecated/Test2.out.i
-data/test/tools/javac/TryWithResources/UnusedResourcesTest.java.i
 data/test/tools/javac/foreach/Foreach.java.i
-data/test/tools/javac/NonAmbiguousField/two/Child2.java.i
+data/test/tools/javac/generics/wildcards/neg/CastWarn2.java.i
 data/test/tools/javac/generics/7022054/T7022054pos2.java.i
 data/test/tools/javac/T6458823/T6458823.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameters.java.i
 data/test/tools/apt/Basics/annot/annot2/AnnotMarker2.java.i
+data/test/tools/javac/generics/InstanceOf2.java.i
 data/test/tools/javac/T5105890.java.i
-data/test/com/sun/javadoc/testHrefInDocComment/pkg/I2.java.i
+data/test/tools/javac/generics/6985719/T6985719d.out.i
 data/test/tools/javac/generics/6956758/T6956758neg.out.i
-data/test/tools/javac/processing/6430209/test0.java.i
+data/test/tools/javac/SuperNew3.java.i
 data/test/tools/javac/generics/T6869075.java.i
 data/test/tools/javac/diags/examples/ResourceNotReferenced.java.i
 data/test/tools/javadoc/6964914/TestStdDoclet.java.i
 data/test/tools/javac/diags/examples/ProcOnlyNoProcs.java.i
+data/test/tools/javac/TryWithResources/BadTwr.out.i
 data/test/tools/javap/typeAnnotations/PresenceInner.java.i
 data/src/share/classes/javax/lang/model/SourceVersion.java.i
 data/test/tools/javac/miranda/6964669/pkg/A.java.i
 data/test/tools/javac/processing/model/util/elements/doccomments/TestDocComments.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java.i
-data/test/tools/javac/generics/diamond/T6939780.java.i
+data/test/tools/javac/enum/NoFinal.java.i
 data/test/tools/javac/processing/model/util/TypesBadArg.java.i
 data/test/tools/javac/ClassLiterals/LiteralInterface_2.java.i
 data/test/tools/javac/depOverrides/annotation/Test1.java.i
-data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingClass.java.i
 data/test/tools/javah/VersionTest.java.i
-data/test/tools/javac/protectedAccess/ProtectedMemberAccess5/Main.java.i
+data/test/tools/apt/Basics/Lacuna.java.i
 data/test/tools/javac/typeAnnotations/MultipleTargets.java.i
 data/test/tools/javac/generics/odersky/BadTest4.java.i
-data/test/tools/javac/unicode/UnicodeNewline.out.i
+data/test/tools/javac/SwitchFence.java.i
 data/test/tools/javac/generics/inference/6315770/T6315770.out.i
-data/src/share/classes/com/sun/tools/classfile/ModuleClass_attribute.java.i
+data/test/tools/javac/6734819/T6734819b.java.i
 data/test/tools/javac/diags/examples/PossibleLossPrecision.java.i
 data/test/tools/javac/processing/6430209/b6341534.java.i
-data/test/tools/javac/cast/6286112/T6286112.java.i
+data/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java.i
 data/test/tools/javac/QualifiedAccess/QualifiedAccess_1.sh.i
 data/test/tools/javac/generics/6910550/T6910550d.out.i
 data/test/tools/javac/modules/ModuleModeTests/TestRunner.java.i
-data/test/tools/javac/boxing/NoBoxingInt.java.i
+data/test/tools/javac/generics/T5094318.java.i
 data/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java.i
 data/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java.i
 data/test/tools/javac/TryWithResources/TwrNullTests.java.i
-data/test/tools/javac/generics/inference/7086586/T7086586.java.i
 data/test/tools/javac/generics/6985719/T6985719a.java.i
 data/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java.i
-data/test/tools/javac/generics/genericAbstract/B.java.i
-data/test/tools/apt/Basics/StaticFieldAnnotations.java.i
+data/test/tools/javac/api/T6483788.java.i
+data/test/tools/javac/AnonymousNull.java.i
 data/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java.i
-data/test/tools/javac/generics/6372782/PlanarVectorVariable.java.i
-data/test/tools/javac/generics/bridge1/D.java.i
+data/test/tools/javac/diags/examples/UncheckedGenericArrayCreation.java.i
 data/test/tools/javac/generics/odersky/Cell.java.i
+data/test/tools/javac/T6230128.out.i
 data/test/tools/javac/literals/BadUnderscoreLiterals.7.out.i
-data/test/tools/javac/TestPkgInfo.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumDeclarationImpl.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/apt/MessagerImpl.java.i
 data/test/tools/javac/diags/examples/UncheckedAssign.java.i
-data/test/tools/javadoc/BreakIteratorWarning.java.i
+data/test/com/sun/javadoc/testUseOption/pkg1/package.html.i
 data/test/tools/apt/Basics/TestGetPackageApf.java.i
 data/test/tools/javadoc/sourceOnly/p/SourceOnly.java.i
-data/test/tools/javac/api/TestClientCodeWrapper.java.i
+data/test/tools/javac/generics/inference/7086601/T7086601a.java.i
 data/test/tools/javac/diags/examples/OverrideVarargsExtra.java.i
-data/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.sh.i
+data/test/tools/javac/mixedTarget/ExtendCovariant2.java.i
 data/test/tools/javac/InstanceInitException_2.java.i
-data/test/tools/javac/annotations/neg/Dup.java.i
+data/test/tools/javac/T4994049/DeprecatedYES.java.i
 data/test/tools/javac/versions/CheckClassFileVersion.java.i
-data/test/tools/javac/warnings/T6763518.java.i
-data/test/tools/javac/generics/6956758/T6956758neg.java.i
-data/test/tools/javac/diags/examples/NonStaticCantBeRef.java.i
+data/test/tools/javac/diags/examples/TryResourceNotSupported.java.i
+data/test/tools/apt/Compile/ClassDeclApf2.java.i
+data/src/share/classes/javax/lang/model/element/TypeElement.java.i
 data/test/tools/javac/overload/T5090220.java.i
 data/test/tools/javac/processing/model/util/directSupersOfErr/C1.java.i
 data/test/tools/javac/processing/filer/TestLastRound.out.i
-data/test/com/sun/javadoc/testHref/package-list.i
+data/test/tools/javac/T4906100.out.i
 data/src/share/classes/com/sun/source/tree/SwitchTree.java.i
 data/test/tools/javac/diags/examples/DeprecatedPlural/DeprecatedFilename.java.i
 data/test/tools/javac/T6403466.java.i
 data/src/share/classes/com/sun/tools/javac/Server.java.i
-data/test/tools/javac/4917091/Test256a.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java.i
 data/test/tools/javac/diags/examples/UncheckedPlural/UncheckedPlural.java.i
 data/test/tools/javac/typeAnnotations/failures/target/Constructor.java.i
-data/test/tools/javac/generics/diamond/7030687/ParserTest.java.i
+data/test/tools/javac/completion/C.java.i
 data/test/tools/javac/Null2DArray.java.i
-data/test/tools/javac/6199662/TreeScanner.java.i
-data/test/tools/apt/mirror/util/TypeCreation.java.i
+data/test/tools/javac/4980495/std/Test.out.i
+data/src/share/classes/com/sun/tools/javac/comp/Lower.java.i
 data/test/tools/javac/meth/InvokeDynTrans.java.i
 data/test/tools/javac/binaryCompat/T1.java.i
 data/test/tools/javac/innerClassFile/y/R3.java.i
-data/test/tools/javac/diags/examples/TypeVarMayNotBeFollowedByOtherBounds.java.i
-data/test/tools/javac/varargs/warning/Warn2.java.i
-data/src/share/classes/com/sun/mirror/type/WildcardType.java.i
-data/test/tools/javac/InterfaceOverrideFinal.java.i
+data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestClass.java.i
+data/test/tools/javac/limits/ArrayDims3.java.i
+data/src/share/classes/com/sun/tools/javac/util/Options.java.i
 data/test/com/sun/javadoc/testClassTree/pkg/ParentClass.java.i
 data/test/tools/javac/failover/FailOver10.out.i
 data/test/tools/javac/generics/typevars/5060485/Compatibility02.out.i
-data/test/tools/javac/boxing/Boxing2.java.i
+data/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java.i
+data/test/tools/javac/warnings/DivZero.java.i
 data/test/tools/javac/diags/examples/IllegalBytecodeIdentChar.java.i
-data/src/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java.i
 data/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out.i
-data/src/share/classes/javax/lang/model/type/ErrorType.java.i
+data/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccess/NotDefAccessClassIntfCantAccess.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_2.java.i
 data/src/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java.i
 data/src/share/classes/com/sun/tools/apt/main/AptJavaCompiler.java.i
 data/test/tools/javac/depOverrides/annotation/B2.java.i
-data/test/tools/javac/InitializerCompletion_2.java.i
+data/test/com/sun/javadoc/testThrowsTag/pkg/C.java.i
+data/test/tools/javac/generics/6192945/Neg3.java.i
 data/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out.i
 data/src/share/classes/com/sun/source/util/JavacTask.java.i
 data/test/tools/javac/ThrowNull.java.i
-data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes9.java.i
 data/test/tools/javac/ProtectedInnerClass/p2/ProtectedInnerClass3.java.i
 data/test/tools/javac/6403424/T6403424.java.i
 data/test/tools/javac/InterfaceObjectInheritance.java.i
-data/test/tools/javac/processing/model/element/TypeParamBounds.java.i
-data/test/tools/javac/diags/examples/GenericThrowable.java.i
+data/test/tools/javac/ClassPathTest/bar/pkg/ClassPathTestAux2.java.i
 data/test/tools/javac/T6668802.java.i
 data/test/tools/javap/T6868539.java.i
 data/test/tools/javac/generics/6268476/T6268476.java.i
 data/test/tools/javac/processing/6511613/clss41701.java.i
-data/test/tools/javadoc/outputRedirect/Test.java.i
+data/test/tools/javah/SubClassConsts.win.i
 data/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java.i
 data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out.i
 data/test/tools/javac/RawCrash.java.i
 data/test/tools/javac/generics/6946618/T6946618b.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java.i
+data/src/share/classes/javax/annotation/processing/Completions.java.i
 data/test/tools/javac/generics/wildcards/neg/ParamCast.java.i
 data/src/share/classes/com/sun/tools/javac/util/ListBuffer.java.i
-data/src/share/classes/sun/tools/javap/JavapPrinter.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumConstantDeclarationImpl.java.i
-data/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java.i
+data/test/tools/javac/7079713/TestCircularClassfile.java.i
 data/test/tools/javac/processing/6378728/T6378728.java.i
-data/test/tools/javac/Enum1.java.i
+data/test/com/sun/javadoc/testCmndLineClass/pkg2/C3.java.i
 data/test/tools/javac/limits/PoolSize2.java.i
 data/test/tools/javac/failover/CheckAttributedTree.java.i
+data/src/share/classes/javax/lang/model/type/TypeVariable.java.i
 data/test/tools/javac/nested/4903103/T4903103.java.i
-data/test/tools/javac/generics/6946618/T6946618b.out.i
+data/test/tools/javac/diags/examples/OperatorCantBeApplied.java.i
 data/test/tools/javadoc/annotations/shortcuts/expected.out.i
 data/test/tools/javac/generics/wildcards/AssignmentSameType7.java.i
 data/test/tools/javac/cast/6548436/T6548436a.java.i
 data/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.java.i
-data/test/tools/apt/Basics/TestGetTypeDeclarationApf.java.i
+data/test/tools/javac/diags/examples/MulticatchNotSupported.java.i
 data/test/tools/javac/miranda/T4279316a.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java.i
-data/test/tools/javac/quid/MakeNegTests.sh.i
+data/test/tools/javac/abstract/T4717181a.java.i
 data/test/com/sun/javadoc/testPackagePage/com/pkg/C.java.i
-data/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java.i
+data/test/tools/javac/diags/examples/EnumAnnoValueMustBeEnumConst.java.i
 data/test/tools/javac/OverrideChecks/6199153/T6199153.java.i
 data/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.java.i
+data/src/share/classes/com/sun/source/tree/ProvidesServiceDirectiveTree.java.i
 data/test/com/sun/javadoc/testSimpleTag/C.java.i
-data/test/tools/javac/assert/DU1.java.i
+data/test/tools/javac/generics/6207386/Test.java.i
 data/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java.i
 data/test/tools/javac/processing/6365040/ProcBar.java.i
 data/test/tools/javac/generics/inference/5034571/T5034571.java.i
@@ -2707,120 +2724,120 @@ data/test/tools/javac/generics/rare/Rare11.java.i
 data/test/tools/javac/falseCycle/FalseCycleBase.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java.i
 data/test/tools/javac/generics/Casting2.java.i
-data/test/tools/apt/Options/OptionChecker.java.i
+data/test/tools/javac/AbstractOverride.java.i
 data/src/share/classes/javax/lang/model/type/TypeMirror.java.i
 data/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out.i
 data/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java.i
 data/test/com/sun/javadoc/testLinkTaglet/pkg/C.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java.i
 data/test/tools/javac/diags/examples/TypeFoundRequired.java.i
-data/test/tools/javac/6330920/T6330920.java.i
+data/test/tools/javac/diags/examples/NoJavaLang.java.i
 data/test/tools/javac/mandatoryWarnings/deprecated/Test3.out.i
 data/test/tools/javac/PackageClassAmbiguity/util.java.i
 data/test/tools/javac/depOverrides/annotation/P.java.i
 data/src/share/classes/javax/lang/model/element/ExecutableElement.java.i
-data/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateParent.java.i
+data/src/share/classes/sun/tools/javap/InnerClassData.java.i
 data/src/share/classes/com/sun/tools/classfile/ModuleExport_attribute.java.i
-data/test/tools/javac/annotations/neg/Z9.java.i
+data/test/tools/javac/diags/examples/VarargsPluralAdditional/VarargsPlural.java.i
 data/test/tools/javac/api/T6258271.java.i
-data/test/tools/javac/diags/Example.java.i
-data/test/tools/javac/generics/InnerInterface2.java.i
-data/src/share/classes/com/sun/tools/javac/util/ByteBuffer.java.i
-data/test/tools/javac/annotations/neg/NoObjectMethods.java.i
+data/test/tools/javac/sourcePath/SourcePath.java.i
+data/test/com/sun/javadoc/testMemberInheritence/diamond/C.java.i
+data/test/tools/javap/classfile/T6887895.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java.i
-data/test/tools/javac/api/6471599/Main.java.i
 data/test/tools/javac/generics/7034019/T7034019b.java.i
-data/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java.i
+data/test/tools/javac/enum/EnumSwitch1.java.i
+data/test/tools/javac/typeAnnotations/newlocations/LocalVariables.java.i
 data/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java.i
-data/test/tools/javac/CyclicInheritance2.java.i
-data/test/tools/javac/crossPackageImpl/CrossPackageImplA.java.i
-data/test/tools/javac/diags/examples/TypeParameterOnPolymorphicSignature.java.i
+data/test/tools/javac/generics/inference/6638712/T6638712d.java.i
+data/test/tools/javac/cast/6302956/T6302956.java.i
+data/test/tools/javac/StringsInSwitch/OneCaseSwitches.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java.i
-data/make/test/TEST.ROOT.i
 data/test/tools/javac/generics/RelaxedArrays.java.i
-data/test/tools/javac/annotations/neg/NoClone.java.i
-data/test/tools/javac/generics/diamond/T6951833.java.i
-data/test/tools/javadoc/dupOk/sp1/p/A.java.i
+data/test/tools/javac/StringConversion.java.i
+data/src/share/classes/com/sun/source/tree/EmptyStatementTree.java.i
+data/test/tools/javac/QualifiedThisAndSuper_1.java.i
 data/test/tools/javac/generics/InstanceOf1.java.i
 data/test/tools/javac/6979683/TestCast6979683_BAD35.java.errlog.i
 data/test/tools/javac/diags/examples/AttrMustBeConstant.java.i
 data/test/tools/javac/varargs/6569633/T6569633.java.i
-data/test/tools/javac/generics/MultipleInheritance.java.i
+data/test/tools/javac/cast/6665356/T6665356.out.i
 data/test/tools/javac/typeAnnotations/newlocations/TypeParameters.java.i
 data/src/share/classes/com/sun/tools/javap/overview.html.i
 data/test/tools/javac/varargs/Warn2.java.i
 data/test/tools/javac/annotations/pos/Enum1.java.i
 data/test/tools/javac/diags/examples/DiamondAndAnonClass.java.i
-data/test/tools/javadoc/badSuper/BadSuper.java.i
-data/test/tools/javac/capture/Martin.java.i
+data/test/tools/javac/generics/odersky/Test2.java.i
 data/test/tools/javadoc/generics/tparamTagOnType/pkg1/A.java.i
 data/test/tools/javadoc/dupOk/sp2/p/A.java.i
-data/src/share/classes/com/sun/tools/classfile/DefaultAttribute.java.i
 data/test/tools/javac/UnterminatedLineComment.java.i
-data/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java.i
+data/test/tools/javac/processing/6413690/src/Super.java.i
 data/test/tools/javac/annotations/neg/Z5.java.i
-data/test/tools/javac/cast/6558559/T6558559a.java.i
+data/test/tools/javac/api/6471599/Main.java.i
 data/test/tools/javac/diags/examples/GenericArrayCreation.java.i
 data/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java.i
 data/test/tools/javac/tree/ClassTreeTest.java.i
 data/src/share/classes/sun/tools/javap/CPX.java.i
+data/test/tools/javac/resolve/TraceResolve.java.i
 data/test/tools/javac/generics/typevars/5060485/Compatibility.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java.i
+data/test/tools/javac/processing/6994946/SyntaxErrorTest.out.i
 data/test/tools/javac/capture/Capture1.java.i
-data/make/test/lib/javadoc.sh.i
 data/test/tools/javac/StringsInSwitch/BadlyTypedLabel2.out.i
 data/test/tools/javac/diags/examples/IllegalEnumStaticRef.java.i
-data/test/tools/javac/multicatch/Neg04.java.i
+data/src/share/classes/com/sun/tools/javac/main/JavacOption.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java.i
-data/test/tools/javac/failover/FailOver15.out.i
 data/test/tools/javac/T6358024.java.i
 data/test/com/sun/javadoc/testMemberSummary/pkg/PrivateParent.java.i
 data/test/tools/javac/positions/T6253161.java.i
 data/test/tools/javac/diags/examples/InconvertibleTypes.java.i
-data/test/tools/javac/generics/wildcards/neg/CastWarn2.java.i
+data/test/tools/javadoc/imports/MissingImport.java.i
+data/test/tools/javac/NonAmbiguousField/two/Child2.java.i
 data/test/tools/javac/unicode/SupplementaryJavaID6.java.i
 data/test/tools/javac/processing/model/6194785/T6194785a.java.i
 data/test/com/sun/javadoc/testNonFrameWarning/TestNonFrameWarning.java.i
 data/test/tools/javac/T6725036.java.i
-data/test/tools/javac/annotations/neg/DupTarget.java.i
+data/test/tools/javac/enum/T6724345.java.i
+data/test/tools/javac/generics/inference/7086586/T7086586.java.i
+data/test/tools/javac/warnings/6594914/T6594914b.out.i
 data/src/share/classes/com/sun/tools/classfile/ModuleRequires_attribute.java.i
-data/test/tools/javac/mixedTarget/ExtendCovariant2.java.i
+data/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.sh.i
 data/test/tools/javac/generics/7034019/T7034019d.out.i
 data/test/tools/javac/failover/FailOver02.java.i
 data/test/tools/javac/4980495/std/p1/A1.java.i
+data/test/tools/javac/generics/bridge1/E.java.i
 data/test/tools/javac/annotations/neg/OverrideNo.java.i
 data/test/tools/javac/diags/examples/OverrideDoesntThrow.java.i
-data/src/share/classes/com/sun/javadoc/ThrowsTag.java.i
 data/test/tools/javac/ExtendsAccess/ExtendsAccess.sh.i
-data/test/tools/javac/processing/model/util/elements/doccomments/a/First.java.i
+data/test/tools/javac/boxing/NoBoxingFloat.java.i
 data/test/tools/javac/diags/examples/ProcUseProcOrImplicit/ProcUseProcOrImplicit.java.i
 data/test/tools/javac/DuplicateImport.java.i
-data/test/tools/javah/SubClassConsts.win.i
-data/src/share/classes/javax/annotation/processing/Completions.java.i
+data/test/tools/javadoc/outputRedirect/Test.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java.i
 data/test/tools/javac/multicatch/Pos08eff_final.java.i
 data/test/tools/javac/generics/wildcards/neg/CastWarn4.java.i
-data/test/tools/javac/diags/examples/MulticatchNotSupported.java.i
+data/test/tools/apt/Basics/TestGetTypeDeclarationApf.java.i
 data/test/tools/javac/generics/PrimitiveClass.java.i
-data/test/tools/javadoc/annotations/annotateParams/expected.out.i
-data/test/tools/javac/diags/examples/VarargsPluralAdditional/VarargsPlural.java.i
+data/test/tools/javac/T6705935.java.i
+data/test/tools/javac/generics/typevars/6182630/T6182630.java.i
+data/test/tools/javac/annotations/neg/Z9.java.i
 data/test/tools/javac/importContext/namedPackage/Dummy.java.i
 data/test/tools/javac/DefiniteAssignment/DefAssignAfterTry3.java.i
+data/test/tools/javac/resolve/tests/ReferenceOverInferred.java.i
 data/test/tools/javac/generics/7007615/acc2/p1/C.java.i
-data/test/tools/javac/generics/inference/5070671/T5070671.java.i
-data/test/tools/javac/processing/6413690/src/Super.java.i
+data/test/tools/javac/diags/examples/DirPathElementNotFound.java.i
+data/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java.i
 data/test/tools/javac/multicatch/7005371/T7005371.java.i
 data/test/tools/javac/processing/6359313/T6359313.java.i
 data/test/tools/javac/generics/ParametricException.java.i
 data/test/tools/javac/scope/StarImportTest.java.i
-data/test/tools/javac/generics/inference/6650759/T6650759b.java.i
-data/test/tools/javac/processing/6634138/Dummy.java.i
+data/test/tools/javac/inheritedAccess/MethodReferenceQualification_1.java.i
 data/test/tools/javac/6199662/TreeInfo.java.i
-data/test/tools/javac/api/T6345974.java.i
+data/test/tools/javadoc/completionFailure/pkg/A.java.i
 data/test/tools/javac/danglingDep/NoDepX.java.i
 data/src/share/classes/com/sun/tools/javac/model/JavacElements.java.i
 data/test/tools/javadoc/varArgs/Main.java.i
 data/test/tools/javac/generics/7022054/T7022054pos1.java.i
 data/src/share/classes/javax/lang/model/type/DeclaredType.java.i
+data/test/tools/javac/accessVirtualInner/Main.java.i
 data/test/tools/javac/DefiniteAssignment/T4718142a.java.i
 data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestInterface.java.i
 data/test/tools/javap/stackmap/T6271292.java.i
@@ -2828,8 +2845,8 @@ data/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties.i
 data/src/share/classes/javax/annotation/processing/Processor.java.i
 data/test/tools/javac/diags/examples/ProcPackageDoesNotExist/processors/AnnoProc.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationType.java.i
-data/test/tools/javac/cast/6467183/T6467183b.java.i
-data/test/com/sun/javadoc/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java.i
+data/test/com/sun/javadoc/testUseOption/pkg2/package.html.i
+data/test/tools/javac/warnings/Unchecked.lintAll.out.i
 data/test/com/sun/javadoc/testTagInheritence/firstSentence2/C.java.i
 data/test/tools/javac/generics/6192945/Neg.java.i
 data/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java.i
@@ -2839,23 +2856,23 @@ data/test/tools/javac/diags/examples/SunApiPluralAdditional/SunApiFilename.java.
 data/test/tools/javac/varargs/5088429/T5088429Neg01.out.i
 data/test/tools/javac/generics/6332204/T6346876.java.i
 data/test/tools/apt/lib/TestProcessorFactory.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodFinder.java.i
+data/test/tools/javac/mandatoryWarnings/deprecated/P.java.i
 data/src/share/classes/com/sun/tools/classfile/ConstantPool.java.i
 data/test/tools/javac/CaptureInSubtype.java.i
 data/test/tools/javap/T6866657.java.i
 data/test/tools/apt/Basics/annot/annot2/AnnotSimple2.java.i
 data/src/share/classes/com/sun/tools/apt/comp/UsageMessageNeededException.java.i
 data/test/tools/javac/6457284/T6457284.java.i
-data/test/tools/javac/typeAnnotations/newlocations/Throws.java.i
+data/test/tools/javah/MissingParamClassTest.sh.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest1.java.i
 data/test/tools/javac/danglingDep/RefX.java.i
 data/test/tools/javac/failover/FailOver11.out.i
 data/test/tools/javac/annotations/pos/Z3.java.i
-data/test/tools/javac/implicitThis/6541876/T6541876b.java.i
-data/test/tools/javac/miranda/T4528315.java.i
+data/src/share/classes/com/sun/javadoc/Doc.java.i
 data/test/tools/javac/constDebug/ConstDebug.java.i
 data/test/tools/javac/diags/examples/PackageAnnos.java.i
-data/test/com/sun/javadoc/testNoPackagesFile/C.java.i
+data/test/tools/javac/protectedInner/pkg1/Base.java.i
+data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestError.java.i
 data/test/tools/javac/Paths/Help.sh.i
 data/test/tools/javac/AddReferenceThis.java.i
 data/test/tools/javac/policy/byfile.ACD.out.i
@@ -2863,19 +2880,20 @@ data/test/com/sun/javadoc/testRelativeLinks/pkg2/Foo.java.i
 data/src/share/sample/javac/processing/src/CheckNamesProcessor.java.i
 data/test/tools/javac/TryWithResources/WeirdTwr.java.i
 data/test/tools/javac/generics/6192945/Method.java.i
-data/test/tools/javac/ClassPathTest/pkg/ClassPathTestAux3.java.i
+data/test/tools/javac/annotations/6365854/TestCore.java.i
 data/test/tools/javac/meth/InvokeMHTrans.out.i
 data/test/tools/javac/varargs/Anon.java.i
 data/test/com/sun/javadoc/testPackageDeprecation/pkg1/package-info.java.i
 data/test/tools/javac/annotations/neg/ObjectMembers.java.i
 data/test/tools/javac/ClassCycle/ClassCycle1b.java.i
 data/test/com/sun/javadoc/testGroupOption/TestGroupOption.java.i
-data/test/tools/javac/T6230128.out.i
+data/test/tools/javac/cast/6467183/T6467183b.java.i
 data/test/tools/javac/diags/examples/EnumTypesNotExtensible.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java.i
 data/src/share/classes/com/sun/mirror/apt/AnnotationProcessorEnvironment.java.i
 data/src/share/classes/javax/lang/model/type/NullType.java.i
 data/test/tools/javac/diags/examples.not-yet.txt.i
+data/test/tools/javah/4942232/ParamClassTest.java.i
 data/test/tools/javac/implicitThis/WhichImplicitThis10.java.i
 data/test/tools/javac/generics/6946618/T6946618a.out.i
 data/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationValueImpl.java.i
@@ -2887,35 +2905,37 @@ data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMappe
 data/test/tools/javac/T6180021/Super.java.i
 data/test/tools/javac/api/6406133/Erroneous.java.i
 data/test/tools/javac/TryWithResources/TwrTests.java.i
-data/test/tools/javac/innerClassFile/y/Main.java.i
+data/test/tools/javap/T6474890.java.i
 data/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java.i
 data/test/tools/javac/6979683/TestCast6979683_BAD39.java.errlog.i
 data/test/tools/javac/processing/filer/TestPackageInfo.java.i
 data/test/tools/javac/generics/7034019/T7034019d.java.i
 data/test/tools/javac/T6587674.java.i
+data/test/tools/javac/T7093325.java.i
 data/test/tools/javac/staticImport/6665223/pkg/B.java.i
+data/src/share/classes/com/sun/source/tree/ViewDeclarationTree.java.i
 data/test/tools/apt/mirror/type/PrimitiveTyp.java.i
 data/test/tools/javac/QualifiedThisAndSuper_2.java.i
 data/test/tools/javac/6589361/T6589361.java.i
-data/test/tools/javac/multicatch/Neg04eff_final.java.i
+data/test/com/sun/javadoc/testIndex/pkg/Coin.java.i
 data/test/tools/javac/diags/examples/UnreportedException.java.i
 data/test/com/sun/javadoc/testThrowsInheritence/Foo.java.i
 data/src/share/classes/com/sun/mirror/util/DeclarationVisitor.java.i
 data/src/share/classes/javax/tools/package-info.java.i
 data/src/share/classes/com/sun/source/tree/AssertTree.java.i
 data/test/tools/javac/api/6852595/T6852595.java.i
+data/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java.i
 data/test/tools/javac/ExtendsAccess/ExtendsAccess.out.i
+data/test/tools/javac/ImportCycle/foo/Bottom.java.i
 data/test/com/sun/javadoc/testLegacyTaglet/C.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java.i
 data/test/tools/javac/importscope/A.java.i
 data/test/tools/javac/typeAnnotations/failures/target/VoidMethod.java.i
-data/test/tools/javac/generics/ArrayClone.java.i
 data/test/tools/javac/diags/examples/PrintProcessorInfo/PrintProcessorInfo.java.i
 data/test/tools/javac/overload/T4723909.java.i
 data/test/tools/javac/modules/ModuleClassAttributeTest01.java.i
 data/src/share/classes/com/sun/tools/apt/comp/PrintAP.java.i
 data/test/tools/javac/TryWithResources/DuplicateResourceDecl.java.i
-data/src/share/classes/sun/tools/javap/RuntimeConstants.java.i
+data/test/tools/javac/generics/wildcards/7034495/T7034495.java.i
 data/test/tools/javac/diags/examples/UnreportedExceptionImplicitClose.java.i
 data/test/tools/javac/limits/NumArgs1.java.i
 data/test/tools/javac/generics/diamond/neg/Neg04.java.i
@@ -2923,6 +2943,7 @@ data/src/share/classes/com/sun/tools/doclets/package.html.i
 data/test/tools/javac/generics/BridgeRestype.java.i
 data/src/share/classes/com/sun/tools/javac/util/Pair.java.i
 data/test/tools/javac/NonStaticFieldExpr3.java.i
+data/test/tools/javac/parser/T4881269.java.i
 data/src/share/classes/com/sun/tools/javah/JavahTool.java.i
 data/test/tools/javah/6572945/TestClass2.java.i
 data/test/tools/javac/StandaloneQualifiedSuper.java.i
@@ -2942,16 +2963,16 @@ data/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.j
 data/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java.i
 data/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java.i
 data/test/tools/javac/generics/inference/6638712/T6638712e.out.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java.i
+data/test/tools/javac/T6435291/T6435291.java.i
+data/test/tools/javap/T6715767.java.i
 data/test/com/sun/javadoc/testEncoding/TestEncoding.java.i
 data/test/tools/javac/generics/WrongNew.java.i
 data/test/tools/javac/BadHexConstant.java.i
 data/test/tools/javac/QualifiedAccess/QualifiedAccess_4.java.i
 data/test/tools/javac/modules/ModuleModifierTest01.java.i
-data/src/share/classes/com/sun/tools/javap/Context.java.i
+data/test/tools/javac/generics/diamond/neg/Neg01.out.i
 data/test/tools/javac/javazip/good/B.java.i
 data/test/com/sun/javadoc/_template/TemplateComplete.java.i
-data/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java.i
 data/test/tools/javac/T6956638.java.i
 data/src/share/classes/com/sun/tools/javac/code/Printer.java.i
 data/test/tools/javadoc/6942366/p/Base.java.i
@@ -2959,88 +2980,91 @@ data/test/tools/javap/4111861/T4111861.java.i
 data/test/tools/javac/diags/examples/NoSuperclass.java.i
 data/test/tools/javac/multicatch/Pos09.java.i
 data/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.out.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java.i
-data/test/tools/javac/api/lib/ToolTester.java.i
+data/test/tools/javac/6521805/p/Outer.java.i
+data/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java.i
 data/test/com/sun/javadoc/testNavagation/TestNavagation.java.i
-data/test/tools/javac/api/6440333/T6440333.java.i
+data/test/tools/javac/missingClass/A.java.i
 data/test/com/sun/javadoc/testTaglets/Child.java.i
 data/test/tools/javac/processing/model/util/filter/TestIterables.java.i
-data/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignCond.java.i
+data/test/tools/javac/OverrideChecks/6400189/T6400189c.java.i
+data/test/tools/javac/processing/6634138/Dummy.java.i
 data/test/tools/javac/generics/diamond/7057297/T7057297.java.i
 data/src/share/classes/javax/tools/ExtendedLocation.java.i
 data/src/share/classes/com/sun/source/tree/ContinueTree.java.i
-data/test/tools/javac/Diagnostics/6722234/T6722234b.java.i
 data/test/com/sun/javadoc/testLinkOption/testNewLineInLink/package.html.i
 data/test/tools/javadoc/6176978/X.java.i
 data/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java.i
 data/test/tools/apt/lib/TestProcessor.java.i
+data/test/tools/javac/generics/T4738171.java.i
 data/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.java.i
-data/test/com/sun/javadoc/testLegacyTaglet/ToDoTaglet.java.i
-data/test/com/sun/javadoc/testUseOption/pkg1/C2.java.i
+data/test/tools/javac/generics/inference/6315770/T6315770.java.i
+data/test/tools/javac/generics/typevars/6199146/T6199146.java.i
+data/test/tools/apt/mirror/declaration/ConstructorDecl.java.i
 data/test/tools/javac/rawDiags/Error.out.i
 data/src/share/classes/com/sun/tools/javac/Launcher.java.i
 data/test/tools/javadoc/enum/enumType/expected.out.i
 data/test/com/sun/javadoc/testPackageDeprecation/C2.java.i
 data/test/tools/javac/4980495/std/p2/A2.java.i
-data/test/tools/javac/InnerClassesAttribute/Outside$1$Inside.class.i
-data/test/tools/javac/cast/forum/T654170.java.i
 data/test/tools/javac/cast/7005095/T7005095neg.java.i
 data/test/com/sun/javadoc/testSerialVersionUID/C.java.i
 data/test/tools/javadoc/generics/tparamTagOnMethod/pkg1/A.java.i
 data/make/test/lib/javap.sh.i
-data/test/tools/javac/api/TestJavacTask_ParseAttrGen.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/package-info.java.i
 data/test/tools/javac/diags/examples/NoExplicitAnnoProcRequested.java.i
 data/test/tools/javac/multicatch/Neg01.out.i
-data/src/share/classes/com/sun/tools/javap/BasicWriter.java.i
+data/test/tools/javac/T6942649.java.i
 data/test/tools/javac/generics/typevars/4856983/T4856983b.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java.i
-data/test/tools/javac/TryWithResources/TwrIntersection.java.i
+data/test/tools/javac/generics/diamond/7030150/Pos01.java.i
 data/src/share/classes/javax/lang/model/util/ElementFilter.java.i
 data/test/tools/javac/generics/diamond/neg/Neg11.out.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties.i
+data/test/tools/javac/implicitThis/6541876/T6541876b.java.i
 data/src/share/classes/javax/annotation/processing/Filer.java.i
 data/test/tools/javac/5045412/Foo.java.i
 data/test/tools/javac/T6394563.empty.out.i
+data/src/share/classes/com/sun/tools/javac/code/Directive.java.i
 data/test/tools/javac/file/zip/T6836682.java.i
+data/test/tools/javac/cast/6270087/T6270087.java.i
 data/test/com/sun/javadoc/testNavagation/pkg/E.java.i
+data/test/tools/javac/generics/7022054/T7022054neg1.out.i
 data/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java.i
-data/test/tools/apt/Compile/Round1Apf.java.i
 data/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java.i
-data/test/tools/javac/generics/GetClass2.java.i
 data/test/tools/javac/generics/wildcards/7034495/T7034495.out.i
 data/test/com/sun/javadoc/testTaglets/C.java.i
+data/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedFilename.java.i
 data/test/tools/javac/5045412/Bar.java.i
 data/test/tools/javac/policy/test3/Test.java.i
 data/test/tools/javac/diags/examples/RedundantCast.java.i
 data/src/share/classes/com/sun/tools/javac/file/ZipArchive.java.i
 data/test/tools/javac/literals/BinaryLiterals.java.i
-data/test/tools/javac/diags/examples/UnclosedBytecodeIdent.java.i
+data/src/share/classes/com/sun/tools/javac/code/Attribute.java.i
 data/test/tools/javac/depOverrides/doccomment/Test1B2.out.i
-data/test/tools/javac/danglingDep/NoDepX.out.i
+data/test/tools/javac/diags/examples/VarargsClash.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/type/ClassTypeImpl.java.i
 data/src/share/classes/com/sun/mirror/type/package-info.java.i
 data/test/tools/javac/generics/6969184/T6969184.out.i
 data/test/tools/javac/staticImport/6665223/pkg/A.java.i
 data/test/tools/javah/6572945/gold/jni.dir.1/TestClass2.h.i
 data/test/tools/javac/generics/6372782/Scalar.java.i
 data/test/com/sun/javadoc/testReturnTag/TestReturnTag.java.i
+data/test/tools/javac/generics/7007615/acc1/p1/D.java.i
 data/test/tools/javac/AnonymousProtect/P1/pub.java.i
 data/test/tools/javac/diags/examples/InaccessibleVarargsType/p1/A.java.i
+data/test/tools/javac/annotations/pos/Z4.java.i
 data/test/tools/javac/generics/6910550/T6910550a.out.i
 data/test/tools/javac/diags/examples/TrustMeOnNonVarargsMeth.java.i
 data/test/tools/javac/parser/netbeans/JavacParserTest.java.i
 data/test/tools/javadoc/annotations/shortcuts/pkg1/Array.java.i
 data/src/share/classes/com/sun/tools/javac/jigsaw/JavacCatalog.java.i
-data/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java.i
 data/test/tools/javah/SuperClassConsts.java.i
 data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes5.java.i
 data/test/tools/javac/InterfaceAssert.java.i
 data/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java.i
 data/test/tools/javac/annotations/neg/Recovery.java.i
+data/test/tools/javac/processing/warnings/TestSourceVersionWarnings.java.i
 data/test/tools/javadoc/subpackageIgnore/SubpackageIgnore.java.i
 data/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java.i
-data/test/com/sun/javadoc/testExternalOverridenMethod/pkg/XReader.java.i
+data/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound1.java.i
 data/test/tools/javac/generics/wildcards/6437894/B.java.i
 data/test/tools/javac/processing/6359313/package-info.java.i
 data/test/tools/javac/generics/6985719/T6985719b.out.i
@@ -3050,35 +3074,39 @@ data/test/tools/javac/Diagnostics/6722234/T6722234a_1.out.i
 data/test/tools/javac/ConditionalInline.java.i
 data/test/tools/javac/6863465/T6863465c.java.i
 data/test/tools/javac/T4994049/DeprecatedNOT.java.i
-data/src/share/classes/javax/lang/model/element/TypeParameterElement.java.i
+data/test/com/sun/javadoc/testInlineLinkLabel/pkg/package.html.i
 data/test/tools/javac/generics/7034511/T7034511a.out.i
 data/test/tools/javac/TryWithResources/DuplicateResourceDecl.out.i
 data/test/tools/javac/multicatch/Pos05.java.i
+data/test/tools/javac/parser/JavacParserTest.java.i
 data/test/tools/javac/rawDiags/Error.java.i
 data/test/tools/javac/sourcePath/SourcePathA.java.i
 data/test/tools/javac/VoidArray.java.i
-data/test/tools/javac/NameClash/One.java.i
+data/test/tools/javac/depOverrides/annotation/Test1B2.out.i
 data/test/tools/javac/warnings/FallThrough.noLint.out.i
+data/test/tools/javac/generics/Casting3.java.i
 data/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java.i
-data/test/tools/javac/annotations/neg/Package.java.i
+data/test/tools/javac/multicatch/Pos08.java.i
 data/test/com/sun/javadoc/testBaseClass/baz/Foo.java.i
 data/test/tools/javac/generics/rare/Rare6.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/titlebar_end.gif.i
 data/test/com/sun/javadoc/testMemberInheritence/inheritDist/C.java.i
 data/test/tools/javac/annotations/neg/Cycle3.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java.i
 data/test/tools/javac/ExtraneousEquals.java.i
-data/src/share/classes/com/sun/tools/javac/code/Flags.java.i
+data/test/tools/javac/processing/6994946/SemanticErrorTest.java.i
 data/test/com/sun/javadoc/testHref/TestHref.java.i
 data/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java.i
 data/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out.i
+data/test/tools/javac/NonStaticFieldExpr3.out.i
 data/test/tools/javac/DefiniteAssignment/T4720751.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_9.java.i
+data/test/tools/apt/mirror/declaration/PackageDecl.java.i
 data/test/tools/javac/diags/examples/IllegalStartOfExpr.java.i
 data/test/tools/javac/generics/inference/6369605/T6369605b.java.i
+data/test/tools/javac/rawDiags/Note.out.i
 data/test/tools/javac/generics/inference/6359106/Orig.java.i
 data/test/tools/javac/generics/typevars/5060485/T5060485.java.i
 data/test/tools/javac/typeAnnotations/failures/IndexArray.out.i
-data/src/share/classes/com/sun/tools/apt/mirror/type/InterfaceTypeImpl.java.i
 data/test/tools/javap/T4975569.java.i
 data/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java.i
 data/test/tools/javac/ConstantValues/ConstValInit.java.i
@@ -3088,8 +3116,8 @@ data/src/share/classes/com/sun/mirror/declaration/ClassDeclaration.java.i
 data/test/tools/javac/miranda/4711056/T4.java.i
 data/test/tools/javadoc/annotations/annotateParams/Main.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java.i
-data/test/tools/apt/Basics/StaticMethodAnnotations.java.i
-data/make/build.xml.i
+data/test/tools/javac/cast/forum/T654170.java.i
+data/test/tools/javac/6979683/TestCast6979683_BAD37.java.i
 data/src/share/classes/javax/lang/model/element/AnnotationValueVisitor.java.i
 data/test/tools/javadoc/generics/genericSuper/pkg1/A.java.i
 data/test/tools/javac/failover/FailOver06.out.i
@@ -3097,9 +3125,9 @@ data/test/tools/javac/depOverrides/annotation/Test2R.out.i
 data/test/tools/javac/diags/examples/DeprecatedFilenameAdditional.java.i
 data/test/tools/javac/limits/CodeSize.java.i
 data/test/tools/javac/T6395974.java.i
-data/test/tools/javac/AnonymousProtect/P1/priv.java.i
-data/src/share/classes/com/sun/mirror/apt/AnnotationProcessor.java.i
-data/test/tools/javac/rawDiags/Warning.out.i
+data/test/tools/javac/cast/6557182/T6557182.java.i
+data/test/tools/javac/warnings/Deprecation.noLint.out.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignCond.java.i
 data/test/tools/javac/6547131/p/Outer.class.i
 data/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java.i
 data/test/tools/javac/T4848619/T4848619a.java.i
@@ -3109,18 +3137,18 @@ data/src/share/classes/com/sun/tools/javap/CodeWriter.java.i
 data/test/tools/javac/completion/example/B.class.i
 data/test/tools/apt/Compile/Dummy1.java.i
 data/test/tools/javac/T6230128.java.i
-data/test/tools/javac/api/TestDocComments.java.i
-data/test/tools/javap/T4876942.java.i
+data/test/tools/javac/diags/examples/UncheckedCast.java.i
+data/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java.i
+data/test/tools/javac/jvm/6397652/T6397652.java.i
 data/test/tools/javac/processing/filer/TestGetResource2.java.i
 data/test/tools/javac/diags/examples/TypeNoParams.java.i
-data/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java.i
+data/src/share/classes/com/sun/tools/javap/Context.java.i
 data/test/tools/javac/warnings/Finally.java.i
 data/test/tools/javac/diags/examples/InterfaceExpected.java.i
 data/test/tools/javac/diags/examples/NameClashSameErasure.java.i
 data/test/tools/apt/lib/Test.java.i
 data/test/tools/javac/treeannotests/DA.java.i
 data/test/tools/javac/diags/examples/StaticNotQualifiedByType.java.i
-data/test/tools/javac/Paths/Class-Path2.sh.i
 data/src/share/classes/com/sun/mirror/declaration/ConstructorDeclaration.java.i
 data/test/tools/javac/generics/7022054/T7022054neg2.java.i
 data/test/tools/javac/T5092545.java.i
@@ -3138,116 +3166,119 @@ data/test/tools/javac/generics/T4684378.java.i
 data/test/tools/javac/Diagnostics/6722234/T6722234d_1.out.i
 data/src/share/classes/com/sun/mirror/util/package-info.java.i
 data/test/tools/javac/tree/TreePosRoundsTest.java.i
-data/test/tools/javac/diags/examples/ProcUnclosedTypeFiles/processors/AnnoProc.java.i
+data/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java.i
 data/test/com/sun/javadoc/testInterface/pkg/Interface.java.i
 data/test/tools/javac/code/ArrayClone.java.i
 data/test/tools/javac/diags/examples/ProcessorWrongType/ProcessorWrongType.java.i
 data/test/tools/javac/varargs/warning/Warn4.java.i
 data/src/share/classes/com/sun/source/tree/ModuleTree.java.i
 data/test/tools/javac/diags/examples/UncheckedClash.java.i
-data/test/tools/javac/NonStaticFieldExpr1.java.i
+data/test/tools/javac/6400872/C.java.i
 data/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java.i
 data/test/tools/javac/diags/examples/StaticImportNotSupported.java.i
 data/test/com/sun/javadoc/testEncoding/EncodeTest.java.i
 data/test/tools/javac/cast/6302214/T6302214a.java.i
-data/test/tools/javac/api/TestGetElement.java.i
+data/test/tools/javac/6758789/T6758789a.java.i
 data/test/tools/javac/quid/QuotedIdent.java.i
-data/test/tools/javac/generics/T4784219.java.i
+data/test/tools/javac/FloatingPointChanges/Test.java.i
 data/test/tools/javac/multicatch/Neg03.java.i
+data/test/tools/javac/diags/examples/VerboseResolveMulti1.java.i
+data/test/tools/javadoc/enum/docComments/Main.java.i
 data/test/tools/javac/processing/6350124/HelloWorldAP.java.i
 data/test/tools/apt/mirror/type/InterfaceTyp.java.i
 data/test/tools/javac/generics/6476118/T6476118d.java.i
 data/test/tools/javac/TryWithResources/PlainTry6.out.i
-data/test/tools/javac/capture/Capture5.java.i
 data/src/share/classes/com/sun/tools/javac/tree/JCTree.java.i
 data/test/tools/javac/boxing/BoxedForeach.java.i
-data/test/tools/javac/util/context/T7021650.java.i
-data/test/tools/javac/ImportUnnamed/Dummy.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_3.java.i
+data/test/tools/javac/T6231847.java.i
+data/test/tools/javac/6257443/T6257443.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java.i
 data/test/tools/javadoc/6958836/warns/Warnings.java.i
-data/test/tools/javac/processing/T6439826.java.i
+data/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java.i
+data/test/tools/javac/DeclarationStatementInline.java.i
 data/make/netbeans/langtools/build.xml.i
-data/src/share/classes/com/sun/mirror/util/DeclarationFilter.java.i
 data/test/tools/apt/Compile/compile.sh.i
 data/src/share/classes/com/sun/javadoc/Type.java.i
-data/test/tools/javac/generics/inference/5003431/T5003431.java.i
+data/test/tools/javac/accessVirtualInner/a/A.java.i
 data/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java.i
-data/src/share/classes/com/sun/tools/javac/code/Source.java.i
-data/test/com/sun/javadoc/testBadPackageFileInJar/badPackageFileInJar.jar.i
-data/test/tools/javac/multicatch/Neg01eff_final.java.i
+data/test/tools/javac/diags/examples/LocalVarNeedsFinal.java.i
+data/test/tools/javac/generics/typevars/5060485/Neg2.java.i
+data/test/tools/javac/annotations/neg/Z11.java.i
 data/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java.i
 data/test/tools/javac/types/CastObjectToPrimitiveTest.java.i
 data/test/tools/javac/UncaughtOverflow2.java.i
 data/test/tools/javac/QualifiedAccess/QualifiedAccess_3.out.i
 data/test/tools/javac/generics/rawOverride/T6178365.java.i
 data/test/tools/javac/policy/test3/A.java.i
-data/test/tools/javac/generics/wildcards/neg/CastWarn3.java.i
+data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUndocumented.java.i
+data/test/com/sun/javadoc/testHtmlTableTags/pkg1/C1.java.i
 data/test/tools/javac/IllegalAnnotation.java.i
 data/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java.i
 data/test/tools/javap/ListTest.java.i
 data/src/share/classes/com/sun/javadoc/AnnotationTypeDoc.java.i
-data/src/share/classes/javax/lang/model/util/ElementScanner8.java.i
 data/test/tools/javac/diags/examples/WhereCaptured.java.i
 data/test/tools/javac/ObjectIncompatibleInterface.java.i
 data/test/tools/javac/api/6420409/T6420409.java.i
 data/src/share/classes/com/sun/tools/javah/resources/version.properties-template.i
 data/test/tools/javac/versionOpt.sh.i
-data/test/tools/javac/diags/examples/MulticatchMustBeFinal.java.i
-data/test/tools/javac/generics/wildcards/6437894/T6437894.out.i
-data/test/tools/javac/DefiniteAssignment/T4725725.java.i
-data/test/tools/javac/generics/InstanceOf2.java.i
-data/test/tools/javac/staticQualifiedNew/StaticQualifiedNew.java.i
+data/test/tools/javac/api/TestJavacTask_ParseAttrGen.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java.i
+data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C1.java.i
+data/test/tools/javac/processing/warnings/UseImplicit/TestProcUseImplicitWarning.java.i
+data/test/tools/javac/varargs/6199075/T6199075.java.i
 data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_11.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/apt/AnnotationProcessorEnvironmentImpl.java.i
-data/make/test/lib/src.gold.txt.i
+data/test/tools/javac/mandatoryWarnings/unchecked/B.java.i
 data/LICENSE.i
 data/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java.i
 data/test/tools/javac/processing/filer/TestGetResource.java.i
-data/test/tools/javac/diags/examples/WhereCaptured1.java.i
+data/test/tools/javac/diags/examples/ImproperSVUID.java.i
+data/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java.i
 data/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java.i
-data/test/tools/javadoc/lib/Tester.java.i
 data/test/com/sun/javadoc/testStylesheet/pkg/A.java.i
 data/test/tools/javac/AccessMethods/LateAddition.java.i
-data/test/tools/javac/T6705935.java.i
-data/test/tools/javac/InnerNamedConstant_1.java.i
+data/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java.i
 data/test/tools/javac/diags/examples/TypeReqClassArray.java.i
-data/test/tools/javac/protectedInner/Outerclass.java.i
+data/src/share/classes/com/sun/tools/classfile/Descriptor.java.i
+data/src/share/classes/com/sun/tools/javac/zip/ZipFileIndexEntry.java.i
+data/test/tools/javac/varargs/6806876/T6806876.out.i
 data/test/tools/javac/boxing/NoBoxingChar.java.i
+data/test/tools/javac/DefiniteAssignment/T4721062a.java.i
 data/test/tools/javac/T6304128.java.i
-data/test/com/sun/javadoc/testThrowsTag/pkg/T5.java.i
 data/test/tools/javac/multicatch/Neg06.java.i
 data/test/tools/javac/failover/FailOver04.java.i
-data/test/tools/javac/processing/model/type/MirroredTypeEx/OverEager.java.i
+data/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java.i
 data/test/tools/javap/T6879371.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/declaration/MemberDeclarationImpl.java.i
+data/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out.i
 data/test/tools/javac/mandatoryWarnings/unchecked/Test4d.out.i
 data/test/tools/javac/miranda/T4279316b.java.i
-data/test/tools/javac/varargs/T7013865.java.i
-data/test/tools/javac/generics/7007615/acc1/p1/D.java.i
+data/test/tools/javac/generics/wildcards/pos/InstanceOf.java.i
+data/test/tools/javac/failover/FailOver12.java.i
 data/test/tools/javac/6567415/T6567415.java.i
-data/test/tools/javac/NonStaticFinalVar.java.i
-data/test/tools/javac/processing/model/element/TestResourceVariable.java.i
+data/test/tools/javac/ClassLiterals/p1/SuperClass.java.i
+data/test/tools/javadoc/annotations/annotatePackage/Main.java.i
 data/test/tools/javac/TryWithResources/ResourceInterface.java.i
-data/test/tools/apt/mirror/declaration/EnumDecl.java.i
+data/src/share/classes/com/sun/tools/apt/main/Main.java.i
 data/test/tools/javac/policy/Test.java.i
 data/test/tools/javac/generics/diamond/neg/Neg09.out.i
 data/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out.i
 data/test/com/sun/javadoc/testExternalOverridenMethod/package-list.i
 data/test/tools/javac/generics/6985719/T6985719e.out.i
 data/test/com/sun/javadoc/testDocRootLink/pkg1/package.html.i
-data/test/tools/javac/generics/rare/Rare2.java.i
+data/test/tools/javac/6668794/badSource/p/A.java.i
+data/test/tools/javac/6521805/p/Sub.java.i
 data/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/type/WildcardTypeImpl.java.i
 data/test/tools/javac/failover/FailOver13.out.i
 data/test/tools/javac/tree/MakeLiteralTest.java.i
 data/test/tools/javac/Parens3.java.i
-data/test/tools/javac/diags/examples/ProcessorWrongType/processors/AnnoProc.java.i
+data/test/tools/javac/6734819/T6734819a.out.i
 data/test/tools/javac/diags/examples/IntfAnnotationsCantHaveParams.java.i
+data/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.java.i
 data/src/share/classes/com/sun/mirror/type/MirroredTypeException.java.i
-data/test/tools/javac/miranda/6964669/pkg/C.java.i
+data/test/com/sun/javadoc/testDupParamWarn/pkg/Bar.java.i
 data/test/tools/javac/AnonymousProtect/P2/usePub.java.i
-data/test/tools/javac/processing/environment/round/BuriedAnnotations.java.i
+data/test/tools/apt/Compile/servicesRound1.i
 data/test/tools/javac/generics/inference/5044646/p1/C.java.i
 data/test/com/sun/javadoc/testNestedInlineTag/testtaglets/UnderlineTaglet.java.i
 data/test/com/sun/javadoc/testBaseClass/TestBaseClass.java.i
@@ -3258,73 +3289,77 @@ data/test/tools/javadoc/generics/genericInnerAndOuter/Main.java.i
 data/test/tools/javac/enum/Enum2.java.i
 data/test/tools/javac/boxing/T6369051.java.i
 data/test/tools/javac/unicode/UnicodeUnicode.java.i
-data/test/tools/javac/ClassPathTest/ClassPathTest2.java.i
-data/test/com/sun/javadoc/testTypeParams/pkg/ClassUseTest3.java.i
+data/src/share/classes/com/sun/source/util/AbstractTypeProcessor.java.i
+data/test/tools/javac/util/context/T7021650.java.i
 data/test/tools/javac/innerClassFile/Driver.sh.i
 data/test/tools/javac/TryWithResources/TwrMultiCatch.java.i
-data/test/com/sun/javadoc/testIndex/pkg/AnnotationType.java.i
+data/test/tools/apt/Compile/ErrorAPF.java.i
 data/test/tools/javac/T6999210.java.i
 data/test/tools/javac/T6232928/package-info.java.i
-data/test/tools/javac/diags/examples/MethodDoesNotOverride.java.i
+data/test/tools/apt/Compile/HelloWorld.java.i
 data/test/com/sun/javadoc/testCmndLineClass/pkg2/C4.java.i
 data/test/tools/javac/TryWithResources/TwrIntersection02.out.i
 data/test/tools/javac/T6423583.java.i
 data/test/tools/javac/generics/6413682/T6413682.java.i
-data/test/tools/javac/meth/XlintWarn.java.i
-data/test/tools/javac/cast/6557182/T6557182.java.i
+data/test/com/sun/javadoc/testHtmlTableTags/pkg2/package-info.java.i
+data/test/tools/javac/AnonymousProtect/P1/priv.java.i
 data/test/tools/javac/multicatch/Pos02.java.i
+data/test/tools/javac/rawDiags/Warning.out.i
 data/test/com/sun/javadoc/testThrowsInheritence/Iface.java.i
-data/test/tools/javac/p1/BS.java.i
-data/test/tools/javac/ClassLiterals/InnerClassLiterals.java.i
+data/test/tools/javac/generics/wildcards/UnboundArray.java.i
+data/test/tools/javac/generics/Nonlinear.java.i
 data/test/com/sun/javadoc/testHelpOption/TestHelpOption.java.i
 data/test/tools/javac/NonAmbiguousField/Test.i
 data/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java.i
 data/src/share/classes/javax/lang/model/type/NoType.java.i
 data/test/tools/javac/TryWithResources/ArmLint.out.i
 data/test/tools/javac/generics/6218229/T6218229.java.i
-data/test/tools/javac/diags/examples/PrintRounds/processors/AnnoProc.java.i
+data/src/share/classes/com/sun/tools/javac/code/Symtab.java.i
 data/test/tools/javac/api/TestTrees.java.i
-data/test/tools/javac/SuperMeth.java.i
+data/test/tools/javac/api/6421756/T6421756.java.i
 data/test/com/sun/javadoc/testHtmlDocument/testMarkup.html.i
 data/test/tools/javac/OverrideChecks/T6399361.java.i
 data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes2.java.i
 data/test/tools/javadoc/T4994049/FileWithTabs.java.i
-data/test/tools/javac/ExceptionalFinally.java.i
+data/test/tools/javac/generics/6946618/T6946618c.java.i
 data/test/tools/javac/enum/forwardRef/TestEnum5.java.i
 data/test/tools/javac/processing/model/element/TestElement.java.i
-data/test/tools/javac/6520152/T.java.i
 data/test/tools/javac/p1/AS.java.i
 data/test/tools/javac/6863465/T6863465c.out.i
-data/make/test/HelloWorld.javadoc.gold.txt.i
+data/test/tools/javac/diags/examples/HasBeenDeprecated.java.i
 data/test/tools/javac/generics/T4784207b.java.i
 data/test/tools/javac/annotations/pos/Z2.java.i
-data/test/tools/javac/varargs/warning/Warn5.java.i
-data/test/tools/javac/ClassLiterals/LiteralInterface_1.java.i
+data/test/tools/javac/api/TestJavacTask.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java.i
 data/test/tools/apt/lib/Ignore.java.i
-data/src/share/classes/com/sun/javadoc/ExecutableMemberDoc.java.i
+data/test/tools/javadoc/annotations/annotateParams/pkg1/C.java.i
 data/test/tools/javac/mandatoryWarnings/unchecked/Test.java.i
 data/test/tools/javac/api/TestJavacTaskScanner.java.i
-data/test/tools/javac/generics/diamond/neg/Neg03.out.i
+data/test/tools/javac/resolve/Pos.java.i
+data/test/tools/javac/generics/GenLit1.java.i
 data/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out.i
-data/test/tools/javac/generics/parametricException/J.java.i
-data/test/tools/javac/synthesize/Byte.java.i
+data/test/tools/javac/OverrideChecks/6738538/T6738538a.java.i
+data/src/share/classes/com/sun/javadoc/ThrowsTag.java.i
 data/src/share/classes/javax/tools/ForwardingFileObject.java.i
 data/test/com/sun/javadoc/AccessH1/AccessH1.java.i
 data/test/tools/javac/diags/examples/AnnotationMissingValues1.java.i
-data/test/tools/apt/Discovery/Touch.java.i
-data/test/tools/javac/cast/6270087/T6270087.java.i
+data/test/com/sun/javadoc/testUseOption/pkg2/C3.java.i
 data/test/tools/javac/staticImport/6695838/a/FooInterface.java.i
 data/test/tools/javac/CyclicInheritance6/p1/B.java.i
-data/test/com/sun/javadoc/testWarnings/pkg/package.html.i
+data/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java.i
 data/test/tools/javac/diags/examples/EmptyCharLiteral.java.i
-data/test/tools/javac/ExceptionalFinally2.java.i
-data/test/tools/javac/ClassPathTest/ClassPathTest.sh.i
-data/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java.i
-data/test/tools/javac/diags/examples/SunApiFilename.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java.i
+data/test/tools/javac/diags/examples/VarargsFilenameAdditional.java.i
+data/test/tools/javac/generics/wildcards/BoundBug.java.i
+data/test/tools/javac/processing/environment/HelloWorld.java.i
+data/test/tools/javac/generics/6711619/T6711619b.out.i
+data/test/tools/javac/diags/examples/IllegalComboModifiers.java.i
 data/test/tools/javac/6521805/T6521805e.java.i
 data/test/tools/javac/api/TestGetScope.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourceToHTMLConverter.java.i
 data/src/share/classes/sun/tools/javap/StackMapTableData.java.i
 data/test/tools/javac/DefiniteAssignment/7003744/T7003744a.java.i
+data/test/tools/javac/resolve/ResolveHarness.java.i
 data/test/tools/javac/Paths/wcMineField.sh.i
 data/test/tools/javac/generics/7007615/acc2/AccessibilityCheck02.java.i
 data/test/tools/javac/diags/examples/TypeVarCantBeDeref.java.i
@@ -3333,15 +3368,17 @@ data/test/tools/javac/depOverrides/annotation/Test1A.out.i
 data/src/share/opensource/javac/doc/javac_lifecycle/index.html.i
 data/test/tools/javac/generics/7034511/T7034511a.java.i
 data/test/tools/javac/generics/7015430/T7015430.out.i
+data/test/tools/javac/api/evalexpr/CompileFromString.java.i
 data/test/tools/javac/generics/inference/7086601/T7086601b.java.i
 data/test/tools/javac/warnings/6594914/T6594914a.java.i
 data/test/com/sun/javadoc/testTaglets/taglets/Foo.java.i
 data/test/tools/javac/generics/odersky/List.java.i
+data/test/tools/javac/processing/6365040/T6365040.java.i
 data/test/tools/javac/diags/examples/PrintProcessorInfo/processors/AnnoProc.java.i
-data/test/tools/javac/ConstantValues/test_ff2.java.i
+data/test/tools/javac/typeAnnotations/newlocations/BasicTest.out.i
 data/test/tools/javac/DefiniteAssignment/T4721076.java.i
 data/test/tools/javac/varargs/VarargsOverride.java.i
-data/test/tools/javac/diags/examples/DeprecatedPlural/DeprecatedClass.java.i
+data/src/share/classes/com/sun/tools/javac/main/OptionHelper.java.i
 data/test/tools/javac/warnings/6594914/T6594914a.out.i
 data/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java.i
 data/test/tools/javac/VerifyDA.java.i
@@ -3350,26 +3387,27 @@ data/test/tools/javac/warnings/Deprecation.lintAll.out.i
 data/test/com/sun/javadoc/testMemberInheritence/inheritDist/A.java.i
 data/test/tools/javac/diags/examples/AnnosWithoutProcessors/processors/AnnoProc.java.i
 data/test/tools/javac/6979683/TestCast6979683_GOOD.java.i
-data/test/tools/javadoc/generics/genericClass/expected.out.i
+data/test/tools/javac/proprietary/WarnMethod.java.i
 data/test/tools/javadoc/LangVers.java.i
 data/test/tools/javac/AnonInnerException_3.java.i
+data/test/tools/javac/miranda/T4666866.java.i
 data/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeDeclarationImpl.java.i
 data/test/tools/javac/generics/6356636/a/Bar.java.i
 data/test/tools/javac/diags/examples/Orphaned.java.i
 data/src/share/classes/com/sun/tools/javap/AnnotationWriter.java.i
 data/test/tools/javac/depOverrides/doccomment/Test2.java.i
-data/test/com/sun/javadoc/testInlineLinkLabel/pkg/package.html.i
+data/test/tools/javac/generics/rawOverride/7062745/T7062745pos.java.i
 data/test/tools/javac/typeAnnotations/failures/LintCast.java.i
 data/src/share/classes/com/sun/mirror/type/package.html.i
 data/test/tools/javac/annotations/6214965/CompilerAnnotationTest.java.i
-data/test/tools/javac/T6977800.java.i
+data/test/tools/javac/6520152/T.java.i
 data/test/tools/javac/generics/typeargs/Superarg2.java.i
 data/test/tools/javac/processing/werror/WErrorGen.out.i
 data/test/tools/javac/ImportPackagePrivateInner/foo/Accessee.java.i
 data/test/tools/apt/Options/servicesOptions.i
+data/test/tools/javap/T7004698.java.i
 data/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out.i
-data/test/tools/javac/T6900149.java.i
 data/src/share/classes/com/sun/source/tree/AssignmentTree.java.i
 data/test/tools/javac/T6458823/TestClass.java.i
 data/test/tools/javac/fatalErrors/NoJavaLang.java.i
@@ -3379,51 +3417,49 @@ data/test/tools/javac/modules/ModuleVersionTest01.java.i
 data/test/tools/javap/typeAnnotations/ArrayClassLiterals2.java.i
 data/test/tools/javac/diags/examples/ArrayDimMissing.java.i
 data/src/share/opensource/javac/doc/javac_lifecycle/JavaCompiler.html.i
-data/test/tools/javac/generics/inference/6569789/T6569789.java.i
+data/test/tools/javac/processing/model/util/deprecation/ExpectedDeprecation.java.i
 data/test/tools/javac/diags/examples/EmptyBytecodeIdent.java.i
 data/test/tools/javac/processing/model/6341534/dir/Foo.java.i
+data/test/tools/javac/positions/T6402077.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/declaration/FieldDeclarationImpl.java.i
 data/test/tools/javac/T6665791.java.i
 data/test/tools/javac/diags/examples/CantResolve.java.i
 data/test/tools/javac/diags/examples/MissingReturnStatement.java.i
-data/src/share/classes/com/sun/mirror/declaration/package-info.java.i
+data/src/share/classes/javax/lang/model/element/AnnotationMirror.java.i
 data/test/tools/javac/diags/examples/ExplicitParamsDoNotConformToBounds.java.i
 data/test/tools/javac/generics/6985719/T6985719f.out.i
-data/test/tools/javac/DuplicateClass.java.i
 data/test/tools/javac/generics/6192945/Neg.out.i
 data/test/tools/javac/QualifiedOuterThis2.java.i
-data/test/tools/javac/processing/6350124/Marked.java.i
+data/test/tools/javac/generics/abstract/T4717181c.java.i
 data/test/tools/javac/generics/diamond/neg/Neg07.java.i
 data/test/tools/javac/diags/examples/CantResolveArgs.java.i
-data/test/tools/javac/annotations/neg/Z13.java.i
-data/test/tools/javac/cast/6665356/T6665356.java.i
+data/test/tools/javac/processing/6365040/ProcFoo.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/StylesheetWriter.java.i
+data/test/tools/javac/InnerNamedConstant_2.java.i
 data/test/tools/javac/generics/rare/Rare1.java.i
 data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java.i
 data/src/share/classes/com/sun/tools/apt/Main.java.i
-data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestException.java.i
 data/test/tools/javac/diags/examples/CantResolveArgsParams.java.i
-data/test/tools/javac/generics/typeargs/Metharg2.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/type/EnumTypeImpl.java.i
+data/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java.i
+data/src/share/classes/com/sun/tools/javac/util/JavacMessages.java.i
 data/test/tools/javac/cast/6569057/T6569057.java.i
 data/test/tools/javac/generics/inference/5080917/T5080917.java.i
 data/test/tools/apt/Compile/Round4Apf.java.i
 data/test/tools/javac/annotations/pos/RightTarget.java.i
-data/test/com/sun/javadoc/testModifier/TestModifier.java.i
+data/src/share/classes/javax/lang/model/util/ElementScanner6.java.i
 data/test/tools/javac/api/TestJavacTask_Lock.java.i
-data/test/tools/javac/BoundClassError.java.i
+data/src/share/classes/com/sun/tools/javac/resources/compiler.properties.i
 data/test/tools/javac/generics/inference/5044646/p1/B.java.i
-data/test/com/sun/javadoc/testLinkOption/package-list.i
 data/test/tools/apt/Discovery/discovery.sh.i
 data/test/tools/javac/generics/5009937/T5009937.java.i
 data/test/tools/javac/6668794/badClass/A.java.i
 data/test/tools/javac/miranda/4711056/T2.java.i
-data/test/tools/javac/protectedAccess/ProtectedMemberAccess3.out.i
 data/test/tools/apt/Basics/com.sun.mirror.apt.AnnotationProcessorFactory.i
 data/test/tools/javadoc/annotations/annotatePackage/pkg1/package.html.i
 data/test/com/sun/javadoc/testOverridenMethods/pkg3/I1.java.i
-data/test/tools/javac/generics/T6657499.java.i
+data/src/share/classes/com/sun/source/tree/UnaryTree.java.i
 data/test/tools/javac/generics/OverrideBridge.java.i
-data/test/tools/javac/protectedAccess/ProtectedMemberAccess3.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java.i
 data/test/tools/javac/mandatoryWarnings/deprecated/Test1.out.i
 data/test/tools/javac/6547131/p/Outer.jasm.i
 data/test/com/sun/javadoc/5093723/T5093723.java.i
@@ -3431,259 +3467,254 @@ data/test/tools/javac/overrridecrash/B.java.i
 data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/C4.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java.i
 data/src/share/classes/com/sun/tools/javac/tree/Pretty.java.i
-data/test/tools/javac/generics/wildcards/ContraArg.java.i
+data/test/com/sun/javadoc/testTypeParams/pkg/ParamTest2.java.i
 data/test/tools/javac/ForwardReference/ForwardReference_5.java.i
 data/test/tools/javac/failover/FailOver07.out.i
 data/test/tools/javac/processing/options/testCommandLineClasses/p/NestedExamples.java.i
 data/test/tools/javac/5017953/T5017953.java.i
 data/test/tools/javac/jvm/6397652/com/test/Test$Test$Test.java.i
-data/test/tools/javac/diags/examples/SourceNoBootclasspath.java.i
-data/test/tools/javac/generics/wildcards/neg/CastWarn14.java.i
 data/test/tools/javac/ConditionalClass.java.i
 data/test/com/sun/javadoc/testBadPackageFileInJar/pkg/C.java.i
-data/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java.i
-data/test/tools/javac/cast/7005671/T7005671.java.i
+data/test/tools/javac/modules/ModuleResolverTest05.java.i
+data/test/tools/javac/generics/6413682/TestPos.java.i
 data/test/tools/javac/conditional/6500343/T6500343b.java.i
 data/test/tools/javac/mandatoryWarnings/unchecked/Test3.out.i
 data/test/com/sun/javadoc/testSourceTab/DoubleTab/C.java.i
-data/test/tools/javac/assert/Position.java.i
-data/test/tools/javac/warnings/DivZero.java.i
+data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes3.java.i
+data/make/test/lib/src.gold.txt.i
 data/test/tools/javac/generics/6192945/Neg2.out.i
-data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out.i
-data/src/share/classes/com/sun/tools/classfile/DescriptorException.java.i
+data/test/tools/javac/Paths/Class-Path2.sh.i
 data/src/share/classes/javax/lang/model/type/MirroredTypeException.java.i
 data/test/tools/javac/boxing/Boxing1.java.i
-data/test/tools/javac/InterfaceOverrideObject.java.i
-data/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.out.i
-data/test/tools/javac/generics/inference/4942040/T4942040.java.i
+data/test/tools/javac/6402516/Checker.java.i
 data/test/com/sun/javadoc/ValidHtml/ValidHtml.java.i
-data/test/tools/javac/enum/T6509042.java.i
+data/test/tools/javac/annotations/neg/Recovery1.java.i
 data/test/tools/javac/quid/T6999438.out.i
 data/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeDeclarationImpl.java.i
 data/make/test/lib/javac.sh.i
 data/test/tools/javac/HiddenAbstractMethod/two/Child.java.i
-data/test/tools/javac/diags/examples/IntfAnnotationMemberClash.java.i
-data/test/tools/javac/6402516/CheckMethod.java.i
-data/test/tools/javac/processing/6512707/T6512707.java.i
+data/test/tools/javac/6840059/T6840059.out.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java.i
+data/test/tools/javac/policy/test1/simple.ABD.out.i
 data/test/tools/javac/enum/Def.java.i
-data/test/tools/javac/unicode/SupplementaryJavaID4.java.i
+data/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java.i
 data/test/tools/apt/Options/Marked.java.i
-data/test/tools/javac/typeAnnotations/newlocations/ClassParameters.java.i
+data/src/share/classes/com/sun/tools/javac/comp/Modules.java.i
+data/test/tools/javac/generics/diamond/pos/Pos01.java.i
 data/test/tools/javac/diags/examples/UnsupportedEncoding.java.i
 data/test/tools/javac/processing/environment/round/InheritedAnnotation.java.i
-data/test/tools/javac/TryWithResources/ResourceInterface.out.i
+data/test/com/sun/javadoc/testMemberInheritence/diamond/Z.java.i
 data/test/tools/javac/diags/examples/TypeAnnotationsNotSupported.java.i
-data/test/tools/javac/processing/environment/round/SurfaceAnnotations.java.i
-data/src/share/classes/com/sun/tools/javadoc/TagImpl.java.i
-data/src/share/classes/javax/lang/model/element/package-info.java.i
+data/test/tools/javac/generics/rare/Rare8.java.i
+data/test/tools/apt/mirror/declaration/EnumDecl.java.i
+data/test/tools/javac/cast/6286112/T6286112.java.i
+data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java.i
+data/test/tools/javac/DuplicateClass.java.i
 data/test/tools/javac/miranda/T4279316d.java.i
 data/test/tools/javac/enum/NestedEnum.java.i
-data/test/tools/javac/4980495/std/Test.out.i
 data/src/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java.i
 data/test/tools/javac/enum/EnumPublicConstructor.java.i
 data/test/tools/javac/overload/T4743490.java.i
-data/test/tools/javac/generics/diamond/7057297/T7057297.out.i
 data/test/tools/apt/mirror/type/TypeVar.java.i
 data/test/tools/javac/miranda/4686811/Tryit.java.i
 data/test/tools/javac/processing/warnings/gold_0.out.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java.i
 data/test/tools/javac/6390045/T6390045a.java.i
-data/test/tools/javac/annotations/pos/package-info.java.i
 data/test/tools/javac/mandatoryWarnings/deprecated/A.java.i
-data/test/tools/javac/policy/test2/byfile.BA.out.i
-data/test/tools/javap/pathsep.sh.i
-data/src/share/classes/javax/lang/model/type/package-info.java.i
+data/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java.i
+data/test/tools/javac/Digits.java.i
+data/test/tools/javac/generics/rawSeparate/RetroLexer.java.i
 data/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java.i
 data/test/com/sun/javadoc/testNavagation/pkg/I.java.i
-data/test/tools/javac/generics/UncheckedArray.java.i
+data/test/tools/javac/annotations/neg/Z1.java.i
 data/test/tools/javac/varargs/BadSyntax2.java.i
-data/test/tools/javac/processing/model/util/elements/TestGetConstantExpression.java.i
+data/test/tools/javac/diags/examples/IdentifierExpected.java.i
 data/test/tools/javac/6402516/TestClass.java.i
-data/test/tools/javac/T5003235/T5003235c.out.i
-data/test/tools/javac/TryWithResources/BadTwrSyntax.out.i
-data/test/tools/javac/multicatch/Neg04eff_final.out.i
+data/test/tools/javac/QualifiedAccess/QualifiedAccess_1.out.i
+data/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.java.i
+data/test/tools/javac/SuperNew2.java.i
+data/test/tools/javac/implicitThis/6541876/T6541876a.java.i
 data/test/tools/javac/diags/examples/NotDefPublicCantAccess/NotDefPublicCantAccess.java.i
 data/test/tools/javac/generics/inference/5081782/Pos.java.i
-data/test/tools/javac/AccessMethods/ChainedAssignment.java.i
 data/make/test/lib/javah.sh.i
 data/test/tools/javac/Paths/Diagnostics.sh.i
-data/test/tools/javah/ReadOldClass.sh.i
+data/test/tools/javac/generics/6245699/T6245699.java.i
 data/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java.i
-data/test/tools/javac/warnings/6594914/T6594914b.java.i
-data/test/tools/javac/Increment.java.i
+data/src/share/classes/com/sun/mirror/util/DeclarationFilter.java.i
+data/test/tools/javac/6302184/T6302184.sh.i
 data/test/tools/javac/api/T6838467.java.i
-data/test/tools/javac/diags/examples/ProcUseImplicit/ProcUseImplicit.java.i
+data/test/com/sun/javadoc/JavascriptWinTitle/p1/C.java.i
 data/test/tools/javac/diags/FileManager.java.i
 data/test/com/sun/javadoc/testOverridenMethods/pkg3/I3.java.i
-data/test/tools/javac/T6881645.java.i
+data/test/tools/javac/api/T6395981.java.i
 data/test/tools/javac/diags/examples/InvalidBinaryNumber.java.i
 data/test/tools/javac/6863465/T6863465a.java.i
 data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes4.java.i
 data/test/tools/javac/generics/6356636/a/AbstractFoo.java.i
 data/test/tools/javac/generics/typevars/4856983/T4856983.java.i
-data/src/share/classes/com/sun/source/tree/WildcardTree.java.i
-data/test/tools/javac/ClassFileModifiers/MemberModifiers.java.i
+data/test/com/sun/javadoc/testTagInheritence/pkg/TestAbstractClass.java.i
+data/src/share/classes/com/sun/tools/javap/JavapFileManager.java.i
 data/test/tools/javah/compareTest/README.i
 data/test/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner1.h.i
 data/test/tools/javac/StringsInSwitch/RSCL2.out.i
-data/src/share/classes/com/sun/source/tree/WhileLoopTree.java.i
+data/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java.i
 data/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java.i
-data/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java.i
 data/test/tools/javac/failover/FailOver12.out.i
 data/test/tools/javac/generics/GenLit2.java.i
 data/test/tools/javac/processing/warnings/gold_sv_warn_0_2.out.i
 data/test/tools/javac/miranda/4686148/Test.java.i
-data/test/tools/javac/processing/werror/WErrorLast.out.i
 data/src/share/classes/javax/lang/model/element/QualifiedNameable.java.i
-data/test/tools/javac/generics/CastCrash.java.i
 data/src/share/classes/com/sun/tools/javac/code/Symbol.java.i
 data/test/tools/javac/TryWithResources/InterruptedExceptionTest.java.i
+data/test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java.i
+data/src/share/classes/com/sun/source/tree/ModuleDirectiveTree.java.i
 data/test/tools/javac/T6567414.out.i
 data/test/tools/javac/api/TestOperators.java.i
-data/test/tools/javac/generics/6677785/T6677785.java.i
-data/test/tools/javac/ForwardReference/UseBeforeDeclaration.java.i
+data/test/tools/apt/Misc/Marked.java.i
 data/test/tools/javac/diags/examples/MalformedFpLit.java.i
+data/test/tools/javac/depOverrides/doccomment/Test1B.out.i
 data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C1.java.i
 data/test/tools/javac/boxing/Boxing4.java.i
 data/test/tools/javac/generics/6910550/T6910550c.java.i
 data/test/tools/javadoc/6964914/JavadocWarning.java.i
-data/test/tools/javadoc/completionFailure/pkg/B.java.i
-data/test/tools/javac/processing/Xprint.java.i
+data/src/share/classes/com/sun/source/util/SourcePositions.java.i
+data/test/tools/javac/generics/CatchTyparam.java.i
 data/test/tools/javac/processing/environment/round/Part2.java.i
 data/test/tools/javac/diags/examples/KindnameStaticInit.java.i
-data/test/tools/javac/FinalThisReference.java.i
-data/test/com/sun/javadoc/testMemberSummary/pkg2/A.java.i
 data/test/tools/javac/literals/UnderscoreLiterals.java.i
-data/test/tools/javac/generics/typevars/6968793/T6968793.java.i
+data/src/share/classes/com/sun/tools/classfile/Signature.java.i
 data/test/tools/javac/Closure1.java.i
+data/test/tools/javac/generics/typevars/5060485/Compatibility.out.i
 data/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java.i
-data/src/share/classes/javax/lang/model/element/AnnotationValue.java.i
+data/test/tools/javac/multicatch/Neg04eff_final.java.i
 data/test/tools/javac/policy/simple.ABD.out.i
 data/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java.i
 data/test/tools/javac/generics/inference/6638712/T6638712c.java.i
-data/test/tools/javac/generics/6476118/T6476118b.out.i
+data/test/tools/javac/enum/EnumImplicitPrivateConstructor.java.i
 data/test/tools/javac/multicatch/7030606/T7030606.out.i
-data/test/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner2.h.i
+data/test/tools/javac/generics/6192945/MethodNeg.out.i
 data/test/tools/javac/generics/T4695348.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java.i
 data/test/tools/javap/T6729471.java.i
+data/test/tools/javac/diags/examples/MethodReferencesNotSupported.java.i
+data/test/com/sun/javadoc/AccessSkipNav/p1/C1.java.i
 data/test/tools/javac/generics/6495506/T6495506.java.i
 data/test/tools/javac/implicitThis/WhichImplicitThis2.java.i
 data/test/tools/javac/staticImport/6665223/T6665223.java.i
 data/test/tools/javac/AnonStaticMember_2.java.i
 data/test/tools/javac/diags/examples/SunApiPlural/SunApiPlural.java.i
 data/make/netbeans/javah/build.xml.i
-data/test/tools/javac/diags/examples/AssertAsIdentifier2.java.i
+data/test/tools/javac/NestedFinallyReturn.java.i
 data/test/tools/javac/generics/UnsoundInference.java.i
 data/test/tools/javac/diags/examples/UnreachableCatch1.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java.i
 data/test/tools/javac/diags/examples/TypeReqRef.java.i
 data/test/tools/javac/danglingDep/DepX.out.i
-data/test/com/sun/javadoc/constantValues/TestConstantValues2.java.i
-data/test/tools/javac/TryInInstanceInit.java.i
+data/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java.i
+data/test/tools/javac/FinalInitializer.java.i
 data/test/tools/javac/diags/examples/ProcFileReopening/ProcFileReopening.java.i
 data/test/tools/javac/types/GenericTypeWellFormednessTest.java.i
 data/test/tools/javac/generics/6182950/T6182950a.out.i
 data/test/tools/apt/Basics/MyMarker.java.i
 data/test/tools/javac/importChecks/InvalidImportsNoClasses.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java.i
+data/test/tools/javac/generics/diamond/neg/Neg04.out.i
 data/test/tools/javac/varargs/warning/Warn3.java.i
 data/test/tools/javac/generics/wildcards/neg/Unbounded.java.i
-data/test/tools/javac/varargs/6806876/T6806876.out.i
-data/test/tools/javac/6402516/CheckClass.java.i
+data/test/tools/javac/processing/6348499/A.java.i
+data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingClass.java.i
 data/test/tools/javac/limits/ArrayDims4.java.i
 data/test/tools/javac/generics/inference/6650759/T6650759d.java.i
 data/test/com/sun/javadoc/testClassTree/pkg/ChildClass.java.i
 data/test/tools/javac/cast/6302214/T6302214.java.i
 data/test/tools/javac/multicatch/Neg03.out.i
 data/test/tools/javac/mandatoryWarnings/deprecated/Test5.out.i
-data/test/tools/javac/annotations/6214965/CompilerAnnotationTest2bad.java.i
-data/test/tools/javadoc/generics/genericClass/pkg1/A.java.i
+data/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java.i
+data/test/tools/javac/6199662/TreeScanner.java.i
 data/test/tools/javac/processing/werror/WError1.out.i
-data/test/tools/javac/api/T6400207.java.i
+data/test/tools/javac/processing/model/element/TestTypeParameter.java.i
 data/test/tools/javac/annotations/6365854/test1.out.i
-data/test/tools/javac/generics/rawOverride/Fail1.java.i
+data/src/share/classes/javax/lang/model/util/ElementScanner8.java.i
 data/test/tools/javac/6902720/E2.java.i
-data/test/com/sun/javadoc/testCmndLineClass/pkg2/C3.java.i
+data/test/tools/javac/Enum1.java.i
 data/test/tools/javac/generics/diamond/neg/Neg08.out.i
 data/test/tools/javac/diags/examples/MightBeAssignedInLoop.java.i
 data/test/tools/javac/Diagnostics/6722234/T6722234c.out.i
 data/make/test/lib/classes.sh.i
-data/test/tools/javac/OverrideChecks/6400189/T6400189d.java.i
 data/test/com/sun/javadoc/testIndex/TestIndex.java.i
-data/test/tools/javac/generics/7022054/T7022054neg1.java.i
+data/test/tools/apt/Discovery/PhantomUpdate.java.i
 data/test/tools/javac/generics/MissingBridge.java.i
-data/test/tools/javac/6394683/T6394683.java.i
+data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes9.java.i
 data/test/tools/javac/Diagnostics/6722234/T6722234b_1.out.i
-data/test/tools/javap/classfile/T6887895.java.i
-data/test/tools/javac/SerialWarn.java.i
-data/test/tools/javac/processing/environment/HelloWorld.java.i
-data/test/tools/javac/diags/examples/MulticatchTypesMustBeDisjoint.java.i
-data/test/tools/javac/DefiniteAssignment/UncaughtException.java.i
-data/test/tools/javac/processing/6994946/SyntaxErrorTest.out.i
+data/src/share/classes/com/sun/tools/javac/util/ByteBuffer.java.i
+data/test/tools/javac/6835430/A.java.i
+data/test/tools/javac/CyclicInheritance2.java.i
+data/test/tools/javac/processing/6348193/T6348193.java.i
+data/src/share/classes/com/sun/tools/classfile/DefaultAttribute.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java.i
 data/src/share/opensource/javac/README-template.html.i
 data/test/tools/javac/annotations/default/B.java.i
+data/test/tools/javac/T6554097.out.i
+data/test/tools/javac/resolve/tests/PrimitiveOverReferenceOverInferred.java.i
 data/src/share/classes/com/sun/tools/javadoc/JavadocTodo.java.i
 data/test/tools/javac/staticImport/6695838/a/Foo.java.i
-data/test/tools/javac/Paths/6638501/HelloLib/test/HelloImpl.java.i
+data/test/tools/javadoc/annotations/annotateParams/expected.out.i
 data/test/tools/javac/EnclosingAccessCheck.java.i
 data/test/tools/javac/generics/rare/6665356/T6665356.out.i
 data/test/tools/javac/diags/examples/ResourceMayNotBeAssigned.java.i
 data/test/tools/javac/diags/examples/KindnameMethod.java.i
 data/test/tools/javac/OverrideChecks/T4721069.java.i
-data/test/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java.i
-data/test/tools/javac/diags/examples/ProcIncompatibleSourceVersion/ProcIncompatibleSourceVersion.java.i
-data/test/tools/javac/protectedInner/pkg1/Base.java.i
-data/test/tools/javac/T6227617.java.i
-data/test/tools/javac/generics/T4711570.java.i
+data/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded2/testfile.txt.i
+data/test/tools/javac/miranda/T4528315.java.i
+data/test/com/sun/javadoc/testNoPackagesFile/C.java.i
+data/test/tools/javac/boxing/NoBoxingInt.java.i
 data/test/tools/javac/LocalClasses_2.out.i
 data/test/tools/javac/generics/typevars/5060485/Method.java.i
 data/test/tools/javac/generics/InterfaceCast1.java.i
+data/test/tools/javac/enum/T5081785c.java.i
 data/test/tools/javac/diags/examples/SunProprietary.java.i
 data/test/tools/javac/diags/examples/LabelInUse.java.i
-data/test/tools/javac/generics/wildcards/AssignmentSameType6.java.i
+data/test/tools/javac/api/lib/ToolTester.java.i
+data/test/tools/javac/api/T6412669.java.i
 data/test/tools/javac/generics/typevars/6804733/T6804733.out.i
-data/test/tools/javac/generics/wildcards/7034495/T7034495.java.i
+data/src/share/classes/sun/tools/javap/RuntimeConstants.java.i
 data/test/tools/javac/typeAnnotations/failures/StaticMethods.out.i
 data/test/tools/javac/generics/bridge1/A.java.i
 data/src/share/classes/javax/lang/model/type/MirroredTypesException.java.i
-data/test/tools/javac/T6435291/T6435291.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java.i
 data/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java.i
 data/test/tools/javac/OverridePosition.out.i
+data/test/tools/javac/unicode/SupplementaryJavaID3.java.i
+data/test/com/sun/javadoc/VersionNumber/p1/C.java.i
 data/test/tools/javac/T6351767.java.i
-data/test/tools/javac/generics/inference/T6835428.java.i
-data/test/tools/javac/diags/examples/DiamondAndExplicitParams.java.i
+data/test/tools/javac/api/6440333/T6440333.java.i
+data/test/tools/javac/tree/TreeScannerTest.java.i
 data/test/tools/javac/T6266772.java.i
 data/test/tools/javac/mandatoryWarnings/deprecated/B.java.i
 data/test/tools/javac/generics/6723444/T6723444.out.i
-data/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java.i
+data/test/tools/javac/InstanceInitException_1.java.i
 data/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java.i
-data/src/share/classes/com/sun/mirror/declaration/Declaration.java.i
+data/test/tools/javac/Diagnostics/6799605/T6799605.out.i
 data/src/share/classes/com/sun/tools/javac/jvm/Code.java.i
-data/test/tools/javac/processing/6413690/TestMe.java.i
-data/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound1.java.i
+data/test/com/sun/javadoc/testExternalOverridenMethod/pkg/XReader.java.i
 data/test/tools/javac/newlines/Newlines.sh.i
-data/test/tools/javac/depOverrides/annotation/Test1B2.out.i
-data/test/tools/javac/multicatch/Pos08.java.i
-data/test/tools/javac/generics/inference/7086586/T7086586.out.i
+data/test/tools/javac/NameClash/One.java.i
+data/test/tools/javac/annotations/neg/Package.java.i
 data/test/tools/javac/generics/T4711572.java.i
-data/test/tools/javac/processing/6994946/SemanticErrorTest.java.i
+data/src/share/classes/com/sun/tools/javac/code/Flags.java.i
 data/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties.i
-data/test/tools/javac/generics/compat/OverrideBridge2.java.i
+data/test/tools/javac/TryWithResources/UnusedResourcesTest.java.i
 data/test/tools/javac/generics/6729401/T6729401.java.i
-data/test/tools/javac/generics/diamond/pos/Pos01.java.i
-data/src/share/classes/com/sun/tools/javap/resources/javap.properties.i
-data/test/tools/javac/T6794959.java.i
-data/test/tools/javac/6979683/TestCast6979683_BAD37.java.i
-data/test/tools/javac/ClassCycle/ClassCycle2a.java.i
+data/test/tools/javac/generics/T4661029.java.i
+data/test/tools/javac/generics/T6557954.java.i
+data/make/build.xml.i
+data/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java.i
 data/test/tools/javac/T6625520.java.i
-data/test/tools/javac/jvm/6397652/T6397652.java.i
+data/test/tools/javap/T4876942.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java.i
 data/test/com/sun/javadoc/testWarnBadParamNames/C.java.i
-data/test/tools/javac/generics/BridgeClash.java.i
+data/test/tools/javac/multicatch/model/UnionTypeInfo.java.i
 data/src/share/classes/com/sun/tools/javac/util/ClientCodeException.java.i
 data/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java.i
-data/test/tools/javac/diags/examples/UncheckedGenericArrayCreation.java.i
+data/test/tools/javac/6464451/DeepNestedFinally.java.i
 data/test/tools/javac/6558548/T6558548_latest.out.i
 data/test/tools/javac/5005368.java.i
 data/test/com/sun/javadoc/testCmndLineClass/C5.java.i
@@ -3691,102 +3722,99 @@ data/test/tools/javac/unicode/SupplementaryJavaID2.java.i
 data/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C1.java.i
 data/test/tools/javac/generics/inference/4941882/T4941882.java.i
 data/test/tools/javac/ThrowsIntersection_4.java.i
-data/test/tools/javadoc/FlagsTooEarly.java.i
+data/test/tools/javac/types/PrimitiveConversionTest.java.i
+data/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java.i
 data/test/tools/javac/typeAnnotations/6967002/T6967002.out.i
-data/src/share/classes/com/sun/tools/apt/mirror/type/ClassTypeImpl.java.i
-data/test/tools/javadoc/annotations/annotatePackage/Main.java.i
-data/test/tools/javac/Paths/6638501/test1/SayHelloToo.java.i
+data/test/tools/javac/typeAnnotations/newlocations/Throws.java.i
+data/test/tools/javac/processing/model/element/TestResourceVariable.java.i
+data/src/share/opensource/javac/doc/javac_lifecycle/contents.html.i
 data/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.out.i
 data/test/tools/javac/diags/examples/EnclClassRequired.java.i
-data/test/tools/javac/annotations/default/Derr.java.i
 data/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C2.java.i
-data/test/tools/javac/generics/6677785/T6677785.out.i
+data/test/tools/javac/generics/inference/7086601/T7086601a.out.i
 data/test/tools/javac/warnings/Serial.java.i
-data/test/tools/javac/SuperclassConstructorException.java.i
+data/test/tools/javac/T6972327.java.i
 data/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.out.i
-data/test/tools/javadoc/annotations/annotateParams/pkg1/C.java.i
+data/src/share/classes/com/sun/javadoc/ExecutableMemberDoc.java.i
 data/test/tools/javac/typeAnnotations/TypeUseTarget.java.i
-data/src/share/classes/com/sun/tools/javac/parser/Token.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java.i
 data/test/tools/javac/generics/diamond/neg/Neg03.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties.i
 data/test/tools/javac/OverrideChecks/InconsistentReturn.java.i
-data/test/tools/javac/api/evalexpr/CompileFromString.java.i
+data/test/tools/javac/annotations/6365854/T6365854.java.i
 data/test/tools/javac/diags/examples/CantResolveLocation.java.i
-data/test/tools/javac/typeAnnotations/newlocations/BasicTest.out.i
+data/test/tools/javac/ConstantValues/test_ff2.java.i
 data/test/tools/javac/literals/BadBinaryLiterals.6.out.i
-data/test/tools/javac/generics/Casting3.java.i
+data/test/tools/javadoc/sourceOption/SourceOption.java.i
+data/test/tools/javac/DefiniteAssignment/DUSwitch.java.i
+data/test/tools/javac/enum/AbstractEmptyEnum.java.i
 data/test/tools/javah/SubClassConsts.java.i
 data/test/tools/javac/SuperMethodResolve.java.i
-data/test/tools/javah/6572945/gold/jni.file.3.i
+data/test/tools/javac/depOverrides/annotation/Q.java.i
 data/test/tools/javac/OverrideChecks/InterfaceOverride.java.i
 data/test/tools/javac/generics/inference/6995200/T6995200.java.i
 data/test/tools/javac/generics/inference/6369605/T6369605a.java.i
-data/test/tools/javac/annotations/pos/Parameter.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/type/InterfaceTypeImpl.java.i
 data/test/tools/javac/tree/TestAnnotatedAnonClass.java.i
 data/test/com/sun/javadoc/testClassCrossReferences/package-list.i
-data/src/share/classes/com/sun/tools/classfile/Method.java.i
+data/test/tools/javac/T5048776.java.i
 data/test/tools/javac/diags/examples/EnumNoSubclassing.java.i
 data/make/netbeans/common/standard-context-menu-items.ent.i
 data/test/tools/javac/varargs/6313164/p1/A.java.i
 data/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.java.i
-data/test/tools/javac/generics/6413682/TestPos.java.i
-data/test/tools/javac/T5003235/T5003235b.out.i
+data/test/tools/javac/cast/7005671/T7005671.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java.i
 data/test/tools/apt/Basics/foo/bar/Quux.java.i
 data/test/tools/javac/processing/6994946/SemanticErrorTest.2.out.i
 data/test/tools/javac/enum/Enum1.java.i
 data/test/tools/javac/generics/rare/Rare10.java.i
-data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestError.java.i
+data/src/share/classes/com/sun/tools/javac/parser/Token.java.i
 data/test/tools/javac/processing/messager/MessagerBasics.java.i
 data/test/tools/javac/diags/examples/AbstractCantBeInstantiated.java.i
-data/test/tools/javac/generics/rawSeparate/RetroLexer.java.i
-data/test/com/sun/javadoc/testSubTitle/pkg/C.java.i
+data/src/share/classes/com/sun/tools/javac/util/Messages.java.i
+data/src/share/classes/javax/lang/model/type/package-info.java.i
 data/test/com/sun/javadoc/testTagInheritence/pkg/TestSuperSuperInterface.java.i
-data/test/tools/javac/api/T6395981.java.i
-data/test/tools/javac/generics/6476118/T6476118c.java.i
+data/test/tools/javac/T6881645.java.i
+data/test/com/sun/javadoc/testLegacyTaglet/ToDoTaglet.java.i
 data/test/tools/javah/T5070898.java.i
 data/test/tools/javac/missingSuperRecovery/MissingSuperRecovery.java.i
 data/test/tools/javac/T6245591.java.i
-data/test/tools/javac/generics/typevars/6182630/T6182630.java.i
+data/test/tools/javac/generics/6677785/T6677785.java.i
 data/src/share/classes/javax/tools/DiagnosticCollector.java.i
 data/test/tools/apt/Basics/GenClass.java.i
 data/test/tools/javac/diags/examples/MalformedSupported/processors/AnnoProc.java.i
 data/test/tools/javadoc/annotations/missing/somepackage/MissingAnnotationClass.java.i
 data/test/com/sun/javadoc/constantValues/A.java.i
-data/test/tools/javac/generics/typevars/5060485/Compatibility.out.i
+data/test/com/sun/javadoc/testUseOption/pkg1/C2.java.i
 data/src/share/classes/com/sun/source/tree/ModifiersTree.java.i
 data/test/tools/javac/AnonStaticMember_1.java.i
 data/test/com/sun/javadoc/testNotifications/TestNotifications.java.i
 data/test/tools/javac/InnerNamedConstant_2.sh.i
-data/test/tools/javac/processing/model/element/TestTypeParameter.java.i
-data/make/netbeans/apt/build.xml.i
-data/test/tools/javac/processing/6348193/T6348193.java.i
+data/test/tools/javac/api/T6400207.java.i
+data/test/tools/javac/diags/examples/MulticatchTypesMustBeDisjoint.java.i
 data/test/tools/javac/HiddenAbstractMethod/Test.i
-data/src/share/classes/javax/lang/model/type/UnionType.java.i
+data/test/com/sun/javadoc/testSuperclassInSerialForm/pkg/SubClass.java.i
 data/test/tools/javac/generics/inference/6638712/T6638712a.java.i
+data/test/tools/javac/diags/examples/VerboseResolveMulti.java.i
 data/src/share/classes/com/sun/tools/javadoc/Main.java.i
 data/test/tools/javac/InnerClassesAttribute/Test.java.i
-data/test/tools/javac/Closure5.java.i
+data/test/tools/javac/SuperMeth.java.i
 data/test/tools/javadoc/annotations/badVals/Main.java.i
-data/test/tools/javac/generics/typevars/6804733/T6804733.java.i
-data/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java.i
+data/test/tools/javac/capture/Capture5.java.i
 data/test/tools/javac/generics/inference/6650759/T6650759g.java.i
-data/test/tools/javac/api/T6358786.java.i
-data/test/tools/javac/T6972327.java.i
+data/test/com/sun/javadoc/testThrowsTag/pkg/T5.java.i
+data/test/tools/javac/SuperclassConstructorException.java.i
 data/test/tools/javac/generics/typevars/T6880344.java.i
 data/test/tools/javac/generics/7020657/T7020657pos.java.i
-data/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java.i
+data/test/com/sun/javadoc/testSubTitle/pkg/C.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java.i
 data/test/tools/javac/diags/examples/ErrorReadingFile.java.i
 data/test/tools/javac/QualifiedNewScope.java.i
-data/src/share/classes/com/sun/tools/javac/comp/Annotate.java.i
 data/test/tools/javac/enum/EnumProtectedConstructor.java.i
 data/test/tools/javap/classfile/deps/T6907575.java.i
-data/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccess/NotDefAccessClassIntfCantAccess.java.i
-data/test/tools/javac/diags/examples/ProcSuspiciousClassName/processors/AnnoProc.java.i
+data/test/tools/javac/Paths/6638501/test1/SayHelloToo.java.i
 data/test/tools/javac/policy/simple.ACD.out.i
-data/test/tools/javac/CyclicScoping/CyclicScoping_1.java.i
-data/test/tools/javac/TryWithResources/BadTwr.out.i
+data/test/tools/javac/generics/6372782/PlanarVectorVariable.java.i
+data/test/tools/javac/typeAnnotations/failures/Scopes.java.i
 data/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out.i
 data/test/tools/javac/meth/TestCP.java.i
 data/test/tools/javac/api/6452876/T6452876.java.i
@@ -3804,28 +3832,32 @@ data/test/tools/javac/scope/6225935/T6214959.java.i
 data/test/tools/javac/T6558476.java.i
 data/test/tools/javac/annotations/neg/ArrayLit.java.i
 data/test/tools/javac/generics/7034019/T7034019a.java.i
-data/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out.i
-data/test/tools/javac/processing/model/6341534/dir/package-info.java.i
+data/test/tools/javac/generics/6956758/T6956758pos.java.i
 data/test/tools/javac/DefiniteAssignment/ConstantInfiniteWhile.java.i
 data/test/tools/javac/generics/classreader/HArrayMethod.java.i
+data/test/tools/javac/diags/examples/DotClassExpected.java.i
+data/src/share/classes/javax/lang/model/type/UnionType.java.i
 data/test/tools/javac/enum/ExplicitlyFinalEnum2.java.i
 data/test/tools/javac/InnerMemberRegression.java.i
 data/test/tools/javac/depDocComment/SuppressDeprecation.out.i
 data/test/tools/javac/diags/examples/AnonClassImplInterfaceNoArgs.java.i
-data/test/tools/javac/multicatch/Neg02.out.i
-data/test/tools/javac/UncaughtOverflow.java.i
+data/test/tools/javac/T6394563.warn.out.i
+data/src/share/classes/com/sun/tools/javap/BasicWriter.java.i
 data/test/tools/javac/depOverrides/annotation/Test3.out.i
 data/test/tools/javac/T6358168.java.i
-data/test/com/sun/javadoc/testModifier/ModifierAbstract.java.i
-data/test/tools/javac/typeAnnotations/newlocations/ClassLiterals.java.i
+data/test/tools/javac/diags/examples/AnnotationsNotSupported.java.i
+data/test/tools/javac/failover/FailOver08.java.i
+data/test/tools/javac/Paths/6638501/test/SayHello.java.i
 data/src/share/classes/com/sun/source/tree/TypeParameterTree.java.i
 data/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out.i
 data/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java.i
-data/test/tools/javap/classfile/deps/T6907575.out.i
-data/src/share/classes/com/sun/source/tree/NewArrayTree.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/declaration/MemberDeclarationImpl.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationMaker.java.i
 data/test/com/sun/javadoc/testTopOption/TestTopOption.java.i
 data/test/tools/javac/tree/T6993305.java.i
 data/test/tools/javac/Paths/6638501/WsCompileExample.java.i
+data/test/tools/javadoc/generics/throwsGeneric/expected.out.i
+data/test/com/sun/javadoc/testHiddenMembers/pkg/BaseClass.java.i
 data/src/share/classes/javax/tools/Diagnostic.java.i
 data/test/com/sun/javadoc/testLinkOption/pkg2/C2.java.i
 data/test/tools/javadoc/dupOk/DupOk.java.i
@@ -3834,12 +3866,13 @@ data/test/tools/apt/Compile/StaticApf.java.i
 data/test/tools/javac/generics/wildcards/6886247/T6886247_1.java.i
 data/test/tools/javac/DefiniteAssignment/DefAssignAfterTry2.java.i
 data/test/tools/javac/diags/examples/ClassPublicInFile.java.i
-data/src/share/classes/javax/tools/JavaFileObject.java.i
+data/src/share/classes/com/sun/tools/classfile/CompilationID_attribute.java.i
 data/test/tools/javac/varargs/6993978/T6993978neg.java.i
 data/test/tools/javac/OverrideChecks/T4720356a.java.i
+data/test/tools/javac/varargs/7097436/T7097436.out.i
 data/test/tools/javac/TryWithResources/ArmLint.java.i
 data/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java.i
-data/test/tools/javac/generics/diamond/pos/Pos05.java.i
+data/test/tools/javac/diags/examples/WhereCaptured1.java.i
 data/test/tools/javac/6330997/T1.java.i
 data/test/tools/javac/importChecks/ImportCanonical1.java.i
 data/test/tools/javac/processing/warnings/gold_sv_warn_2_3.out.i
@@ -3847,28 +3880,30 @@ data/test/tools/javac/diags/examples/ImportRequiresCanonical/p/ExtendsBase.java.
 data/test/tools/javac/generics/6531090/T6531090b.java.i
 data/test/com/sun/javadoc/testLinkTaglet/checkPkg/B.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java.i
+data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestException.java.i
 data/test/tools/javac/conditional/6500343/T6500343a.java.i
 data/test/tools/javac/nio/compileTest/CompileTest.java.i
 data/test/tools/javac/generics/wildcards/neg/CastWarn7.java.i
-data/src/share/classes/com/sun/tools/javac/util/Log.java.i
-data/test/tools/javac/policy/test2/Test.java.i
+data/test/com/sun/javadoc/testUseOption/TestUseOption.java.i
+data/test/tools/javac/diags/examples/GenericThrowable.java.i
 data/test/tools/javac/generics/6182950/T6182950a.java.i
+data/test/tools/javac/generics/6495506/A.java.i
 data/test/tools/javac/abstract/U1.java.i
 data/test/tools/javac/T5003235/T5003235a.java.i
-data/test/tools/javac/generics/typevars/6199146/T6199146.java.i
+data/test/tools/javac/CyclicInheritance.out.i
 data/test/tools/javac/multicatch/Neg07.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/type/TypeMaker.java.i
+data/test/tools/apt/Compile/WrappedStaticApf.java.i
 data/test/tools/javac/util/T6597678.java.i
-data/test/tools/javac/EmptyBreak.java.i
+data/test/tools/javac/InterfaceOverrideObject.java.i
 data/test/tools/javac/varargs/warning/Warn1.java.i
-data/test/tools/javac/generics/classreader/HMethod.java.i
-data/test/tools/javac/NestedInnerClassNames.out.i
+data/src/share/classes/javax/tools/StandardJavaFileManager.java.i
+data/test/tools/javac/diags/examples/UncheckedFilenameAdditional.java.i
 data/test/tools/javac/diags/examples/NameClashSameErasureNoHide.java.i
 data/test/tools/javac/api/6422327/T6422327.other.i
 data/test/tools/javac/T6554097.java.i
 data/test/tools/javac/file/zip/T6865530.java.i
-data/src/share/classes/javax/lang/model/util/package-info.java.i
+data/src/share/classes/com/sun/source/tree/RequiresServiceDirectiveTree.java.i
+data/src/share/classes/com/sun/source/tree/RequiresFlag.java.i
 data/test/tools/javac/implicitThis/WhichImplicitThis3.java.i
 data/test/tools/javac/T6407257.java.i
 data/test/tools/javac/warnings/FallThrough.lintFallThrough.out.i
@@ -3879,28 +3914,28 @@ data/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnno
 data/make/test/lib/classes.gold.txt.i
 data/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo.java.i
 data/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java.i
-data/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out.i
+data/test/tools/javac/annotations/neg/Z3.java.i
 data/test/tools/javac/tree/JavacTreeScannerTest.java.i
 data/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java.i
 data/src/share/classes/com/sun/mirror/declaration/AnnotationTypeDeclaration.java.i
 data/test/tools/javac/diags/examples/IllegalInitializer.java.i
 data/test/tools/javac/generics/diamond/T6939780.out.i
-data/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out.i
+data/test/tools/javac/T7042623.java.i
 data/test/tools/javac/VersionOpt.java.i
 data/test/com/sun/javadoc/DocRootSlash/p1/package.html.i
 data/test/tools/javac/diags/examples/UndefinedLabel.java.i
+data/test/tools/javac/generics/inference/5070671/T5070671.java.i
 data/src/share/classes/com/sun/source/tree/AnnotationTree.java.i
 data/test/tools/javac/generics/6531090/T6531090a.java.i
 data/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java.i
-data/test/tools/javac/diags/examples/HasBeenDeprecated.java.i
+data/test/tools/javac/T6366196.java.i
 data/test/tools/javac/cast/4916620/T4916620.java.i
 data/src/share/classes/sun/tools/javap/LocVarData.java.i
-data/test/tools/javac/diags/examples/DuplicateClass.java.i
 data/test/req.flg.i
 data/test/tools/javac/generics/inference/6718364/T6718364.out.i
-data/test/tools/javac/generics/6910550/T6910550e.out.i
+data/test/tools/javac/6996626/Main.java.i
 data/test/tools/javac/diags/examples/ProcIllegalFileName/processors/AnnoProc.java.i
-data/test/tools/javac/diags/examples/MulticatchCantBeAssigned.java.i
+data/test/tools/javac/generics/compat/OverrideBridge3.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java.i
@@ -3911,47 +3946,48 @@ data/test/tools/javac/foreach/IntersectIterator.java.i
 data/test/tools/javac/depOverrides/doccomment/Test2Q.out.i
 data/src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java.i
 data/test/tools/javac/modules/ModuleAnnotsTest01.java.i
-data/test/tools/javac/T6458823/MyProcessor.java.i
-data/test/tools/javac/generics/6372782/PlainForm.java.i
+data/src/share/classes/com/sun/source/util/TaskListener.java.i
+data/test/com/sun/javadoc/testBadPackageFileInJar/badPackageFileInJar.jar.i
 data/test/com/sun/javadoc/testUnnamedPackage/BadSource.java.i
 data/test/com/sun/javadoc/testUnnamedPackage/C.java.i
-data/src/share/classes/javax/lang/model/type/TypeVariable.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java.i
 data/test/tools/javac/limits/LongName.java.i
 data/test/tools/javac/diags/examples/ErrProcMessager/processors/AnnoProc.java.i
-data/test/tools/javac/synthesize/Double.java.i
+data/test/tools/javac/NestedInnerClassNames.sh.i
 data/test/tools/javap/6937244/T6937244A.java.i
-data/test/tools/javac/diags/examples/IntfMethodCantHaveBody.java.i
+data/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out.i
 data/test/tools/javac/warnings/DivZero.lint.out.i
 data/src/share/classes/com/sun/tools/javac/util/PropagatedException.java.i
 data/src/share/classes/com/sun/tools/javah/resources/win32_x86.properties.i
 data/src/share/classes/com/sun/tools/javac/util/Constants.java.i
-data/test/tools/javac/literals/T6891079.out.i
 data/src/share/classes/com/sun/tools/apt/mirror/apt/RoundStateImpl.java.i
-data/test/tools/javac/6979683/TestCast6979683_BAD38.java.i
+data/test/com/sun/javadoc/testModifier/ModifierAbstract.java.i
 data/test/tools/javac/T6341023.java.i
 data/src/share/classes/com/sun/mirror/util/SimpleDeclarationVisitor.java.i
 data/test/tools/javah/T6994608.java.i
 data/test/tools/javac/QualifiedAccess/pack1/P2.java.i
 data/test/tools/javac/T6238612.java.i
 data/test/tools/javac/4917091/Test256a.out.i
-data/test/tools/javadoc/InlineTagsWithBraces.java.i
+data/test/tools/javac/generics/ArrayClone.java.i
 data/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java.i
 data/test/tools/javac/scope/6225935/a/Named.java.i
 data/test/tools/javac/Paths/Class-Path.sh.i
+data/test/tools/javac/resolve/tests/ReferenceOverload.java.i
 data/test/tools/javac/processing/errors/TestSuppression.java.i
 data/test/com/sun/javadoc/testMemberInheritence/inheritDist/B.java.i
-data/src/share/opensource/javac/doc/javac_lifecycle/ToDo.html.i
+data/test/tools/javac/diags/examples/UnsupportedExoticID.java.i
 data/test/tools/javac/diags/examples/ProcFileCreateLastRound/ProcFileCreateLastRound.java.i
-data/test/tools/javac/generics/bridge1/C.java.i
+data/test/tools/javac/ExceptionalFinally2.java.i
+data/test/tools/javac/literals/BadUnderscoreLiterals.6.out.i
 data/test/tools/javac/generics/6372782/Vector.java.i
 data/test/tools/javac/options/T7022337.java.i
-data/test/tools/javac/varargs/7043922/T7043922.java.i
-data/test/tools/javac/diags/examples/UnmatchedProcessorOptions/processors/AnnoProc.java.i
-data/test/tools/apt/Scanners/MemberOrderApf.java.i
+data/test/tools/javac/T6900149.java.i
+data/test/tools/javac/generics/typevars/6804733/T6804733.java.i
+data/test/tools/javac/implicitThis/NewBeforeOuterConstructed.java.i
 data/src/share/classes/com/sun/tools/doclets/Taglet.java.i
 data/test/tools/javap/T6622232.java.i
-data/test/tools/javac/diags/examples/AnnotationsNotSupported.java.i
-data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes3.java.i
+data/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java.i
+data/test/tools/apt/Basics/StaticMethodAnnotations.java.i
 data/test/tools/javac/generics/inference/6650759/T6650759c.java.i
 data/test/tools/javac/processing/warnings/HelloWorld.java.i
 data/test/tools/javac/diags/examples/UncheckedImplement.java.i
@@ -3959,183 +3995,191 @@ data/test/tools/javac/diags/examples/NoArgs.java.i
 data/test/tools/javac/synthesize/Float.java.i
 data/src/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java.i
 data/test/com/sun/javadoc/testLinkTaglet/checkPkg/A.java.i
+data/test/tools/javac/typeAnnotations/newlocations/Parameters.java.i
 data/test/tools/javac/6734819/T6734819c.java.i
 data/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java.i
 data/test/tools/javac/AnonInnerException_1.java.i
-data/test/com/sun/javadoc/testHiddenMembers/pkg/BaseClass.java.i
+data/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedFilename1.java.i
 data/src/share/classes/javax/lang/model/element/VariableElement.java.i
 data/test/tools/javac/generics/wildcards/neg/CastFail1.java.i
-data/test/tools/javap/T6715753.java.i
+data/test/tools/javac/Diagnostics/6722234/T6722234b.java.i
 data/test/tools/javac/scope/HashCollisionTest.java.i
 data/test/tools/javac/6717241/T6717241b.out.i
 data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java.i
-data/test/tools/javac/multicatch/Neg02.java.i
+data/test/tools/javac/Diagnostics/6860795/T6860795.out.i
 data/src/share/classes/com/sun/mirror/apt/AnnotationProcessorListener.java.i
 data/test/tools/javac/multicatch/Neg05.out.i
 data/test/tools/javac/synthesize/Long.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java.i
-data/test/tools/javac/TryWithResources/PlainTry.out.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java.i
-data/test/tools/javac/warnings/Deprecation.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_10.java.i
 data/test/tools/javac/cast/6270087/T6270087neg.java.i
 data/test/tools/javac/generics/diamond/neg/Neg12.out.i
 data/test/tools/javac/scope/6225935/a/Private.java.i
 data/src/share/classes/com/sun/tools/javac/util/Position.java.i
+data/test/tools/javac/6857948/T6857948.java.i
 data/test/tools/javac/diags/examples/UnsupportedUnderscoreLiteral.java.i
-data/src/share/classes/com/sun/tools/javac/main/CommandLine.java.i
-data/test/tools/javac/T6224167.out.i
+data/test/tools/javac/diags/examples/NameClashSameErasureNoOverride.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletOutput.java.i
 data/test/tools/javac/processing/warnings/gold_sv_none.out.i
 data/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.out.i
 data/test/tools/javac/Verify.java.i
-data/test/tools/javac/positions/T6402077.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java.i
 data/test/tools/javac/ProtectedInnerClass/p2/ProtectedInnerClass2.java.i
 data/src/share/classes/javax/lang/model/type/UnknownTypeException.java.i
 data/test/com/sun/javadoc/testCmndLineClass/pkg1/package.html.i
 data/test/tools/javac/generics/6245699/T6245699b.java.i
-data/test/tools/javac/diags/examples/FloatNumberTooSmall.java.i
 data/test/tools/javac/generics/typevars/6680106/T6680106.java.i
 data/test/tools/javac/diags/examples/DiamondNonGeneric.java.i
-data/test/tools/javac/depDocComment/SuppressDeprecation.java.i
-data/test/tools/javac/diags/examples/AnonymousClass.java.i
+data/test/tools/javah/4942232/Test.java.i
+data/test/tools/javac/diags/examples/UnclosedBytecodeIdent.java.i
 data/test/com/sun/javadoc/testTagInheritence/pkg/TestTagInheritence.java.i
-data/test/tools/javac/types/CastTest.java.i
+data/test/tools/javac/diags/examples/TryWithoutCatchOrFinallyOrResource.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties.i
 data/test/tools/javac/processing/model/util/filter/Foo1.java.i
-data/test/tools/javac/DefiniteAssignment/T4721062a.java.i
-data/test/tools/javac/StringsInSwitch/RSCL1.out.i
+data/test/tools/javac/generics/wildcards/T5097548b.java.i
+data/src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java.i
 data/test/tools/javac/accessVirtualInner/b/B.java.i
 data/test/tools/javap/stackmap/T6271292.sh.i
 data/test/tools/javac/4846262/Test.sh.i
-data/test/tools/javac/cast/6548436/T6548436d.java.i
 data/test/tools/javac/diags/examples/IntfAnnotationCantHaveTypeParams.java.i
-data/test/tools/javac/diags/examples/VarargsClash.java.i
-data/test/tools/javap/typeAnnotations/Presence.java.i
+data/test/tools/javadoc/generics/genericClass/Main.java.i
+data/test/tools/javac/diags/examples/VarargsAndOldArraySyntax.java.i
 data/test/tools/javac/generics/diamond/7030150/Neg01.java.i
-data/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C3.java.i
 data/test/tools/javac/types/CastObjectToPrimitiveTest.out.i
-data/test/tools/javac/generics/inference/6638712/T6638712b.out.i
-data/test/tools/javac/generics/inference/6943278/T6943278.java.i
-data/test/tools/javac/failover/FailOver08.java.i
+data/src/share/classes/com/sun/mirror/type/AnnotationType.java.i
+data/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java.i
+data/test/tools/javac/diags/examples/ExceptAlreadyCaught.java.i
+data/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java.i
 data/test/tools/javac/varargs/6993978/T6993978neg.out.i
-data/test/tools/javac/processing/model/type/TestTypeKind.java.i
+data/test/tools/javac/generics/diamond/7057297/T7057297.out.i
 data/test/tools/javadoc/nestedClass/NestedClassB.java.i
 data/test/tools/javac/typeAnnotations/failures/StaticFields.java.i
 data/test/tools/javac/processing/6634138/T6634138.java.i
 data/test/tools/javac/T4093617/T4093617.out.i
 data/test/tools/javac/enum/6384542/T6384542.java.i
 data/test/tools/javac/diags/examples/EnumsMustBeStatic.java.i
-data/test/tools/apt/Compile/WarnAPF.java.i
+data/test/tools/javac/treepostests/TreePosTest.java.i
 data/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java.i
 data/test/tools/javac/generics/6372782/AbstractVector.java.i
-data/test/tools/javadoc/enum/docComments/Main.java.i
-data/test/tools/apt/mirror/declaration/ClassDecl.java.i
-data/test/tools/javac/api/6733837/T6733837.java.i
+data/test/tools/javac/scope/6225935/Bar.java.i
+data/src/share/classes/com/sun/source/tree/NewArrayTree.java.i
+data/test/tools/javac/api/6437999/Utf8.java.i
 data/make/Makefile-classic.i
 data/test/tools/apt/Misc/Misc.java.i
 data/src/share/classes/com/sun/tools/javap/StackMapWriter.java.i
 data/test/tools/javac/cast/6586091/T6586091.java.i
-data/test/tools/javac/processing/6430209/test1.java.i
+data/test/tools/javac/generics/wildcards/neg/CastFail9.java.i
 data/test/tools/javac/ForwardReference/T6676362a.java.i
-data/test/tools/javac/processing/6365040/T6365040.java.i
-data/test/tools/javac/OverrideChecks/InterfaceImplements.java.i
+data/test/tools/javac/BadOptimization/DeadCode1.java.i
+data/src/share/classes/com/sun/tools/javap/ConstantWriter.java.i
 data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_8.java.i
 data/test/tools/javac/diags/examples/TrustMeOnReifiableVarargsParam.java.i
 data/test/tools/javac/SwitchScope.java.i
-data/test/tools/javac/cast/6302956/T6302956.java.i
+data/test/tools/javac/generics/diamond/neg/Neg02.java.i
 data/test/tools/javac/T5090006/T5090006.java.i
 data/test/tools/javac/enum/forwardRef/TestEnum1.java.i
 data/test/tools/javac/PrivateUplevelConstant.java.i
 data/test/tools/javac/parser/StringFoldingTest.java.i
 data/test/tools/javac/LocalClasses_1.java.i
 data/test/tools/javac/diags/examples/IncompatibleUpperBounds.java.i
-data/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.java.i
-data/test/tools/javac/annotations/pos/Z4.java.i
-data/test/tools/javac/expression/NullAppend2.java.i
+data/test/tools/javac/FinalInitializer_2.java.i
+data/src/share/classes/com/sun/source/tree/WildcardTree.java.i
+data/src/share/classes/sun/tools/javap/JavapPrinter.java.i
 data/test/tools/javadoc/generics/throwsGeneric/pkg1/A.java.i
 data/test/tools/javac/generics/inference/4954546/T4954546.java.i
 data/test/tools/javac/TryWithResources/ExplicitFinal.java.i
-data/test/tools/javac/6668794/badSource/Test.java.i
-data/test/tools/javac/tree/AbstractTreeScannerTest.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties.i
+data/src/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java.i
+data/test/tools/javac/T6231246/T6231246.java.i
 data/test/tools/javac/ConstantValues/ConstValInlining.java.i
 data/test/tools/javap/typeAnnotations/ArrayClassLiterals.java.i
-data/test/tools/javac/protectedAccess/ProtectedMemberAccess4.out.i
-data/test/tools/javac/diags/examples/NoJavaLang.java.i
+data/test/tools/javac/diags/examples/WarnForwardRef.java.i
+data/test/tools/javac/cast/6548436/T6548436d.java.i
 data/test/tools/javac/6464451/BigFinally.java.i
 data/test/tools/javap/6937244/T6937244.java.i
-data/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out.i
+data/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java.i
+data/test/tools/javac/api/6422327/T6422327.java.i
 data/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java.i
 data/test/tools/javac/T5003235/T5003235c.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java.i
 data/test/tools/javac/annotations/neg/Z14.java.i
-data/test/tools/javac/generics/T4738171.java.i
-data/test/tools/javac/generics/diamond/7030150/Pos01.java.i
-data/test/tools/javac/DefiniteAssignment/DUSwitch.java.i
+data/test/tools/javac/assert/Position.java.i
+data/test/com/sun/javadoc/testModifier/Interface.java.i
+data/test/tools/javac/generics/GenericAnonCtor.java.i
 data/test/tools/javac/EmptySwitch.java.i
-data/test/tools/javadoc/annotations/defaults/pkg1/A.java.i
+data/test/tools/javac/NestedInnerClassNames.java.i
 data/test/tools/javac/implicitThis/WhichImplicitThis5.java.i
-data/test/tools/javac/processing/6350124/Marker.java.i
+data/test/tools/javac/CyclicInheritance.sh.i
 data/src/share/classes/com/sun/tools/javadoc/TypeMaker.java.i
 data/test/tools/javac/depDocComment/DeprecatedDocComment2.java.i
 data/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java.i
 data/test/tools/javac/generics/6985719/T6985719a.out.i
-data/test/tools/javac/api/T6430241.java.i
+data/test/tools/javac/annotations/pos/package-info.java.i
 data/test/tools/javac/DefiniteAssignment/T4717164.java.i
-data/test/tools/javac/annotations/neg/Cycle2.java.i
-data/test/tools/javac/protectedInner/mypackage/Superclass.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_16.java.i
+data/test/tools/javac/generics/wildcards/neg/CastFail2.java.i
+data/test/tools/javac/fatalErrors/NoJavaLang.out.i
 data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java.i
 data/test/tools/javac/mandatoryWarnings/deprecated/Test4.out.i
-data/test/tools/javac/generics/inference/6650759/T6650759e.java.i
+data/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java.i
 data/test/tools/javac/generics/wildcards/neg/CastWarn9.java.i
 data/test/tools/apt/Compile/goldenFactory.txt.i
 data/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java.i
+data/test/tools/javac/resolve/tests/ReferenceOverVarargs.java.i
 data/test/tools/javac/failover/FailOver10.java.i
 data/test/tools/javac/api/6468404/T6468404.java.i
-data/test/tools/javac/T6231246/T6231246.java.i
+data/src/share/classes/javax/tools/JavaFileObject.java.i
 data/test/tools/javac/OverrideChecks/ThrowsConflict.java.i
-data/src/share/opensource/javac/build.xml.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java.i
+data/test/com/sun/javadoc/testLegacyTaglet/UnderlineTaglet.java.i
+data/src/share/classes/com/sun/mirror/apt/RoundState.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/declaration/InterfaceDeclarationImpl.java.i
 data/src/share/classes/com/sun/mirror/type/ReferenceType.java.i
 data/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java.i
-data/test/tools/javac/depDocComment/DeprecatedDocComment.out.i
-data/test/tools/javac/T6654037.java.i
+data/test/tools/javac/generics/6946618/T6946618b.out.i
+data/test/tools/javac/AccessMethods/UplevelPrivateConstants.java.i
 data/test/tools/javac/tree/TreePosTest.java.i
 data/test/tools/javap/4111861/A.java.i
-data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java.i
+data/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java.i
 data/test/tools/javac/diags/examples/ConstantSVUID.java.i
 data/test/tools/apt/Basics/FreshnessApf.java.i
 data/test/tools/javadoc/generics/wildcards/pkg1/A.java.i
 data/test/tools/javac/7086595/T7086595.out.i
-data/test/com/sun/javadoc/testSubTitle/pkg/package.html.i
+data/test/tools/javac/overrridecrash/A.java.i
 data/test/tools/javac/diags/examples/ProcSuspiciousClassName/ProcSuspiciousClassName.java.i
-data/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java.i
+data/test/tools/javac/generics/diamond/pos/Pos05.java.i
 data/test/tools/javac/generics/6372782/AdditionDefined.java.i
 data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignConstantBoolean.java.i
 data/test/tools/javap/T6980017.java.i
 data/test/tools/javac/generics/wildcards/pos/UncheckedCast1.java.i
-data/test/tools/javac/enum/T5081785c.java.i
+data/test/tools/javac/generics/rare/6665356/T6665356.java.i
+data/test/com/sun/javadoc/testHiddenMembers/pkg/SubClass.java.i
 data/test/tools/javac/tree/T6923080.java.i
 data/test/tools/javac/ShiftExpressionTest.java.i
 data/test/tools/javap/TestSuperclass.java.i
 data/test/tools/javac/diags/examples/Note.java.i
 data/test/tools/javac/generics/inference/5044646/T5044646.java.i
-data/test/tools/javac/api/ToolProvider/ToolProviderTest2.java.i
-data/test/tools/javac/varargs/5088429/T5088429Neg02.java.i
+data/test/tools/javac/unicode/NonasciiDigit.java.i
+data/test/tools/javac/T6214885a.out.i
+data/test/tools/javadoc/lib/Tester.java.i
+data/test/tools/javac/processing/model/6341534/dir/package-info.java.i
 data/test/tools/javac/processing/model/6194785/T6194785.java.i
 data/test/tools/javac/annotations/pos/ClassA.java.i
 data/test/tools/javac/BadOptimization/DeadCode2.java.i
 data/test/tools/javac/api/TestTreePath.java.i
-data/test/tools/javac/TryWithResources/TwrInference.java.i
+data/test/tools/javac/generics/6711619/T6711619b.java.i
 data/test/tools/apt/mirror/type/WildcardTyp.java.i
 data/test/tools/javac/VarDeclarationWithAssignment.java.i
-data/test/tools/javac/generics/ExtendedRaw2.java.i
+data/test/tools/javac/diags/examples/SuperNotAllowedInEnum.java.i
 data/src/share/classes/sun/tools/javap/StackMapData.java.i
 data/test/tools/javadoc/generics/genericInterface/expected.out.i
 data/test/tools/javadoc/annotations/annotatePackage/expected.out.i
-data/test/tools/javac/6668794/badClass/B.java.i
-data/test/tools/javac/varargs/5088429/T5088429Neg01.java.i
-data/src/share/classes/javax/annotation/processing/RoundEnvironment.java.i
+data/test/tools/javac/6402516/CheckLocalElements.java.i
+data/test/tools/javac/diags/examples/DiamondRedundantArgs.java.i
+data/src/share/classes/com/sun/source/tree/MemberReferenceTree.java.i
+data/test/com/sun/javadoc/constantValues/TestConstantValues.java.i
 data/test/tools/javac/generics/NameOrder.java.i
 data/src/share/classes/com/sun/tools/javac/comp/ConstFold.java.i
 data/test/tools/javac/diags/examples/VarargsPlural/VarargsPlural.java.i
@@ -4143,38 +4187,39 @@ data/test/tools/javac/diags/examples/ProcUseProcOrImplicit/sourcepath/p/SomeClas
 data/test/tools/javac/generics/T6660289.java.i
 data/test/tools/javac/processing/environment/round/Foo.java.i
 data/test/tools/javac/diags/examples/EnumsNotSupported.java.i
-data/test/tools/javac/typeAnnotations/newlocations/MethodTypeArgs.java.i
-data/test/tools/javac/PackageClassAmbiguity/Bad.java.i
+data/test/tools/javac/diags/examples/DefaultAllowedInIntfAnnotationMember.java.i
 data/test/tools/javac/meth/InvokeMH_BAD68.java.i
 data/test/com/sun/javadoc/MetaTag/p2/C2.java.i
 data/test/tools/javac/diags/examples/RepeatedInterface.java.i
-data/test/com/sun/javadoc/testValueTag/pkg2/package.html.i
+data/test/tools/apt/Scanners/scanner.sh.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java.i
-data/test/tools/javac/modules/ModuleAccessTest01.java.i
+data/test/com/sun/javadoc/testHeadings/pkg1/C1.java.i
 data/test/tools/apt/Basics/p1/p2.java.i
-data/test/tools/javac/ExtDirs/ext2/pkg2.jar.i
-data/test/com/sun/javadoc/testParamTaglet/pkg/C.java.i
-data/test/tools/javac/annotations/pos/AnnotationMethods.java.i
+data/test/tools/javac/diags/examples/FloatNumberTooSmall.java.i
+data/make/test/contents.gold.txt.i
+data/make/test/TEST.ROOT.i
 data/test/tools/apt/mirror/declaration/ConstExpr.java.i
 data/test/tools/javac/6758789/T6758789a.out.i
 data/test/tools/javac/processing/messager/6362067/T6362067.out.i
-data/test/com/sun/javadoc/testValueTag/pkg1/CustomTagUsage.java.i
+data/test/tools/javac/T6413876.java.i
 data/test/tools/apt/Basics/MisMatch.java.i
-data/test/tools/javap/T4075403.java.i
+data/test/tools/javac/lint/NoWarn2.out.i
 data/test/tools/javac/generics/wildcards/neg/CastFail4.java.i
-data/test/tools/javac/generics/Varargs.java.i
+data/test/tools/javac/CyclicInheritance6/p1/C.java.i
+data/test/tools/javac/GoodCovar.java.i
 data/test/tools/javac/protectedAccess/ProtectedAccess_3.java.i
-data/test/tools/javac/ClassFileModifiers/MemberModifiers.out.i
-data/test/com/sun/javadoc/AccessFrameTitle/p2/C2.java.i
-data/test/tools/javac/generics/diamond/6996914/T6996914a.java.i
+data/make/netbeans/apt/nbproject/project.xml.i
+data/test/tools/javac/processing/werror/WErrorLast.out.i
+data/test/tools/javac/generics/T4711570.java.i
 data/test/tools/apt/Basics/NestedClassAnnotations.java.i
 data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_15.java.i
-data/test/tools/javac/6948381/npe/A.java.i
-data/test/tools/javac/typeAnnotations/newlocations/Parameters.java.i
+data/test/com/sun/javadoc/testDocRootInlineTag/pkg/C.java.i
+data/test/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java.i
 data/test/tools/javac/processing/model/util/filter/ExpectedElementCounts.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java.i
+data/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java.i
 data/test/tools/javac/generics/6192945/Neg3.out.i
-data/src/share/classes/com/sun/tools/apt/resources/apt.properties.i
+data/src/share/classes/com/sun/tools/doclets/standard/Standard.java.i
+data/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java.i
 data/test/tools/javac/generics/wildcards/neg/CastFail17.java.i
 data/THIRD_PARTY_README.i
 data/test/tools/javac/api/6608214/T6608214.java.i
@@ -4183,91 +4228,93 @@ data/test/tools/javac/T6411379.java.i
 data/src/share/classes/com/sun/tools/javap/AttributeWriter.java.i
 data/test/com/sun/javadoc/DocRootSlash/p2/package.html.i
 data/test/tools/javap/T6715251.java.i
-data/test/tools/javadoc/imports/MissingImport.java.i
+data/test/tools/javap/classfile/deps/T6907575.out.i
 data/test/tools/javac/diags/examples/InvalidInstanceof.java.i
-data/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html.i
-data/test/tools/javac/mandatoryWarnings/unchecked/Test1.out.i
+data/test/tools/javac/6341866/Anno.java.i
 data/src/share/classes/javax/lang/model/element/Parameterizable.java.i
 data/src/share/classes/com/sun/tools/javac/parser/Lexer.java.i
 data/src/share/classes/com/sun/tools/javac/util/Assert.java.i
 data/src/share/classes/javax/annotation/processing/AbstractProcessor.java.i
 data/test/tools/javac/6341866/T6341866.java.i
-data/test/tools/javac/DefiniteAssignment/ThrowBeforeTryFinally.java.i
+data/src/share/classes/com/sun/tools/javah/resources/SunOS_sparcv9.properties.i
 data/test/tools/javac/diags/CheckExamples.java.i
 data/test/tools/javac/generics/6372782/Value.java.i
+data/test/com/sun/javadoc/testValueTag/pkg2/package.html.i
 data/test/jprt.config.i
 data/src/share/classes/com/sun/javadoc/AnnotationDesc.java.i
-data/test/tools/javac/generics/6495506/A.java.i
+data/test/tools/javac/diags/examples/StringSwitchNotSupported.java.i
 data/test/tools/javac/generics/wildcards/neg/CastFail10.java.i
 data/test/tools/javac/scope/7017664/CompoundScopeTest.java.i
 data/test/tools/javac/annotations/pos/Local.java.i
-data/test/tools/javac/diags/examples/VarargsAndOldArraySyntax.java.i
+data/test/tools/javac/ImportCycle/foo/Middle2.java.i
+data/test/tools/javac/CyclicScoping/CyclicScoping_1.java.i
 data/test/tools/javac/diags/examples/InterfaceNotAllowed.java.i
 data/test/com/sun/javadoc/DocRootSlash/DocRootSlash.java.i
 data/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedClass.java.i
 data/test/tools/javac/unit/util/convert/EnclosingCandidates.java.i
 data/src/share/classes/com/sun/tools/javac/comp/Infer.java.i
-data/test/tools/javac/diags/examples/AnnoNotValidForType.java.i
+data/test/tools/javac/OverrideChecks/6738538/T6738538b.java.i
 data/test/tools/javac/meth/InvokeMH.java.i
-data/test/tools/javac/processing/warnings/TestSourceVersionWarnings.java.i
+data/test/tools/javac/diags/examples/DuplicateClass.java.i
 data/test/tools/javac/synthesize/Test.java.i
 data/test/tools/javac/diags/examples/WarningAndWerror.java.i
-data/test/tools/javac/enum/AbstractEnum1.java.i
+data/test/tools/javac/diags/examples/CannotCreateArrayWithDiamond.java.i
 data/test/tools/javac/protectedAccess/ProtectedMemberAccess2.java.i
-data/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedFilename.java.i
+data/test/tools/javac/protectedInner/Outerclass.java.i
+data/test/tools/javac/cast/6795580/T6795580.java.i
 data/test/tools/javadoc/annotations/shortcuts/pkg1/Value.java.i
-data/test/tools/javac/unicode/NonasciiDigit.java.i
+data/test/tools/javac/generics/syntax/6318240/BarNeg2a.java.i
 data/test/tools/javac/synthesize/Serializable.java.i
-data/test/tools/javac/processing/options/Xprint.java.i
+data/test/com/sun/javadoc/testBreakIterator/pkg/BreakIteratorTest.java.i
 data/test/tools/javac/T6394563.java.i
+data/test/tools/javac/6394683/T6394683.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo2.java.i
 data/src/share/classes/sun/tools/javap/MethodData.java.i
 data/src/share/classes/com/sun/tools/javac/resources/javac.properties.i
 data/src/share/classes/com/sun/tools/javadoc/ParamTagImpl.java.i
 data/test/tools/javac/generics/TyparamStaticScope2.java.i
-data/test/tools/javadoc/generics/tparamCycle/pkg1/LikeEnum.java.i
-data/test/tools/javac/generics/6969184/T6969184.java.i
+data/test/tools/javac/api/T6501502.java.i
 data/test/tools/javac/NullQualifiedNew.java.i
 data/test/tools/javac/diags/examples/NativeMethodCantHaveBody.java.i
 data/test/tools/javac/generics/syntax/6318240/BarNeg1.java.i
 data/test/tools/javac/staticImport/PrivateStaticImport.java.i
 data/test/tools/javac/annotations/neg/AnnComma.java.i
 data/test/tools/javac/enum/T5075242.java.i
-data/test/tools/javac/diags/examples/InheritFromFinal.java.i
-data/src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java.i
+data/src/share/classes/com/sun/javadoc/ProgramElementDoc.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java.i
 data/test/tools/javac/annotations/neg/Scope.java.i
 data/test/tools/javac/ClassLiterals/evalinit/java/lang/Integer.java.i
 data/src/share/classes/com/sun/javadoc/RootDoc.java.i
 data/test/com/sun/javadoc/JavascriptWinTitle/overview.html.i
 data/test/tools/javac/4880220/T4880220.error.out.i
 data/test/tools/javac/T6358166.java.i
-data/test/tools/javac/foreach/T6500701.java.i
+data/src/share/classes/com/sun/tools/classfile/Type.java.i
 data/test/tools/javac/depOverrides/doccomment/Test1.java.i
 data/test/tools/javadoc/annotations/defaults/Main.java.i
-data/test/tools/javac/synthesize/Cloneable.java.i
-data/test/tools/javadoc/NoStar.java.i
+data/test/tools/javac/crossPackageImpl/CrossPackageImplA.java.i
 data/test/tools/javac/api/6420464/T6420464.java.i
 data/src/share/classes/com/sun/source/tree/TreeVisitor.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/titlebar.gif.i
 data/test/tools/javac/annotations/T7073477.java.i
-data/test/tools/javac/generics/6946618/T6946618c.java.i
-data/test/tools/javac/multicatch/model/UnionTypeInfo.java.i
+data/test/tools/apt/Compile/Round1Apf.java.i
+data/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java.i
 data/test/tools/javac/DefiniteAssignment/DefAssignNestedArg.java.i
 data/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java.i
-data/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java.i
+data/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java.i
+data/test/tools/javac/warnings/FallThrough.java.i
 data/test/tools/javac/InterfaceInInner.java.i
-data/test/tools/javac/diags/examples/OverrideWeakerAccess.java.i
+data/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.java.i
 data/src/share/classes/com/sun/javadoc/MethodDoc.java.i
 data/src/share/classes/com/sun/tools/javac/parser/ScannerFactory.java.i
-data/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.java.i
-data/test/tools/javac/generics/wildcards/neg/CastWarn13.java.i
+data/test/tools/javac/enum/TrailingComma.java.i
+data/src/share/classes/javax/lang/model/util/package-info.java.i
 data/test/tools/javac/implicitThis/NewBeforeOuterConstructed2.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/type/PrimitiveTypeImpl.java.i
+data/src/share/classes/com/sun/tools/javah/resources/Linux_ppc.properties.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java.i
 data/test/com/sun/javadoc/testValueTag/pkg2/Class3.java.i
 data/test/tools/javac/failover/FailOver08.out.i
 data/test/tools/javac/miranda/4686148/ConcreteTest.java.i
-data/test/tools/javac/T6435291/T.jcod.i
+data/test/tools/javac/InvalidIntfCast.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java.i
 data/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java.i
 data/src/share/classes/com/sun/javadoc/AnnotationValue.java.i
@@ -4276,243 +4323,254 @@ data/test/tools/javac/generics/inference/6302954/T6456971.java.i
 data/make/netbeans/javap/build.xml.i
 data/test/tools/javac/diags/examples/CallMustBeFirst.java.i
 data/test/tools/javac/annotations/neg/Cycle1.java.i
-data/test/tools/javac/ignored.jtx.i
-data/test/tools/javac/NonStaticFieldExpr1.out.i
+data/test/tools/javac/processing/options/testCommandLineClasses/Test.java.i
+data/test/tools/javac/6402516/CheckMethod.java.i
 data/test/tools/javac/assert/Attach.java.i
 data/test/tools/javac/generics/inference/6838943/T6838943.out.i
 data/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java.i
 data/src/share/classes/com/sun/source/tree/LiteralTree.java.i
 data/test/tools/javac/annotations/pos/NType.java.i
+data/test/tools/javac/generics/6956758/T6956758neg.java.i
 data/test/tools/javac/typeAnnotations/failures/IncompleteVararg.out.i
 data/test/tools/javac/options/T6900037.out.i
 data/test/tools/javac/DefiniteAssignment/DUBeforeDefined1.java.i
 data/test/tools/javac/diags/examples/DeprecatedPlural/DeprecatedPlural.java.i
 data/test/tools/javac/ImportCycle/foo/Top.java.i
 data/test/tools/javac/foreach/T6682380.java.i
-data/test/tools/javac/generics/6711619/T6711619b.out.i
+data/test/tools/javac/enum/enumSwitch/Color2.java.i
 data/test/tools/javac/processing/model/util/NoSupers.java.i
 data/test/tools/javac/cast/6714835/T6714835.java.i
 data/test/com/sun/javadoc/T6735320/T6735320.java.i
 data/test/tools/javac/miranda/T4279316c.java.i
-data/test/tools/javadoc/BooleanConst.java.i
-data/src/share/classes/com/sun/tools/javap/Messages.java.i
+data/test/tools/apt/mirror/type/EnumTyp.java.i
+data/test/tools/javac/meth/InvokeDyn.java.i
 data/test/tools/javac/generics/inference/6638712/T6638712c.out.i
 data/test/tools/javac/generics/inference/5044646/p1/A1.java.i
-data/test/tools/javac/generics/wildcards/6437894/A.java.i
+data/test/tools/javac/api/6411310/T6411310.java.i
 data/test/tools/javac/T6956462/TestClass.java.i
 data/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java.i
-data/test/tools/javac/generics/typevars/6182630/T6182630d.java.i
+data/test/tools/javac/InitializerCompletion_3.java.i
 data/test/tools/javac/Parens4.java.i
 data/test/tools/javap/typeAnnotations/JSR175Annotations.java.i
 data/test/tools/javac/6948381/npe/B.java.i
 data/test/tools/javac/typeAnnotations/failures/IncompleteArray.out.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java.i
-data/test/tools/javac/6979683/TestCast6979683_BAD39.java.i
+data/test/tools/javac/treeannotests/TA.java.i
 data/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/AlreadDefinedStaticImport.java.i
 data/test/com/sun/javadoc/testSummaryHeading/C.java.i
-data/test/tools/javac/FinallyWarn.java.i
 data/test/tools/javac/generics/typevars/5061359/T5061359b.java.i
 data/test/tools/javac/generics/wildcards/neg/CastFail14.java.i
 data/test/tools/javac/positions/T6404194.java.i
 data/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java.i
-data/test/tools/javac/diags/examples/ForeachNotApplicable.java.i
-data/test/tools/javac/protectedAccess/ProtectedMemberAccess4.java.i
+data/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java.i
+data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C4.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java.i
 data/test/tools/javac/processing/model/6341534/T6341534.java.i
-data/test/tools/javac/diags/examples/PackageInfoAlreadySeen/package-info.java.i
+data/src/share/classes/com/sun/tools/classfile/DescriptorException.java.i
 data/test/tools/javac/typeAnnotations/failures/IncompleteVararg.java.i
 data/test/tools/javac/processing/errors/TestErrorCount.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java.i
+data/src/share/classes/com/sun/source/tree/ImportTree.java.i
 data/test/tools/javac/diags/examples/CountErrorPlural.java.i
 data/test/tools/javac/AccessMethods/BitwiseAssignment.java.i
-data/test/tools/javac/generics/diamond/neg/Neg10.java.i
-data/test/tools/javadoc/generics/genericInnerAndOuter/pkg1/X.java.i
-data/test/tools/javac/OverrideChecks/StaticOverride.java.i
+data/test/com/sun/javadoc/testThrowsHead/C.java.i
+data/test/tools/javac/api/6418694/T6418694.java.i
 data/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java.i
 data/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java.i
 data/test/tools/javah/compareTest/FindNativeFiles.java.i
-data/src/share/classes/com/sun/javadoc/SerialFieldTag.java.i
-data/test/tools/javac/depOverrides/doccomment/Test1B.out.i
+data/test/tools/apt/Basics/StaticFieldAnnotations.java.i
+data/test/tools/javac/TryWithResources/PlainTry.java.i
 data/test/tools/javac/generics/GenericThrowable.java.i
 data/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java.i
 data/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java.i
 data/src/share/classes/com/sun/source/tree/MethodTree.java.i
-data/make/test/contents.sh.i
-data/test/tools/javac/diags/MessageInfo.java.i
+data/test/tools/javac/enum/forwardRef/T6425594.out.i
 data/test/tools/javac/6863465/T6863465b.out.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java.i
-data/test/tools/javac/diags/examples/AlreadyDefinedClinit.java.i
-data/test/tools/javac/generics/6182950/T6182950b.java.i
+data/test/tools/javac/NonStaticFieldExpr4d.java.i
 data/test/tools/javac/limits/ArrayDims2.java.i
 data/test/tools/javac/6917288/T6917288.java.i
-data/src/share/classes/com/sun/source/tree/NewClassTree.java.i
+data/test/tools/javac/ImportCycle/foo/Top2.java.i
 data/test/tools/javah/MissingParamClassException.java.i
+data/test/tools/javac/diags/examples/NoInterfaceExpected.java.i
+data/src/share/classes/com/sun/tools/apt/resources/apt.properties.i
 data/test/tools/javac/annotations/TestAnnotationPackageInfo.java.i
+data/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out.i
 data/test/tools/javac/QualifiedNew.java.i
 data/test/tools/javac/ArrayCast.java.i
-data/test/tools/javap/T7004698.java.i
+data/test/tools/javac/annotations/neg/Z12.java.i
 data/src/share/classes/com/sun/mirror/type/TypeVariable.java.i
 data/test/tools/javac/6627362/T6627362.java.i
 data/src/share/classes/sun/tools/javap/Main.java.i
 data/test/com/sun/javadoc/testTopOption/pkg/AnnotationType.java.i
 data/test/tools/javac/EarlyAssertWrapper.java.i
+data/test/tools/javac/generics/wildcards/neg/CastWarn13.java.i
 data/test/tools/javac/diags/examples/IntfAnnotationsCantHaveTypeParams.java.i
-data/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass_2.java.i
+data/test/tools/javac/generics/compat/CovariantCompat2.java.i
 data/test/tools/javac/importChecks/ImportCanonical2.java.i
-data/test/tools/javac/ClassLiterals/evalinit/ClassLiteralEvalInit.java.i
-data/test/tools/javac/typeAnnotations/newlocations/ConstructorTypeArgs.java.i
-data/test/tools/javac/miranda/T4666866.java.i
+data/src/share/classes/javax/lang/model/element/UnknownElementException.java.i
+data/test/tools/javac/T6977800.java.i
+data/test/tools/javac/generics/6476118/T6476118c.java.i
 data/test/tools/javac/generics/6985719/T6985719c.out.i
 data/test/tools/javac/generics/compat/VisibleBridge.java.i
 data/src/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java.i
 data/test/tools/javadoc/generics/genericInnerAndOuter/pkg1/O.java.i
 data/test/tools/javac/processing/6413690/T6413690.java.i
+data/test/com/sun/javadoc/JavascriptWinTitle/p2/C2.java.i
 data/test/tools/javac/processing/6512707/TestAnnotation.java.i
-data/test/tools/javac/unicode/UnicodeAtEOL.java.i
+data/test/tools/javac/boxing/T6614974.java.i
 data/test/tools/javac/SuperField.java.i
-data/test/tools/javac/protectedInner/InnerClass.java.i
+data/src/share/classes/com/sun/source/tree/MemberSelectTree.java.i
 data/test/tools/javac/diags/examples/TrustMeOnVirtualMethod.java.i
 data/test/tools/javac/depOverrides/doccomment/A.java.i
-data/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java.i
+data/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css.i
 data/test/tools/javac/generics/typevars/6486430/T6486430.java.i
 data/test/tools/javac/cast/6932571/T6932571neg.out.i
-data/test/tools/javac/generics/wildcards/6330931/T6330931.java.i
-data/test/tools/javac/diags/examples/DotClassExpected.java.i
+data/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java.i
+data/src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java.i
 data/test/tools/javac/annotations/6214965/T6214965.java.i
-data/src/share/classes/com/sun/tools/classfile/Attribute.java.i
-data/test/tools/javac/generics/rawOverride/AttributeSet.java.i
-data/test/tools/javac/generics/typevars/6182630/T6182630f.java.i
+data/test/tools/javac/7085024/T7085024.java.i
+data/test/com/sun/javadoc/testPrivateClasses/pkg/PublicInterface.java.i
+data/test/tools/javac/T7120266.java.i
+data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest2.java.i
 data/test/tools/javac/ConditionalArgTypes_2.java.i
 data/test/tools/javac/scope/6225935/a/Star.java.i
 data/test/tools/javac/T6900037.out.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java.i
+data/test/tools/javadoc/NoStar.java.i
 data/test/tools/javac/6257443/package-info.java.i
-data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/MultiTypeParameters.java.i
 data/test/tools/javac/varargs/6730476/T6730476b.java.i
 data/test/tools/javac/diags/examples/EnumConstRequired.java.i
-data/test/tools/javac/T6554097.out.i
-data/test/tools/javac/constDebug/ConstDebug.sh.i
-data/test/tools/javadoc/sourceOption/SourceOption.java.i
+data/test/tools/javac/diags/examples/NoInterfaceHere.java.i
+data/test/tools/javac/accessVirtualInner/c/C.java.i
+data/test/tools/javac/generics/wildcards/6651719/T6651719a.java.i
 data/test/tools/javac/unicode/SubChar.java.i
 data/test/tools/javac/rawDiags/Warning.java.i
 data/src/share/classes/com/sun/mirror/util/DeclarationScanner.java.i
-data/test/com/sun/javadoc/testValueTag/pkg1/Class2.java.i
+data/test/tools/javac/QualifiedAccess/QualifiedAccess_2.java.i
+data/test/tools/javac/7102515/T7102515.java.i
 data/make/tools/Jigsaw/FpkgTask.java.i
 data/test/tools/javac/policy/A.java.i
 data/test/tools/javac/processing/6994946/TestProcessor.java.i
 data/test/tools/javac/NonAmbiguousField/one/Parent.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo4.java.i
 data/test/tools/javac/6758789/T6758789b.out.i
+data/src/share/classes/com/sun/tools/apt/mirror/type/TypeMaker.java.i
 data/test/tools/javac/processing/6414633/A.java.i
 data/test/tools/javac/generics/ParenVerify.java.i
 data/test/tools/javap/ExtPath.java.i
-data/test/com/sun/javadoc/testDocRootLink/pkg2/package.html.i
+data/test/tools/javac/TryWithResources/PlainTry.out.i
 data/src/share/classes/com/sun/tools/javap/package.html.i
 data/test/tools/javac/annotations/6365854/evolve/TestAnnotation.java.i
 data/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java.i
 data/test/com/sun/javadoc/testHtmlDocument/testLink.html.i
-data/test/tools/javac/6734819/T6734819b.java.i
-data/test/tools/apt/mirror/declaration/AnnoTypeElemDecl.java.i
+data/src/share/classes/com/sun/tools/classfile/ModuleClass_attribute.java.i
+data/test/tools/javac/diags/examples/SourceNoBootclasspath.java.i
 data/test/tools/javac/generics/7007615/acc1/p2/E.java.i
 data/src/share/classes/javax/tools/ModuleFileManager.java.i
-data/test/tools/javac/generics/inference/6638712/T6638712a.out.i
-data/test/tools/javac/7024568/T7024568.out.i
+data/test/tools/javac/generics/bridge1/D.java.i
+data/test/tools/javac/ClassPathTest/pkg/ClassPathTestAux3.java.i
 data/test/tools/javac/diags/examples/ProcUseImplicit/sourcepath/p/SomeClass.java.i
-data/test/tools/javac/T4906100.out.i
-data/test/tools/javac/DefiniteAssignment/DefAssignAfterIf_1.java.i
+data/test/com/sun/javadoc/testHref/package-list.i
+data/src/share/classes/com/sun/mirror/apt/RoundCompleteListener.java.i
 data/test/tools/javac/processing/options/testPrintProcessorInfo/Test.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_2.java.i
-data/test/tools/javac/SynthName1.java.i
+data/src/share/classes/javax/lang/model/type/ErrorType.java.i
+data/test/tools/javac/InnerClassesAttribute/Outside$1$Inside.class.i
 data/test/tools/javadoc/generics/supertypes/pkg1/B.java.i
 data/test/tools/javac/typeAnnotations/failures/StaticMethods.java.i
 data/test/tools/javac/diags/examples/AnnotationMustBeNameValue.java.i
 data/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java.i
-data/test/tools/javac/enum/T6724345.java.i
-data/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java.i
+data/make/test/HelloWorld.javadoc.gold.txt.i
+data/test/tools/javac/scope/6225935/Baz.java.i
 data/test/tools/javadoc/generics/tparamTagOnType/expected.out.i
 data/test/tools/javac/unicode/NonasciiDigit2.java.i
 data/src/share/classes/com/sun/javadoc/ParameterizedType.java.i
 data/test/tools/javac/T5024091/T5024091.out.i
-data/test/tools/javac/generics/inference/6638712/T6638712d.java.i
+data/test/tools/javac/unicode/SupplementaryJavaID6.sh.i
 data/test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.java.i
-data/test/tools/javac/diags/examples/WhereTypeVar.java.i
-data/test/tools/javac/diags/examples/ProcFileReopening/processors/AnnoProc.java.i
-data/test/tools/javac/sourcePath/SourcePath.java.i
+data/test/tools/javac/generics/6372782/PlainForm.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_13.java.i
+data/test/tools/javac/diags/Example.java.i
 data/test/tools/apt/Compile/servicesRound4.i
-data/test/tools/javac/CyclicInheritance6/p1/C.java.i
+data/test/tools/javac/processing/errors/Foo.java.i
+data/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C3.java.i
+data/src/share/classes/com/sun/tools/classfile/Attribute.java.i
 data/test/tools/javac/generics/wildcards/T6450290.java.i
-data/test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.out.i
+data/src/share/classes/javax/tools/overview.html.i
 data/test/tools/javac/diags/RunExamples.java.i
-data/test/tools/javac/T6413876.java.i
-data/test/tools/javac/generics/6207386/T6207386.java.i
+data/src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java.i
+data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/MultiTypeParameters.java.i
 data/test/tools/javadoc/annotations/shortcuts/Main.java.i
-data/test/tools/javac/unicode/SupplementaryJavaID3.java.i
-data/test/tools/javac/generics/inference/5042462/T5042462.java.i
-data/src/share/classes/com/sun/mirror/apt/RoundState.java.i
-data/test/tools/javac/innerClassFile/y/R1.java.i
-data/test/tools/javac/T6214885a.out.i
-data/test/tools/javac/inheritedAccess/MethodReferenceQualification_1.java.i
+data/test/tools/javac/annotations/neg/DupTarget.java.i
+data/test/tools/javac/diags/MessageInfo.java.i
+data/test/tools/javac/generics/CastCrash.java.i
+data/test/com/sun/javadoc/5093723/UndocumentedClass.java.i
+data/test/tools/javac/innerClassFile/y/R1.java.i
+data/test/tools/javac/literals/BadBinaryLiterals.java.i
+data/test/tools/javac/generics/inference/6650759/T6650759b.java.i
 data/test/tools/javac/diags/examples/ClashesWith.java.i
-data/test/tools/javac/6521805/p/Sub.java.i
+data/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java.i
 data/test/tools/javac/AnonStaticMember_2.out.i
 data/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java.i
-data/test/tools/javac/mandatoryWarnings/deprecated/P.java.i
-data/test/tools/javac/accessVirtualInner/Main.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodFinder.java.i
+data/test/tools/javac/policy/test2/Test.java.i
 data/src/share/classes/com/sun/mirror/declaration/MethodDeclaration.java.i
-data/test/tools/javac/generics/6192945/Neg3.java.i
+data/test/tools/javac/annotations/pos/TrailingComma.java.i
 data/test/com/sun/javadoc/testTypeParams/pkg/Foo4.java.i
 data/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java.i
 data/test/tools/javac/policy/test2/byfile.AB.out.i
 data/test/tools/javac/annotations/6359949/T6359949a.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java.i
-data/test/tools/javap/T6474890.java.i
+data/test/tools/javac/innerClassFile/y/Main.java.i
 data/test/tools/javac/positions/T6264029.out.i
-data/test/tools/javac/diags/examples/LocalVarNeedsFinal.java.i
+data/test/com/sun/javadoc/testDocRootLink/pkg2/package.html.i
+data/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java.i
 data/test/tools/javac/generics/wildcards/neg/CastFail11.java.i
-data/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java.i
-data/test/tools/javac/rawDiags/Note.out.i
+data/test/tools/javac/ClassLiterals/LiteralInterfaceImpl.java.i
+data/test/tools/javac/generics/inference/6468384/T6468384.java.i
 data/test/tools/javac/options/T6900037.java.i
 data/test/tools/javac/processing/warnings/UseImplicit/p/C2.java.i
 data/test/tools/javac/generics/rare/Rare5.java.i
 data/test/tools/javac/ThrowsIntersection_3.java.i
-data/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/type/AnnotationTypeImpl.java.i
+data/src/share/classes/com/sun/tools/javac/parser/Keywords.java.i
+data/test/tools/javac/OverrideChecks/StaticOverride.java.i
 data/test/tools/javadoc/enum/enumType/Main.java.i
 data/test/tools/apt/mirror/type/ClassTyp.java.i
 data/test/tools/javac/diags/examples/PkgClashWithClass/p/q.java.i
+data/test/tools/javac/generics/ExtendedRaw2.java.i
 data/test/tools/javac/T6873845.java.i
 data/test/tools/javac/failover/FailOver14.out.i
 data/test/tools/javac/generics/inference/6302954/X.java.i
 data/test/tools/javac/staticQualifiedNew/p2/X.java.i
+data/test/com/sun/javadoc/testTypeParams/pkg/ClassUseTest3.java.i
 data/test/tools/apt/mirror/declaration/pkg1/AClass.java.i
-data/test/tools/javac/generics/6372782/MultiplicationDefined.java.i
+data/test/tools/javac/lambda/MethodReferenceParserTest.java.i
 data/test/tools/javac/diags/examples/PathElementNotFound.java.i
 data/test/com/sun/javadoc/DocRootSlash/overview.html.i
-data/test/tools/javac/api/6422327/T6422327.java.i
-data/test/tools/javac/generics/7022054/T7022054neg1.out.i
+data/test/tools/javac/protectedAccess/ProtectedMemberAccess3.out.i
+data/test/tools/javac/danglingDep/NoDepX.out.i
 data/test/tools/javac/generics/wildcards/neg/CastFail5.java.i
 data/test/tools/javac/7023703/T7023703neg.out.i
 data/test/tools/javac/diags/examples/CyclicAnnoElement.java.i
 data/src/share/classes/com/sun/tools/apt/comp/AnnotationProcessingError.java.i
 data/test/tools/javac/multicatch/Pos04.java.i
-data/test/tools/javac/typeAnnotations/newlocations/LocalVariables.java.i
+data/src/share/classes/javax/lang/model/element/TypeParameterElement.java.i
 data/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java.i
-data/src/share/classes/sun/tools/javap/CPX2.java.i
-data/test/tools/javac/multicatch/Pos01.java.i
+data/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.java.i
+data/test/tools/javac/generics/typevars/6486430/T6486430a.java.i
 data/test/tools/javac/NonStaticFieldExpr4c.java.i
-data/test/tools/javac/EmptyDocComments.java.i
-data/test/tools/apt/Scanners/TestEnum.java.i
+data/test/tools/javac/6547131/T.java.i
 data/test/tools/javac/diags/examples/ResourceNotApplicableToType.java.i
 data/test/tools/javac/annotations/6365854/TestAnnotation.java.i
-data/test/tools/javac/diags/examples/UncheckedCast.java.i
+data/test/tools/javac/api/TestDocComments.java.i
+data/test/tools/javac/generics/compat/OverrideBridge2.java.i
 data/src/share/classes/com/sun/tools/classfile/Annotation.java.i
-data/test/tools/javac/processing/6365040/ProcFoo.java.i
+data/test/tools/javac/6330920/T6330920.java.i
 data/test/com/sun/javadoc/testValueTag/pkg1/Class1.java.i
-data/test/tools/javac/generics/inference/5073060/T5073060.java.i
-data/test/tools/javac/modules/ModuleProvidesAttributeTest01.java.i
-data/src/share/classes/com/sun/tools/javac/util/AbstractLog.java.i
+data/test/tools/javac/depDocComment/DeprecatedDocComment4.out.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java.i
+data/test/tools/javac/tree/AbstractTreeScannerTest.java.i
 data/test/tools/javac/processing/loader/testClose/TestClose.java.i
 data/test/tools/javap/T4459541.java.i
 data/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java.i
@@ -4522,90 +4580,94 @@ data/test/tools/javac/generics/InheritanceConflict2.java.i
 data/test/tools/javac/processing/filer/foo/bar/FuBar.java.i
 data/test/tools/javac/TryWithResources/BadTwrSyntax.java.i
 data/test/com/sun/javadoc/testGroupOption/pkg1/C.java.i
+data/test/tools/javac/diags/examples/NotAStatement.java.i
 data/test/tools/javac/scope/6225935/Test.java.i
-data/test/tools/javac/T6595666.java.i
+data/src/share/classes/javax/annotation/processing/SupportedOptions.java.i
 data/test/tools/javac/annotations/neg/Z8.java.i
-data/test/tools/javac/DeclarationStatementInline.java.i
+data/test/tools/javadoc/annotations/defaults/pkg1/A.java.i
 data/test/tools/javac/generics/SelfImplement.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignAfterIf_1.java.i
+data/test/tools/javac/typeAnnotations/newlocations/ClassLiterals.java.i
 data/test/tools/javac/AccessMethods/InternalHandshake.java.i
 data/test/tools/javac/multicatch/T6978574.java.i
 data/test/tools/javac/InconsistentStack.java.i
 data/src/share/classes/com/sun/tools/javac/services/javax.tools.JavaCompilerTool.i
-data/test/tools/javap/T6716452.java.i
-data/test/tools/javac/diags/ArgTypeCompilerFactory.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourceToHTMLConverter.java.i
+data/test/com/sun/javadoc/DocRootSlash/p2/C2.java.i
+data/test/tools/javac/ExceptionalFinally.java.i
+data/src/share/classes/com/sun/tools/classfile/Method.java.i
+data/test/tools/javac/annotations/6214965/CompilerAnnotationTest2bad.java.i
 data/test/tools/javap/T4880663.java.i
 data/src/share/classes/com/sun/mirror/apt/AnnotationProcessors.java.i
-data/test/tools/javac/Diagnostics/6722234/T6722234d.java.i
-data/test/tools/javac/diags/examples/VarargsFilenameAdditional.java.i
-data/test/tools/javac/depOverrides/annotation/Test3.java.i
+data/test/tools/apt/Discovery/Touch.java.i
+data/test/tools/javac/ClassPathTest/ClassPathTest.sh.i
+data/test/tools/javac/synthesize/Double.java.i
 data/test/tools/javac/processing/completion/TestCompletions.java.i
 data/test/tools/javac/StrictAbstract.java.i
 data/test/tools/javac/generics/rare/Rare7.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_6.java.i
+data/test/tools/javac/diags/examples/DeprecatedPlural/DeprecatedClass.java.i
+data/src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java.i
 data/test/tools/javac/diags/examples/CantResolveLocationArgs.java.i
 data/src/share/classes/com/sun/source/tree/BlockTree.java.i
 data/test/tools/javac/stackmap/T4955930.sh.i
-data/test/tools/javac/unicode/SupplementaryJavaID1.java.i
+data/test/tools/javac/generics/6985719/T6985719h.out.i
 data/test/tools/javac/diags/examples/Expected3.java.i
-data/test/tools/javac/multicatch/Neg05.java.i
+data/test/tools/javac/6464451/ManyExitsInTry.java.i
 data/test/tools/javac/enum/ValueOf.java.i
-data/test/tools/javac/ImportCycle/foo/Bottom.java.i
-data/test/tools/javac/processing/model/element/TestAnonSourceNames.java.i
-data/test/tools/javac/api/6411310/Test.java.i
-data/test/tools/javac/diags/examples/IllegalLineEndInCharLit.java.i
+data/src/share/classes/com/sun/tools/javah/JNI.java.i
+data/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java.i
 data/test/tools/javac/multicatch/model/Check.java.i
 data/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java.i
 data/test/tools/javac/processing/environment/round/Part1.java.i
-data/test/tools/javadoc/generics/throwsGeneric/expected.out.i
+data/src/share/classes/com/sun/tools/apt/mirror/type/EnumTypeImpl.java.i
 data/src/share/classes/com/sun/tools/classfile/Dependency.java.i
 data/test/tools/javac/generics/TyparamStaticScope.java.i
+data/test/tools/javac/diags/examples/PackageInfoAlreadySeen/package-info.java.i
 data/test/tools/javac/diags/examples/ArrayRequired.java.i
-data/test/tools/javac/abstract/T2.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java.i
 data/test/tools/javac/diags/examples/VoidNotAllowed.java.i
 data/test/tools/javac/processing/environment/round/TestContext.java.i
 data/src/share/classes/com/sun/tools/javac/comp/Attr.java.i
 data/test/tools/javac/api/T6358955.java.i
+data/test/tools/javac/enum/DA2.java.i
 data/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java.i
-data/test/tools/javac/generics/6476118/T6476118c.out.i
+data/src/share/classes/com/sun/source/tree/WhileLoopTree.java.i
 data/test/tools/javac/scope/6225935/a/Ambiguous.java.i
-data/test/tools/javac/policy/test2/bytodo.AB.out.i
-data/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java.i
+data/src/share/classes/com/sun/tools/classfile/Module_attribute.java.i
+data/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java.i
 data/test/tools/javac/QualifiedThisExactMatch.java.i
 data/test/tools/javac/generics/wildcards/T6732484.java.i
-data/test/tools/javac/boxing/NoBoxingLong.java.i
+data/src/share/classes/com/sun/mirror/apt/AnnotationProcessor.java.i
+data/test/com/sun/javadoc/testMemberSummary/pkg2/A.java.i
 data/test/tools/javac/depOverrides/annotation/B.java.i
+data/test/tools/javac/diags/examples/AnnotationMissingValue.java.i
 data/src/share/classes/com/sun/mirror/overview.html.i
 data/src/share/classes/com/sun/source/tree/MethodInvocationTree.java.i
 data/test/tools/javac/DefiniteAssignment/DefAssignAfterTry1.java.i
-data/src/share/classes/com/sun/tools/javah/Mangle.java.i
+data/test/tools/javac/T7040104.java.i
 data/src/share/classes/com/sun/tools/javac/util/Convert.java.i
-data/test/tools/javac/generics/diamond/neg/Neg04.out.i
-data/test/tools/javac/ExtDirs/ext3/pkg2.jar.i
-data/test/tools/javac/generics/5066774/T5066774.java.i
-data/test/com/sun/javadoc/testModifier/Test.java.i
-data/test/tools/javac/api/6431435/T6431435.java.i
-data/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java.i
+data/src/share/classes/javax/lang/model/type/WildcardType.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java.i
+data/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java.i
 data/test/tools/javac/positions/T6253161.out.i
 data/test/tools/javac/diags/HTMLWriter.java.i
-data/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java.i
+data/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E2.java.i
 data/test/tools/javac/code/ArrayClone.sh.i
 data/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java.i
 data/test/tools/javadoc/annotations/annotateMethodsFields/pkg1/B.java.i
 data/test/tools/javac/diags/examples/ClassCantWrite.java.i
 data/test/tools/javac/generics/wildcards/pos/RvalConversion.java.i
 data/test/tools/javac/processing/model/type/TestUnionType.java.i
-data/test/tools/javac/api/T6412669.java.i
+data/test/tools/javac/6979683/TestCast6979683_BAD38.java.i
 data/test/tools/javac/processing/errors/TestErrorCount.out.i
 data/src/share/classes/com/sun/mirror/declaration/MemberDeclaration.java.i
-data/test/tools/javac/tree/TreeScannerTest.java.i
-data/test/tools/javac/AbstractOverride.java.i
+data/test/tools/javac/diags/examples/DiamondAndExplicitParams.java.i
+data/test/tools/javac/processing/6413690/TestMe.java.i
 data/test/tools/javac/T6232928.java.i
 data/test/tools/javac/diags/examples/QualifiedNewStaticClass.java.i
-data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUndocumented.java.i
-data/test/tools/javac/generics/bridge1/E.java.i
-data/make/netbeans/common/shared.xml.i
-data/test/tools/javac/miranda/6964669/pkg/B.java.i
+data/test/tools/javac/T6406771.java.i
+data/test/tools/javac/generics/5066774/T5066774.java.i
+data/test/tools/javac/generics/6372782/MultiplicationDefined.java.i
 data/test/tools/javac/DefiniteAssignment/T4718708.java.i
 data/test/tools/apt/Compile/servicesRound3.i
 data/test/tools/javac/diags/examples/ProcUseProcOrImplicit/processors/AnnoProc.java.i
@@ -4613,91 +4675,95 @@ data/test/tools/javac/generics/wildcards/6886247/T6886247_2.out.i
 data/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java.i
 data/test/com/sun/javadoc/testMemberInheritence/pkg/BaseClass.java.i
 data/test/tools/javac/generics/6910550/T6910550b.java.i
-data/test/com/sun/javadoc/testMemberInheritence/pkg/BaseInterface.java.i
+data/test/tools/javac/OverrideChecks/6400189/T6400189d.java.i
 data/test/tools/javac/generics/T4757416.java.i
+data/src/share/classes/com/sun/source/tree/PermitsDirectiveTree.java.i
 data/test/tools/javac/generics/odersky/Test.java.i
-data/src/share/classes/com/sun/tools/javac/util/Messages.java.i
+data/src/share/opensource/javac/build.xml.i
 data/test/tools/javah/compareTest/CompareTest.sh.i
 data/test/tools/javac/generics/6372782/AbstractElement.java.i
 data/test/tools/javac/diags/examples/ModifierNotAllowed.java.i
 data/test/tools/javac/processing/6499119/ClassProcessor.java.i
 data/test/tools/javac/FoldConditional.java.i
-data/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java.i
+data/test/tools/javac/annotations/neg/MixedSource.java.i
 data/test/tools/javac/generics/inference/5073060/Neg.java.i
 data/test/tools/javac/unicode/FirstChar2.java.i
 data/README.i
 data/test/bootclasspath-exclude.jtx.i
-data/test/tools/javac/positions/T6253161a.java.i
+data/test/tools/javac/diags/examples/IllegalDot.java.i
+data/make/netbeans/apt/build.xml.i
 data/test/tools/javac/diags/examples/UnreachableStatement.java.i
 data/test/tools/javac/treeannotests/AnnoTreeTests.java.i
-data/test/tools/javac/processing/werror/WError1.java.i
+data/test/tools/javac/StringAppendAccessMethodOnLHS.java.i
 data/test/tools/javac/modules/ModuleResolverTest03.java.i
 data/test/tools/javac/multicatch/Neg01eff_final.out.i
 data/src/share/classes/com/sun/tools/javac/comp/Enter.java.i
 data/test/tools/javadoc/MethodLinks.java.i
 data/src/share/opensource/javac/doc/javac_lifecycle/packages.html.i
-data/test/tools/javac/diags/examples/UncheckedFilenameAdditional.java.i
+data/test/tools/javac/NestedInnerClassNames.out.i
 data/test/tools/javac/processing/warnings/gold_sv_warn_5_6.out.i
 data/test/tools/javac/diags/examples/BreakOutsideSwitchLoop.java.i
+data/test/tools/javac/api/T6400205.java.i
 data/test/tools/javac/6508981/TestInferBinaryName.java.i
-data/test/tools/javac/generics/compat/OverrideBridge3.java.i
+data/src/share/classes/com/sun/tools/javac/file/Locations.java.i
+data/test/tools/javac/diags/examples/MulticatchCantBeAssigned.java.i
 data/src/share/opensource/javac/doc/javac_lifecycle/Main.html.i
 data/test/tools/javac/6979683/TestCast6979683_BAD36.java.i
-data/test/tools/javac/generics/rare/6665356/T6665356.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java.i
 data/test/tools/javac/annotations/neg/Z10.java.i
-data/src/share/classes/com/sun/tools/javac/zip/ZipFileIndexEntry.java.i
+data/test/tools/javac/literals/T6891079.out.i
 data/test/tools/javac/diags/examples/TryWithoutCatchOrFinally.java.i
 data/src/share/classes/com/sun/tools/javac/file/RelativePath.java.i
-data/test/tools/javac/diags/examples/UnsupportedExoticID.java.i
+data/src/share/opensource/javac/doc/javac_lifecycle/ToDo.html.i
 data/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java.i
 data/test/tools/javac/generics/T6507024.java.i
 data/test/tools/javac/6521805/T6521805a_2.out.i
 data/test/tools/javac/file/T7018098.java.i
 data/test/tools/javac/OverrideChecks/Private.java.i
 data/test/tools/javac/typeAnnotations/InnerClass.java.i
-data/test/tools/javac/diags/examples/NameClashSameErasureNoOverride.java.i
+data/src/share/classes/com/sun/tools/javac/main/CommandLine.java.i
 data/test/tools/apt/Compile/Round3Apf.java.i
 data/test/tools/javac/generics/6207386/T6207386.out.i
 data/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java.i
 data/test/tools/javac/generics/6192945/T6192945.java.i
 data/test/com/sun/javadoc/testBaseClass/BaseClass.java.i
-data/test/tools/javac/T6567414.java.i
-data/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java.i
+data/test/tools/javac/FinalThisReference.java.i
+data/test/tools/javac/protectedInner/InnerClass.java.i
 data/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.java.i
 data/test/tools/javac/policy/test2/A.java.i
 data/test/com/sun/javadoc/testInlineLinkLabel/pkg/C2.java.i
 data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_14.java.i
-data/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java.i
-data/test/com/sun/javadoc/JavascriptWinTitle/p2/C2.java.i
-data/test/tools/javac/NonStaticFieldExpr3.out.i
+data/test/tools/javac/diags/examples/AssertAsIdentifier.java.i
+data/test/com/sun/javadoc/testHtmlTableTags/pkg1/I1.java.i
+data/test/tools/javac/multicatch/Neg02.out.i
 data/test/tools/apt/Scanners/VisitOrder.java.i
 data/test/tools/javac/annotations/default/C.java.i
 data/test/com/sun/javadoc/testTagInheritence/firstSentence2/B.java.i
 data/test/tools/javac/diags/examples/BadSourceFileHeader/BadSourceFileHeader.java.i
 data/src/share/classes/com/sun/mirror/declaration/TypeParameterDeclaration.java.i
-data/test/tools/javac/missingClass/A.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeElementDeclarationImpl.java.i
 data/src/share/classes/com/sun/tools/javac/code/BoundKind.java.i
-data/test/com/sun/javadoc/testLegacyTaglet/UnderlineTaglet.java.i
-data/test/tools/javac/processing/filer/TestValidRelativeNames.java.i
+data/test/tools/javac/generics/diamond/neg/Neg10.java.i
+data/test/tools/javac/capture/Martin.java.i
 data/test/tools/javac/inheritAccess/PvtMbrsNotInherit1.java.i
 data/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.out.i
-data/test/tools/javac/overrridecrash/A.java.i
+data/test/com/sun/javadoc/testSubTitle/pkg/package.html.i
 data/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java.i
-data/test/tools/javadoc/annotations/badVals/pkg1/A.java.i
+data/test/com/sun/javadoc/testInlineLinkLabel/pkg/C1.java.i
 data/test/tools/javac/depOverrides/doccomment/empty.i
-data/test/tools/javac/literals/BadUnderscoreLiterals.6.out.i
-data/src/share/classes/javax/lang/model/element/UnknownElementException.java.i
+data/test/tools/javac/generics/inference/5073060/T5073060.java.i
+data/test/tools/javac/mandatoryWarnings/unchecked/Test1.out.i
 data/test/tools/javac/generics/6946618/T6946618a.java.i
 data/test/tools/javac/processing/model/util/elements/VacuousEnum.java.i
-data/test/tools/javac/warnings/Unchecked.lintAll.out.i
-data/test/tools/javac/generics/inference/4972073/T4972073a.java.i
+data/test/tools/javac/annotations/neg/NoObjectMethods.java.i
+data/test/com/sun/javadoc/testTaglets/Parent.java.i
 data/test/tools/javadoc/annotations/elementTypes/pkg1/B.java.i
 data/test/tools/javac/diags/examples/TryResourceTrailingSemi.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest3.java.i
 data/test/tools/javah/6572945/gold/jni.dir.1/TestClass1.h.i
-data/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java.i
-data/test/tools/javah/4942232/ParamClassTest.java.i
-data/test/tools/apt/Scanners/Scanner.java.i
+data/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.out.i
+data/test/com/sun/javadoc/AccessAsciiArt/p1/C.java.i
+data/make/test/lib/javadoc.sh.i
 data/test/tools/javac/diags/examples/OverrideUncheckedReturn.java.i
 data/test/tools/javac/diags/examples/DeprecatedFilename.java.i
 data/test/tools/javadoc/T6551367.java.i
@@ -4705,21 +4771,22 @@ data/test/com/sun/javadoc/testTagInheritence/firstSentence/A.java.i
 data/test/tools/javap/T6863746.java.i
 data/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java.i
 data/test/tools/javac/staticImport/ImportPrivate.java.i
-data/test/com/sun/javadoc/VersionNumber/p1/C.java.i
+data/test/tools/javac/generics/6969184/T6969184.java.i
+data/test/tools/javac/multicatch/Pos01.java.i
 data/test/tools/javac/tree/TestToString.java.i
 data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/Coin.java.i
 data/test/tools/javac/warnings/Unchecked.noLint.out.i
-data/test/tools/javac/lint/NoWarn1.out.i
+data/src/share/classes/com/sun/tools/javac/parser/Parser.java.i
 data/test/tools/javac/cast/5065215/T5065215.java.i
-data/test/tools/javac/processing/model/util/OverridesSpecEx.java.i
+data/test/tools/javac/generics/wildcards/neg/CastWarn14.java.i
 data/test/tools/javadoc/varArgs/pkg1/A.java.i
 data/test/tools/javac/multicatch/Neg04.out.i
-data/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.java.i
-data/test/tools/javac/6390045/T6390045b.java.i
+data/test/tools/javac/diags/examples/UnmatchedProcessorOptions/processors/AnnoProc.java.i
+data/test/tools/javac/diags/examples/IllegalLineEndInCharLit.java.i
 data/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.java.i
 data/test/tools/javac/mixedTarget/CompatibleAbstracts2.java.i
 data/src/share/classes/com/sun/tools/javac/model/JavacTypes.java.i
-data/test/tools/javac/meth/InvokeDyn.java.i
+data/src/share/classes/com/sun/tools/javap/Messages.java.i
 data/test/tools/javac/generics/inference/6222762/T6222762.java.i
 data/test/tools/javac/diags/examples/Expected2.java.i
 data/test/tools/javac/CyclicScoping/CyclicScoping_2.java.i
@@ -4727,79 +4794,82 @@ data/test/tools/javac/diags/examples/FloatNumberTooLarge.java.i
 data/test/tools/javac/policy/B.java.i
 data/test/tools/javac/generics/PermuteBound.java.i
 data/test/tools/javac/EarlyAssert.java.i
-data/test/tools/javac/typeAnnotations/failures/OldArray.out.i
+data/test/tools/apt/Scanners/MemberOrderApf.java.i
 data/test/tools/javac/literals/BadUnderscoreLiterals.java.i
-data/make/netbeans/javah/nbproject/project.xml.i
-data/test/tools/javac/diags/examples/AnnotationMissingValue.java.i
+data/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded1/testfile.txt.i
+data/test/com/sun/javadoc/WindowTitles/WindowTitles.java.i
 data/test/tools/javac/Capture.java.i
-data/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedPluralAdditional.java.i
+data/test/tools/javac/ClassLiterals/evalinit/ClassLiteralEvalInit.java.i
 data/test/tools/apt/Scanners/Order.java.i
-data/test/tools/javac/processing/errors/Foo.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java.i
 data/test/tools/javadoc/imports/I.java.i
 data/test/tools/javac/policy/D.java.i
 data/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java.i
-data/test/tools/javac/processing/6512707/TestEnum.java.i
+data/test/tools/javac/generics/inference/5021635/T5021635.java.i
 data/test/tools/javac/6400383/T6400383.java.i
-data/test/tools/javac/Closure3.java.i
+data/test/com/sun/javadoc/testValueTag/pkg1/CustomTagUsage.java.i
 data/src/share/classes/com/sun/mirror/declaration/AnnotationMirror.java.i
 data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourcePath.java.i
 data/test/tools/javac/generics/diamond/neg/Neg05.out.i
 data/src/share/classes/com/sun/source/tree/InstanceOfTree.java.i
-data/test/tools/javac/scope/6225935/Baz.java.i
-data/test/tools/javac/api/T6400205.java.i
+data/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java.i
+data/test/tools/javac/AccessMethods/ChainedAssignment.java.i
 data/test/tools/javac/T5090006/broken.jar.i
 data/test/com/sun/javadoc/testSubTitle/TestSubTitle.java.i
 data/src/share/classes/com/sun/tools/javac/comp/Todo.java.i
 data/test/tools/javac/enum/DA3.java.i
-data/test/tools/javap/typeAnnotations/ClassLiterals.java.i
+data/make/test/contents.sh.i
 data/test/tools/javac/processing/model/type/NoTypes.java.i
 data/test/tools/javac/Closure4.java.i
 data/test/tools/javadoc/annotations/annotatePackage/pkg2/package.html.i
 data/test/tools/javac/6979683/TestCast6979683_BAD37.java.errlog.i
-data/test/tools/javac/diags/examples/EnumAsIdentifier.java.i
-data/test/tools/javac/warnings/6594914/T6594914b.out.i
+data/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java.i
+data/test/tools/javac/boxing/Boxing2.java.i
+data/test/tools/javac/processing/Xprint.java.i
 data/test/tools/javac/diags/examples/CantImplement.java.i
 data/test/tools/javac/importContext/anonPackage/Foo.java.i
 data/test/tools/javac/generics/wildcards/neg/CastWarn12.java.i
-data/test/tools/javac/modules/ModulePermitsAttributeTest01.java.i
-data/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java.i
+data/test/tools/javac/annotations/default/Derr.java.i
+data/test/tools/javac/api/6411310/Test.java.i
 data/test/tools/javac/Paths/SameJVM.java.i
-data/test/tools/javadoc/annotations/missing/Main.java.i
+data/test/tools/apt/Scanners/TestEnum.java.i
 data/test/tools/javac/importContext/namedPackage/bar/Baz.java.i
 data/test/tools/javac/proprietary/WarnImport.java.i
 data/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java.i
-data/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E2.java.i
-data/test/tools/javac/warnings/FallThrough.lintAll.out.i
-data/test/tools/javadoc/enum/docComments/pkg1/Operation.java.i
+data/test/com/sun/javadoc/testModifier/Test.java.i
+data/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java.i
+data/test/tools/javac/T6794959.java.i
+data/test/tools/javac/diags/examples/AnnosWithoutProcessors/AnnosWithoutProcessors.java.i
 data/test/tools/javac/OverrideChecks/6400189/T6400189a.java.i
 data/test/tools/javac/multicatch/Neg01.java.i
-data/test/tools/javac/6857948/T6857948.java.i
+data/test/tools/javac/generics/6910550/T6910550e.out.i
 data/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.out.i
 data/test/tools/javac/typeAnnotations/6967002/T6967002.java.i
+data/test/tools/javac/7024568/T7024568.out.i
 data/test/tools/javac/diags/examples/AnnoValueMustBeClassLiteral.java.i
 data/test/com/sun/javadoc/testDocFileDir/pkg/C.java.i
-data/test/tools/javac/6521805/p/Outer.java.i
+data/test/tools/javac/processing/model/element/TestAnonSourceNames.java.i
 data/test/com/sun/javadoc/testNavagation/pkg/A.java.i
-data/test/tools/javac/meth/InvokeMH_BAD72.java.i
+data/test/tools/javac/scope/6392998/T6392998.java.i
 data/test/tools/javac/enum/NoFinal2.java.i
 data/test/tools/javac/diags/examples/IntNumberTooLarge.java.i
-data/test/tools/javah/ConstMacroTest.sh.i
-data/test/tools/javac/TryWithResources/ResourceTypeVar.java.i
+data/test/tools/javac/typeAnnotations/newlocations/MethodTypeArgs.java.i
+data/test/tools/javac/DefiniteAssignment/T4704365.java.i
 data/test/tools/javac/protectedAccess/ProtectedMemberAccess5/z2/Z2.java.i
-data/test/tools/javac/sourcePath2/SourcePath2.java.i
+data/test/com/sun/javadoc/testLinkOption/package-list.i
 data/test/tools/javadoc/generics/genericInterface/Main.java.i
 data/test/tools/javac/cast/7005095/T7005095neg.out.i
-data/test/tools/javac/generics/T5094318.java.i
+data/test/com/sun/javadoc/testThrowsTag/pkg/T1.java.i
 data/test/tools/javah/6257087/foo.java.i
 data/test/tools/javac/diags/examples/CantExtendIntfAnno.java.i
 data/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java.i
 data/test/tools/javac/6520152/T6520152.java.i
 data/test/tools/javac/EmptyArray.java.i
 data/test/tools/javac/diags/examples/AlreadyDefinedImport.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/type/AnnotationTypeImpl.java.i
 data/test/tools/javadoc/annotations/annotateMethodsFields/pkg1/A.java.i
-data/test/tools/javac/scope/6392998/T6392998.java.i
-data/test/tools/javac/generics/wildcards/neg/CastFail2.java.i
+data/test/tools/javac/meth/InvokeMH_BAD72.java.i
+data/test/tools/javac/StringsInSwitch/RSCL1.out.i
 data/test/tools/javac/IllegalAnnotation.out.i
-data/test/tools/javap/T6715767.java.i
+data/test/tools/javac/6734819/T6734819c.out.i
 data/test/tools/javac/diags/examples/WrongNumberTypeArgs.java.i
diff --git a/langtools/.hg/store/undo b/langtools/.hg/store/undo
index 68018e1..28e8b69 100644
Binary files a/langtools/.hg/store/undo and b/langtools/.hg/store/undo differ
diff --git a/langtools/.hg/undo.desc b/langtools/.hg/undo.desc
index 5d85ed1..2564977 100644
--- a/langtools/.hg/undo.desc
+++ b/langtools/.hg/undo.desc
@@ -1,3 +1,3 @@
-1168
+1169
 pull
 http://hg.openjdk.java.net/jigsaw/jigsaw/langtools
diff --git a/langtools/.hg/undo.dirstate b/langtools/.hg/undo.dirstate
index cbf2265..749c1bd 100644
Binary files a/langtools/.hg/undo.dirstate and b/langtools/.hg/undo.dirstate differ
diff --git a/langtools/.hgtags b/langtools/.hgtags
index 6f1a202..6d35db6 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -136,3 +136,13 @@ f497fac86cf9ada4801ecaf49eb0d2307a2b61c8 jdk8-b03
 d2422276f9dabc848b7a079025719826d2f9a30f jdk8-b06
 116980ecec5cc7d52736f09cf332321e0773265f jdk8-b07
 e8acc2d6c32f0c8321e642e1a86672a2e196a056 jdk8-b08
+b7a7e47c8d3daf7822abf7c37e5179ccbbf53008 jdk8-b09
+f6c783e18bdf4d46a0ab273868afebbf32600ff7 jdk8-b10
+4bf01f1c4e3464f378959d10f3983a0469181d94 jdk8-b11
+f2d6ed25857dfa7f269ac66e13666d648cb988c6 jdk8-b12
+ae25163501bc7477cd907e26a006a6f1b05fdb6d jdk8-b13
+58f1325d72b2bacc901f5189ee5e4e81e81ea657 jdk8-b14
+07599bd780cab1f40da7915e1dc6774629b0cf8c jdk8-b15
+1cbe86c11ba69521875c0b0357d7540781eb334d jdk8-b17
+ec2c0973cc31e143cffc05ceb63d98fae76f97d4 jdk8-b16
+ab1b1cc7857716914f2bb20b3128e5a8978290f7 jdk8-b18
diff --git a/langtools/make/build.properties b/langtools/make/build.properties
index 5e15770..bcd70b8 100644
--- a/langtools/make/build.properties
+++ b/langtools/make/build.properties
@@ -130,21 +130,29 @@ javac.includes = \
 javac.tests = \
         tools/javac
 
-javac.module.name = jdk.javac
-javac.module.includes = \
-    com/sun/source/** \
-    com/sun/tools/javac/**
-javac.module.excludes = \
-    com/sun/tools/javac/Launcher.class
-
 # Additional modules for langtools public API
 
-langtools.module.name = jdk.compiler
-langtools.module.includes = \
+javax.tools.module.name = jdk.compiler
+javax.tools.module.includes = \
     javax/tools/** \
     javax/lang/model/** \
     javax/annotation/processing/**
 
+#
+
+langtools.module.name = jdk.devtools
+langtools.module.includes = \
+    com/sun/source/** \
+    com/sun/tools/javac/** \
+    com/sun/tools/javah/** \
+    com/sun/tools/javap/** \
+    com/sun/tools/classfile/** \
+    com/sun/javadoc/** \
+    com/sun/tools/doclets/** \
+    com/sun/tools/javadoc/**
+
+#
+
 mirror.module.name = jdk.mirror
 mirror.module.includes = \
     com/sun/mirror/**
@@ -158,12 +166,6 @@ javadoc.includes = \
 javadoc.tests = \
         tools/javadoc/
 
-javadoc.module.name = jdk.javadoc
-javadoc.module.includes = \
-    com/sun/javadoc/** \
-    com/sun/tools/doclets/** \
-    com/sun/tools/javadoc/**
-
 #
 
 doclets.includes = \
@@ -182,10 +184,6 @@ javah.includes = \
 javah.tests = \
         tools/javah/
 
-javah.module.name = jdk.javah
-javah.module.includes = \
-    com/sun/tools/javah/**
-
 #
 
 javap.includes = \
@@ -195,11 +193,6 @@ javap.includes = \
 javap.tests = \
         tools/javap/
 
-javap.module.name = jdk.javap
-javap.module.includes = \
-    com/sun/tools/classfile/** \
-    com/sun/tools/javap/**
-
 #
 
 apt.includes = \
@@ -235,6 +228,10 @@ import.jdk.stub.files = \
 # Override as desired to run a specific set of tests
 jtreg.tests =
 
+# Check style configuration
+# overridable name and version
+checkstyle.name.version = checkstyle-5.4
+
 # Set the verbosity used for displaying bootstrap.opts. The value should
 # be suitable for the level attribute of the echo task.
 bootstrap.opts.verbose=verbose
diff --git a/langtools/make/build.xml b/langtools/make/build.xml
index a19ce17..6309d26 100644
--- a/langtools/make/build.xml
+++ b/langtools/make/build.xml
@@ -133,8 +133,10 @@
     <property name="dist.bin.dir" location="${dist.dir}/bin"/>
     <property name="dist.coverage.dir" location="${dist.dir}/coverage"/>
     <property name="dist.findbugs.dir" location="${dist.dir}/findbugs"/>
+    <property name="dist.checkstyle.dir" location="${dist.dir}/checkstyle"/>
     <property name="dist.lib.dir" location="${dist.dir}/lib"/>
     <property name="make.dir" location="make"/>
+    <property name="make.conf.dir" location="${make.dir}/conf"/>
     <property name="make.tools.dir" location="${make.dir}/tools"/>
     <property name="src.dir" location="src"/>
     <property name="src.bin.dir" location="${src.dir}/share/bin"/>
@@ -312,6 +314,41 @@
         <jtreg-tool name="all" tests="${jtreg.tests}"/>
     </target>
 
+    <target name="checkstyle" depends="-def-checkstyle"
+        description="Generates reports for code convention violations.">
+        <mkdir dir="${dist.checkstyle.dir}"/>
+        <checkstyle config="${make.conf.dir}/checkstyle-langtools.xml"
+              failureProperty="checkstyle.failure"
+              failOnViolation="false">
+            <formatter type="xml" tofile="${dist.checkstyle.dir}/checkstyle_report.xml"/>
+            <fileset dir="src" includes="**/*.java, **/*.properties"/>
+        </checkstyle>
+        <!-- transform the output to a simple html -->
+        <xslt  in="${dist.checkstyle.dir}/checkstyle_report.xml"
+               out="${dist.checkstyle.dir}/checkstyle_report.html"
+               style="${checkstyle.home}/contrib/checkstyle-simple.xsl"/>            
+        <!-- transform the output to a very simple emacs friendly text file -->
+        <xslt  in="${dist.checkstyle.dir}/checkstyle_report.xml"
+               out="${dist.checkstyle.dir}/checkstyle_report.tmp"
+               style="${make.conf.dir}/checkstyle-emacs.xsl"/>
+        <!-- beautify remove extra lines -->
+        <move file="${dist.checkstyle.dir}/checkstyle_report.tmp"
+             toFile="${dist.checkstyle.dir}/checkstyle_report.emacs.txt">
+            <filterchain>
+                <ignoreblank/>
+                <replaceregex byline="true" pattern="^File:" replace="${line.separator}File:"/>
+            </filterchain>
+        </move>
+    </target>
+    <!-- target can be invoked from an ide, the output of which can be used
+         to access and fix the errors directly.
+     -->
+    <target name="checkstyle-ide" depends="checkstyle">
+        <concat>
+            <fileset file="${dist.checkstyle.dir}/checkstyle_report.emacs.txt"/>
+        </concat>  
+    </target>
+    
     <target name="findbugs" depends="-def-findbugs,build-all-tools">
         <property name="findbugs.reportLevel" value="medium"/>
         <mkdir dir="${dist.findbugs.dir}"/>
@@ -455,6 +492,7 @@
         <echo level="info">target.java.home = ${target.java.home}</echo>
         <echo level="info">jtreg.home = ${jtreg.home}</echo>
         <echo level="info">findbugs.home = ${findbugs.home}</echo>
+        <echo level="info">checkstyle.home = ${checkstyle.home}</echo>
     </target>
 
     <target name="post-sanity" depends="-def-jtreg,sanity,build"
@@ -502,16 +540,8 @@
         <build-bootstrap-classes includes="${javac.includes}"/>
     </target>
 
-    <target name="build-bootstrap-module-javac" depends="build-bootstrap-classes-javac,build-bootstrap-module-langtools"
-            if="boot.java.provides.modules">
-        <build-bootstrap-module module.name="${javac.module.name}"
-            includes="${javac.module.includes}"
-            excludes="${javac.module.excludes}"
-            />
-    </target>
-
     <target name="build-bootstrap-javac"
-            depends="build-bootstrap-classes-javac,build-bootstrap-module-javac,-def-build-bootstrap-jar,-def-build-bootstrap-tool">
+            depends="build-bootstrap-classes-javac,build-bootstrap-module-langtools,-def-build-bootstrap-jar,-def-build-bootstrap-tool">
         <build-bootstrap-jar     name="javac" includes="${javac.includes}"/>
         <build-bootstrap-tool    name="javac"/>
     </target>
@@ -520,15 +550,7 @@
         <build-classes includes="${javac.includes}"/>
     </target>
 
-    <target name="build-module-javac" depends="build-classes-javac,build-module-langtools,-def-build-module"
-            if="target.java.provides.modules">
-        <build-module module.name="${javac.module.name}"
-            includes="${javac.module.includes}"
-            excludes="${javac.module.excludes}"
-            />
-    </target>
-
-    <target name="build-javac" depends="build-classes-javac,build-module-javac">
+    <target name="build-javac" depends="build-classes-javac,build-module-langtools">
         <build-jar  name="javac" includes="${javac.includes}"/>
         <build-tool name="javac"/>
     </target>
@@ -549,18 +571,29 @@
 
     <!-- langtools module targets -->
 
-    <target name="build-bootstrap-module-langtools"
+    <target name="build-bootstrap-module-javax-tools"
             depends="build-bootstrap-classes-javac,-def-build-bootstrap-module"
             if="boot.java.provides.modules">
+        <build-bootstrap-module module.name="${javax.tools.module.name}" includes="${javax.tools.module.includes}"/>
+    </target>
+
+    <target name="build-module-javax-tools" depends="build-classes-javac,-def-build-module"
+            if="target.java.provides.modules">
+        <build-module module.name="${javax.tools.module.name}" includes="${javax.tools.module.includes}"/>
+    </target>
+    
+    <target name="build-bootstrap-module-langtools"
+            depends="build-bootstrap-classes-javac,build-bootstrap-classes-javah,build-bootstrap-classes-javap,build-bootstrap-classes-javadoc,build-bootstrap-classes-doclets,build-bootstrap-module-javax-tools,-def-build-bootstrap-module"
+            if="boot.java.provides.modules">
         <build-bootstrap-module module.name="${langtools.module.name}" includes="${langtools.module.includes}"/>
     </target>
 
-    <target name="build-module-langtools" depends="build-classes-javac,-def-build-module"
+    <target name="build-module-langtools"
+            depends="build-classes-javac,build-classes-javah,build-classes-javap,build-classes-javadoc,build-classes-doclets,build-module-javax-tools,-def-build-module"
             if="target.java.provides.modules">
         <build-module module.name="${langtools.module.name}" includes="${langtools.module.includes}"/>
     </target>
 
-
     <!--
     **** javadoc targets.
     -->
@@ -570,16 +603,8 @@
         <build-bootstrap-classes includes="${javadoc.includes}"/>
     </target>
 
-    <target name="build-bootstrap-module-javadoc"
-            depends="build-bootstrap-classes-javadoc,build-bootstrap-classes-doclets,build-bootstrap-module-javac"
-            if="boot.java.provides.modules">
-        <build-bootstrap-module module.name="${javadoc.module.name}"
-            includes="${javadoc.module.includes}"
-            />
-    </target>
-
     <target name="build-bootstrap-javadoc"
-            depends="build-bootstrap-classes-javadoc,build-bootstrap-module-javadoc,build-bootstrap-javac">
+            depends="build-bootstrap-classes-javadoc,build-bootstrap-javac,build-bootstrap-module-langtools">
         <build-bootstrap-jar     name="javadoc" includes="${javadoc.includes}"
                                  jarclasspath="javac.jar doclets.jar"/>
         <build-bootstrap-tool    name="javadoc"/>
@@ -589,12 +614,7 @@
         <build-classes includes="${javadoc.includes}"/>
     </target>
 
-    <target name="build-module-javadoc" depends="build-classes-javadoc,build-classes-doclets,build-module-javac"
-            if="target.java.provides.modules">
-        <build-module module.name="${javadoc.module.name}" includes="${javadoc.module.includes}"/>
-    </target>
-
-    <target name="build-javadoc" depends="build-javac,build-classes-javadoc,build-module-javadoc">
+    <target name="build-javadoc" depends="build-javac,build-classes-javadoc,build-module-langtools">
         <build-jar  name="javadoc" includes="${javadoc.includes}"
                     jarclasspath="javac.jar doclets.jar"/>
         <build-tool name="javadoc"/>
@@ -662,16 +682,8 @@
         <build-bootstrap-classes includes="${javah.includes}"/>
     </target>
 
-    <target name="build-bootstrap-module-javah"
-            depends="build-bootstrap-classes-javah,build-bootstrap-module-javac"
-            if="boot.java.provides.modules">
-        <build-bootstrap-module module.name="${javah.module.name}"
-            includes="${javah.module.includes}"
-            />
-    </target>
-
     <target name="build-bootstrap-javah"
-            depends="build-bootstrap-classes-javah,build-bootstrap-module-javah,build-bootstrap-javac">
+            depends="build-bootstrap-classes-javah,build-bootstrap-javac,build-bootstrap-module-langtools">
         <build-bootstrap-jar     name="javah" includes="${javah.includes}"
                                  jarclasspath="javac.jar"/>
         <build-bootstrap-tool    name="javah"/>
@@ -681,12 +693,7 @@
         <build-classes includes="${javah.includes}"/>
     </target>
 
-    <target name="build-module-javah" depends="build-classes-javah,build-module-javac"
-            if="target.java.provides.modules">
-        <build-module module.name="${javah.module.name}" includes="${javah.module.includes}"/>
-    </target>
-
-    <target name="build-javah" depends="build-javac,build-classes-javah,build-module-javah">
+    <target name="build-javah" depends="build-javac,build-classes-javah,build-module-langtools">
         <build-jar  name="javah" includes="${javah.includes}" jarclasspath="javac.jar"/>
         <build-tool name="javah"/>
     </target>
@@ -713,16 +720,8 @@
         <build-bootstrap-classes includes="${javap.includes}"/>
     </target>
 
-    <target name="build-bootstrap-module-javap"
-            depends="build-bootstrap-classes-javap,build-bootstrap-module-javac"
-            if="boot.java.provides.modules">
-        <build-bootstrap-module module.name="${javap.module.name}"
-            includes="${javap.module.includes}"
-            />
-    </target>
-
     <target name="build-bootstrap-javap"
-            depends="build-bootstrap-classes-javap,build-bootstrap-module-javap,build-bootstrap-javac">
+            depends="build-bootstrap-classes-javap,build-bootstrap-javac,build-bootstrap-module-langtools">
         <build-bootstrap-jar     name="javap" includes="${javap.includes}"
                                  jarclasspath="javac.jar"/>
         <build-bootstrap-tool    name="javap"/>
@@ -732,12 +731,7 @@
         <build-classes includes="${javap.includes}"/>
     </target>
 
-    <target name="build-module-javap" depends="build-classes-javap,build-module-javac"
-            if="target.java.provides.modules">
-        <build-module module.name="${javap.module.name}" includes="${javap.module.includes}"/>
-    </target>
-
-    <target name="build-javap" depends="build-javac,build-classes-javap,build-module-javap">
+    <target name="build-javap" depends="build-javac,build-classes-javap,build-module-langtools">
         <build-jar  name="javap" includes="${javap.includes}"
                     jarmainclass="com.sun.tools.javap.Main"
                     jarclasspath="javac.jar"/>
@@ -767,7 +761,7 @@
     </target>
 
     <target name="build-bootstrap-module-apt"
-            depends="build-bootstrap-classes-apt,build-bootstrap-module-javac,build-bootstrap-module-mirror"
+            depends="build-bootstrap-classes-apt,build-bootstrap-module-mirror,build-bootstrap-module-langtools"
             if="boot.java.provides.modules">
         <build-bootstrap-module module.name="${apt.module.name}"
             includes="${apt.module.includes}"
@@ -785,7 +779,7 @@
         <build-classes includes="${apt.includes}"/>
     </target>
 
-    <target name="build-module-apt" depends="build-classes-apt,build-module-javac,build-module-mirror"
+    <target name="build-module-apt" depends="build-classes-apt,build-module-mirror,build-module-langtools"
             if="target.java.provides.modules">
         <build-module module.name="${apt.module.name}" includes="${apt.module.includes}"/>
     </target>
@@ -860,6 +854,10 @@
         <check name="findbugs" property="findbugs.home" marker="lib/findbugs.jar"/>
     </target>
 
+    <target name="-check-checkstyle.home" depends="-def-check">
+        <check name="checkstyle" property="checkstyle.home" marker="${checkstyle.name.version}.jar"/>
+    </target>
+    
     <target name="-check-jtreg.home" depends="-def-check">
         <check name="jtreg" property="jtreg.home" marker="lib/jtreg.jar"/>
     </target>
@@ -1238,6 +1236,16 @@
         <taskdef classpathref="cobertura.classpath" resource="tasks.properties"/>
     </target>
 
+    <target name="-def-checkstyle" unless="checkstyle.defined"
+        depends="-check-checkstyle.home">
+        <taskdef resource="checkstyletask.properties">
+            <classpath>
+                <pathelement location="${checkstyle.home}/${checkstyle.name.version}-all.jar"/>
+            </classpath>
+        </taskdef>
+        <property name="checkstyle.defined" value="true"/>
+    </target>
+    
     <target name="-def-findbugs" unless="findbugs.defined"
         depends="-check-findbugs.home,-check-target.java.home">
         <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask">
diff --git a/langtools/make/conf/checkstyle-emacs.xsl b/langtools/make/conf/checkstyle-emacs.xsl
new file mode 100644
index 0000000..836bb40
--- /dev/null
+++ b/langtools/make/conf/checkstyle-emacs.xsl
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="text" omit-xml-declaration="yes"/>
+
+<xsl:template match="/">
+Coding Style Check Results
+--------------------------
+Total files checked: <xsl:number level="any" value="count(descendant::file)"/>
+  Files with errors: <xsl:number level="any" value="count(descendant::file[error])"/>
+       Total errors: <xsl:number level="any" value="count(descendant::error)"/>
+    Errors per file: <xsl:number level="any" value="count(descendant::error) div count(descendant::file)"/>
+<xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="file[error]">
+<xsl:apply-templates select="error"/>
+</xsl:template>
+
+<xsl:template match="error">
+<xsl:value-of select="../@name"/>:<xsl:value-of select="@line"/><xsl:text>: </xsl:text><xsl:value-of select="@message"/><xsl:text>
+</xsl:text>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/langtools/make/conf/checkstyle-langtools.xml b/langtools/make/conf/checkstyle-langtools.xml
new file mode 100644
index 0000000..148161a
--- /dev/null
+++ b/langtools/make/conf/checkstyle-langtools.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+          "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+          "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+   Checks for initial langtools code conventions, we are starting with
+   imports and import orders and this will grow to encompass other
+   violations over time. 
+-->
+
+<module name="Checker">
+    
+    <!-- Checks for whitespace. -->
+    <module name="FileTabCharacter">
+        <property name="fileExtensions" value=".java"/>
+    </module>
+
+    <!-- Miscellaneous other checks.                   -->
+    <module name="RegexpSingleline">
+        <property name="format" value="\s+$"/>
+        <property name="minimum" value="0"/>
+        <property name="maximum" value="0"/>
+        <property name="message" value="Line has trailing spaces."/>
+        <property name="fileExtensions" value=".java .html"/>
+    </module>
+
+    <module name="TreeWalker">
+    <!-- Checks for imports                              -->
+    <!--
+        <module name="AvoidStarImport"/>
+        <module name="IllegalImport"/>
+    -->
+        <module name="GenericWhitespace"/>
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>  
+        <module name="ImportOrder">
+            <property name="groups" value="java, javax, org, com"/>
+            <property name="ordered" value="true"/>
+            <property name="separated" value="true"/>
+        </module>        
+        <module name="EmptyForInitializerPad">
+            <property name="option" value="space"/>
+        </module>
+        <module name="WhitespaceAfter"/>
+    </module>
+</module>
\ No newline at end of file
diff --git a/langtools/make/jprt.properties b/langtools/make/jprt.properties
index cb67b3c..a4ef7fd 100644
--- a/langtools/make/jprt.properties
+++ b/langtools/make/jprt.properties
@@ -25,23 +25,38 @@
 
 # Properties for jprt
 
-# The release to build
+# Locked down to jdk8
 jprt.tools.default.release=jdk8
 
 # The different build flavors we want, we override here so we just get these 2
 jprt.build.flavors=product,fastdebug
 
 # Standard list of jprt build targets for this source tree
-jprt.build.targets= 						\
-    solaris_sparc_5.10-{product|fastdebug}, 			\
-    solaris_sparcv9_5.10-{product|fastdebug}, 			\
-    solaris_i586_5.10-{product|fastdebug}, 			\
-    solaris_x64_5.10-{product|fastdebug}, 			\
-    linux_i586_2.6-{product|fastdebug}, 			\
-    linux_x64_2.6-{product|fastdebug}, 				\
-    windows_i586_5.1-{product|fastdebug}, 			\
+jprt.build.targets=                                             \
+    solaris_sparc_5.10-{product|fastdebug},                     \
+    solaris_sparcv9_5.10-{product|fastdebug},                   \
+    solaris_i586_5.10-{product|fastdebug},                      \
+    solaris_x64_5.10-{product|fastdebug},                       \
+    linux_i586_2.6-{product|fastdebug},                         \
+    linux_x64_2.6-{product|fastdebug},                          \
+    windows_i586_5.1-{product|fastdebug},                       \
     windows_x64_5.2-{product|fastdebug}
 
+# Test target list (no fastdebug & limited c2 testing)
+jprt.my.test.target.set= 					\
+    solaris_sparc_5.10-product-c1-TESTNAME,                     \
+    solaris_sparcv9_5.10-product-c2-TESTNAME,                   \
+    solaris_i586_5.10-product-c1-TESTNAME,                      \
+    solaris_x64_5.10-product-c2-TESTNAME,                       \
+    linux_i586_2.6-product-{c1|c2}-TESTNAME,                    \
+    linux_x64_2.6-product-c2-TESTNAME,                          \
+    windows_i586_5.1-product-c1-TESTNAME,                       \
+    windows_x64_5.2-product-c2-TESTNAME
+
+# Default test targets
+jprt.make.rule.test.targets=					\
+    ${jprt.my.test.target.set:TESTNAME=jtreg}
+
 # Directories to be excluded from the source bundles
 jprt.bundle.exclude.src.dirs=build dist webrev
 
diff --git a/langtools/make/tools/GenStubs/GenStubs.java b/langtools/make/tools/GenStubs/GenStubs.java
index 5c5e5ac..c3c39f3 100644
--- a/langtools/make/tools/GenStubs/GenStubs.java
+++ b/langtools/make/tools/GenStubs/GenStubs.java
@@ -298,9 +298,9 @@ public class GenStubs {
             tree.accept(this);
             ListBuffer<JCTree> defs = new ListBuffer<JCTree>();
             for (JCTree def: tree.defs) {
-                if (def.getTag() == JCTree.IMPORT) {
+                if (def.hasTag(JCTree.Tag.IMPORT)) {
                     JCImport imp = (JCImport) def;
-                    if (imp.qualid.getTag() == JCTree.SELECT) {
+                    if (imp.qualid.hasTag(JCTree.Tag.SELECT)) {
                         JCFieldAccess qualid = (JCFieldAccess) imp.qualid;
                         if (!qualid.name.toString().equals("*")
                                 && !names.contains(qualid.name)) {
diff --git a/langtools/src/share/classes/com/sun/source/tree/EntrypointDirectiveTree.java b/langtools/src/share/classes/com/sun/source/tree/EntrypointDirectiveTree.java
new file mode 100644
index 0000000..3d10a12
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/source/tree/EntrypointDirectiveTree.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2009, 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.
+ */
+
+package com.sun.source.tree;
+
+public interface EntrypointDirectiveTree extends ModuleDirectiveTree {
+    ExpressionTree getClassName();
+}
diff --git a/langtools/src/share/classes/com/sun/source/tree/ExportDirectiveTree.java b/langtools/src/share/classes/com/sun/source/tree/ExportDirectiveTree.java
new file mode 100644
index 0000000..8d22f10
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/source/tree/ExportDirectiveTree.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2009, 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.
+ */
+
+package com.sun.source.tree;
+
+/**
+ *
+ */
+public interface ExportDirectiveTree extends ModuleDirectiveTree {
+    ExpressionTree getExportName();
+}
diff --git a/langtools/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java b/langtools/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java
new file mode 100644
index 0000000..61ae45a
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package com.sun.source.tree;
+
+import java.util.List;
+
+/**
+ * A tree node for a lambda expression.
+ *
+ * For example:
+ * <pre>
+ *   ()->{}
+ *   (List<String> ls)->ls.size()
+ *   (x,y)-> { return x + y; }
+ * </pre>
+ */
+public interface LambdaExpressionTree extends ExpressionTree {
+
+    /**
+     * Lambda expressions come in two forms: (i) expression lambdas, whose body
+     * is an expression, and (ii) statement lambdas, whose body is a block
+     */
+    public enum BodyKind {
+        /** enum constant for expression lambdas */
+        EXPRESSION,
+        /** enum constant for statement lambdas */
+        STATEMENT;
+    }
+
+    List<? extends VariableTree> getParameters();
+    Tree getBody();
+    BodyKind getBodyKind();
+}
diff --git a/langtools/src/share/classes/com/sun/source/tree/MemberReferenceTree.java b/langtools/src/share/classes/com/sun/source/tree/MemberReferenceTree.java
new file mode 100644
index 0000000..68efd16
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/source/tree/MemberReferenceTree.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package com.sun.source.tree;
+
+import java.util.List;
+
+import javax.lang.model.element.Name;
+
+/**
+ * A tree node for a member reference expression.
+ *
+ * For example:
+ * <pre>
+ *   <em>expression</em> # <em>[ identifier | new ]</em>
+ * </pre>
+ *
+ * @see JSR 292
+ */
+public interface MemberReferenceTree extends ExpressionTree {
+
+    /**
+     * There are two kinds of member references: (i) method references and
+     * (ii) constructor references
+     */
+    public enum ReferenceMode {
+        /** enum constant for method references */
+        INVOKE,
+        /** enum constant for constructor references */
+        NEW
+    }
+    ReferenceMode getMode();
+    ExpressionTree getQualifierExpression();
+    Name getName();
+    List<? extends ExpressionTree> getTypeArguments();
+}
diff --git a/langtools/src/share/classes/com/sun/source/tree/ModuleDirectiveTree.java b/langtools/src/share/classes/com/sun/source/tree/ModuleDirectiveTree.java
new file mode 100644
index 0000000..6d36c0c
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/source/tree/ModuleDirectiveTree.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package com.sun.source.tree;
+
+/**
+ * A super-type for all the directives in a ModuleTree.
+ */
+public interface ModuleDirectiveTree extends Tree { }
diff --git a/langtools/src/share/classes/com/sun/source/tree/ModuleIdQueryTree.java b/langtools/src/share/classes/com/sun/source/tree/ModuleIdQueryTree.java
new file mode 100644
index 0000000..c126c76
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/source/tree/ModuleIdQueryTree.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2009, 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.
+ */
+
+package com.sun.source.tree;
+
+import javax.lang.model.element.Name;
+
+/**
+ *
+ */
+public interface ModuleIdQueryTree extends Tree {
+    Tree getName();
+    Name getVersionQuery();
+}
diff --git a/langtools/src/share/classes/com/sun/source/tree/ModuleIdTree.java b/langtools/src/share/classes/com/sun/source/tree/ModuleIdTree.java
index 633a4f4..d2ae1fe 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ModuleIdTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ModuleIdTree.java
@@ -31,6 +31,6 @@ import javax.lang.model.element.Name;
  *
  */
 public interface ModuleIdTree extends Tree {
-    Tree getModuleName();
-    Name getModuleVersion();
+    Tree getName();
+    Name getVersion();
 }
diff --git a/langtools/src/share/classes/com/sun/source/tree/ModuleTree.java b/langtools/src/share/classes/com/sun/source/tree/ModuleTree.java
index 2d278bf..362ca20 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ModuleTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ModuleTree.java
@@ -32,8 +32,7 @@ import java.util.List;
  *
  */
 public interface ModuleTree extends Tree {
-    List<? extends AnnotationTree> getAnnotations();
     ModuleIdTree getId();
-    List<? extends ModuleIdTree> getProvides();
-    List<? extends Tree> getMetadataList();
+    List<? extends ModuleDirectiveTree> getDirectives();
+    CharSequence getExtendedMetadata();
 }
diff --git a/langtools/src/share/classes/com/sun/source/tree/PermitsDirectiveTree.java b/langtools/src/share/classes/com/sun/source/tree/PermitsDirectiveTree.java
new file mode 100644
index 0000000..b25fdb1
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/source/tree/PermitsDirectiveTree.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2009, 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.
+ */
+
+package com.sun.source.tree;
+
+/**
+ *
+ */
+public interface PermitsDirectiveTree extends Tree {
+    Tree getModuleName();
+}
diff --git a/langtools/src/share/classes/com/sun/source/tree/ProvidesModuleDirectiveTree.java b/langtools/src/share/classes/com/sun/source/tree/ProvidesModuleDirectiveTree.java
new file mode 100644
index 0000000..f96ee7e
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/source/tree/ProvidesModuleDirectiveTree.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2009, 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.
+ */
+
+package com.sun.source.tree;
+
+public interface ProvidesModuleDirectiveTree extends ModuleDirectiveTree {
+    ModuleIdTree getModuleId();
+}
+
diff --git a/langtools/src/share/classes/com/sun/source/tree/ProvidesServiceDirectiveTree.java b/langtools/src/share/classes/com/sun/source/tree/ProvidesServiceDirectiveTree.java
new file mode 100644
index 0000000..1a0b451
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/source/tree/ProvidesServiceDirectiveTree.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2009, 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.
+ */
+
+package com.sun.source.tree;
+
+/*
+ *
+ */
+public interface ProvidesServiceDirectiveTree extends ModuleDirectiveTree {
+    ExpressionTree getServiceName();
+    ExpressionTree getImplementationName();
+}
+
+
diff --git a/langtools/src/share/classes/com/sun/source/tree/RequiresFlag.java b/langtools/src/share/classes/com/sun/source/tree/RequiresFlag.java
new file mode 100644
index 0000000..0670deb
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/source/tree/RequiresFlag.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package com.sun.source.tree;
+
+/**
+ *
+ */
+public enum RequiresFlag {
+    OPTIONAL,
+    LOCAL,
+    PUBLIC
+}
diff --git a/langtools/src/share/classes/com/sun/source/tree/RequiresModuleDirectiveTree.java b/langtools/src/share/classes/com/sun/source/tree/RequiresModuleDirectiveTree.java
new file mode 100644
index 0000000..8cd7f05
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/source/tree/RequiresModuleDirectiveTree.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2009, 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.
+ */
+
+package com.sun.source.tree;
+
+import java.util.List;
+
+public interface RequiresModuleDirectiveTree extends ModuleDirectiveTree {
+    List<RequiresFlag> getFlags();
+    ModuleIdQueryTree getModuleIdQuery();
+}
diff --git a/langtools/src/share/classes/com/sun/source/tree/RequiresServiceDirectiveTree.java b/langtools/src/share/classes/com/sun/source/tree/RequiresServiceDirectiveTree.java
new file mode 100644
index 0000000..8bed9de
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/source/tree/RequiresServiceDirectiveTree.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2009, 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.
+ */
+
+package com.sun.source.tree;
+
+import java.util.List;
+
+public interface RequiresServiceDirectiveTree extends ModuleDirectiveTree {
+    List<RequiresFlag> getFlags();
+    ExpressionTree getServiceName();
+}
diff --git a/langtools/src/share/classes/com/sun/source/tree/Tree.java b/langtools/src/share/classes/com/sun/source/tree/Tree.java
index 74e058a..d0000d3 100644
--- a/langtools/src/share/classes/com/sun/source/tree/Tree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/Tree.java
@@ -132,6 +132,11 @@ public interface Tree {
         MEMBER_SELECT(MemberSelectTree.class),
 
         /**
+         * Used for instances of {@link MemberReferenceTree}.
+         */
+        MEMBER_REFERENCE(MemberReferenceTree.class),
+
+        /**
          * Used for instances of {@link ForLoopTree}.
          */
         FOR_LOOP(ForLoopTree.class),
@@ -187,6 +192,11 @@ public interface Tree {
         NEW_CLASS(NewClassTree.class),
 
         /**
+         * Used for instances of {@link LambdaExpressionTree}.
+         */
+        LAMBDA_EXPRESSION(LambdaExpressionTree.class),
+
+        /**
          * Used for instances of {@link ParenthesizedTree}.
          */
         PARENTHESIZED(ParenthesizedTree.class),
@@ -557,15 +567,25 @@ public interface Tree {
 
         MODULE(ModuleTree.class),
 
-        MODULE_CLASS(ModuleClassTree.class),
+        ENTRYPOINT_DIRECTIVE(EntrypointDirectiveTree.class),
 
-        MODULE_EXPORT(ModuleExportTree.class),
+        EXPORT_DIRECTIVE(ExportDirectiveTree.class),
 
         MODULE_ID(ModuleIdTree.class),
 
-        MODULE_PERMITS(ModulePermitsTree.class),
+        MODULE_ID_QUERY(ModuleIdQueryTree.class),
+
+        PERMITS_DIRECTIVE(PermitsDirectiveTree.class),
+
+        PROVIDES_MODULE_DIRECTIVE(ProvidesModuleDirectiveTree.class),
+
+        PROVIDES_SERVICE_DIRECTIVE(ProvidesServiceDirectiveTree.class),
+
+        REQUIRES_MODULE_DIRECTIVE(RequiresModuleDirectiveTree.class),
+
+        REQUIRES_SERVICE_DIRECTIVE(RequiresServiceDirectiveTree.class),
 
-        MODULE_REQUIRES(ModuleRequiresTree.class),
+        VIEW_DECLARATION(ViewDeclarationTree.class),
 
         PACKAGE(PackageTree.class),
 
diff --git a/langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java b/langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java
index ce40d93..22da09a 100644
--- a/langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java
+++ b/langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java
@@ -71,7 +71,9 @@ public interface TreeVisitor<R,P> {
     R visitConditionalExpression(ConditionalExpressionTree node, P p);
     R visitContinue(ContinueTree node, P p);
     R visitDoWhileLoop(DoWhileLoopTree node, P p);
+    R visitEntrypoint(EntrypointDirectiveTree node, P p);
     R visitErroneous(ErroneousTree node, P p);
+    R visitExport(ExportDirectiveTree node, P p);
     R visitExpressionStatement(ExpressionStatementTree node, P p);
     R visitEnhancedForLoop(EnhancedForLoopTree node, P p);
     R visitForLoop(ForLoopTree node, P p);
@@ -84,17 +86,22 @@ public interface TreeVisitor<R,P> {
     R visitMethod(MethodTree node, P p);
     R visitModifiers(ModifiersTree node, P p);
     R visitModule(ModuleTree node, P p);
-    R visitModuleClass(ModuleClassTree node, P p);
-    R visitModuleExport(ModuleExportTree node, P p);
     R visitModuleId(ModuleIdTree node, P p);
-    R visitModulePermits(ModulePermitsTree node, P p);
-    R visitModuleRequires(ModuleRequiresTree node, P p);
+    R visitModuleIdQuery(ModuleIdQueryTree node, P p);
     R visitNewArray(NewArrayTree node, P p);
     R visitNewClass(NewClassTree node, P p);
+    R visitLambdaExpression(LambdaExpressionTree node, P p);
     R visitPackage(PackageTree node, P p);
     R visitParenthesized(ParenthesizedTree node, P p);
+    R visitPermits(PermitsDirectiveTree node, P p);
+    R visitProvidesModule(ProvidesModuleDirectiveTree node, P p);
+    R visitProvidesService(ProvidesServiceDirectiveTree node, P p);
+    R visitRequiresModule(RequiresModuleDirectiveTree node, P p);
+    R visitRequiresService(RequiresServiceDirectiveTree node, P p);
+    R visitView(ViewDeclarationTree node, P p);
     R visitReturn(ReturnTree node, P p);
     R visitMemberSelect(MemberSelectTree node, P p);
+    R visitMemberReference(MemberReferenceTree node, P p);
     R visitEmptyStatement(EmptyStatementTree node, P p);
     R visitSwitch(SwitchTree node, P p);
     R visitSynchronized(SynchronizedTree node, P p);
diff --git a/langtools/src/share/classes/com/sun/source/tree/ViewDeclarationTree.java b/langtools/src/share/classes/com/sun/source/tree/ViewDeclarationTree.java
new file mode 100644
index 0000000..f8c8ac1
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/source/tree/ViewDeclarationTree.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2009, 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.
+ */
+
+package com.sun.source.tree;
+
+import java.util.List;
+
+/**
+ *
+ */
+public interface ViewDeclarationTree extends Tree {
+    ExpressionTree getName();
+    List<? extends ModuleDirectiveTree> getDirectives();
+}
diff --git a/langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java b/langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java
index e15469a..457fa10 100644
--- a/langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java
+++ b/langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java
@@ -172,6 +172,10 @@ public class SimpleTreeVisitor<R,P> implements TreeVisitor<R,P> {
         return defaultAction(node, p);
     }
 
+    public R visitLambdaExpression(LambdaExpressionTree node, P p) {
+        return defaultAction(node, p);
+    }
+
     public R visitParenthesized(ParenthesizedTree node, P p) {
         return defaultAction(node, p);
     }
@@ -208,6 +212,10 @@ public class SimpleTreeVisitor<R,P> implements TreeVisitor<R,P> {
         return defaultAction(node, p);
     }
 
+    public R visitMemberReference(MemberReferenceTree node, P p) {
+        return defaultAction(node, p);
+    }
+
     public R visitIdentifier(IdentifierTree node, P p) {
         return defaultAction(node, p);
     }
@@ -252,27 +260,58 @@ public class SimpleTreeVisitor<R,P> implements TreeVisitor<R,P> {
         return defaultAction(node, p);
     }
 
+    @Override
     public R visitModule(ModuleTree node, P p) {
         return defaultAction(node, p);
     }
 
-    public R visitModuleClass(ModuleClassTree node, P p) {
+    @Override
+    public R visitModuleId(ModuleIdTree node, P p) {
         return defaultAction(node, p);
     }
 
-    public R visitModuleExport(ModuleExportTree node, P p) {
+    @Override
+    public R visitModuleIdQuery(ModuleIdQueryTree node, P p) {
         return defaultAction(node, p);
     }
 
-    public R visitModuleId(ModuleIdTree node, P p) {
+    @Override
+    public R visitView(ViewDeclarationTree node, P p) {
+        return defaultAction(node, p);
+    }
+
+    @Override
+    public R visitEntrypoint(EntrypointDirectiveTree node, P p) {
+        return defaultAction(node, p);
+    }
+
+    @Override
+    public R visitExport(ExportDirectiveTree node, P p) {
+        return defaultAction(node, p);
+    }
+
+    @Override
+    public R visitPermits(PermitsDirectiveTree node, P p) {
+        return defaultAction(node, p);
+    }
+
+    @Override
+    public R visitProvidesModule(ProvidesModuleDirectiveTree node, P p) {
+        return defaultAction(node, p);
+    }
+
+    @Override
+    public R visitProvidesService(ProvidesServiceDirectiveTree node, P p) {
         return defaultAction(node, p);
     }
 
-    public R visitModulePermits(ModulePermitsTree node, P p) {
+    @Override
+    public R visitRequiresModule(RequiresModuleDirectiveTree node, P p) {
         return defaultAction(node, p);
     }
 
-    public R visitModuleRequires(ModuleRequiresTree node, P p) {
+    @Override
+    public R visitRequiresService(RequiresServiceDirectiveTree node, P p) {
         return defaultAction(node, p);
     }
 
diff --git a/langtools/src/share/classes/com/sun/source/util/TreeScanner.java b/langtools/src/share/classes/com/sun/source/util/TreeScanner.java
index 780472e..32160f9 100644
--- a/langtools/src/share/classes/com/sun/source/util/TreeScanner.java
+++ b/langtools/src/share/classes/com/sun/source/util/TreeScanner.java
@@ -285,6 +285,12 @@ public class TreeScanner<R,P> implements TreeVisitor<R,P> {
         return r;
     }
 
+    public R visitLambdaExpression(LambdaExpressionTree node, P p) {
+        R r = scan(node.getParameters(), p);
+        r = scanAndReduce(node.getBody(), p, r);
+        return r;
+    }
+
     public R visitParenthesized(ParenthesizedTree node, P p) {
         return scan(node.getExpression(), p);
     }
@@ -333,6 +339,12 @@ public class TreeScanner<R,P> implements TreeVisitor<R,P> {
         return scan(node.getExpression(), p);
     }
 
+    public R visitMemberReference(MemberReferenceTree node, P p) {
+        R r = scan(node.getQualifierExpression(), p);
+        r = scanAndReduce(node.getTypeArguments(), p, r);
+        return r;
+    }
+
     public R visitIdentifier(IdentifierTree node, P p) {
         return null;
     }
@@ -379,31 +391,53 @@ public class TreeScanner<R,P> implements TreeVisitor<R,P> {
     }
 
     public R visitModule(ModuleTree node, P p) {
-        R r = scan(node.getAnnotations(), p);
-        r = scanAndReduce(node.getId(), p, r);
-        r = scanAndReduce(node.getProvides(), p, r);
-        r = scanAndReduce(node.getMetadataList(), p, r);
+        R r = scan(node.getId(), p);
+        r = scanAndReduce(node.getDirectives(), p, r);
         return r;
     }
 
-    public R visitModuleClass(ModuleClassTree node, P p) {
+    public R visitView(ViewDeclarationTree node, P p) {
+        R r = scan(node.getName(), p);
+        r = scanAndReduce(node.getDirectives(), p, r);
+        return r;
+    }
+
+    public R visitEntrypoint(EntrypointDirectiveTree node, P p) {
         return scan(node.getClassName(), p);
     }
 
-    public R visitModuleExport(ModuleExportTree node, P p) {
+    public R visitExport(ExportDirectiveTree node, P p) {
         return scan(node.getExportName(), p);
     }
 
     public R visitModuleId(ModuleIdTree node, P p) {
+        return scan(node.getName(), p);
+    }
+
+    public R visitModuleIdQuery(ModuleIdQueryTree node, P p) {
+        return scan(node.getName(), p);
+    }
+
+    public R visitPermits(PermitsDirectiveTree node, P p) {
         return scan(node.getModuleName(), p);
     }
 
-    public R visitModulePermits(ModulePermitsTree node, P p) {
-        return scan(node.getModuleNames(), p);
+    public R visitProvidesModule(ProvidesModuleDirectiveTree node, P p) {
+        return scan(node.getModuleId(), p);
+    }
+
+    public R visitProvidesService(ProvidesServiceDirectiveTree node, P p) {
+        R r = scan(node.getServiceName(), p);
+        r = scanAndReduce(node.getImplementationName(), p, r);
+        return r;
+    }
+
+    public R visitRequiresModule(RequiresModuleDirectiveTree node, P p) {
+        return scan(node.getModuleIdQuery(), p);
     }
 
-    public R visitModuleRequires(ModuleRequiresTree node, P p) {
-        return scan(node.getModuleIds(), p);
+    public R visitRequiresService(RequiresServiceDirectiveTree node, P p) {
+        return scan(node.getServiceName(), p);
     }
 
     public R visitPackage(PackageTree node, P p) {
diff --git a/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java b/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java
index 00f261a..75d647f 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -214,7 +214,7 @@ public class Apt extends ListBuffer<Env<AttrContext>> {
                      AnnotationProcessorFactory providedFactory,
                      java.util.Set<Class<? extends AnnotationProcessorFactory> > productiveFactories) {
         Bark bark = Bark.instance(context);
-        java.io.PrintWriter out = bark.warnWriter;
+        java.io.PrintWriter out = bark.getWriter(Log.WriterKind.WARNING);
         Options options = Options.instance(context);
 
         Collection<TypeDeclaration> spectypedecls =     new LinkedHashSet<TypeDeclaration>();
diff --git a/langtools/src/share/classes/com/sun/tools/apt/main/AptJavaCompiler.java b/langtools/src/share/classes/com/sun/tools/apt/main/AptJavaCompiler.java
index 89658e2..32d10ab 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/main/AptJavaCompiler.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/main/AptJavaCompiler.java
@@ -42,7 +42,6 @@ import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.apt.comp.*;
 import com.sun.tools.apt.util.Bark;
 import com.sun.mirror.apt.AnnotationProcessorFactory;
-import com.sun.tools.javac.parser.DocCommentScanner;
 
 /**
  *  <p><b>This is NOT part of any supported API.
diff --git a/langtools/src/share/classes/com/sun/tools/apt/main/Main.java b/langtools/src/share/classes/com/sun/tools/apt/main/Main.java
index 5c2cfcc..0adab92 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/main/Main.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/main/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@ import com.sun.tools.apt.comp.UsageMessageNeededException;
 import com.sun.tools.apt.util.Bark;
 import com.sun.mirror.apt.AnnotationProcessorFactory;
 
-import static com.sun.tools.javac.file.Paths.pathToURLs;
+import static com.sun.tools.javac.file.Locations.pathToURLs;
 
 /** This class provides a commandline interface to the apt build-time
  *  tool.
@@ -205,7 +205,7 @@ public class Main {
             String s = "  " + helpSynopsis();
             out.print(s);
             for (int j = s.length(); j < 29; j++) out.print(" ");
-            Bark.printLines(out, getLocalizedString(descrKey));
+            Bark.printRawLines(out, getLocalizedString(descrKey));
         }
 
     }
@@ -227,7 +227,7 @@ public class Main {
             String s = "  " + helpSynopsis();
             out.print(s);
             for (int j = s.length(); j < 29; j++) out.print(" ");
-            Bark.printLines(out, getLocalizedString(descrKey));
+            Bark.printRawLines(out, getLocalizedString(descrKey));
         }
 
     }
@@ -259,7 +259,7 @@ public class Main {
             String s = "  " + helpSynopsis();
             out.print(s);
             for (int j = s.length(); j < 29; j++) out.print(" ");
-            Log.printLines(out, getLocalizedString(descrKey));
+            Log.printRawLines(out, getLocalizedString(descrKey));
         }
     };
 
@@ -421,7 +421,7 @@ public class Main {
         },
         new AptOption("-version",               "opt.version") {
             boolean process(String option) {
-                Bark.printLines(out, ownName + " " + AptJavaCompiler.version());
+                Bark.printRawLines(out, ownName + " " + AptJavaCompiler.version());
                 return super.process(option);
             }
         },
@@ -660,11 +660,11 @@ public class Main {
     /** Print a string that explains usage.
      */
     void help() {
-        Bark.printLines(out, getLocalizedString("msg.usage.header", ownName));
+        Bark.printRawLines(out, getLocalizedString("msg.usage.header", ownName));
         for (int i=0; i < recognizedOptions.length; i++) {
             recognizedOptions[i].help();
         }
-        Bark.printLines(out, getLocalizedString("msg.usage.footer"));
+        Bark.printRawLines(out, getLocalizedString("msg.usage.footer"));
         out.println();
     }
 
@@ -675,7 +675,7 @@ public class Main {
             recognizedOptions[i].xhelp();
         }
         out.println();
-        Bark.printLines(out, getLocalizedString("msg.usage.nonstandard.footer"));
+        Bark.printRawLines(out, getLocalizedString("msg.usage.nonstandard.footer"));
     }
 
     /** Report a usage error.
@@ -688,7 +688,7 @@ public class Main {
     /** Report a warning.
      */
     void warning(String key, Object... args) {
-        Bark.printLines(out, ownName + ": "
+        Bark.printRawLines(out, ownName + ": "
                        + getLocalizedString(key, args));
     }
 
@@ -796,7 +796,7 @@ public class Main {
             origFilenames = processArgs((args=CommandLine.parse(args)));
 
             if (options.get("suppress-tool-api-removal-message") == null) {
-                Bark.printLines(out, getLocalizedString("misc.Deprecation"));
+                Bark.printRawLines(out, getLocalizedString("misc.Deprecation"));
             }
 
             if (origFilenames == null) {
@@ -808,7 +808,7 @@ public class Main {
                     return EXIT_OK;
             }
         } catch (java.io.FileNotFoundException e) {
-            Bark.printLines(out, ownName + ": " +
+            Bark.printRawLines(out, ownName + ": " +
                            getLocalizedString("err.file.not.found",
                                               e.getMessage()));
             return EXIT_SYSERR;
@@ -1183,7 +1183,7 @@ public class Main {
     /** Print a message reporting an internal error.
      */
     void bugMessage(Throwable ex) {
-        Bark.printLines(out, getLocalizedString("msg.bug",
+        Bark.printRawLines(out, getLocalizedString("msg.bug",
                                                AptJavaCompiler.version()));
         ex.printStackTrace(out);
     }
@@ -1191,34 +1191,34 @@ public class Main {
     /** Print a message reporting an fatal error.
      */
     void apMessage(AnnotationProcessingError ex) {
-        Bark.printLines(out, getLocalizedString("misc.Problem"));
+        Bark.printRawLines(out, getLocalizedString("misc.Problem"));
         ex.getCause().printStackTrace(out);
     }
 
     /** Print a message about sun.misc.Service problem.
      */
     void sceMessage(sun.misc.ServiceConfigurationError ex) {
-        Bark.printLines(out, getLocalizedString("misc.SunMiscService"));
+        Bark.printRawLines(out, getLocalizedString("misc.SunMiscService"));
         ex.printStackTrace(out);
     }
 
     /** Print a message reporting an fatal error.
      */
     void feMessage(Throwable ex) {
-        Bark.printLines(out, ex.toString());
+        Bark.printRawLines(out, ex.toString());
     }
 
     /** Print a message reporting an input/output error.
      */
     void ioMessage(Throwable ex) {
-        Bark.printLines(out, getLocalizedString("msg.io"));
+        Bark.printRawLines(out, getLocalizedString("msg.io"));
         ex.printStackTrace(out);
     }
 
     /** Print a message reporting an out-of-resources error.
      */
     void resourceMessage(Throwable ex) {
-        Bark.printLines(out, getLocalizedString("msg.resource"));
+        Bark.printRawLines(out, getLocalizedString("msg.resource"));
         ex.printStackTrace(out);
     }
 
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java
index a97014e..0fe94f3 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java
@@ -65,9 +65,7 @@ public abstract class Attribute {
 
     // JSR 294
     public static final String Module                   = "Module";
-    public static final String ModuleClass              = "ModuleClass";
-    public static final String ModuleExport             = "ModuleExport";
-    public static final String ModulePermits            = "ModulePermits";
+    public static final String ModuleData               = "ModuleData";
     public static final String ModuleProvides           = "ModuleProvides";
     public static final String ModuleRequires           = "ModuleRequires";
 
@@ -121,9 +119,7 @@ public abstract class Attribute {
             standardAttributes.put(LocalVariableTypeTable, LocalVariableTypeTable_attribute.class);
 
             standardAttributes.put(Module,            Module_attribute.class);
-            standardAttributes.put(ModuleClass,       ModuleClass_attribute.class);
-            standardAttributes.put(ModuleExport,      ModuleExport_attribute.class);
-            standardAttributes.put(ModulePermits,     ModulePermits_attribute.class);
+            standardAttributes.put(ModuleData,        ModuleData_attribute.class);
             standardAttributes.put(ModuleProvides,    ModuleProvides_attribute.class);
             standardAttributes.put(ModuleRequires,    ModuleRequires_attribute.class);
 
@@ -199,9 +195,7 @@ public abstract class Attribute {
         R visitSynthetic(Synthetic_attribute attr, P p);
 
         R visitModule(Module_attribute attr, P p);
-        R visitModuleClass(ModuleClass_attribute attr, P p);
-        R visitModuleExport(ModuleExport_attribute attr, P p);
-        R visitModulePermits(ModulePermits_attribute attr, P p);
+        R visitModuleData(ModuleData_attribute attr, P p);
         R visitModuleProvides(ModuleProvides_attribute attr, P p);
         R visitModuleRequires(ModuleRequires_attribute attr, P p);
     }
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java b/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java
index 36564bc..2c5e62b 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java
@@ -490,46 +490,50 @@ public class ClassWriter {
             return null;
         }
 
-        public Void visitModuleClass(ModuleClass_attribute attr, ClassOutputStream out) {
-            out.writeShort(attr.class_index);
-            out.writeShort(attr.attributes.length);
-            for (int index: attr.attributes) {
-                out.writeShort(index);
-            }
+        public Void visitModuleData(ModuleData_attribute attr, ClassOutputStream out) {
+            out.writeShort(attr.data_index);
             return null;
         }
 
-        public Void visitModuleExport(ModuleExport_attribute attr, ClassOutputStream out) {
-            out.writeShort(attr.export_table.length);
-            for (ModuleExport_attribute.Entry e: attr.export_table) {
+        public Void visitModuleProvides(ModuleProvides_attribute attr, ClassOutputStream out) {
+            out.writeShort(attr.view_table.length);
+            for (ModuleProvides_attribute.View v: attr.view_table)
+                writeView(v, out);
+            return null;
+        }
+
+        protected void writeView(ModuleProvides_attribute.View v, ClassOutputStream out) {
+            out.writeShort(v.view_name_index);
+            out.writeShort(v.entrypoint_index);
+            out.writeShort(v.alias_table.length);
+            for (int alias_index: v.alias_table)
+                out.writeShort(alias_index);
+            out.writeShort(v.service_table.length);
+            for (ModuleProvides_attribute.Service s: v.service_table) {
+                out.writeShort(s.service_index);
+                out.writeShort(s.impl_index);
+            }
+            out.writeShort(v.export_table.length);
+            for (ModuleProvides_attribute.Export e: v.export_table) {
                 out.writeShort(e.export_index);
-                out.writeByte(e.flags);
+                out.writeShort(e.export_flags);
+                out.writeShort(e.source_index);
             }
-            return null;
-        }
-
-        public Void visitModulePermits(ModulePermits_attribute attr, ClassOutputStream out) {
-            out.writeShort(attr.permits_table.length);
-            for (int i: attr.permits_table)
-                out.writeShort(i);
-            return null;
-        }
-
-        public Void visitModuleProvides(ModuleProvides_attribute attr, ClassOutputStream out) {
-            out.writeShort(attr.provides_table.length);
-            for (int i: attr.provides_table)
-                out.writeShort(i);
-            return null;
+            out.writeShort(v.permit_table.length);
+            for (int permit_index: v.permit_table)
+                out.writeShort(permit_index);
         }
 
         public Void visitModuleRequires(ModuleRequires_attribute attr, ClassOutputStream out) {
-            out.writeShort(attr.requires_table.length);
-            for (ModuleRequires_attribute.Entry e: attr.requires_table) {
-                out.writeShort(e.requires_index);
-                out.writeShort(e.attributes.length);
-                for (int i = 0; i < e.attributes_length; i++) {
-                    out.writeShort(e.attributes[i]);
-                }
+            out.writeShort(attr.module_table.length);
+            for (ModuleRequires_attribute.Entry e: attr.module_table) {
+                out.writeShort(e.index);
+                out.writeShort(e.flags);
+            }
+            out.writeShort(attr.service_table.length);
+            for (ModuleRequires_attribute.Entry e: attr.service_table) {
+                out.writeShort(e.index);
+                out.writeShort(e.flags);
             }
             return null;
         }
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java b/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java
index 1200a97..ffe7aa0 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java
@@ -117,7 +117,7 @@ public class ConstantPool {
     public static final int CONSTANT_MethodHandle = 15;
     public static final int CONSTANT_MethodType = 16;
     public static final int CONSTANT_InvokeDynamic = 18;
-    public static final int CONSTANT_ModuleId = 13;
+    public static final int CONSTANT_ModuleId = 19;
 
     public static enum RefKind {
         REF_getField(1, "getfield"),
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ModuleData_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/ModuleData_attribute.java
new file mode 100644
index 0000000..4f108a9
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ModuleData_attribute.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2008, 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.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.IOException;
+
+import com.sun.tools.classfile.ConstantPool.*;
+
+/**
+ * See Jigsaw.
+ *
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ */
+public class ModuleData_attribute extends Attribute {
+    ModuleData_attribute(ClassReader cr, int name_index, int length) throws IOException {
+        super(name_index, length);
+        data_index = cr.readUnsignedShort();
+    }
+
+    public ModuleData_attribute(ConstantPool constant_pool, int class_index, int[] attributes)
+            throws ConstantPoolException {
+        this(constant_pool.getUTF8Index(Attribute.ModuleData), class_index, attributes);
+    }
+
+    public ModuleData_attribute(int name_index, int data_index, int[] attributes) {
+        super(name_index, 2 + attributes.length * 2);
+        this.data_index = data_index;
+    }
+
+    public CONSTANT_Class_info getClassInfo(ConstantPool constant_pool) throws ConstantPoolException {
+        if (data_index == 0)
+            return null;
+        return constant_pool.getClassInfo(data_index);
+    }
+
+    public String getData(ConstantPool constant_pool) throws ConstantPoolException {
+        if (data_index == 0)
+            return null;
+        return constant_pool.getClassInfo(data_index).getName();
+    }
+
+    public <R, D> R accept(Visitor<R, D> visitor, D data) {
+        return visitor.visitModuleData(this, data);
+    }
+
+    public final int data_index;
+}
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ModuleProvides_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/ModuleProvides_attribute.java
index a6035e5..f979e08 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/ModuleProvides_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ModuleProvides_attribute.java
@@ -26,10 +26,9 @@
 package com.sun.tools.classfile;
 
 import java.io.IOException;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_ModuleId_info;
 
 /**
- * See JSR 294.
+ * See Jigsaw.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
@@ -39,32 +38,136 @@ import com.sun.tools.classfile.ConstantPool.CONSTANT_ModuleId_info;
 public class ModuleProvides_attribute extends Attribute {
     ModuleProvides_attribute(ClassReader cr, int name_index, int length) throws IOException {
         super(name_index, length);
-        provides_length = cr.readUnsignedShort();
-        provides_table = new int[provides_length];
-        for (int i = 0; i < provides_length; i++)
-            provides_table[i] = cr.readUnsignedShort();
+        view_length = cr.readUnsignedShort();
+        view_table = new View[view_length];
+        for (int i = 0; i < view_length; i++)
+            view_table[i] = new View(cr);
     }
 
-    public ModuleProvides_attribute(ConstantPool constant_pool, int[] provides_table)
+    public ModuleProvides_attribute(ConstantPool constant_pool, View[] provides_table)
             throws ConstantPoolException {
         this(constant_pool.getUTF8Index(Attribute.ModuleProvides), provides_table);
     }
 
-    public ModuleProvides_attribute(int name_index, int[] provides_table) {
-        super(name_index, 2 + 2 * provides_table.length);
-        this.provides_length = provides_table.length;
-        this.provides_table = provides_table;
-    }
-
-    public CONSTANT_ModuleId_info getProvides(int index, ConstantPool constant_pool) throws ConstantPoolException {
-        int provides_index = provides_table[index];
-        return constant_pool.getModuleIdInfo(provides_index);
+    public ModuleProvides_attribute(int name_index, View[] view_table) {
+        super(name_index, 2 + length(view_table));
+        this.view_length = view_table.length;
+        this.view_table = view_table;
     }
 
     public <R, D> R accept(Visitor<R, D> visitor, D data) {
         return visitor.visitModuleProvides(this, data);
     }
 
-    public final int provides_length;
-    public final int[] provides_table;
+    public final int view_length;
+    public final View[] view_table;
+    
+    private static int length(View[] view_table) {
+        int n = 0;
+        for (View v: view_table)
+            n += v.length();
+        return n;
+    }
+
+    public static class View {
+        public final int view_name_index;
+        public final int entrypoint_index;
+        public final int alias_length;
+        public final int[] alias_table;
+        public final int service_length;
+        public final Service[] service_table;
+        public final int export_length;
+        public final Export[] export_table;
+        public final int  permit_length;
+        public final int[] permit_table;
+
+        View(ClassReader cr) throws IOException {
+            view_name_index = cr.readUnsignedShort();
+            entrypoint_index = cr.readUnsignedShort();
+            alias_length = cr.readUnsignedShort();
+            alias_table = new int[alias_length];
+            for (int i = 0; i < alias_table.length; i++)
+                alias_table[i] = cr.readUnsignedShort();
+            service_length = cr.readUnsignedShort();
+            service_table = new Service[service_length];
+            for (int i = 0; i < service_table.length; i++)
+                service_table[i] = new Service(cr);
+            export_length = cr.readUnsignedShort();
+            export_table = new Export[export_length];
+            for (int i = 0; i < export_table.length; i++)
+                export_table[i] = new Export(cr);
+            permit_length = cr.readUnsignedShort();
+            permit_table = new int[permit_length];
+            for (int i = 0; i < permit_table.length; i++)
+                permit_table[i] = cr.readUnsignedShort();
+        }
+        
+        public View(int view_name_index, int entrypoint_index,
+                    int[] alias_table, Service[] service_table,
+                    Export[] export_table, int[] permit_table)
+        {
+            this.view_name_index = view_name_index;
+            this.entrypoint_index = entrypoint_index;
+            this.alias_length = alias_table.length;
+            this.alias_table = alias_table;
+            this.export_length = export_table.length;
+            this.export_table = export_table;
+            this.permit_length = permit_table.length;
+            this.permit_table = permit_table;
+            this.service_length = service_table.length;
+            this.service_table = service_table;
+        }
+        
+        int length() {
+            return  2   // view_name_index
+                    + 2 // entrypoint_index
+                    + 2 + 2 * alias_table.length
+                    + 2 + Service.length * service_table.length
+                    + 2 + Export.length * export_table.length
+                    + 2 + 2 * permit_table.length;
+
+        }
+    }
+
+    public static class Service {
+        static final int length = 4;
+
+        public final int service_index;
+        public final int impl_index;
+
+        Service(ClassReader cr) throws IOException {
+            service_index = cr.readUnsignedShort();
+            impl_index = cr.readUnsignedShort();
+        }
+
+	public Service(int service_index, int impl_index) {
+	    this.service_index = service_index;
+	    this.impl_index = impl_index;
+	}
+    }
+
+    public static class Export {
+        public static final int TYPE                    = 0x1;
+        public static final int TYPE_AND_MEMBERS        = 0x2;
+        public static final int PACKAGE                 = 0x4;
+        public static final int PACKAGE_AND_SUBPACKAGES = 0x8;
+
+        static final int length = 6;
+
+        public final int export_index;
+        public final int export_flags;
+        public final int source_index;
+
+        Export(ClassReader cr) throws IOException {
+            export_index = cr.readUnsignedShort();
+            export_flags = cr.readUnsignedShort();
+            source_index = cr.readUnsignedShort();
+        }
+        
+        public Export(int index, int flags, int source_index) {
+            this.export_index = index;
+            this.export_flags = flags;
+            this.source_index = source_index;
+        }
+    }
 }
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ModuleRequires_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/ModuleRequires_attribute.java
index 232eda7..045eb63 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/ModuleRequires_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ModuleRequires_attribute.java
@@ -28,7 +28,7 @@ package com.sun.tools.classfile;
 import java.io.IOException;
 
 /**
- * See JSR 294.
+ * See Jigsaw.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
@@ -36,60 +36,63 @@ import java.io.IOException;
  *  deletion without notice.</b>
  */
 public class ModuleRequires_attribute extends Attribute {
+    public static final int MR_OPTIONAL = 0x1;
+    public static final int MR_LOCAL = 0x2;
+    public static final int MR_PUBLIC = 0x4;
+    public static final int MR_SYNTHETIC = 0x1000;    // THIS IS NOT IN THE OFFICIAL SPEC, YET
+
     ModuleRequires_attribute(ClassReader cr, int name_index, int length) throws IOException {
         super(name_index, length);
-        requires_length = cr.readUnsignedShort();
-        requires_table = new Entry[requires_length];
-        for (int i = 0; i < requires_length; i++)
-            requires_table[i] = new Entry(cr);
+        module_length = cr.readUnsignedShort();
+        module_table = new Entry[module_length];
+        for (int i = 0; i < module_length; i++)
+            module_table[i] = new Entry(cr);
+        service_length = cr.readUnsignedShort();
+        service_table = new Entry[service_length];
+        for (int i = 0; i < service_length; i++)
+            service_table[i] = new Entry(cr);
     }
 
-    public ModuleRequires_attribute(ConstantPool constant_pool, Entry[] requires_table)
+    public ModuleRequires_attribute(ConstantPool constant_pool, Entry[] module_table, Entry[] service_table)
             throws ConstantPoolException {
-        this(constant_pool.getUTF8Index(Attribute.ModuleRequires), requires_table);
+        this(constant_pool.getUTF8Index(Attribute.ModuleRequires), module_table, service_table);
     }
 
-    public ModuleRequires_attribute(int name_index, Entry[] requires_table) {
-        super(name_index, 2 + length(requires_table));
-        this.requires_length = requires_table.length;
-        this.requires_table = requires_table;
+    public ModuleRequires_attribute(int name_index, Entry[] module_table, Entry[] service_table) {
+        super(name_index, 2 + length(module_table) + 2 + length(service_table));
+        this.module_length = module_table.length;
+        this.module_table = module_table;
+        this.service_length = service_table.length;
+        this.service_table = service_table;
     }
 
     public <R, D> R accept(Visitor<R, D> visitor, D data) {
         return visitor.visitModuleRequires(this, data);
     }
 
-    public final int requires_length;
-    public final Entry[] requires_table;
+    public final int module_length;
+    public final Entry[] module_table;
+    public final int service_length;
+    public final Entry[] service_table;
 
-    private static int length(Entry[] requires_table) {
-        int n = 0;
-        for (int i = 0; i < requires_table.length; i++)
-            n += requires_table[i].length();
-        return n;
+    private static int length(Entry[] table) {
+        return table.length * Entry.length;
     }
 
     public static class Entry {
         Entry(ClassReader cr) throws IOException {
-            requires_index = cr.readUnsignedShort();
-            attributes_length = cr.readUnsignedShort();
-            attributes = new int[attributes_length];
-            for (int i = 0; i < attributes_length; i++)
-                attributes[i] = cr.readUnsignedShort();
+            index = cr.readUnsignedShort();
+            flags = cr.readUnsignedShort();
         }
 
-        public Entry(int index, int[] attrs) {
-            requires_index = index;
-            attributes_length = attrs.length;
-            attributes = attrs;
+        public Entry(int index, int flags) {
+            this.index = index;
+            this.flags = flags;
         }
 
-        public int length() {
-            return 4 + attributes_length * 2;
-        }
+        public static final int length = 4;
 
-        public final int requires_index;
-        public final int attributes_length;
-        public final int[] attributes;
+        public final int index;
+        public final int flags;
     }
 }
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Module_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/Module_attribute.java
index 0dbe818..92f8e09 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Module_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Module_attribute.java
@@ -28,7 +28,7 @@ package com.sun.tools.classfile;
 import java.io.IOException;
 
 /**
- * See JSR 294.
+ * See Jigsaw.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties
index f3ef939..b9bef57 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties
@@ -216,6 +216,7 @@ doclet.Groupname_already_used=In -group option, groupname already used: {0}
 doclet.Same_package_name_used=Package name format used twice: {0}
 doclet.Serialization.Excluded_Class=Non-transient field {1} uses excluded class {0}.
 doclet.Serialization.Nonexcluded_Class=Non-transient field {1} uses hidden, non-included class {0}.
+doclet.exception_encountered=Exception encountered while processing {1}\n{0}
 doclet.usage=Provided by Standard doclet:\n\
   -d <directory>                    Destination directory for output files\n\
   -use                              Create class and package usage pages\n\
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
index 1b1e331..e1a82e6 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
@@ -325,7 +325,7 @@ public class JavacTaskImpl extends JavacTask {
             ListBuffer<TypeElement> elements = new ListBuffer<TypeElement>();
             for (JCCompilationUnit unit : units) {
                 for (JCTree node : unit.defs) {
-                    if (node.getTag() == JCTree.CLASSDEF) {
+                    if (node.hasTag(JCTree.Tag.CLASSDEF)) {
                         JCClassDecl cdef = (JCClassDecl) node;
                         if (cdef.sym != null) // maybe null if errors in anno processing
                             elements.append(cdef.sym);
@@ -383,12 +383,12 @@ public class JavacTaskImpl extends JavacTask {
         private void handleFlowResults(Queue<Env<AttrContext>> queue, ListBuffer<Element> elems) {
             for (Env<AttrContext> env: queue) {
                 switch (env.tree.getTag()) {
-                    case JCTree.CLASSDEF:
+                    case CLASSDEF:
                         JCClassDecl cdef = (JCClassDecl) env.tree;
                         if (cdef.sym != null)
                             elems.append(cdef.sym);
                         break;
-                    case JCTree.TOPLEVEL:
+                    case TOPLEVEL:
                         JCCompilationUnit unit = (JCCompilationUnit) env.tree;
                         if (unit.packge != null)
                             elems.append(unit.packge);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java
index 8b015d2..0be82fb 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java
@@ -25,18 +25,15 @@
 
 package com.sun.tools.javac.api;
 
-import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.Writer;
 import java.nio.charset.Charset;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import javax.lang.model.SourceVersion;
@@ -44,16 +41,15 @@ import javax.tools.*;
 
 import com.sun.source.util.JavacTask;
 import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.main.JavacOption.OptionKind;
-import com.sun.tools.javac.main.JavacOption;
 import com.sun.tools.javac.main.Main;
-import com.sun.tools.javac.main.RecognizedOptions.GrumpyHelper;
-import com.sun.tools.javac.main.RecognizedOptions;
+import com.sun.tools.javac.main.Option;
+import com.sun.tools.javac.main.OptionHelper;
+import com.sun.tools.javac.main.OptionHelper.GrumpyHelper;
 import com.sun.tools.javac.util.ClientCodeException;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.Log.PrefixKind;
 import com.sun.tools.javac.util.Options;
-import com.sun.tools.javac.util.Pair;
 
 /**
  * TODO: describe com.sun.tools.javac.api.Tool
@@ -66,23 +62,10 @@ import com.sun.tools.javac.util.Pair;
  * @author Peter von der Ah\u00e9
  */
 public final class JavacTool implements JavaCompiler {
-    private final List<Pair<String,String>> options
-        = new ArrayList<Pair<String,String>>();
-    private final Context dummyContext = new Context();
-
-    private final PrintWriter silent = new PrintWriter(new OutputStream(){
-        public void write(int b) {}
-    });
-
-    private final Main sharedCompiler = new Main("javac", silent);
-    {
-        sharedCompiler.setOptions(Options.instance(dummyContext));
-    }
-
     /**
-     * Constructor used by service provider mechanism.  The correct way to
-     * obtain an instance of this class is using create or the service provider
-     * mechanism.
+     * Constructor used by service provider mechanism.  The recommended way to
+     * obtain an instance of this class is by using {@link #create} or the
+     * service provider mechanism.
      * @see javax.tools.JavaCompilerTool
      * @see javax.tools.ToolProvider
      * @see #create
@@ -98,49 +81,6 @@ public final class JavacTool implements JavaCompiler {
         return new JavacTool();
     }
 
-    private String argsToString(Object... args) {
-        String newArgs = null;
-        if (args.length > 0) {
-            StringBuilder sb = new StringBuilder();
-            String separator = "";
-            for (Object arg : args) {
-                sb.append(separator).append(arg.toString());
-                separator = File.pathSeparator;
-            }
-            newArgs = sb.toString();
-        }
-        return newArgs;
-    }
-
-    private void setOption1(String name, OptionKind kind, Object... args) {
-        String arg = argsToString(args);
-        JavacOption option = sharedCompiler.getOption(name);
-        if (option == null || !match(kind, option.getKind()))
-            throw new IllegalArgumentException(name);
-        if ((args.length != 0) != option.hasArg())
-            throw new IllegalArgumentException(name);
-        if (option.hasArg()) {
-            if (option.process(null, name, arg)) // FIXME
-                throw new IllegalArgumentException(name);
-        } else {
-            if (option.process(null, name)) // FIXME
-                throw new IllegalArgumentException(name);
-        }
-        options.add(new Pair<String,String>(name,arg));
-    }
-
-    public void setOption(String name, Object... args) {
-        setOption1(name, OptionKind.NORMAL, args);
-    }
-
-    public void setExtendedOption(String name, Object... args)  {
-        setOption1(name, OptionKind.EXTENDED, args);
-    }
-
-    private static boolean match(OptionKind clientKind, OptionKind optionKind) {
-        return (clientKind == (optionKind == OptionKind.HIDDEN ? OptionKind.EXTENDED : optionKind));
-    }
-
     public JavacFileManager getStandardFileManager(
         DiagnosticListener<? super JavaFileObject> diagnosticListener,
         Locale locale,
@@ -156,15 +96,28 @@ public final class JavacTool implements JavaCompiler {
         return new JavacFileManager(context, true, charset);
     }
 
+    @Override
     public JavacTask getTask(Writer out,
                              JavaFileManager fileManager,
                              DiagnosticListener<? super JavaFileObject> diagnosticListener,
                              Iterable<String> options,
                              Iterable<String> classes,
-                             Iterable<? extends JavaFileObject> compilationUnits)
+                             Iterable<? extends JavaFileObject> compilationUnits) {
+        Context context = new Context();
+        return getTask(out, fileManager, diagnosticListener,
+                options, classes, compilationUnits,
+                context);
+    }
+
+    public JavacTask getTask(Writer out,
+                             JavaFileManager fileManager,
+                             DiagnosticListener<? super JavaFileObject> diagnosticListener,
+                             Iterable<String> options,
+                             Iterable<String> classes,
+                             Iterable<? extends JavaFileObject> compilationUnits,
+                             Context context)
     {
         try {
-            Context context = new Context();
             ClientCodeWrapper ccw = ClientCodeWrapper.instance(context);
 
             final String kindMsg = "All compilation units must be of SOURCE kind";
@@ -195,7 +148,9 @@ public final class JavacTool implements JavaCompiler {
             if (fileManager == null)
                 fileManager = getStandardFileManager(diagnosticListener, null, null);
             fileManager = ccw.wrap(fileManager);
+
             context.put(JavaFileManager.class, fileManager);
+
             processOptions(context, fileManager, options);
             Main compiler = new Main("javacTask", context.get(Log.outKey));
             return new JavacTaskImpl(compiler, options, context, classes, compilationUnits);
@@ -211,10 +166,28 @@ public final class JavacTool implements JavaCompiler {
         if (options == null)
             return;
 
-        Options optionTable = Options.instance(context);
+        final Options optionTable = Options.instance(context);
+        Log log = Log.instance(context);
+
+        Option[] recognizedOptions =
+                Option.getJavacToolOptions().toArray(new Option[0]);
+        OptionHelper optionHelper = new GrumpyHelper(log) {
+            @Override
+            public String get(Option option) {
+                return optionTable.get(option.getText());
+            }
+
+            @Override
+            public void put(String name, String value) {
+                optionTable.put(name, value);
+            }
+
+            @Override
+            public void remove(String name) {
+                optionTable.remove(name);
+            }
+        };
 
-        JavacOption[] recognizedOptions =
-            RecognizedOptions.getJavacToolOptions(new GrumpyHelper());
         Iterator<String> flags = options.iterator();
         while (flags.hasNext()) {
             String flag = flags.next();
@@ -227,29 +200,31 @@ public final class JavacTool implements JavaCompiler {
                 if (fileManager.handleOption(flag, flags)) {
                     continue;
                 } else {
-                    String msg = Main.getLocalizedString("err.invalid.flag", flag);
+                    String msg = log.localize(PrefixKind.JAVAC, "err.invalid.flag", flag);
                     throw new IllegalArgumentException(msg);
                 }
             }
 
-            JavacOption option = recognizedOptions[j];
+            Option option = recognizedOptions[j];
             if (option.hasArg()) {
                 if (!flags.hasNext()) {
-                    String msg = Main.getLocalizedString("err.req.arg", flag);
+                    String msg = log.localize(PrefixKind.JAVAC, "err.req.arg", flag);
                     throw new IllegalArgumentException(msg);
                 }
                 String operand = flags.next();
-                if (option.process(optionTable, flag, operand))
+                if (option.process(optionHelper, flag, operand))
                     // should not happen as the GrumpyHelper will throw exceptions
                     // in case of errors
                     throw new IllegalArgumentException(flag + " " + operand);
             } else {
-                if (option.process(optionTable, flag))
+                if (option.process(optionHelper, flag))
                     // should not happen as the GrumpyHelper will throw exceptions
                     // in case of errors
                     throw new IllegalArgumentException(flag);
             }
         }
+
+        optionTable.notifyListeners();
     }
 
     public int run(InputStream in, OutputStream out, OutputStream err, String... arguments) {
@@ -266,9 +241,8 @@ public final class JavacTool implements JavaCompiler {
     }
 
     public int isSupportedOption(String option) {
-        JavacOption[] recognizedOptions =
-            RecognizedOptions.getJavacToolOptions(new GrumpyHelper());
-        for (JavacOption o : recognizedOptions) {
+        Set<Option> recognizedOptions = Option.getJavacToolOptions();
+        for (Option o : recognizedOptions) {
             if (o.matches(option))
                 return o.hasArg() ? 1 : 0;
         }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java
index 7bd384b..4f0df76 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java
@@ -59,6 +59,7 @@ import com.sun.tools.javac.comp.Env;
 import com.sun.tools.javac.comp.MemberEnter;
 import com.sun.tools.javac.comp.Resolve;
 import com.sun.tools.javac.model.JavacElements;
+import com.sun.tools.javac.parser.EndPosTable;
 import com.sun.tools.javac.processing.JavacProcessingEnvironment;
 import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.tree.JCTree;
@@ -140,8 +141,8 @@ public class JavacTrees extends Trees {
                 }
 
                 public long getEndPosition(CompilationUnitTree file, Tree tree) {
-                    Map<JCTree,Integer> endPositions = ((JCCompilationUnit) file).endPositions;
-                    return TreeInfo.getEndPos((JCTree) tree, endPositions);
+                    EndPosTable endPosTable = ((JCCompilationUnit) file).endPositions;
+                    return TreeInfo.getEndPos((JCTree) tree, endPosTable);
                 }
             };
     }
@@ -207,7 +208,7 @@ public class JavacTrees extends Trees {
         if (sym == null && TreeInfo.isDeclaration(tree)) {
             for (TreePath p = path; p != null; p = p.getParentPath()) {
                 JCTree t = (JCTree) p.getLeaf();
-                if (t.getTag() == JCTree.CLASSDEF) {
+                if (t.hasTag(JCTree.Tag.CLASSDEF)) {
                     JCClassDecl ct = (JCClassDecl) t;
                     if (ct.sym != null) {
                         if ((ct.sym.flags_field & Flags.UNATTRIBUTED) != 0) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Directive.java b/langtools/src/share/classes/com/sun/tools/javac/code/Directive.java
new file mode 100644
index 0000000..256d2dd
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Directive.java
@@ -0,0 +1,351 @@
+/*
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package com.sun.tools.javac.code;
+
+import java.util.EnumSet;
+import java.util.Set;
+import com.sun.tools.javac.code.Symbol.ClassSymbol;
+import com.sun.tools.javac.code.Symbol.TypeSymbol;
+import com.sun.tools.javac.util.List;
+import com.sun.tools.javac.util.ListBuffer;
+import com.sun.tools.javac.util.Name;
+
+import static com.sun.tools.javac.code.Kinds.*;
+
+/**
+ *  Root class for the directives that may appear in module compilation units.
+ *
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ */
+public abstract class Directive {
+    public enum Kind {
+        REQUIRES_MODULE,
+        REQUIRES_SERVICE,
+        PROVIDES_MODULE,
+        PROVIDES_SERVICE,
+        EXPORTS,
+        PERMITS,
+        ENTRYPOINT,
+        VIEW
+    }
+
+    /** Flags for RequiresModuleDirective and RequiresServiceDirective. */
+    public enum RequiresFlag {
+        OPTIONAL(0x0001),
+        LOCAL(0x0002),
+        PUBLIC(0x0004);
+
+        // overkill? move to ClassWriter?
+        public static int value(Set<RequiresFlag> s) {
+            int v = 0;
+            for (RequiresFlag f: s)
+                v |= f.value;
+            return v;
+        }
+        
+        RequiresFlag(int value) {
+            this.value = value;
+        }
+        
+        public final int value;
+    }
+
+    /** Flags for an ExportsDirective.
+     * These are mutually exclusive; only one may be used in an ExportsDirective.
+     */
+    public enum ExportFlag {
+        TYPE(0x0001),
+        TYPE_AND_MEMBERS(0x0002),
+        PACKAGE(0x0004),
+        PACKAGE_AND_SUBPACKAGES(0x0008);
+
+        ExportFlag(int value) {
+            this.value = value;
+        }
+
+        // overkill? move to ClassWriter?
+        public static int value(Set<ExportFlag> s) {
+            int v = 0;
+            for (ExportFlag f: s)
+                v |= f.value;
+            return v;
+        }
+
+        public static ExportFlag valueOf(int kind, boolean asterisk) {
+            switch (kind) {
+                case PCK:
+                    return asterisk ? PACKAGE_AND_SUBPACKAGES : PACKAGE;
+                case TYP:
+                    return asterisk ? TYPE_AND_MEMBERS : TYPE;
+                default:
+                    throw new IllegalArgumentException();
+            }
+        }
+        
+        public final int value;
+    }
+
+    public abstract Kind getKind();
+
+    static <T extends Directive> List<T> filter(ListBuffer<Directive> directives, Kind kind, Class<T> clazz) {
+        ListBuffer<T> list = ListBuffer.lb();
+        for (Directive d: directives) {
+            if (d.getKind() == kind)
+                list.add(clazz.cast(d));
+        }
+        return list.toList();
+    }
+
+    /**
+     * 'requires' ['optional'] {'local' | 'public'} ModuleNameAndVersionQuery ';'
+     */
+    public static class RequiresModuleDirective extends Directive {
+        public final ModuleIdQuery moduleQuery;
+        public final Set<RequiresFlag> flags;
+
+        public RequiresModuleDirective(ModuleIdQuery moduleQuery) {
+            this(moduleQuery, EnumSet.noneOf(RequiresFlag.class));
+        }
+
+        public RequiresModuleDirective(ModuleIdQuery moduleQuery, Set<RequiresFlag> flags) {
+            this.moduleQuery = moduleQuery;
+            this.flags = flags;
+        }
+
+        @Override
+        public Kind getKind() {
+            return Kind.REQUIRES_MODULE;
+        }
+
+        @Override
+        public String toString() {
+            return "RequiresModule[" + flags + "," + moduleQuery + "]";
+        }
+    }
+
+    /**
+     * 'requires' ['optional'] 'service' ServiceName ';'
+     */
+    public static class RequiresServiceDirective extends Directive {
+        public final ClassSymbol sym;
+        public final Set<RequiresFlag> flags;
+
+        public RequiresServiceDirective(ClassSymbol sym, Set<RequiresFlag> flags) {
+            this.sym = sym;
+            this.flags = flags;
+        }
+
+        @Override
+        public Kind getKind() {
+            return Kind.REQUIRES_SERVICE;
+        }
+
+        @Override
+        public String toString() {
+            return "RequiresService[" + flags + "," + sym + "]";
+        }
+    }
+
+    /**
+     * 'provides' ModuleNameAndVersion ';'
+     */
+    public static class ProvidesModuleDirective extends Directive {
+        public final ModuleId moduleId;
+
+        public ProvidesModuleDirective(ModuleId moduleId) {
+            this.moduleId = moduleId;
+        }
+
+        @Override
+        public Kind getKind() {
+            return Kind.PROVIDES_MODULE;
+        }
+
+        @Override
+        public String toString() {
+            return "ProvidesModule[" + moduleId + "]";
+        }
+    }
+
+    /**
+     * 'provides' 'service' ServiceName 'with' QualifiedIdentifer ';'
+     */
+    public static class ProvidesServiceDirective extends Directive {
+        public final ClassSymbol service;
+        public final ClassSymbol impl;
+
+        public ProvidesServiceDirective(ClassSymbol service, ClassSymbol impl) {
+            this.service = service;
+            this.impl = impl;
+        }
+
+        @Override
+        public Kind getKind() {
+            return Kind.PROVIDES_SERVICE;
+        }
+
+        @Override
+        public String toString() {
+            return "ProvidesService[" + service + "," + impl + "]";
+        }
+    }
+
+    /**
+     * 'exports' PackageOrTypeName ['.' '*'] ';'
+     */
+    public static class ExportsDirective extends Directive {
+        public final TypeSymbol sym;
+        public final Set<ExportFlag> flags;
+        public final ModuleId origin;
+
+        public ExportsDirective(TypeSymbol sym, Set<ExportFlag> flags, ModuleId origin) {
+            this.sym = sym;
+            this.flags = flags;
+            this.origin = origin;
+        }
+
+        @Override
+        public Kind getKind() {
+            return Kind.EXPORTS;
+        }
+
+        @Override
+        public String toString() {
+            return "Exports[" + flags + "," + sym + "," + origin + "]";
+        }
+    }
+
+    /**
+     * 'permits' ModuleName ';'
+     */
+    public static class PermitsDirective extends Directive {
+        public final ModuleId moduleId;
+
+        public PermitsDirective(ModuleId moduleId) {
+            this.moduleId = moduleId;
+        }
+
+        public PermitsDirective(Name moduleName) {
+            moduleId = new ModuleId(moduleName);
+        }
+
+        @Override
+        public Kind getKind() {
+            return Kind.PERMITS;
+        }
+
+        @Override
+        public String toString() {
+            return "Permits[" + moduleId + "]";
+        }
+    }
+
+    /**
+     * 'class' TypeName ';'
+     */
+    public static class EntrypointDirective extends Directive {
+        public final ClassSymbol sym;
+
+        public EntrypointDirective(ClassSymbol sym) {
+            this.sym = sym;
+        }
+
+        @Override
+        public Kind getKind() {
+            return Kind.ENTRYPOINT;
+        }
+
+        @Override
+        public String toString() {
+            return "Entrypoint[" + sym + "]";
+        }
+    }
+
+    /**
+     * 'view' ModuleName '{' {ProvidesDirective | ExportsDirective | PermitsDirective | EntrypointDirective} '}'
+     */
+    public static class ViewDeclaration extends Directive {
+        public final Name name;
+        public final ListBuffer<Directive> directives;
+        
+        public ViewDeclaration(Name name) {
+            this.name = name;
+            this.directives = ListBuffer.lb();
+        }
+
+        public ViewDeclaration(ListBuffer<Directive> directives) {
+            this.name = null;
+            this.directives = directives;
+        }
+
+        public boolean isDefault() {
+            return name == null;
+        }
+
+        public boolean hasEntrypoint() {
+            for (Directive d: directives) {
+                if (d.getKind() == Directive.Kind.ENTRYPOINT)
+                    return true;
+            }
+            return false;
+        }
+
+        public ClassSymbol getEntrypoint() {
+            List<EntrypointDirective> list =
+                    filter(directives, Kind.ENTRYPOINT, EntrypointDirective.class);
+            return list.isEmpty() ? null : list.head.sym;
+        }
+
+        public List<ProvidesModuleDirective> getAliases() {
+            return filter(directives, Kind.PROVIDES_MODULE, ProvidesModuleDirective.class);
+        }
+
+        public List<ProvidesServiceDirective> getServices() {
+            return filter(directives, Kind.PROVIDES_SERVICE, ProvidesServiceDirective.class);
+        }
+
+        public List<ExportsDirective> getExports() {
+            return filter(directives, Kind.EXPORTS, ExportsDirective.class);
+        }
+
+        public List<PermitsDirective> getPermits() {
+            return filter(directives, Kind.PERMITS, PermitsDirective.class);
+        }
+
+        @Override
+        public Kind getKind() {
+            return Kind.VIEW;
+        }
+
+        @Override
+        public String toString() {
+            return "View[" + directives + "]";
+        }
+    }
+}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/ModuleId.java b/langtools/src/share/classes/com/sun/tools/javac/code/ModuleId.java
new file mode 100644
index 0000000..545517b
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/ModuleId.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package com.sun.tools.javac.code;
+
+import com.sun.tools.javac.api.Formattable;
+import com.sun.tools.javac.api.Messages;
+import com.sun.tools.javac.util.Name;
+import java.util.Locale;
+
+/**
+ * Representation of a module id, {@literal module-name[@version]}
+ *
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ */
+public class ModuleId implements javax.lang.model.element.ModuleElement.ModuleId, Formattable {
+    public final Name name;
+    public final Name version;
+
+    public ModuleId(Name name) {
+        this.name = name;
+        this.version = null;
+    }
+
+    public ModuleId(Name name, Name version) {
+        this.name = name;
+        this.version = version;
+    }
+
+    public CharSequence getName() {
+        return name;
+    }
+
+    public CharSequence getVersion() {
+        return version;
+    }
+
+    public ModuleIdQuery toQuery() {
+        return new ModuleIdQuery(name, version);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof ModuleId))
+            return false;
+
+        ModuleId m = (ModuleId) other;
+        if (name != m.name)
+            return false;
+
+        return (version == null ? m.version == null : version.equals(m.version));
+    }
+
+    @Override
+    public int hashCode() {
+        if (version == null) {
+            return name.hashCode();
+        } else {
+            return name.hashCode() * version.hashCode();
+        }
+    }
+
+    // for debugging
+    @Override
+    public String toString() {
+        return "ModuleId[" + name + (version == null ? "" : "@" + version) + "]";
+    }
+
+    // for use in diagnostics
+    @Override
+    public String toString(Locale locale, Messages messages) {
+        return version == null ? name.toString() : name + "@" + version;
+    }
+
+    public String getKind() {
+        return "ModuleId";
+    }
+
+}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/ModuleIdQuery.java b/langtools/src/share/classes/com/sun/tools/javac/code/ModuleIdQuery.java
new file mode 100644
index 0000000..6ca5935
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/ModuleIdQuery.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package com.sun.tools.javac.code;
+
+import java.util.Locale;
+
+import com.sun.tools.javac.api.Formattable;
+import com.sun.tools.javac.api.Messages;
+import com.sun.tools.javac.util.Name;
+
+/**
+ * Representation of a module query, @literal{module-name at version-query}
+ *
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ */
+public class ModuleIdQuery implements javax.lang.model.element.ModuleElement.ModuleIdQuery, Formattable {
+    public final Name name;
+    public final Name versionQuery;
+
+    public ModuleIdQuery(Name name, Name version) {
+        this.name = name;
+        this.versionQuery = version;
+    }
+
+    public CharSequence getName() {
+        return name;
+    }
+
+    public CharSequence getVersionQuery() {
+        return versionQuery;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof ModuleIdQuery))
+            return false;
+
+        ModuleIdQuery m = (ModuleIdQuery) other;
+        if (name != m.name)
+            return false;
+
+        return (versionQuery == null) ? (m.versionQuery == null)
+                : versionQuery.equals(m.versionQuery);
+    }
+
+    @Override
+    public int hashCode() {
+        if (versionQuery == null) {
+            return name.hashCode();
+        } else {
+            return name.hashCode() * versionQuery.hashCode();
+        }
+    }
+
+    // for debugging
+    @Override
+    public String toString() {
+        return "ModuleQuery[" + name + (versionQuery == null ? "" : "@" + versionQuery) + "]";
+    }
+
+    // for use in diagnostics
+    @Override
+    public String toString(Locale locale, Messages messages) {
+        return versionQuery == null ? name.toString() : name + "@" + versionQuery;
+    }
+
+    public String getKind() {
+        return "ModuleQuery";
+    }
+
+}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java b/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java
index b20f84c..2233c07 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java
@@ -263,7 +263,7 @@ public abstract class Printer implements Type.Visitor<String, Locale>, Symbol.Vi
             ClassType norm = (ClassType) t.tsym.type;
             if (norm == null) {
                 s = localize(locale, "compiler.misc.anonymous.class", (Object) null);
-            } else if (norm.interfaces_field.nonEmpty()) {
+            } else if (norm.interfaces_field != null && norm.interfaces_field.nonEmpty()) {
                 s = localize(locale, "compiler.misc.anonymous.class",
                         visit(norm.interfaces_field.head, locale));
             } else {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java
index ab30aee..8c4bca3 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java
@@ -32,7 +32,7 @@ import static javax.lang.model.SourceVersion.*;
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.jvm.Target;
 
-import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.main.Option.*;
 
 /** The source language version accepted.
  *
@@ -170,9 +170,6 @@ public enum Source {
     public boolean allowModules() {
         return compareTo(JDK1_7) >= 0;
     }
-    public boolean allowImportsBeforePackage() {
-        return compareTo(JDK1_7) >= 0;
-    }
     public boolean addBridges() {
         return compareTo(JDK1_5) >= 0;
     }
@@ -200,6 +197,12 @@ public enum Source {
     public boolean allowObjectToPrimitiveCast() {
         return compareTo(JDK1_7) >= 0;
     }
+    public boolean allowLambda() {
+        return compareTo(JDK1_8) >= 0;
+    }
+    public boolean allowMethodReferences() {
+        return compareTo(JDK1_8) >= 0;
+    }
     public static SourceVersion toSourceVersion(Source source) {
         switch(source) {
         case JDK1_2:
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
index ec34c65..35a2ba2 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
@@ -34,12 +34,12 @@ import javax.tools.JavaFileObject;
 
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.Name;
+import com.sun.tools.javac.code.Directive.*;
 import com.sun.tools.javac.code.Type.*;
 import com.sun.tools.javac.comp.Attr;
 import com.sun.tools.javac.comp.AttrContext;
 import com.sun.tools.javac.comp.Env;
 import com.sun.tools.javac.jvm.*;
-import com.sun.tools.javac.jvm.ClassFile.ModuleId;
 import com.sun.tools.javac.model.*;
 import com.sun.tools.javac.tree.JCTree;
 
@@ -645,57 +645,22 @@ public abstract class Symbol implements Element {
         }
     }
 
-    public static class ModuleExport {
-        public ClassSymbol sym;
-        public List<Name> flags;
-        public ModuleExport(ClassSymbol sym, List<Name> flags) {
-            this.sym = sym;
-            this.flags = flags;
-        }
-
-        @Override
-        public String toString() {
-            return "ModuleExport[" + flags + "," + sym + "]";
-        }
-    }
-
-    public static class ModuleRequires implements ModuleElement.ModuleRequires {
-        public ModuleId moduleId;
-        public List<Name> flags;
-
-        public ModuleRequires(ModuleId moduleIdQuery, List<Name> flags) {
-            this.moduleId = moduleIdQuery;
-            this.flags = flags;
-        }
-
-        public ModuleElement.ModuleIdQuery getModuleIdQuery() {
-            return moduleId;
-        }
-
-        public java.util.List<? extends CharSequence> getFlags() {
-            return flags;
-        }
-
-        public String toString() {
-            return "ModuleRequires[" + flags + "," + moduleId + "]";
-        }
-    }
-
     /** A class for module symbols.
      */
     public static class ModuleSymbol extends TypeSymbol implements ModuleElement // JIGSAW need TypeSymbol?
             /*implements ModuleElement*/ {
+
         public Name fullname;
         public Name version;
 
+        /** All directives, in natural order. */
+        public ListBuffer<Directive> directives;
+
+        /** An uninterpreted string associated with the module. */
+        public Name extendedMetadata;
+
         public ClassSymbol module_info;
 
-        public ClassSymbol className;
-        public List<Name> classFlags;
-        public ListBuffer<Name> permits;
-        public ListBuffer<Symbol.ModuleExport> exports;
-        public ListBuffer<ClassFile.ModuleId> provides;
-        public Map<ClassFile.ModuleId,Symbol.ModuleRequires> requires;
         public JavaFileManager.Location location;
 
         public ModuleSymbol() {
@@ -711,16 +676,82 @@ public abstract class Symbol implements Element {
             this.fullname = formFullName(name, owner);
         }
 
-        public ClassFile.ModuleId getModuleId() {
-            return new ClassFile.ModuleId(fullname, version);
+        // Currently ModuleId is defined in ModuleElement, which means
+        public com.sun.tools.javac.code.ModuleId getModuleId() {
+            return new com.sun.tools.javac.code.ModuleId(fullname, version);
         }
 
-        public java.util.List<Symbol.ModuleRequires> getRequires() {
-            List<Symbol.ModuleRequires> l = List.nil();
-            for (Symbol.ModuleRequires mr: requires.values()) {
-                l = l.prepend(mr);
+        public boolean hasRequires() {
+            for (Directive d: directives) {
+                switch (d.getKind()) {
+                    case REQUIRES_MODULE:
+                    case REQUIRES_SERVICE:
+                        return true;
+                }
             }
-            return l.reverse();
+            return false;
+        }
+
+        public List<RequiresModuleDirective> getRequiredModules() {
+            return Directive.filter(directives, Directive.Kind.REQUIRES_MODULE,
+                    RequiresModuleDirective.class);
+        }
+
+        public List<RequiresServiceDirective> getRequiredServices() {
+            return Directive.filter(directives, Directive.Kind.REQUIRES_SERVICE,
+                    RequiresServiceDirective.class);
+        }
+
+        public boolean hasViews() {
+            for (Directive d: directives) {
+                switch (d.getKind()) {
+                    case REQUIRES_MODULE:
+                    case REQUIRES_SERVICE:
+                        continue;
+                    default:
+                        return true;
+                }
+            }
+            return false;
+        }
+
+        public ViewDeclaration getDefaultView() {
+            ListBuffer<Directive> defaultViewDirectives = ListBuffer.lb();
+            for (Directive d: directives) {
+                switch (d.getKind()) {
+                    case PROVIDES_MODULE:
+                    case PROVIDES_SERVICE:
+                    case EXPORTS:
+                    case PERMITS:
+                    case ENTRYPOINT:
+                        defaultViewDirectives.add(d);
+                }
+            }
+            return new ViewDeclaration(defaultViewDirectives);
+        }
+
+        public List<ViewDeclaration> getViews() {
+            ListBuffer<Directive> defaultViewDirectives = ListBuffer.lb();
+            for (Directive d: directives) {
+                switch (d.getKind()) {
+                    case PROVIDES_MODULE:
+                    case PROVIDES_SERVICE:
+                    case EXPORTS:
+                    case PERMITS:
+                    case ENTRYPOINT:
+                        defaultViewDirectives.add(d);
+                }
+            }
+            List<ViewDeclaration> views =
+                    Directive.filter(directives, Directive.Kind.VIEW,
+                        ViewDeclaration.class);
+            if (defaultViewDirectives.nonEmpty())
+                views = views.prepend(new ViewDeclaration(defaultViewDirectives));
+            return views;
+        }
+
+        public boolean hasExtendedMetadata() {
+            return (extendedMetadata != null) && !extendedMetadata.isEmpty();
         }
 
         @Override
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
index cca3bcd..9336b92 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
@@ -278,7 +278,6 @@ public class Types {
         boolean tPrimitive = t.isPrimitive();
         boolean sPrimitive = s.isPrimitive();
         if (tPrimitive == sPrimitive) {
-            checkUnsafeVarargsConversion(t, s, warn);
             return isSubtypeUnchecked(t, s, warn);
         }
         if (!allowBoxing) return false;
@@ -286,27 +285,6 @@ public class Types {
             ? isSubtype(boxedClass(t).type, s)
             : isSubtype(unboxedType(t), s);
     }
-    //where
-    private void checkUnsafeVarargsConversion(Type t, Type s, Warner warn) {
-        if (t.tag != ARRAY || isReifiable(t)) return;
-        ArrayType from = (ArrayType)t;
-        boolean shouldWarn = false;
-        switch (s.tag) {
-            case ARRAY:
-                ArrayType to = (ArrayType)s;
-                shouldWarn = from.isVarargs() &&
-                        !to.isVarargs() &&
-                        !isReifiable(from);
-                break;
-            case CLASS:
-                shouldWarn = from.isVarargs() &&
-                        isSubtype(from, s);
-                break;
-        }
-        if (shouldWarn) {
-            warn.warn(LintCategory.VARARGS);
-        }
-    }
 
     /**
      * Is t a subtype of or convertiable via boxing/unboxing
@@ -328,42 +306,63 @@ public class Types {
      * Is t an unchecked subtype of s?
      */
     public boolean isSubtypeUnchecked(Type t, Type s, Warner warn) {
-        if (t.tag == ARRAY && s.tag == ARRAY) {
-            if (((ArrayType)t).elemtype.tag <= lastBaseTag) {
-                return isSameType(elemtype(t), elemtype(s));
-            } else {
-                ArrayType from = (ArrayType)t;
-                ArrayType to = (ArrayType)s;
-                if (from.isVarargs() &&
-                        !to.isVarargs() &&
-                        !isReifiable(from)) {
-                    warn.warn(LintCategory.VARARGS);
+        boolean result = isSubtypeUncheckedInternal(t, s, warn);
+        if (result) {
+            checkUnsafeVarargsConversion(t, s, warn);
+        }
+        return result;
+    }
+    //where
+        private boolean isSubtypeUncheckedInternal(Type t, Type s, Warner warn) {
+            if (t.tag == ARRAY && s.tag == ARRAY) {
+                if (((ArrayType)t).elemtype.tag <= lastBaseTag) {
+                    return isSameType(elemtype(t), elemtype(s));
+                } else {
+                    return isSubtypeUnchecked(elemtype(t), elemtype(s), warn);
                 }
-                return isSubtypeUnchecked(elemtype(t), elemtype(s), warn);
+            } else if (isSubtype(t, s)) {
+                return true;
             }
-        } else if (isSubtype(t, s)) {
-            return true;
-        }
-        else if (t.tag == TYPEVAR) {
-            return isSubtypeUnchecked(t.getUpperBound(), s, warn);
-        }
-        else if (s.tag == UNDETVAR) {
-            UndetVar uv = (UndetVar)s;
-            if (uv.inst != null)
-                return isSubtypeUnchecked(t, uv.inst, warn);
+            else if (t.tag == TYPEVAR) {
+                return isSubtypeUnchecked(t.getUpperBound(), s, warn);
+            }
+            else if (s.tag == UNDETVAR) {
+                UndetVar uv = (UndetVar)s;
+                if (uv.inst != null)
+                    return isSubtypeUnchecked(t, uv.inst, warn);
+            }
+            else if (!s.isRaw()) {
+                Type t2 = asSuper(t, s.tsym);
+                if (t2 != null && t2.isRaw()) {
+                    if (isReifiable(s))
+                        warn.silentWarn(LintCategory.UNCHECKED);
+                    else
+                        warn.warn(LintCategory.UNCHECKED);
+                    return true;
+                }
+            }
+            return false;
         }
-        else if (!s.isRaw()) {
-            Type t2 = asSuper(t, s.tsym);
-            if (t2 != null && t2.isRaw()) {
-                if (isReifiable(s))
-                    warn.silentWarn(LintCategory.UNCHECKED);
-                else
-                    warn.warn(LintCategory.UNCHECKED);
-                return true;
+
+        private void checkUnsafeVarargsConversion(Type t, Type s, Warner warn) {
+            if (t.tag != ARRAY || isReifiable(t)) return;
+            ArrayType from = (ArrayType)t;
+            boolean shouldWarn = false;
+            switch (s.tag) {
+                case ARRAY:
+                    ArrayType to = (ArrayType)s;
+                    shouldWarn = from.isVarargs() &&
+                            !to.isVarargs() &&
+                            !isReifiable(from);
+                    break;
+                case CLASS:
+                    shouldWarn = from.isVarargs();
+                    break;
+            }
+            if (shouldWarn) {
+                warn.warn(LintCategory.VARARGS);
             }
         }
-        return false;
-    }
 
     /**
      * Is t a subtype of s?<br>
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java
index 3d13527..724481e 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,8 @@ import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.tree.*;
 import com.sun.tools.javac.tree.JCTree.*;
 
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
+
 /** Enter annotations on symbols.  Annotations accumulate in a queue,
  *  which is processed at the top level of any set of recursive calls
  *  requesting it be processed.
@@ -148,7 +150,7 @@ public class Annotate {
             return new Attribute.Compound(a.type, List.<Pair<MethodSymbol,Attribute>>nil());
         }
         List<JCExpression> args = a.args;
-        if (args.length() == 1 && args.head.getTag() != JCTree.ASSIGN) {
+        if (args.length() == 1 && !args.head.hasTag(ASSIGN)) {
             // special case: elided "value=" assumed
             args.head = make.at(args.head.pos).
                 Assign(make.Ident(names.value), args.head);
@@ -157,12 +159,12 @@ public class Annotate {
             new ListBuffer<Pair<MethodSymbol,Attribute>>();
         for (List<JCExpression> tl = args; tl.nonEmpty(); tl = tl.tail) {
             JCExpression t = tl.head;
-            if (t.getTag() != JCTree.ASSIGN) {
+            if (!t.hasTag(ASSIGN)) {
                 log.error(t.pos(), "annotation.value.must.be.name.value");
                 continue;
             }
             JCAssign assign = (JCAssign)t;
-            if (assign.lhs.getTag() != JCTree.IDENT) {
+            if (!assign.lhs.hasTag(IDENT)) {
                 log.error(t.pos(), "annotation.value.must.be.name.value");
                 continue;
             }
@@ -222,14 +224,14 @@ public class Annotate {
                                        (((JCFieldAccess) tree).selected).type);
         }
         if ((expected.tsym.flags() & Flags.ANNOTATION) != 0) {
-            if (tree.getTag() != JCTree.ANNOTATION) {
+            if (!tree.hasTag(ANNOTATION)) {
                 log.error(tree.pos(), "annotation.value.must.be.annotation");
                 expected = syms.errorType;
             }
             return enterAnnotation((JCAnnotation)tree, expected, env);
         }
         if (expected.tag == TypeTags.ARRAY) { // should really be isArray()
-            if (tree.getTag() != JCTree.NEWARRAY) {
+            if (!tree.hasTag(NEWARRAY)) {
                 tree = make.at(tree.pos).
                     NewArray(null, List.<JCExpression>nil(), List.of(tree));
             }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
index f459f49..e508185 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -25,6 +25,9 @@
 
 package com.sun.tools.javac.comp;
 
+import com.sun.source.tree.RequiresFlag;
+import com.sun.tools.javac.code.Directive.ProvidesServiceDirective;
+import com.sun.tools.javac.code.Directive.RequiresServiceDirective;
 import java.util.*;
 import java.util.Set;
 import javax.lang.model.element.ElementKind;
@@ -38,6 +41,10 @@ import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 import com.sun.tools.javac.util.List;
 
 import com.sun.tools.javac.jvm.Target;
+import com.sun.tools.javac.code.Directive.EntrypointDirective;
+import com.sun.tools.javac.code.Directive.ExportsDirective;
+import com.sun.tools.javac.code.Directive.ExportFlag;
+import com.sun.tools.javac.code.Directive.ViewDeclaration;
 import com.sun.tools.javac.code.Lint.LintCategory;
 import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.tree.JCTree.*;
@@ -49,8 +56,14 @@ import com.sun.source.tree.TreeVisitor;
 import com.sun.source.util.SimpleTreeVisitor;
 
 import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.ANNOTATION;
+import static com.sun.tools.javac.code.Flags.BLOCK;
 import static com.sun.tools.javac.code.Kinds.*;
+import static com.sun.tools.javac.code.Kinds.ERRONEOUS;
 import static com.sun.tools.javac.code.TypeTags.*;
+import static com.sun.tools.javac.code.TypeTags.PACKAGE;
+import static com.sun.tools.javac.code.TypeTags.WILDCARD;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
 
 /** This is the main context-dependent analysis phase in GJC. It
  *  encompasses name resolution, type checking and constant folding as
@@ -245,7 +258,7 @@ public class Attr extends JCTree.Visitor {
             ((v.flags() & HASINIT) != 0
              ||
              !((base == null ||
-               (base.getTag() == JCTree.IDENT && TreeInfo.name(base) == names._this)) &&
+               (base.hasTag(IDENT) && TreeInfo.name(base) == names._this)) &&
                isAssignableAsBlankFinal(v, env)))) {
             if (v.isResourceVariable()) { //TWR resource
                 log.error(pos, "try.resource.may.not.be.assigned", v);
@@ -263,7 +276,7 @@ public class Attr extends JCTree.Visitor {
      *  @param tree    The candidate tree.
      */
     boolean isStaticReference(JCTree tree) {
-        if (tree.getTag() == JCTree.SELECT) {
+        if (tree.hasTag(SELECT)) {
             Symbol lsym = TreeInfo.symbol(((JCFieldAccess) tree).selected);
             if (lsym == null || lsym.kind != TYP) {
                 return false;
@@ -693,7 +706,7 @@ public class Attr extends JCTree.Visitor {
             // disable implicit outer instance from being passed.
             // (This would be an illegal access to "this before super").
             if (env.info.isSelfCall &&
-                env.tree.getTag() == JCTree.NEWCLASS &&
+                env.tree.hasTag(NEWCLASS) &&
                 ((JCNewClass) env.tree).encl == null)
             {
                 c.flags_field |= NOOUTERTHIS;
@@ -868,7 +881,7 @@ public class Attr extends JCTree.Visitor {
             chk.checkModuleModifier(tree.pos(), v);
 
             if (tree.init != null) {
-                if ((v.flags_field & FINAL) != 0 && tree.init.getTag() != JCTree.NEWCLASS) {
+                if ((v.flags_field & FINAL) != 0 && !tree.init.hasTag(NEWCLASS)) {
                     // In this case, `v' is final.  Ensure that it's initializer is
                     // evaluated.
                     v.getConstValue(); // ensure initializer is evaluated
@@ -976,8 +989,8 @@ public class Attr extends JCTree.Visitor {
     public void visitLabelled(JCLabeledStatement tree) {
         // Check that label is not used in an enclosing statement
         Env<AttrContext> env1 = env;
-        while (env1 != null && env1.tree.getTag() != JCTree.CLASSDEF) {
-            if (env1.tree.getTag() == JCTree.LABELLED &&
+        while (env1 != null && !env1.tree.hasTag(CLASSDEF)) {
+            if (env1.tree.hasTag(LABELLED) &&
                 ((JCLabeledStatement) env1.tree).label == tree.label) {
                 log.error(tree.pos(), "label.already.in.use",
                           tree.label);
@@ -1057,14 +1070,14 @@ public class Attr extends JCTree.Visitor {
         private static void addVars(List<JCStatement> stats, Scope switchScope) {
             for (;stats.nonEmpty(); stats = stats.tail) {
                 JCTree stat = stats.head;
-                if (stat.getTag() == JCTree.VARDEF)
+                if (stat.hasTag(VARDEF))
                     switchScope.enter(((JCVariableDecl) stat).sym);
             }
         }
     // where
     /** Return the selected enumeration constant symbol, or null. */
     private Symbol enumConstant(JCTree tree, Type enumType) {
-        if (tree.getTag() != JCTree.IDENT) {
+        if (!tree.hasTag(IDENT)) {
             log.error(tree.pos(), "enum.label.must.be.unqualified.enum");
             return syms.errSymbol;
         }
@@ -1099,7 +1112,7 @@ public class Attr extends JCTree.Visitor {
             localEnv;
         // Attribute resource declarations
         for (JCTree resource : tree.resources) {
-            if (resource.getTag() == JCTree.VARDEF) {
+            if (resource.hasTag(VARDEF)) {
                 attribStat(resource, tryEnv);
                 chk.checkType(resource, resource.type, syms.autoCloseableType, "try.not.applicable.to.type");
 
@@ -1317,7 +1330,7 @@ public class Attr extends JCTree.Visitor {
          *  @param env     The environment current at the jump statement.
          */
         private JCTree findJumpTarget(DiagnosticPosition pos,
-                                    int tag,
+                                    JCTree.Tag tag,
                                     Name label,
                                     Env<AttrContext> env) {
             // Search environments outwards from the point of jump.
@@ -1325,15 +1338,15 @@ public class Attr extends JCTree.Visitor {
             LOOP:
             while (env1 != null) {
                 switch (env1.tree.getTag()) {
-                case JCTree.LABELLED:
+                case LABELLED:
                     JCLabeledStatement labelled = (JCLabeledStatement)env1.tree;
                     if (label == labelled.label) {
                         // If jump is a continue, check that target is a loop.
-                        if (tag == JCTree.CONTINUE) {
-                            if (labelled.body.getTag() != JCTree.DOLOOP &&
-                                labelled.body.getTag() != JCTree.WHILELOOP &&
-                                labelled.body.getTag() != JCTree.FORLOOP &&
-                                labelled.body.getTag() != JCTree.FOREACHLOOP)
+                        if (tag == CONTINUE) {
+                            if (!labelled.body.hasTag(DOLOOP) &&
+                                !labelled.body.hasTag(WHILELOOP) &&
+                                !labelled.body.hasTag(FORLOOP) &&
+                                !labelled.body.hasTag(FOREACHLOOP))
                                 log.error(pos, "not.loop.label", label);
                             // Found labelled statement target, now go inwards
                             // to next non-labelled tree.
@@ -1343,17 +1356,17 @@ public class Attr extends JCTree.Visitor {
                         }
                     }
                     break;
-                case JCTree.DOLOOP:
-                case JCTree.WHILELOOP:
-                case JCTree.FORLOOP:
-                case JCTree.FOREACHLOOP:
+                case DOLOOP:
+                case WHILELOOP:
+                case FORLOOP:
+                case FOREACHLOOP:
                     if (label == null) return env1.tree;
                     break;
-                case JCTree.SWITCH:
-                    if (label == null && tag == JCTree.BREAK) return env1.tree;
+                case SWITCH:
+                    if (label == null && tag == BREAK) return env1.tree;
                     break;
-                case JCTree.METHODDEF:
-                case JCTree.CLASSDEF:
+                case METHODDEF:
+                case CLASSDEF:
                     break LOOP;
                 default:
                 }
@@ -1361,7 +1374,7 @@ public class Attr extends JCTree.Visitor {
             }
             if (label != null)
                 log.error(pos, "undef.label", label);
-            else if (tag == JCTree.CONTINUE)
+            else if (tag == CONTINUE)
                 log.error(pos, "cont.outside.loop");
             else
                 log.error(pos, "break.outside.switch.loop");
@@ -1457,7 +1470,7 @@ public class Attr extends JCTree.Visitor {
                     if (encl.tag == CLASS) {
                         // we are calling a nested class
 
-                        if (tree.meth.getTag() == JCTree.SELECT) {
+                        if (tree.meth.hasTag(SELECT)) {
                             JCTree qualifier = ((JCFieldAccess) tree.meth).selected;
 
                             // We are seeing a prefixed call, of the form
@@ -1473,7 +1486,7 @@ public class Attr extends JCTree.Visitor {
                             rs.resolveImplicitThis(tree.meth.pos(),
                                                    localEnv, site, true);
                         }
-                    } else if (tree.meth.getTag() == JCTree.SELECT) {
+                    } else if (tree.meth.hasTag(SELECT)) {
                         log.error(tree.meth.pos(), "illegal.qual.not.icls",
                                   site.tsym);
                     }
@@ -1527,7 +1540,7 @@ public class Attr extends JCTree.Visitor {
 
             // as a special case, array.clone() has a result that is
             // the same as static type of the array being cloned
-            if (tree.meth.getTag() == JCTree.SELECT &&
+            if (tree.meth.hasTag(SELECT) &&
                 allowCovariantReturns &&
                 methName == names.clone &&
                 types.isArray(((JCFieldAccess) tree.meth).selected.type))
@@ -1536,7 +1549,7 @@ public class Attr extends JCTree.Visitor {
             // as a special case, x.getClass() has type Class<? extends |X|>
             if (allowGenerics &&
                 methName == names.getClass && tree.args.isEmpty()) {
-                Type qualifier = (tree.meth.getTag() == JCTree.SELECT)
+                Type qualifier = (tree.meth.hasTag(SELECT))
                     ? ((JCFieldAccess) tree.meth).selected.type
                     : env.enclClass.sym.type;
                 restype = new
@@ -1565,7 +1578,7 @@ public class Attr extends JCTree.Visitor {
             JCMethodDecl enclMethod = env.enclMethod;
             if (enclMethod != null && enclMethod.name == names.init) {
                 JCBlock body = enclMethod.body;
-                if (body.stats.head.getTag() == JCTree.EXEC &&
+                if (body.stats.head.hasTag(EXEC) &&
                     ((JCExpressionStatement) body.stats.head).expr == tree)
                     return true;
             }
@@ -1596,7 +1609,7 @@ public class Attr extends JCTree.Visitor {
         // complete class name to be fully qualified
         JCExpression clazz = tree.clazz; // Class field following new
         JCExpression clazzid =          // Identifier in class field
-            (clazz.getTag() == JCTree.TYPEAPPLY)
+            (clazz.hasTag(TYPEAPPLY))
             ? ((JCTypeApply) clazz).clazz
             : clazz;
 
@@ -1615,7 +1628,7 @@ public class Attr extends JCTree.Visitor {
                                              attribExpr(tree.encl, env));
             clazzid1 = make.at(clazz.pos).Select(make.Type(encltype),
                                                  ((JCIdent) clazzid).name);
-            if (clazz.getTag() == JCTree.TYPEAPPLY)
+            if (clazz.hasTag(TYPEAPPLY))
                 clazz = make.at(tree.pos).
                     TypeApply(clazzid1,
                               ((JCTypeApply) clazz).arguments);
@@ -1694,7 +1707,7 @@ public class Attr extends JCTree.Visitor {
             // Enums may not be instantiated except implicitly
             if (allowEnums &&
                 (clazztype.tsym.flags_field&Flags.ENUM) != 0 &&
-                (env.tree.getTag() != JCTree.VARDEF ||
+                (!env.tree.hasTag(VARDEF) ||
                  (((JCVariableDecl) env.tree).mods.flags&Flags.ENUM) == 0 ||
                  ((JCVariableDecl) env.tree).init != tree))
                 log.error(tree.pos(), "enum.cant.be.instantiated");
@@ -1935,7 +1948,7 @@ public class Attr extends JCTree.Visitor {
         Name name = TreeInfo.name(arg);
         if (name == names._this || name == names._super) return arg;
 
-        int optag = JCTree.NULLCHK;
+        JCTree.Tag optag = NULLCHK;
         JCUnary tree = make.at(arg.pos).Unary(optag, arg);
         tree.operator = syms.nullcheck;
         tree.type = arg.type;
@@ -1975,6 +1988,16 @@ public class Attr extends JCTree.Visitor {
         result = check(tree, owntype, VAL, pkind, pt);
     }
 
+    @Override
+    public void visitLambda(JCLambda that) {
+        throw new UnsupportedOperationException("Lambda expression not supported yet");
+    }
+
+    @Override
+    public void visitReference(JCMemberReference that) {
+        throw new UnsupportedOperationException("Member references not supported yet");
+    }
+
     public void visitParens(JCParens tree) {
         Type owntype = attribTree(tree.expr, env, pkind, pt);
         result = check(tree, owntype, pkind, pkind, pt);
@@ -1996,7 +2019,7 @@ public class Attr extends JCTree.Visitor {
         Type operand = attribExpr(tree.rhs, env);
         // Find operator.
         Symbol operator = tree.operator = rs.resolveBinaryOperator(
-            tree.pos(), tree.getTag() - JCTree.ASGOffset, env,
+            tree.pos(), tree.getTag().noAssignOp(), env,
             owntype, operand);
 
         if (operator.kind == MTH &&
@@ -2004,7 +2027,7 @@ public class Attr extends JCTree.Visitor {
                 !operand.isErroneous()) {
             chk.checkOperator(tree.pos(),
                               (OperatorSymbol)operator,
-                              tree.getTag() - JCTree.ASGOffset,
+                              tree.getTag().noAssignOp(),
                               owntype,
                               operand);
             chk.checkDivZero(tree.rhs.pos(), operator, operand);
@@ -2017,7 +2040,7 @@ public class Attr extends JCTree.Visitor {
 
     public void visitUnary(JCUnary tree) {
         // Attribute arguments.
-        Type argtype = (JCTree.PREINC <= tree.getTag() && tree.getTag() <= JCTree.POSTDEC)
+        Type argtype = (tree.getTag().isIncOrDecUnaryOp())
             ? attribTree(tree.arg, env, VAR, Type.noType)
             : chk.checkNonVoid(tree.arg.pos(), attribExpr(tree.arg, env));
 
@@ -2028,7 +2051,7 @@ public class Attr extends JCTree.Visitor {
         Type owntype = types.createErrorType(tree.type);
         if (operator.kind == MTH &&
                 !argtype.isErroneous()) {
-            owntype = (JCTree.PREINC <= tree.getTag() && tree.getTag() <= JCTree.POSTDEC)
+            owntype = (tree.getTag().isIncOrDecUnaryOp())
                 ? tree.arg.type
                 : operator.type.getReturnType();
             int opc = ((OperatorSymbol)operator).opcode;
@@ -2626,7 +2649,7 @@ public class Attr extends JCTree.Visitor {
                 canOwnInitializer(env.info.scope.owner) &&
                 v.owner == env.info.scope.owner.enclClass() &&
                 ((v.flags() & STATIC) != 0) == Resolve.isStatic(env) &&
-                (env.tree.getTag() != JCTree.ASSIGN ||
+                (!env.tree.hasTag(ASSIGN) ||
                  TreeInfo.skipParens(((JCAssign) env.tree).lhs) != tree)) {
                 String suffix = (env.info.enclVar == v) ?
                                 "self.ref" : "forward.ref";
@@ -2817,10 +2840,10 @@ public class Attr extends JCTree.Visitor {
                 }
                 Type elemtype = types.elemtype(argtype);
                 switch (tree.getTag()) {
-                case JCTree.APPLY:
+                case APPLY:
                     ((JCMethodInvocation) tree).varargsElement = elemtype;
                     break;
-                case JCTree.NEWCLASS:
+                case NEWCLASS:
                     ((JCNewClass) tree).varargsElement = elemtype;
                     break;
                 default:
@@ -2901,9 +2924,9 @@ public class Attr extends JCTree.Visitor {
                 if (clazzOuter.tag == CLASS) {
                     Type site;
                     JCExpression clazz = TreeInfo.typeIn(tree.clazz);
-                    if (clazz.getTag() == JCTree.IDENT) {
+                    if (clazz.hasTag(IDENT)) {
                         site = env.enclClass.sym.type;
-                    } else if (clazz.getTag() == JCTree.SELECT) {
+                    } else if (clazz.hasTag(SELECT)) {
                         site = ((JCFieldAccess) clazz).selected.type;
                     } else throw new AssertionError(""+tree);
                     if (clazzOuter.tag == CLASS && site != clazzOuter) {
@@ -3056,59 +3079,120 @@ public class Attr extends JCTree.Visitor {
         result = tree.type = syms.errType;
     }
 
+    @Override
     public void visitModuleDef(JCModuleDecl tree) {
-        attribStats(tree.getMetadataList(), env);
+        attribStats(tree.getDirectives(), env);
+    }
+
+    @Override
+    public void visitExports(JCExportDirective tree) {
+        JCExpression expr = tree.qualid;
+        boolean asterisk = false;
+        if (expr.hasTag(Tag.SELECT)) {
+            JCFieldAccess fa = (JCFieldAccess) expr;
+            if (fa.name == names.asterisk) {
+                asterisk = true;
+                expr = fa.selected;
+            }
+        }
+
+        TypeSymbol tsym = attribTree(expr, env,
+                PCK | TYP, Type.noType).tsym;
+        if (tsym.kind != ERR) {
+            EnumSet<ExportFlag> flags = EnumSet.of(ExportFlag.valueOf(tsym.kind, asterisk));
+            ModuleId origin = (tsym.kind == TYP) ? ((ClassSymbol) tsym).modle.getModuleId() : null;
+            ExportsDirective d = new ExportsDirective(tsym, flags, origin);
+            ViewDeclaration enclView = env.info.enclView;
+            if (enclView == null) {
+                ModuleSymbol msym = env.toplevel.modle;
+                msym.directives.add(d);
+            } else {
+                enclView.directives.add(d);
+            }
+        }
     }
 
-    public void visitModuleExport(JCModuleExport tree) {
-        JCTree exp = tree.qualid;
-        if (exp.getTag() != JCTree.SELECT) {
-            log.error(exp.pos(), "invalid.export");
-            return;
-        }
-        ClassSymbol csym;
-        JCFieldAccess s = (JCFieldAccess) exp;
-        Name name = TreeInfo.name(exp);
-        if (name == names.double_asterisk) {
-            TypeSymbol p = attribTree(s.selected, env, PCK, Type.noType).tsym;
-            Scope.Entry e = p.members().lookup(name);
-            if (e.sym != null) {
-                csym = (ClassSymbol) e.sym;
-            } else {
-                csym = new ClassSymbol(0, name, p);
-                p.members().enter(csym);
-            }
-        } else if (name == names.asterisk) {
-            TypeSymbol t = attribTree(s.selected, env, PCK | TYP, Type.noType).tsym;
-            Scope.Entry e = t.members().lookup(name);
-            if (e.sym != null) {
-                csym = (ClassSymbol) e.sym;
+    @Override
+    public void visitProvidesModule(JCProvidesModuleDirective tree) {
+    }
+
+    @Override
+    public void visitProvidesService(JCProvidesServiceDirective tree) {
+        Symbol srvc = attribTree(tree.serviceName, env, TYP, Type.noType).tsym;
+        TypeSymbol impl = attribTree(tree.implName, env, TYP, Type.noType).tsym;
+        if (srvc.kind != ERR && impl.kind != ERR) {
+            ProvidesServiceDirective d =
+                    new ProvidesServiceDirective((ClassSymbol) srvc, (ClassSymbol) impl);
+            ViewDeclaration enclView = env.info.enclView;
+            if (enclView == null) {
+                ModuleSymbol msym = env.toplevel.modle;
+                msym.directives.add(d);
             } else {
-                csym = new ClassSymbol(0, name, t);
-                t.members().enter(csym);
+                enclView.directives.add(d);
             }
-        } else {
-            csym = (ClassSymbol) attribTree(s, env, TYP, Type.noType).tsym;
         }
+    }
 
-        ModuleSymbol msym = env.toplevel.modle;
-        msym.exports.add(new Symbol.ModuleExport(csym, List.<Name>nil()));
-
+    @Override
+    public void visitRequiresModule(JCRequiresModuleDirective tree) {
     }
 
-    public void visitModuleRequires(JCModuleRequires tree) {
+    @Override
+    public void visitRequiresService(JCRequiresServiceDirective tree) {
+        Type t = attribType(tree.serviceName, env);
+        if (t.tag == CLASS) {
+            // FIXME: should check for duplicates
+            Set<Directive.RequiresFlag> flags = EnumSet.noneOf(Directive.RequiresFlag.class);
+            for (RequiresFlag f: tree.flags) {
+                switch (f) {
+                    case OPTIONAL:
+                        flags.add(Directive.RequiresFlag.OPTIONAL);
+                        break;
+                }
+            }
+            RequiresServiceDirective d = new RequiresServiceDirective((ClassSymbol) tree.serviceName.type.tsym, flags);
+            ViewDeclaration enclView = env.info.enclView;
+            if (enclView == null) {
+                ModuleSymbol msym = env.toplevel.modle;
+                msym.directives.add(d);
+            } else {
+                enclView.directives.add(d);
+            }
+        }
     }
 
-    public void visitModulePermits(JCModulePermits tree) {
+    @Override
+    public void visitPermits(JCPermitsDirective tree) {
     }
 
-    public void visitModuleClass(JCModuleClass tree) {
-        ModuleSymbol msym = env.toplevel.modle;
+    @Override
+    public void visitEntrypoint(JCEntrypointDirective tree) {
         Type t = attribType(tree.qualId, env);
         if (t.tag == CLASS) {
             // FIXME: should check for duplicates
-            msym.className = (ClassSymbol) tree.qualId.type.tsym;
-            msym.classFlags = tree.flags;
+            EntrypointDirective d = new EntrypointDirective((ClassSymbol) tree.qualId.type.tsym);
+            ViewDeclaration enclView = env.info.enclView;
+            if (enclView == null) {
+                ModuleSymbol msym = env.toplevel.modle;
+                msym.directives.add(d);
+            } else {
+                enclView.directives.add(d);
+            }
+        }
+    }
+
+    @Override
+    public void visitView(JCViewDecl tree) {
+        ModuleSymbol msym = env.toplevel.modle;
+        Name name = TreeInfo.fullName(tree.name);
+        for (Directive d: msym.directives) {
+            if (d.getKind() == Directive.Kind.VIEW
+                    && ((ViewDeclaration) d).name == name) {
+                Assert.checkNull(env.info.enclView);
+                env.info.enclView = (ViewDeclaration) d;
+                attribStats(tree.directives, env);
+                env.info.enclView = null;
+            }
         }
     }
 
@@ -3127,10 +3211,10 @@ public class Attr extends JCTree.Visitor {
 
     public void attrib(Env<AttrContext> env) {
         switch (env.tree.getTag()) {
-            case JCTree.MODULE:
+            case MODULE:
                 attribModule(env.tree.pos(), ((JCModuleDecl)env.tree).sym);
                 break;
-            case JCTree.TOPLEVEL:
+            case TOPLEVEL:
                 attribTopLevel(env);
                 break;
             default:
@@ -3329,7 +3413,7 @@ public class Attr extends JCTree.Visitor {
                 ((c.flags() & STATIC) == 0 || c.name == names.empty) &&
                 (TreeInfo.flags(l.head) & (STATIC | INTERFACE)) != 0) {
                 Symbol sym = null;
-                if (l.head.getTag() == JCTree.VARDEF) sym = ((JCVariableDecl) l.head).sym;
+                if (l.head.hasTag(VARDEF)) sym = ((JCVariableDecl) l.head).sym;
                 if (sym == null ||
                     sym.kind != VAR ||
                     ((VarSymbol) sym).getConstValue() == null)
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/AttrContext.java b/langtools/src/share/classes/com/sun/tools/javac/comp/AttrContext.java
index 1589ccb..59be5fc 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/AttrContext.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/AttrContext.java
@@ -27,6 +27,7 @@ package com.sun.tools.javac.comp;
 
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.code.*;
+import com.sun.tools.javac.code.Directive.ViewDeclaration;
 
 /** Contains information specific to the attribute and enter
  *  passes, to be used in place of the generic field in environments.
@@ -62,7 +63,7 @@ public class AttrContext {
      */
     List<Type> tvars = List.nil();
 
-    /** A record of the lint/SuppressWarnings currently in effect
+    /** A record of the lint/SuppressWarnings currently in effect.
      */
     Lint lint;
 
@@ -71,6 +72,9 @@ public class AttrContext {
      */
     Symbol enclVar = null;
 
+    /** The enclosing view, in a module-info file. */
+    ViewDeclaration enclView;
+
     /** Duplicate this context, replacing scope field and copying all others.
      */
     AttrContext dup(Scope scope) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
index 63c6979..06a1818 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
@@ -42,11 +42,14 @@ import com.sun.tools.javac.code.Type.*;
 import com.sun.tools.javac.code.Symbol.*;
 
 import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.ANNOTATION;
+import static com.sun.tools.javac.code.Flags.MODULE;
+import static com.sun.tools.javac.code.Flags.SYNCHRONIZED;
 import static com.sun.tools.javac.code.Kinds.*;
 import static com.sun.tools.javac.code.TypeTags.*;
-import static com.sun.tools.javac.code.Flags.MODULE; // resolve ambiguity
+import static com.sun.tools.javac.code.TypeTags.WILDCARD;
 
-import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
 
 /** Type checking helper class for the attribution phase.
  *
@@ -107,7 +110,7 @@ public class Check {
         allowAnnotations = source.allowAnnotations();
         allowCovariantReturns = source.allowCovariantReturns();
         allowSimplifiedVarargs = source.allowSimplifiedVarargs();
-        complexInference = options.isSet(COMPLEXINFERENCE);
+        complexInference = options.isSet("complexinference");
         skipAnnotations = options.isSet("skipAnnotations");
         warnOnSyntheticConflicts = options.isSet("warnOnSyntheticConflicts");
         suppressAbortOnBadClassFile = options.isSet("suppressAbortOnBadClassFile");
@@ -1015,7 +1018,7 @@ public class Check {
      *  <i>not</i> final.
      */
     private long implicitEnumFinalFlag(JCTree tree) {
-        if (tree.getTag() != JCTree.CLASSDEF) return 0;
+        if (!tree.hasTag(CLASSDEF)) return 0;
         class SpecialTreeVisitor extends JCTree.Visitor {
             boolean specialized;
             SpecialTreeVisitor() {
@@ -1127,7 +1130,7 @@ public class Check {
                 // not parameterized at all.
                 if (tree.type.getEnclosingType().isRaw())
                     log.error(tree.pos(), "improperly.formed.type.inner.raw.param");
-                if (tree.clazz.getTag() == JCTree.SELECT)
+                if (tree.clazz.hasTag(SELECT))
                     visitSelectInternal((JCFieldAccess)tree.clazz);
             }
         }
@@ -1197,12 +1200,17 @@ public class Check {
             if (lint.isEnabled(LintCategory.RAW) &&
                 tree.type.tag == CLASS &&
                 !TreeInfo.isDiamond(tree) &&
-                !env.enclClass.name.isEmpty() &&  //anonymous or intersection
+                !withinAnonConstr(env) &&
                 tree.type.isRaw()) {
                 log.warning(LintCategory.RAW,
                         tree.pos(), "raw.class.use", tree.type, tree.type.tsym.type);
             }
         }
+
+        boolean withinAnonConstr(Env<AttrContext> env) {
+            return env.enclClass.name.isEmpty() &&
+                    env.enclMethod != null && env.enclMethod.name == names.init;
+        }
     }
 
 /* *************************************************************************
@@ -2436,7 +2444,7 @@ public class Check {
 
         // count them off as they're annotated
         for (JCTree arg : a.args) {
-            if (arg.getTag() != JCTree.ASSIGN) continue; // recovery
+            if (!arg.hasTag(ASSIGN)) continue; // recovery
             JCAssign assign = (JCAssign) arg;
             Symbol m = TreeInfo.symbol(assign.lhs);
             if (m == null || m.type.isErroneous()) continue;
@@ -2465,12 +2473,12 @@ public class Check {
             a.args.tail == null)
             return;
 
-        if (a.args.head.getTag() != JCTree.ASSIGN) return; // error recovery
+        if (!a.args.head.hasTag(ASSIGN)) return; // error recovery
         JCAssign assign = (JCAssign) a.args.head;
         Symbol m = TreeInfo.symbol(assign.lhs);
         if (m.name != names.value) return;
         JCTree rhs = assign.rhs;
-        if (rhs.getTag() != JCTree.NEWARRAY) return;
+        if (!rhs.hasTag(NEWARRAY)) return;
         JCNewArray na = (JCNewArray) rhs;
         Set<Symbol> targets = new HashSet<Symbol>();
         for (JCTree elem : na.elems) {
@@ -2501,7 +2509,7 @@ public class Check {
                     warnDeprecated(pos, s);
                 }
             });
-        };
+        }
     }
 
     void checkSunAPI(final DiagnosticPosition pos, final Symbol s) {
@@ -2529,7 +2537,7 @@ public class Check {
         try {
             tree.sym.flags_field |= LOCKED;
             for (JCTree def : tree.defs) {
-                if (def.getTag() != JCTree.METHODDEF) continue;
+                if (!def.hasTag(METHODDEF)) continue;
                 JCMethodDecl meth = (JCMethodDecl)def;
                 checkAnnotationResType(meth.pos(), meth.restype.type);
             }
@@ -2637,7 +2645,7 @@ public class Check {
      */
     int checkOperator(DiagnosticPosition pos,
                        OperatorSymbol operator,
-                       int tag,
+                       JCTree.Tag tag,
                        Type left,
                        Type right) {
         if (operator.opcode == ByteCodes.error) {
@@ -2673,7 +2681,8 @@ public class Check {
      * Check for empty statements after if
      */
     void checkEmptyIf(JCIf tree) {
-        if (tree.thenpart.getTag() == JCTree.SKIP && tree.elsepart == null && lint.isEnabled(LintCategory.EMPTY))
+        if (tree.thenpart.hasTag(SKIP) && tree.elsepart == null &&
+                lint.isEnabled(LintCategory.EMPTY))
             log.warning(LintCategory.EMPTY, tree.thenpart.pos(), "empty.if");
     }
 
@@ -2777,7 +2786,7 @@ public class Check {
     }
         // where
         private boolean isCanonical(JCTree tree) {
-            while (tree.getTag() == JCTree.SELECT) {
+            while (tree.hasTag(SELECT)) {
                 JCFieldAccess s = (JCFieldAccess) tree;
                 if (s.sym.owner != TreeInfo.symbol(s.selected))
                     return false;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java
index 6789258..50e70b7 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java
@@ -34,7 +34,7 @@ import com.sun.tools.javac.code.Scope.*;
 import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.code.Type.*;
 import com.sun.tools.javac.jvm.*;
-import com.sun.tools.javac.main.RecognizedOptions.PkgInfo;
+import com.sun.tools.javac.main.Option.PkgInfo;
 import com.sun.tools.javac.tree.*;
 import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.util.*;
@@ -232,7 +232,7 @@ public class Enter extends JCTree.Visitor {
      *  only, and members go into the class member scope.
      */
     Scope enterScope(Env<AttrContext> env) {
-        return (env.tree.getTag() == JCTree.CLASSDEF)
+        return (env.tree.hasTag(JCTree.Tag.CLASSDEF))
             ? ((JCClassDecl) env.tree).sym.members_field
             : env.info.scope;
     }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Env.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Env.java
index c46cafe..f61ed70 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Env.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Env.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -116,9 +116,9 @@ public class Env<A> implements Iterable<Env<A>> {
 
     /** Return closest enclosing environment which points to a tree with given tag.
      */
-    public Env<A> enclosing(int tag) {
+    public Env<A> enclosing(JCTree.Tag tag) {
         Env<A> env1 = this;
-        while (env1 != null && env1.tree.getTag() != tag) env1 = env1.next;
+        while (env1 != null && !env1.tree.hasTag(tag)) env1 = env1.next;
         return env1;
     }
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java
index c300166..155f14f 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java
@@ -40,8 +40,10 @@ import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.tree.JCTree.*;
 
 import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.BLOCK;
 import static com.sun.tools.javac.code.Kinds.*;
 import static com.sun.tools.javac.code.TypeTags.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
 
 /** This pass implements dataflow analysis for Java programs.
  *  Liveness analysis checks that every statement is reachable.
@@ -321,7 +323,7 @@ public class Flow extends TreeScanner {
                 log.error(exit.tree.pos(),
                         "unreported.exception.default.constructor",
                         exit.thrown);
-            } else if (exit.tree.getTag() == JCTree.VARDEF &&
+            } else if (exit.tree.hasTag(VARDEF) &&
                     ((JCVariableDecl)exit.tree).sym.isResourceVariable()) {
                 log.error(exit.tree.pos(),
                         "unreported.exception.implicit.close",
@@ -416,7 +418,7 @@ public class Flow extends TreeScanner {
      */
     void letInit(JCTree tree) {
         tree = TreeInfo.skipParens(tree);
-        if (tree.getTag() == JCTree.IDENT || tree.getTag() == JCTree.SELECT) {
+        if (tree.hasTag(IDENT) || tree.hasTag(SELECT)) {
             Symbol sym = TreeInfo.symbol(tree);
             if (sym.kind == VAR) {
                 letInit(tree.pos(), (VarSymbol)sym);
@@ -452,7 +454,7 @@ public class Flow extends TreeScanner {
         pendingExits = oldPendingExits;
         for (; exits.nonEmpty(); exits = exits.tail) {
             PendingExit exit = exits.head;
-            if (exit.tree.getTag() == JCTree.BREAK &&
+            if (exit.tree.hasTag(BREAK) &&
                 ((JCBreak) exit.tree).target == tree) {
                 inits.andSet(exit.inits);
                 uninits.andSet(exit.uninits);
@@ -471,7 +473,7 @@ public class Flow extends TreeScanner {
         pendingExits = new ListBuffer<PendingExit>();
         for (; exits.nonEmpty(); exits = exits.tail) {
             PendingExit exit = exits.head;
-            if (exit.tree.getTag() == JCTree.CONTINUE &&
+            if (exit.tree.hasTag(CONTINUE) &&
                 ((JCContinue) exit.tree).target == tree) {
                 inits.andSet(exit.inits);
                 uninits.andSet(exit.uninits);
@@ -517,7 +519,7 @@ public class Flow extends TreeScanner {
      */
     void scanDef(JCTree tree) {
         scanStat(tree);
-        if (tree != null && tree.getTag() == JCTree.BLOCK && !alive) {
+        if (tree != null && tree.hasTag(JCTree.Tag.BLOCK) && !alive) {
             log.error(tree.pos(),
                       "initializer.must.be.able.to.complete.normally");
         }
@@ -528,7 +530,7 @@ public class Flow extends TreeScanner {
     void scanStat(JCTree tree) {
         if (!alive && tree != null) {
             log.error(tree.pos(), "unreachable.stmt");
-            if (tree.getTag() != JCTree.SKIP) alive = true;
+            if (!tree.hasTag(SKIP)) alive = true;
         }
         scan(tree);
     }
@@ -614,7 +616,7 @@ public class Flow extends TreeScanner {
         try {
             // define all the static fields
             for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
-                if (l.head.getTag() == JCTree.VARDEF) {
+                if (l.head.hasTag(VARDEF)) {
                     JCVariableDecl def = (JCVariableDecl)l.head;
                     if ((def.mods.flags & STATIC) != 0) {
                         VarSymbol sym = def.sym;
@@ -626,7 +628,7 @@ public class Flow extends TreeScanner {
 
             // process all the static initializers
             for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
-                if (l.head.getTag() != JCTree.METHODDEF &&
+                if (!l.head.hasTag(METHODDEF) &&
                     (TreeInfo.flags(l.head) & STATIC) != 0) {
                     scanDef(l.head);
                     errorUncaught();
@@ -653,7 +655,7 @@ public class Flow extends TreeScanner {
 
             // define all the instance fields
             for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
-                if (l.head.getTag() == JCTree.VARDEF) {
+                if (l.head.hasTag(VARDEF)) {
                     JCVariableDecl def = (JCVariableDecl)l.head;
                     if ((def.mods.flags & STATIC) == 0) {
                         VarSymbol sym = def.sym;
@@ -665,7 +667,7 @@ public class Flow extends TreeScanner {
 
             // process all the instance initializers
             for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
-                if (l.head.getTag() != JCTree.METHODDEF &&
+                if (!l.head.hasTag(METHODDEF) &&
                     (TreeInfo.flags(l.head) & STATIC) == 0) {
                     scanDef(l.head);
                     errorUncaught();
@@ -691,7 +693,7 @@ public class Flow extends TreeScanner {
 
             // process all the methods
             for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
-                if (l.head.getTag() == JCTree.METHODDEF) {
+                if (l.head.hasTag(METHODDEF)) {
                     scan(l.head);
                     errorUncaught();
                 }
@@ -760,7 +762,7 @@ public class Flow extends TreeScanner {
                 PendingExit exit = exits.head;
                 exits = exits.tail;
                 if (exit.thrown == null) {
-                    Assert.check(exit.tree.getTag() == JCTree.RETURN);
+                    Assert.check(exit.tree.hasTag(RETURN));
                     if (isInitialConstructor) {
                         inits = exit.inits;
                         for (int i = firstadr; i < nextadr; i++)
@@ -989,7 +991,7 @@ public class Flow extends TreeScanner {
                                     Bits uninits) {
             for (;stats.nonEmpty(); stats = stats.tail) {
                 JCTree stat = stats.head;
-                if (stat.getTag() == JCTree.VARDEF) {
+                if (stat.hasTag(VARDEF)) {
                     int adr = ((JCVariableDecl) stat).sym.adr;
                     inits.excl(adr);
                     uninits.incl(adr);
@@ -1346,7 +1348,7 @@ public class Flow extends TreeScanner {
 
     public void visitUnary(JCUnary tree) {
         switch (tree.getTag()) {
-        case JCTree.NOT:
+        case NOT:
             scanCond(tree.arg);
             Bits t = initsWhenFalse;
             initsWhenFalse = initsWhenTrue;
@@ -1355,8 +1357,8 @@ public class Flow extends TreeScanner {
             uninitsWhenFalse = uninitsWhenTrue;
             uninitsWhenTrue = t;
             break;
-        case JCTree.PREINC: case JCTree.POSTINC:
-        case JCTree.PREDEC: case JCTree.POSTDEC:
+        case PREINC: case POSTINC:
+        case PREDEC: case POSTDEC:
             scanExpr(tree.arg);
             letInit(tree.arg);
             break;
@@ -1367,7 +1369,7 @@ public class Flow extends TreeScanner {
 
     public void visitBinary(JCBinary tree) {
         switch (tree.getTag()) {
-        case JCTree.AND:
+        case AND:
             scanCond(tree.lhs);
             Bits initsWhenFalseLeft = initsWhenFalse;
             Bits uninitsWhenFalseLeft = uninitsWhenFalse;
@@ -1377,7 +1379,7 @@ public class Flow extends TreeScanner {
             initsWhenFalse.andSet(initsWhenFalseLeft);
             uninitsWhenFalse.andSet(uninitsWhenFalseLeft);
             break;
-        case JCTree.OR:
+        case OR:
             scanCond(tree.lhs);
             Bits initsWhenTrueLeft = initsWhenTrue;
             Bits uninitsWhenTrueLeft = uninitsWhenTrue;
@@ -1418,7 +1420,7 @@ public class Flow extends TreeScanner {
         private boolean is292targetTypeCast(JCTypeCast tree) {
             boolean is292targetTypeCast = false;
             JCExpression expr = TreeInfo.skipParens(tree.expr);
-            if (expr.getTag() == JCTree.APPLY) {
+            if (expr.hasTag(APPLY)) {
                 JCMethodInvocation apply = (JCMethodInvocation)expr;
                 Symbol sym = TreeInfo.symbol(apply.meth);
                 is292targetTypeCast = sym != null &&
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
index 3c9ed3a..00564d9 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
@@ -34,7 +34,8 @@ import com.sun.tools.javac.code.*;
 import com.sun.tools.javac.code.Type.*;
 import com.sun.tools.javac.code.Type.ForAll.ConstraintKind;
 import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.util.JCDiagnostic;
+import com.sun.tools.javac.comp.Resolve.VerboseResolutionMode;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 
 import static com.sun.tools.javac.code.TypeTags.*;
 
@@ -56,6 +57,7 @@ public class Infer {
     Types types;
     Check chk;
     Resolve rs;
+    Log log;
     JCDiagnostic.Factory diags;
 
     public static Infer instance(Context context) {
@@ -70,6 +72,7 @@ public class Infer {
         syms = Symtab.instance(context);
         types = Types.instance(context);
         rs = Resolve.instance(context);
+        log = Log.instance(context);
         chk = Check.instance(context);
         diags = JCDiagnostic.Factory.instance(context);
         ambiguousNoInstanceException =
@@ -460,7 +463,7 @@ public class Infer {
             // quantify result type with them
             final List<Type> inferredTypes = insttypes.toList();
             final List<Type> all_tvars = tvars; //this is the wrong tvars
-            return new UninferredMethodType(mt, restvars.toList()) {
+            return new UninferredMethodType(env.tree.pos(), msym, mt, restvars.toList()) {
                 @Override
                 List<Type> getConstraints(TypeVar tv, ConstraintKind ck) {
                     for (Type t : restundet.toList()) {
@@ -502,13 +505,17 @@ public class Infer {
          * type - when the return type is instantiated (see Infer.instantiateExpr)
          * the underlying method type is also updated.
          */
-        static abstract class UninferredMethodType extends DelegatedType {
+        abstract class UninferredMethodType extends DelegatedType {
 
             final List<Type> tvars;
+            final Symbol msym;
+            final DiagnosticPosition pos;
 
-            public UninferredMethodType(MethodType mtype, List<Type> tvars) {
+            public UninferredMethodType(DiagnosticPosition pos, Symbol msym, MethodType mtype, List<Type> tvars) {
                 super(METHOD, new MethodType(mtype.argtypes, null, mtype.thrown, mtype.tsym));
                 this.tvars = tvars;
+                this.msym = msym;
+                this.pos = pos;
                 asMethodType().restype = new UninferredReturnType(tvars, mtype.restype);
             }
 
@@ -543,6 +550,9 @@ public class Infer {
                 public Type inst(List<Type> actuals, Types types) {
                     Type newRestype = super.inst(actuals, types);
                     instantiateReturnType(newRestype, actuals, types);
+                    if (rs.verboseResolutionMode.contains(VerboseResolutionMode.DEFERRED_INST)) {
+                        log.note(pos, "deferred.method.inst", msym, UninferredMethodType.this.qtype, newRestype);
+                    }
                     return newRestype;
                 }
                 @Override
@@ -623,13 +633,13 @@ public class Infer {
         //the polymorphic signature call environment is nested.
 
         switch (env.next.tree.getTag()) {
-            case JCTree.TYPECAST:
+            case TYPECAST:
                 JCTypeCast castTree = (JCTypeCast)env.next.tree;
                 restype = (TreeInfo.skipParens(castTree.expr) == env.tree) ?
                     castTree.clazz.type :
                     syms.objectType;
                 break;
-            case JCTree.EXEC:
+            case EXEC:
                 JCTree.JCExpressionStatement execTree =
                         (JCTree.JCExpressionStatement)env.next.tree;
                 restype = (TreeInfo.skipParens(execTree.expr) == env.tree) ?
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
index 3430a62..6ffb3f5 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -29,7 +29,7 @@ import java.util.*;
 
 import com.sun.tools.javac.code.*;
 import com.sun.tools.javac.jvm.*;
-import com.sun.tools.javac.main.RecognizedOptions.PkgInfo;
+import com.sun.tools.javac.main.Option.PkgInfo;
 import com.sun.tools.javac.tree.*;
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
@@ -40,11 +40,14 @@ import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.code.Type.*;
 
 import com.sun.tools.javac.jvm.Target;
+import com.sun.tools.javac.parser.EndPosTable;
 
 import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.BLOCK;
 import static com.sun.tools.javac.code.Kinds.*;
 import static com.sun.tools.javac.code.TypeTags.*;
 import static com.sun.tools.javac.jvm.ByteCodes.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
 
 /** This pass translates away some syntactic sugar: inner classes,
  *  class literals, assertions, foreach loops, etc.
@@ -125,7 +128,7 @@ public class Lower extends TreeTranslator {
 
     /** A hash table mapping syntax trees to their ending source positions.
      */
-    Map<JCTree, Integer> endPositions;
+    EndPosTable endPosTable;
 
 /**************************************************************************
  * Global mappings
@@ -303,7 +306,7 @@ public class Lower extends TreeTranslator {
                 Symbol constructor = TreeInfo.symbol(tree.meth);
                 ClassSymbol c = (ClassSymbol)constructor.owner;
                 if (c.hasOuterInstance() &&
-                    tree.meth.getTag() != JCTree.SELECT &&
+                    !tree.meth.hasTag(SELECT) &&
                     outerThisStack.head != null)
                     visitSymbol(outerThisStack.head);
             }
@@ -508,7 +511,7 @@ public class Lower extends TreeTranslator {
      *  @param optag    The operators tree tag.
      *  @param arg      The operator's argument.
      */
-    JCUnary makeUnary(int optag, JCExpression arg) {
+    JCUnary makeUnary(JCTree.Tag optag, JCExpression arg) {
         JCUnary tree = make.Unary(optag, arg);
         tree.operator = rs.resolveUnaryOperator(
             make_pos, optag, attrEnv, arg.type);
@@ -521,7 +524,7 @@ public class Lower extends TreeTranslator {
      *  @param lhs      The operator's left argument.
      *  @param rhs      The operator's right argument.
      */
-    JCBinary makeBinary(int optag, JCExpression lhs, JCExpression rhs) {
+    JCBinary makeBinary(JCTree.Tag optag, JCExpression lhs, JCExpression rhs) {
         JCBinary tree = make.Binary(optag, lhs, rhs);
         tree.operator = rs.resolveBinaryOperator(
             make_pos, optag, attrEnv, lhs.type, rhs.type);
@@ -534,10 +537,10 @@ public class Lower extends TreeTranslator {
      *  @param lhs      The operator's left argument.
      *  @param rhs      The operator's right argument.
      */
-    JCAssignOp makeAssignop(int optag, JCTree lhs, JCTree rhs) {
+    JCAssignOp makeAssignop(JCTree.Tag optag, JCTree lhs, JCTree rhs) {
         JCAssignOp tree = make.Assignop(optag, lhs, rhs);
         tree.operator = rs.resolveBinaryOperator(
-            make_pos, tree.getTag() - JCTree.ASGOffset, attrEnv, lhs.type, rhs.type);
+            make_pos, tree.getTag().noAssignOp(), attrEnv, lhs.type, rhs.type);
         tree.type = lhs.type;
         return tree;
     }
@@ -720,7 +723,7 @@ public class Lower extends TreeTranslator {
     // where
     private boolean isTranslatedClassAvailable(ClassSymbol c) {
         for (JCTree tree: translated) {
-            if (tree.getTag() == JCTree.CLASSDEF
+            if (tree.hasTag(CLASSDEF)
                     && ((JCClassDecl) tree).sym == c) {
                 return true;
             }
@@ -802,13 +805,13 @@ public class Lower extends TreeTranslator {
     private static int accessCode(JCTree tree, JCTree enclOp) {
         if (enclOp == null)
             return DEREFcode;
-        else if (enclOp.getTag() == JCTree.ASSIGN &&
+        else if (enclOp.hasTag(ASSIGN) &&
                  tree == TreeInfo.skipParens(((JCAssign) enclOp).lhs))
             return ASSIGNcode;
-        else if (JCTree.PREINC <= enclOp.getTag() && enclOp.getTag() <= JCTree.POSTDEC &&
+        else if (enclOp.getTag().isIncOrDecUnaryOp() &&
                  tree == TreeInfo.skipParens(((JCUnary) enclOp).arg))
-            return (enclOp.getTag() - JCTree.PREINC) * 2 + PREINCcode;
-        else if (JCTree.BITOR_ASG <= enclOp.getTag() && enclOp.getTag() <= JCTree.MOD_ASG &&
+            return mapTagToUnaryOpCode(enclOp.getTag());
+        else if (enclOp.getTag().isAssignop() &&
                  tree == TreeInfo.skipParens(((JCAssignOp) enclOp).lhs))
             return accessCode(((OperatorSymbol) ((JCAssignOp) enclOp).operator).opcode);
         else
@@ -832,39 +835,39 @@ public class Lower extends TreeTranslator {
     /** Return tree tag for assignment operation corresponding
      *  to given binary operator.
      */
-    private static int treeTag(OperatorSymbol operator) {
+    private static JCTree.Tag treeTag(OperatorSymbol operator) {
         switch (operator.opcode) {
         case ByteCodes.ior: case ByteCodes.lor:
-            return JCTree.BITOR_ASG;
+            return BITOR_ASG;
         case ByteCodes.ixor: case ByteCodes.lxor:
-            return JCTree.BITXOR_ASG;
+            return BITXOR_ASG;
         case ByteCodes.iand: case ByteCodes.land:
-            return JCTree.BITAND_ASG;
+            return BITAND_ASG;
         case ByteCodes.ishl: case ByteCodes.lshl:
         case ByteCodes.ishll: case ByteCodes.lshll:
-            return JCTree.SL_ASG;
+            return SL_ASG;
         case ByteCodes.ishr: case ByteCodes.lshr:
         case ByteCodes.ishrl: case ByteCodes.lshrl:
-            return JCTree.SR_ASG;
+            return SR_ASG;
         case ByteCodes.iushr: case ByteCodes.lushr:
         case ByteCodes.iushrl: case ByteCodes.lushrl:
-            return JCTree.USR_ASG;
+            return USR_ASG;
         case ByteCodes.iadd: case ByteCodes.ladd:
         case ByteCodes.fadd: case ByteCodes.dadd:
         case ByteCodes.string_add:
-            return JCTree.PLUS_ASG;
+            return PLUS_ASG;
         case ByteCodes.isub: case ByteCodes.lsub:
         case ByteCodes.fsub: case ByteCodes.dsub:
-            return JCTree.MINUS_ASG;
+            return MINUS_ASG;
         case ByteCodes.imul: case ByteCodes.lmul:
         case ByteCodes.fmul: case ByteCodes.dmul:
-            return JCTree.MUL_ASG;
+            return MUL_ASG;
         case ByteCodes.idiv: case ByteCodes.ldiv:
         case ByteCodes.fdiv: case ByteCodes.ddiv:
-            return JCTree.DIV_ASG;
+            return DIV_ASG;
         case ByteCodes.imod: case ByteCodes.lmod:
         case ByteCodes.fmod: case ByteCodes.dmod:
-            return JCTree.MOD_ASG;
+            return MOD_ASG;
         default:
             throw new AssertionError();
         }
@@ -1003,7 +1006,7 @@ public class Lower extends TreeTranslator {
         if (!currentClass.isSubClass(sym.owner, types))
             return true;
         if ((sym.flags() & STATIC) != 0 ||
-            tree.getTag() != JCTree.SELECT ||
+            !tree.hasTag(SELECT) ||
             TreeInfo.name(((JCFieldAccess) tree).selected) == names._super)
             return false;
         return !((JCFieldAccess) tree).selected.type.tsym.isSubClass(currentClass, types);
@@ -1018,7 +1021,7 @@ public class Lower extends TreeTranslator {
         if (protAccess) {
             Symbol qualifier = null;
             ClassSymbol c = currentClass;
-            if (tree.getTag() == JCTree.SELECT && (sym.flags() & STATIC) == 0) {
+            if (tree.hasTag(SELECT) && (sym.flags() & STATIC) == 0) {
                 qualifier = ((JCFieldAccess) tree).selected.type.tsym;
                 while (!qualifier.isSubClass(c, types)) {
                     c = c.owner.enclClass();
@@ -1058,7 +1061,7 @@ public class Lower extends TreeTranslator {
             Assert.check(sym != null && (sym.flags_field & FINAL) != 0);
             tree = make.at(tree.pos).Ident(sym);
         }
-        JCExpression base = (tree.getTag() == JCTree.SELECT) ? ((JCFieldAccess) tree).selected : null;
+        JCExpression base = (tree.hasTag(SELECT)) ? ((JCFieldAccess) tree).selected : null;
         switch (sym.kind) {
         case TYP:
             if (sym.owner.kind != PCK) {
@@ -1068,11 +1071,11 @@ public class Lower extends TreeTranslator {
                 while (base != null &&
                        TreeInfo.symbol(base) != null &&
                        TreeInfo.symbol(base).kind != PCK) {
-                    base = (base.getTag() == JCTree.SELECT)
+                    base = (base.hasTag(SELECT))
                         ? ((JCFieldAccess) base).selected
                         : null;
                 }
-                if (tree.getTag() == JCTree.IDENT) {
+                if (tree.hasTag(IDENT)) {
                     ((JCIdent) tree).name = flatname;
                 } else if (base == null) {
                     tree = make.at(tree.pos).Ident(sym);
@@ -1220,6 +1223,42 @@ public class Lower extends TreeTranslator {
         }
     }
 
+    /** Maps unary operator integer codes to JCTree.Tag objects
+     *  @param unaryOpCode the unary operator code
+     */
+    private static Tag mapUnaryOpCodeToTag(int unaryOpCode){
+        switch (unaryOpCode){
+            case PREINCcode:
+                return PREINC;
+            case PREDECcode:
+                return PREDEC;
+            case POSTINCcode:
+                return POSTINC;
+            case POSTDECcode:
+                return POSTDEC;
+            default:
+                return NO_TAG;
+        }
+    }
+
+    /** Maps JCTree.Tag objects to unary operator integer codes
+     *  @param tag the JCTree.Tag
+     */
+    private static int mapTagToUnaryOpCode(Tag tag){
+        switch (tag){
+            case PREINC:
+                return PREINCcode;
+            case PREDEC:
+                return PREDECcode;
+            case POSTINC:
+                return POSTINCcode;
+            case POSTDEC:
+                return POSTDECcode;
+            default:
+                return -1;
+        }
+    }
+
     /** Construct definition of an access method.
      *  @param pos        The source code position of the definition.
      *  @param vsym       The private or protected symbol.
@@ -1259,8 +1298,7 @@ public class Lower extends TreeTranslator {
                 expr = make.Assign(ref, args.head);
                 break;
             case PREINCcode: case POSTINCcode: case PREDECcode: case POSTDECcode:
-                expr = makeUnary(
-                    ((acode1 - PREINCcode) >> 1) + JCTree.PREINC, ref);
+                expr = makeUnary(mapUnaryOpCodeToTag(acode1), ref);
                 break;
             default:
                 expr = make.Assignop(
@@ -1576,7 +1614,7 @@ public class Lower extends TreeTranslator {
     }
 
     private JCExpression makeNonNullCheck(JCExpression expression) {
-        return makeBinary(JCTree.NE, expression, makeNull());
+        return makeBinary(NE, expression, makeNull());
     }
 
     /** Construct a tree that represents the outer instance
@@ -1808,7 +1846,7 @@ public class Lower extends TreeTranslator {
             // $newcache.getClass().getComponentType().getClassLoader() : cl$"
             JCExpression clvalue =
                 make.Conditional(
-                    makeBinary(JCTree.EQ, make.Ident(clsym), makeNull()),
+                    makeBinary(EQ, make.Ident(clsym), makeNull()),
                     make.Assign(
                         make.Ident(clsym),
                         makeCall(
@@ -1976,7 +2014,7 @@ public class Lower extends TreeTranslator {
                 writer.xClassName(type).toString().replace('/', '.');
             Symbol cs = cacheSym(pos, sig);
             return make_at(pos).Conditional(
-                makeBinary(JCTree.EQ, make.Ident(cs), makeNull()),
+                makeBinary(EQ, make.Ident(cs), makeNull()),
                 make.Assign(
                     make.Ident(cs),
                     make.App(
@@ -2023,7 +2061,7 @@ public class Lower extends TreeTranslator {
                                                             List.<Type>nil());
             JCClassDecl containerDef = classDef(container);
             make_at(containerDef.pos());
-            JCExpression notStatus = makeUnary(JCTree.NOT, make.App(make.Select(
+            JCExpression notStatus = makeUnary(NOT, make.App(make.Select(
                     classOfType(types.erasure(outermostClass.type),
                                 containerDef.pos()),
                     desiredAssertionStatusSym)));
@@ -2032,7 +2070,7 @@ public class Lower extends TreeTranslator {
             containerDef.defs = containerDef.defs.prepend(assertDisabledDef);
         }
         make_at(pos);
-        return makeUnary(JCTree.NOT, make.Ident(assertDisabledSym));
+        return makeUnary(NOT, make.Ident(assertDisabledSym));
     }
 
 
@@ -2062,9 +2100,9 @@ public class Lower extends TreeTranslator {
     JCTree abstractRval(JCTree rval, Type type, TreeBuilder builder) {
         rval = TreeInfo.skipParens(rval);
         switch (rval.getTag()) {
-        case JCTree.LITERAL:
+        case LITERAL:
             return builder.build(rval);
-        case JCTree.IDENT:
+        case IDENT:
             JCIdent id = (JCIdent) rval;
             if ((id.sym.flags() & FINAL) != 0 && id.sym.owner.kind == MTH)
                 return builder.build(rval);
@@ -2097,9 +2135,9 @@ public class Lower extends TreeTranslator {
     JCTree abstractLval(JCTree lval, final TreeBuilder builder) {
         lval = TreeInfo.skipParens(lval);
         switch (lval.getTag()) {
-        case JCTree.IDENT:
+        case IDENT:
             return builder.build(lval);
-        case JCTree.SELECT: {
+        case SELECT: {
             final JCFieldAccess s = (JCFieldAccess)lval;
             JCTree selected = TreeInfo.skipParens(s.selected);
             Symbol lid = TreeInfo.symbol(s.selected);
@@ -2110,7 +2148,7 @@ public class Lower extends TreeTranslator {
                     }
                 });
         }
-        case JCTree.INDEXED: {
+        case INDEXED: {
             final JCArrayAccess i = (JCArrayAccess)lval;
             return abstractRval(i.indexed, new TreeBuilder() {
                     public JCTree build(final JCTree indexed) {
@@ -2125,7 +2163,7 @@ public class Lower extends TreeTranslator {
                     }
                 });
         }
-        case JCTree.TYPECAST: {
+        case TYPECAST: {
             return abstractLval(((JCTypeCast)lval).expr, builder);
         }
         }
@@ -2158,9 +2196,8 @@ public class Lower extends TreeTranslator {
         } else {
             make_at(tree.pos());
             T result = super.translate(tree);
-            if (endPositions != null && result != tree) {
-                Integer endPos = endPositions.remove(tree);
-                if (endPos != null) endPositions.put(result, endPos);
+            if (endPosTable != null && result != tree) {
+                endPosTable.replaceTree(tree, result);
             }
             return result;
         }
@@ -2242,7 +2279,7 @@ public class Lower extends TreeTranslator {
         c.attributes_field = msym.attributes_field;
         c.flags_field |= SYNTHETIC;
         msym.attributes_field = List.nil();
-        createInfoClass(tree.annots, tree.sym.module_info);
+        createInfoClass(List.<JCAnnotation>nil(), tree.sym.module_info);
     }
 
     private void createInfoClass(List<JCAnnotation> annots, ClassSymbol c) {
@@ -2358,7 +2395,7 @@ public class Lower extends TreeTranslator {
         for (List<JCTree> defs = tree.defs;
              defs.nonEmpty();
              defs=defs.tail) {
-            if (defs.head.getTag() == JCTree.VARDEF && (((JCVariableDecl) defs.head).mods.flags & ENUM) != 0) {
+            if (defs.head.hasTag(VARDEF) && (((JCVariableDecl) defs.head).mods.flags & ENUM) != 0) {
                 JCVariableDecl var = (JCVariableDecl)defs.head;
                 visitEnumConstantDef(var, nextOrdinal++);
                 values.append(make.QualIdent(var.sym));
@@ -2770,9 +2807,9 @@ public class Lower extends TreeTranslator {
                 List.<JCExpression>nil() : List.of(translate(tree.detail));
             if (!tree.cond.type.isFalse()) {
                 cond = makeBinary
-                    (JCTree.AND,
+                    (AND,
                      cond,
-                     makeUnary(JCTree.NOT, tree.cond));
+                     makeUnary(NOT, tree.cond));
             }
             result =
                 make.If(cond,
@@ -2829,7 +2866,7 @@ public class Lower extends TreeTranslator {
             // first argument.
             if (c.hasOuterInstance()) {
                 JCExpression thisArg;
-                if (tree.meth.getTag() == JCTree.SELECT) {
+                if (tree.meth.hasTag(SELECT)) {
                     thisArg = attr.
                         makeNullCheck(translate(((JCFieldAccess) tree.meth).selected));
                     tree.meth = make.Ident(constructor);
@@ -2850,7 +2887,7 @@ public class Lower extends TreeTranslator {
             // If the translated method itself is an Apply tree, we are
             // seeing an access method invocation. In this case, append
             // the method arguments to the arguments of the access method.
-            if (tree.meth.getTag() == JCTree.APPLY) {
+            if (tree.meth.hasTag(APPLY)) {
                 JCMethodInvocation app = (JCMethodInvocation)tree.meth;
                 app.args = tree.args.prependList(app.args);
                 result = app;
@@ -2984,7 +3021,7 @@ public class Lower extends TreeTranslator {
         // If translated left hand side is an Apply, we are
         // seeing an access method invocation. In this case, append
         // right hand side as last argument of the access method.
-        if (tree.lhs.getTag() == JCTree.APPLY) {
+        if (tree.lhs.hasTag(APPLY)) {
             JCMethodInvocation app = (JCMethodInvocation)tree.lhs;
             app.args = List.of(tree.rhs).prependList(app.args);
             result = app;
@@ -3001,7 +3038,7 @@ public class Lower extends TreeTranslator {
             // (but without recomputing x)
             JCTree newTree = abstractLval(tree.lhs, new TreeBuilder() {
                     public JCTree build(final JCTree lhs) {
-                        int newTag = tree.getTag() - JCTree.ASGOffset;
+                        JCTree.Tag newTag = tree.getTag().noAssignOp();
                         // Erasure (TransTypes) can change the type of
                         // tree.lhs.  However, we can still get the
                         // unerased type of tree.lhs as it is stored
@@ -3031,7 +3068,7 @@ public class Lower extends TreeTranslator {
         // If translated left hand side is an Apply, we are
         // seeing an access method invocation. In this case, append
         // right hand side as last argument of the access method.
-        if (tree.lhs.getTag() == JCTree.APPLY) {
+        if (tree.lhs.hasTag(APPLY)) {
             JCMethodInvocation app = (JCMethodInvocation)tree.lhs;
             // if operation is a += on strings,
             // make sure to convert argument to string
@@ -3051,13 +3088,13 @@ public class Lower extends TreeTranslator {
         // or
         // translate to tmp1=lval(e); tmp2=tmp1; (typeof tree)tmp1 OP 1; tmp2
         // where OP is += or -=
-        final boolean cast = TreeInfo.skipParens(tree.arg).getTag() == JCTree.TYPECAST;
+        final boolean cast = TreeInfo.skipParens(tree.arg).hasTag(TYPECAST);
         return abstractLval(tree.arg, new TreeBuilder() {
                 public JCTree build(final JCTree tmp1) {
                     return abstractRval(tmp1, tree.arg.type, new TreeBuilder() {
                             public JCTree build(final JCTree tmp2) {
-                                int opcode = (tree.getTag() == JCTree.POSTINC)
-                                    ? JCTree.PLUS_ASG : JCTree.MINUS_ASG;
+                                JCTree.Tag opcode = (tree.hasTag(POSTINC))
+                                    ? PLUS_ASG : MINUS_ASG;
                                 JCTree lhs = cast
                                     ? make.TypeCast(tree.arg.type, (JCExpression)tmp1)
                                     : tmp1;
@@ -3072,25 +3109,24 @@ public class Lower extends TreeTranslator {
     }
 
     public void visitUnary(JCUnary tree) {
-        boolean isUpdateOperator =
-            JCTree.PREINC <= tree.getTag() && tree.getTag() <= JCTree.POSTDEC;
+        boolean isUpdateOperator = tree.getTag().isIncOrDecUnaryOp();
         if (isUpdateOperator && !tree.arg.type.isPrimitive()) {
             switch(tree.getTag()) {
-            case JCTree.PREINC:            // ++ e
+            case PREINC:            // ++ e
                     // translate to e += 1
-            case JCTree.PREDEC:            // -- e
+            case PREDEC:            // -- e
                     // translate to e -= 1
                 {
-                    int opcode = (tree.getTag() == JCTree.PREINC)
-                        ? JCTree.PLUS_ASG : JCTree.MINUS_ASG;
+                    JCTree.Tag opcode = (tree.hasTag(PREINC))
+                        ? PLUS_ASG : MINUS_ASG;
                     JCAssignOp newTree = makeAssignop(opcode,
                                                     tree.arg,
                                                     make.Literal(1));
                     result = translate(newTree, tree.type);
                     return;
                 }
-            case JCTree.POSTINC:           // e ++
-            case JCTree.POSTDEC:           // e --
+            case POSTINC:           // e ++
+            case POSTDEC:           // e --
                 {
                     result = translate(lowerBoxedPostop(tree), tree.type);
                     return;
@@ -3101,14 +3137,14 @@ public class Lower extends TreeTranslator {
 
         tree.arg = boxIfNeeded(translate(tree.arg, tree), tree.type);
 
-        if (tree.getTag() == JCTree.NOT && tree.arg.type.constValue() != null) {
+        if (tree.hasTag(NOT) && tree.arg.type.constValue() != null) {
             tree.type = cfolder.fold1(bool_not, tree.arg.type);
         }
 
         // If translated left hand side is an Apply, we are
         // seeing an access method invocation. In this case, return
         // that access method invocation as result.
-        if (isUpdateOperator && tree.arg.getTag() == JCTree.APPLY) {
+        if (isUpdateOperator && tree.arg.hasTag(APPLY)) {
             result = tree.arg;
         } else {
             result = tree;
@@ -3119,7 +3155,7 @@ public class Lower extends TreeTranslator {
         List<Type> formals = tree.operator.type.getParameterTypes();
         JCTree lhs = tree.lhs = translate(tree.lhs, formals.head);
         switch (tree.getTag()) {
-        case JCTree.OR:
+        case OR:
             if (lhs.type.isTrue()) {
                 result = lhs;
                 return;
@@ -3129,7 +3165,7 @@ public class Lower extends TreeTranslator {
                 return;
             }
             break;
-        case JCTree.AND:
+        case AND:
             if (lhs.type.isFalse()) {
                 result = lhs;
                 return;
@@ -3199,9 +3235,9 @@ public class Lower extends TreeTranslator {
             indexdef.init.type = indexdef.type = syms.intType.constType(0);
 
             List<JCStatement> loopinit = List.of(arraycachedef, lencachedef, indexdef);
-            JCBinary cond = makeBinary(JCTree.LT, make.Ident(index), make.Ident(lencache));
+            JCBinary cond = makeBinary(LT, make.Ident(index), make.Ident(lencache));
 
-            JCExpressionStatement step = make.Exec(makeUnary(JCTree.PREINC, make.Ident(index)));
+            JCExpressionStatement step = make.Exec(makeUnary(PREINC, make.Ident(index)));
 
             Type elemtype = types.elemtype(tree.expr.type);
             JCExpression loopvarinit = make.Indexed(make.Ident(arraycache),
@@ -3605,7 +3641,7 @@ public class Lower extends TreeTranslator {
         // need to special case-access of the form C.super.x
         // these will always need an access method.
         boolean qualifiedSuperAccess =
-            tree.selected.getTag() == JCTree.SELECT &&
+            tree.selected.hasTag(SELECT) &&
             TreeInfo.name(tree.selected) == names._super;
         tree.selected = translate(tree.selected);
         if (tree.name == names._class)
@@ -3652,10 +3688,10 @@ public class Lower extends TreeTranslator {
         try {
             attrEnv = env;
             this.make = make;
-            endPositions = env.toplevel.endPositions;
+            endPosTable = env.toplevel.endPositions;
             currentClass = null;
             currentMethodDef = null;
-            outermostClassDef = (cdef.getTag() == JCTree.CLASSDEF) ? (JCClassDecl)cdef : null;
+            outermostClassDef = (cdef.hasTag(CLASSDEF)) ? (JCClassDecl)cdef : null;
             outermostMemberDef = null;
             this.translated = new ListBuffer<JCTree>();
             classdefs = new HashMap<ClassSymbol,JCClassDecl>();
@@ -3681,7 +3717,7 @@ public class Lower extends TreeTranslator {
             // note that recursive invocations of this method fail hard
             attrEnv = null;
             this.make = null;
-            endPositions = null;
+            endPosTable = null;
             currentClass = null;
             currentMethodDef = null;
             outermostClassDef = null;
@@ -3851,7 +3887,7 @@ public class Lower extends TreeTranslator {
 
         JCIdent fLocUsageId = make.Ident(otherVarSym);
         JCExpression sel = make.Select(fLocUsageId, ordinalSymbol);
-        JCBinary bin = makeBinary(JCTree.MINUS, id1, sel);
+        JCBinary bin = makeBinary(MINUS, id1, sel);
         JCReturn ret = make.Return(bin);
         blockStatements.append(ret);
         JCMethodDecl compareToMethod = make.MethodDef((MethodSymbol)compareToSym,
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
index 8fbd33d..0344ab8 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
@@ -41,9 +41,11 @@ import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.tree.JCTree.*;
 
 import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.ANNOTATION;
+import static com.sun.tools.javac.code.Flags.MODULE;
 import static com.sun.tools.javac.code.Kinds.*;
 import static com.sun.tools.javac.code.TypeTags.*;
-import static com.sun.tools.javac.code.Flags.MODULE; // resolve ambiguity
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
 
 /** This is the second phase of Enter, in which classes are completed
  *  by entering their members into the class scope using
@@ -526,11 +528,6 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
         /*temp*/if (tree.modle != null)/*temp*/ // JIGSAW TEMP: tree.modle SHOULD ALWAYS BE SET
             tree.modle.complete();
 
-        // process module annotations
-        if (md != null) {
-            annotateLater(md.annots, env, md.sym);
-        }
-
         // process package annotations
         if (pd != null)
             annotateLater(pd.annots, env, pd.sym);
@@ -662,7 +659,7 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
         tree.sym = v;
         if (tree.init != null) {
             v.flags_field |= HASINIT;
-            if ((v.flags_field & FINAL) != 0 && tree.init.getTag() != JCTree.NEWCLASS) {
+            if ((v.flags_field & FINAL) != 0 && !tree.init.hasTag(NEWCLASS)) {
                 Env<AttrContext> initEnv = getInitEnv(tree, env);
                 initEnv.info.enclVar = v;
                 v.setLazyConstValue(initEnv(tree, initEnv), attr, tree.init);
@@ -886,7 +883,7 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
             // If this is a toplevel-class, make sure any preceding import
             // clauses have been seen.
             if (c.owner.kind == PCK) {
-                memberEnter(env.toplevel, env.enclosing(JCTree.TOPLEVEL));
+                memberEnter(env.toplevel, env.enclosing(TOPLEVEL));
                 todo.append(env);
             }
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Modules.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Modules.java
index 2efef6a..1afdba1 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Modules.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Modules.java
@@ -26,6 +26,7 @@
 
 package com.sun.tools.javac.comp;
 
+import com.sun.tools.javac.tree.JCTree.JCViewDecl;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -53,28 +54,38 @@ import javax.tools.StandardLocation;
 
 import static javax.tools.StandardLocation.*;
 
+import com.sun.source.tree.RequiresFlag;
+
+import com.sun.tools.javac.code.Directive;
+import com.sun.tools.javac.code.Directive.PermitsDirective;
+import com.sun.tools.javac.code.Directive.ProvidesModuleDirective;
+import com.sun.tools.javac.code.Directive.RequiresModuleDirective;
+import com.sun.tools.javac.code.Directive.ViewDeclaration;
+import com.sun.tools.javac.code.ModuleId;
+import com.sun.tools.javac.code.ModuleIdQuery;
 import com.sun.tools.javac.code.Scope;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Symbol.ClassSymbol;
 import com.sun.tools.javac.code.Symbol.CompletionFailure;
-import com.sun.tools.javac.code.Symbol.ModuleRequires;
 import com.sun.tools.javac.code.Symbol.ModuleSymbol;
 import com.sun.tools.javac.code.Symtab;
 import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.jvm.ClassFile;
-import com.sun.tools.javac.jvm.ClassFile.ModuleId;
 import com.sun.tools.javac.jvm.ClassReader;
-import com.sun.tools.javac.main.OptionName;
+import com.sun.tools.javac.main.Option;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCClassDecl;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
 import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCModuleClass;
+import com.sun.tools.javac.tree.JCTree.JCEntrypointDirective;
 import com.sun.tools.javac.tree.JCTree.JCModuleDecl;
-import com.sun.tools.javac.tree.JCTree.JCModuleExport;
+import com.sun.tools.javac.tree.JCTree.JCExportDirective;
 import com.sun.tools.javac.tree.JCTree.JCModuleId;
-import com.sun.tools.javac.tree.JCTree.JCModulePermits;
-import com.sun.tools.javac.tree.JCTree.JCModuleRequires;
+import com.sun.tools.javac.tree.JCTree.JCModuleIdQuery;
+import com.sun.tools.javac.tree.JCTree.JCPermitsDirective;
+import com.sun.tools.javac.tree.JCTree.JCProvidesModuleDirective;
+import com.sun.tools.javac.tree.JCTree.JCProvidesServiceDirective;
+import com.sun.tools.javac.tree.JCTree.JCRequiresModuleDirective;
+import com.sun.tools.javac.tree.JCTree.JCRequiresServiceDirective;
 import com.sun.tools.javac.tree.TreeInfo;
 import com.sun.tools.javac.tree.TreeScanner;
 import com.sun.tools.javac.util.Context;
@@ -87,7 +98,8 @@ import com.sun.tools.javac.util.Name;
 import com.sun.tools.javac.util.Names;
 import com.sun.tools.javac.util.Options;
 
-import static com.sun.tools.javac.main.OptionName.*;
+import java.util.EnumSet;
+import static com.sun.tools.javac.main.Option.*;
 
 /**
  * <p><b>This is NOT part of any supported API.
@@ -126,6 +138,9 @@ public class Modules extends JCTree.Visitor {
     /** The symbol currently being analyzed. */
     ModuleSymbol currSym;
 
+    /** The view currently being analyzed. */
+    ViewDeclaration currView;
+
     static class ModuleContext {
         ModuleContext(JCModuleDecl decl) {
             this.decl = decl;
@@ -156,7 +171,7 @@ public class Modules extends JCTree.Visitor {
         names = Names.instance(context);
         syms = Symtab.instance(context);
         Options options = Options.instance(context);
-        debug = new Debug("modules", options, log.noticeWriter);
+        debug = new Debug("modules", options, log);
 
         // module system features enabled unless -XDnomodules is set
         enabled = (options.get("nomodules") == null);
@@ -178,8 +193,6 @@ public class Modules extends JCTree.Visitor {
             l.head.accept(this);
     }
 
-
-
     @Override
     public void visitModuleDef(JCModuleDecl tree) {
         DEBUG("Modules.visitModuleDef " + tree.id);
@@ -203,6 +216,7 @@ public class Modules extends JCTree.Visitor {
             sym.name = sym.fullname = TreeInfo.fullName(tree.id.qualId);
             sym.module_info.fullname = ClassSymbol.formFullName(sym.module_info.name, sym);
             sym.module_info.flatname = ClassSymbol.formFlatName(sym.module_info.name, sym);
+            sym.extendedMetadata = tree.metadata;
             sym.module_info.sourcefile = currTopLevel.sourcefile;
             sym.module_info.members_field = new Scope(sym.module_info);
             sym.completer = null;
@@ -219,27 +233,23 @@ public class Modules extends JCTree.Visitor {
         tree.sym = sym;
 
         sym.version = tree.getId().version;
-        sym.exports = new ListBuffer<Symbol.ModuleExport>();
-        sym.permits = new ListBuffer<Name>();
-        sym.provides = new ListBuffer<ModuleId>();
-        sym.requires = new LinkedHashMap<ModuleId,ModuleRequires>();
-        for (List<JCModuleId> l = tree.provides; l.nonEmpty(); l = l.tail) {
-            JCModuleId moduleId = l.head;
-            sym.provides.append(new ModuleId(TreeInfo.fullName(moduleId.qualId), moduleId.version));
-        }
-
+        sym.directives = ListBuffer.lb();
         currSym = sym;
         Env<ModuleContext> menv = env.dup(tree, new ModuleContext(tree));
         moduleEnvs.put(sym, menv);
         Env<ModuleContext> prev = env;
         env = menv;
         try {
-            acceptAll(tree.metadata);
+            ModuleResolver mr = getModuleResolver();
+            if (mr.isPlatformName(sym.name))
+                env.info.seenPlatformRequires = true;
+
+            acceptAll(tree.directives);
 
             if (!env.info.seenPlatformRequires) {
                 DEBUG("Modules.visitModuleDef seenPlatformRequires:" + env.info.seenPlatformRequires);
                 ModuleId mid = getDefaultPlatformModule();
-                sym.requires.put(mid, new ModuleRequires(mid, List.of(names.synthetic)));
+                sym.directives.add(new RequiresModuleDirective(mid.toQuery()));
             }
         } finally {
             currSym = null;
@@ -280,40 +290,90 @@ public class Modules extends JCTree.Visitor {
     }
 
     @Override
-    public void visitModuleClass(JCModuleClass tree) {
+    public void visitEntrypoint(JCEntrypointDirective tree) {
 //        ModuleSymbol sym = currSym;
 //        Name className = TreeInfo.fullName(tree.qualId);
 //        // JIGSAW TODO check conflicts (at most one class)
 //        sym.className = reader.enterClass(className);
-//        sym.classFlags = tree.flags;
+//        sym.classFlags = tree.flags;C
     }
 
     @Override
-    public void visitModuleExport(JCModuleExport tree) {
+    public void visitExports(JCExportDirective tree) {
     }
 
     @Override
-    public void visitModulePermits(JCModulePermits tree) {
+    public void visitPermits(JCPermitsDirective tree) {
         ModuleSymbol sym = currSym;
-        for (List<JCExpression> l = tree.moduleNames; l.nonEmpty(); l = l.tail) {
-            JCTree qualId = l.head;
-            Name moduleName = TreeInfo.fullName(qualId);
-            // JIGSAW TODO check duplicates
-            sym.permits.add(moduleName);
-        }
+        JCTree qualId = tree.moduleName;
+        Name moduleName = TreeInfo.fullName(qualId);
+        // JIGSAW TODO check duplicates
+        PermitsDirective d = new PermitsDirective(moduleName);
+        if (currView == null)
+            sym.directives.add(d);
+        else
+            currView.directives.add(d);
     }
 
     @Override
-    public void visitModuleRequires(JCModuleRequires tree) {
+    public void visitProvidesModule(JCProvidesModuleDirective tree) {
         ModuleSymbol sym = currSym;
-        for (List<JCModuleId> l = tree.moduleIds; l.nonEmpty(); l = l.tail) {
-            JCModuleId moduleId = l.head;
-            ModuleId mid = new ModuleId(TreeInfo.fullName(moduleId.qualId), moduleId.version);
-            // JIGSAW TODO check duplicates
-            sym.requires.put(mid, new ModuleRequires(mid, tree.flags));
-            ModuleResolver mr = getModuleResolver();
-            if (mr.isPlatformName(mid.name))
-                env.info.seenPlatformRequires = true;
+        JCModuleId moduleId = tree.moduleId;
+        ProvidesModuleDirective d = new ProvidesModuleDirective(
+                new ModuleId(TreeInfo.fullName(moduleId.qualId), moduleId.version));
+        if (currView == null)
+            sym.directives.add(d);
+        else
+            currView.directives.add(d);
+    }
+
+    @Override
+    public void visitProvidesService(JCProvidesServiceDirective tree) {
+    }
+
+    @Override
+    public void visitRequiresModule(JCRequiresModuleDirective tree) {
+        ModuleSymbol sym = currSym;
+        JCModuleIdQuery moduleIdQuery = tree.moduleIdQuery;
+        ModuleIdQuery mq = new ModuleIdQuery(TreeInfo.fullName(moduleIdQuery.qualId), moduleIdQuery.versionQuery);
+        // JIGSAW TODO check duplicates
+        Set<Directive.RequiresFlag> flags = EnumSet.noneOf(Directive.RequiresFlag.class);
+        for (RequiresFlag f: tree.flags) {
+            switch (f) {
+                case PUBLIC:
+                    flags.add(Directive.RequiresFlag.PUBLIC);
+                    break;
+                case OPTIONAL:
+                    flags.add(Directive.RequiresFlag.OPTIONAL);
+                    break;
+                case LOCAL:
+                    flags.add(Directive.RequiresFlag.LOCAL);
+                    break;
+            }
+        }
+        RequiresModuleDirective d = new RequiresModuleDirective(mq, flags);
+        sym.directives.add(d);
+        ModuleResolver mr = getModuleResolver();
+        if (mr.isPlatformName(mq.name))
+            env.info.seenPlatformRequires = true;
+    }
+
+    @Override
+    public void visitRequiresService(JCRequiresServiceDirective tree) {
+    }
+
+    @Override
+    public void visitView(JCViewDecl tree) {
+        if (currView == null) {
+            currView = new ViewDeclaration(TreeInfo.fullName(tree.name));
+            try {
+                acceptAll(tree.directives);
+            } finally {
+                currSym.directives.add(currView);
+                currView = null;
+            }
+        } else {
+            log.error(tree, "nested.view.not.allowed");
         }
     }
 
@@ -348,9 +408,10 @@ public class Modules extends JCTree.Visitor {
             if (classFile == null) {
                 sym.name = sym.fullname = names.empty; // unnamed module
                 DEBUG("Modules.readModule: (" + sym.hashCode() + ") no module info found for " + locn );
-                ModuleId p = getDefaultPlatformModule();
-                sym.requires = new HashMap<ModuleId, ModuleRequires>(1);
-                sym.requires.put(p, new ModuleRequires(p, List.<Name>nil()));
+                ModuleIdQuery mq = getDefaultPlatformModule().toQuery();
+                RequiresModuleDirective d = new RequiresModuleDirective(mq);
+                sym.directives = ListBuffer.lb();
+                sym.directives.add(d);
                 return;
             }
             file = classFile;
@@ -521,7 +582,7 @@ public class Modules extends JCTree.Visitor {
 //                return;
 //            }
 
-            String library = options.get(OptionName.L);
+            String library = options.get(Option.L);
             if (library != null || !isLegacyRuntime()) {
                 // use Class.forName on jigsaw module resolver, to avoid bootstrap dependency
                 try {
@@ -533,14 +594,14 @@ public class Modules extends JCTree.Visitor {
                     moduleResolver = constr.newInstance(context);
                     DEBUG("Modules.initModuleResolver: " + moduleResolver);
 
-                    OptionName[] unsupportedOptions = {
+                    Option[] unsupportedOptions = {
             //            XBOOTCLASSPATH_PREPEND,
                         ENDORSEDDIRS,
             //            BOOTCLASSPATH,
             //            XBOOTCLASSPATH_APPEND,
                         EXTDIRS
                     };
-                    for (OptionName o: unsupportedOptions) {
+                    for (Option o: unsupportedOptions) {
                         if (options.get(o) != null) {
 
                         }
@@ -580,6 +641,9 @@ public class Modules extends JCTree.Visitor {
             public void report(ModuleSymbol msym, ModuleId mid, String key, Object... args) {
                 error(msym, mid, key, args);
             }
+            public void report(ModuleSymbol msym, ModuleIdQuery mq, String key, Object... args) {
+                error(msym, mq, key, args);
+            }
         });
         DEBUG("Modules.initModuleResolver: zeromod: " + moduleResolver);
     }
@@ -592,6 +656,10 @@ public class Modules extends JCTree.Visitor {
         return rt_jar.exists();
     }
 
+    private void error(ModuleSymbol msym, ModuleIdQuery mq, String key, Object... args) {
+        error(msym, new ModuleId(mq.name, mq.versionQuery), key, args);
+    }
+
     private void error(ModuleSymbol msym, ModuleId id, String key, Object... args) {
         if (msym == null) {
             log.error(key, args);
@@ -638,17 +706,22 @@ public class Modules extends JCTree.Visitor {
         @Override
         public void visitModuleDef(JCModuleDecl tree) {
             search(tree.id);
-            search(tree.provides);
-            search(tree.metadata);
+            search(tree.directives);
+        }
+
+        @Override
+        public void visitExports(JCExportDirective tree) {
         }
 
         @Override
-        public void visitModuleExport(JCModuleExport tree) {
+        public void visitPermits(JCPermitsDirective tree) {
+            if (equal(TreeInfo.fullName(tree.moduleName), mid.name) && mid.version == null)
+                result = tree;
         }
 
         @Override
-        public void visitModuleRequires(JCModuleRequires tree) {
-            search(tree.moduleIds);
+        public void visitRequiresModule(JCRequiresModuleDirective tree) {
+            search(tree.moduleIdQuery);
         }
 
         @Override
@@ -659,6 +732,14 @@ public class Modules extends JCTree.Visitor {
             DEBUG("Modules.treeFinder.visitModuleId result " + result);
         }
 
+        @Override
+        public void visitModuleIdQuery(JCModuleIdQuery tree) {
+            DEBUG("Modules.treeFinder.visitModuleId " + tree + " " + mid);
+            if (equal(TreeInfo.fullName(tree.qualId), mid.name) && equal(tree.versionQuery, mid.version))
+                result = tree;
+            DEBUG("Modules.treeFinder.visitModuleId result " + result);
+        }
+
         void search(JCTree tree) {
             if (result != null)
                 return;
@@ -827,9 +908,9 @@ public class Modules extends JCTree.Visitor {
                     // short form only, for now
                     debug.print("    requires: ");
                     String sep = "";
-                    for (ModuleRequires r: msym.getRequires()) {
+                    for (RequiresModuleDirective d: msym.getRequiredModules()) {
                         debug.print(sep);
-                        showNameAndVersion(r.moduleId.name, r.moduleId.version);
+                        showNameAndVersion(d.moduleQuery.name, d.moduleQuery.versionQuery);
                         sep = ", ";
                     }
                     debug.println();
@@ -892,6 +973,7 @@ public class Modules extends JCTree.Visitor {
 
     interface ErrorHandler {
         void report(ModuleSymbol msym, ModuleId mid, String key, Object... args);
+        void report(ModuleSymbol msym, ModuleIdQuery mq, String key, Object... args);
     }
 
     class ZeroMod implements ModuleResolver {
@@ -951,9 +1033,11 @@ public class Modules extends JCTree.Visitor {
             // build module index
             for (ModuleElement elem: modules) {
                 ModuleSymbol sym = (ModuleSymbol) elem;
-                add(table, sym, new ClassFile.ModuleId(sym.name, sym.version));
-                for (List<ClassFile.ModuleId> l = sym.provides.toList(); l.nonEmpty(); l = l.tail)
-                    add(table, sym, l.head);
+                add(table, sym, new ModuleId(sym.name, sym.version));
+                for (ViewDeclaration v : sym.getViews()) {
+                    for (ProvidesModuleDirective d : v.getAliases())
+                        add(table, sym, d.moduleId);
+                }
             }
 
             // Add entry for default platform module if needed
@@ -965,8 +1049,8 @@ public class Modules extends JCTree.Visitor {
                     table.put(p.name, versions = new HashMap<Name,ModuleSymbol>());
                 psym = new ModuleSymbol(p.name, syms.rootModule);
                 psym.location = StandardLocation.PLATFORM_CLASS_PATH;
-                psym.requires = new HashMap<ModuleId,ModuleRequires>();
                 versions.put(p.version, psym);
+                psym.directives = ListBuffer.lb();
             }
 
             return table;
@@ -985,16 +1069,16 @@ public class Modules extends JCTree.Visitor {
                 versions.put(mid.version, sym);
         }
 
-        private ModuleSymbol getModule(ModuleId mid) throws ModuleException {
+        private ModuleSymbol getModule(ModuleIdQuery mid) throws ModuleException {
             Map<Name, ModuleSymbol> versions = moduleTable.get(mid.name);
             if (versions == null)
                 throw new ModuleException("mdl.no.version.available", mid);
-            if (mid.version == null) {
+            if (mid.versionQuery == null) {
                 if (versions.size() > 1)
                     throw new ModuleException("mdl.no.unique.version.available", mid);
                 return versions.values().iterator().next();
             } else {
-                ModuleSymbol sym = versions.get(mid.version);
+                ModuleSymbol sym = versions.get(mid.versionQuery);
                 if (sym == null)
                     throw new ModuleException("mdl.required.version.not.available", mid);
                 return sym;
@@ -1014,12 +1098,12 @@ public class Modules extends JCTree.Visitor {
 
         private class ModuleException extends Exception {
             private static final long serialVersionUID = 0;
-            ModuleException(String key, ModuleId moduleId) {
+            ModuleException(String key, ModuleIdQuery moduleQuery) {
                 this.key = key;
-                this.moduleId = moduleId;
+                this.moduleQuery = moduleQuery;
             }
             final String key;
-            final ModuleId moduleId;
+            final ModuleIdQuery moduleQuery;
         }
 
 ////////        List<Node> getNodes(Iterable<? extends ModuleElement.ModuleIdQuery> queries) {
@@ -1065,13 +1149,13 @@ public class Modules extends JCTree.Visitor {
             }
 
             Iterable<Node> getDependencies() {
-                DEBUG("ZeroMod.Node.getDependencies: " + sym + " " + sym.requires);
+                DEBUG("ZeroMod.Node.getDependencies: " + sym + " " + sym.getRequiredModules());
                 ListBuffer<Node> nodes = new ListBuffer<Node>();
-                for (ModuleRequires mr: sym.requires.values()) {
+                for (RequiresModuleDirective d: sym.getRequiredModules()) {
                     try {
-                        nodes.add(getNode(getModule(mr.moduleId)));
+                        nodes.add(getNode(getModule(d.moduleQuery)));
                     } catch (ModuleException e) {
-                        errorHandler.report(sym, e.moduleId, e.key, e.moduleId);
+                        errorHandler.report(sym, e.moduleQuery, e.key, e.moduleQuery);
                     }
                 }
                 return nodes.toList();
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
index 27fa7d9..20eac31 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -25,31 +25,37 @@
 
 package com.sun.tools.javac.comp;
 
-import java.util.Map;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
 import javax.lang.model.element.ElementVisitor;
 
-import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.jvm.*;
-import com.sun.tools.javac.tree.*;
 import com.sun.tools.javac.api.Formattable.LocalizedString;
-import static com.sun.tools.javac.comp.Resolve.MethodResolutionPhase.*;
-
+import com.sun.tools.javac.code.*;
 import com.sun.tools.javac.code.Type.*;
 import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.jvm.*;
+import com.sun.tools.javac.tree.*;
 import com.sun.tools.javac.tree.JCTree.*;
+import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType;
 
 import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.BLOCK;
+import static com.sun.tools.javac.code.Flags.MODULE;
 import static com.sun.tools.javac.code.Kinds.*;
+import static com.sun.tools.javac.code.Kinds.ERRONEOUS;
 import static com.sun.tools.javac.code.TypeTags.*;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType;
-
-import static com.sun.tools.javac.code.Flags.MODULE; // disambiguate
-import java.util.Set;
-import java.util.HashSet;
+import static com.sun.tools.javac.comp.Resolve.MethodResolutionPhase.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
 
 /** Helper class for name resolution, used mostly by the attribution phase.
  *
@@ -75,9 +81,45 @@ public class Resolve {
     public final boolean varargsEnabled; // = source.allowVarargs();
     public final boolean allowMethodHandles;
     private final boolean debugResolve;
+    final EnumSet<VerboseResolutionMode> verboseResolutionMode;
 
     Scope polymorphicSignatureScope;
 
+    enum VerboseResolutionMode {
+        SUCCESS("success"),
+        FAILURE("failure"),
+        APPLICABLE("applicable"),
+        INAPPLICABLE("inapplicable"),
+        DEFERRED_INST("deferred-inference"),
+        PREDEF("predef"),
+        OBJECT_INIT("object-init"),
+        INTERNAL("internal");
+
+        String opt;
+
+        private VerboseResolutionMode(String opt) {
+            this.opt = opt;
+        }
+
+        static EnumSet<VerboseResolutionMode> getVerboseResolutionMode(Options opts) {
+            String s = opts.get("verboseResolution");
+            EnumSet<VerboseResolutionMode> res = EnumSet.noneOf(VerboseResolutionMode.class);
+            if (s == null) return res;
+            if (s.contains("all")) {
+                res = EnumSet.allOf(VerboseResolutionMode.class);
+            }
+            Collection<String> args = Arrays.asList(s.split(","));
+            for (VerboseResolutionMode mode : values()) {
+                if (args.contains(mode.opt)) {
+                    res.add(mode);
+                } else if (args.contains("-" + mode.opt)) {
+                    res.remove(mode);
+                }
+            }
+            return res;
+        }
+    }
+
     public static Resolve instance(Context context) {
         Resolve instance = context.get(resolveKey);
         if (instance == null)
@@ -113,6 +155,7 @@ public class Resolve {
         varargsEnabled = source.allowVarargs();
         Options options = Options.instance(context);
         debugResolve = options.isSet("debugresolve");
+        verboseResolutionMode = VerboseResolutionMode.getVerboseResolutionMode(options);
         Target target = Target.instance(context);
         allowMethodHandles = target.hasMethodHandles();
         polymorphicSignatureScope = new Scope(syms.noSymbol);
@@ -699,13 +742,16 @@ public class Resolve {
         if (!sym.isInheritedIn(site.tsym, types)) return bestSoFar;
         Assert.check(sym.kind < AMBIGUOUS);
         try {
-            rawInstantiate(env, site, sym, argtypes, typeargtypes,
+            Type mt = rawInstantiate(env, site, sym, argtypes, typeargtypes,
                                allowBoxing, useVarargs, Warner.noWarnings);
+            if (!operator) addVerboseApplicableCandidateDiag(sym ,mt);
         } catch (InapplicableMethodException ex) {
+            if (!operator) addVerboseInapplicableCandidateDiag(sym, ex.getDiagnostic());
             switch (bestSoFar.kind) {
             case ABSENT_MTH:
                 return wrongMethod.setWrongSym(sym, ex.getDiagnostic());
             case WRONG_MTH:
+                if (operator) return bestSoFar;
                 wrongMethods.addCandidate(currentStep, wrongMethod.sym, wrongMethod.explanation);
             case WRONG_MTHS:
                 return wrongMethods.addCandidate(currentStep, sym, ex.getDiagnostic());
@@ -723,6 +769,34 @@ public class Resolve {
             : mostSpecific(sym, bestSoFar, env, site,
                            allowBoxing && operator, useVarargs);
     }
+    //where
+        void addVerboseApplicableCandidateDiag(Symbol sym, Type inst) {
+            if (!verboseResolutionMode.contains(VerboseResolutionMode.APPLICABLE))
+                return;
+
+            JCDiagnostic subDiag = null;
+            if (inst.getReturnType().tag == FORALL) {
+                Type diagType = types.createMethodTypeWithReturn(inst.asMethodType(),
+                                                                ((ForAll)inst.getReturnType()).qtype);
+                subDiag = diags.fragment("partial.inst.sig", diagType);
+            } else if (sym.type.tag == FORALL) {
+                subDiag = diags.fragment("full.inst.sig", inst.asMethodType());
+            }
+
+            String key = subDiag == null ?
+                    "applicable.method.found" :
+                    "applicable.method.found.1";
+
+            verboseResolutionCandidateDiags.put(sym,
+                    diags.fragment(key, verboseResolutionCandidateDiags.size(), sym, subDiag));
+        }
+
+        void addVerboseInapplicableCandidateDiag(Symbol sym, JCDiagnostic subDiag) {
+            if (!verboseResolutionMode.contains(VerboseResolutionMode.INAPPLICABLE))
+                return;
+            verboseResolutionCandidateDiags.put(sym,
+                    diags.fragment("not.applicable.method.found", verboseResolutionCandidateDiags.size(), sym, subDiag));
+        }
 
     /* Return the most specific of the two methods for a call,
      *  given that both are accessible and applicable.
@@ -920,8 +994,9 @@ public class Resolve {
                       boolean allowBoxing,
                       boolean useVarargs,
                       boolean operator) {
+        verboseResolutionCandidateDiags.clear();
         Symbol bestSoFar = methodNotFound;
-        return findMethod(env,
+        bestSoFar = findMethod(env,
                           site,
                           name,
                           argtypes,
@@ -933,6 +1008,8 @@ public class Resolve {
                           useVarargs,
                           operator,
                           new HashSet<TypeSymbol>());
+        reportVerboseResolutionDiagnostic(env.tree.pos(), name, site, argtypes, typeargtypes, bestSoFar);
+        return bestSoFar;
     }
     // where
     private Symbol findMethod(Env<AttrContext> env,
@@ -990,6 +1067,37 @@ public class Resolve {
         }
         return bestSoFar;
     }
+    //where
+        void reportVerboseResolutionDiagnostic(DiagnosticPosition dpos, Name name, Type site, List<Type> argtypes, List<Type> typeargtypes, Symbol bestSoFar) {
+            boolean success = bestSoFar.kind < ERRONEOUS;
+
+            if (success && !verboseResolutionMode.contains(VerboseResolutionMode.SUCCESS)) {
+                return;
+            } else if (!success && !verboseResolutionMode.contains(VerboseResolutionMode.FAILURE)) {
+                return;
+            }
+
+            if (bestSoFar.name == names.init &&
+                    bestSoFar.owner == syms.objectType.tsym &&
+                    !verboseResolutionMode.contains(VerboseResolutionMode.OBJECT_INIT)) {
+                return; //skip diags for Object constructor resolution
+            } else if (site == syms.predefClass.type && !verboseResolutionMode.contains(VerboseResolutionMode.PREDEF)) {
+                return; //skip spurious diags for predef symbols (i.e. operators)
+            } else if (internalResolution && !verboseResolutionMode.contains(VerboseResolutionMode.INTERNAL)) {
+                return;
+            }
+
+            int pos = 0;
+            for (Symbol s : verboseResolutionCandidateDiags.keySet()) {
+                if (s == bestSoFar) break;
+                pos++;
+            }
+            String key = success ? "verbose.resolve.multi" : "verbose.resolve.multi.1";
+            JCDiagnostic main = diags.note(log.currentSource(), dpos, key, name, site.tsym, pos, currentStep,
+                    methodArguments(argtypes), methodArguments(typeargtypes));
+            JCDiagnostic d = new JCDiagnostic.MultilineDiagnostic(main, List.from(verboseResolutionCandidateDiags.values().toArray(new JCDiagnostic[verboseResolutionCandidateDiags.size()])));
+            log.report(d);
+        }
 
     /** Find unqualified method matching given name, type and value arguments.
      *  @param env       The current environment.
@@ -1178,7 +1286,7 @@ public class Resolve {
                 staticOnly = true;
         }
 
-        if (env.tree.getTag() != JCTree.IMPORT) {
+        if (!env.tree.hasTag(IMPORT)) {
             sym = findGlobalType(env, env.toplevel.namedImportScope, name);
             if (sym.exists()) return sym;
             else if (sym.kind < bestSoFar.kind) bestSoFar = sym;
@@ -1558,12 +1666,19 @@ public class Resolve {
                                         Type site, Name name,
                                         List<Type> argtypes,
                                         List<Type> typeargtypes) {
-        Symbol sym = resolveQualifiedMethod(
-            pos, env, site.tsym, site, name, argtypes, typeargtypes);
-        if (sym.kind == MTH) return (MethodSymbol)sym;
-        else throw new FatalError(
-                 diags.fragment("fatal.err.cant.locate.meth",
-                                name));
+        boolean prevInternal = internalResolution;
+        try {
+            internalResolution = true;
+            Symbol sym = resolveQualifiedMethod(
+                pos, env, site.tsym, site, name, argtypes, typeargtypes);
+            if (sym.kind == MTH) return (MethodSymbol)sym;
+            else throw new FatalError(
+                     diags.fragment("fatal.err.cant.locate.meth",
+                                    name));
+        }
+        finally {
+            internalResolution = prevInternal;
+        }
     }
 
     /** Resolve constructor.
@@ -1698,8 +1813,9 @@ public class Resolve {
      *  @param env       The environment current at the operation.
      *  @param argtypes  The types of the operands.
      */
-    Symbol resolveOperator(DiagnosticPosition pos, int optag,
+    Symbol resolveOperator(DiagnosticPosition pos, JCTree.Tag optag,
                            Env<AttrContext> env, List<Type> argtypes) {
+        startResolution();
         Name name = treeinfo.operatorName(optag);
         Symbol sym = findMethod(env, syms.predefClass.type, name, argtypes,
                                 null, false, false, true);
@@ -1716,7 +1832,7 @@ public class Resolve {
      *  @param env       The environment current at the operation.
      *  @param arg       The type of the operand.
      */
-    Symbol resolveUnaryOperator(DiagnosticPosition pos, int optag, Env<AttrContext> env, Type arg) {
+    Symbol resolveUnaryOperator(DiagnosticPosition pos, JCTree.Tag optag, Env<AttrContext> env, Type arg) {
         return resolveOperator(pos, optag, env, List.of(arg));
     }
 
@@ -1728,7 +1844,7 @@ public class Resolve {
      *  @param right     The types of the right operand.
      */
     Symbol resolveBinaryOperator(DiagnosticPosition pos,
-                                 int optag,
+                                 JCTree.Tag optag,
                                  Env<AttrContext> env,
                                  Type left,
                                  Type right) {
@@ -1843,7 +1959,7 @@ public class Resolve {
     private final LocalizedString noArgs = new LocalizedString("compiler.misc.no.args");
 
     public Object methodArguments(List<Type> argtypes) {
-        return argtypes.isEmpty() ? noArgs : argtypes;
+        return argtypes == null || argtypes.isEmpty() ? noArgs : argtypes;
     }
 
     /**
@@ -2390,10 +2506,15 @@ public class Resolve {
     private Map<MethodResolutionPhase, Symbol> methodResolutionCache =
         new HashMap<MethodResolutionPhase, Symbol>(MethodResolutionPhase.values().length);
 
+    private Map<Symbol, JCDiagnostic> verboseResolutionCandidateDiags =
+        new LinkedHashMap<Symbol, JCDiagnostic>();
+
     final List<MethodResolutionPhase> methodResolutionSteps = List.of(BASIC, BOX, VARARITY);
 
     private MethodResolutionPhase currentStep = null;
 
+    private boolean internalResolution = false;
+
     private MethodResolutionPhase firstErroneousResolutionPhase() {
         MethodResolutionPhase bestSoFar = BASIC;
         Symbol sym = methodNotFound;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/CompositeLocation.java b/langtools/src/share/classes/com/sun/tools/javac/file/CompositeLocation.java
index 7420904..6238d1a 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/CompositeLocation.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/CompositeLocation.java
@@ -25,14 +25,18 @@
 
 package com.sun.tools.javac.file;
 
-import com.sun.tools.javac.util.ListBuffer;
+import java.io.File;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.Set;
 import javax.tools.ExtendedLocation;
 import javax.tools.JavaFileManager;
 import javax.tools.JavaFileManager.Location;
 import javax.tools.JavaFileObject;
 import javax.tools.JavaFileObject.Kind;
+import javax.tools.StandardJavaFileManager;
+
+import com.sun.tools.javac.util.ListBuffer;
 
 /**
  * A location composed of a list of component locations.
@@ -41,7 +45,7 @@ class CompositeLocation implements ExtendedLocation {
     final JavaFileManager fileManager;
     final Iterable<? extends Location> locations;
     final String name;
-    private static int count;
+    private static int count; // FIXME, move count/name to creator, or move CompositeLocation to Locations
 
     CompositeLocation(Iterable<? extends Location> locations, JavaFileManager fileManager) {
         this.locations = locations;
@@ -52,6 +56,7 @@ class CompositeLocation implements ExtendedLocation {
         name = "multiLocation#" + (count++) + names.toString();
     }
 
+    @Override // javax.tools.ExtendedLocation
     public Iterable<JavaFileObject> list(String packageName, Set<Kind> kinds, boolean recurse) throws IOException {
         ListBuffer<JavaFileObject> results = new ListBuffer<JavaFileObject>();
         for (Location l: locations) {
@@ -66,6 +71,7 @@ class CompositeLocation implements ExtendedLocation {
         return results.toList();
     }
 
+    @Override // javax.tools.ExtendedLocation
     public String inferBinaryName(JavaFileObject file) {
         for (Location l: locations) {
             String binaryName;
@@ -79,10 +85,12 @@ class CompositeLocation implements ExtendedLocation {
         return null;
     }
 
+    @Override // javax.tools.JavaFileManager.Location
     public String getName() {
         return name;
     }
 
+    @Override // javax.tools.JavaFileManager.Location
     public boolean isOutputLocation() {
         return false;
     }
@@ -91,4 +99,21 @@ class CompositeLocation implements ExtendedLocation {
     public String toString() {
         return getName();
     }
+
+    Collection<File> getLocation() {
+        if (!(fileManager instanceof StandardJavaFileManager))
+            throw new IllegalStateException();
+        StandardJavaFileManager fm = (StandardJavaFileManager) fileManager;
+        ListBuffer<File> files = new ListBuffer<File>();
+        for (Location l: locations) {
+            Iterable<? extends File> iter = fm.getLocation(l);
+            // FIXME: need a way to distinguish between empty locations and
+            // non-standard locations
+//            if (iter == null)
+//                throw new IllegalStateException();
+            if (iter != null)
+                for (File f: iter) files.add(f);
+        }
+        return files.toList();
+    }
 }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java b/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
index e5377af..b771693 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
@@ -25,7 +25,6 @@
 
 package com.sun.tools.javac.file;
 
-import java.util.Comparator;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -41,9 +40,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -63,18 +62,15 @@ import javax.tools.StandardLocation;
 
 import static javax.tools.StandardLocation.*;
 
-import com.sun.tools.javac.file.Paths.Path;
-import com.sun.tools.javac.file.Paths.PathEntry;
-import com.sun.tools.javac.file.Paths.PathLocation;
+import com.sun.tools.javac.file.Locations.Path;
 import com.sun.tools.javac.file.RelativePath.RelativeFile;
 import com.sun.tools.javac.file.RelativePath.RelativeDirectory;
-import com.sun.tools.javac.main.OptionName;
 import com.sun.tools.javac.util.BaseFileManager;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.util.ListBuffer;
 
-import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.main.Option.*;
 
 /**
  * This class provides access to the source, class and other files
@@ -96,32 +92,14 @@ public class JavacFileManager
             return buffer.toString().toCharArray();
     }
 
-    /** Encapsulates knowledge of paths
-     */
-    private Paths paths;
-
     private FSInfo fsInfo;
 
     private boolean contextUseOptimizedZip;
     private ZipFileIndexCache zipFileIndexCache;
 
-    private final File uninited = new File("U N I N I T E D");
-
     private final Set<JavaFileObject.Kind> sourceOrClass =
         EnumSet.of(JavaFileObject.Kind.SOURCE, JavaFileObject.Kind.CLASS);
 
-    /** The standard output directory, primarily used for classes.
-     *  Initialized by the "-d" option.
-     *  If classOutDir = null, files are written into same directory as the sources
-     *  they were generated from.
-     */
-    private File classOutDir = uninited;
-
-    /** The output directory, used when generating sources while processing annotations.
-     *  Initialized by the "-s" option.
-     */
-    private File sourceOutDir = uninited;
-
     protected boolean mmappedIO;
     protected boolean ignoreSymbolFile;
 
@@ -167,13 +145,6 @@ public class JavacFileManager
     @Override
     public void setContext(Context context) {
         super.setContext(context);
-        if (paths == null) {
-            paths = Paths.instance(context);
-        } else {
-            // Reuse the Paths object as it stores the locations that
-            // have been set with setLocation, etc.
-            paths.setContext(context);
-        }
 
         fsInfo = FSInfo.instance(context);
 
@@ -192,7 +163,7 @@ public class JavacFileManager
 
     @Override
     public boolean isDefaultBootClassPath() {
-        return paths.isDefaultBootClassPath();
+        return locations.isDefaultBootClassPath();
     }
 
     public JavaFileObject getFileForInput(String name) {
@@ -432,6 +403,7 @@ public class JavacFileManager
 
     private ModuleMode moduleMode;
 
+    @Override // javax.tools.ModuleFileManager
     public ModuleMode getModuleMode() {
         if (moduleMode == null) {
             if (options.get(MODULEPATH) != null && options.get(CLASSPATH) == null)
@@ -442,6 +414,7 @@ public class JavacFileManager
         return moduleMode;
     }
 
+    @Override // javax.tools.ModuleFileManager
     public Location getModuleLocation(Location locn, JavaFileObject fo, String pkgName)
             throws InvalidLocationException, InvalidFileObjectException {
         if (getModuleMode() == ModuleMode.SINGLE)
@@ -463,19 +436,20 @@ public class JavacFileManager
     private Map<Location,Iterable<Location>> moduleLocations =
             new LinkedHashMap<Location,Iterable<Location>>();
 
+    @Override // javax.tools.ModuleFileManager
     public Iterable<Location> getModuleLocations(Location locn) {
         //System.err.println("JavacFileManager.getModuleLocations " + getModuleMode() + " " + locn);
 
         Iterable<Location> result = moduleLocations.get(locn);
         if (result == null) {
-            Iterable<PathEntry> pathEntries = getEntriesForLocation(locn);
-            if (pathEntries == null)
+            Iterable<File> files = locations.getLocation(locn);
+            if (files == null)
                 result = List.<Location>nil();
             else {
                 Set<Location> locns = new LinkedHashSet<Location>();
-                for (PathEntry pe: pathEntries) {
-                    if (pe.file.isDirectory()) {
-                        for (File f: pe.file.listFiles()) {
+                for (File file: files) {
+                    if (file.isDirectory()) {
+                        for (File f: file.listFiles()) {
                             String tag = null;
                             if (f.isDirectory())
                                 tag = f.getName();
@@ -483,6 +457,7 @@ public class JavacFileManager
 //                                String name = f.getName();
 //                                tag = name.substring(0, name.lastIndexOf("."));
 //                            }
+                            // FIXME: check if tag has already been seen
                             if (tag != null)
                                 locns.add(getModuleLocation(locn, tag));
                         }
@@ -500,67 +475,29 @@ public class JavacFileManager
         return result;
     }
 
-
     private Map<String, Location> locationCache = new HashMap<String,Location>();
 
-    public Location join(Iterable<? extends Location> locations)
+    @Override // javax.tools.ModuleFileManager
+    public Location join(Iterable<? extends Location> list)
             throws IllegalArgumentException {
         StringBuilder sb = new StringBuilder("{");
         String sep = "";
-        for (Location l: locations) {
-            if (l instanceof StandardLocation || l instanceof PathLocation || l instanceof ExtendedLocation) {
-                sb.append(sep);
-                sb.append(l.getName());
-                sep = ",";
-            } else
+        for (Location l: list) {
+            if (!locations.isSupportedLocation(l))
                 throw new IllegalArgumentException(l.toString());
+            sb.append(sep);
+            sb.append(l.getName());
+            sep = ",";
         }
         sb.append("}");
         String name = sb.toString();
 
+        // ugly, rethink this (using name for key)
         Location result = locationCache.get(name);
         if (result == null) {
-            ListBuffer<Location> mergeList = new ListBuffer<Location>();
-            Path currPath = null;
-            for (Location l: locations) {
-                if (l instanceof StandardLocation) {
-                    if (hasLocation(l)) {
-                        Set<JavaFileObject.Kind> kinds = allKinds;
-                        switch ((StandardLocation) l) {
-                            case CLASS_PATH:
-                                kinds = (hasLocation(SOURCE_PATH) ? noSourceKind : allKinds);
-                                break;
-                            case SOURCE_OUTPUT:
-                            case SOURCE_PATH:
-                                kinds = noClassKind;
-                                break;
-                            case ANNOTATION_PROCESSOR_PATH:
-                            case PLATFORM_CLASS_PATH:
-                            case CLASS_OUTPUT:
-                                kinds = noSourceKind;
-                                break;
-                        }
-                        if (currPath == null)
-                            currPath = paths.new Path();
-                        currPath.addAll(getEntriesForLocation(l), kinds);
-                    }
-                } else if (l instanceof PathLocation) {
-                    if (currPath == null)
-                        currPath = paths.new Path();
-                    currPath.addAll(((PathLocation) l).path);
-                } else if (l instanceof ExtendedLocation) {
-                    if (currPath != null) {
-                        mergeList.add(new PathLocation(currPath));
-                        currPath = null;
-                    }
-                    mergeList.add(l);
-                }
-            }
-            if (currPath != null) {
-                mergeList.add(new PathLocation(currPath));
-                currPath = null;
-            }
-            result = (mergeList.size() == 1) ? mergeList.first() : new CompositeLocation(mergeList, this);
+            // FIXME, could flatten list, and/or use a LinkedHashSet to
+            // canonicalize list
+            result = new CompositeLocation(list, this);
             locationCache.put(name, result);
         }
 
@@ -576,27 +513,23 @@ public class JavacFileManager
         String name = location.getName() + "[" + tag + "]";
         Location result = locationCache.get(name);
         if (result == null) {
-            Iterable<? extends PathEntry> pathEntries;
-            if (location instanceof StandardLocation)
-                pathEntries = getEntriesForLocation(location);
-            else if (location instanceof PathLocation)
-                pathEntries = ((PathLocation) location).path;
-            else
+            Iterable<? extends File> files = locations.getLocation(location);
+            if (files == null)
                 throw new IllegalArgumentException(location.getName());
-            Path p = paths.new Path();
-            if (pathEntries != null) {
-                for (PathEntry e: pathEntries) {
-                    File dir = new File(e.file, tag);
+            Path p = locations.new Path();
+            if (files != null) {
+                for (File file: files) {
+                    File dir = new File(file, tag);
                     if (dir.exists() && dir.isDirectory() || location.isOutputLocation())
-                        p.add(paths.new PathEntry(dir, e.kinds));
+                        p.addFile(dir);
                     else {
-                        File jar = new File(e.file, tag + ".jar");
+                        File jar = new File(file, tag + ".jar");
                         if (jar.exists() && jar.isFile())
-                            p.add(paths.new PathEntry(dir, e.kinds));
+                            p.addFile(jar);
                     }
                 }
             }
-            result = new PathLocation(p, name);
+            result = locations.createLocation(p, name, locations.getOrigin(location));
             locationCache.put(name, result);
         }
         return result;
@@ -616,34 +549,24 @@ public class JavacFileManager
             return List.of(l);
         }
 
-        Path ppPrepend = first ? paths.getPlatformPathPrepend() : null;
-        Path ppBase = paths.getPlatformPathBase();
-        Path ppAppend = last ? paths.getPlatformPathAppend() : null;
+        Path ppPrepend = first ? locations.getPlatformPathPrepend() : null;
+        Path ppBase = locations.getPlatformPathBase();
+        Path ppAppend = last ? locations.getPlatformPathAppend() : null;
 
         ListBuffer<Location> results = new ListBuffer<Location>();
         if (ppPrepend != null)
-            results.add(new PathLocation(ppPrepend));
+            results.add(locations.createLocation(ppPrepend, StandardLocation.PLATFORM_CLASS_PATH));
         if (ppBase != null) {
             if (first)
-                results.add(new PathLocation(ppBase));
+                results.add(locations.createLocation(ppBase, StandardLocation.PLATFORM_CLASS_PATH));
         } else
             results.add(l);
         if (ppAppend != null)
-            results.add(new PathLocation(ppAppend));
+            results.add(locations.createLocation(ppAppend, StandardLocation.PLATFORM_CLASS_PATH));
         //System.out.println("JFM:augmentPlatformLocation: " + l + " " + first + " " + last + " " + results);
         return results.toList();
     }
 
-    private static Set<JavaFileObject.Kind> allKinds, noSourceKind, noClassKind;
-    static {
-        allKinds = EnumSet.allOf(JavaFileObject.Kind.class);
-        noSourceKind = EnumSet.allOf(JavaFileObject.Kind.class);
-        noSourceKind.remove(JavaFileObject.Kind.SOURCE);
-        noClassKind = EnumSet.allOf(JavaFileObject.Kind.class);
-        noClassKind.remove(JavaFileObject.Kind.CLASS);
-    }
-
-
     /**
      * An archive provides a flat directory structure of a ZipFile by
      * mapping directory names to lists of files (basenames).
@@ -720,7 +643,7 @@ public class JavacFileManager
      */
     private Archive openArchive(File zipFileName, boolean useOptimizedZip) throws IOException {
         File origZipFileName = zipFileName;
-        if (!ignoreSymbolFile && paths.isDefaultBootClassPathRtJar(zipFileName)) {
+        if (!ignoreSymbolFile && locations.isDefaultBootClassPathRtJar(zipFileName)) {
             File file = zipFileName.getParentFile().getParentFile(); // ${java.home}
             if (new File(file.getName()).equals(new File("jre")))
                 file = file.getParentFile();
@@ -807,6 +730,7 @@ public class JavacFileManager
 
     /** Flush any output resources.
      */
+    @Override // javax.tools.JavaFileManager
     public void flush() {
         contentCache.clear();
     }
@@ -814,6 +738,7 @@ public class JavacFileManager
     /**
      * Close the JavaFileManager, releasing resources.
      */
+    @Override // javax.tools.JavaFileManager
     public void close() {
         for (Iterator<Archive> i = archives.values().iterator(); i.hasNext(); ) {
             Archive a = i.next();
@@ -834,6 +759,7 @@ public class JavacFileManager
         return defaultEncodingName;
     }
 
+    @Override // javax.tools.JavaFileManager
     public ClassLoader getClassLoader(Location location) {
         nullCheck(location);
         Iterable<? extends File> path = getLocation(location);
@@ -851,6 +777,7 @@ public class JavacFileManager
         return getClassLoader(lb.toArray(new URL[lb.size()]));
     }
 
+    @Override // javax.tools.JavaFileManager
     public Iterable<JavaFileObject> list(Location location,
                                          String packageName,
                                          Set<JavaFileObject.Kind> kinds,
@@ -858,6 +785,7 @@ public class JavacFileManager
         throws IOException
     {
         // validatePackageName(packageName);
+        nullCheck(location);
         nullCheck(packageName);
         nullCheck(kinds);
 
@@ -865,21 +793,20 @@ public class JavacFileManager
             return ((ExtendedLocation) location).list(packageName, kinds, recurse);
         }
 
-        Iterable<? extends PathEntry> entries = getEntriesForLocation(location);
-        if (entries == null)
+        Iterable<? extends File> files = locations.getLocation(location);
+        if (files == null)
             return List.nil();
         RelativeDirectory subdirectory = RelativeDirectory.forPackage(packageName);
         ListBuffer<JavaFileObject> results = new ListBuffer<JavaFileObject>();
 
-        for (PathEntry e: entries) {
-            Set<JavaFileObject.Kind> s = EnumSet.copyOf(kinds);
-            s.retainAll(e.kinds);
-            if (!s.isEmpty())
-                listContainer(e.file, subdirectory, s, recurse, results);
+        for (File file: files) {
+            listContainer(file, subdirectory, kinds, recurse, results);
         }
+
         return results.toList();
     }
 
+    @Override // javax.tools.JavaFileManager
     public String inferBinaryName(Location location, JavaFileObject file) {
         file.getClass(); // null check
         location.getClass(); // null check
@@ -900,6 +827,7 @@ public class JavacFileManager
             return null; // FIXME -- seems OK per spec but need to check
     }
 
+    @Override // javax.tools.JavaFileManager
     public boolean isSameFile(FileObject a, FileObject b) {
         nullCheck(a);
         nullCheck(b);
@@ -910,17 +838,20 @@ public class JavacFileManager
         return a.equals(b);
     }
 
+    @Override // javax.tools.JavaFileManager
     public boolean hasLocation(Location location) {
-        return getLocation(location) != null;
+        return (location instanceof ExtendedLocation || (getLocation(location) != null));
     }
 
+    @Override // javax.tools.JavaFileManager
     public JavaFileObject getJavaFileForInput(Location location,
                                               String className,
                                               JavaFileObject.Kind kind)
         throws IOException
     {
         nullCheck(location);
-        // validateClassName(className);
+        // validateClassName(className);g518
+
         nullCheck(className);
         nullCheck(kind);
         if (!sourceOrClass.contains(kind))
@@ -928,6 +859,7 @@ public class JavacFileManager
         return getFileForInput(location, RelativeFile.forClass(className, kind), kind);
     }
 
+    @Override // javax.tools.JavaFileManager
     public FileObject getFileForInput(Location location,
                                       String packageName,
                                       String relativeName)
@@ -955,24 +887,30 @@ public class JavacFileManager
 
     private JavaFileObject getFileForInput(Location location, RelativeFile name,
                 JavaFileObject.Kind kind) throws IOException {
-        Iterable<? extends PathEntry> entries = getEntriesForLocation(location);
-        if (entries == null)
+        if (location instanceof CompositeLocation) {
+            for (Location l: ((CompositeLocation) location).locations) {
+                JavaFileObject fo = getFileForInput(l, name, kind);
+                if (fo != null)
+                    return fo;
+            }
+            return null;
+        }
+
+        Iterable<? extends File> files = locations.getLocation(location);
+        if (files == null)
             return null;
 
-        for (PathEntry e: entries) {
-            if (kind != null && !e.kinds.contains(kind))
-                continue;
-            File dir = e.file;
-            Archive a = archives.get(dir);
+        for (File file: files) {
+            Archive a = archives.get(file);
             if (a == null) {
-                if (fsInfo.isDirectory(dir)) {
-                    File f = name.getFile(dir);
+                if (fsInfo.isDirectory(file)) {
+                    File f = name.getFile(file);
                     if (f.exists())
                         return new RegularFileObject(this, f);
                     continue;
                 }
                 // Not a directory, create the archive
-                a = openArchive(dir);
+                a = openArchive(file);
             }
             // Process the archive
             if (a.contains(name)) {
@@ -982,6 +920,7 @@ public class JavacFileManager
         return null;
     }
 
+    @Override // javax.tools.JavaFileManager
     public JavaFileObject getJavaFileForOutput(Location location,
                                                String className,
                                                JavaFileObject.Kind kind,
@@ -997,6 +936,7 @@ public class JavacFileManager
         return getFileForOutput(location, RelativeFile.forClass(className, kind), sibling);
     }
 
+    @Override // javax.tools.JavaFileManager
     public FileObject getFileForOutput(Location location,
                                        String packageName,
                                        String relativeName,
@@ -1014,6 +954,7 @@ public class JavacFileManager
         return getFileForOutput(location, name, sibling);
     }
 
+    // FIXME: compare against tl
     private JavaFileObject getFileForOutput(Location location,
                                             RelativeFile fileName,
                                             FileObject sibling)
@@ -1034,10 +975,10 @@ public class JavacFileManager
             dir = (getSourceOutDir() != null ? getSourceOutDir() : getClassOutDir());
         } else {
             dir = null;
-            Iterable<? extends PathEntry> path = getEntriesForLocation(location);
+            Iterable<? extends File> path = locations.getLocation(location);
             if (path != null) {
-                for (PathEntry e: path) {
-                    dir = e.file;
+                for (File e: path) {
+                    dir = e;
                     break;
                 }
             }
@@ -1049,6 +990,7 @@ public class JavacFileManager
 
     }
 
+    @Override // javax.tools.StandardJavaFileManager
     public Iterable<? extends JavaFileObject> getJavaFileObjectsFromFiles(
         Iterable<? extends File> files)
     {
@@ -1062,129 +1004,37 @@ public class JavacFileManager
         return result;
     }
 
+    @Override // javax.tools.StandardJavaFileManager
     public Iterable<? extends JavaFileObject> getJavaFileObjects(File... files) {
         return getJavaFileObjectsFromFiles(Arrays.asList(nullCheck(files)));
     }
 
+    @Override // javax.tools.StandardJavaFileManager
     public void setLocation(Location location,
                             Iterable<? extends File> path)
         throws IOException
     {
         nullCheck(location);
-        paths.lazy();
-
-        final File dir = location.isOutputLocation() ? getOutputDirectory(path) : null;
-
-        if (location == CLASS_OUTPUT)
-            classOutDir = getOutputLocation(dir, D);
-        else if (location == SOURCE_OUTPUT)
-            sourceOutDir = getOutputLocation(dir, S);
-        else
-            paths.setPathForLocation(location, path);
-    }
-    // where
-        private File getOutputDirectory(Iterable<? extends File> path) throws IOException {
-            if (path == null)
-                return null;
-            Iterator<? extends File> pathIter = path.iterator();
-            if (!pathIter.hasNext())
-                throw new IllegalArgumentException("empty path for directory");
-            File dir = pathIter.next();
-            if (pathIter.hasNext())
-                throw new IllegalArgumentException("path too long for directory");
-            if (!dir.exists())
-                throw new FileNotFoundException(dir + ": does not exist");
-            else if (!dir.isDirectory())
-                throw new IOException(dir + ": not a directory");
-            return dir;
-        }
-
-    private File getOutputLocation(File dir, OptionName defaultOptionName) {
-        if (dir != null)
-            return dir;
-        String arg = options.get(defaultOptionName);
-        if (arg == null)
-            return null;
-        return new File(arg);
+        locations.setLocation(location, path);
     }
 
+    @Override // javax.tools.StandardJavaFileManager
     public Iterable<File> getLocation(Location location) {
-        nullCheck(location);
-        paths.lazy();
-
-        if (location == CLASS_OUTPUT) {
-            File dir = getClassOutDir();
-            return (dir == null ? null : List.of(dir));
-        }
-
-        if (location == SOURCE_OUTPUT) {
-            File dir = getSourceOutDir();
-            return (dir == null ? null : List.of(dir));
-        }
-
-
-        final Iterable<? extends PathEntry> entries;
-        if (location instanceof PathLocation)
-            entries = ((PathLocation) location).path;
-        else
-            entries = paths.getPathForLocation(location);
-
-        if (entries == null)
-            return null;
-
-        // wrap the natural PathEntry iterator with one that just returns the file values
-        return new Iterable<File>() {
-            public Iterator<File> iterator() {
-                return new Iterator<File>() {
-                    public boolean hasNext() {
-                        return iter.hasNext();
-                    }
-
-                    public File next() {
-                        return iter.next().file;
-                    }
-
-                    public void remove() {
-                        iter.remove();
-                    }
-
-                    final Iterator<? extends PathEntry> iter = entries.iterator();
-                };
-            }
-        };
+        return locations.getLocation(location);
     }
 
-    Iterable<PathEntry> getEntriesForLocation(Location location) {
+    @Deprecated // remove uses of this method
+    Iterable<File> getEntriesForLocation(Location location) {
         nullCheck(location);
-
-        if (location instanceof PathLocation)
-            return ((PathLocation) location).path;
-
-        paths.lazy();
-
-        if (location == CLASS_OUTPUT) {
-            File dir = getClassOutDir();
-            return (dir == null ? null : List.of(paths.new PathEntry(dir)));
-        }
-
-        if (location == SOURCE_OUTPUT) {
-            File dir = getSourceOutDir();
-            return (dir == null ? null : List.of(paths.new PathEntry(dir)));
-        }
-
-        return paths.getPathForLocation(location);
+        return locations.getLocation(location);
     }
 
     private File getClassOutDir() {
-        if (classOutDir == uninited)
-            classOutDir = getOutputLocation(null, D);
-        return classOutDir;
+        return locations.getOutputLocation(CLASS_OUTPUT);
     }
 
     private File getSourceOutDir() {
-        if (sourceOutDir == uninited)
-            sourceOutDir = getOutputLocation(null, S);
-        return sourceOutDir;
+        return locations.getOutputLocation(SOURCE_OUTPUT);
     }
 
     /**
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java b/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java
new file mode 100644
index 0000000..2439cf7
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java
@@ -0,0 +1,957 @@
+/*
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package com.sun.tools.javac.file;
+
+import javax.tools.ExtendedLocation;
+import java.io.FileNotFoundException;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.zip.ZipFile;
+
+import javax.tools.JavaFileManager.Location;
+import javax.tools.StandardLocation;
+
+import com.sun.tools.javac.code.Lint;
+import com.sun.tools.javac.main.Option;
+import com.sun.tools.javac.util.ListBuffer;
+import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.Options;
+
+import static javax.tools.StandardLocation.*;
+import static com.sun.tools.javac.main.Option.*;
+
+/**
+ *  This class converts command line arguments, environment variables
+ *  and system properties (in File.pathSeparator-separated String form)
+ *  into a boot class path, user class path, and source path (in
+ *  Collection<PathEntry> form).
+ *
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ */
+public class Locations {
+
+    /** The log to use for warning output */
+    private Log log;
+
+    /** Collection of command-line options */
+    private Options options;
+
+    /** Handler for -Xlint options */
+    private Lint lint;
+
+    /** Access to (possibly cached) file info */
+    private FSInfo fsInfo;
+
+    /** Whether to warn about non-existent path elements */
+    private boolean warn;
+
+    // TODO: remove need for this
+    private boolean inited = false; // TODO? caching bad?
+
+    public Locations() {
+        initHandlers();
+    }
+
+    public void update(Log log, Options options, Lint lint, FSInfo fsInfo) {
+        this.log = log;
+        this.options = options;
+        this.lint = lint;
+        this.fsInfo = fsInfo;
+    }
+
+    boolean isSupportedLocation(Location l) {
+        return (l instanceof StandardLocation)
+                || (l instanceof PathLocation)
+                || (l instanceof ExtendedLocation);
+    }
+
+    Location getOrigin(Location l) {
+        return (l instanceof PathLocation) ? ((PathLocation) l).origin : l;
+    }
+
+    public Collection<File> bootClassPath() {
+        return getLocation(PLATFORM_CLASS_PATH);
+    }
+
+    public boolean isDefaultBootClassPath() {
+        BootClassPathLocationHandler h =
+                (BootClassPathLocationHandler) getHandler(PLATFORM_CLASS_PATH);
+        return h.isDefault();
+    }
+
+    boolean isDefaultBootClassPathRtJar(File file) {
+        BootClassPathLocationHandler h =
+                (BootClassPathLocationHandler) getHandler(PLATFORM_CLASS_PATH);
+        return h.isDefaultRtJar(file);
+    }
+
+    public Collection<File> userClassPath() {
+        return getLocation(CLASS_PATH);
+    }
+
+    public Collection<File> sourcePath() {
+        Collection<File> p = getLocation(SOURCE_PATH);
+        // TODO: this should be handled by the LocationHandler
+        return p == null || p.isEmpty() ? null : p;
+    }
+
+    /**
+     * Split a path into its elements. Empty path elements will be ignored.
+     * @param path The path to be split
+     * @return The elements of the path
+     */
+    private static Iterable<File> getPathEntries(String path) {
+        return getPathEntries(path, null);
+    }
+
+    /**
+     * Split a path into its elements. If emptyPathDefault is not null, all
+     * empty elements in the path, including empty elements at either end of
+     * the path, will be replaced with the value of emptyPathDefault.
+     * @param path The path to be split
+     * @param emptyPathDefault The value to substitute for empty path elements,
+     *  or null, to ignore empty path elements
+     * @return The elements of the path
+     */
+    private static Iterable<File> getPathEntries(String path, File emptyPathDefault) {
+        ListBuffer<File> entries = new ListBuffer<File>();
+        int start = 0;
+        while (start <= path.length()) {
+            int sep = path.indexOf(File.pathSeparatorChar, start);
+            if (sep == -1)
+                sep = path.length();
+            if (start < sep)
+                entries.add(new File(path.substring(start, sep)));
+            else if (emptyPathDefault != null)
+                entries.add(emptyPathDefault);
+            start = sep + 1;
+        }
+        return entries;
+    }
+
+    Location createLocation(Path path, Location origin) {
+        return new PathLocation(path, origin);
+    }
+
+    Location createLocation(Path path, String name, Location origin) {
+        return new PathLocation(path, name, origin);
+    }
+
+    private static class PathLocation implements Location {
+        final Collection<File> files;
+        final String name;
+        final Location origin;
+
+        @Deprecated // FIXME should not use static count
+        static int count;
+
+        PathLocation(Path p, Location origin) {
+            files = p.toFiles();
+            //name = "pathLocation#" + (count++) + p;
+            name = "pathLocation#" + (count++) + "(path=" + p + ")";
+            this.origin = origin;
+        }
+
+        PathLocation(Path p, String name, Location origin) {
+            files = p.toFiles();
+            this.name = name;
+            this.origin = origin;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public boolean isOutputLocation() {
+            return false;
+        }
+
+        @Override
+        public String toString() {
+            return getName();
+        }
+    }
+
+    private class PathEntry {
+        PathEntry(File file) {
+            file.getClass(); // null check
+            this.file = file;
+            this.canonFile = fsInfo.getCanonicalFile(file);
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            if (this == other)
+                return true;
+            if (!(other instanceof PathEntry))
+                return false;
+            PathEntry o = (PathEntry) other;
+            return canonFile.equals(o.canonFile);
+        }
+
+        @Override
+        public int hashCode() {
+            return canonFile.hashCode();
+        }
+
+        @Override
+        public String toString() {
+            return file.getPath();
+        }
+
+        final File file;
+        final File canonFile;
+    }
+
+    /**
+     * Utility class to help evaluate a path option.
+     * Duplicate entries are ignored, jar class paths can be expanded.
+     */
+    class Path extends LinkedHashSet<PathEntry> {
+        private static final long serialVersionUID = 0;
+
+        private boolean expandJarClassPaths = false;
+
+        public Path expandJarClassPaths(boolean x) {
+            expandJarClassPaths = x;
+            return this;
+        }
+
+        /** What to use when path element is the empty string */
+        private File emptyPathDefault = null;
+
+        public Path emptyPathDefault(File x) {
+            emptyPathDefault = x;
+            return this;
+        }
+
+        /** Add all the jar files found in one or more directories.
+         *  @param dirs one or more directories separated by path separator char
+         *  @param whether to generate a warning if a given directory does not exist
+         */
+        public Path addDirectories(String dirs, boolean warn) {
+            boolean prev = expandJarClassPaths;
+            expandJarClassPaths = true;
+            try {
+                if (dirs != null)
+                    for (File dir : getPathEntries(dirs))
+                        addDirectory(dir, warn);
+                return this;
+            } finally {
+                expandJarClassPaths = prev;
+            }
+        }
+
+        /** Add all the jar files found in one or more directories.
+         *  Warnings about non-existent directories are given iff Paths.warn is set.
+         *  @param dirs one or more directories separated by path separator char
+         */
+        public Path addDirectories(String dirs) {
+            return addDirectories(dirs, warn);
+        }
+
+        /** Add all the jar files found in a directory.
+         *  @param dirs one or more directories separated by path separator char
+         *  @param whether to generate a warning if a given directory does not exist
+         */
+        private void addDirectory(File dir, boolean warn) {
+            if (!dir.isDirectory()) {
+                if (warn)
+                    log.warning(Lint.LintCategory.PATH,
+                            "dir.path.element.not.found", dir);
+                return;
+            }
+
+            File[] files = dir.listFiles();
+            if (files == null)
+                return;
+
+            for (File direntry : files) {
+                if (isArchive(direntry))
+                    addFile(direntry, warn);
+            }
+        }
+
+        /** Add directories and archive files.
+         *  @param files one or more directories and archive files separated by path separator char
+         *  @param whether to generate a warning if a given entry does not exist
+         */
+        public Path addFiles(String files, boolean warn) {
+            if (files != null) {
+                addFiles(getPathEntries(files, emptyPathDefault), warn);
+            }
+            return this;
+        }
+
+        public Path addFiles(String files) {
+            return addFiles(files, warn);
+        }
+
+        public Path addFiles(Iterable<? extends File> files, boolean warn) {
+            if (files != null) {
+                for (File file: files)
+                    addFile(file, warn);
+            }
+            return this;
+        }
+
+        public Path addFiles(Iterable<? extends File> files) {
+            return addFiles(files, warn);
+        }
+
+        /** Add a directory or archive file.
+         *  @param file directory or archive file to be added
+         */
+        public void addFile(File file) {
+            addFile(file, warn);
+        }
+
+        /** Add a directory or archive file.
+         *  @param file directory or archive file to be added
+         *  @param warn whether to generate a warning if the file does not exist
+         */
+        public void addFile(File file, boolean warn) {
+            PathEntry entry = new PathEntry(file);
+            if (contains(entry)) {
+                /* Discard duplicates and avoid infinite recursion */
+                return;
+            }
+
+            if (!fsInfo.exists(file)) {
+                /* No such file or directory exists */
+                if (warn) {
+                    log.warning(Lint.LintCategory.PATH,
+                            "path.element.not.found", file);
+                }
+                super.add(entry);
+                return;
+            }
+
+            if (fsInfo.isFile(file)) {
+                /* File is an ordinary file. */
+                if (!isArchive(file)) {
+                    /* Not a recognized extension; open it to see if
+                     it looks like a valid zip file. */
+                    try {
+                        ZipFile z = new ZipFile(file);
+                        z.close();
+                        if (warn) {
+                            log.warning(Lint.LintCategory.PATH,
+                                    "unexpected.archive.file", file);
+                        }
+                    } catch (IOException e) {
+                        // FIXME: include e.getLocalizedMessage in warning
+                        if (warn) {
+                            log.warning(Lint.LintCategory.PATH,
+                                    "invalid.archive.file", file);
+                        }
+                        return;
+                    }
+                }
+            }
+
+            /* Now what we have left is either a directory or a file name
+               conforming to archive naming convention */
+            super.add(entry);
+
+            if (expandJarClassPaths && fsInfo.isFile(file))
+                addJarClassPath(file, warn);
+        }
+
+        // Adds referenced classpath elements from a jar's Class-Path
+        // Manifest entry.  In some future release, we may want to
+        // update this code to recognize URLs rather than simple
+        // filenames, but if we do, we should redo all path-related code.
+        private void addJarClassPath(File jarFile, boolean warn) {
+            try {
+                for (File f: fsInfo.getJarClassPath(jarFile)) {
+                    addFile(f, warn);
+                }
+            } catch (IOException e) {
+                log.error("error.reading.file", jarFile, JavacFileManager.getMessage(e));
+            }
+        }
+
+        void addAll(Iterable<PathEntry> entries) {
+            for (PathEntry e: entries) 
+                add(e);
+        }
+
+        Collection<File> toFiles() {
+            ListBuffer<File> files = new ListBuffer<File>();
+            for (PathEntry e: this)
+                files.add(e.file);
+            return files.toList();
+        }
+
+        // DEBUG
+        @Override
+        public String toString() {
+            return "Path(" + super.toString() + ")";
+        }
+    }
+
+    /**
+     * Base class for handling support for the representation of Locations.
+     * Implementations are responsible for handling the interactions between
+     * the command line options for a location, and API access via setLocation.
+     * @see #initHandlers
+     * @see #getHandler
+     */
+    protected abstract class LocationHandler {
+        final Location location;
+        final Set<Option> options;
+
+        /**
+         * Create a handler. The location and options provide a way to map
+         * from a location or an option to the corresponding handler.
+         * @see #initHandlers
+         */
+        protected LocationHandler(Location location, Option... options) {
+            this.location = location;
+            this.options = options.length == 0 ?
+                EnumSet.noneOf(Option.class):
+                EnumSet.copyOf(Arrays.asList(options));
+        }
+
+        // TODO: TEMPORARY, while Options still used for command line options
+        void update(Options optionTable) {
+            for (Option o: options) {
+                String v = optionTable.get(o);
+                if (v != null) {
+                    handleOption(o, v);
+                }
+            }
+        }
+
+        /** @see JavaFileManager#handleOption. */
+        abstract boolean handleOption(Option option, String value);
+        /** @see StandardJavaFileManager#getLocation. */
+        abstract Collection<File> getLocation();
+        /** @see StandardJavaFileManager#setLocation. */
+        abstract void setLocation(Iterable<? extends File> files) throws IOException;
+    }
+
+    /**
+     * General purpose implementation for output locations,
+     * such as -d/CLASS_OUTPUT and -s/SOURCE_OUTPUT.
+     * All options are treated as equivalent (i.e. aliases.)
+     * The value is a single file, possibly null.
+     */
+    private class OutputLocationHandler extends LocationHandler {
+        private File outputDir;
+
+        OutputLocationHandler(Location location, Option... options) {
+            super(location, options);
+        }
+
+        @Override
+        boolean handleOption(Option option, String value) {
+            if (!options.contains(option))
+                return false;
+
+            // TODO: could/should validate outputDir exists and is a directory
+            // need to decide how best to report issue for benefit of
+            // direct API call on JavaFileManager.handleOption(specifies IAE)
+            // vs. command line decoding.
+            outputDir = new File(value);
+            return true;
+        }
+
+        @Override
+        Collection<File> getLocation() {
+            return (outputDir == null) ? null : Collections.singleton(outputDir);
+        }
+
+        @Override
+        void setLocation(Iterable<? extends File> files) throws IOException {
+            if (files == null) {
+                outputDir = null;
+            } else {
+                Iterator<? extends File> pathIter = files.iterator();
+                if (!pathIter.hasNext())
+                    throw new IllegalArgumentException("empty path for directory");
+                File dir = pathIter.next();
+                if (pathIter.hasNext())
+                    throw new IllegalArgumentException("path too long for directory");
+                if (!dir.exists())
+                    throw new FileNotFoundException(dir + ": does not exist");
+                else if (!dir.isDirectory())
+                    throw new IOException(dir + ": not a directory");
+                outputDir = dir;
+            }
+        }
+    }
+
+    /**
+     * General purpose implementation for search path locations,
+     * such as -sourcepath/SOURCE_PATH and -processorPath/ANNOTATION_PROCESS_PATH.
+     * All options are treated as equivalent (i.e. aliases.)
+     * The value is an ordered set of files and/or directories.
+     */
+    private class SimpleLocationHandler extends LocationHandler {
+        protected Collection<File> searchPath;
+
+        SimpleLocationHandler(Location location, Option... options) {
+            super(location, options);
+        }
+
+        @Override
+        boolean handleOption(Option option, String value) {
+            if (!options.contains(option))
+                return false;
+            searchPath = (value == null) ? null : computePath(value).toFiles();
+            return true;
+        }
+
+        protected Path computePath(String value) {
+            return new Path().addFiles(value);
+        }
+
+        @Override
+        Collection<File> getLocation() {
+            return searchPath;
+        }
+
+        @Override
+        void setLocation(Iterable<? extends File> files) {
+            Path p;
+            if (files == null) {
+                p = computePath(null);
+            } else {
+                p = new Path().addFiles(files);
+            }
+            searchPath = p.toFiles();
+        }
+    }
+
+    /**
+     * Subtype of SimpleLocationHandler for -classpath/CLASS_PATH.
+     * If no value is given, a default is provided, based on system properties
+     * and other values.
+     */
+    private class ClassPathLocationHandler extends SimpleLocationHandler {
+        ClassPathLocationHandler() {
+            super(StandardLocation.CLASS_PATH,
+                    Option.CLASSPATH, Option.CP);
+        }
+
+        @Override
+        Collection<File> getLocation() {
+            lazy();
+            return searchPath;
+        }
+
+        @Override
+        protected Path computePath(String value) {
+            String cp = value;
+
+            // CLASSPATH environment variable when run from `javac'.
+            if (cp == null) cp = System.getProperty("env.class.path");
+
+            // If invoked via a java VM (not the javac launcher), use the
+            // platform class path
+            if (cp == null && System.getProperty("application.home") == null)
+                cp = System.getProperty("java.class.path");
+
+            // Default to current working directory.
+            if (cp == null) cp = ".";
+
+            return new Path()
+                .expandJarClassPaths(true)        // Only search user jars for Class-Paths
+                .emptyPathDefault(new File("."))  // Empty path elt ==> current directory
+                .addFiles(cp);
+            }
+
+        private void lazy() {
+            if (searchPath == null)
+                setLocation(null);
+        }
+    }
+
+    /**
+     * Custom subtype of LocationHandler for PLATFORM_CLASS_PATH.
+     * Various options are supported for different components of the
+     * platform class path.
+     * Setting a value with setLocation overrides all existing option values.
+     * Setting any option overrides any value set with setLocation, and reverts
+     * to using default values for options that have not been set.
+     * Setting -bootclasspath or -Xbootclasspath overrides any existing
+     * value for -Xbootclasspath/p: and -Xbootclasspath/a:.
+     */
+    private class BootClassPathLocationHandler extends LocationHandler {
+        private Collection<File> searchPath;
+        final Map<Option, String> optionValues = new EnumMap<Option,String>(Option.class);
+
+        /**
+         * rt.jar as found on the default bootclasspath.
+         * If the user specified a bootclasspath, null is used.
+         */
+        private File defaultBootClassPathRtJar = null;
+
+        /**
+         *  Is bootclasspath the default?
+         */
+        private boolean isDefaultBootClassPath;
+
+        BootClassPathLocationHandler() {
+            super(StandardLocation.PLATFORM_CLASS_PATH,
+                    Option.BOOTCLASSPATH, Option.XBOOTCLASSPATH,
+                    Option.XBOOTCLASSPATH_PREPEND,
+                    Option.XBOOTCLASSPATH_APPEND,
+                    Option.ENDORSEDDIRS, Option.DJAVA_ENDORSED_DIRS,
+                    Option.EXTDIRS, Option.DJAVA_EXT_DIRS);
+        }
+
+        boolean isDefault() {
+            lazy();
+            return isDefaultBootClassPath;
+        }
+
+        boolean isDefaultRtJar(File file) {
+            lazy();
+            return file.equals(defaultBootClassPathRtJar);
+        }
+
+        @Override
+        boolean handleOption(Option option, String value) {
+            if (!options.contains(option))
+                return false;
+
+            option = canonicalize(option);
+            optionValues.put(option, value);
+            if (option == BOOTCLASSPATH) {
+                optionValues.remove(XBOOTCLASSPATH_PREPEND);
+                optionValues.remove(XBOOTCLASSPATH_APPEND);
+            }
+            searchPath = null;  // reset to "uninitialized"
+            return true;
+        }
+        // where
+            // TODO: would be better if option aliasing was handled at a higher
+            // level
+            private Option canonicalize(Option option) {
+                switch (option) {
+                    case XBOOTCLASSPATH:
+                        return Option.BOOTCLASSPATH;
+                    case DJAVA_ENDORSED_DIRS:
+                        return Option.ENDORSEDDIRS;
+                    case DJAVA_EXT_DIRS:
+                        return Option.EXTDIRS;
+                    default:
+                        return option;
+                }
+            }
+
+        @Override
+        Collection<File> getLocation() {
+            lazy();
+            return searchPath;
+        }
+
+        @Override
+        void setLocation(Iterable<? extends File> files) {
+            if (files == null) {
+                searchPath = null;  // reset to "uninitialized"
+            } else {
+                defaultBootClassPathRtJar = null;
+                isDefaultBootClassPath = false;
+                Path p = new Path().addFiles(files, false);
+                searchPath = p.toFiles();
+                optionValues.clear();
+            }
+        }
+
+        Path computePath() {
+            defaultBootClassPathRtJar = null;
+            Path path = new Path();
+
+            String bootclasspathOpt = optionValues.get(BOOTCLASSPATH);
+            String endorseddirsOpt = optionValues.get(ENDORSEDDIRS);
+            String extdirsOpt = optionValues.get(EXTDIRS);
+            String xbootclasspathPrependOpt = optionValues.get(XBOOTCLASSPATH_PREPEND);
+            String xbootclasspathAppendOpt = optionValues.get(XBOOTCLASSPATH_APPEND);
+
+            path.addFiles(xbootclasspathPrependOpt);
+
+            if (endorseddirsOpt != null)
+                path.addDirectories(endorseddirsOpt);
+            else
+                path.addDirectories(System.getProperty("java.endorsed.dirs"), false);
+
+            if (bootclasspathOpt != null) {
+                path.addFiles(bootclasspathOpt);
+            } else {
+                // Standard system classes for this compiler's release.
+                String files = System.getProperty("sun.boot.class.path");
+                path.addFiles(files, false);
+                File rt_jar = new File("rt.jar");
+                for (File file : getPathEntries(files)) {
+                    if (new File(file.getName()).equals(rt_jar))
+                        defaultBootClassPathRtJar = file;
+                }
+            }
+
+            path.addFiles(xbootclasspathAppendOpt);
+
+            // Strictly speaking, standard extensions are not bootstrap
+            // classes, but we treat them identically, so we'll pretend
+            // that they are.
+            if (extdirsOpt != null)
+                path.addDirectories(extdirsOpt);
+            else
+                path.addDirectories(System.getProperty("java.ext.dirs"), false);
+
+            isDefaultBootClassPath =
+                    (xbootclasspathPrependOpt == null) &&
+                    (bootclasspathOpt == null) &&
+                    (xbootclasspathAppendOpt == null);
+
+            return path;
+        }
+
+        private void lazy() {
+            if (searchPath == null)
+                searchPath = computePath().toFiles();
+        }
+    }
+
+    Map<Location, LocationHandler> handlersForLocation;
+    Map<Option, LocationHandler> handlersForOption;
+
+    void initHandlers() {
+        handlersForLocation = new HashMap<Location, LocationHandler>();
+        handlersForOption = new EnumMap<Option, LocationHandler>(Option.class);
+
+        LocationHandler[] handlers = {
+            new BootClassPathLocationHandler(),
+            new ClassPathLocationHandler(),
+            new SimpleLocationHandler(StandardLocation.MODULE_PATH, Option.MODULEPATH),
+            new SimpleLocationHandler(StandardLocation.SOURCE_PATH, Option.SOURCEPATH),
+            new SimpleLocationHandler(StandardLocation.ANNOTATION_PROCESSOR_PATH, Option.PROCESSORPATH),
+            new OutputLocationHandler((StandardLocation.CLASS_OUTPUT), Option.D),
+            new OutputLocationHandler((StandardLocation.SOURCE_OUTPUT), Option.S)
+        };
+
+        for (LocationHandler h: handlers) {
+            handlersForLocation.put(h.location, h);
+            for (Option o: h.options)
+                handlersForOption.put(o, h);
+        }
+    }
+
+    boolean handleOption(Option option, String value) {
+        LocationHandler h = handlersForOption.get(option);
+        return (h == null ? false : h.handleOption(option, value));
+    }
+
+    Collection<File> getLocation(Location location) {
+        if (location instanceof PathLocation)
+            return ((PathLocation) location).files;
+        if (location instanceof CompositeLocation)
+            return ((CompositeLocation) location).getLocation();
+
+        LocationHandler h = getHandler(location);
+        return (h == null ? null : h.getLocation());
+    }
+
+    File getOutputLocation(Location location) {
+        if (!location.isOutputLocation())
+            throw new IllegalArgumentException();
+        LocationHandler h = getHandler(location);
+        return ((OutputLocationHandler) h).outputDir;
+    }
+
+    void setLocation(Location location, Iterable<? extends File> files) throws IOException {
+        //FIXME: should we be able to set values for PathLocation and ExtendedLocation
+        LocationHandler h = getHandler(location);
+        if (h == null) {
+            if (location.isOutputLocation())
+                h = new OutputLocationHandler(location);
+            else
+                h = new SimpleLocationHandler(location);
+            handlersForLocation.put(location, h);
+        }
+        h.setLocation(files);
+    }
+
+    protected LocationHandler getHandler(Location location) {
+        location.getClass(); // null check
+        lazy();
+        return handlersForLocation.get(location);
+    }
+
+// TOGO
+    protected void lazy() {
+        if (!inited) {
+            warn = lint.isEnabled(Lint.LintCategory.PATH);
+
+            for (LocationHandler h: handlersForLocation.values()) {
+                h.update(options);
+            }
+
+            inited = true;
+        }
+    }
+
+    /**
+     * Get any classes that should appear before the main platform classes.
+     * For compatibility, this is the classes defined by -Xbootclasspath/p:
+     * and the contents of the endorsed directories.
+     * See computeBootClassPath() for the full definition of the legacy
+     * platform class path.
+     */
+    Path getPlatformPathPrepend() {
+        //return getPathForOption(XBOOTCLASSPATH_PREPEND, EnumSet.of(JavaFileObject.Kind.CLASS));
+        Path path = new Path();
+
+        path.addFiles(options.get(XBOOTCLASSPATH_PREPEND));
+
+        String optionValue;
+        if ((optionValue = options.get(ENDORSEDDIRS)) != null)
+            path.addDirectories(optionValue);
+        else
+            path.addDirectories(System.getProperty("java.endorsed.dirs"), false);
+
+        return (path.size() == 0 ? null : path);
+    }
+
+    /**
+     * Get the main platform classes.
+     * For now, this is just the classes defined by -bootclasspath or -Xbootclasspath.
+     * See computeBootClassPath() for the full definition of the legacy
+     * platform class path.
+     */
+    Path getPlatformPathBase() {
+        Path path = new Path();
+        path.addFiles(options.get(BOOTCLASSPATH));
+        return (path.size() == 0 ? null : path);
+    }
+
+    /**
+     * Get any classes that should appear after the main platform classes.
+     * For compatibility, this is the classes defined by -Xbootclasspath/a:
+     * and the contents of the extension directories.
+     * See computeBootClassPath() for the full definition of the legacy
+     * platform class path.
+     */
+    Path getPlatformPathAppend() {
+        //return getPathForOption(XBOOTCLASSPATH_APPEND, EnumSet.of(JavaFileObject.Kind.CLASS));
+        Path path = new Path();
+
+        path.addFiles(options.get(XBOOTCLASSPATH_APPEND));
+
+        // Strictly speaking, standard extensions are not bootstrap
+        // classes, but we treat them identically, so we'll pretend
+        // that they are.
+        String optionValue;
+        if ((optionValue = options.get(EXTDIRS)) != null)
+            path.addDirectories(optionValue);
+        else
+            path.addDirectories(System.getProperty("java.ext.dirs"), false);
+
+        return (path.size() == 0 ? null : path);
+    }
+
+    /** Is this the name of an archive file? */
+    private boolean isArchive(File file) {
+        String n = file.getName().toLowerCase();
+        return fsInfo.isFile(file)
+            && (n.endsWith(".jar") || n.endsWith(".zip"));
+    }
+
+    /**
+     * Utility method for converting a search path string to an array
+     * of directory and JAR file URLs.
+     *
+     * Note that this method is called by apt and the DocletInvoker.
+     *
+     * @param path the search path string
+     * @return the resulting array of directory and JAR file URLs
+     */
+    public static URL[] pathToURLs(String path) {
+        StringTokenizer st = new StringTokenizer(path, File.pathSeparator);
+        URL[] urls = new URL[st.countTokens()];
+        int count = 0;
+        while (st.hasMoreTokens()) {
+            URL url = fileToURL(new File(st.nextToken()));
+            if (url != null) {
+                urls[count++] = url;
+            }
+        }
+        if (urls.length != count) {
+            URL[] tmp = new URL[count];
+            System.arraycopy(urls, 0, tmp, 0, count);
+            urls = tmp;
+        }
+        return urls;
+    }
+
+    /**
+     * Returns the directory or JAR file URL corresponding to the specified
+     * local file name.
+     *
+     * @param file the File object
+     * @return the resulting directory or JAR file URL, or null if unknown
+     */
+    private static URL fileToURL(File file) {
+        String name;
+        try {
+            name = file.getCanonicalPath();
+        } catch (IOException e) {
+            name = file.getAbsolutePath();
+        }
+        name = name.replace(File.separatorChar, '/');
+        if (!name.startsWith("/")) {
+            name = "/" + name;
+        }
+        // If the file does not exist, then assume that it's a directory
+        if (!file.isFile()) {
+            name = name + "/";
+        }
+        try {
+            return new URL("file", "", name);
+        } catch (MalformedURLException e) {
+            throw new IllegalArgumentException(file.toString());
+        }
+    }
+}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jigsaw/JavacCatalog.java b/langtools/src/share/classes/com/sun/tools/javac/jigsaw/JavacCatalog.java
index 0a049b1..347f55e 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jigsaw/JavacCatalog.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jigsaw/JavacCatalog.java
@@ -27,16 +27,20 @@ package com.sun.tools.javac.jigsaw;
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.annotation.Annotation;
 import java.lang.module.Dependence;
 import java.lang.module.ModuleId;
+import java.lang.module.ModuleIdQuery;
 import java.lang.module.ModuleInfo;
+import java.lang.module.ModuleView;
+import java.lang.module.ServiceDependence;
+import java.lang.module.ViewDependence;
 import java.lang.module.Version;
 import java.lang.module.VersionQuery;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
@@ -48,11 +52,18 @@ import org.openjdk.jigsaw.JigsawModuleSystem;
 import org.openjdk.jigsaw.Library;
 import org.openjdk.jigsaw.SimpleLibrary;
 
+import com.sun.tools.javac.code.Directive.PermitsDirective;
+import com.sun.tools.javac.code.Directive.ProvidesModuleDirective;
+import com.sun.tools.javac.code.Directive.ProvidesServiceDirective;
+import com.sun.tools.javac.code.Directive.RequiresFlag;
+import com.sun.tools.javac.code.Directive.RequiresModuleDirective;
+import com.sun.tools.javac.code.Directive.ViewDeclaration;
 import com.sun.tools.javac.code.Symbol;
+import com.sun.tools.javac.code.Symbol.ClassSymbol;
 import com.sun.tools.javac.code.Symbol.ModuleSymbol;
 import com.sun.tools.javac.jvm.ClassFile;
 import com.sun.tools.javac.util.Name;
-import java.lang.module.ModuleIdQuery;
+
 
 /*
  * Implementation of a Jigsaw catalog providing access to the modules
@@ -97,8 +108,14 @@ public class JavacCatalog  extends Catalog {
             ModuleSymbol msym = (ModuleSymbol) me;
             DEBUG("JavacCatalog.init: msym:" + msym + " msym.fullname:" + msym.fullname + " msym.version:" + msym.version);
             addModule(msym.fullname, msym.version, msym);
-            for (ClassFile.ModuleId mid: msym.provides) {
-                addModule(mid.name, mid.version, msym);
+            for (ViewDeclaration v: msym.getViews()) {
+                if (v.name != null) {
+                    addModule(v.name, msym.version, msym);
+                }
+                for (ProvidesModuleDirective d: v.getAliases()) {
+                    com.sun.tools.javac.code.ModuleId mid = d.moduleId;
+                    addModule(mid.name, mid.version, msym);
+                }
             }
         }
         DEBUG("JavacCatalog.init: map:" + moduleMap);
@@ -116,23 +133,37 @@ public class JavacCatalog  extends Catalog {
     @Override
     protected void gatherLocalModuleIds(String moduleName, Set<ModuleId> mids) throws IOException {
         DEBUG("JavacCatalog.gatherLocalModuleIds: " + moduleName);
-        Collection<Map<Version,ModuleSymbol>> maps;
         if (moduleName != null) {
             Map<Version,ModuleSymbol> syms = moduleMap.get(moduleName);
             if (syms == null)
                 return;
-            maps = Collections.singleton(syms);
+            addModuleIds(syms, moduleName, mids);
         } else {
-            maps = moduleMap.values();
-        }
-
-        for (Map<Version,ModuleSymbol> map: maps) {
-            for (ModuleSymbol sym: map.values())
-                mids.add(getModuleId(sym));
+            for (String mn : moduleMap.keySet()) {
+                addModuleIds(moduleMap.get(mn), moduleName, mids);
+            }
         }
-
         DEBUG("JavacCatalog.gatherLocalModuleIds: moduleName:" + moduleName + "--" + mids);
     }
+    
+    // add all ModuleIds of the given name
+    private void addModuleIds(Map<Version,ModuleSymbol> map,
+                              String mn, Set<ModuleId> mids) {
+        for (ModuleSymbol sym : map.values()) {
+            ModuleId mid = getModuleId(sym);
+            if (mn == null || mid.name().equals(mn)) {
+                mids.add(mid);
+            }
+            for (ViewDeclaration v : sym.getViews()) {
+                if (v.name == null)
+                    continue;
+                
+                if (mn == null || mn.equals(v.name.toString())) {
+                    mids.add(getModuleId(v.name, sym.version));
+                }
+            }
+        }
+    }
 
     @Override
     protected ModuleInfo readLocalModuleInfo(ModuleId mid) throws IOException {
@@ -174,7 +205,7 @@ public class JavacCatalog  extends Catalog {
         return getModuleId(sym.fullname, sym.version); // FIXME -- throws IllegalArgumentException
     }
 
-    ModuleId getModuleId(ClassFile.ModuleId mid) {
+    ModuleId getModuleId(com.sun.tools.javac.code.ModuleId mid) {
         return getModuleId(mid.name, mid.version); // FIXME -- throws IllegalArgumentException
     }
 
@@ -183,105 +214,207 @@ public class JavacCatalog  extends Catalog {
         return jigsaw.parseModuleId(mid); // FIXME -- throws IllegalArgumentException
     }
 
-    ModuleIdQuery getModuleIdQuery(ClassFile.ModuleId midq) {
-        return getModuleIdQuery(midq.name, midq.version); // FIXME -- throws IllegalArgumentException
+    ModuleIdQuery getModuleIdQuery(com.sun.tools.javac.code.ModuleIdQuery midq) {
+        return getModuleIdQuery(midq.name, midq.versionQuery); // FIXME -- throws IllegalArgumentException
+    }
+    
+    ModuleIdQuery getModuleIdQuery(ModuleElement.ModuleIdQuery midq) {
+        return getModuleIdQuery(midq.getName(), midq.getVersionQuery());
     }
 
     ModuleIdQuery getModuleIdQuery(Name n, Name vq) {
         String midq = (vq == null) ? n.toString() : (n + "@" + vq);
         return jigsaw.parseModuleIdQuery(midq); // FIXME -- throws IllegalArgumentException
     }
+    
+    ModuleIdQuery getModuleIdQuery(CharSequence n, CharSequence vq) {
+        String q = (vq == null || vq.length() == 0) ? String.valueOf(n) : (n + "@" + vq);
+        return jigsaw.parseModuleIdQuery(q);
+    }
 
-    Dependence.Modifier getModifier(Name n) {
-        String s = n.toString();  // FIXME: use names, but that requires Context
-        if (s.equals("local"))
-            return Dependence.Modifier.LOCAL;
-        if (s.equals("optional"))
-            return Dependence.Modifier.OPTIONAL;
-        if (s.equals("public"))
-            return Dependence.Modifier.PUBLIC;
-        if (s.equals("synthetic"))
-            return Dependence.Modifier.SYNTHETIC;
-        throw new IllegalArgumentException(s);  // FIXME -- throws IllegalArgumentException
+    Dependence.Modifier getModifier(RequiresFlag f) {
+        switch (f) {
+            case LOCAL:
+                return Dependence.Modifier.LOCAL;
+            case OPTIONAL:
+                return Dependence.Modifier.OPTIONAL;
+            case PUBLIC:
+                return Dependence.Modifier.PUBLIC;
+			default:
+                throw new IllegalArgumentException(f.toString());  // FIXME -- throws IllegalArgumentException
+        }
     }
 
     class JavacModuleInfo implements ModuleInfo {
         ModuleSymbol msym;
 
         ModuleId id;
-        Set<String> permits;
-        Set<ModuleId> provides;
-        Set<Dependence> requires;
-        String mainClass;
+        Set<ViewDependence> requiresModules;
+        Map<ModuleId, ModuleView> views;
 
         JavacModuleInfo(ModuleSymbol msym) {
             msym.getClass(); // null check
             DEBUG("JavacModuleInfo: msym: " + msym);
 
             this.msym = msym;
+            this.views = new HashMap<ModuleId, ModuleView>();
+
+            this.id = getModuleId(msym); // FIXME -- throws IllegalArgumentException
+
+            for (ViewDeclaration v : msym.getViews()) {
+                String mainClass = null;
 
-            id = getModuleId(msym); // FIXME -- throws IllegalArgumentException
+                if (v.hasEntrypoint()) {
+                    mainClass = new String(ClassFile.externalize(v.getEntrypoint().flatname));
+                }
 
-            mainClass = (msym.className == null) ? null : msym.className.toString();
+                Set<String> permits = new LinkedHashSet<String>();
+                for (PermitsDirective d : v.getPermits()) {
+                    permits.add(d.moduleId.name.toString()); // FIXME: validate name?
+                }
 
-            permits = new LinkedHashSet<String>();
-            for (Name p: msym.permits)
-                permits.add(p.toString()); // FIXME: validate name?
-            permits = Collections.unmodifiableSet(permits);
+                Set<String> exports = new LinkedHashSet<String>();
 
-            provides = new LinkedHashSet<ModuleId>();
-            for (ClassFile.ModuleId p: msym.provides)
-                provides.add(getModuleId(p));
-            provides = Collections.unmodifiableSet(provides);
+                Set<ModuleId> provides = new LinkedHashSet<ModuleId>();
+                for (ProvidesModuleDirective d : v.getAliases()) {
+                    provides.add(getModuleId(d.moduleId));
+                }
+                
+                Map<String,Set<String>> services = new LinkedHashMap<String,Set<String>>();
+                for (ProvidesServiceDirective s : v.getServices()) {
+                    String sn = new String(ClassFile.externalize(s.service.flatname));
+                    String pn = new String(ClassFile.externalize(s.impl.flatname));
+                    Set<String> providers = services.get(sn);
+                    if (providers == null) {
+                        providers = new LinkedHashSet<String>();
+                        services.put(sn, providers);
+                    }
+                    providers.add(pn);
+                }
+                
+                ModuleId vid = (v.name == null)
+                                   ? id
+                                   : getModuleId(v.name, msym.version);
+                ModuleView view = new JavacModuleView(this,
+                                                      vid,
+                                                      mainClass,
+                                                      provides,
+                                                      exports,
+                                                      permits,
+                                                      services);
+                views.put(vid, view);
+            }
+            
+            if (!views.containsKey(id)) {
+                // create the default view if not exists
+                views.put(id, new JavacModuleView(this,
+                                                  id,
+                                                  null,
+                                                  Collections.<ModuleId>emptySet(),
+                                                  Collections.<String>emptySet(),
+                                                  Collections.<String>emptySet(),
+                                                  Collections.<String,Set<String>>emptyMap()));
+            }
 
-            requires = new LinkedHashSet<Dependence>();
-            for (Symbol.ModuleRequires r: msym.requires.values()) {
+            requiresModules = new LinkedHashSet<ViewDependence>();
+            for (RequiresModuleDirective r: msym.getRequiredModules()) {
                 DEBUG("JavacModuleInfo: require " + r);
-                ModuleIdQuery q = getModuleIdQuery(r.moduleId);
+                ModuleIdQuery q = getModuleIdQuery(r.moduleQuery);
                 EnumSet<Dependence.Modifier> mods = EnumSet.noneOf(Dependence.Modifier.class);
-                for (Name n: r.flags) {
-                    mods.add(getModifier(n));  // FIXME -- throws IllegalArgumentException
+                for (com.sun.tools.javac.code.Directive.RequiresFlag f: r.flags) {
+                    mods.add(getModifier(f));  // FIXME -- throws IllegalArgumentException
                 }
-                requires.add(new Dependence(mods, q));
+                requiresModules.add(new ViewDependence(mods, q));
             }
-            DEBUG("JavacModuleInfo: msym: " + msym + "[id:" + id + " permits:" + permits + " provides:" + provides + " requires:" + requires + " mainClass:" + mainClass + "]");
+            DEBUG("JavacModuleInfo: msym: " + msym + "[id:" + id + " views:" + views + " requires:" + requiresModules + "]");
         }
 
         @Override
         public ModuleId id() {
             return id;
         }
-
+         
         @Override
-        public String mainClass() {
-            return mainClass;
+        public Set<ViewDependence> requiresModules() {
+            return requiresModules;
+        }
+        
+        public Set<ServiceDependence> requiresServices() {
+            return Collections.emptySet();
         }
 
-        @Override
-        public Set<String> permits() {
-            return permits;
+        public ModuleView defaultView() {
+            return views.get(id);
         }
 
-        @Override
-        public Set<ModuleId> provides() {
-            return provides;
+        public Set<ModuleView> views() {
+            return Collections.unmodifiableSet(new HashSet<ModuleView>(views.values()));
+        }
+    }
+    
+    class JavacModuleView
+        implements ModuleView
+    {
+        private final ModuleInfo mi;
+        private final ModuleId id;
+        private final Set<String> exports;
+        private final Set<ModuleId> aliases;
+        private final Map<String,Set<String>> services;
+        private final Set<String> permits;
+        private final String mainClass;
+
+        JavacModuleView(ModuleInfo mi,
+                        ModuleId id,
+                        String mainClass,
+                        Set<ModuleId> aliases,
+                        Set<String> exports,
+                        Set<String> permits,
+                        Map<String,Set<String>> serviceProviders) {
+            this.mi = mi;
+            this.id = id;
+            this.mainClass = mainClass;
+            this.aliases = aliases;
+            this.exports = exports;
+            this.permits = permits;
+            this.services = serviceProviders;
         }
 
-        @Override
-        public Set<Dependence> requires() {
-            return requires;
+        public ModuleInfo moduleInfo() {
+            return mi;
         }
 
-	// no access to annotations for now
-        @Override
-        public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
-            throw new UnsupportedOperationException();
+        public ModuleId id() {
+            return id;
+        }
+
+        public Set<ModuleId> aliases() {
+            return Collections.unmodifiableSet(aliases);
+        }
+
+        public Set<String> exports() {
+            return Collections.unmodifiableSet(exports);
+        }
+        
+        public Set<String> permits() {
+            return Collections.unmodifiableSet(permits);
+        }
+
+        public Map<String,Set<String>> services() {
+            return Collections.unmodifiableMap(services);
+        }
+
+        public String mainClass() {
+            return mainClass;
         }
 
-	// no access to annotations for now
         @Override
-        public <A extends Annotation> A getAnnotation(Class<A> annotationType) {
-            throw new UnsupportedOperationException();
+        public String toString() {
+            return "View { id: " + id
+                    + ", provides: " + aliases
+                    + ", provides service: " + services
+                    + ", permits: " + permits
+                    + ", mainClass: " + mainClass
+                    + " }";
         }
     }
 }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jigsaw/JigsawModuleResolver.java b/langtools/src/share/classes/com/sun/tools/javac/jigsaw/JigsawModuleResolver.java
index e05ba9c..3462b76 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jigsaw/JigsawModuleResolver.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jigsaw/JigsawModuleResolver.java
@@ -48,9 +48,10 @@ import org.openjdk.jigsaw.JigsawModuleSystem;
 import org.openjdk.jigsaw.PathContext;
 import org.openjdk.jigsaw.Platform;
 
+import com.sun.tools.javac.code.Directive.RequiresModuleDirective;
 import com.sun.tools.javac.code.Symbol.ModuleSymbol;
 import com.sun.tools.javac.code.Symtab;
-import com.sun.tools.javac.main.OptionName;
+import com.sun.tools.javac.main.Option;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.Debug;
 import com.sun.tools.javac.util.List;
@@ -79,13 +80,13 @@ public class JigsawModuleResolver implements ModuleResolver {
         syms = Symtab.instance(context);
 
         Options options = Options.instance(context);
-        String l = options.get(OptionName.L);
+        String l = options.get(Option.L);
         File library = (l == null ? null : new File(l));
 
         catalog = new JavacCatalog(library);
 
         log = Log.instance(context);
-        debug = new Debug("jigsaw", options, log.noticeWriter);
+        debug = new Debug("jigsaw", options, log);
     }
 
     public Iterable<? extends ModuleElement> resolve(
@@ -97,15 +98,17 @@ public class JigsawModuleResolver implements ModuleResolver {
         catalog.init(modules);
         Collection<ModuleIdQuery> jigsawRootQueries = new LinkedHashSet<ModuleIdQuery>();
         for (ModuleElement r: roots) {
+            // TEMP, until we model directives in ModuleElement
+            ModuleSymbol msym = (ModuleSymbol) r;
             // should use catalog here
             CharSequence rn = r.getModuleId().getName();
             if (rn.length() == 0) {
                 // unnamed module
 ////////////                // assert r.getRequires() == default platform module
 ////////////                q = getDefaultPlatformModule();
-                for (ModuleElement.ModuleRequires mr: r.getRequires()) {
+                for (RequiresModuleDirective d: msym.getRequiredModules()) {
                     // assert mr.getFlags().isEmpty()
-                    jigsawRootQueries.add(getModuleIdQuery(mr.getModuleIdQuery())); // FIXME: handle IllegalArgumentException
+                    jigsawRootQueries.add(getModuleIdQuery(d.moduleQuery)); // FIXME: handle IllegalArgumentException
                 }
             } else {
                 jigsawRootQueries.add(getModuleIdQuery(r.getModuleId())); // FIXME: handle IllegalArgumentException
@@ -161,7 +164,7 @@ public class JigsawModuleResolver implements ModuleResolver {
                     sym = new ModuleSymbol(name, syms.rootModule);
                     sym.version = names.fromString(mid.version().toString());
                     sym.location = new JigsawLibraryLocation(catalog.library, mid);
-                    sym.requires = Collections.emptyMap();
+                    sym.directives = ListBuffer.lb();
                 }
                 results.add(sym);
             }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTable.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTable.java
index a2c1edc..e39c934 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTable.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTable.java
@@ -31,6 +31,7 @@ import com.sun.tools.javac.tree.*;
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.tree.JCTree.*;
+import com.sun.tools.javac.parser.EndPosTable;
 
 /** This class contains the CharacterRangeTable for some method
  *  and the hashtable for mapping trees or lists of trees to their
@@ -54,9 +55,9 @@ implements CRTFlags {
      */
     private Map<Object,SourceRange> positions = new HashMap<Object,SourceRange>();
 
-    /** The hashtable for ending positions stored in the parser.
+    /** The object for ending positions stored in the parser.
      */
-    private Map<JCTree, Integer> endPositions;
+    private EndPosTable endPosTable;
 
     /** The tree of the method this table is intended for.
      *  We should traverse this tree to get source ranges.
@@ -65,9 +66,9 @@ implements CRTFlags {
 
     /** Constructor
      */
-    public CRTable(JCTree.JCMethodDecl tree, Map<JCTree, Integer> endPositions) {
+    public CRTable(JCTree.JCMethodDecl tree, EndPosTable endPosTable) {
         this.methodTree = tree;
-        this.endPositions = endPositions;
+        this.endPosTable = endPosTable;
     }
 
     /** Create a new CRTEntry and add it to the entries.
@@ -532,12 +533,9 @@ implements CRTFlags {
          */
         public int endPos(JCTree tree) {
             if (tree == null) return Position.NOPOS;
-            if (tree.getTag() == JCTree.BLOCK)
+            if (tree.hasTag(JCTree.Tag.BLOCK))
                 return ((JCBlock) tree).endpos;
-            Integer endpos = endPositions.get(tree);
-            if (endpos != null)
-                return endpos.intValue();
-            return Position.NOPOS;
+            return endPosTable.getEndPos(tree);
         }
     }
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java
index 0e80987..46b9c59 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java
@@ -25,11 +25,6 @@
 
 package com.sun.tools.javac.jvm;
 
-import java.util.Locale;
-import javax.lang.model.element.ModuleElement;
-
-import com.sun.tools.javac.api.Formattable;
-import com.sun.tools.javac.api.Messages;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.util.Name;
 
@@ -88,7 +83,7 @@ public class ClassFile {
     public final static int CONSTANT_MethodHandle = 15;
     public final static int CONSTANT_MethodType = 16;
     public final static int CONSTANT_InvokeDynamic = 18;
-    public final static int CONSTANT_ModuleId = 13;
+    public final static int CONSTANT_ModuleId = 19;
 
     public final static int MAX_PARAMETERS = 0xff;
     public final static int MAX_DIMENSIONS = 0xff;
@@ -100,7 +95,8 @@ public class ClassFile {
         V45_3(45, 3), // base level for all attributes
         V49(49, 0),   // JDK 1.5: enum, generics, annotations
         V50(50, 0),   // JDK 1.6: stackmaps
-        V51(51, 0);   // JDK 1.7
+        V51(51, 0),   // JDK 1.7: invokedynamic
+        V52(51, 0);   // JDK 1.8: Lambda, Jigsaw    !!!! FIXME -- the 51 is deliberate but temporary and should be corrected eventually
         Version(int major, int minor) {
             this.major = major;
             this.minor = minor;
@@ -168,6 +164,7 @@ public class ClassFile {
             this.type = type;
         }
 
+        @Override
         public boolean equals(Object other) {
             return
                 other instanceof NameAndType &&
@@ -175,62 +172,9 @@ public class ClassFile {
                 type.equals(((NameAndType) other).type);
         }
 
-        public int hashCode() {
-            return name.hashCode() * type.hashCode();
-        }
-    }
-
-    // move to top level in code or jvm?
-    public static class ModuleId
-            implements ModuleElement.ModuleId, ModuleElement.ModuleIdQuery, Formattable {
-        public final Name name;
-        public final Name version;
-
-        public ModuleId(Name name, Name version) {
-            this.name = name;
-            this.version = version;
-        }
-
-        public CharSequence getName() {
-            return name;
-        }
-
-        public CharSequence getVersion() {
-            return version;
-        }
-
-        public CharSequence getVersionQuery() {
-            return version;
-        }
-
-        @Override
-        public boolean equals(Object other) {
-            return
-                other instanceof ModuleId &&
-                name == ((ModuleId) other).name &&
-                version.equals(((ModuleId) other).version);
-        }
-
         @Override
         public int hashCode() {
-            if (version == null)
-                return name.hashCode();
-            else
-                return name.hashCode() * version.hashCode();
-        }
-
-        @Override // for debugging
-        public String toString() {
-            return "ModuleId[" + name + (version == null ? "" : "@" + version) + "]";
-        }
-
-        @Override // for use in diagnostics
-        public String toString(Locale locale, Messages messages) {
-            return (version == null ? name.toString() : name + "@" + version);
-        }
-
-        public String getKind() {
-            return "ModuleId";
+            return name.hashCode() * type.hashCode();
         }
     }
 }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
index 8851dfb..35ba319 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -25,6 +25,15 @@
 
 package com.sun.tools.javac.jvm;
 
+import com.sun.tools.javac.code.Directive.PermitsDirective;
+import com.sun.tools.javac.code.Directive.EntrypointDirective;
+import com.sun.tools.javac.code.Directive.ViewDeclaration;
+import com.sun.tools.javac.code.Directive.ExportFlag;
+import com.sun.tools.javac.code.Directive.ExportsDirective;
+import com.sun.tools.javac.code.Directive.ProvidesServiceDirective;
+import com.sun.tools.javac.code.Directive.ProvidesModuleDirective;
+import com.sun.tools.javac.code.Directive.RequiresServiceDirective;
+import com.sun.tools.javac.code.Directive.RequiresFlag;
 import java.io.*;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -33,7 +42,6 @@ import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 import javax.lang.model.SourceVersion;
@@ -46,6 +54,7 @@ import static javax.tools.StandardLocation.*;
 
 import com.sun.tools.javac.comp.Annotate;
 import com.sun.tools.javac.code.*;
+import com.sun.tools.javac.code.Directive.RequiresModuleDirective;
 import com.sun.tools.javac.code.Lint.LintCategory;
 import com.sun.tools.javac.code.Type.*;
 import com.sun.tools.javac.code.Symbol.*;
@@ -60,7 +69,7 @@ import static com.sun.tools.javac.code.TypeTags.*;
 import static com.sun.tools.javac.jvm.ClassFile.*;
 import static com.sun.tools.javac.jvm.ClassFile.Version.*;
 
-import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.main.Option.*;
 
 /** This class provides operations to read a classfile into an internal
  *  representation. The internal representation is anchored in a
@@ -586,6 +595,35 @@ public class ClassReader implements Completer {
         return (ModuleId) (readPool(i));
     }
 
+    /** Read module id query.
+     */
+    ModuleIdQuery readModuleIdQuery(int i) {
+        ModuleId id = (ModuleId) (readPool(i));
+        return id.toQuery();
+    }
+
+    /** Read exports_flags.
+     */
+    Set<ExportFlag> readExportFlags(int flags) {
+        Set<ExportFlag> set = EnumSet.noneOf(ExportFlag.class);
+        for (ExportFlag f: ExportFlag.values()) {
+            if ((flags & f.value) != 0)
+                set.add(f);
+        }
+        return set;
+    }
+
+    /** Read requires_flags.
+     */
+    Set<RequiresFlag> readRequiresFlags(int flags) {
+        Set<RequiresFlag> set = EnumSet.noneOf(RequiresFlag.class);
+        for (RequiresFlag f: RequiresFlag.values()) {
+            if ((flags & f.value) != 0)
+                set.add(f);
+        }
+        return set;
+    }
+
     Name readInternalName(int i) {
         int index = poolIdx[i];
         return names.fromUtf(internalize(buf, index + 3, getChar(index + 1)));
@@ -1168,9 +1206,9 @@ public class ClassReader implements Completer {
                 }
             },
 
-            //  v51 module attributes
+            //  v52 module attributes
 
-            new AttributeReader(names.Module, V51, CLASS_OR_MEMBER_ATTRIBUTE) {
+            new AttributeReader(names.Module, V52, CLASS_ATTRIBUTE) {
                 @Override
                 boolean accepts(AttributeKind kind) {
                     return super.accepts(kind) && allowModules;
@@ -1185,7 +1223,7 @@ public class ClassReader implements Completer {
                 }
             },
 
-            new AttributeReader(names.ModuleExport, V51, CLASS_OR_MEMBER_ATTRIBUTE) {
+            new AttributeReader(names.ModuleProvides, V52, CLASS_ATTRIBUTE) {
                 @Override
                 boolean accepts(AttributeKind kind) {
                     return super.accepts(kind) && allowModules;
@@ -1193,47 +1231,66 @@ public class ClassReader implements Completer {
                 void read(Symbol sym, int attrLen) {
                     if (sym.kind == TYP && sym.owner.kind == MDL) {
                         ModuleSymbol msym = (ModuleSymbol) sym.owner;
-                        int num = nextChar();
-                        for (int i = 0; i < num; i++) {
-                            ClassSymbol esym = readClassSymbol(nextChar());
-                            int flags = nextByte(); // ignored, for now
-                            msym.exports.append(new Symbol.ModuleExport(esym, List.<Name>nil()));
-                        }
-                    }
-                }
-            },
+                        int numViews = nextChar();
+                        for (int v = 0; v < numViews; v++) {
+                            Name viewName = readName(nextChar());
+                            ListBuffer<Directive> directives;
+                            if (viewName == null) {
+                                directives = msym.directives;
+                            } else {
+                                ViewDeclaration vdecl = new ViewDeclaration(viewName);
+                                directives = vdecl.directives;
+                            }
 
-            new AttributeReader(names.ModulePermits, V51, CLASS_OR_MEMBER_ATTRIBUTE) {
-                @Override
-                boolean accepts(AttributeKind kind) {
-                    return super.accepts(kind) && allowModules;
-                }
-                void read(Symbol sym, int attrLen) {
-                    if (sym.kind == TYP && sym.owner.kind == MDL) {
-                        ModuleSymbol msym = (ModuleSymbol) sym.owner;
-                        int num = nextChar();
-                        for (int i = 0; i < num; i++)
-                            msym.permits.append(readName(nextChar()));
-                    }
-                }
-            },
+                            ClassSymbol entrypoint = readClassSymbol(nextChar());
+                            if (entrypoint != null) {
+                                EntrypointDirective d = new EntrypointDirective(entrypoint);
+                                directives.add(d);
+                            }
 
-            new AttributeReader(names.ModuleProvides, V51, CLASS_OR_MEMBER_ATTRIBUTE) {
-                @Override
-                boolean accepts(AttributeKind kind) {
-                    return super.accepts(kind) && allowModules;
-                }
-                void read(Symbol sym, int attrLen) {
-                    if (sym.kind == TYP && sym.owner.kind == MDL) {
-                        ModuleSymbol msym = (ModuleSymbol) sym.owner;
-                        int num = nextChar();
-                        for (int i = 0; i < num; i++)
-                            msym.provides.append(readModuleId(nextChar()));
+                            int numAliases = nextChar();
+                            for (int i = 0; i < numAliases; i++) {
+                                ModuleId id = readModuleId(nextChar());
+                                ProvidesModuleDirective d = new ProvidesModuleDirective(id);
+                                directives.add(d);
+                            }
+
+                            int numServices = nextChar();
+                            for (int i = 0; i < numServices; i++) {
+                                ClassSymbol svcSym = readClassSymbol(nextChar());
+                                ClassSymbol implSym = readClassSymbol(nextChar());
+                                ProvidesServiceDirective d = new ProvidesServiceDirective(svcSym, implSym);
+                                directives.add(d);
+                            }
+
+                            int numExports = nextChar();
+                            for (int i = 0; i < numExports; i++) {
+                                Name export = readName(nextChar());
+                                Set<ExportFlag> flags = readExportFlags(nextChar());
+                                ModuleId origin = readModuleId(nextChar());
+                                TypeSymbol tsym;
+                                if (flags.contains(ExportFlag.PACKAGE) || flags.contains(ExportFlag.PACKAGE_AND_SUBPACKAGES))
+                                    tsym = enterPackage(export);
+                                else if (flags.contains(ExportFlag.TYPE) || flags.contains(ExportFlag.TYPE_AND_MEMBERS))
+                                    tsym = enterClass(export);
+                                else
+                                    continue;
+                                ExportsDirective d = new ExportsDirective(tsym, flags, origin);
+                                directives.add(d);
+                            }
+
+                            int numPermits = nextChar();
+                            for (int i = 0; i < numPermits; i++) {
+                                ModuleId id = readModuleId(nextChar());
+                                PermitsDirective d = new PermitsDirective(id);
+                                directives.add(d);
+                            }
+                        }
                     }
                 }
             },
 
-            new AttributeReader(names.ModuleRequires, V51, CLASS_OR_MEMBER_ATTRIBUTE) {
+            new AttributeReader(names.ModuleRequires, V52, CLASS_ATTRIBUTE) {
                 @Override
                 boolean accepts(AttributeKind kind) {
                     return super.accepts(kind) && allowModules;
@@ -1241,15 +1298,19 @@ public class ClassReader implements Completer {
                 void read(Symbol sym, int attrLen) {
                     if (sym.kind == TYP && sym.owner.kind == MDL) {
                         ModuleSymbol msym = (ModuleSymbol) sym.owner;
-                        int numRequires = nextChar();
-                        for (int r = 0; r < numRequires; r++) {
-                            ModuleId id = readModuleId(nextChar());
-                            ListBuffer<Name> flags = new ListBuffer<Name>();
-                            int numFlags = nextChar();
-                            for (int f = 0; f < numFlags; f++) {
-                                flags.append(readName(nextChar()));
-                            }
-                            msym.requires.put(id, new ModuleRequires(id, flags.toList()));
+                        int numModules = nextChar();
+                        for (int r = 0; r < numModules; r++) {
+                            ModuleIdQuery q = readModuleIdQuery(nextChar());
+                            Set<RequiresFlag> flags = readRequiresFlags(nextChar());
+                            RequiresModuleDirective d = new RequiresModuleDirective(q, flags);
+                            msym.directives.add(d);
+                        }
+                        int numServices = nextChar();
+                        for (int r = 0; r < numServices; r++) {
+                            ClassSymbol csym = readClassSymbol(nextChar());
+                            Set<RequiresFlag> flags = readRequiresFlags(nextChar());
+                            RequiresServiceDirective d = new RequiresServiceDirective(csym, flags);
+                            msym.directives.add(d);
                         }
                     }
                 }
@@ -2278,9 +2339,7 @@ public class ClassReader implements Completer {
         } else if (sym.kind == MDL) {
             //System.err.println("ClassReader.complete module " + sym + " " + sym.name);
             ModuleSymbol msym = (ModuleSymbol) sym;
-            msym.permits = new ListBuffer<Name>();
-            msym.provides = new ListBuffer<ModuleId>();
-            msym.requires = new LinkedHashMap<ModuleId,ModuleRequires>();
+            msym.directives = new ListBuffer<Directive>();
             msym.module_info.members_field = new Scope(sym); // or Scope.empty?
             fillIn(msym.module_info);
             assert msym.name != null;
@@ -2691,7 +2750,7 @@ public class ClassReader implements Completer {
      *  @param arg An argument for substitution into the output string.
      */
     private void printCCF(String key, Object arg) {
-        log.printNoteLines(key, arg);
+        log.printLines(key, arg);
     }
 
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
index 6f103fa..a227684 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
@@ -35,12 +35,12 @@ import javax.tools.JavaFileObject;
 
 import com.sun.tools.javac.code.*;
 import com.sun.tools.javac.code.Attribute.RetentionPolicy;
+import com.sun.tools.javac.code.Directive.*;
 import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.code.Type.*;
 import com.sun.tools.javac.file.BaseFileObject;
 import com.sun.tools.javac.util.*;
 
-import java.util.Map;
 import javax.tools.JavaFileManager.Location;
 import javax.tools.ModuleFileManager;
 import static com.sun.tools.javac.code.BoundKind.*;
@@ -48,7 +48,7 @@ import static com.sun.tools.javac.code.Flags.*;
 import static com.sun.tools.javac.code.Kinds.*;
 import static com.sun.tools.javac.code.TypeTags.*;
 import static com.sun.tools.javac.jvm.UninitializedType.*;
-import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.main.Option.*;
 import static javax.tools.StandardLocation.CLASS_OUTPUT;
 
 
@@ -64,19 +64,17 @@ public class ClassWriter extends ClassFile {
     protected static final Context.Key<ClassWriter> classWriterKey =
         new Context.Key<ClassWriter>();
 
-    private final Symtab syms;
-
     private final Options options;
 
     /** Switch: verbose output.
      */
     private boolean verbose;
 
-    /** Switch: scrable private names.
+    /** Switch: scramble private names.
      */
     private boolean scramble;
 
-    /** Switch: scrable private names.
+    /** Switch: scramble private names.
      */
     private boolean scrambleAll;
 
@@ -172,7 +170,6 @@ public class ClassWriter extends ClassFile {
 
         log = Log.instance(context);
         names = Names.instance(context);
-        syms = Symtab.instance(context);
         options = Options.instance(context);
         target = Target.instance(context);
         source = Source.instance(context);
@@ -544,6 +541,11 @@ public class ClassWriter extends ClassFile {
                 poolbuf.appendByte(CONSTANT_ModuleId);
                 poolbuf.appendChar(pool.put(mid.name));
                 poolbuf.appendChar(mid.version == null ? 0 : pool.put(mid.version));
+            } else if (value instanceof ModuleIdQuery) {
+                ModuleIdQuery mid = (ModuleIdQuery)value;
+                poolbuf.appendByte(CONSTANT_ModuleId);
+                poolbuf.appendChar(pool.put(mid.name));
+                poolbuf.appendChar(mid.versionQuery == null ? 0 : pool.put(mid.versionQuery));
             } else {
                 Assert.error("writePool " + value);
             }
@@ -878,60 +880,70 @@ public class ClassWriter extends ClassFile {
     int writeModuleMetadata(ModuleSymbol sym) {
         int n = 0;
 
-        if (sym.provides.size() > 0) {
-            int alenIdx = writeAttr(names.ModuleProvides);
-            databuf.appendChar(sym.provides.size());
-            for (List<ModuleId> l = sym.provides.elems; l.nonEmpty(); l = l.tail) {
-                databuf.appendChar(pool.put(l.head));
-            }
-            endAttr(alenIdx);
-            n++;
-        }
-
-        if (sym.requires.size() > 0) {
+        if (sym.hasRequires()) {
             int alenIdx = writeAttr(names.ModuleRequires);
-            databuf.appendChar(sym.requires.size());
-            for (Map.Entry<ModuleId,ModuleRequires> e: sym.requires.entrySet()) {
-                ModuleId m = e.getKey();
-                ModuleRequires mr = e.getValue();
-                databuf.appendChar(pool.put(m));
-                databuf.appendChar(mr.flags.size());
-                for (List<Name> l = mr.flags; l.nonEmpty(); l = l.tail) {
-                    databuf.appendChar(pool.put(l.head));
+                // modules
+                List<RequiresModuleDirective> modules = sym.getRequiredModules();
+                databuf.appendChar(modules.size());
+                for (RequiresModuleDirective m: modules) {
+                    databuf.appendChar(pool.put(m.moduleQuery));
+                    databuf.appendChar(RequiresFlag.value(m.flags));
+                }
+                // services
+                List<RequiresServiceDirective> services = sym.getRequiredServices();
+                databuf.appendChar(services.size());
+                for (RequiresServiceDirective s: services) {
+                    databuf.appendChar(pool.put(s.sym));
+                    databuf.appendChar(RequiresFlag.value(s.flags));
                 }
-            }
-            endAttr(alenIdx);
-            n++;
-        }
-
-        if (sym.permits.size() > 0) {
-            int alenIdx = writeAttr(names.ModulePermits);
-            databuf.appendChar(sym.permits.size());
-            for (Name name: sym.permits) {
-                databuf.appendChar(pool.put(name));
-            }
             endAttr(alenIdx);
             n++;
         }
 
-        if (sym.exports.size() > 0) {
-            int alenIdx = writeAttr(names.ModuleExport);
-            databuf.appendChar(sym.exports.size());
-            for (ModuleExport e: sym.exports) {
-                databuf.appendChar(pool.put(e.sym));
-                databuf.appendByte(0); // no flags for now
+        if (sym.hasViews()) {
+            int alenIdx = writeAttr(names.ModuleProvides);
+            List<ViewDeclaration> views = sym.getViews();
+            databuf.appendChar(views.size());
+            for (ViewDeclaration v: views) {
+                // name
+                databuf.appendChar(v.isDefault() ? 0 : pool.put(v.name));
+                // entrypoint, if any
+                ClassSymbol esym = v.getEntrypoint();
+                databuf.appendChar(esym == null ? 0 : pool.put(esym));
+                // aliases
+                List<ProvidesModuleDirective> aliases = v.getAliases();
+                databuf.appendChar(aliases.size());
+                for (ProvidesModuleDirective a: aliases)
+                    databuf.appendChar(pool.put(a.moduleId));
+                // services
+                List<ProvidesServiceDirective> services = v.getServices();
+                databuf.appendChar(services.size());
+                for (ProvidesServiceDirective s: services) {
+                    databuf.appendChar(pool.put(s.service));
+                    databuf.appendChar(pool.put(s.impl));
+                }
+                // exports
+                List<ExportsDirective> exports = v.getExports();
+                databuf.appendChar(exports.size());
+                for (ExportsDirective e: exports) {
+                    databuf.appendChar(pool.put(e.sym.flatName()));  // CHECK THIS: ensure this is the binary name
+                    databuf.appendChar(ExportFlag.value(e.flags));
+                    databuf.appendChar(e.origin == null ? 0 : pool.put(e.origin));
+                }
+                // permits
+                List<PermitsDirective> permits = v.getPermits();
+                databuf.appendChar(permits.size());
+                for (PermitsDirective p: permits) {
+                    databuf.appendChar(pool.put(p.moduleId));
+                }
             }
             endAttr(alenIdx);
             n++;
         }
 
-        if (sym.className != null) {
-            int alenIdx = writeAttr(names.ModuleClass);
-            databuf.appendChar(pool.put(sym.className));
-            databuf.appendChar(sym.classFlags.size());
-            for (Name name: sym.classFlags) {
-                databuf.appendChar(pool.put(name));
-            }
+        if (sym.hasExtendedMetadata()) {
+            int alenIdx = writeAttr(names.ModuleData);
+            databuf.appendChar(pool.put(sym.extendedMetadata));
             endAttr(alenIdx);
             n++;
         }
@@ -987,8 +999,9 @@ public class ClassWriter extends ClassFile {
             if ((flags & INTERFACE) != 0) flags |= ABSTRACT; // Interfaces are always ABSTRACT
             if (inner.name.isEmpty()) flags &= ~FINAL; // Anonymous class: unset FINAL flag
             if (dumpInnerClassModifiers) {
-                log.errWriter.println("INNERCLASS  " + inner.name);
-                log.errWriter.println("---" + flagNames(flags));
+                PrintWriter pw = log.getWriter(Log.WriterKind.ERROR);
+                pw.println("INNERCLASS  " + inner.name);
+                pw.println("---" + flagNames(flags));
             }
             databuf.appendChar(pool.get(inner));
             databuf.appendChar(
@@ -1006,8 +1019,9 @@ public class ClassWriter extends ClassFile {
         int flags = adjustFlags(v.flags());
         databuf.appendChar(flags);
         if (dumpFieldModifiers) {
-            log.errWriter.println("FIELD  " + fieldName(v));
-            log.errWriter.println("---" + flagNames(v.flags()));
+            PrintWriter pw = log.getWriter(Log.WriterKind.ERROR);
+            pw.println("FIELD  " + fieldName(v));
+            pw.println("---" + flagNames(v.flags()));
         }
         databuf.appendChar(pool.put(fieldName(v)));
         databuf.appendChar(pool.put(typeSig(v.erasure(types))));
@@ -1029,8 +1043,9 @@ public class ClassWriter extends ClassFile {
         int flags = adjustFlags(m.flags());
         databuf.appendChar(flags);
         if (dumpMethodModifiers) {
-            log.errWriter.println("METHOD  " + fieldName(m));
-            log.errWriter.println("---" + flagNames(m.flags()));
+            PrintWriter pw = log.getWriter(Log.WriterKind.ERROR);
+            pw.println("METHOD  " + fieldName(m));
+            pw.println("---" + flagNames(m.flags()));
         }
         databuf.appendChar(pool.put(fieldName(m)));
         databuf.appendChar(pool.put(typeSig(m.externalType(types))));
@@ -1594,9 +1609,10 @@ public class ClassWriter extends ClassFile {
         if ((flags & INTERFACE) == 0) flags |= ACC_SUPER;
         if (c.isInner() && c.name.isEmpty()) flags &= ~FINAL;
         if (dumpClassModifiers) {
-            log.errWriter.println();
-            log.errWriter.println("CLASSFILE  " + c.getQualifiedName());
-            log.errWriter.println("---" + flagNames(flags));
+            PrintWriter pw = log.getWriter(Log.WriterKind.ERROR);
+            pw.println();
+            pw.println("CLASSFILE  " + c.getQualifiedName());
+            pw.println("---" + flagNames(flags));
         }
         databuf.appendChar(flags);
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java
index ec080df..59f0fc1 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java
@@ -1542,7 +1542,28 @@ public class Code {
      */
     public void addCatch(
         char startPc, char endPc, char handlerPc, char catchType) {
-        catchInfo.append(new char[]{startPc, endPc, handlerPc, catchType});
+            catchInfo.append(new char[]{startPc, endPc, handlerPc, catchType});
+        }
+
+
+    public void compressCatchTable() {
+        ListBuffer<char[]> compressedCatchInfo = ListBuffer.lb();
+        List<Integer> handlerPcs = List.nil();
+        for (char[] catchEntry : catchInfo.elems) {
+            handlerPcs = handlerPcs.prepend((int)catchEntry[2]);
+        }
+        for (char[] catchEntry : catchInfo.elems) {
+            int startpc = catchEntry[0];
+            int endpc = catchEntry[1];
+            if (startpc == endpc ||
+                    (startpc == (endpc - 1) &&
+                    handlerPcs.contains(startpc))) {
+                continue;
+            } else {
+                compressedCatchInfo.append(catchEntry);
+            }
+        }
+        catchInfo = compressedCatchInfo;
     }
 
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
index 618700e..07aacc4 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
@@ -26,8 +26,6 @@
 package com.sun.tools.javac.jvm;
 import java.util.*;
 
-import javax.lang.model.element.ElementKind;
-
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 import com.sun.tools.javac.util.List;
@@ -39,6 +37,7 @@ import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.code.Type.*;
 import com.sun.tools.javac.jvm.Code.*;
 import com.sun.tools.javac.jvm.Items.*;
+import com.sun.tools.javac.parser.EndPosTable;
 import com.sun.tools.javac.tree.JCTree.*;
 
 import static com.sun.tools.javac.code.Flags.*;
@@ -46,7 +45,9 @@ import static com.sun.tools.javac.code.Kinds.*;
 import static com.sun.tools.javac.code.TypeTags.*;
 import static com.sun.tools.javac.jvm.ByteCodes.*;
 import static com.sun.tools.javac.jvm.CRTFlags.*;
-import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.main.Option.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.BLOCK;
 
 /** This pass maps flat Java (i.e. without inner classes) to bytecodes.
  *
@@ -195,9 +196,10 @@ public class Gen extends JCTree.Visitor {
      */
     private int nerrs = 0;
 
-    /** A hash table mapping syntax trees to their ending source positions.
+    /** An object containing mappings of syntax trees to their
+     *  ending source positions.
      */
-    private Map<JCTree, Integer> endPositions;
+    EndPosTable endPosTable;
 
     /** Generate code to load an integer constant.
      *  @param n     The integer to be loaded.
@@ -433,7 +435,7 @@ public class Gen extends JCTree.Visitor {
      */
     boolean hasFinally(JCTree target, Env<GenContext> env) {
         while (env.tree != target) {
-            if (env.tree.getTag() == JCTree.TRY && env.info.finalize.hasFinalizer())
+            if (env.tree.hasTag(TRY) && env.info.finalize.hasFinalizer())
                 return true;
             env = env.next;
         }
@@ -460,17 +462,17 @@ public class Gen extends JCTree.Visitor {
         for (List<JCTree> l = defs; l.nonEmpty(); l = l.tail) {
             JCTree def = l.head;
             switch (def.getTag()) {
-            case JCTree.BLOCK:
+            case BLOCK:
                 JCBlock block = (JCBlock)def;
                 if ((block.flags & STATIC) != 0)
                     clinitCode.append(block);
                 else
                     initCode.append(block);
                 break;
-            case JCTree.METHODDEF:
+            case METHODDEF:
                 methodDefs.append(def);
                 break;
-            case JCTree.VARDEF:
+            case VARDEF:
                 JCVariableDecl vdef = (JCVariableDecl) def;
                 VarSymbol sym = vdef.sym;
                 checkDimension(vdef.pos(), sym.type);
@@ -480,20 +482,14 @@ public class Gen extends JCTree.Visitor {
                         JCStatement init = make.at(vdef.pos()).
                             Assignment(sym, vdef.init);
                         initCode.append(init);
-                        if (endPositions != null) {
-                            Integer endPos = endPositions.remove(vdef);
-                            if (endPos != null) endPositions.put(init, endPos);
-                        }
+                        endPosTable.replaceTree(vdef, init);
                     } else if (sym.getConstValue() == null) {
                         // Initialize class (static) variables only if
                         // they are not compile-time constants.
                         JCStatement init = make.at(vdef.pos).
                             Assignment(sym, vdef.init);
                         clinitCode.append(init);
-                        if (endPositions != null) {
-                            Integer endPos = endPositions.remove(vdef);
-                            if (endPos != null) endPositions.put(init, endPos);
-                        }
+                        endPosTable.replaceTree(vdef, init);
                     } else {
                         checkStringConstant(vdef.init.pos(), sym.getConstValue());
                     }
@@ -707,7 +703,7 @@ public class Gen extends JCTree.Visitor {
         }
         int startpc = code.curPc();
         genStat(tree, env);
-        if (tree.getTag() == JCTree.BLOCK) crtFlags |= CRT_BLOCK;
+        if (tree.hasTag(BLOCK)) crtFlags |= CRT_BLOCK;
         code.crt.put(tree, crtFlags, startpc, code.curPc());
     }
 
@@ -717,7 +713,7 @@ public class Gen extends JCTree.Visitor {
         if (code.isAlive()) {
             code.statBegin(tree.pos);
             genDef(tree, env);
-        } else if (env.info.isSwitch && tree.getTag() == JCTree.VARDEF) {
+        } else if (env.info.isSwitch && tree.hasTag(VARDEF)) {
             // variables whose declarations are in a switch
             // can be used even if the decl is unreachable.
             code.newLocal(((JCVariableDecl) tree).sym);
@@ -784,7 +780,7 @@ public class Gen extends JCTree.Visitor {
      */
     public CondItem genCond(JCTree _tree, boolean markBranches) {
         JCTree inner_tree = TreeInfo.skipParens(_tree);
-        if (inner_tree.getTag() == JCTree.CONDEXPR) {
+        if (inner_tree.hasTag(CONDEXPR)) {
             JCConditional tree = (JCConditional)inner_tree;
             CondItem cond = genCond(tree.cond, CRT_FLOW_CONTROLLER);
             if (cond.isTrue()) {
@@ -959,6 +955,9 @@ public class Gen extends JCTree.Visitor {
                     code.lastFrame = null;
                     code.frameBeforeLast = null;
                 }
+
+                //compress exception table
+                code.compressCatchTable();
             }
         }
 
@@ -1030,7 +1029,7 @@ public class Gen extends JCTree.Visitor {
         Env<GenContext> localEnv = env.dup(tree, new GenContext());
         genStats(tree.stats, localEnv);
         // End the scope of all block-local variables in variable info.
-        if (env.tree.getTag() != JCTree.METHODDEF) {
+        if (!env.tree.hasTag(METHODDEF)) {
             code.statBegin(tree.endpos);
             code.endScopes(limit);
             code.pendingStatPos = Position.NOPOS;
@@ -1437,7 +1436,6 @@ public class Gen extends JCTree.Visitor {
                     code.markDead();
                 }
             }
-
             // Resolve all breaks.
             code.resolve(exitChain);
 
@@ -1496,23 +1494,21 @@ public class Gen extends JCTree.Visitor {
         void registerCatch(DiagnosticPosition pos,
                            int startpc, int endpc,
                            int handler_pc, int catch_type) {
-            if (startpc != endpc) {
-                char startpc1 = (char)startpc;
-                char endpc1 = (char)endpc;
-                char handler_pc1 = (char)handler_pc;
-                if (startpc1 == startpc &&
-                    endpc1 == endpc &&
-                    handler_pc1 == handler_pc) {
-                    code.addCatch(startpc1, endpc1, handler_pc1,
-                                  (char)catch_type);
+            char startpc1 = (char)startpc;
+            char endpc1 = (char)endpc;
+            char handler_pc1 = (char)handler_pc;
+            if (startpc1 == startpc &&
+                endpc1 == endpc &&
+                handler_pc1 == handler_pc) {
+                code.addCatch(startpc1, endpc1, handler_pc1,
+                              (char)catch_type);
+            } else {
+                if (!useJsrLocally && !target.generateStackMapTable()) {
+                    useJsrLocally = true;
+                    throw new CodeSizeOverflow();
                 } else {
-                    if (!useJsrLocally && !target.generateStackMapTable()) {
-                        useJsrLocally = true;
-                        throw new CodeSizeOverflow();
-                    } else {
-                        log.error(pos, "limit.code.too.large.for.try.stmt");
-                        nerrs++;
-                    }
+                    log.error(pos, "limit.code.too.large.for.try.stmt");
+                    nerrs++;
                 }
             }
         }
@@ -1628,11 +1624,11 @@ public class Gen extends JCTree.Visitor {
         // Optimize x++ to ++x and x-- to --x.
         JCExpression e = tree.expr;
         switch (e.getTag()) {
-            case JCTree.POSTINC:
-                ((JCUnary) e).setTag(JCTree.PREINC);
+            case POSTINC:
+                ((JCUnary) e).setTag(PREINC);
                 break;
-            case JCTree.POSTDEC:
-                ((JCUnary) e).setTag(JCTree.PREDEC);
+            case POSTDEC:
+                ((JCUnary) e).setTag(PREDEC);
                 break;
         }
         genExpr(tree.expr, tree.expr.type).drop();
@@ -1819,13 +1815,13 @@ public class Gen extends JCTree.Visitor {
             // If we have an increment of -32768 to +32767 of a local
             // int variable we can use an incr instruction instead of
             // proceeding further.
-            if ((tree.getTag() == JCTree.PLUS_ASG || tree.getTag() == JCTree.MINUS_ASG) &&
+            if ((tree.hasTag(PLUS_ASG) || tree.hasTag(MINUS_ASG)) &&
                 l instanceof LocalItem &&
                 tree.lhs.type.tag <= INT &&
                 tree.rhs.type.tag <= INT &&
                 tree.rhs.type.constValue() != null) {
                 int ival = ((Number) tree.rhs.type.constValue()).intValue();
-                if (tree.getTag() == JCTree.MINUS_ASG) ival = -ival;
+                if (tree.hasTag(MINUS_ASG)) ival = -ival;
                 ((LocalItem)l).incr(ival);
                 result = l;
                 return;
@@ -1841,29 +1837,29 @@ public class Gen extends JCTree.Visitor {
 
     public void visitUnary(JCUnary tree) {
         OperatorSymbol operator = (OperatorSymbol)tree.operator;
-        if (tree.getTag() == JCTree.NOT) {
+        if (tree.hasTag(NOT)) {
             CondItem od = genCond(tree.arg, false);
             result = od.negate();
         } else {
             Item od = genExpr(tree.arg, operator.type.getParameterTypes().head);
             switch (tree.getTag()) {
-            case JCTree.POS:
+            case POS:
                 result = od.load();
                 break;
-            case JCTree.NEG:
+            case NEG:
                 result = od.load();
                 code.emitop0(operator.opcode);
                 break;
-            case JCTree.COMPL:
+            case COMPL:
                 result = od.load();
                 emitMinusOne(od.typecode);
                 code.emitop0(operator.opcode);
                 break;
-            case JCTree.PREINC: case JCTree.PREDEC:
+            case PREINC: case PREDEC:
                 od.duplicate();
                 if (od instanceof LocalItem &&
                     (operator.opcode == iadd || operator.opcode == isub)) {
-                    ((LocalItem)od).incr(tree.getTag() == JCTree.PREINC ? 1 : -1);
+                    ((LocalItem)od).incr(tree.hasTag(PREINC) ? 1 : -1);
                     result = od;
                 } else {
                     od.load();
@@ -1877,12 +1873,12 @@ public class Gen extends JCTree.Visitor {
                     result = items.makeAssignItem(od);
                 }
                 break;
-            case JCTree.POSTINC: case JCTree.POSTDEC:
+            case POSTINC: case POSTDEC:
                 od.duplicate();
                 if (od instanceof LocalItem &&
                     (operator.opcode == iadd || operator.opcode == isub)) {
                     Item res = od.load();
-                    ((LocalItem)od).incr(tree.getTag() == JCTree.POSTINC ? 1 : -1);
+                    ((LocalItem)od).incr(tree.hasTag(POSTINC) ? 1 : -1);
                     result = res;
                 } else {
                     Item res = od.load();
@@ -1898,7 +1894,7 @@ public class Gen extends JCTree.Visitor {
                     result = res;
                 }
                 break;
-            case JCTree.NULLCHK:
+            case NULLCHK:
                 result = od.load();
                 code.emitop0(dup);
                 genNullCheck(tree.pos());
@@ -1926,7 +1922,7 @@ public class Gen extends JCTree.Visitor {
             // Convert buffer to string.
             bufferToString(tree.pos());
             result = items.makeStackItem(syms.stringType);
-        } else if (tree.getTag() == JCTree.AND) {
+        } else if (tree.hasTag(AND)) {
             CondItem lcond = genCond(tree.lhs, CRT_FLOW_CONTROLLER);
             if (!lcond.isFalse()) {
                 Chain falseJumps = lcond.jumpFalse();
@@ -1940,7 +1936,7 @@ public class Gen extends JCTree.Visitor {
             } else {
                 result = lcond;
             }
-        } else if (tree.getTag() == JCTree.OR) {
+        } else if (tree.hasTag(OR)) {
             CondItem lcond = genCond(tree.lhs, CRT_FLOW_CONTROLLER);
             if (!lcond.isTrue()) {
                 Chain trueJumps = lcond.jumpTrue();
@@ -1997,7 +1993,7 @@ public class Gen extends JCTree.Visitor {
          */
         void appendStrings(JCTree tree) {
             tree = TreeInfo.skipParens(tree);
-            if (tree.getTag() == JCTree.PLUS && tree.type.constValue() == null) {
+            if (tree.hasTag(PLUS) && tree.type.constValue() == null) {
                 JCBinary op = (JCBinary) tree;
                 if (op.operator.kind == MTH &&
                     ((OperatorSymbol) op.operator).opcode == string_add) {
@@ -2215,7 +2211,7 @@ public class Gen extends JCTree.Visitor {
             attrEnv = env;
             ClassSymbol c = cdef.sym;
             this.toplevel = env.toplevel;
-            this.endPositions = toplevel.endPositions;
+            this.endPosTable = toplevel.endPositions;
             // If this is a class definition requiring Miranda methods,
             // add them.
             if (generateIproxies &&
@@ -2240,7 +2236,7 @@ public class Gen extends JCTree.Visitor {
             if (nerrs != 0) {
                 // if errors, discard code
                 for (List<JCTree> l = cdef.defs; l.nonEmpty(); l = l.tail) {
-                    if (l.head.getTag() == JCTree.METHODDEF)
+                    if (l.head.hasTag(METHODDEF))
                         ((JCMethodDecl) l.head).sym.code = null;
                 }
             }
@@ -2251,7 +2247,7 @@ public class Gen extends JCTree.Visitor {
             attrEnv = null;
             this.env = null;
             toplevel = null;
-            endPositions = null;
+            endPosTable = null;
             nerrs = 0;
         }
     }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java
index a22c3a7..a658438 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java
@@ -28,6 +28,7 @@ package com.sun.tools.javac.jvm;
 import java.util.*;
 
 import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.util.Assert;
 
 /** An internal structure that corresponds to the constant pool of a classfile.
  *
@@ -96,6 +97,7 @@ public class Pool {
      *  package.  Return the object's index in the pool.
      */
     public int put(Object value) {
+        Assert.checkNonNull(value);
         if (value instanceof MethodSymbol)
             value = new Method((MethodSymbol)value);
         else if (value instanceof VarSymbol)
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/Target.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/Target.java
index 348c842..9463309 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Target.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Target.java
@@ -31,7 +31,7 @@ import com.sun.tools.javac.code.Flags;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.util.*;
 
-import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.main.Option.*;
 
 /** The classfile version target.
  *
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index 24ea957..67d4a81 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -48,20 +48,21 @@ import javax.tools.DiagnosticListener;
 import com.sun.source.util.TaskEvent;
 import com.sun.source.util.TaskListener;
 
-import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.code.*;
 import com.sun.tools.javac.code.Lint.LintCategory;
 import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.tree.*;
-import com.sun.tools.javac.tree.JCTree.*;
-import com.sun.tools.javac.parser.*;
 import com.sun.tools.javac.comp.*;
+import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.jvm.*;
+import com.sun.tools.javac.parser.*;
 import com.sun.tools.javac.processing.*;
+import com.sun.tools.javac.tree.*;
+import com.sun.tools.javac.tree.JCTree.*;
+import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.Log.WriterKind;
 
 import static javax.tools.StandardLocation.CLASS_OUTPUT;
-import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.main.Option.*;
 import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag.*;
 import static com.sun.tools.javac.util.ListBuffer.lb;
 
@@ -823,8 +824,8 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
 
         // forcibly set the equivalent of -Xlint:-options, so that no further
         // warnings about command line options are generated from this point on
-        options.put(XLINT_CUSTOM + "-" + LintCategory.OPTIONS.option, "true");
-        options.remove(XLINT_CUSTOM + LintCategory.OPTIONS.option);
+        options.put(XLINT_CUSTOM.text + "-" + LintCategory.OPTIONS.option, "true");
+        options.remove(XLINT_CUSTOM.text + LintCategory.OPTIONS.option);
 
         start_msec = now();
 
@@ -1354,7 +1355,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
             make.at(Position.FIRSTPOS);
             TreeMaker localMake = make.forToplevel(env.toplevel);
 
-            if (env.tree.getTag() == JCTree.TOPLEVEL || env.tree.getTag() == JCTree.MODULE) {
+            if (env.tree.hasTag(JCTree.Tag.TOPLEVEL) || env.tree.hasTag(JCTree.Tag.MODULE)) {
                 if (!(stubOutput || sourceOutput || printFlat)) {
                     if (shouldStop(CompileState.LOWER))
                         return;
@@ -1513,20 +1514,20 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
                     for (List<JCTree> it = tree.defs; it.tail != null; it = it.tail) {
                         JCTree t = it.head;
                         switch (t.getTag()) {
-                        case JCTree.CLASSDEF:
+                        case CLASSDEF:
                             if (isInterface ||
                                 (((JCClassDecl) t).mods.flags & (Flags.PROTECTED|Flags.PUBLIC)) != 0 ||
                                 (((JCClassDecl) t).mods.flags & (Flags.PRIVATE)) == 0 && ((JCClassDecl) t).sym.packge().getQualifiedName() == names.java_lang)
                                 newdefs.append(t);
                             break;
-                        case JCTree.METHODDEF:
+                        case METHODDEF:
                             if (isInterface ||
                                 (((JCMethodDecl) t).mods.flags & (Flags.PROTECTED|Flags.PUBLIC)) != 0 ||
                                 ((JCMethodDecl) t).sym.name == names.init ||
                                 (((JCMethodDecl) t).mods.flags & (Flags.PRIVATE)) == 0 && ((JCMethodDecl) t).sym.packge().getQualifiedName() == names.java_lang)
                                 newdefs.append(t);
                             break;
-                        case JCTree.VARDEF:
+                        case VARDEF:
                             if (isInterface || (((JCVariableDecl) t).mods.flags & (Flags.PROTECTED|Flags.PUBLIC)) != 0 ||
                                 (((JCVariableDecl) t).mods.flags & (Flags.PRIVATE)) == 0 && ((JCVariableDecl) t).sym.packge().getQualifiedName() == names.java_lang)
                                 newdefs.append(t);
@@ -1609,7 +1610,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
     }
 
     protected void printNote(String lines) {
-        Log.printLines(log.noticeWriter, lines);
+        log.printRawLines(Log.WriterKind.NOTICE, lines);
     }
 
     /** Print numbers of errors and warnings.
@@ -1621,8 +1622,8 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
                 key = "count." + kind;
             else
                 key = "count." + kind + ".plural";
-            log.printErrLines(key, String.valueOf(count));
-            log.errWriter.flush();
+            log.printLines(WriterKind.ERROR, key, String.valueOf(count));
+            log.flush(Log.WriterKind.ERROR);
         }
     }
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/Main.java b/langtools/src/share/classes/com/sun/tools/javac/main/Main.java
index 7762813..a0fbfb9 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/main/Main.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/Main.java
@@ -33,7 +33,6 @@ import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.util.Collection;
 import java.util.LinkedHashSet;
-import java.util.MissingResourceException;
 import java.util.Set;
 import javax.tools.JavaFileManager;
 import javax.tools.JavaFileObject;
@@ -43,12 +42,12 @@ import com.sun.tools.javac.code.Source;
 import com.sun.tools.javac.file.CacheFSInfo;
 import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.jvm.Target;
-import com.sun.tools.javac.main.JavacOption.Option;
-import com.sun.tools.javac.main.RecognizedOptions.OptionHelper;
 import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.Log.WriterKind;
+import com.sun.tools.javac.util.Log.PrefixKind;
 import com.sun.tools.javac.processing.AnnotationProcessingError;
 
-import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.main.Option.*;
 
 /** This class provides a commandline interface to the GJC compiler.
  *
@@ -67,6 +66,10 @@ public class Main {
      */
     PrintWriter out;
 
+    /** The log to use for diagnostic output.
+     */
+    Log log;
+
     /**
      * If true, certain errors will cause an exception, such as command line
      * arg errors, or exceptions in user provided code.
@@ -94,41 +97,51 @@ public class Main {
         public final int exitCode;
     }
 
-    private Option[] recognizedOptions = RecognizedOptions.getJavaCompilerOptions(new OptionHelper() {
+    private Option[] recognizedOptions =
+            Option.getJavaCompilerOptions().toArray(new Option[0]);
 
-        public void setOut(PrintWriter out) {
-            Main.this.out = out;
+    private OptionHelper optionHelper = new OptionHelper() {
+        @Override
+        public String get(Option option) {
+            return options.get(option);
         }
 
-        public void error(String key, Object... args) {
-            Main.this.error(key, args);
+        @Override
+        public void put(String name, String value) {
+            options.put(name, value);
         }
 
-        public void printVersion() {
-            Log.printLines(out, getLocalizedString("version", ownName,  JavaCompiler.version()));
+        @Override
+        public void remove(String name) {
+            options.remove(name);
         }
 
-        public void printFullVersion() {
-            Log.printLines(out, getLocalizedString("fullVersion", ownName,  JavaCompiler.fullVersion()));
+        @Override
+        public Log getLog() {
+            return log;
         }
 
-        public void printHelp() {
-            help();
+        @Override
+        public String getOwnName() {
+            return ownName;
         }
 
-        public void printXhelp() {
-            xhelp();
+        @Override
+        public void error(String key, Object... args) {
+            Main.this.error(key, args);
         }
 
+        @Override
         public void addFile(File f) {
             filenames.add(f);
         }
 
+        @Override
         public void addClassName(String s) {
             classnames.append(s);
         }
 
-    });
+    };
 
     /**
      * Construct a compiler instance.
@@ -155,42 +168,21 @@ public class Main {
      */
     public ListBuffer<String> classnames = null; // XXX sb protected
 
-    /** Print a string that explains usage.
-     */
-    void help() {
-        Log.printLines(out, getLocalizedString("msg.usage.header", ownName));
-        for (int i=0; i<recognizedOptions.length; i++) {
-            recognizedOptions[i].help(out);
-        }
-        out.println();
-    }
-
-    /** Print a string that explains usage for X options.
-     */
-    void xhelp() {
-        for (int i=0; i<recognizedOptions.length; i++) {
-            recognizedOptions[i].xhelp(out);
-        }
-        out.println();
-        Log.printLines(out, getLocalizedString("msg.usage.nonstandard.footer"));
-    }
-
     /** Report a usage error.
      */
     void error(String key, Object... args) {
         if (apiMode) {
-            String msg = getLocalizedString(key, args);
+            String msg = log.localize(PrefixKind.JAVAC, key, args);
             throw new PropagatedException(new IllegalStateException(msg));
         }
         warning(key, args);
-        Log.printLines(out, getLocalizedString("msg.usage", ownName));
+        log.printLines(PrefixKind.JAVAC, "msg.usage", ownName);
     }
 
     /** Report a warning.
      */
     void warning(String key, Object... args) {
-        Log.printLines(out, ownName + ": "
-                       + getLocalizedString(key, args));
+        log.printRawLines(ownName + ": " + log.localize(PrefixKind.JAVAC, key, args));
     }
 
     public Option getOption(String flag) {
@@ -248,10 +240,10 @@ public class Main {
                 }
                 String operand = flags[ac];
                 ac++;
-                if (option.process(options, flag, operand))
+                if (option.process(optionHelper, flag, operand))
                     return null;
             } else {
-                if (option.process(options, flag))
+                if (option.process(optionHelper, flag))
                     return null;
             }
         }
@@ -300,33 +292,33 @@ public class Main {
         }
 
 
-        OptionName[] bootclasspathOptions = {
+        Option[] bootclasspathOptions = {
 //            XBOOTCLASSPATH_PREPEND,
             ENDORSEDDIRS,
 //            BOOTCLASSPATH,
 //            XBOOTCLASSPATH_APPEND,
             EXTDIRS
         };
-        OptionName[] moduleOptions = {
+        Option[] moduleOptions = {
             L,
             MODULEPATH
         };
-        List<OptionName> bcpOpts = List.nil();
-        List<OptionName> mOpts = List.nil();
-        for (OptionName n: bootclasspathOptions) {
+        List<Option> bcpOpts = List.nil();
+        List<Option> mOpts = List.nil();
+        for (Option n: bootclasspathOptions) {
             if (options.get(n) != null)
                 bcpOpts = bcpOpts.prepend(n);
         }
-        for (OptionName n: moduleOptions) {
+        for (Option n: moduleOptions) {
             if (options.get(n) != null)
                 mOpts = mOpts.prepend(n);
         }
         if (bcpOpts.nonEmpty() && mOpts.nonEmpty()) {
-            error("err.conficting.options", bcpOpts.head.optionName, mOpts.head.optionName);
+            error("err.conficting.options", bcpOpts.head.text, mOpts.head.text);
             return null;
         }
         if (mOpts.nonEmpty() && !source.allowModules()) {
-            error("err.option.not.supported.in.source", mOpts.head.optionName, source.name);
+            error("err.option.not.supported.in.source", mOpts.head.text, source.name);
             return null;
         }
 
@@ -338,11 +330,13 @@ public class Main {
             showClass(showClass);
         }
 
+        options.notifyListeners();
+
         return filenames;
     }
     // where
-        private boolean checkDirectory(OptionName optName) {
-            String value = options.get(optName);
+        private boolean checkDirectory(Option option) {
+            String value = options.get(option);
             if (value == null)
                 return true;
             File file = new File(value);
@@ -383,6 +377,9 @@ public class Main {
                        List<JavaFileObject> fileObjects,
                        Iterable<? extends Processor> processors)
     {
+        context.put(Log.outKey, out);
+        log = Log.instance(context);
+
         if (options == null)
             options = Options.instance(context); // creates a new one
 
@@ -396,7 +393,7 @@ public class Main {
          */
         try {
             if (args.length == 0 && fileObjects.isEmpty()) {
-                help();
+                Option.HELP.process(optionHelper, "-help");
                 return Result.CMDERR;
             }
 
@@ -421,20 +418,16 @@ public class Main {
                     return Result.CMDERR;
                 }
             } catch (java.io.FileNotFoundException e) {
-                Log.printLines(out, ownName + ": " +
-                               getLocalizedString("err.file.not.found",
-                                                  e.getMessage()));
+                warning("err.file.not.found", e.getMessage());
                 return Result.SYSERR;
             }
 
             boolean forceStdOut = options.isSet("stdout");
             if (forceStdOut) {
-                out.flush();
-                out = new PrintWriter(System.out, true);
+                log.flush();
+                log.setWriters(new PrintWriter(System.out, true));
             }
 
-            context.put(Log.outKey, out);
-
             // allow System property in following line as a Mustang legacy
             boolean batchMode = (options.isUnset("nonBatchMode")
                         && System.getProperty("nonBatchMode") == null);
@@ -446,8 +439,6 @@ public class Main {
             comp = JavaCompiler.instance(context);
             if (comp == null) return Result.SYSERR;
 
-            Log log = Log.instance(context);
-
             if (!files.isEmpty()) {
                 // add filenames to fileObjects
                 comp = JavaCompiler.instance(context);
@@ -464,10 +455,10 @@ public class Main {
 
             if (log.expectDiagKeys != null) {
                 if (log.expectDiagKeys.isEmpty()) {
-                    Log.printLines(log.noticeWriter, "all expected diagnostics found");
+                    log.printRawLines("all expected diagnostics found");
                     return Result.OK;
                 } else {
-                    Log.printLines(log.noticeWriter, "expected diagnostic keys not found: " + log.expectDiagKeys);
+                    log.printRawLines("expected diagnostic keys not found: " + log.expectDiagKeys);
                     return Result.ERROR;
                 }
             }
@@ -522,52 +513,50 @@ public class Main {
     /** Print a message reporting an internal error.
      */
     void bugMessage(Throwable ex) {
-        Log.printLines(out, getLocalizedString("msg.bug",
-                                               JavaCompiler.version()));
-        ex.printStackTrace(out);
+        log.printLines(PrefixKind.JAVAC, "msg.bug", JavaCompiler.version());
+        ex.printStackTrace(log.getWriter(WriterKind.NOTICE));
     }
 
     /** Print a message reporting a fatal error.
      */
     void feMessage(Throwable ex) {
-        Log.printLines(out, ex.getMessage());
+        log.printRawLines(ex.getMessage());
         if (ex.getCause() != null && options.isSet("dev")) {
-            ex.getCause().printStackTrace(out);
+            ex.getCause().printStackTrace(log.getWriter(WriterKind.NOTICE));
         }
     }
 
     /** Print a message reporting an input/output error.
      */
     void ioMessage(Throwable ex) {
-        Log.printLines(out, getLocalizedString("msg.io"));
-        ex.printStackTrace(out);
+        log.printLines(PrefixKind.JAVAC, "msg.io");
+        ex.printStackTrace(log.getWriter(WriterKind.NOTICE));
     }
 
     /** Print a message reporting an out-of-resources error.
      */
     void resourceMessage(Throwable ex) {
-        Log.printLines(out, getLocalizedString("msg.resource"));
-//      System.out.println("(name buffer len = " + Name.names.length + " " + Name.nc);//DEBUG
-        ex.printStackTrace(out);
+        log.printLines(PrefixKind.JAVAC, "msg.resource");
+        ex.printStackTrace(log.getWriter(WriterKind.NOTICE));
     }
 
     /** Print a message reporting an uncaught exception from an
      * annotation processor.
      */
     void apMessage(AnnotationProcessingError ex) {
-        Log.printLines(out,
-                       getLocalizedString("msg.proc.annotation.uncaught.exception"));
-        ex.getCause().printStackTrace(out);
+        log.printLines("msg.proc.annotation.uncaught.exception");
+        ex.getCause().printStackTrace(log.getWriter(WriterKind.NOTICE));
     }
 
     /** Display the location and checksum of a class. */
     void showClass(String className) {
-        out.println("javac: show class: " + className);
+        PrintWriter pw = log.getWriter(WriterKind.NOTICE);
+        pw.println("javac: show class: " + className);
         URL url = getClass().getResource('/' + className.replace('.', '/') + ".class");
         if (url == null)
-            out.println("  class not found");
+            pw.println("  class not found");
         else {
-            out.println("  " + url);
+            pw.println("  " + url);
             try {
                 final String algorithm = "MD5";
                 byte[] digest;
@@ -584,9 +573,9 @@ public class Main {
                 StringBuilder sb = new StringBuilder();
                 for (byte b: digest)
                     sb.append(String.format("%02x", b));
-                out.println("  " + algorithm + " checksum: " + sb);
+                pw.println("  " + algorithm + " checksum: " + sb);
             } catch (Exception e) {
-                out.println("  cannot compute digest: " + e);
+                pw.println("  cannot compute digest: " + e);
             }
         }
     }
@@ -597,35 +586,35 @@ public class Main {
      * Internationalization
      *************************************************************************/
 
-    /** Find a localized string in the resource bundle.
-     *  @param key     The key for the localized string.
-     */
-    public static String getLocalizedString(String key, Object... args) { // FIXME sb private
-        try {
-            if (messages == null)
-                messages = new JavacMessages(javacBundleName);
-            return messages.getLocalizedString("javac." + key, args);
-        }
-        catch (MissingResourceException e) {
-            throw new Error("Fatal Error: Resource for javac is missing", e);
-        }
-    }
-
-    public static void useRawMessages(boolean enable) {
-        if (enable) {
-            messages = new JavacMessages(javacBundleName) {
-                    @Override
-                    public String getLocalizedString(String key, Object... args) {
-                        return key;
-                    }
-                };
-        } else {
-            messages = new JavacMessages(javacBundleName);
-        }
-    }
-
-    private static final String javacBundleName =
+//    /** Find a localized string in the resource bundle.
+//     *  @param key     The key for the localized string.
+//     */
+//    public static String getLocalizedString(String key, Object... args) { // FIXME sb private
+//        try {
+//            if (messages == null)
+//                messages = new JavacMessages(javacBundleName);
+//            return messages.getLocalizedString("javac." + key, args);
+//        }
+//        catch (MissingResourceException e) {
+//            throw new Error("Fatal Error: Resource for javac is missing", e);
+//        }
+//    }
+//
+//    public static void useRawMessages(boolean enable) {
+//        if (enable) {
+//            messages = new JavacMessages(javacBundleName) {
+//                    @Override
+//                    public String getLocalizedString(String key, Object... args) {
+//                        return key;
+//                    }
+//                };
+//        } else {
+//            messages = new JavacMessages(javacBundleName);
+//        }
+//    }
+
+    public static final String javacBundleName =
         "com.sun.tools.javac.resources.javac";
-
-    private static JavacMessages messages;
+//
+//    private static JavacMessages messages;
 }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/Option.java b/langtools/src/share/classes/com/sun/tools/javac/main/Option.java
new file mode 100644
index 0000000..f961979
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/Option.java
@@ -0,0 +1,714 @@
+/*
+ * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package com.sun.tools.javac.main;
+
+import java.util.Collections;
+import com.sun.tools.javac.util.Log.PrefixKind;
+import com.sun.tools.javac.util.Log.WriterKind;
+import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.code.Lint;
+import com.sun.tools.javac.code.Source;
+import com.sun.tools.javac.code.Type;
+import com.sun.tools.javac.jvm.Target;
+import com.sun.tools.javac.util.Options;
+import com.sun.tools.javac.processing.JavacProcessingEnvironment;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.PrintWriter;
+import java.util.EnumSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import javax.lang.model.SourceVersion;
+
+import static com.sun.tools.javac.main.Option.ChoiceKind.*;
+import static com.sun.tools.javac.main.Option.OptionKind.*;
+import static com.sun.tools.javac.main.Option.OptionGroup.*;
+
+/**
+ * Options for javac. The specific Option to handle a command-line option
+ * is identified by searching the members of this enum in order, looking
+ * the first {@link #matches match}. The action for an Option is performed
+ * by calling {@link #process process}, and by providing a suitable
+ * {@link OptionHelper} to provide access the compiler state.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk.  This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public enum Option {
+    G("-g", "opt.g", STANDARD, BASIC),
+
+    G_NONE("-g:none", "opt.g.none", STANDARD, BASIC) {
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            helper.put("-g:", "none");
+            return false;
+        }
+    },
+
+    G_CUSTOM("-g:",  "opt.g.lines.vars.source",
+            STANDARD, BASIC, ANYOF, "lines", "vars", "source"),
+
+    XLINT("-Xlint", "opt.Xlint", EXTENDED, BASIC),
+
+    XLINT_CUSTOM("-Xlint:", "opt.Xlint.suboptlist",
+            EXTENDED,   BASIC, ANYOF, getXLintChoices()),
+
+    // -nowarn is retained for command-line backward compatibility
+    NOWARN("-nowarn", "opt.nowarn", STANDARD, BASIC) {
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            helper.put("-Xlint:none", option);
+            return false;
+        }
+    },
+
+    VERBOSE("-verbose", "opt.verbose", STANDARD, BASIC),
+
+    // -deprecation is retained for command-line backward compatibility
+    DEPRECATION("-deprecation", "opt.deprecation", STANDARD, BASIC) {
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            helper.put("-Xlint:deprecation", option);
+            return false;
+        }
+    },
+
+    CLASSPATH("-classpath", "opt.arg.path", "opt.classpath", STANDARD, FILEMANAGER),
+
+    CP("-cp", "opt.arg.path", "opt.classpath", STANDARD, FILEMANAGER) {
+        @Override
+        public boolean process(OptionHelper helper, String option, String arg) {
+            return super.process(helper, "-classpath", arg);
+        }
+    },
+
+    SOURCEPATH("-sourcepath", "opt.arg.path", "opt.sourcepath", STANDARD, FILEMANAGER),
+
+    BOOTCLASSPATH("-bootclasspath", "opt.arg.path", "opt.bootclasspath", STANDARD, FILEMANAGER) {
+        @Override
+        public boolean process(OptionHelper helper, String option, String arg) {
+            helper.remove("-Xbootclasspath/p:");
+            helper.remove("-Xbootclasspath/a:");
+            return super.process(helper, option, arg);
+        }
+    },
+
+    XBOOTCLASSPATH_PREPEND("-Xbootclasspath/p:", "opt.arg.path", "opt.Xbootclasspath.p", EXTENDED, FILEMANAGER),
+
+    XBOOTCLASSPATH_APPEND("-Xbootclasspath/a:", "opt.arg.path", "opt.Xbootclasspath.a", EXTENDED, FILEMANAGER),
+
+    XBOOTCLASSPATH("-Xbootclasspath:", "opt.arg.path", "opt.bootclasspath", EXTENDED, FILEMANAGER) {
+        @Override
+        public boolean process(OptionHelper helper, String option, String arg) {
+            helper.remove("-Xbootclasspath/p:");
+            helper.remove("-Xbootclasspath/a:");
+            return super.process(helper, "-bootclasspath", arg);
+        }
+    },
+
+    MODULEPATH("-modulepath", "opt.arg.path", "opt.modulepath", STANDARD, FILEMANAGER),
+    
+    L("-L", "opt.arg.path", "opt.l", STANDARD, FILEMANAGER),
+
+    EXTDIRS("-extdirs", "opt.arg.dirs", "opt.extdirs", STANDARD, FILEMANAGER),
+
+    DJAVA_EXT_DIRS("-Djava.ext.dirs=", "opt.arg.dirs", "opt.extdirs", EXTENDED, FILEMANAGER) {
+        @Override
+        public boolean process(OptionHelper helper, String option, String arg) {
+            return super.process(helper, "-extdirs", arg);
+        }
+    },
+
+    ENDORSEDDIRS("-endorseddirs", "opt.arg.dirs", "opt.endorseddirs", STANDARD, FILEMANAGER),
+
+    DJAVA_ENDORSED_DIRS("-Djava.endorsed.dirs=", "opt.arg.dirs", "opt.endorseddirs", EXTENDED, FILEMANAGER) {
+        @Override
+        public boolean process(OptionHelper helper, String option, String arg) {
+            return super.process(helper, "-endorseddirs", arg);
+        }
+    },
+
+    PROC("-proc:", "opt.proc.none.only", STANDARD, BASIC,  ONEOF, "none", "only"),
+
+    PROCESSOR("-processor", "opt.arg.class.list", "opt.processor", STANDARD, BASIC),
+
+    PROCESSORPATH("-processorpath", "opt.arg.path", "opt.processorpath", STANDARD, FILEMANAGER),
+
+    D("-d", "opt.arg.directory", "opt.d", STANDARD, FILEMANAGER),
+
+    S("-s", "opt.arg.directory", "opt.sourceDest", STANDARD, FILEMANAGER),
+
+    IMPLICIT("-implicit:", "opt.implicit", STANDARD, BASIC, ONEOF, "none", "class"),
+
+    ENCODING("-encoding", "opt.arg.encoding", "opt.encoding", STANDARD, FILEMANAGER) {
+        @Override
+        public boolean process(OptionHelper helper, String option, String operand) {
+//            System.err.println("process encoding " + operand);
+            return super.process(helper, option, operand);
+        }
+
+    },
+
+    SOURCE("-source", "opt.arg.release", "opt.source", STANDARD, BASIC) {
+        @Override
+        public boolean process(OptionHelper helper, String option, String operand) {
+            Source source = Source.lookup(operand);
+            if (source == null) {
+                helper.error("err.invalid.source", operand);
+                return true;
+            }
+            return super.process(helper, option, operand);
+        }
+    },
+
+    TARGET("-target", "opt.arg.release", "opt.target", STANDARD, BASIC) {
+        @Override
+        public boolean process(OptionHelper helper, String option, String operand) {
+            Target target = Target.lookup(operand);
+            if (target == null) {
+                helper.error("err.invalid.target", operand);
+                return true;
+            }
+            return super.process(helper, option, operand);
+        }
+    },
+
+    VERSION("-version", "opt.version", STANDARD, INFO) {
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            Log log = helper.getLog();
+            String ownName = helper.getOwnName();
+            log.printLines(PrefixKind.JAVAC, "version", ownName,  JavaCompiler.version());
+            return super.process(helper, option);
+        }
+    },
+
+    FULLVERSION("-fullversion", null, HIDDEN, INFO) {
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            Log log = helper.getLog();
+            String ownName = helper.getOwnName();
+            log.printLines(PrefixKind.JAVAC, "fullVersion", ownName,  JavaCompiler.fullVersion());
+            return super.process(helper, option);
+        }
+    },
+
+    DIAGS("-XDdiags=", null, HIDDEN, INFO) {
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            option = option.substring(option.indexOf('=') + 1);
+            String diagsOption = option.contains("%") ?
+                "-XDdiagsFormat=" :
+                "-XDdiags=";
+            diagsOption += option;
+            if (XD.matches(diagsOption))
+                return XD.process(helper, diagsOption);
+            else
+                return false;
+        }
+    },
+
+    HELP("-help", "opt.help", STANDARD, INFO) {
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            Log log = helper.getLog();
+            String ownName = helper.getOwnName();
+            log.printLines(PrefixKind.JAVAC, "msg.usage.header", ownName);
+            for (Option o: getJavaCompilerOptions()) {
+                o.help(log, OptionKind.STANDARD);
+            }
+            log.printNewline();
+            return super.process(helper, option);
+        }
+    },
+
+    A("-A", "opt.arg.key.equals.value", "opt.A", STANDARD, BASIC) {
+        { hasSuffix = true; }
+
+        @Override
+        public boolean matches(String arg) {
+            return arg.startsWith("-A");
+        }
+
+        @Override
+        public boolean hasArg() {
+            return false;
+        }
+        // Mapping for processor options created in
+        // JavacProcessingEnvironment
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            int argLength = option.length();
+            if (argLength == 2) {
+                helper.error("err.empty.A.argument");
+                return true;
+            }
+            int sepIndex = option.indexOf('=');
+            String key = option.substring(2, (sepIndex != -1 ? sepIndex : argLength) );
+            if (!JavacProcessingEnvironment.isValidOptionName(key)) {
+                helper.error("err.invalid.A.key", option);
+                return true;
+            }
+            return process(helper, option, option);
+        }
+    },
+
+    X("-X", "opt.X", STANDARD, INFO) {
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            Log log = helper.getLog();
+            for (Option o: getJavaCompilerOptions()) {
+                o.help(log, OptionKind.EXTENDED);
+            }
+            log.printNewline();
+            log.printLines(PrefixKind.JAVAC, "msg.usage.nonstandard.footer");
+            return super.process(helper, option);
+        }
+    },
+
+    // This option exists only for the purpose of documenting itself.
+    // It's actually implemented by the launcher.
+    J("-J", "opt.arg.flag", "opt.J", STANDARD, INFO) {
+        { hasSuffix = true; }
+
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            throw new AssertionError
+                ("the -J flag should be caught by the launcher.");
+        }
+    },
+
+    // stop after parsing and attributing.
+    // new HiddenOption("-attrparseonly"),
+
+    // new Option("-moreinfo",                                      "opt.moreinfo") {
+    MOREINFO("-moreinfo", null, HIDDEN, BASIC) {
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            Type.moreInfo = true;
+            return super.process(helper, option);
+        }
+    },
+
+    // treat warnings as errors
+    WERROR("-Werror", "opt.Werror", STANDARD, BASIC),
+
+//    // use complex inference from context in the position of a method call argument
+//    COMPLEXINFERENCE("-complexinference", null, HIDDEN, BASIC),
+
+    // generare source stubs
+    // new HiddenOption("-stubs"),
+
+    // relax some constraints to allow compiling from stubs
+    // new HiddenOption("-relax"),
+
+    // output source after translating away inner classes
+    // new Option("-printflat",                             "opt.printflat"),
+    // new HiddenOption("-printflat"),
+
+    // display scope search details
+    // new Option("-printsearch",                           "opt.printsearch"),
+    // new HiddenOption("-printsearch"),
+
+    // prompt after each error
+    // new Option("-prompt",                                        "opt.prompt"),
+    PROMPT("-prompt", null, HIDDEN, BASIC),
+
+    // dump stack on error
+    DOE("-doe", null, HIDDEN, BASIC),
+
+    // output source after type erasure
+    // new Option("-s",                                     "opt.s"),
+    PRINTSOURCE("-printsource", null, HIDDEN, BASIC),
+
+    // output shrouded class files
+    // new Option("-scramble",                              "opt.scramble"),
+    // new Option("-scrambleall",                           "opt.scrambleall"),
+
+    // display warnings for generic unchecked operations
+    WARNUNCHECKED("-warnunchecked", null, HIDDEN, BASIC) {
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            helper.put("-Xlint:unchecked", option);
+            return false;
+        }
+    },
+
+    XMAXERRS("-Xmaxerrs", "opt.arg.number", "opt.maxerrs", EXTENDED, BASIC),
+
+    XMAXWARNS("-Xmaxwarns", "opt.arg.number", "opt.maxwarns", EXTENDED, BASIC),
+
+    XSTDOUT("-Xstdout", "opt.arg.file", "opt.Xstdout", EXTENDED, INFO) {
+        @Override
+        public boolean process(OptionHelper helper, String option, String arg) {
+            try {
+                Log log = helper.getLog();
+                // TODO: this file should be closed at the end of compilation
+                log.setWriters(new PrintWriter(new FileWriter(arg), true));
+            } catch (java.io.IOException e) {
+                helper.error("err.error.writing.file", arg, e);
+                return true;
+            }
+            return super.process(helper, option, arg);
+        }
+    },
+
+    XPRINT("-Xprint", "opt.print", EXTENDED, BASIC),
+
+    XPRINTROUNDS("-XprintRounds", "opt.printRounds", EXTENDED, BASIC),
+
+    XPRINTPROCESSORINFO("-XprintProcessorInfo", "opt.printProcessorInfo", EXTENDED, BASIC),
+
+    XPREFER("-Xprefer:", "opt.prefer", EXTENDED, BASIC, ONEOF, "source", "newer"),
+
+    XPKGINFO("-Xpkginfo:", "opt.pkginfo", EXTENDED, BASIC, ONEOF, "always", "legacy", "nonempty"),
+
+    /* -O is a no-op, accepted for backward compatibility. */
+    O("-O", null, HIDDEN, BASIC),
+
+    /* -Xjcov produces tables to support the code coverage tool jcov. */
+    XJCOV("-Xjcov", null, HIDDEN, BASIC),
+
+    /* This is a back door to the compiler's option table.
+     * -XDx=y sets the option x to the value y.
+     * -XDx sets the option x to the value x.
+     */
+    XD("-XD", null, HIDDEN, BASIC) {
+        String s;
+        @Override
+        public boolean matches(String s) {
+            this.s = s;
+            return s.startsWith(text);
+        }
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            s = s.substring(text.length());
+            int eq = s.indexOf('=');
+            String key = (eq < 0) ? s : s.substring(0, eq);
+            String value = (eq < 0) ? s : s.substring(eq+1);
+            helper.put(key, value);
+            return false;
+        }
+    },
+
+    // This option exists only for the purpose of documenting itself.
+    // It's actually implemented by the CommandLine class.
+    AT("@", "opt.arg.file", "opt.AT", STANDARD, INFO) {
+        { hasSuffix = true; }
+
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            throw new AssertionError("the @ flag should be caught by CommandLine.");
+        }
+    },
+
+    /*
+     * TODO: With apt, the matches method accepts anything if
+     * -XclassAsDecls is used; code elsewhere does the lookup to
+     * see if the class name is both legal and found.
+     *
+     * In apt, the process method adds the candidate class file
+     * name to a separate list.
+     */
+    SOURCEFILE("sourcefile", null, HIDDEN, INFO) {
+        String s;
+        @Override
+        public boolean matches(String s) {
+            this.s = s;
+            return s.endsWith(".java")  // Java source file
+                || SourceVersion.isName(s);   // Legal type name
+        }
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            if (s.endsWith(".java") ) {
+                File f = new File(s);
+                if (!f.exists()) {
+                    helper.error("err.file.not.found", f);
+                    return true;
+                }
+                if (!f.isFile()) {
+                    helper.error("err.file.not.file", f);
+                    return true;
+                }
+                helper.addFile(f);
+            }
+            else
+                helper.addClassName(s);
+            return false;
+        }
+    };
+
+    /** The kind of an Option. This is used by the -help and -X options. */
+    public enum OptionKind {
+        /** A standard option, documented by -help. */
+        STANDARD,
+        /** An extended option, documented by -X. */
+        EXTENDED,
+        /** A hidden option, not documented. */
+        HIDDEN,
+    }
+
+    /** The group for an Option. This determines the situations in which the
+     *  option is applicable. */
+    enum OptionGroup {
+        /** A basic option, available for use on the command line or via the
+         *  Compiler API. */
+        BASIC,
+        /** An option for javac's standard JavaFileManager. Other file managers
+         *  may or may not support these options. */
+        FILEMANAGER,
+        /** A command-line option that requests information, such as -help. */
+        INFO,
+        /** A command-line "option" representing a file or class name. */
+        OPERAND
+    }
+
+    /** The kind of choice for "choice" options. */
+    enum ChoiceKind {
+        /** The expected value is exactly one of the set of choices. */
+        ONEOF,
+        /** The expected value is one of more of the set of choices. */
+        ANYOF
+    }
+
+    public final String text;
+
+    final OptionKind kind;
+
+    final OptionGroup group;
+
+    /** Documentation key for arguments.
+     */
+    final String argsNameKey;
+
+    /** Documentation key for description.
+     */
+    final String descrKey;
+
+    /** Suffix option (-foo=bar or -foo:bar)
+     */
+    boolean hasSuffix;
+
+    /** The kind of choices for this option, if any.
+     */
+    final ChoiceKind choiceKind;
+
+    /** The choices for this option, if any, and whether or not the choices
+     *  are hidden
+     */
+    final Map<String,Boolean> choices;
+
+
+    Option(String text, String descrKey,
+            OptionKind kind, OptionGroup group) {
+        this(text, null, descrKey, kind, group, null, null);
+    }
+
+    Option(String text, String argsNameKey, String descrKey,
+            OptionKind kind, OptionGroup group) {
+        this(text, argsNameKey, descrKey, kind, group, null, null);
+    }
+
+    Option(String text, String descrKey,
+            OptionKind kind, OptionGroup group,
+            ChoiceKind choiceKind, Map<String,Boolean> choices) {
+        this(text, null, descrKey, kind, group, choiceKind, choices);
+    }
+
+    Option(String text, String descrKey,
+            OptionKind kind, OptionGroup group,
+            ChoiceKind choiceKind, String... choices) {
+        this(text, null, descrKey, kind, group, choiceKind, createChoices(choices));
+    }
+    // where
+        private static Map<String,Boolean> createChoices(String... choices) {
+            Map<String,Boolean> map = new LinkedHashMap<String,Boolean>();
+            for (String c: choices)
+                map.put(c, false);
+            return map;
+        }
+
+    private Option(String text, String argsNameKey, String descrKey,
+            OptionKind kind, OptionGroup group,
+            ChoiceKind choiceKind, Map<String,Boolean> choices) {
+        this.text = text;
+        this.argsNameKey = argsNameKey;
+        this.descrKey = descrKey;
+        this.kind = kind;
+        this.group = group;
+        this.choiceKind = choiceKind;
+        this.choices = choices;
+        char lastChar = text.charAt(text.length()-1);
+        hasSuffix = lastChar == ':' || lastChar == '=';
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public OptionKind getKind() {
+        return kind;
+    }
+
+    public boolean hasArg() {
+        return argsNameKey != null && !hasSuffix;
+    }
+
+    public boolean matches(String option) {
+        if (!hasSuffix)
+            return option.equals(text);
+
+        if (!option.startsWith(text))
+            return false;
+
+        if (choices != null) {
+            String arg = option.substring(text.length());
+            if (choiceKind == ChoiceKind.ONEOF)
+                return choices.keySet().contains(arg);
+            else {
+                for (String a: arg.split(",+")) {
+                    if (!choices.keySet().contains(a))
+                        return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    public boolean process(OptionHelper helper, String option, String arg) {
+        if (choices != null) {
+            if (choiceKind == ChoiceKind.ONEOF) {
+                // some clients like to see just one of option+choice set
+                for (String s: choices.keySet())
+                    helper.remove(option + s);
+                String opt = option + arg;
+                helper.put(opt, opt);
+                // some clients like to see option (without trailing ":")
+                // set to arg
+                String nm = option.substring(0, option.length() - 1);
+                helper.put(nm, arg);
+            } else {
+                // set option+word for each word in arg
+                for (String a: arg.split(",+")) {
+                    String opt = option + a;
+                    helper.put(opt, opt);
+                }
+            }
+        }
+        helper.put(option, arg);
+        return false;
+    }
+
+    public boolean process(OptionHelper helper, String option) {
+        if (hasSuffix)
+            return process(helper, text, option.substring(text.length()));
+        else
+            return process(helper, option, option);
+    }
+
+    void help(Log log, OptionKind kind) {
+        if (this.kind != kind)
+            return;
+
+        log.printRawLines(WriterKind.NOTICE,
+                String.format("  %-26s %s",
+                    helpSynopsis(log),
+                    log.localize(PrefixKind.JAVAC, descrKey)));
+
+    }
+
+    private String helpSynopsis(Log log) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(text);
+        if (argsNameKey == null) {
+            if (choices != null) {
+                String sep = "{";
+                for (Map.Entry<String,Boolean> e: choices.entrySet()) {
+                    if (!e.getValue()) {
+                        sb.append(sep);
+                        sb.append(e.getKey());
+                        sep = ",";
+                    }
+                }
+                sb.append("}");
+            }
+        } else {
+            if (!hasSuffix)
+                sb.append(" ");
+            sb.append(log.localize(PrefixKind.JAVAC, argsNameKey));
+
+        }
+
+        return sb.toString();
+    }
+
+    // For -XpkgInfo:value
+    public enum PkgInfo {
+        ALWAYS, LEGACY, NONEMPTY;
+        public static PkgInfo get(Options options) {
+            String v = options.get(XPKGINFO);
+            return (v == null
+                    ? PkgInfo.LEGACY
+                    : PkgInfo.valueOf(v.toUpperCase()));
+        }
+    }
+
+    private static Map<String,Boolean> getXLintChoices() {
+        Map<String,Boolean> choices = new LinkedHashMap<String,Boolean>();
+        choices.put("all", false);
+        for (Lint.LintCategory c : Lint.LintCategory.values())
+            choices.put(c.option, c.hidden);
+        for (Lint.LintCategory c : Lint.LintCategory.values())
+            choices.put("-" + c.option, c.hidden);
+        choices.put("none", false);
+        return choices;
+    }
+
+    static Set<Option> getJavaCompilerOptions() {
+        return EnumSet.allOf(Option.class);
+    }
+
+    public static Set<Option> getJavacFileManagerOptions() {
+        return getOptions(EnumSet.of(FILEMANAGER));
+    }
+
+    public static Set<Option> getJavacToolOptions() {
+        return getOptions(EnumSet.of(BASIC));
+    }
+
+    static Set<Option> getOptions(Set<OptionGroup> desired) {
+        Set<Option> options = EnumSet.noneOf(Option.class);
+        for (Option option : Option.values())
+            if (desired.contains(option.group))
+                options.add(option);
+        return Collections.unmodifiableSet(options);
+    }
+
+}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/OptionHelper.java b/langtools/src/share/classes/com/sun/tools/javac/main/OptionHelper.java
new file mode 100644
index 0000000..4e65230
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/OptionHelper.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package com.sun.tools.javac.main;
+
+import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.Log.PrefixKind;
+import java.io.File;
+
+/**
+ * Helper object to be used by {@link Option#process}, providing access to
+ * the compilation environment.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk.  This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+
+public abstract class OptionHelper {
+
+    /** Get the current value of an option. */
+    public abstract String get(Option option);
+
+    /** Set the value of an option. */
+    public abstract void put(String name, String value);
+
+    /** Remove any prior value for an option. */
+    public abstract void remove(String name);
+
+    /** Get access to the Log for the compilation. */
+    public abstract Log getLog();
+
+    /** Get the name of the tool, such as "javac", to be used in info like -help. */
+    public abstract String getOwnName();
+
+    /** Report an error. */
+    abstract void error(String key, Object... args);
+
+    /** Record a file to be compiled. */
+    abstract void addFile(File f);
+
+    /** Record the name of a class for annotation processing. */
+    abstract void addClassName(String s);
+
+    /** An implementation of OptionHelper that mostly throws exceptions. */
+    public static class GrumpyHelper extends OptionHelper {
+        private final Log log;
+
+        public GrumpyHelper(Log log) {
+            this.log = log;
+        }
+
+        @Override
+        public Log getLog() {
+            return log;
+        }
+
+        @Override
+        public String getOwnName() {
+            throw new IllegalStateException();
+        }
+
+        @Override
+        public String get(Option option) {
+            throw new IllegalArgumentException();
+        }
+
+        @Override
+        public void put(String name, String value) {
+            throw new IllegalArgumentException();
+        }
+
+        @Override
+        public void remove(String name) {
+            throw new IllegalArgumentException();
+        }
+
+        @Override
+        void error(String key, Object... args) {
+            throw new IllegalArgumentException(log.localize(PrefixKind.JAVAC, key, args));
+        }
+
+        @Override
+        public void addFile(File f) {
+            throw new IllegalArgumentException(f.getPath());
+        }
+
+        @Override
+        public void addClassName(String s) {
+            throw new IllegalArgumentException(s);
+        }
+    }
+
+}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java b/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java
index 6ac0835..06c82fa 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,7 @@ import com.sun.tools.javac.tree.TreeScanner;
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.Name;
 
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
 import static javax.lang.model.util.ElementFilter.methodsIn;
 
 /**
@@ -288,7 +289,7 @@ public class JavacElements implements Elements {
                 }
             }
             public void visitArray(Attribute.Array array) {
-                if (tree.getTag() == JCTree.NEWARRAY &&
+                if (tree.hasTag(NEWARRAY) &&
                         types.elemtype(array.type).tsym == findme.type.tsym) {
                     List<JCExpression> elems = ((JCNewArray) tree).elems;
                     for (Attribute value : array.values) {
@@ -327,7 +328,7 @@ public class JavacElements implements Elements {
                     scan(t.args);
             }
             public void visitAssign(JCAssign t) {
-                if (t.lhs.getTag() == JCTree.IDENT) {
+                if (t.lhs.hasTag(IDENT)) {
                     JCIdent ident = (JCIdent) t.lhs;
                     if (ident.sym == sym)
                         result = t.rhs;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java b/langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
index bb0c620..9c44b62 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
@@ -25,9 +25,7 @@
 
 package com.sun.tools.javac.nio;
 
-
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -60,13 +58,12 @@ import javax.tools.StandardLocation;
 import static java.nio.file.FileVisitOption.*;
 import static javax.tools.StandardLocation.*;
 
-import com.sun.tools.javac.file.Paths;
 import com.sun.tools.javac.util.BaseFileManager;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.util.ListBuffer;
 
-import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.main.Option.*;
 
 
 // NOTE the imports carefully for this compilation unit.
@@ -125,9 +122,8 @@ public class JavacPathFileManager extends BaseFileManager implements PathFileMan
      * Set the context for JavacPathFileManager.
      */
     @Override
-    protected void setContext(Context context) {
+    public void setContext(Context context) {
         super.setContext(context);
-        searchPaths = Paths.instance(context);
     }
 
     @Override
@@ -173,7 +169,7 @@ public class JavacPathFileManager extends BaseFileManager implements PathFileMan
 
     @Override
     public boolean isDefaultBootClassPath() {
-        return searchPaths.isDefaultBootClassPath();
+        return locations.isDefaultBootClassPath();
     }
 
     // <editor-fold defaultstate="collapsed" desc="Location handling">
@@ -231,13 +227,13 @@ public class JavacPathFileManager extends BaseFileManager implements PathFileMan
         if (locn instanceof StandardLocation) {
             switch ((StandardLocation) locn) {
                 case CLASS_PATH:
-                    files = searchPaths.userClassPath();
+                    files = locations.userClassPath();
                     break;
                 case PLATFORM_CLASS_PATH:
-                    files = searchPaths.bootClassPath();
+                    files = locations.bootClassPath();
                     break;
                 case SOURCE_PATH:
-                    files = searchPaths.sourcePath();
+                    files = locations.sourcePath();
                     break;
                 case CLASS_OUTPUT: {
                     String arg = options.get(D);
@@ -272,7 +268,6 @@ public class JavacPathFileManager extends BaseFileManager implements PathFileMan
         private boolean inited = false;
 
     private Map<Location, PathsForLocation> pathsForLocation;
-    private Paths searchPaths;
 
     private static class PathsForLocation extends LinkedHashSet<Path> {
         private static final long serialVersionUID = 6788510222394486733L;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/EndPosTable.java b/langtools/src/share/classes/com/sun/tools/javac/parser/EndPosTable.java
new file mode 100644
index 0000000..3db8cd6
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/EndPosTable.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+package com.sun.tools.javac.parser;
+
+import com.sun.tools.javac.tree.JCTree;
+
+/**
+ * Specifies the methods to access a mappings of syntax trees to end positions.
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk.  This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public interface EndPosTable {
+
+    /**
+     * This method will return the end position of a given tree, otherwise a
+     * Positions.NOPOS will be returned.
+     * @param tree JCTree
+     * @return position of the source tree or Positions.NOPOS for non-existent mapping
+     */
+    public int getEndPos(JCTree tree);
+
+    /**
+     * Give an old tree and a new tree, the old tree will be replaced with
+     * the new tree, the position of the new tree will be that of the old
+     * tree.
+     * not exist.
+     * @param oldtree a JCTree to be replaced
+     * @param newtree a JCTree to be replaced with
+     * @return position of the old tree or Positions.NOPOS for non-existent mapping
+     */
+    public int replaceTree(JCTree oldtree, JCTree newtree);
+}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java b/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
new file mode 100644
index 0000000..00d155d
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
@@ -0,0 +1,961 @@
+/*
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package com.sun.tools.javac.parser;
+
+import com.sun.tools.javac.code.Source;
+import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
+import com.sun.tools.javac.util.*;
+
+import java.nio.CharBuffer;
+
+import static com.sun.tools.javac.parser.Tokens.*;
+import static com.sun.tools.javac.util.LayoutCharacters.*;
+
+/** The lexical analyzer maps an input stream consisting of
+ *  ASCII characters and Unicode escapes into a token sequence.
+ *
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ */
+public class JavaTokenizer {
+
+    private static boolean scannerDebug = false;
+
+    /** Allow hex floating-point literals.
+     */
+    private boolean allowHexFloats;
+
+    /** Allow binary literals.
+     */
+    private boolean allowBinaryLiterals;
+
+    /** Allow underscores in literals.
+     */
+    private boolean allowUnderscoresInLiterals;
+
+    /** The source language setting.
+     */
+    private Source source;
+
+    /** The log to be used for error reporting.
+     */
+    private final Log log;
+
+    /** The token factory. */
+    private final Tokens tokens;
+
+    /** The token kind, set by nextToken().
+     */
+    protected TokenKind tk;
+
+    /** The token's radix, set by nextToken().
+     */
+    protected int radix;
+
+    /** The token's name, set by nextToken().
+     */
+    protected Name name;
+
+    /** The position where a lexical error occurred;
+     */
+    protected int errPos = Position.NOPOS;
+
+    /** The Unicode reader (low-level stream reader).
+     */
+    protected UnicodeReader reader;
+
+    protected ScannerFactory fac;
+
+    private static final boolean hexFloatsWork = hexFloatsWork();
+    private static boolean hexFloatsWork() {
+        try {
+            Float.valueOf("0x1.0p1");
+            return true;
+        } catch (NumberFormatException ex) {
+            return false;
+        }
+    }
+
+    protected boolean allowVersionLiteral;
+
+    /**
+     * Create a scanner from the input array.  This method might
+     * modify the array.  To avoid copying the input array, ensure
+     * that {@code inputLength < input.length} or
+     * {@code input[input.length -1]} is a white space character.
+     *
+     * @param fac the factory which created this Scanner
+     * @param input the input, might be modified
+     * @param inputLength the size of the input.
+     * Must be positive and less than or equal to input.length.
+     */
+    protected JavaTokenizer(ScannerFactory fac, CharBuffer buf) {
+        this(fac, new UnicodeReader(fac, buf));
+    }
+
+    protected JavaTokenizer(ScannerFactory fac, char[] buf, int inputLength) {
+        this(fac, new UnicodeReader(fac, buf, inputLength));
+    }
+
+    protected JavaTokenizer(ScannerFactory fac, UnicodeReader reader) {
+        this.fac = fac;
+        this.log = fac.log;
+        this.tokens = fac.tokens;
+        this.source = fac.source;
+        this.reader = reader;
+        this.allowBinaryLiterals = source.allowBinaryLiterals();
+        this.allowHexFloats = source.allowHexFloats();
+        this.allowUnderscoresInLiterals = source.allowUnderscoresInLiterals();
+    }
+
+    protected boolean allowVersionLiteral() {
+        return allowVersionLiteral;
+    }
+
+    protected void allowVersionLiteral(boolean allow) {
+        allowVersionLiteral = allow;
+    }
+
+    /** Report an error at the given position using the provided arguments.
+     */
+    protected void lexError(int pos, String key, Object... args) {
+        log.error(pos, key, args);
+        tk = TokenKind.ERROR;
+        errPos = pos;
+    }
+
+    /** Read next character in character or string literal and copy into sbuf.
+     */
+    private void scanLitChar(int pos) {
+        if (reader.ch == '\\') {
+            if (reader.peekChar() == '\\' && !reader.isUnicode()) {
+                reader.skipChar();
+                reader.putChar('\\', true);
+            } else {
+                reader.scanChar();
+                switch (reader.ch) {
+                case '0': case '1': case '2': case '3':
+                case '4': case '5': case '6': case '7':
+                    char leadch = reader.ch;
+                    int oct = reader.digit(pos, 8);
+                    reader.scanChar();
+                    if ('0' <= reader.ch && reader.ch <= '7') {
+                        oct = oct * 8 + reader.digit(pos, 8);
+                        reader.scanChar();
+                        if (leadch <= '3' && '0' <= reader.ch && reader.ch <= '7') {
+                            oct = oct * 8 + reader.digit(pos, 8);
+                            reader.scanChar();
+                        }
+                    }
+                    reader.putChar((char)oct);
+                    break;
+                case 'b':
+                    reader.putChar('\b', true); break;
+                case 't':
+                    reader.putChar('\t', true); break;
+                case 'n':
+                    reader.putChar('\n', true); break;
+                case 'f':
+                    reader.putChar('\f', true); break;
+                case 'r':
+                    reader.putChar('\r', true); break;
+                case '\'':
+                    reader.putChar('\'', true); break;
+                case '\"':
+                    reader.putChar('\"', true); break;
+                case '\\':
+                    reader.putChar('\\', true); break;
+                default:
+                    lexError(reader.bp, "illegal.esc.char");
+                }
+            }
+        } else if (reader.bp != reader.buflen) {
+            reader.putChar(true);
+        }
+    }
+
+    private void scanDigits(int pos, int digitRadix) {
+        char saveCh;
+        int savePos;
+        do {
+            if (reader.ch != '_') {
+                reader.putChar(false);
+            } else {
+                if (!allowUnderscoresInLiterals) {
+                    lexError(pos, "unsupported.underscore.lit", source.name);
+                    allowUnderscoresInLiterals = true;
+                }
+            }
+            saveCh = reader.ch;
+            savePos = reader.bp;
+            reader.scanChar();
+        } while (reader.digit(pos, digitRadix) >= 0 || reader.ch == '_');
+        if (saveCh == '_')
+            lexError(savePos, "illegal.underscore");
+    }
+
+    /** Read fractional part of hexadecimal floating point number.
+     */
+    private void scanHexExponentAndSuffix(int pos) {
+        if (reader.ch == 'p' || reader.ch == 'P') {
+            reader.putChar(true);
+            skipIllegalUnderscores();
+            if (reader.ch == '+' || reader.ch == '-') {
+                reader.putChar(true);
+            }
+            skipIllegalUnderscores();
+            if ('0' <= reader.ch && reader.ch <= '9') {
+                scanDigits(pos, 10);
+                if (!allowHexFloats) {
+                    lexError(pos, "unsupported.fp.lit", source.name);
+                    allowHexFloats = true;
+                }
+                else if (!hexFloatsWork)
+                    lexError(pos, "unsupported.cross.fp.lit");
+            } else
+                lexError(pos, "malformed.fp.lit");
+        } else {
+            lexError(pos, "malformed.fp.lit");
+        }
+        if (reader.ch == 'f' || reader.ch == 'F') {
+            reader.putChar(true);
+            tk = TokenKind.FLOATLITERAL;
+            radix = 16;
+        } else {
+            if (reader.ch == 'd' || reader.ch == 'D') {
+                reader.putChar(true);
+            }
+            tk = TokenKind.DOUBLELITERAL;
+            radix = 16;
+        }
+    }
+
+    /** Read fractional part of floating point number.
+     */
+    private void scanFraction(int pos) {
+        skipIllegalUnderscores();
+        if ('0' <= reader.ch && reader.ch <= '9') {
+            scanDigits(pos, 10);
+        }
+        int sp1 = reader.sp;
+        if (reader.ch == 'e' || reader.ch == 'E') {
+            reader.putChar(true);
+            skipIllegalUnderscores();
+            if (reader.ch == '+' || reader.ch == '-') {
+                reader.putChar(true);
+            }
+            skipIllegalUnderscores();
+            if ('0' <= reader.ch && reader.ch <= '9') {
+                scanDigits(pos, 10);
+                return;
+            }
+            lexError(pos, "malformed.fp.lit");
+            reader.sp = sp1;
+        }
+    }
+
+    /** Read fractional part and 'd' or 'f' suffix of floating point number.
+     */
+    private void scanFractionAndSuffix(int pos) {
+        radix = 10;
+        scanFraction(pos);
+        if (reader.ch == 'f' || reader.ch == 'F') {
+            reader.putChar(true);
+            tk = TokenKind.FLOATLITERAL;
+        } else {
+            if (reader.ch == 'd' || reader.ch == 'D') {
+                reader.putChar(true);
+            }
+            tk = TokenKind.DOUBLELITERAL;
+        }
+    }
+
+    /** Read fractional part and 'd' or 'f' suffix of floating point number.
+     */
+    private void scanHexFractionAndSuffix(int pos, boolean seendigit) {
+        radix = 16;
+        Assert.check(reader.ch == '.');
+        reader.putChar(true);
+        skipIllegalUnderscores();
+        if (reader.digit(pos, 16) >= 0) {
+            seendigit = true;
+            scanDigits(pos, 16);
+        }
+        if (!seendigit)
+            lexError(pos, "invalid.hex.number");
+        else
+            scanHexExponentAndSuffix(pos);
+    }
+
+    private void skipIllegalUnderscores() {
+        if (reader.ch == '_') {
+            lexError(reader.bp, "illegal.underscore");
+            while (reader.ch == '_')
+                reader.scanChar();
+        }
+    }
+
+    /** Read a number.
+     *  @param radix  The radix of the number; one of 2, j8, 10, 16.
+     */
+    private void scanNumber(int pos, int radix) {
+        // for octal, allow base-10 digit in case it's a float literal
+        this.radix = radix;
+        int digitRadix = (radix == 8 ? 10 : radix);
+        boolean seendigit = false;
+        if (reader.digit(pos, digitRadix) >= 0) {
+            seendigit = true;
+            scanDigits(pos, digitRadix);
+        }
+        if (radix == 16 && reader.ch == '.') {
+            scanHexFractionAndSuffix(pos, seendigit);
+        } else if (seendigit && radix == 16 && (reader.ch == 'p' || reader.ch == 'P')) {
+            scanHexExponentAndSuffix(pos);
+        } else if (digitRadix == 10 && reader.ch == '.') {
+            reader.putChar(true);
+            scanFractionAndSuffix(pos);
+        } else if (digitRadix == 10 &&
+                   (reader.ch == 'e' || reader.ch == 'E' ||
+                    reader.ch == 'f' || reader.ch == 'F' ||
+                    reader.ch == 'd' || reader.ch == 'D')) {
+            scanFractionAndSuffix(pos);
+        } else {
+            if (reader.ch == 'l' || reader.ch == 'L') {
+                reader.scanChar();
+                tk = TokenKind.LONGLITERAL;
+            } else {
+                tk = TokenKind.INTLITERAL;
+            }
+        }
+    }
+
+    /** Read an identifier.
+     */
+    private void scanIdent() {
+        boolean isJavaIdentifierPart;
+        char high;
+        do {
+            reader.putChar(true);
+            switch (reader.ch) {
+            case 'A': case 'B': case 'C': case 'D': case 'E':
+            case 'F': case 'G': case 'H': case 'I': case 'J':
+            case 'K': case 'L': case 'M': case 'N': case 'O':
+            case 'P': case 'Q': case 'R': case 'S': case 'T':
+            case 'U': case 'V': case 'W': case 'X': case 'Y':
+            case 'Z':
+            case 'a': case 'b': case 'c': case 'd': case 'e':
+            case 'f': case 'g': case 'h': case 'i': case 'j':
+            case 'k': case 'l': case 'm': case 'n': case 'o':
+            case 'p': case 'q': case 'r': case 's': case 't':
+            case 'u': case 'v': case 'w': case 'x': case 'y':
+            case 'z':
+            case '$': case '_':
+            case '0': case '1': case '2': case '3': case '4':
+            case '5': case '6': case '7': case '8': case '9':
+            case '\u0000': case '\u0001': case '\u0002': case '\u0003':
+            case '\u0004': case '\u0005': case '\u0006': case '\u0007':
+            case '\u0008': case '\u000E': case '\u000F': case '\u0010':
+            case '\u0011': case '\u0012': case '\u0013': case '\u0014':
+            case '\u0015': case '\u0016': case '\u0017':
+            case '\u0018': case '\u0019': case '\u001B':
+            case '\u007F':
+                break;
+            case '\u001A': // EOI is also a legal identifier part
+                if (reader.bp >= reader.buflen) {
+                    name = reader.name();
+                    tk = tokens.lookupKind(name);
+                    return;
+                }
+                break;
+            default:
+                if (reader.ch < '\u0080') {
+                    // all ASCII range chars already handled, above
+                    isJavaIdentifierPart = false;
+                } else {
+                    high = reader.scanSurrogates();
+                    if (high != 0) {
+                        reader.putChar(high);
+                        isJavaIdentifierPart = Character.isJavaIdentifierPart(
+                            Character.toCodePoint(high, reader.ch));
+                    } else {
+                        isJavaIdentifierPart = Character.isJavaIdentifierPart(reader.ch);
+                    }
+                }
+                if (!isJavaIdentifierPart) {
+                    name = reader.name();
+                    tk = tokens.lookupKind(name);
+                    return;
+                }
+            }
+        } while (true);
+    }
+
+    /** Return true if reader.ch can be part of an operator.
+     */
+    private boolean isSpecial(char ch) {
+        switch (ch) {
+        case '!': case '%': case '&': case '*': case '?':
+        case '+': case '-': case ':': case '<': case '=':
+        case '>': case '^': case '|': case '~':
+        case '@':
+            return true;
+        default:
+            return false;
+        }
+    }
+
+    /** Read longest possible sequence of special characters and convert
+     *  to token.
+     */
+    private void scanOperator() {
+        while (true) {
+            reader.putChar(false);
+            Name newname = reader.name();
+            TokenKind tk1 = tokens.lookupKind(newname);
+            if (tk1 == TokenKind.IDENTIFIER) {
+                reader.sp--;
+                break;
+            }
+            tk = tk1;
+            reader.scanChar();
+            if (!isSpecial(reader.ch)) break;
+        }
+    }
+
+    /* same as scanIdent, except
+     * 1. '.' and '-' included
+     * 2. set tk to VERSION_LITERAL
+     */
+    private void scanVersionLiteral() {
+        boolean isJavaIdentifierPart;
+        char high;
+        do {
+            reader.putChar(true);
+            switch (reader.ch) {
+            case '-': case '.': // specific to version literals
+            case 'A': case 'B': case 'C': case 'D': case 'E':
+            case 'F': case 'G': case 'H': case 'I': case 'J':
+            case 'K': case 'L': case 'M': case 'N': case 'O':
+            case 'P': case 'Q': case 'R': case 'S': case 'T':
+            case 'U': case 'V': case 'W': case 'X': case 'Y':
+            case 'Z':
+            case 'a': case 'b': case 'c': case 'd': case 'e':
+            case 'f': case 'g': case 'h': case 'i': case 'j':
+            case 'k': case 'l': case 'm': case 'n': case 'o':
+            case 'p': case 'q': case 'r': case 's': case 't':
+            case 'u': case 'v': case 'w': case 'x': case 'y':
+            case 'z':
+            case '$': case '_':
+            case '0': case '1': case '2': case '3': case '4':
+            case '5': case '6': case '7': case '8': case '9':
+            case '\u0000': case '\u0001': case '\u0002': case '\u0003':
+            case '\u0004': case '\u0005': case '\u0006': case '\u0007':
+            case '\u0008': case '\u000E': case '\u000F': case '\u0010':
+            case '\u0011': case '\u0012': case '\u0013': case '\u0014':
+            case '\u0015': case '\u0016': case '\u0017':
+            case '\u0018': case '\u0019': case '\u001B':
+            case '\u007F':
+                break;
+            case '\u001A': // EOI is also a legal identifier part
+                if (reader.bp >= reader.buflen) {
+                    name = reader.name();
+                    tk = TokenKind.VERSIONLITERAL;
+                    return;
+                }
+                break;
+            default:
+                if (reader.ch < '\u0080') {
+                    // all ASCII range chars already handled, above
+                    isJavaIdentifierPart = false;
+                } else {
+                    high = reader.scanSurrogates();
+                    if (high != 0) {
+                        reader.putChar(high);
+                        isJavaIdentifierPart = Character.isJavaIdentifierPart(
+                            Character.toCodePoint(high, reader.ch));
+                    } else {
+                        isJavaIdentifierPart = Character.isJavaIdentifierPart(reader.ch);
+                    }
+                }
+                if (!isJavaIdentifierPart) {
+                    name = reader.name();
+                    tk = TokenKind.VERSIONLITERAL;
+                    return;
+                }
+            }
+        } while (true);
+    }
+
+    /** Read token.
+     */
+    public Token readToken() {
+
+        reader.sp = 0;
+        name = null;
+        radix = 0;
+
+        int pos = 0;
+        int endPos = 0;
+        List<Comment> comments = null;
+
+        try {
+            loop: while (true) {
+                pos = reader.bp;
+                switch (reader.ch) {
+                case ' ': // (Spec 3.6)
+                case '\t': // (Spec 3.6)
+                case FF: // (Spec 3.6)
+                    do {
+                        reader.scanChar();
+                    } while (reader.ch == ' ' || reader.ch == '\t' || reader.ch == FF);
+                    processWhiteSpace(pos, reader.bp);
+                    break;
+                case LF: // (Spec 3.4)
+                    reader.scanChar();
+                    processLineTerminator(pos, reader.bp);
+                    break;
+                case CR: // (Spec 3.4)
+                    reader.scanChar();
+                    if (reader.ch == LF) {
+                        reader.scanChar();
+                    }
+                    processLineTerminator(pos, reader.bp);
+                    break;
+                case 'A': case 'B': case 'C': case 'D': case 'E':
+                case 'F': case 'G': case 'H': case 'I': case 'J':
+                case 'K': case 'L': case 'M': case 'N': case 'O':
+                case 'P': case 'Q': case 'R': case 'S': case 'T':
+                case 'U': case 'V': case 'W': case 'X': case 'Y':
+                case 'Z':
+                case 'a': case 'b': case 'c': case 'd': case 'e':
+                case 'f': case 'g': case 'h': case 'i': case 'j':
+                case 'k': case 'l': case 'm': case 'n': case 'o':
+                case 'p': case 'q': case 'r': case 's': case 't':
+                case 'u': case 'v': case 'w': case 'x': case 'y':
+                case 'z':
+                case '$': case '_':
+                    scanIdent();
+                    break loop;
+                case '0':
+                    if (allowVersionLiteral) {
+                        scanVersionLiteral();
+                        break loop;
+                    }
+                    reader.scanChar();
+                    if (reader.ch == 'x' || reader.ch == 'X') {
+                        reader.scanChar();
+                        skipIllegalUnderscores();
+                        if (reader.ch == '.') {
+                            scanHexFractionAndSuffix(pos, false);
+                        } else if (reader.digit(pos, 16) < 0) {
+                            lexError(pos, "invalid.hex.number");
+                        } else {
+                            scanNumber(pos, 16);
+                        }
+                    } else if (reader.ch == 'b' || reader.ch == 'B') {
+                        if (!allowBinaryLiterals) {
+                            lexError(pos, "unsupported.binary.lit", source.name);
+                            allowBinaryLiterals = true;
+                        }
+                        reader.scanChar();
+                        skipIllegalUnderscores();
+                        if (reader.digit(pos, 2) < 0) {
+                            lexError(pos, "invalid.binary.number");
+                        } else {
+                            scanNumber(pos, 2);
+                        }
+                    } else {
+                        reader.putChar('0');
+                        if (reader.ch == '_') {
+                            int savePos = reader.bp;
+                            do {
+                                reader.scanChar();
+                            } while (reader.ch == '_');
+                            if (reader.digit(pos, 10) < 0) {
+                                lexError(savePos, "illegal.underscore");
+                            }
+                        }
+                        scanNumber(pos, 8);
+                    }
+                    break loop;
+                case '1': case '2': case '3': case '4':
+                case '5': case '6': case '7': case '8': case '9':
+                    if (allowVersionLiteral) {
+                        scanVersionLiteral();
+                        break loop;
+                    }
+                    scanNumber(pos, 10);
+                    break loop;
+                case '.':
+                    reader.scanChar();
+                    if ('0' <= reader.ch && reader.ch <= '9') {
+                        reader.putChar('.');
+                        scanFractionAndSuffix(pos);
+                    } else if (reader.ch == '.') {
+                        int savePos = reader.bp;
+                        reader.putChar('.'); reader.putChar('.', true);
+                        if (reader.ch == '.') {
+                            reader.scanChar();
+                            reader.putChar('.');
+                            tk = TokenKind.ELLIPSIS;
+                        } else {
+                            lexError(savePos, "illegal.dot");
+                        }
+                    } else {
+                        tk = TokenKind.DOT;
+                    }
+                    break loop;
+                case ',':
+                    reader.scanChar(); tk = TokenKind.COMMA; break loop;
+                case ';':
+                    reader.scanChar(); tk = TokenKind.SEMI; break loop;
+                case '(':
+                    reader.scanChar(); tk = TokenKind.LPAREN; break loop;
+                case ')':
+                    reader.scanChar(); tk = TokenKind.RPAREN; break loop;
+                case '[':
+                    reader.scanChar(); tk = TokenKind.LBRACKET; break loop;
+                case ']':
+                    reader.scanChar(); tk = TokenKind.RBRACKET; break loop;
+                case '{':
+                    reader.scanChar(); tk = TokenKind.LBRACE; break loop;
+                case '}':
+                    reader.scanChar(); tk = TokenKind.RBRACE; break loop;
+                case '/':
+                    reader.scanChar();
+                    if (reader.ch == '/') {
+                        do {
+                            reader.scanCommentChar();
+                        } while (reader.ch != CR && reader.ch != LF && reader.bp < reader.buflen);
+                        if (reader.bp < reader.buflen) {
+                            comments = addDocReader(comments, processComment(pos, reader.bp, CommentStyle.LINE));
+                        }
+                        break;
+                    } else if (reader.ch == '*') {
+                        boolean isEmpty = false;
+                        reader.scanChar();
+                        CommentStyle style;
+                        if (reader.ch == '*') {
+                            style = CommentStyle.JAVADOC;
+                            reader.scanCommentChar();
+                            if (reader.ch == '/') {
+                                isEmpty = true;
+                            }
+                        } else {
+                            style = CommentStyle.BLOCK;
+                        }
+                        while (!isEmpty && reader.bp < reader.buflen) {
+                            if (reader.ch == '*') {
+                                reader.scanChar();
+                                if (reader.ch == '/') break;
+                            } else {
+                                reader.scanCommentChar();
+                            }
+                        }
+                        if (reader.ch == '/') {
+                            reader.scanChar();
+                            comments = addDocReader(comments, processComment(pos, reader.bp, style));
+                            break;
+                        } else {
+                            lexError(pos, "unclosed.comment");
+                            break loop;
+                        }
+                    } else if (reader.ch == '=') {
+                        tk = TokenKind.SLASHEQ;
+                        reader.scanChar();
+                    } else {
+                        tk = TokenKind.SLASH;
+                    }
+                    break loop;
+                case '\'':
+                    reader.scanChar();
+                    if (reader.ch == '\'') {
+                        lexError(pos, "empty.char.lit");
+                    } else {
+                        if (reader.ch == CR || reader.ch == LF)
+                            lexError(pos, "illegal.line.end.in.char.lit");
+                        scanLitChar(pos);
+                        char ch2 = reader.ch;
+                        if (reader.ch == '\'') {
+                            reader.scanChar();
+                            tk = TokenKind.CHARLITERAL;
+                        } else {
+                            lexError(pos, "unclosed.char.lit");
+                        }
+                    }
+                    break loop;
+                case '\"':
+                    reader.scanChar();
+                    while (reader.ch != '\"' && reader.ch != CR && reader.ch != LF && reader.bp < reader.buflen)
+                        scanLitChar(pos);
+                    if (reader.ch == '\"') {
+                        tk = TokenKind.STRINGLITERAL;
+                        reader.scanChar();
+                    } else {
+                        lexError(pos, "unclosed.str.lit");
+                    }
+                    break loop;
+                case '#':
+                    reader.scanChar();
+                    tk = TokenKind.HASH;
+                    break loop;
+                default:
+                    if (isSpecial(reader.ch)) {
+                        scanOperator();
+                    } else {
+                        boolean isJavaIdentifierStart;
+                        if (reader.ch < '\u0080') {
+                            // all ASCII range chars already handled, above
+                            isJavaIdentifierStart = false;
+                        } else {
+                            char high = reader.scanSurrogates();
+                            if (high != 0) {
+                                reader.putChar(high);
+
+                                isJavaIdentifierStart = Character.isJavaIdentifierStart(
+                                    Character.toCodePoint(high, reader.ch));
+                            } else {
+                                isJavaIdentifierStart = Character.isJavaIdentifierStart(reader.ch);
+                            }
+                        }
+                        if (isJavaIdentifierStart) {
+                            scanIdent();
+                        } else if (reader.bp == reader.buflen || reader.ch == EOI && reader.bp + 1 == reader.buflen) { // JLS 3.5
+                            tk = TokenKind.EOF;
+                            pos = reader.buflen;
+                        } else {
+                            lexError(pos, "illegal.char", String.valueOf((int)reader.ch));
+                            reader.scanChar();
+                        }
+                    }
+                    break loop;
+                }
+            }
+            endPos = reader.bp;
+            switch (tk.tag) {
+                case DEFAULT: return new Token(tk, pos, endPos, comments);
+                case NAMED: return new NamedToken(tk, pos, endPos, name, comments);
+                case STRING: return new StringToken(tk, pos, endPos, reader.chars(), comments);
+                case NUMERIC: return new NumericToken(tk, pos, endPos, reader.chars(), radix, comments);
+                default: throw new AssertionError();
+            }
+        }
+        finally {
+            if (scannerDebug) {
+                    System.out.println("nextToken(" + pos
+                                       + "," + endPos + ")=|" +
+                                       new String(reader.getRawCharacters(pos, endPos))
+                                       + "|");
+            }
+        }
+    }
+    //where
+        List<Comment> addDocReader(List<Comment> docReaders, Comment docReader) {
+            return docReaders == null ?
+                    List.of(docReader) :
+                    docReaders.prepend(docReader);
+        }
+
+    /** Return the position where a lexical error occurred;
+     */
+    public int errPos() {
+        return errPos;
+    }
+
+    /** Set the position where a lexical error occurred;
+     */
+    public void errPos(int pos) {
+        errPos = pos;
+    }
+
+    /**
+     * Called when a complete comment has been scanned. pos and endPos
+     * will mark the comment boundary.
+     */
+    protected Tokens.Comment processComment(int pos, int endPos, CommentStyle style) {
+        if (scannerDebug)
+            System.out.println("processComment(" + pos
+                               + "," + endPos + "," + style + ")=|"
+                               + new String(reader.getRawCharacters(pos, endPos))
+                               + "|");
+        char[] buf = reader.getRawCharacters(pos, endPos);
+        return new BasicComment<UnicodeReader>(new UnicodeReader(fac, buf, buf.length), style);
+    }
+
+    /**
+     * Called when a complete whitespace run has been scanned. pos and endPos
+     * will mark the whitespace boundary.
+     */
+    protected void processWhiteSpace(int pos, int endPos) {
+        if (scannerDebug)
+            System.out.println("processWhitespace(" + pos
+                               + "," + endPos + ")=|" +
+                               new String(reader.getRawCharacters(pos, endPos))
+                               + "|");
+    }
+
+    /**
+     * Called when a line terminator has been processed.
+     */
+    protected void processLineTerminator(int pos, int endPos) {
+        if (scannerDebug)
+            System.out.println("processTerminator(" + pos
+                               + "," + endPos + ")=|" +
+                               new String(reader.getRawCharacters(pos, endPos))
+                               + "|");
+    }
+
+    /** Build a map for translating between line numbers and
+     * positions in the input.
+     *
+     * @return a LineMap */
+    public Position.LineMap getLineMap() {
+        return Position.makeLineMap(reader.getRawCharacters(), reader.buflen, false);
+    }
+
+
+    /**
+    * Scan a documentation comment; determine if a deprecated tag is present.
+    * Called once the initial /, * have been skipped, positioned at the second *
+    * (which is treated as the beginning of the first line).
+    * Stops positioned at the closing '/'.
+    */
+    protected class BasicComment<U extends UnicodeReader> implements Comment {
+
+        CommentStyle cs;
+        U comment_reader;
+
+        protected boolean deprecatedFlag = false;
+        protected boolean scanned = false;
+
+        protected BasicComment(U comment_reader, CommentStyle cs) {
+            this.comment_reader = comment_reader;
+            this.cs = cs;
+        }
+
+        public String getText() {
+            return null;
+        }
+
+        public CommentStyle getStyle() {
+            return cs;
+        }
+
+        public boolean isDeprecated() {
+            if (!scanned && cs == CommentStyle.JAVADOC) {
+                scanDocComment();
+            }
+            return deprecatedFlag;
+        }
+
+        @SuppressWarnings("fallthrough")
+        protected void scanDocComment() {
+            try {
+                boolean deprecatedPrefix = false;
+
+                comment_reader.bp += 3; // '/**'
+                comment_reader.ch = comment_reader.buf[comment_reader.bp];
+
+                forEachLine:
+                while (comment_reader.bp < comment_reader.buflen) {
+
+                    // Skip optional WhiteSpace at beginning of line
+                    while (comment_reader.bp < comment_reader.buflen && (comment_reader.ch == ' ' || comment_reader.ch == '\t' || comment_reader.ch == FF)) {
+                        comment_reader.scanCommentChar();
+                    }
+
+                    // Skip optional consecutive Stars
+                    while (comment_reader.bp < comment_reader.buflen && comment_reader.ch == '*') {
+                        comment_reader.scanCommentChar();
+                        if (comment_reader.ch == '/') {
+                            return;
+                        }
+                    }
+
+                    // Skip optional WhiteSpace after Stars
+                    while (comment_reader.bp < comment_reader.buflen && (comment_reader.ch == ' ' || comment_reader.ch == '\t' || comment_reader.ch == FF)) {
+                        comment_reader.scanCommentChar();
+                    }
+
+                    deprecatedPrefix = false;
+                    // At beginning of line in the JavaDoc sense.
+                    if (!deprecatedFlag) {
+                        String deprecated = "@deprecated";
+                        int i = 0;
+                        while (comment_reader.bp < comment_reader.buflen && comment_reader.ch == deprecated.charAt(i)) {
+                            comment_reader.scanCommentChar();
+                            i++;
+                            if (i == deprecated.length()) {
+                                deprecatedPrefix = true;
+                                break;
+                            }
+                        }
+                    }
+
+                    if (deprecatedPrefix && comment_reader.bp < comment_reader.buflen) {
+                        if (Character.isWhitespace(comment_reader.ch)) {
+                            deprecatedFlag = true;
+                        } else if (comment_reader.ch == '*') {
+                            comment_reader.scanCommentChar();
+                            if (comment_reader.ch == '/') {
+                                deprecatedFlag = true;
+                                return;
+                            }
+                        }
+                    }
+
+                    // Skip rest of line
+                    while (comment_reader.bp < comment_reader.buflen) {
+                        switch (comment_reader.ch) {
+                            case '*':
+                                comment_reader.scanCommentChar();
+                                if (comment_reader.ch == '/') {
+                                    return;
+                                }
+                                break;
+                            case CR: // (Spec 3.4)
+                                comment_reader.scanCommentChar();
+                                if (comment_reader.ch != LF) {
+                                    continue forEachLine;
+                                }
+                            /* fall through to LF case */
+                            case LF: // (Spec 3.4)
+                                comment_reader.scanCommentChar();
+                                continue forEachLine;
+                            default:
+                                comment_reader.scanCommentChar();
+                        }
+                    } // rest of line
+                } // forEachLine
+                return;
+            } finally {
+                scanned = true;
+            }
+        }
+    }
+}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
index 31abace..9c9abdd 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -27,7 +27,12 @@ package com.sun.tools.javac.parser;
 
 import java.util.*;
 
+import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
+import com.sun.source.tree.RequiresFlag;
+
 import com.sun.tools.javac.code.*;
+import com.sun.tools.javac.parser.Tokens.*;
+import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
 import com.sun.tools.javac.tree.*;
 import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.util.*;
@@ -35,8 +40,17 @@ import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 import com.sun.tools.javac.util.List;
 
+import static com.sun.tools.javac.parser.Tokens.TokenKind.*;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.ASSERT;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.CASE;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.CATCH;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.EQ;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.GT;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.IMPORT;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.LT;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.PACKAGE;
 import static com.sun.tools.javac.util.ListBuffer.lb;
-import static com.sun.tools.javac.parser.Token.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
 
 /** The parser maps a token sequence into an abstract syntax
  *  tree. It operates by recursive descent, with code derived
@@ -67,27 +81,27 @@ public class JavacParser implements Parser {
      */
     private Log log;
 
-    /** The keyword table. */
-    private Keywords keywords;
-
     /** The Source language setting. */
     private Source source;
 
     /** The name table. */
     private Names names;
 
+    /** End position mappings container */
+    private final AbstractEndPosTable endPosTable;
+
     /** Construct a parser from a given scanner, tree factory and log.
      */
     protected JavacParser(ParserFactory fac,
                      Lexer S,
                      boolean keepDocComments,
-                     boolean keepLineMap) {
+                     boolean keepLineMap,
+                     boolean keepEndPositions) {
         this.S = S;
-        S.nextToken(); // prime the pump
+        nextToken(); // prime the pump
         this.F = fac.F;
         this.log = fac.log;
         this.names = fac.names;
-        this.keywords = fac.keywords;
         this.source = fac.source;
         this.allowGenerics = source.allowGenerics();
         this.allowVarargs = source.allowVarargs();
@@ -100,14 +114,23 @@ public class JavacParser implements Parser {
         this.allowDiamond = source.allowDiamond();
         this.allowMulticatch = source.allowMulticatch();
         this.allowStringFolding = fac.options.getBoolean("allowStringFolding", true);
+        this.allowLambda = source.allowLambda() &&
+                fac.options.isSet("allowLambda");
+        this.allowMethodReferences = source.allowMethodReferences() &&
+                fac.options.isSet("allowMethodReferences");
         this.allowModules = source.allowModules();
-        this.allowImportsBeforePackage = source.allowImportsBeforePackage();
         this.keepDocComments = keepDocComments;
         docComments = keepDocComments ? new HashMap<JCTree,String>() : null;
         this.keepLineMap = keepLineMap;
         this.errorTree = F.Erroneous();
+        endPosTable = newEndPosTable(keepEndPositions);
     }
 
+    protected AbstractEndPosTable newEndPosTable(boolean keepEndPositions) {
+        return  keepEndPositions
+                ? new SimpleEndPosTable()
+                : new EmptyEndPosTable();
+    }
     /** Switch: Should generics be recognized?
      */
     boolean allowGenerics;
@@ -152,13 +175,17 @@ public class JavacParser implements Parser {
      */
     boolean allowStringFolding;
 
-    /** Switch: should we recognize modules?
+    /** Switch: should we recognize lambda expressions?
      */
-    boolean allowModules;
+    boolean allowLambda;
+
+    /** Switch: should we allow method/constructor references?
+     */
+    boolean allowMethodReferences;
 
-    /** Switch: should we recognize import before package?
+    /** Switch: should we recognize modules?
      */
-    boolean allowImportsBeforePackage;
+    boolean allowModules;
 
     /** Switch: should we keep docComments?
      */
@@ -188,7 +215,40 @@ public class JavacParser implements Parser {
      */
     private int lastmode = 0;
 
-/* ---------- error recovery -------------- */
+    /* ---------- token management -------------- */
+
+    protected Token token;
+
+    protected void nextToken() {
+        S.nextToken();
+        token = S.token();
+    }
+
+    protected boolean peekToken(TokenKind tk) {
+        return S.token(1).kind == tk;
+    }
+
+    protected boolean peekToken(TokenKind tk1, TokenKind tk2) {
+        return S.token(1).kind == tk1 &&
+                S.token(2).kind == tk2;
+    }
+
+    protected boolean peekToken(TokenKind tk1, TokenKind tk2, TokenKind tk3) {
+        return S.token(1).kind == tk1 &&
+                S.token(2).kind == tk2 &&
+                S.token(3).kind == tk3;
+    }
+
+    protected boolean peekToken(TokenKind... kinds) {
+        for (int lookahead = 0 ; lookahead < kinds.length ; lookahead++) {
+            if (S.token(lookahead + 1).kind != kinds[lookahead]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /* ---------- error recovery -------------- */
 
     private JCErroneous errorTree;
 
@@ -196,9 +256,9 @@ public class JavacParser implements Parser {
      */
     private void skip(boolean stopAtImport, boolean stopAtMemberDecl, boolean stopAtIdentifier, boolean stopAtStatement) {
          while (true) {
-             switch (S.token()) {
+             switch (token.kind) {
                 case SEMI:
-                    S.nextToken();
+                    nextToken();
                     return;
                 case PUBLIC:
                 case FINAL:
@@ -259,15 +319,15 @@ public class JavacParser implements Parser {
                         return;
                     break;
             }
-            S.nextToken();
+            nextToken();
         }
     }
 
-    private JCErroneous syntaxError(int pos, String key, Token... args) {
+    private JCErroneous syntaxError(int pos, String key, TokenKind... args) {
         return syntaxError(pos, List.<JCTree>nil(), key, args);
     }
 
-    private JCErroneous syntaxError(int pos, List<JCTree> errs, String key, Token... args) {
+    private JCErroneous syntaxError(int pos, List<JCTree> errs, String key, TokenKind... args) {
         setErrorEndPos(pos);
         JCErroneous err = F.at(pos).Erroneous(errs);
         reportSyntaxError(err, key, (Object[])args);
@@ -297,16 +357,16 @@ public class JavacParser implements Parser {
     private void reportSyntaxError(JCDiagnostic.DiagnosticPosition diagPos, String key, Object... args) {
         int pos = diagPos.getPreferredPosition();
         if (pos > S.errPos() || pos == Position.NOPOS) {
-            if (S.token() == EOF) {
+            if (token.kind == EOF) {
                 error(diagPos, "premature.eof");
             } else {
                 error(diagPos, key, args);
             }
         }
         S.errPos(pos);
-        if (S.pos() == errorPos)
-            S.nextToken(); // guarantee progress
-        errorPos = S.pos();
+        if (token.pos == errorPos)
+            nextToken(); // guarantee progress
+        errorPos = token.pos;
     }
 
 
@@ -314,25 +374,25 @@ public class JavacParser implements Parser {
      *  reported at the same position.
      */
     private JCErroneous syntaxError(String key) {
-        return syntaxError(S.pos(), key);
+        return syntaxError(token.pos, key);
     }
 
     /** Generate a syntax error at current position unless one was
      *  already reported at the same position.
      */
-    private JCErroneous syntaxError(String key, Token arg) {
-        return syntaxError(S.pos(), key, arg);
+    private JCErroneous syntaxError(String key, TokenKind arg) {
+        return syntaxError(token.pos, key, arg);
     }
 
     /** If next input token matches given token, skip it, otherwise report
      *  an error.
      */
-    public void accept(Token token) {
-        if (S.token() == token) {
-            S.nextToken();
+    public void accept(TokenKind tk) {
+        if (token.kind == tk) {
+            nextToken();
         } else {
-            setErrorEndPos(S.pos());
-            reportSyntaxError(S.prevEndPos(), "expected", token);
+            setErrorEndPos(token.pos);
+            reportSyntaxError(S.prevToken().endPos, "expected", tk);
         }
     }
 
@@ -350,14 +410,14 @@ public class JavacParser implements Parser {
     /** Report an illegal start of expression/type error at current position.
      */
     JCExpression illegal() {
-        return illegal(S.pos());
+        return illegal(token.pos);
     }
 
     /** Diagnose a modifier flag from the set, if any. */
     void checkNoMods(long mods) {
         if (mods != 0) {
             long lowestMod = mods & -mods;
-            error(S.pos(), "mod.not.allowed.here",
+            error(token.pos, "mod.not.allowed.here",
                       Flags.asFlagSet(lowestMod));
         }
     }
@@ -384,37 +444,21 @@ public class JavacParser implements Parser {
 
 /* -------- source positions ------- */
 
-    private int errorEndPos = -1;
-
     private void setErrorEndPos(int errPos) {
-        if (errPos > errorEndPos)
-            errorEndPos = errPos;
+        endPosTable.setErrorEndPos(errPos);
     }
 
-    protected int getErrorEndPos() {
-        return errorEndPos;
+    private void storeEnd(JCTree tree, int endpos) {
+        endPosTable.storeEnd(tree, endpos);
     }
 
-    /**
-     * Store ending position for a tree.
-     * @param tree   The tree.
-     * @param endpos The ending position to associate with the tree.
-     */
-    protected void storeEnd(JCTree tree, int endpos) {}
-
-    /**
-     * Store ending position for a tree.  The ending position should
-     * be the ending position of the current token.
-     * @param t The tree.
-     */
-    protected <T extends JCTree> T to(T t) { return t; }
+    private <T extends JCTree> T to(T t) {
+        return endPosTable.to(t);
+    }
 
-    /**
-     * Store ending position for a tree.  The ending position should
-     * be greater of the ending position of the previous token and errorEndPos.
-     * @param t The tree.
-     */
-    protected <T extends JCTree> T toP(T t) { return t; }
+    private <T extends JCTree> T toP(T t) {
+        return endPosTable.toP(t);
+    }
 
     /** Get the start position for a tree node.  The start position is
      * defined to be the position of the first character of the first
@@ -434,7 +478,7 @@ public class JavacParser implements Parser {
      * @param tree  The tree node
      */
     public int getEndPos(JCTree tree) {
-        return Position.NOPOS;
+        return endPosTable.getEndPos(tree);
     }
 
 
@@ -445,30 +489,30 @@ public class JavacParser implements Parser {
      * Ident = IDENTIFIER
      */
     Name ident() {
-        if (S.token() == IDENTIFIER) {
-            Name name = S.name();
-            S.nextToken();
+        if (token.kind == IDENTIFIER) {
+            Name name = token.name();
+            nextToken();
             return name;
-        } else if (S.token() == ASSERT) {
+        } else if (token.kind == ASSERT) {
             if (allowAsserts) {
-                error(S.pos(), "assert.as.identifier");
-                S.nextToken();
+                error(token.pos, "assert.as.identifier");
+                nextToken();
                 return names.error;
             } else {
-                warning(S.pos(), "assert.as.identifier");
-                Name name = S.name();
-                S.nextToken();
+                warning(token.pos, "assert.as.identifier");
+                Name name = token.name();
+                nextToken();
                 return name;
             }
-        } else if (S.token() == ENUM) {
+        } else if (token.kind == ENUM) {
             if (allowEnums) {
-                error(S.pos(), "enum.as.identifier");
-                S.nextToken();
+                error(token.pos, "enum.as.identifier");
+                nextToken();
                 return names.error;
             } else {
-                warning(S.pos(), "enum.as.identifier");
-                Name name = S.name();
-                S.nextToken();
+                warning(token.pos, "enum.as.identifier");
+                Name name = token.name();
+                nextToken();
                 return name;
             }
         } else {
@@ -481,17 +525,17 @@ public class JavacParser implements Parser {
      * Qualident = Ident { DOT Ident }
      */
     public JCExpression qualident() {
-        JCExpression t = toP(F.at(S.pos()).Ident(ident()));
-        while (S.token() == DOT) {
-            int pos = S.pos();
-            S.nextToken();
+        JCExpression t = toP(F.at(token.pos).Ident(ident()));
+        while (token.kind == DOT) {
+            int pos = token.pos;
+            nextToken();
             t = toP(F.at(pos).Select(t, ident()));
         }
         return t;
     }
 
     JCExpression literal(Name prefix) {
-        return literal(prefix, S.pos());
+        return literal(prefix, token.pos);
     }
 
     /**
@@ -500,9 +544,9 @@ public class JavacParser implements Parser {
      */
     public JCExpression qualident(JCExpression head) {
         JCExpression t = head;
-        while (S.token() == DOT) {
-            int pos = S.pos();
-            S.nextToken();
+        while (token.kind == DOT) {
+            int pos = token.pos;
+            nextToken();
             t = toP(F.at(pos).Select(t, ident()));
         }
         return t;
@@ -522,27 +566,29 @@ public class JavacParser implements Parser {
      */
     JCExpression literal(Name prefix, int pos) {
         JCExpression t = errorTree;
-        switch (S.token()) {
+        switch (token.kind) {
         case INTLITERAL:
             try {
                 t = F.at(pos).Literal(
                     TypeTags.INT,
-                    Convert.string2int(strval(prefix), S.radix()));
+                    Convert.string2int(strval(prefix), token.radix()));
             } catch (NumberFormatException ex) {
-                error(S.pos(), "int.number.too.large", strval(prefix));
+                error(token.pos, "int.number.too.large", strval(prefix));
             }
             break;
         case LONGLITERAL:
             try {
                 t = F.at(pos).Literal(
                     TypeTags.LONG,
-                    new Long(Convert.string2long(strval(prefix), S.radix())));
+                    new Long(Convert.string2long(strval(prefix), token.radix())));
             } catch (NumberFormatException ex) {
-                error(S.pos(), "int.number.too.large", strval(prefix));
+                error(token.pos, "int.number.too.large", strval(prefix));
             }
             break;
         case FLOATLITERAL: {
-            String proper = (S.radix() == 16 ? ("0x"+ S.stringVal()) : S.stringVal());
+            String proper = token.radix() == 16 ?
+                    ("0x"+ token.stringVal()) :
+                    token.stringVal();
             Float n;
             try {
                 n = Float.valueOf(proper);
@@ -551,15 +597,17 @@ public class JavacParser implements Parser {
                 n = Float.NaN;
             }
             if (n.floatValue() == 0.0f && !isZero(proper))
-                error(S.pos(), "fp.number.too.small");
+                error(token.pos, "fp.number.too.small");
             else if (n.floatValue() == Float.POSITIVE_INFINITY)
-                error(S.pos(), "fp.number.too.large");
+                error(token.pos, "fp.number.too.large");
             else
                 t = F.at(pos).Literal(TypeTags.FLOAT, n);
             break;
         }
         case DOUBLELITERAL: {
-            String proper = (S.radix() == 16 ? ("0x"+ S.stringVal()) : S.stringVal());
+            String proper = token.radix() == 16 ?
+                    ("0x"+ token.stringVal()) :
+                    token.stringVal();
             Double n;
             try {
                 n = Double.valueOf(proper);
@@ -568,9 +616,9 @@ public class JavacParser implements Parser {
                 n = Double.NaN;
             }
             if (n.doubleValue() == 0.0d && !isZero(proper))
-                error(S.pos(), "fp.number.too.small");
+                error(token.pos, "fp.number.too.small");
             else if (n.doubleValue() == Double.POSITIVE_INFINITY)
-                error(S.pos(), "fp.number.too.large");
+                error(token.pos, "fp.number.too.large");
             else
                 t = F.at(pos).Literal(TypeTags.DOUBLE, n);
             break;
@@ -578,17 +626,17 @@ public class JavacParser implements Parser {
         case CHARLITERAL:
             t = F.at(pos).Literal(
                 TypeTags.CHAR,
-                S.stringVal().charAt(0) + 0);
+                token.stringVal().charAt(0) + 0);
             break;
         case STRINGLITERAL:
             t = F.at(pos).Literal(
                 TypeTags.CLASS,
-                S.stringVal());
+                token.stringVal());
             break;
         case TRUE: case FALSE:
             t = F.at(pos).Literal(
                 TypeTags.BOOLEAN,
-                (S.token() == TRUE ? 1 : 0));
+                (token.kind == TRUE ? 1 : 0));
             break;
         case NULL:
             t = F.at(pos).Literal(
@@ -600,8 +648,8 @@ public class JavacParser implements Parser {
         }
         if (t == errorTree)
             t = F.at(pos).Erroneous();
-        storeEnd(t, S.endPos());
-        S.nextToken();
+        storeEnd(t, token.endPos);
+        nextToken();
         return t;
     }
 //where
@@ -614,7 +662,7 @@ public class JavacParser implements Parser {
         }
 
         String strval(Name prefix) {
-            String s = S.stringVal();
+            String s = token.stringVal();
             return prefix.isEmpty() ? s : prefix + s;
         }
 
@@ -651,17 +699,17 @@ public class JavacParser implements Parser {
     JCExpression term() {
         JCExpression t = term1();
         if ((mode & EXPR) != 0 &&
-            S.token() == EQ || PLUSEQ.compareTo(S.token()) <= 0 && S.token().compareTo(GTGTGTEQ) <= 0)
+            token.kind == EQ || PLUSEQ.compareTo(token.kind) <= 0 && token.kind.compareTo(GTGTGTEQ) <= 0)
             return termRest(t);
         else
             return t;
     }
 
     JCExpression termRest(JCExpression t) {
-        switch (S.token()) {
+        switch (token.kind) {
         case EQ: {
-            int pos = S.pos();
-            S.nextToken();
+            int pos = token.pos;
+            nextToken();
             mode = EXPR;
             JCExpression t1 = term();
             return toP(F.at(pos).Assign(t, t1));
@@ -677,12 +725,12 @@ public class JavacParser implements Parser {
         case LTLTEQ:
         case GTGTEQ:
         case GTGTGTEQ:
-            int pos = S.pos();
-            Token token = S.token();
-            S.nextToken();
+            int pos = token.pos;
+            TokenKind tk = token.kind;
+            nextToken();
             mode = EXPR;
             JCExpression t1 = term();
-            return F.at(pos).Assignop(optag(token), t, t1);
+            return F.at(pos).Assignop(optag(tk), t, t1);
         default:
             return t;
         }
@@ -694,7 +742,7 @@ public class JavacParser implements Parser {
      */
     JCExpression term1() {
         JCExpression t = term2();
-        if ((mode & EXPR) != 0 && S.token() == QUES) {
+        if ((mode & EXPR) != 0 && token.kind == QUES) {
             mode = EXPR;
             return term1Rest(t);
         } else {
@@ -705,9 +753,9 @@ public class JavacParser implements Parser {
     /** Expression1Rest = ["?" Expression ":" Expression1]
      */
     JCExpression term1Rest(JCExpression t) {
-        if (S.token() == QUES) {
-            int pos = S.pos();
-            S.nextToken();
+        if (token.kind == QUES) {
+            int pos = token.pos;
+            nextToken();
             JCExpression t1 = term();
             accept(COLON);
             JCExpression t2 = term1();
@@ -723,7 +771,7 @@ public class JavacParser implements Parser {
      */
     JCExpression term2() {
         JCExpression t = term3();
-        if ((mode & EXPR) != 0 && prec(S.token()) >= TreeInfo.orPrec) {
+        if ((mode & EXPR) != 0 && prec(token.kind) >= TreeInfo.orPrec) {
             mode = EXPR;
             return term2Rest(t, TreeInfo.orPrec);
         } else {
@@ -749,34 +797,29 @@ public class JavacParser implements Parser {
         JCExpression[] odStack = newOdStack();
         List<Token[]> savedOp = opStackSupply.elems;
         Token[] opStack = newOpStack();
-        List<int[]> savedPos = posStackSupply.elems;
-        int[] posStack = newPosStack();
+
         // optimization, was odStack = new Tree[...]; opStack = new Tree[...];
         int top = 0;
         odStack[0] = t;
-        int startPos = S.pos();
-        Token topOp = ERROR;
-        int topOpPos = Position.NOPOS;
-        while (prec(S.token()) >= minprec) {
-            posStack[top] = topOpPos;
+        int startPos = token.pos;
+        Token topOp = Tokens.DUMMY;
+        while (prec(token.kind) >= minprec) {
             opStack[top] = topOp;
             top++;
-            topOp = S.token();
-            topOpPos = S.pos();
-            S.nextToken();
-            odStack[top] = (topOp == INSTANCEOF) ? parseType() : term3();
-            while (top > 0 && prec(topOp) >= prec(S.token())) {
-                odStack[top-1] = makeOp(topOpPos, topOp, odStack[top-1],
+            topOp = token;
+            nextToken();
+            odStack[top] = (topOp.kind == INSTANCEOF) ? parseType() : term3();
+            while (top > 0 && prec(topOp.kind) >= prec(token.kind)) {
+                odStack[top-1] = makeOp(topOp.pos, topOp.kind, odStack[top-1],
                                         odStack[top]);
                 top--;
                 topOp = opStack[top];
-                topOpPos = posStack[top];
             }
         }
         Assert.check(top == 0);
         t = odStack[0];
 
-        if (t.getTag() == JCTree.PLUS) {
+        if (t.hasTag(JCTree.Tag.PLUS)) {
             StringBuffer buf = foldStrings(t);
             if (buf != null) {
                 t = toP(F.at(startPos).Literal(TypeTags.CLASS, buf.toString()));
@@ -785,14 +828,13 @@ public class JavacParser implements Parser {
 
         odStackSupply.elems = savedOd; // optimization
         opStackSupply.elems = savedOp; // optimization
-        posStackSupply.elems = savedPos; // optimization
         return t;
     }
 //where
         /** Construct a binary or type test node.
          */
         private JCExpression makeOp(int pos,
-                                    Token topOp,
+                                    TokenKind topOp,
                                     JCExpression od1,
                                     JCExpression od2)
         {
@@ -810,7 +852,7 @@ public class JavacParser implements Parser {
                 return null;
             List<String> buf = List.nil();
             while (true) {
-                if (tree.getTag() == JCTree.LITERAL) {
+                if (tree.hasTag(LITERAL)) {
                     JCLiteral lit = (JCLiteral) tree;
                     if (lit.typetag == TypeTags.CLASS) {
                         StringBuffer sbuf =
@@ -821,9 +863,9 @@ public class JavacParser implements Parser {
                         }
                         return sbuf;
                     }
-                } else if (tree.getTag() == JCTree.PLUS) {
+                } else if (tree.hasTag(JCTree.Tag.PLUS)) {
                     JCBinary op = (JCBinary)tree;
-                    if (op.rhs.getTag() == JCTree.LITERAL) {
+                    if (op.rhs.hasTag(LITERAL)) {
                         JCLiteral lit = (JCLiteral) op.rhs;
                         if (lit.typetag == TypeTags.CLASS) {
                             buf = buf.prepend((String) lit.value);
@@ -841,7 +883,6 @@ public class JavacParser implements Parser {
          */
         ListBuffer<JCExpression[]> odStackSupply = new ListBuffer<JCExpression[]>();
         ListBuffer<Token[]> opStackSupply = new ListBuffer<Token[]>();
-        ListBuffer<int[]> posStackSupply = new ListBuffer<int[]>();
 
         private JCExpression[] newOdStack() {
             if (odStackSupply.elems == odStackSupply.last)
@@ -859,14 +900,6 @@ public class JavacParser implements Parser {
             return opStack;
         }
 
-        private int[] newPosStack() {
-            if (posStackSupply.elems == posStackSupply.last)
-                posStackSupply.append(new int[infixPrecedenceLevels + 1]);
-            int[] posStack = posStackSupply.elems.head;
-            posStackSupply.elems = posStackSupply.elems.tail;
-            return posStack;
-        }
-
     /** Expression3    = PrefixOp Expression3
      *                 | "(" Expr | TypeNoParams ")" Expression3
      *                 | Primary {Selector} {PostfixOp}
@@ -875,7 +908,10 @@ public class JavacParser implements Parser {
      *                 | [TypeArguments] THIS [Arguments]
      *                 | [TypeArguments] SUPER SuperSuffix
      *                 | NEW [TypeArguments] Creator
+     *                 | "(" Arguments ")" "->" ( Expression | Block )
+     *                 | Ident "->" ( Expression | Block )
      *                 | Ident { "." Ident }
+     *                 | Expression3 MemberReferenceSuffix
      *                   [ "[" ( "]" BracketsOpt "." CLASS | Expression "]" )
      *                   | Arguments
      *                   | "." ( CLASS | THIS | [TypeArguments] SUPER Arguments | NEW [TypeArguments] InnerCreator )
@@ -895,10 +931,10 @@ public class JavacParser implements Parser {
      *  SuperSuffix    = Arguments | "." Ident [Arguments]
      */
     protected JCExpression term3() {
-        int pos = S.pos();
+        int pos = token.pos;
         JCExpression t;
         List<JCExpression> typeArgs = typeArgumentsOpt(EXPR);
-        switch (S.token()) {
+        switch (token.kind) {
         case QUES:
             if ((mode & TYPE) != 0 && (mode & (TYPEARG|NOPARAMS)) == TYPEARG) {
                 mode = TYPE;
@@ -907,64 +943,91 @@ public class JavacParser implements Parser {
                 return illegal();
         case PLUSPLUS: case SUBSUB: case BANG: case TILDE: case PLUS: case SUB:
             if (typeArgs == null && (mode & EXPR) != 0) {
-                Token token = S.token();
-                S.nextToken();
+                TokenKind tk = token.kind;
+                nextToken();
                 mode = EXPR;
-                if (token == SUB &&
-                    (S.token() == INTLITERAL || S.token() == LONGLITERAL) &&
-                    S.radix() == 10) {
+                if (tk == SUB &&
+                    (token.kind == INTLITERAL || token.kind == LONGLITERAL) &&
+                    token.radix() == 10) {
                     mode = EXPR;
                     t = literal(names.hyphen, pos);
                 } else {
                     t = term3();
-                    return F.at(pos).Unary(unoptag(token), t);
+                    return F.at(pos).Unary(unoptag(tk), t);
                 }
             } else return illegal();
             break;
         case LPAREN:
             if (typeArgs == null && (mode & EXPR) != 0) {
-                S.nextToken();
-                mode = EXPR | TYPE | NOPARAMS;
-                t = term3();
-                if ((mode & TYPE) != 0 && S.token() == LT) {
-                    // Could be a cast to a parameterized type
-                    int op = JCTree.LT;
-                    int pos1 = S.pos();
-                    S.nextToken();
-                    mode &= (EXPR | TYPE);
-                    mode |= TYPEARG;
-                    JCExpression t1 = term3();
-                    if ((mode & TYPE) != 0 &&
-                        (S.token() == COMMA || S.token() == GT)) {
-                        mode = TYPE;
-                        ListBuffer<JCExpression> args = new ListBuffer<JCExpression>();
-                        args.append(t1);
-                        while (S.token() == COMMA) {
-                            S.nextToken();
-                            args.append(typeArgument());
-                        }
-                        accept(GT);
-                        t = toP(F.at(pos1).TypeApply(t, args.toList()));
-                        checkGenerics();
-                        while (S.token() == DOT) {
-                            S.nextToken();
+                if (peekToken(FINAL) ||
+                        peekToken(RPAREN) ||
+                        peekToken(IDENTIFIER, COMMA) ||
+                        peekToken(IDENTIFIER, RPAREN, ARROW)) {
+                    //implicit n-ary lambda
+                    t = lambdaExpressionOrStatement(true, peekToken(FINAL), pos);
+                    break;
+                } else {
+                    nextToken();
+                    mode = EXPR | TYPE | NOPARAMS;
+                    t = term3();
+                    if ((mode & TYPE) != 0 && token.kind == LT) {
+                        // Could be a cast to a parameterized type
+                        JCTree.Tag op = JCTree.Tag.LT;
+                        int pos1 = token.pos;
+                        nextToken();
+                        mode &= (EXPR | TYPE);
+                        mode |= TYPEARG;
+                        JCExpression t1 = term3();
+                        if ((mode & TYPE) != 0 &&
+                            (token.kind == COMMA || token.kind == GT)) {
                             mode = TYPE;
-                            t = toP(F.at(S.pos()).Select(t, ident()));
-                            t = typeArgumentsOpt(t);
+                            ListBuffer<JCExpression> args = new ListBuffer<JCExpression>();
+                            args.append(t1);
+                            while (token.kind == COMMA) {
+                                nextToken();
+                                args.append(typeArgument());
+                            }
+                            accept(GT);
+                            t = toP(F.at(pos1).TypeApply(t, args.toList()));
+                            checkGenerics();
+                            mode = EXPR | TYPE; //could be a lambda or a method ref or a cast to a type
+                            t = term3Rest(t, typeArgs);
+                            if (token.kind == IDENTIFIER || token.kind == ELLIPSIS) {
+                                //explicit lambda (w/ generic type)
+                                mode = EXPR;
+                                JCModifiers mods = F.at(token.pos).Modifiers(Flags.PARAMETER);
+                                if (token.kind == ELLIPSIS) {
+                                    mods.flags = Flags.VARARGS;
+                                    t = to(F.at(token.pos).TypeArray(t));
+                                    nextToken();
+                                }
+                                t = lambdaExpressionOrStatement(variableDeclaratorId(mods, t), pos);
+                                break;
+                            }
+                        } else {
+                            Assert.check((mode & EXPR) != 0);
+                            mode = EXPR;
+                            JCExpression e = term2Rest(t1, TreeInfo.shiftPrec);
+                            t = F.at(pos1).Binary(op, t, e);
+                            t = termRest(term1Rest(term2Rest(t, TreeInfo.orPrec)));
                         }
-                        t = bracketsOpt(toP(t));
-                    } else if ((mode & EXPR) != 0) {
+                    } else if ((mode & TYPE) != 0 &&
+                            (token.kind == IDENTIFIER || token.kind == ELLIPSIS)) {
+                        //explicit lambda (w/ non-generic type)
                         mode = EXPR;
-                        JCExpression e = term2Rest(t1, TreeInfo.shiftPrec);
-                        t = F.at(pos1).Binary(op, t, e);
-                        t = termRest(term1Rest(term2Rest(t, TreeInfo.orPrec)));
+                        JCModifiers mods = F.at(token.pos).Modifiers(Flags.PARAMETER);
+                        if (token.kind == ELLIPSIS) {
+                            mods.flags = Flags.VARARGS;
+                            t = to(F.at(token.pos).TypeArray(t));
+                            nextToken();
+                        }
+                        t = lambdaExpressionOrStatement(variableDeclaratorId(mods, t), pos);
+                        break;
                     } else {
-                        accept(GT);
+                        t = termRest(term1Rest(term2Rest(t, TreeInfo.orPrec)));
                     }
                 }
-                else {
-                    t = termRest(term1Rest(term2Rest(t, TreeInfo.orPrec)));
-                }
+
                 accept(RPAREN);
                 lastmode = mode;
                 mode = EXPR;
@@ -972,28 +1035,30 @@ public class JavacParser implements Parser {
                     JCExpression t1 = term3();
                     return F.at(pos).TypeCast(t, t1);
                 } else if ((lastmode & TYPE) != 0) {
-                    switch (S.token()) {
+                    switch (token.kind) {
                     /*case PLUSPLUS: case SUBSUB: */
                     case BANG: case TILDE:
                     case LPAREN: case THIS: case SUPER:
                     case INTLITERAL: case LONGLITERAL: case FLOATLITERAL:
                     case DOUBLELITERAL: case CHARLITERAL: case STRINGLITERAL:
                     case TRUE: case FALSE: case NULL:
-                    case NEW: case IDENTIFIER: case ASSERT: case ENUM:
+                        case NEW: case IDENTIFIER: case ASSERT: case ENUM:
                     case BYTE: case SHORT: case CHAR: case INT:
                     case LONG: case FLOAT: case DOUBLE: case BOOLEAN: case VOID:
                         JCExpression t1 = term3();
                         return F.at(pos).TypeCast(t, t1);
                     }
                 }
-            } else return illegal();
+            } else {
+                return illegal();
+            }
             t = toP(F.at(pos).Parens(t));
             break;
         case THIS:
             if ((mode & EXPR) != 0) {
                 mode = EXPR;
                 t = to(F.at(pos).Ident(names._this));
-                S.nextToken();
+                nextToken();
                 if (typeArgs == null)
                     t = argumentsOpt(null, t);
                 else
@@ -1021,83 +1086,116 @@ public class JavacParser implements Parser {
             if (typeArgs != null) return illegal();
             if ((mode & EXPR) != 0) {
                 mode = EXPR;
-                S.nextToken();
-                if (S.token() == LT) typeArgs = typeArguments(false);
+                nextToken();
+                if (token.kind == LT) typeArgs = typeArguments(false);
                 t = creator(pos, typeArgs);
                 typeArgs = null;
             } else return illegal();
             break;
         case IDENTIFIER: case ASSERT: case ENUM:
             if (typeArgs != null) return illegal();
-            t = toP(F.at(S.pos()).Ident(ident()));
-            loop: while (true) {
-                pos = S.pos();
-                switch (S.token()) {
-                case LBRACKET:
-                    S.nextToken();
-                    if (S.token() == RBRACKET) {
-                        S.nextToken();
-                        t = bracketsOpt(t);
-                        t = toP(F.at(pos).TypeArray(t));
-                        t = bracketsSuffix(t);
-                    } else {
-                        if ((mode & EXPR) != 0) {
-                            mode = EXPR;
-                            JCExpression t1 = term();
-                            t = to(F.at(pos).Indexed(t, t1));
+            if ((mode & EXPR) != 0 && peekToken(ARROW)) {
+                t = lambdaExpressionOrStatement(false, false, pos);
+            } else {
+                t = toP(F.at(token.pos).Ident(ident()));
+                loop: while (true) {
+                    pos = token.pos;
+                    switch (token.kind) {
+                    case LBRACKET:
+                        nextToken();
+                        if (token.kind == RBRACKET) {
+                            nextToken();
+                            t = bracketsOpt(t);
+                            t = toP(F.at(pos).TypeArray(t));
+                            t = bracketsSuffix(t);
+                        } else {
+                            if ((mode & EXPR) != 0) {
+                                mode = EXPR;
+                                JCExpression t1 = term();
+                                t = to(F.at(pos).Indexed(t, t1));
+                            }
+                            accept(RBRACKET);
                         }
-                        accept(RBRACKET);
-                    }
-                    break loop;
-                case LPAREN:
-                    if ((mode & EXPR) != 0) {
-                        mode = EXPR;
-                        t = arguments(typeArgs, t);
-                        typeArgs = null;
-                    }
-                    break loop;
-                case DOT:
-                    S.nextToken();
-                    int oldmode = mode;
-                    mode &= ~NOPARAMS;
-                    typeArgs = typeArgumentsOpt(EXPR);
-                    mode = oldmode;
-                    if ((mode & EXPR) != 0) {
-                        switch (S.token()) {
-                        case CLASS:
-                            if (typeArgs != null) return illegal();
-                            mode = EXPR;
-                            t = to(F.at(pos).Select(t, names._class));
-                            S.nextToken();
-                            break loop;
-                        case THIS:
-                            if (typeArgs != null) return illegal();
-                            mode = EXPR;
-                            t = to(F.at(pos).Select(t, names._this));
-                            S.nextToken();
-                            break loop;
-                        case SUPER:
+                        break loop;
+                    case LPAREN:
+                        if ((mode & EXPR) != 0) {
                             mode = EXPR;
-                            t = to(F.at(pos).Select(t, names._super));
-                            t = superSuffix(typeArgs, t);
+                            t = arguments(typeArgs, t);
                             typeArgs = null;
-                            break loop;
-                        case NEW:
-                            if (typeArgs != null) return illegal();
+                        }
+                        break loop;
+                    case DOT:
+                        nextToken();
+                        int oldmode = mode;
+                        mode &= ~NOPARAMS;
+                        typeArgs = typeArgumentsOpt(EXPR);
+                        mode = oldmode;
+                        if ((mode & EXPR) != 0) {
+                            switch (token.kind) {
+                            case CLASS:
+                                if (typeArgs != null) return illegal();
+                                mode = EXPR;
+                                t = to(F.at(pos).Select(t, names._class));
+                                nextToken();
+                                break loop;
+                            case THIS:
+                                if (typeArgs != null) return illegal();
+                                mode = EXPR;
+                                t = to(F.at(pos).Select(t, names._this));
+                                nextToken();
+                                break loop;
+                            case SUPER:
+                                mode = EXPR;
+                                t = to(F.at(pos).Select(t, names._super));
+                                t = superSuffix(typeArgs, t);
+                                typeArgs = null;
+                                break loop;
+                            case NEW:
+                                if (typeArgs != null) return illegal();
+                                mode = EXPR;
+                                int pos1 = token.pos;
+                                nextToken();
+                                if (token.kind == LT) typeArgs = typeArguments(false);
+                                t = innerCreator(pos1, typeArgs, t);
+                                typeArgs = null;
+                                break loop;
+                            }
+                        }
+                        // typeArgs saved for next loop iteration.
+                        t = toP(F.at(pos).Select(t, ident()));
+                        break;
+                    case LT:
+                        if ((mode & TYPE) == 0 && isUnboundMemberRef()) {
+                            //this is an unbound method reference whose qualifier
+                            //is a generic type i.e. A<S>#m
+                            int pos1 = token.pos;
+                            accept(LT);
+                            ListBuffer<JCExpression> args = new ListBuffer<JCExpression>();
+                            args.append(typeArgument());
+                            while (token.kind == COMMA) {
+                                nextToken();
+                                args.append(typeArgument());
+                            }
+                            accept(GT);
+                            t = toP(F.at(pos1).TypeApply(t, args.toList()));
+                            checkGenerics();
+                            while (token.kind == DOT) {
+                                nextToken();
+                                mode = TYPE;
+                                t = toP(F.at(token.pos).Select(t, ident()));
+                                t = typeArgumentsOpt(t);
+                            }
+                            if (token.kind != HASH) {
+                                //method reference expected here
+                                t = illegal();
+                            }
                             mode = EXPR;
-                            int pos1 = S.pos();
-                            S.nextToken();
-                            if (S.token() == LT) typeArgs = typeArguments(false);
-                            t = innerCreator(pos1, typeArgs, t);
-                            typeArgs = null;
-                            break loop;
+                            return term3Rest(t, typeArgs);
                         }
+                        break loop;
+                    default:
+                        break loop;
                     }
-                    // typeArgs saved for next loop iteration.
-                    t = toP(F.at(pos).Select(t, ident()));
-                    break;
-                default:
-                    break loop;
                 }
             }
             if (typeArgs != null) illegal();
@@ -1111,8 +1209,8 @@ public class JavacParser implements Parser {
         case VOID:
             if (typeArgs != null) illegal();
             if ((mode & EXPR) != 0) {
-                S.nextToken();
-                if (S.token() == DOT) {
+                nextToken();
+                if (token.kind == DOT) {
                     JCPrimitiveTypeTree ti = toP(F.at(pos).TypeIdent(TypeTags.VOID));
                     t = bracketsSuffix(ti);
                 } else {
@@ -1123,7 +1221,7 @@ public class JavacParser implements Parser {
                 // a void type (like other primitive types) to the next phase.
                 // The error will be reported in Attr.attribTypes or Attr.visitApply.
                 JCPrimitiveTypeTree ti = to(F.at(pos).TypeIdent(TypeTags.VOID));
-                S.nextToken();
+                nextToken();
                 return ti;
                 //return illegal();
             }
@@ -1131,16 +1229,20 @@ public class JavacParser implements Parser {
         default:
             return illegal();
         }
+        return term3Rest(t, typeArgs);
+    }
+
+    JCExpression term3Rest(JCExpression t, List<JCExpression> typeArgs) {
         if (typeArgs != null) illegal();
         while (true) {
-            int pos1 = S.pos();
-            if (S.token() == LBRACKET) {
-                S.nextToken();
+            int pos1 = token.pos;
+            if (token.kind == LBRACKET) {
+                nextToken();
                 if ((mode & TYPE) != 0) {
                     int oldmode = mode;
                     mode = TYPE;
-                    if (S.token() == RBRACKET) {
-                        S.nextToken();
+                    if (token.kind == RBRACKET) {
+                        nextToken();
                         t = bracketsOpt(t);
                         t = toP(F.at(pos1).TypeArray(t));
                         return t;
@@ -1153,21 +1255,21 @@ public class JavacParser implements Parser {
                     t = to(F.at(pos1).Indexed(t, t1));
                 }
                 accept(RBRACKET);
-            } else if (S.token() == DOT) {
-                S.nextToken();
+            } else if (token.kind == DOT) {
+                nextToken();
                 typeArgs = typeArgumentsOpt(EXPR);
-                if (S.token() == SUPER && (mode & EXPR) != 0) {
+                if (token.kind == SUPER && (mode & EXPR) != 0) {
                     mode = EXPR;
                     t = to(F.at(pos1).Select(t, names._super));
-                    S.nextToken();
+                    nextToken();
                     t = arguments(typeArgs, t);
                     typeArgs = null;
-                } else if (S.token() == NEW && (mode & EXPR) != 0) {
+                } else if (token.kind == NEW && (mode & EXPR) != 0) {
                     if (typeArgs != null) return illegal();
                     mode = EXPR;
-                    int pos2 = S.pos();
-                    S.nextToken();
-                    if (S.token() == LT) typeArgs = typeArguments(false);
+                    int pos2 = token.pos;
+                    nextToken();
+                    if (token.kind == LT) typeArgs = typeArguments(false);
                     t = innerCreator(pos2, typeArgs, t);
                     typeArgs = null;
                 } else {
@@ -1175,29 +1277,116 @@ public class JavacParser implements Parser {
                     t = argumentsOpt(typeArgs, typeArgumentsOpt(t));
                     typeArgs = null;
                 }
+            } else if ((mode & EXPR) != 0 && token.kind == HASH) {
+                mode = EXPR;
+                if (typeArgs != null) return illegal();
+                accept(HASH);
+                t = memberReferenceSuffix(pos1, t);
             } else {
                 break;
             }
         }
-        while ((S.token() == PLUSPLUS || S.token() == SUBSUB) && (mode & EXPR) != 0) {
+        while ((token.kind == PLUSPLUS || token.kind == SUBSUB) && (mode & EXPR) != 0) {
             mode = EXPR;
-            t = to(F.at(S.pos()).Unary(
-                  S.token() == PLUSPLUS ? JCTree.POSTINC : JCTree.POSTDEC, t));
-            S.nextToken();
+            t = to(F.at(token.pos).Unary(
+                  token.kind == PLUSPLUS ? POSTINC : POSTDEC, t));
+            nextToken();
         }
         return toP(t);
     }
 
+    /**
+     * If we see an identifier followed by a '<' it could be an unbound
+     * method reference or a binary expression. To disambiguate, look for a
+     * matching '>' and see if the subsequent terminal is either '.' or '#'.
+     */
+    @SuppressWarnings("fallthrough")
+    boolean isUnboundMemberRef() {
+        int pos = 0, depth = 0;
+        for (Token t = S.token(pos) ; ; t = S.token(++pos)) {
+            switch (t.kind) {
+                case IDENTIFIER: case QUES: case EXTENDS: case SUPER:
+                case DOT: case RBRACKET: case LBRACKET: case COMMA:
+                case BYTE: case SHORT: case INT: case LONG: case FLOAT:
+                case DOUBLE: case BOOLEAN: case CHAR:
+                    break;
+                case LT:
+                    depth++; break;
+                case GTGTGT:
+                    depth--;
+                case GTGT:
+                    depth--;
+                case GT:
+                    depth--;
+                    if (depth == 0) {
+                        return
+                            S.token(pos + 1).kind == TokenKind.DOT ||
+                            S.token(pos + 1).kind == TokenKind.HASH;
+                    }
+                    break;
+                default:
+                    return false;
+            }
+        }
+    }
+
+    JCExpression lambdaExpressionOrStatement(JCVariableDecl firstParam, int pos) {
+        ListBuffer<JCVariableDecl> params = new ListBuffer<JCVariableDecl>();
+        params.append(firstParam);
+        JCVariableDecl lastParam = firstParam;
+        while ((lastParam.mods.flags & Flags.VARARGS) == 0 && token.kind == COMMA) {
+            nextToken();
+            params.append(lastParam = formalParameter());
+        }
+        accept(RPAREN);
+        return lambdaExpressionOrStatementRest(params.toList(), pos);
+    }
+
+    JCExpression lambdaExpressionOrStatement(boolean hasParens, boolean explicitParams, int pos) {
+        List<JCVariableDecl> params = explicitParams ?
+                formalParameters() :
+                implicitParameters(hasParens);
+
+        return lambdaExpressionOrStatementRest(params, pos);
+    }
+
+    JCExpression lambdaExpressionOrStatementRest(List<JCVariableDecl> args, int pos) {
+        if (token.kind != ARROW) {
+            //better error recovery
+            return F.at(pos).Erroneous(args);
+        }
+
+        checkLambda();
+        accept(ARROW);
+
+        return token.kind == LBRACE ?
+            lambdaStatement(args, pos, pos) :
+            lambdaExpression(args, pos);
+    }
+
+    JCExpression lambdaStatement(List<JCVariableDecl> args, int pos, int pos2) {
+        JCBlock block = block(pos2, 0);
+        return toP(F.at(pos).Lambda(args, block));
+    }
+
+    JCExpression lambdaExpression(List<JCVariableDecl> args, int pos) {
+        JCTree expr = parseExpression();
+        return toP(F.at(pos).Lambda(args, expr));
+    }
+
     /** SuperSuffix = Arguments | "." [TypeArguments] Ident [Arguments]
      */
     JCExpression superSuffix(List<JCExpression> typeArgs, JCExpression t) {
-        S.nextToken();
-        if (S.token() == LPAREN || typeArgs != null) {
+        nextToken();
+        if (token.kind == LPAREN || typeArgs != null) {
             t = arguments(typeArgs, t);
+        } else if (token.kind == HASH) {
+            if (typeArgs != null) return illegal();
+            t = memberReferenceSuffix(t);
         } else {
-            int pos = S.pos();
+            int pos = token.pos;
             accept(DOT);
-            typeArgs = (S.token() == LT) ? typeArguments(false) : null;
+            typeArgs = (token.kind == LT) ? typeArguments(false) : null;
             t = toP(F.at(pos).Select(t, ident()));
             t = argumentsOpt(typeArgs, t);
         }
@@ -1207,15 +1396,15 @@ public class JavacParser implements Parser {
     /** BasicType = BYTE | SHORT | CHAR | INT | LONG | FLOAT | DOUBLE | BOOLEAN
      */
     JCPrimitiveTypeTree basicType() {
-        JCPrimitiveTypeTree t = to(F.at(S.pos()).TypeIdent(typetag(S.token())));
-        S.nextToken();
+        JCPrimitiveTypeTree t = to(F.at(token.pos).TypeIdent(typetag(token.kind)));
+        nextToken();
         return t;
     }
 
     /** ArgumentsOpt = [ Arguments ]
      */
     JCExpression argumentsOpt(List<JCExpression> typeArgs, JCExpression t) {
-        if ((mode & EXPR) != 0 && S.token() == LPAREN || typeArgs != null) {
+        if ((mode & EXPR) != 0 && token.kind == LPAREN || typeArgs != null) {
             mode = EXPR;
             return arguments(typeArgs, t);
         } else {
@@ -1227,24 +1416,24 @@ public class JavacParser implements Parser {
      */
     List<JCExpression> arguments() {
         ListBuffer<JCExpression> args = lb();
-        if (S.token() == LPAREN) {
-            S.nextToken();
-            if (S.token() != RPAREN) {
+        if (token.kind == LPAREN) {
+            nextToken();
+            if (token.kind != RPAREN) {
                 args.append(parseExpression());
-                while (S.token() == COMMA) {
-                    S.nextToken();
+                while (token.kind == COMMA) {
+                    nextToken();
                     args.append(parseExpression());
                 }
             }
             accept(RPAREN);
         } else {
-            syntaxError(S.pos(), "expected", LPAREN);
+            syntaxError(token.pos, "expected", LPAREN);
         }
         return args.toList();
     }
 
     JCMethodInvocation arguments(List<JCExpression> typeArgs, JCExpression t) {
-        int pos = S.pos();
+        int pos = token.pos;
         List<JCExpression> args = arguments();
         return toP(F.at(pos).Apply(typeArgs, t, args));
     }
@@ -1252,7 +1441,7 @@ public class JavacParser implements Parser {
     /**  TypeArgumentsOpt = [ TypeArguments ]
      */
     JCExpression typeArgumentsOpt(JCExpression t) {
-        if (S.token() == LT &&
+        if (token.kind == LT &&
             (mode & TYPE) != 0 &&
             (mode & NOPARAMS) == 0) {
             mode = TYPE;
@@ -1267,7 +1456,7 @@ public class JavacParser implements Parser {
     }
 
     List<JCExpression> typeArgumentsOpt(int useMode) {
-        if (S.token() == LT) {
+        if (token.kind == LT) {
             checkGenerics();
             if ((mode & useMode) == 0 ||
                 (mode & NOPARAMS) != 0) {
@@ -1282,47 +1471,37 @@ public class JavacParser implements Parser {
     /**  TypeArguments  = "<" TypeArgument {"," TypeArgument} ">"
      */
     List<JCExpression> typeArguments(boolean diamondAllowed) {
-        if (S.token() == LT) {
-            S.nextToken();
-            if (S.token() == GT && diamondAllowed) {
+        if (token.kind == LT) {
+            nextToken();
+            if (token.kind == GT && diamondAllowed) {
                 checkDiamond();
                 mode |= DIAMOND;
-                S.nextToken();
+                nextToken();
                 return List.nil();
             } else {
                 ListBuffer<JCExpression> args = ListBuffer.lb();
                 args.append(((mode & EXPR) == 0) ? typeArgument() : parseType());
-                while (S.token() == COMMA) {
-                    S.nextToken();
+                while (token.kind == COMMA) {
+                    nextToken();
                     args.append(((mode & EXPR) == 0) ? typeArgument() : parseType());
                 }
-                switch (S.token()) {
-                case GTGTGTEQ:
-                    S.token(GTGTEQ);
-                    break;
-                case GTGTEQ:
-                    S.token(GTEQ);
-                    break;
-                case GTEQ:
-                    S.token(EQ);
-                    break;
-                case GTGTGT:
-                    S.token(GTGT);
-                    break;
-                case GTGT:
-                    S.token(GT);
+                switch (token.kind) {
+
+                case GTGTGTEQ: case GTGTEQ: case GTEQ:
+                case GTGTGT: case GTGT:
+                    token = S.split();
                     break;
                 case GT:
-                    S.nextToken();
+                    nextToken();
                     break;
                 default:
-                    args.append(syntaxError(S.pos(), "expected", GT));
+                    args.append(syntaxError(token.pos, "expected", GT));
                     break;
                 }
                 return args.toList();
             }
         } else {
-            return List.<JCExpression>of(syntaxError(S.pos(), "expected", LT));
+            return List.<JCExpression>of(syntaxError(token.pos, "expected", LT));
         }
     }
 
@@ -1332,24 +1511,24 @@ public class JavacParser implements Parser {
      *               | "?" SUPER Type
      */
     JCExpression typeArgument() {
-        if (S.token() != QUES) return parseType();
-        int pos = S.pos();
-        S.nextToken();
-        if (S.token() == EXTENDS) {
+        if (token.kind != QUES) return parseType();
+        int pos = token.pos;
+        nextToken();
+        if (token.kind == EXTENDS) {
             TypeBoundKind t = to(F.at(pos).TypeBoundKind(BoundKind.EXTENDS));
-            S.nextToken();
+            nextToken();
             JCExpression bound = parseType();
             return F.at(pos).Wildcard(t, bound);
-        } else if (S.token() == SUPER) {
+        } else if (token.kind == SUPER) {
             TypeBoundKind t = to(F.at(pos).TypeBoundKind(BoundKind.SUPER));
-            S.nextToken();
+            nextToken();
             JCExpression bound = parseType();
             return F.at(pos).Wildcard(t, bound);
-        } else if (S.token() == IDENTIFIER) {
+        } else if (token.kind == IDENTIFIER) {
             //error recovery
             TypeBoundKind t = F.at(Position.NOPOS).TypeBoundKind(BoundKind.UNBOUND);
             JCExpression wc = toP(F.at(pos).Wildcard(t, null));
-            JCIdent id = toP(F.at(S.pos()).Ident(ident()));
+            JCIdent id = toP(F.at(token.pos).Ident(ident()));
             JCErroneous err = F.at(pos).Erroneous(List.<JCTree>of(wc, id));
             reportSyntaxError(err, "expected3", GT, EXTENDS, SUPER);
             return err;
@@ -1360,7 +1539,7 @@ public class JavacParser implements Parser {
     }
 
     JCTypeApply typeArguments(JCExpression t, boolean diamondAllowed) {
-        int pos = S.pos();
+        int pos = token.pos;
         List<JCExpression> args = typeArguments(diamondAllowed);
         return toP(F.at(pos).TypeApply(t, args));
     }
@@ -1368,9 +1547,9 @@ public class JavacParser implements Parser {
     /** BracketsOpt = {"[" "]"}
      */
     private JCExpression bracketsOpt(JCExpression t) {
-        if (S.token() == LBRACKET) {
-            int pos = S.pos();
-            S.nextToken();
+        if (token.kind == LBRACKET) {
+            int pos = token.pos;
+            nextToken();
             t = bracketsOptCont(t, pos);
             F.at(pos);
         }
@@ -1387,17 +1566,17 @@ public class JavacParser implements Parser {
      *  BracketsSuffixType =
      */
     JCExpression bracketsSuffix(JCExpression t) {
-        if ((mode & EXPR) != 0 && S.token() == DOT) {
+        if ((mode & EXPR) != 0 && token.kind == DOT) {
             mode = EXPR;
-            int pos = S.pos();
-            S.nextToken();
+            int pos = token.pos;
+            nextToken();
             accept(CLASS);
-            if (S.pos() == errorEndPos) {
+            if (token.pos == endPosTable.errorEndPos) {
                 // error recovery
                 Name name = null;
-                if (S.token() == IDENTIFIER) {
-                    name = S.name();
-                    S.nextToken();
+                if (token.kind == IDENTIFIER) {
+                    name = token.name();
+                    nextToken();
                 } else {
                     name = names.error;
                 }
@@ -1408,15 +1587,45 @@ public class JavacParser implements Parser {
         } else if ((mode & TYPE) != 0) {
             mode = TYPE;
         } else {
-            syntaxError(S.pos(), "dot.class.expected");
+            syntaxError(token.pos, "dot.class.expected");
         }
         return t;
     }
 
+    /**
+     * MemberReferenceSuffix = "#" [TypeArguments] Ident
+     *                       | "#" [TypeArguments] "new"
+     */
+    JCExpression memberReferenceSuffix(JCExpression t) {
+        int pos1 = token.pos;
+        accept(HASH);
+        return memberReferenceSuffix(pos1, t);
+    }
+
+    JCExpression memberReferenceSuffix(int pos1, JCExpression t) {
+        checkMethodReferences();
+        mode = EXPR;
+        List<JCExpression> typeArgs = null;
+        if (token.kind == LT) {
+            typeArgs = typeArguments(false);
+        }
+        Name refName = null;
+        ReferenceMode refMode = null;
+        if (token.kind == NEW) {
+            refMode = ReferenceMode.NEW;
+            refName = names.init;
+            nextToken();
+        } else {
+            refMode = ReferenceMode.INVOKE;
+            refName = ident();
+        }
+        return toP(F.at(t.getStartPosition()).Reference(refMode, refName, t, typeArgs));
+    }
+
     /** Creator = Qualident [TypeArguments] ( ArrayCreatorRest | ClassCreatorRest )
      */
     JCExpression creator(int newpos, List<JCExpression> typeArgs) {
-        switch (S.token()) {
+        switch (token.kind) {
         case BYTE: case SHORT: case CHAR: case INT: case LONG: case FLOAT:
         case DOUBLE: case BOOLEAN:
             if (typeArgs == null)
@@ -1429,29 +1638,29 @@ public class JavacParser implements Parser {
         mode = TYPE;
         boolean diamondFound = false;
         int lastTypeargsPos = -1;
-        if (S.token() == LT) {
+        if (token.kind == LT) {
             checkGenerics();
-            lastTypeargsPos = S.pos();
+            lastTypeargsPos = token.pos;
             t = typeArguments(t, true);
             diamondFound = (mode & DIAMOND) != 0;
         }
-        while (S.token() == DOT) {
+        while (token.kind == DOT) {
             if (diamondFound) {
                 //cannot select after a diamond
                 illegal();
             }
-            int pos = S.pos();
-            S.nextToken();
+            int pos = token.pos;
+            nextToken();
             t = toP(F.at(pos).Select(t, ident()));
-            if (S.token() == LT) {
-                lastTypeargsPos = S.pos();
+            if (token.kind == LT) {
+                lastTypeargsPos = token.pos;
                 checkGenerics();
                 t = typeArguments(t, true);
                 diamondFound = (mode & DIAMOND) != 0;
             }
         }
         mode = oldmode;
-        if (S.token() == LBRACKET) {
+        if (token.kind == LBRACKET) {
             JCExpression e = arrayCreatorRest(newpos, t);
             if (diamondFound) {
                 reportSyntaxError(lastTypeargsPos, "cannot.create.array.with.diamond");
@@ -1465,17 +1674,17 @@ public class JavacParser implements Parser {
                     // modified to improve error recovery.
                     pos = typeArgs.head.pos;
                 }
-                setErrorEndPos(S.prevEndPos());
+                setErrorEndPos(S.prevToken().endPos);
                 JCErroneous err = F.at(pos).Erroneous(typeArgs.prepend(e));
                 reportSyntaxError(err, "cannot.create.array.with.type.arguments");
                 return toP(err);
             }
             return e;
-        } else if (S.token() == LPAREN) {
+        } else if (token.kind == LPAREN) {
             return classCreatorRest(newpos, null, typeArgs, t);
         } else {
-            setErrorEndPos(S.pos());
-            reportSyntaxError(S.pos(), "expected2", LPAREN, LBRACKET);
+            setErrorEndPos(token.pos);
+            reportSyntaxError(token.pos, "expected2", LPAREN, LBRACKET);
             t = toP(F.at(newpos).NewClass(null, typeArgs, t, List.<JCExpression>nil(), null));
             return toP(F.at(newpos).Erroneous(List.<JCTree>of(t)));
         }
@@ -1484,8 +1693,8 @@ public class JavacParser implements Parser {
     /** InnerCreator = Ident [TypeArguments] ClassCreatorRest
      */
     JCExpression innerCreator(int newpos, List<JCExpression> typeArgs, JCExpression encl) {
-        JCExpression t = toP(F.at(S.pos()).Ident(ident()));
-        if (S.token() == LT) {
+        JCExpression t = toP(F.at(token.pos).Ident(ident()));
+        if (token.kind == LT) {
             int oldmode = mode;
             checkGenerics();
             t = typeArguments(t, true);
@@ -1499,23 +1708,23 @@ public class JavacParser implements Parser {
      */
     JCExpression arrayCreatorRest(int newpos, JCExpression elemtype) {
         accept(LBRACKET);
-        if (S.token() == RBRACKET) {
+        if (token.kind == RBRACKET) {
             accept(RBRACKET);
             elemtype = bracketsOpt(elemtype);
-            if (S.token() == LBRACE) {
+            if (token.kind == LBRACE) {
                 return arrayInitializer(newpos, elemtype);
             } else {
                 JCExpression t = toP(F.at(newpos).NewArray(elemtype, List.<JCExpression>nil(), null));
-                return syntaxError(S.pos(), List.<JCTree>of(t), "array.dimension.missing");
+                return syntaxError(token.pos, List.<JCTree>of(t), "array.dimension.missing");
             }
         } else {
             ListBuffer<JCExpression> dims = new ListBuffer<JCExpression>();
             dims.append(parseExpression());
             accept(RBRACKET);
-            while (S.token() == LBRACKET) {
-                int pos = S.pos();
-                S.nextToken();
-                if (S.token() == RBRACKET) {
+            while (token.kind == LBRACKET) {
+                int pos = token.pos;
+                nextToken();
+                if (token.kind == RBRACKET) {
                     elemtype = bracketsOptCont(elemtype, pos);
                 } else {
                     dims.append(parseExpression());
@@ -1535,9 +1744,9 @@ public class JavacParser implements Parser {
     {
         List<JCExpression> args = arguments();
         JCClassDecl body = null;
-        if (S.token() == LBRACE) {
-            int pos = S.pos();
-            List<JCTree> defs = classOrInterfaceBody(names.empty, CLASS);
+        if (token.kind == LBRACE) {
+            int pos = token.pos;
+            List<JCTree> defs = classOrInterfaceBody(names.empty, false);
             JCModifiers mods = F.at(Position.NOPOS).Modifiers(0);
             body = toP(F.at(pos).AnonymousClassDef(mods, defs));
         }
@@ -1549,13 +1758,13 @@ public class JavacParser implements Parser {
     JCExpression arrayInitializer(int newpos, JCExpression t) {
         accept(LBRACE);
         ListBuffer<JCExpression> elems = new ListBuffer<JCExpression>();
-        if (S.token() == COMMA) {
-            S.nextToken();
-        } else if (S.token() != RBRACE) {
+        if (token.kind == COMMA) {
+            nextToken();
+        } else if (token.kind != RBRACE) {
             elems.append(variableInitializer());
-            while (S.token() == COMMA) {
-                S.nextToken();
-                if (S.token() == RBRACE) break;
+            while (token.kind == COMMA) {
+                nextToken();
+                if (token.kind == RBRACE) break;
                 elems.append(variableInitializer());
             }
         }
@@ -1566,16 +1775,17 @@ public class JavacParser implements Parser {
     /** VariableInitializer = ArrayInitializer | Expression
      */
     public JCExpression variableInitializer() {
-        return S.token() == LBRACE ? arrayInitializer(S.pos(), null) : parseExpression();
+        return token.kind == LBRACE ? arrayInitializer(token.pos, null) : parseExpression();
     }
 
     /** ParExpression = "(" Expression ")"
      */
     JCExpression parExpression() {
+        int pos = token.pos;
         accept(LPAREN);
         JCExpression t = parseExpression();
         accept(RPAREN);
-        return t;
+        return toP(F.at(pos).Parens(t));
     }
 
     /** Block = "{" BlockStatements "}"
@@ -1584,19 +1794,19 @@ public class JavacParser implements Parser {
         accept(LBRACE);
         List<JCStatement> stats = blockStatements();
         JCBlock t = F.at(pos).Block(flags, stats);
-        while (S.token() == CASE || S.token() == DEFAULT) {
-            syntaxError("orphaned", S.token());
+        while (token.kind == CASE || token.kind == DEFAULT) {
+            syntaxError("orphaned", token.kind);
             switchBlockStatementGroups();
         }
         // the Block node has a field "endpos" for first char of last token, which is
         // usually but not necessarily the last char of the last token.
-        t.endpos = S.pos();
+        t.endpos = token.pos;
         accept(RBRACE);
         return toP(t);
     }
 
     public JCBlock block() {
-        return block(S.pos(), 0);
+        return block(token.pos, 0);
     }
 
     /** BlockStatements = { BlockStatement }
@@ -1612,8 +1822,8 @@ public class JavacParser implements Parser {
         int lastErrPos = -1;
         ListBuffer<JCStatement> stats = new ListBuffer<JCStatement>();
         while (true) {
-            int pos = S.pos();
-            switch (S.token()) {
+            int pos = token.pos;
+            switch (token.kind) {
             case RBRACE: case CASE: case DEFAULT: case EOF:
                 return stats.toList();
             case LBRACE: case IF: case FOR: case WHILE: case DO: case TRY:
@@ -1623,64 +1833,63 @@ public class JavacParser implements Parser {
                 break;
             case MONKEYS_AT:
             case FINAL: {
-                String dc = S.docComment();
-                JCModifiers mods = modifiersOpt(ModuleModifierKind.DISALLOWED);
-                if (S.token() == INTERFACE ||
-                    S.token() == CLASS ||
-                    allowEnums && S.token() == ENUM) {
+                String dc = token.comment(CommentStyle.JAVADOC);
+                JCModifiers mods = modifiersOpt();
+                if (token.kind == INTERFACE ||
+                    token.kind == CLASS ||
+                    allowEnums && token.kind == ENUM) {
                     stats.append(classOrInterfaceOrEnumDeclaration(mods, dc));
                 } else {
                     JCExpression t = parseType();
                     stats.appendList(variableDeclarators(mods, t,
                                                          new ListBuffer<JCStatement>()));
                     // A "LocalVariableDeclarationStatement" subsumes the terminating semicolon
-                    storeEnd(stats.elems.last(), S.endPos());
+                    storeEnd(stats.elems.last(), token.endPos);
                     accept(SEMI);
                 }
                 break;
             }
             case ABSTRACT: case STRICTFP: {
-                String dc = S.docComment();
-                JCModifiers mods = modifiersOpt(ModuleModifierKind.DISALLOWED);
+                String dc = token.comment(CommentStyle.JAVADOC);
+                JCModifiers mods = modifiersOpt();
                 stats.append(classOrInterfaceOrEnumDeclaration(mods, dc));
                 break;
             }
             case INTERFACE:
             case CLASS:
-                stats.append(classOrInterfaceOrEnumDeclaration(modifiersOpt(ModuleModifierKind.DISALLOWED),
-                                                               S.docComment()));
+                String dc = token.comment(CommentStyle.JAVADOC);
+                stats.append(classOrInterfaceOrEnumDeclaration(modifiersOpt(), dc));
                 break;
             case ENUM:
             case ASSERT:
-                if (allowEnums && S.token() == ENUM) {
-                    error(S.pos(), "local.enum");
-                    stats.
-                        append(classOrInterfaceOrEnumDeclaration(modifiersOpt(ModuleModifierKind.DISALLOWED),
-                                                                 S.docComment()));
+                if (allowEnums && token.kind == ENUM) {
+                    error(token.pos, "local.enum");
+                    dc = token.comment(CommentStyle.JAVADOC);
+                    stats.append(classOrInterfaceOrEnumDeclaration(modifiersOpt(), dc));
                     break;
-                } else if (allowAsserts && S.token() == ASSERT) {
+                } else if (allowAsserts && token.kind == ASSERT) {
                     stats.append(parseStatement());
                     break;
                 }
                 /* fall through to default */
             default:
-                Name name = S.name();
+                Token prevToken = token;
                 JCExpression t = term(EXPR | TYPE);
-                if (S.token() == COLON && t.getTag() == JCTree.IDENT) {
-                    S.nextToken();
+                if (token.kind == COLON && t.hasTag(IDENT)) {
+                    nextToken();
                     JCStatement stat = parseStatement();
-                    stats.append(F.at(pos).Labelled(name, stat));
+                    stats.append(F.at(pos).Labelled(prevToken.name(), stat));
                 } else if ((lastmode & TYPE) != 0 &&
-                           (S.token() == IDENTIFIER ||
-                            S.token() == ASSERT ||
-                            S.token() == ENUM)) {
-                    pos = S.pos();
+                           (token.kind == IDENTIFIER ||
+                            token.kind == ASSERT ||
+                            token.kind == ENUM)) {
+                    pos = token.pos;
                     JCModifiers mods = F.at(Position.NOPOS).Modifiers(0);
                     F.at(pos);
                     stats.appendList(variableDeclarators(mods, t,
                                                          new ListBuffer<JCStatement>()));
                     // A "LocalVariableDeclarationStatement" subsumes the terminating semicolon
-                    storeEnd(stats.elems.last(), S.endPos());
+                    storeEnd(stats.elems.last(), token.endPos);
                     accept(SEMI);
                 } else {
                     // This Exec is an "ExpressionStatement"; it subsumes the terminating semicolon
@@ -1690,15 +1899,12 @@ public class JavacParser implements Parser {
             }
 
             // error recovery
-            if (S.pos() == lastErrPos)
+            if (token.pos == lastErrPos)
                 return stats.toList();
-            if (S.pos() <= errorEndPos) {
+            if (token.pos <= endPosTable.errorEndPos) {
                 skip(false, true, true, true);
-                lastErrPos = S.pos();
+                lastErrPos = token.pos;
             }
-
-            // ensure no dangling /** @deprecated */ active
-            S.resetDeprecatedFlag();
         }
     }
 
@@ -1724,29 +1930,29 @@ public class JavacParser implements Parser {
      */
     @SuppressWarnings("fallthrough")
     public JCStatement parseStatement() {
-        int pos = S.pos();
-        switch (S.token()) {
+        int pos = token.pos;
+        switch (token.kind) {
         case LBRACE:
             return block();
         case IF: {
-            S.nextToken();
+            nextToken();
             JCExpression cond = parExpression();
             JCStatement thenpart = parseStatement();
             JCStatement elsepart = null;
-            if (S.token() == ELSE) {
-                S.nextToken();
+            if (token.kind == ELSE) {
+                nextToken();
                 elsepart = parseStatement();
             }
             return F.at(pos).If(cond, thenpart, elsepart);
         }
         case FOR: {
-            S.nextToken();
+            nextToken();
             accept(LPAREN);
-            List<JCStatement> inits = S.token() == SEMI ? List.<JCStatement>nil() : forInit();
+            List<JCStatement> inits = token.kind == SEMI ? List.<JCStatement>nil() : forInit();
             if (inits.length() == 1 &&
-                inits.head.getTag() == JCTree.VARDEF &&
+                inits.head.hasTag(VARDEF) &&
                 ((JCVariableDecl) inits.head).init == null &&
-                S.token() == COLON) {
+                token.kind == COLON) {
                 checkForeach();
                 JCVariableDecl var = (JCVariableDecl)inits.head;
                 accept(COLON);
@@ -1756,22 +1962,22 @@ public class JavacParser implements Parser {
                 return F.at(pos).ForeachLoop(var, expr, body);
             } else {
                 accept(SEMI);
-                JCExpression cond = S.token() == SEMI ? null : parseExpression();
+                JCExpression cond = token.kind == SEMI ? null : parseExpression();
                 accept(SEMI);
-                List<JCExpressionStatement> steps = S.token() == RPAREN ? List.<JCExpressionStatement>nil() : forUpdate();
+                List<JCExpressionStatement> steps = token.kind == RPAREN ? List.<JCExpressionStatement>nil() : forUpdate();
                 accept(RPAREN);
                 JCStatement body = parseStatement();
                 return F.at(pos).ForLoop(inits, cond, steps, body);
             }
         }
         case WHILE: {
-            S.nextToken();
+            nextToken();
             JCExpression cond = parExpression();
             JCStatement body = parseStatement();
             return F.at(pos).WhileLoop(cond, body);
         }
         case DO: {
-            S.nextToken();
+            nextToken();
             JCStatement body = parseStatement();
             accept(WHILE);
             JCExpression cond = parExpression();
@@ -1780,21 +1986,21 @@ public class JavacParser implements Parser {
             return t;
         }
         case TRY: {
-            S.nextToken();
+            nextToken();
             List<JCTree> resources = List.<JCTree>nil();
-            if (S.token() == LPAREN) {
+            if (token.kind == LPAREN) {
                 checkTryWithResources();
-                S.nextToken();
+                nextToken();
                 resources = resources();
                 accept(RPAREN);
             }
             JCBlock body = block();
             ListBuffer<JCCatch> catchers = new ListBuffer<JCCatch>();
             JCBlock finalizer = null;
-            if (S.token() == CATCH || S.token() == FINALLY) {
-                while (S.token() == CATCH) catchers.append(catchClause());
-                if (S.token() == FINALLY) {
-                    S.nextToken();
+            if (token.kind == CATCH || token.kind == FINALLY) {
+                while (token.kind == CATCH) catchers.append(catchClause());
+                if (token.kind == FINALLY) {
+                    nextToken();
                     finalizer = block();
                 }
             } else {
@@ -1807,7 +2013,7 @@ public class JavacParser implements Parser {
             return F.at(pos).Try(resources, body, catchers.toList(), finalizer);
         }
         case SWITCH: {
-            S.nextToken();
+            nextToken();
             JCExpression selector = parExpression();
             accept(LBRACE);
             List<JCCase> cases = switchBlockStatementGroups();
@@ -1816,41 +2022,41 @@ public class JavacParser implements Parser {
             return t;
         }
         case SYNCHRONIZED: {
-            S.nextToken();
+            nextToken();
             JCExpression lock = parExpression();
             JCBlock body = block();
             return F.at(pos).Synchronized(lock, body);
         }
         case RETURN: {
-            S.nextToken();
-            JCExpression result = S.token() == SEMI ? null : parseExpression();
+            nextToken();
+            JCExpression result = token.kind == SEMI ? null : parseExpression();
             JCReturn t = to(F.at(pos).Return(result));
             accept(SEMI);
             return t;
         }
         case THROW: {
-            S.nextToken();
+            nextToken();
             JCExpression exc = parseExpression();
             JCThrow t = to(F.at(pos).Throw(exc));
             accept(SEMI);
             return t;
         }
         case BREAK: {
-            S.nextToken();
-            Name label = (S.token() == IDENTIFIER || S.token() == ASSERT || S.token() == ENUM) ? ident() : null;
+            nextToken();
+            Name label = (token.kind == IDENTIFIER || token.kind == ASSERT || token.kind == ENUM) ? ident() : null;
             JCBreak t = to(F.at(pos).Break(label));
             accept(SEMI);
             return t;
         }
         case CONTINUE: {
-            S.nextToken();
-            Name label = (S.token() == IDENTIFIER || S.token() == ASSERT || S.token() == ENUM) ? ident() : null;
+            nextToken();
+            Name label = (token.kind == IDENTIFIER || token.kind == ASSERT || token.kind == ENUM) ? ident() : null;
             JCContinue t =  to(F.at(pos).Continue(label));
             accept(SEMI);
             return t;
         }
         case SEMI:
-            S.nextToken();
+            nextToken();
             return toP(F.at(pos).Skip());
         case ELSE:
             return toP(F.Exec(syntaxError("else.without.if")));
@@ -1859,12 +2065,12 @@ public class JavacParser implements Parser {
         case CATCH:
             return toP(F.Exec(syntaxError("catch.without.try")));
         case ASSERT: {
-            if (allowAsserts && S.token() == ASSERT) {
-                S.nextToken();
+            if (allowAsserts && token.kind == ASSERT) {
+                nextToken();
                 JCExpression assertion = parseExpression();
                 JCExpression message = null;
-                if (S.token() == COLON) {
-                    S.nextToken();
+                if (token.kind == COLON) {
+                    nextToken();
                     message = parseExpression();
                 }
                 JCAssert t = to(F.at(pos).Assert(assertion, message));
@@ -1875,12 +2081,12 @@ public class JavacParser implements Parser {
         }
         case ENUM:
         default:
-            Name name = S.name();
+            Token prevToken = token;
             JCExpression expr = parseExpression();
-            if (S.token() == COLON && expr.getTag() == JCTree.IDENT) {
-                S.nextToken();
+            if (token.kind == COLON && expr.hasTag(IDENT)) {
+                nextToken();
                 JCStatement stat = parseStatement();
-                return F.at(pos).Labelled(name, stat);
+                return F.at(pos).Labelled(prevToken.name(), stat);
             } else {
                 // This Exec is an "ExpressionStatement"; it subsumes the terminating semicolon
                 JCExpressionStatement stat = to(F.at(pos).Exec(checkExprStat(expr)));
@@ -1893,7 +2099,7 @@ public class JavacParser implements Parser {
     /** CatchClause     = CATCH "(" FormalParameter ")" Block
      */
     protected JCCatch catchClause() {
-        int pos = S.pos();
+        int pos = token.pos;
         accept(CATCH);
         accept(LPAREN);
         JCModifiers mods = optFinal(Flags.PARAMETER);
@@ -1910,9 +2116,9 @@ public class JavacParser implements Parser {
     List<JCExpression> catchTypes() {
         ListBuffer<JCExpression> catchTypes = ListBuffer.lb();
         catchTypes.add(parseType());
-        while (S.token() == BAR) {
+        while (token.kind == BAR) {
             checkMulticatch();
-            S.nextToken();
+            nextToken();
             catchTypes.add(qualident());
         }
         return catchTypes.toList();
@@ -1925,33 +2131,33 @@ public class JavacParser implements Parser {
     List<JCCase> switchBlockStatementGroups() {
         ListBuffer<JCCase> cases = new ListBuffer<JCCase>();
         while (true) {
-            int pos = S.pos();
-            switch (S.token()) {
+            int pos = token.pos;
+            switch (token.kind) {
             case CASE: {
-                S.nextToken();
+                nextToken();
                 JCExpression pat = parseExpression();
                 accept(COLON);
                 List<JCStatement> stats = blockStatements();
                 JCCase c = F.at(pos).Case(pat, stats);
                 if (stats.isEmpty())
-                    storeEnd(c, S.prevEndPos());
+                    storeEnd(c, S.prevToken().endPos);
                 cases.append(c);
                 break;
             }
             case DEFAULT: {
-                S.nextToken();
+                nextToken();
                 accept(COLON);
                 List<JCStatement> stats = blockStatements();
                 JCCase c = F.at(pos).Case(null, stats);
                 if (stats.isEmpty())
-                    storeEnd(c, S.prevEndPos());
+                    storeEnd(c, S.prevToken().endPos);
                 cases.append(c);
                 break;
             }
             case RBRACE: case EOF:
                 return cases.toList();
             default:
-                S.nextToken(); // to ensure progress
+                nextToken(); // to ensure progress
                 syntaxError(pos, "expected3",
                     CASE, DEFAULT, RBRACE);
             }
@@ -1965,9 +2171,9 @@ public class JavacParser implements Parser {
                                                                     T stats) {
         // This Exec is a "StatementExpression"; it subsumes no terminating token
         stats.append(toP(F.at(pos).Exec(checkExprStat(first))));
-        while (S.token() == COMMA) {
-            S.nextToken();
-            pos = S.pos();
+        while (token.kind == COMMA) {
+            nextToken();
+            pos = token.pos;
             JCExpression t = parseExpression();
             // This Exec is a "StatementExpression"; it subsumes no terminating token
             stats.append(toP(F.at(pos).Exec(checkExprStat(t))));
@@ -1980,14 +2186,14 @@ public class JavacParser implements Parser {
      */
     List<JCStatement> forInit() {
         ListBuffer<JCStatement> stats = lb();
-        int pos = S.pos();
-        if (S.token() == FINAL || S.token() == MONKEYS_AT) {
+        int pos = token.pos;
+        if (token.kind == FINAL || token.kind == MONKEYS_AT) {
             return variableDeclarators(optFinal(0), parseType(), stats).toList();
         } else {
             JCExpression t = term(EXPR | TYPE);
             if ((lastmode & TYPE) != 0 &&
-                (S.token() == IDENTIFIER || S.token() == ASSERT || S.token() == ENUM))
-                return variableDeclarators(modifiersOpt(ModuleModifierKind.DISALLOWED), t, stats).toList();
+                (token.kind == IDENTIFIER || token.kind == ASSERT || token.kind == ENUM))
+                return variableDeclarators(modifiersOpt(), t, stats).toList();
             else
                 return moreStatementExpressions(pos, t, stats).toList();
         }
@@ -1996,7 +2202,7 @@ public class JavacParser implements Parser {
     /** ForUpdate = StatementExpression MoreStatementExpressions
      */
     List<JCExpressionStatement> forUpdate() {
-        return moreStatementExpressions(S.pos(),
+        return moreStatementExpressions(token.pos,
                                         parseExpression(),
                                         new ListBuffer<JCExpressionStatement>()).toList();
     }
@@ -2004,53 +2210,44 @@ public class JavacParser implements Parser {
     /** AnnotationsOpt = { '@' Annotation }
      */
     List<JCAnnotation> annotationsOpt() {
-        if (S.token() != MONKEYS_AT) return List.nil(); // optimization
+        if (token.kind != MONKEYS_AT) return List.nil(); // optimization
         ListBuffer<JCAnnotation> buf = new ListBuffer<JCAnnotation>();
-        while (S.token() == MONKEYS_AT) {
-            int pos = S.pos();
-            S.nextToken();
+        while (token.kind == MONKEYS_AT) {
+            int pos = token.pos;
+            nextToken();
             buf.append(annotation(pos));
         }
         return buf.toList();
     }
 
-    enum ModuleModifierKind { DISALLOWED, LOOKAHEAD, ALLOWED };
-
     /** ModifiersOpt = { Modifier }
      *  Modifier = PUBLIC | PROTECTED | PRIVATE | STATIC | ABSTRACT | FINAL
      *           | NATIVE | SYNCHRONIZED | TRANSIENT | VOLATILE | "@"
      *           | "@" Annotation
      */
-    JCModifiers modifiersOpt(ModuleModifierKind mmk) {
-        return modifiersOpt(mmk, null, null);
-    }
-
-    JCModifiers modifiersOpt(ModuleModifierKind mmk, Name constrName) {
-        return modifiersOpt(mmk, null, constrName);
+    JCModifiers modifiersOpt() {
+        return modifiersOpt(null);
     }
-
-    @SuppressWarnings("fallthrough")
-    protected JCModifiers modifiersOpt(ModuleModifierKind mmk, JCModifiers partial, Name constrName) {
+    protected JCModifiers modifiersOpt(JCModifiers partial) {
         long flags;
         ListBuffer<JCAnnotation> annotations = new ListBuffer<JCAnnotation>();
         int pos;
         if (partial == null) {
             flags = 0;
-            pos = S.pos();
+            pos = token.pos;
         } else {
             flags = partial.flags;
             annotations.appendList(partial.annotations);
             pos = partial.pos;
         }
-        if (S.deprecatedFlag()) {
+        if (token.deprecatedFlag()) {
             flags |= Flags.DEPRECATED;
-            S.resetDeprecatedFlag();
         }
         int lastPos = Position.NOPOS;
     loop:
         while (true) {
             long flag;
-            switch (S.token()) {
+            switch (token.kind) {
             case PRIVATE     : flag = Flags.PRIVATE; break;
             case PROTECTED   : flag = Flags.PROTECTED; break;
             case PUBLIC      : flag = Flags.PUBLIC; break;
@@ -2063,50 +2260,15 @@ public class JavacParser implements Parser {
             case SYNCHRONIZED: flag = Flags.SYNCHRONIZED; break;
             case STRICTFP    : flag = Flags.STRICTFP; break;
             case MONKEYS_AT  : flag = Flags.ANNOTATION; break;
-            case ERROR       : flag = 0; S.nextToken(); break;
-            case IDENTIFIER:
-                if (S.name() != names.module)
-                    break loop;
-                switch (mmk) {
-                    case DISALLOWED:
-                        break loop;
-                    case LOOKAHEAD: {
-                        if ((flags & (Flags.AccessFlags)) != 0)
-                            break loop;
-                        S.mark();
-                        try {
-                            S.nextToken();
-                            if (S.token() == IDENTIFIER) {
-                                Name ident = S.name();
-                                S.nextToken();
-                                switch (S.token()) {
-                                    case SEMI:
-                                    case EQ:
-                                    case LBRACKET:
-                                        break loop;
-                                    case LPAREN:
-                                        if (ident == constrName)
-                                            break;
-                                        break loop;
-                                }
-                            }
-                        } finally {
-                            S.reset();
-                        }
-                    }
-                    case ALLOWED:
-                        break;
-                }
-                flag = Flags.MODULE;
-                break;
+            case ERROR       : flag = 0; nextToken(); break;
             default: break loop;
             }
-            if ((flags & flag) != 0) error(S.pos(), "repeated.modifier");
-            lastPos = S.pos();
-            S.nextToken();
+            if ((flags & flag) != 0) error(token.pos, "repeated.modifier");
+            lastPos = token.pos;
+            nextToken();
             if (flag == Flags.ANNOTATION) {
                 checkAnnotations();
-                if (S.token() != INTERFACE) {
+                if (token.kind != INTERFACE) {
                     JCAnnotation ann = annotation(lastPos);
                     // if first modifier is an annotation, set pos to annotation's.
                     if (flags == 0 && annotations.isEmpty())
@@ -2118,7 +2280,7 @@ public class JavacParser implements Parser {
             }
             flags |= flag;
         }
-        switch (S.token()) {
+        switch (token.kind) {
         case ENUM: flags |= Flags.ENUM; break;
         case INTERFACE: flags |= Flags.INTERFACE; break;
         default: break;
@@ -2131,7 +2293,7 @@ public class JavacParser implements Parser {
 
         JCModifiers mods = F.at(pos).Modifiers(flags, annotations.toList());
         if (pos != Position.NOPOS)
-            storeEnd(mods, S.prevEndPos());
+            storeEnd(mods, S.prevToken().endPos);
         return mods;
     }
 
@@ -2144,22 +2306,22 @@ public class JavacParser implements Parser {
         JCTree ident = qualident();
         List<JCExpression> fieldValues = annotationFieldValuesOpt();
         JCAnnotation ann = F.at(pos).Annotation(ident, fieldValues);
-        storeEnd(ann, S.prevEndPos());
+        storeEnd(ann, S.prevToken().endPos);
         return ann;
     }
 
     List<JCExpression> annotationFieldValuesOpt() {
-        return (S.token() == LPAREN) ? annotationFieldValues() : List.<JCExpression>nil();
+        return (token.kind == LPAREN) ? annotationFieldValues() : List.<JCExpression>nil();
     }
 
     /** AnnotationFieldValues   = "(" [ AnnotationFieldValue { "," AnnotationFieldValue } ] ")" */
     List<JCExpression> annotationFieldValues() {
         accept(LPAREN);
         ListBuffer<JCExpression> buf = new ListBuffer<JCExpression>();
-        if (S.token() != RPAREN) {
+        if (token.kind != RPAREN) {
             buf.append(annotationFieldValue());
-            while (S.token() == COMMA) {
-                S.nextToken();
+            while (token.kind == COMMA) {
+                nextToken();
                 buf.append(annotationFieldValue());
             }
         }
@@ -2171,11 +2333,11 @@ public class JavacParser implements Parser {
      *                          | Identifier "=" AnnotationValue
      */
     JCExpression annotationFieldValue() {
-        if (S.token() == IDENTIFIER) {
+        if (token.kind == IDENTIFIER) {
             mode = EXPR;
             JCExpression t1 = term1();
-            if (t1.getTag() == JCTree.IDENT && S.token() == EQ) {
-                int pos = S.pos();
+            if (t1.hasTag(IDENT) && token.kind == EQ) {
+                int pos = token.pos;
                 accept(EQ);
                 JCExpression v = annotationValue();
                 return toP(F.at(pos).Assign(t1, v));
@@ -2192,20 +2354,20 @@ public class JavacParser implements Parser {
      */
     JCExpression annotationValue() {
         int pos;
-        switch (S.token()) {
+        switch (token.kind) {
         case MONKEYS_AT:
-            pos = S.pos();
-            S.nextToken();
+            pos = token.pos;
+            nextToken();
             return annotation(pos);
         case LBRACE:
-            pos = S.pos();
+            pos = token.pos;
             accept(LBRACE);
             ListBuffer<JCExpression> buf = new ListBuffer<JCExpression>();
-            if (S.token() != RBRACE) {
+            if (token.kind != RBRACE) {
                 buf.append(annotationValue());
-                while (S.token() == COMMA) {
-                    S.nextToken();
-                    if (S.token() == RBRACE) break;
+                while (token.kind == COMMA) {
+                    nextToken();
+                    if (token.kind == RBRACE) break;
                     buf.append(annotationValue());
                 }
             }
@@ -2223,7 +2385,7 @@ public class JavacParser implements Parser {
                                                                          JCExpression type,
                                                                          T vdefs)
     {
-        return variableDeclaratorsRest(S.pos(), mods, type, ident(), false, null, vdefs);
+        return variableDeclaratorsRest(token.pos, mods, type, ident(), false, null, vdefs);
     }
 
     /** VariableDeclaratorsRest = VariableDeclaratorRest { "," VariableDeclarator }
@@ -2241,10 +2403,10 @@ public class JavacParser implements Parser {
                                                                      T vdefs)
     {
         vdefs.append(variableDeclaratorRest(pos, mods, type, name, reqInit, dc));
-        while (S.token() == COMMA) {
+        while (token.kind == COMMA) {
             // All but last of multiple declarators subsume a comma
-            storeEnd((JCTree)vdefs.elems.last(), S.endPos());
-            S.nextToken();
+            storeEnd((JCTree)vdefs.elems.last(), token.endPos);
+            nextToken();
             vdefs.append(variableDeclarator(mods, type, reqInit, dc));
         }
         return vdefs;
@@ -2254,7 +2416,7 @@ public class JavacParser implements Parser {
      *  ConstantDeclarator = Ident ConstantDeclaratorRest
      */
     JCVariableDecl variableDeclarator(JCModifiers mods, JCExpression type, boolean reqInit, String dc) {
-        return variableDeclaratorRest(S.pos(), mods, type, ident(), reqInit, dc);
+        return variableDeclaratorRest(token.pos, mods, type, ident(), reqInit, dc);
     }
 
     /** VariableDeclaratorRest = BracketsOpt ["=" VariableInitializer]
@@ -2267,11 +2429,11 @@ public class JavacParser implements Parser {
                                   boolean reqInit, String dc) {
         type = bracketsOpt(type);
         JCExpression init = null;
-        if (S.token() == EQ) {
-            S.nextToken();
+        if (token.kind == EQ) {
+            nextToken();
             init = variableInitializer();
         }
-        else if (reqInit) syntaxError(S.pos(), "expected", EQ);
+        else if (reqInit) syntaxError(token.pos, "expected", EQ);
         JCVariableDecl result =
             toP(F.at(pos).VarDef(mods, name, type, init));
         attach(result, dc);
@@ -2281,11 +2443,11 @@ public class JavacParser implements Parser {
     /** VariableDeclaratorId = Ident BracketsOpt
      */
     JCVariableDecl variableDeclaratorId(JCModifiers mods, JCExpression type) {
-        int pos = S.pos();
+        int pos = token.pos;
         Name name = ident();
         if ((mods.flags & Flags.VARARGS) != 0 &&
-                S.token() == LBRACKET) {
-            log.error(S.pos(), "varargs.and.old.array.syntax");
+                token.kind == LBRACKET) {
+            log.error(token.pos, "varargs.and.old.array.syntax");
         }
         type = bracketsOpt(type);
         return toP(F.at(pos).VarDef(mods, name, type, null));
@@ -2296,12 +2458,12 @@ public class JavacParser implements Parser {
     List<JCTree> resources() {
         ListBuffer<JCTree> defs = new ListBuffer<JCTree>();
         defs.append(resource());
-        while (S.token() == SEMI) {
+        while (token.kind == SEMI) {
             // All but last of multiple declarators must subsume a semicolon
-            storeEnd(defs.elems.last(), S.endPos());
-            int semiColonPos = S.pos();
-            S.nextToken();
-            if (S.token() == RPAREN) { // Optional trailing semicolon
+            storeEnd(defs.elems.last(), token.endPos);
+            int semiColonPos = token.pos;
+            nextToken();
+            if (token.kind == RPAREN) { // Optional trailing semicolon
                                        // after last resource
                 break;
             }
@@ -2315,98 +2477,86 @@ public class JavacParser implements Parser {
     protected JCTree resource() {
         JCModifiers optFinal = optFinal(Flags.FINAL);
         JCExpression type = parseType();
-        int pos = S.pos();
+        int pos = token.pos;
         Name ident = ident();
         return variableDeclaratorRest(pos, optFinal, type, ident, true, null);
     }
 
-    /** CompilationUnit =
-     *      {ImportDeclaration} [ModuleDeclaration]
-     *      [ { "@" Annotation } PACKAGE Qualident ";"]
-     *      {ImportDeclaration}
-     *      {TypeDeclaration}
+    /** CompilationUnit = [ { "@" Annotation } PACKAGE Qualident ";"] {ImportDeclaration} {TypeDeclaration}
      */
     public JCTree.JCCompilationUnit parseCompilationUnit() {
-        ListBuffer<JCTree> defs = new ListBuffer<JCTree>();
-        int cu_pos = S.pos();
-        boolean seenImport = false;
-
-        String toplevel_dc = S.docComment();
-
-        while (S.token() == IMPORT) {
-            defs.append(importDeclaration());
-            seenImport = true;
-        }
-
-        String dc = S.docComment();
-
+        Token firstToken = token;
+        JCExpression pid = null;
         JCModifiers mods = null;
-        if (S.token() == MONKEYS_AT)  {
-            mods = modifiersOpt(ModuleModifierKind.DISALLOWED);
-        }
-
-        if (S.token() == IDENTIFIER && S.name() == names.module) {
-            defs.append(moduleDecl(mods, dc));
-            dc = null;
-        }
-
-        if (mods == null && S.token() == MONKEYS_AT) {
-            dc = S.docComment();
-            mods = modifiersOpt(ModuleModifierKind.DISALLOWED);
-        }
+        boolean consumedToplevelDoc = false;
+        boolean seenImport = false;
+        boolean seenPackage = false;
+        ListBuffer<JCTree> defs = new ListBuffer<JCTree>();
 
-        if (S.token() == PACKAGE) {
-            int pos = S.pos();
-            if (seenImport && !allowImportsBeforePackage)
-                log.error(pos, "imports.not.allowed.before.package.in.source", source.name);
-            List<JCAnnotation> annots = List.nil();
-            if (mods != null) {
-                checkNoMods(mods.flags);
-                annots = mods.annotations;
-                mods = null;
-                dc = null;
+        if (token.kind == IDENTIFIER && token.name() == names.module) {
+            defs.append(moduleDecl(mods, token.comment(CommentStyle.JAVADOC)));
+            consumedToplevelDoc = true;
+        } else {
+            List<JCAnnotation> packageAnnotations = List.nil();
+            if (token.kind == MONKEYS_AT)
+            mods = modifiersOpt();
+
+            if (token.kind == PACKAGE) {
+                seenPackage = true;
+                if (mods != null) {
+                    checkNoMods(mods.flags);
+                    packageAnnotations = mods.annotations;
+                    mods = null;
+                }
+                nextToken();
+                pid = qualident();
+                accept(SEMI);
+                JCPackageDecl pd = F.at(firstToken.pos).Package(packageAnnotations, pid);
+                String docComment = firstToken.comment(CommentStyle.JAVADOC);
+                consumedToplevelDoc = true;
+                attach(pd, docComment);
+                defs.append(pd);
             }
-            S.nextToken();
-            JCExpression pid = qualident();
-            accept(SEMI);
-            defs.append(toP(F.at(pos).Package(annots, pid)));
-        }
 
-        boolean checkForImports = true;
-        while (S.token() != EOF) {
-            if (S.pos() <= errorEndPos) {
-                // error recovery
-                skip(checkForImports, false, false, false);
-                if (S.token() == EOF)
-                    break;
-            }
-            if (checkForImports && mods == null && S.token() == IMPORT) {
-                defs.append(importDeclaration());
-            } else {
-                JCTree def = typeDeclaration(mods, dc);
-                if (keepDocComments && dc != null && docComments.get(def) == dc) {
-                    // If the first type declaration has consumed the first doc
-                    // comment, then don't use it for the top level comment as well.
-                    dc = null;
+            boolean checkForImports = true;
+            boolean firstTypeDecl = true;
+            while (token.kind != EOF) {
+                if (token.pos <= endPosTable.errorEndPos) {
+                    // error recovery
+                    skip(checkForImports, false, false, false);
+                    if (token.kind == EOF)
+                        break;
+                }
+                if (checkForImports && mods == null && token.kind == IMPORT) {
+                    seenImport = true;
+                    defs.append(importDeclaration());
+                } else {
+                    String docComment = token.comment(CommentStyle.JAVADOC);
+                    if (firstTypeDecl && !seenImport && !seenPackage) {
+                        docComment = firstToken.comment(CommentStyle.JAVADOC);
+                        consumedToplevelDoc = true;
+                    }
+                    JCTree def = typeDeclaration(mods, docComment);
+                    if (def instanceof JCExpressionStatement)
+                        def = ((JCExpressionStatement)def).expr;
+                    defs.append(def);
+                    if (def instanceof JCClassDecl)
+                        checkForImports = false;
+                    mods = null;
+                    firstTypeDecl = false;
                 }
-                if (def instanceof JCExpressionStatement)
-                    def = ((JCExpressionStatement)def).expr;
-                defs.append(def);
-                if (def instanceof JCClassDecl)
-                    checkForImports = false;
-                mods = null;
-                dc = null;
             }
         }
-
-        JCTree.JCCompilationUnit toplevel = F.at(cu_pos).TopLevel(defs.toList());
-        attach(toplevel, toplevel_dc);
+        JCTree.JCCompilationUnit toplevel = F.at(firstToken.pos).TopLevel(defs.toList());
+        if (!consumedToplevelDoc)
+            attach(toplevel, firstToken.comment(CommentStyle.JAVADOC));
         if (defs.elems.isEmpty())
-            storeEnd(toplevel, S.prevEndPos());
+            storeEnd(toplevel, S.prevToken().endPos);
         if (keepDocComments)
             toplevel.docComments = docComments;
         if (keepLineMap)
             toplevel.lineMap = S.getLineMap();
+        toplevel.endPositions = this.endPosTable;
         return toplevel;
     }
 
@@ -2417,30 +2567,40 @@ public class JavacParser implements Parser {
      * called after MODULE has been seen
      */
     JCModuleDecl moduleDecl(JCModifiers mods, String dc) {
-        int pos = S.pos();
-        if (!allowModules)
+        int pos = token.pos;
+        if (!allowModules) {
             log.error(pos, "modules.not.supported.in.source", source.name);
+            allowModules = true;
+        }
+        S.allowVersionLiteral(true);
+        // FIXME: unimpl annots
         List<JCAnnotation> annots = List.nil();
         if (mods != null) {
             checkNoMods(mods.flags);
             annots = mods.annotations;
             mods = null;
         }
-        S.nextToken();
+        nextToken();
         JCModuleId mid = moduleId();
-        List<JCModuleId> provides = null;
-        List<JCModuleMetadata> metadataList = null;
-
-        if (S.token() == IDENTIFIER && S.name() == names.provides) {
-            S.nextToken();
-            provides = moduleIdList();
-        } else
-            provides = List.nil();
-        accept(LBRACE);
-        metadataList = moduleMetadataList();
-        accept(RBRACE);
+        List<JCModuleDirective> directives = null;
 
-        JCModuleDecl result = toP(F.at(pos).Module(annots, mid, provides, metadataList));
+        accept(LBRACE);
+        directives = moduleDirectiveList();
+        if (token.kind != RBRACE) {
+            setErrorEndPos(token.pos);
+            reportSyntaxError(S.prevToken().endPos, "expected", RBRACE);
+        }
+
+        // The extended metadata is all of the textual content that follows the
+        // module declaration.
+        UnicodeReader reader = S.getReader();
+        while (reader.bp < reader.buflen && Character.isWhitespace(reader.ch))
+            reader.scanChar();
+        while (reader.bp < reader.buflen)
+            reader.putChar(true);
+        Name moduleData = (reader.sp == 0) ? null : reader.name();
+
+        JCModuleDecl result = toP(F.at(pos).Module(mid, directives, moduleData));
         attach(result, dc);
         return result;
     }
@@ -2451,78 +2611,89 @@ public class JavacParser implements Parser {
      * ModuleRequires = REQUIRES Identifier* ModuleId {',' ModuleId}
      * ModulePermits  = PERMITS  QualifiedIdentifier {',' QualifiedIdentifier}
      */
-    List<JCModuleMetadata> moduleMetadataList() {
-        ListBuffer<JCModuleMetadata> defs = new ListBuffer<JCModuleMetadata>();
-
-        while (S.token() == IDENTIFIER || S.token() == CLASS) {
-            int pos = S.pos();
-            if (S.token() == CLASS) {
-                S.nextToken();
-                ListBuffer<Name> flags = new ListBuffer<Name>();
-                JCExpression qualIdHead = null;
-                while (S.token() == IDENTIFIER) {
-                    int id_pos = S.pos();
-                    Name id = S.name();
-                    S.nextToken();
-                    if (S.token() == DOT || S.token() == SEMI) {
-                        qualIdHead = toP(F.at(id_pos).Ident(id));
-                        break;
-                    }
-                    flags.append(id);
-                }
-                if (qualIdHead == null) {
-                    log.error(pos, "class.id.expected");
-                } else {
-                    JCExpression qualId = qualident(qualIdHead);
-                    accept(SEMI);
-                    defs.append(toP(F.at(pos).ModuleClass(flags.toList(), qualId)));
-                }
-            } else if (S.name() == names.export) {
-                S.nextToken();
-                JCExpression exportId = toP(F.at(S.pos()).Ident(ident()));
-                do {
-                    int pos1 = S.pos();
+    List<JCModuleDirective> moduleDirectiveList() {
+        ListBuffer<JCModuleDirective> defs = new ListBuffer<JCModuleDirective>();
+
+        while (token.kind == IDENTIFIER || token.kind == CLASS) {
+            int pos = token.pos;
+            if (token.kind == CLASS) {
+                nextToken();
+                JCExpression qualId = qualident();
+                accept(SEMI);
+                defs.append(toP(F.at(pos).Entrypoint(qualId)));
+            } else if (token.name() == names.exports) {
+                // FIXME, unimpl .**?
+                nextToken();
+                JCExpression exportId = toP(F.at(token.pos).Ident(ident()));
+                while (token.kind == DOT) {
+                    int pos1 = token.pos;
                     accept(DOT);
-                    Token t  = S.token();
-                    if (t == STAR || t == STARSTAR) {
-                        Name tname = (t == STAR ? names.asterisk : names.double_asterisk);
+                    if (token.kind == STAR || token.kind == STARSTAR) {
+                        Name tname = (token.kind == STAR ? names.asterisk : names.double_asterisk);
                         exportId = to(F.at(pos1).Select(exportId, tname));
-                        S.nextToken();
+                        nextToken();
                         break;
                     } else {
                         exportId = toP(F.at(pos1).Select(exportId, ident()));
                     }
-                } while (S.token() == DOT);
+                }
                 accept(SEMI);
-                defs.append(toP(F.at(pos).ModuleExport(null, exportId)));
-            } else if (S.name() == names.requires) {
-                ListBuffer<Name> flags = new ListBuffer<Name>();
-                List<JCModuleId> moduleIds;
-                S.nextToken();
-                JCExpression moduleIdHead = null;
-                while (S.token() == IDENTIFIER ||
-                        S.token().name != null && Character.isLetter(S.token().name.charAt(0))) {
-                    int id_pos = S.pos();
-                    Name id = S.name();
-                    S.nextToken();
-                    if (S.token() == DOT || S.token() == MONKEYS_AT || S.token() == COMMA || S.token() == SEMI) {
-                        moduleIdHead = toP(F.at(id_pos).Ident(id));
-                        break;
-                    }
-                    flags.append(id);
+                defs.append(toP(F.at(pos).Exports(exportId)));
+            } else if (token.name() == names.requires) {
+                ListBuffer<RequiresFlag> flags = new ListBuffer<RequiresFlag>();
+                nextToken();
+                if (token.kind == IDENTIFIER && token.name() == names.optional) {
+                    flags.add(RequiresFlag.OPTIONAL);
+                    nextToken();
                 }
-                if (moduleIdHead == null) {
-                    log.error(pos, "module.id.expected");
+                if (token.kind == IDENTIFIER && token.name() == names.service) {
+                    nextToken();
+                    JCExpression qualId = qualident();
+                    accept(SEMI);
+                    defs.append(toP(F.at(pos).RequiresService(flags.toList(), qualId)));
                 } else {
-                    moduleIds = moduleIdList(moduleIdHead);
+                    while ((token.kind == PUBLIC)
+                            || (token.kind == IDENTIFIER && token.name() == names.local)) {
+                        RequiresFlag flag = (token.kind == PUBLIC)
+                                ? RequiresFlag.PUBLIC : RequiresFlag.LOCAL;
+                        // FIXME: check duplicates
+                        flags.append(flag);
+                        nextToken();
+                    }
+                    JCModuleIdQuery moduleIdQuery = moduleIdQuery();
                     accept(SEMI);
-                    defs.append(toP(F.at(pos).ModuleRequires(flags.toList(), moduleIds)));
+                    defs.append(toP(F.at(pos).RequiresModule(flags.toList(), moduleIdQuery)));
                 }
-            } else if (S.name() == names.permits) {
-                S.nextToken();
-                List<JCExpression> qualIds = qualidentList();
+            } else if (token.name() == names.permits) {
+                nextToken();
+                JCExpression qualId = qualident();
                 accept(SEMI);
-                defs.append(toP(F.at(pos).ModulePermits(qualIds)));
+                defs.append(toP(F.at(pos).Permits(qualId)));
+            } else if (token.name() == names.provides) {
+                nextToken();
+                if (token.kind == IDENTIFIER && token.name() == names.service) {
+                    nextToken();
+                    JCExpression serviceName = qualident();
+                    if (token.kind == IDENTIFIER && token.name() == names.with) {
+                        nextToken();
+                        JCExpression implName = qualident();
+                        accept(SEMI);
+                        defs.append(toP(F.at(pos).ProvidesService(serviceName, implName)));
+                    } else {
+                        log.error("with.expected");
+                    }
+                } else {
+                    JCModuleId moduleId = moduleId();
+                    accept(SEMI);
+                    defs.append(toP(F.at(pos).ProvidesModule(moduleId)));
+                }
+            } else if (token.name() == names.view) {
+                nextToken();
+                JCExpression qualId = qualident();
+                accept(LBRACE);
+                List<JCModuleDirective> directives = moduleDirectiveList();
+                accept(RBRACE);
+                defs.append(toP(F.at(pos).View(qualId, directives)));
             } else
                 break;
         }
@@ -2535,8 +2706,8 @@ public class JavacParser implements Parser {
     List<JCModuleId> moduleIdList() {
         ListBuffer<JCModuleId> ts = new ListBuffer<JCModuleId>();
         ts.append(moduleId());
-        while (S.token() == COMMA) {
-            S.nextToken();
+        while (token.kind == COMMA) {
+            nextToken();
             ts.append(moduleId());
         }
         return ts.toList();
@@ -2548,55 +2719,84 @@ public class JavacParser implements Parser {
     List<JCModuleId> moduleIdList(JCExpression head) {
         ListBuffer<JCModuleId> ts = new ListBuffer<JCModuleId>();
         ts.append(moduleId(head));
-        while (S.token() == COMMA) {
-            S.nextToken();
+        while (token.kind == COMMA) {
+            nextToken();
             ts.append(moduleId());
         }
         return ts.toList();
     }
 
     JCModuleId moduleId() {
-        return moduleId(toP(F.at(S.pos()).Ident(ident())));
+        return moduleId(toP(F.at(token.pos).Ident(ident())));
     }
 
     JCModuleId moduleId(JCExpression head) {
-        int pos = S.pos();
+        int pos = token.pos;
         JCTree qualId = qualident(head);
         Name version = null;
-        if (S.token() == MONKEYS_AT) {
-            S.nextToken();
-            if (S.token() == MODULEVERSIONLITERAL || S.token() == STRINGLITERAL) {
-                version = names.fromString(S.stringVal());
+        if (token.kind == MONKEYS_AT) {
+            nextToken();
+            if (token.kind == VERSIONLITERAL) {
+                version = token.name();
             } else
                log.error(pos, "modules.version.literal.expected");
-            S.nextToken();
+            nextToken();
         }
         return toP(F.at(pos).ModuleId(qualId, version));
     }
 
+    JCModuleIdQuery moduleIdQuery() {
+        return moduleIdQuery(toP(F.at(token.pos).Ident(ident())));
+    }
+
+    JCModuleIdQuery moduleIdQuery(JCExpression head) {
+        int pos = token.pos;
+        JCTree qualId = qualident(head);
+        Name query = null;
+        if (token.kind == MONKEYS_AT) {
+            nextToken();
+            if (token.kind == VERSIONLITERAL) {
+                query = token.name();
+                nextToken();
+            } else if (optag(token.kind) != Tag.NO_TAG) { // FIXME: close, but not close enough
+                Token op = token;
+                nextToken();
+                if (token.kind == VERSIONLITERAL) {
+                    query = names.fromString(op.kind.name + token.name());
+                    nextToken();
+                } else {
+                    log.error(token.pos, "modules.version.literal.expected");
+                }
+            } else {
+               log.error(pos, "modules.version.query.expected");
+            }
+        }
+        return toP(F.at(pos).ModuleIdQuery(qualId, query));
+    }
+
     /** ImportDeclaration = IMPORT [ STATIC ] Ident { "." Ident } [ "." "*" ] ";"
      */
     JCTree importDeclaration() {
-        int pos = S.pos();
-        S.nextToken();
+        int pos = token.pos;
+        nextToken();
         boolean importStatic = false;
-        if (S.token() == STATIC) {
+        if (token.kind == STATIC) {
             checkStaticImports();
             importStatic = true;
-            S.nextToken();
+            nextToken();
         }
-        JCExpression pid = toP(F.at(S.pos()).Ident(ident()));
+        JCExpression pid = toP(F.at(token.pos).Ident(ident()));
         do {
-            int pos1 = S.pos();
+            int pos1 = token.pos;
             accept(DOT);
-            if (S.token() == STAR) {
+            if (token.kind == STAR) {
                 pid = to(F.at(pos1).Select(pid, names.asterisk));
-                S.nextToken();
+                nextToken();
                 break;
             } else {
                 pid = toP(F.at(pos1).Select(pid, ident()));
             }
-        } while (S.token() == DOT);
+        } while (token.kind == DOT);
         accept(SEMI);
         return toP(F.at(pos).Import(pid, importStatic));
     }
@@ -2604,19 +2804,13 @@ public class JavacParser implements Parser {
     /** TypeDeclaration = ClassOrInterfaceOrEnumDeclaration
      *                  | ";"
      */
-    JCTree typeDeclaration(JCModifiers mods, String dc) {
-        int pos = S.pos();
-        if (mods == null && S.token() == SEMI) {
-            S.nextToken();
+    JCTree typeDeclaration(JCModifiers mods, String docComment) {
+        int pos = token.pos;
+        if (mods == null && token.kind == SEMI) {
+            nextToken();
             return toP(F.at(pos).Skip());
         } else {
-            if (mods == null) {
-                // FIXME: after merging with b116, this throws AssertionError
-                // temporarily comment this out 
-                // assert dc == null;
-                dc = S.docComment();
-            }
-            return classOrInterfaceOrEnumDeclaration(modifiersOpt(ModuleModifierKind.ALLOWED, mods, null), dc);
+            return classOrInterfaceOrEnumDeclaration(modifiersOpt(mods), docComment);
         }
     }
 
@@ -2626,19 +2820,19 @@ public class JavacParser implements Parser {
      *  @param dc       The documentation comment for the class, or null.
      */
     JCStatement classOrInterfaceOrEnumDeclaration(JCModifiers mods, String dc) {
-        if (S.token() == CLASS) {
+        if (token.kind == CLASS) {
             return classDeclaration(mods, dc);
-        } else if (S.token() == INTERFACE) {
+        } else if (token.kind == INTERFACE) {
             return interfaceDeclaration(mods, dc);
         } else if (allowEnums) {
-            if (S.token() == ENUM) {
+            if (token.kind == ENUM) {
                 return enumDeclaration(mods, dc);
             } else {
-                int pos = S.pos();
+                int pos = token.pos;
                 List<JCTree> errs;
-                if (S.token() == IDENTIFIER) {
+                if (token.kind == IDENTIFIER) {
                     errs = List.<JCTree>of(mods, toP(F.at(pos).Ident(ident())));
-                    setErrorEndPos(S.pos());
+                    setErrorEndPos(token.pos);
                 } else {
                     errs = List.<JCTree>of(mods);
                 }
@@ -2646,16 +2840,16 @@ public class JavacParser implements Parser {
                                               CLASS, INTERFACE, ENUM)));
             }
         } else {
-            if (S.token() == ENUM) {
-                error(S.pos(), "enums.not.supported.in.source", source.name);
+            if (token.kind == ENUM) {
+                error(token.pos, "enums.not.supported.in.source", source.name);
                 allowEnums = true;
                 return enumDeclaration(mods, dc);
             }
-            int pos = S.pos();
+            int pos = token.pos;
             List<JCTree> errs;
-            if (S.token() == IDENTIFIER) {
+            if (token.kind == IDENTIFIER) {
                 errs = List.<JCTree>of(mods, toP(F.at(pos).Ident(ident())));
-                setErrorEndPos(S.pos());
+                setErrorEndPos(token.pos);
             } else {
                 errs = List.<JCTree>of(mods);
             }
@@ -2669,24 +2863,24 @@ public class JavacParser implements Parser {
      *  @param mods    The modifiers starting the class declaration
      *  @param dc       The documentation comment for the class, or null.
      */
-    JCClassDecl classDeclaration(JCModifiers mods, String dc) {
-        int pos = S.pos();
+    protected JCClassDecl classDeclaration(JCModifiers mods, String dc) {
+        int pos = token.pos;
         accept(CLASS);
         Name name = ident();
 
         List<JCTypeParameter> typarams = typeParametersOpt();
 
         JCExpression extending = null;
-        if (S.token() == EXTENDS) {
-            S.nextToken();
+        if (token.kind == EXTENDS) {
+            nextToken();
             extending = parseType();
         }
         List<JCExpression> implementing = List.nil();
-        if (S.token() == IMPLEMENTS) {
-            S.nextToken();
+        if (token.kind == IMPLEMENTS) {
+            nextToken();
             implementing = typeList();
         }
-        List<JCTree> defs = classOrInterfaceBody(name, CLASS);
+        List<JCTree> defs = classOrInterfaceBody(name, false);
         JCClassDecl result = toP(F.at(pos).ClassDef(
             mods, name, typarams, extending, implementing, defs));
         attach(result, dc);
@@ -2698,19 +2892,19 @@ public class JavacParser implements Parser {
      *  @param mods    The modifiers starting the interface declaration
      *  @param dc       The documentation comment for the interface, or null.
      */
-    JCClassDecl interfaceDeclaration(JCModifiers mods, String dc) {
-        int pos = S.pos();
+    protected JCClassDecl interfaceDeclaration(JCModifiers mods, String dc) {
+        int pos = token.pos;
         accept(INTERFACE);
         Name name = ident();
 
         List<JCTypeParameter> typarams = typeParametersOpt();
 
         List<JCExpression> extending = List.nil();
-        if (S.token() == EXTENDS) {
-            S.nextToken();
+        if (token.kind == EXTENDS) {
+            nextToken();
             extending = typeList();
         }
-        List<JCTree> defs = classOrInterfaceBody(name, INTERFACE);
+        List<JCTree> defs = classOrInterfaceBody(name, true);
         JCClassDecl result = toP(F.at(pos).ClassDef(
             mods, name, typarams, null, extending, defs));
         attach(result, dc);
@@ -2721,14 +2915,14 @@ public class JavacParser implements Parser {
      *  @param mods    The modifiers starting the enum declaration
      *  @param dc       The documentation comment for the enum, or null.
      */
-    JCClassDecl enumDeclaration(JCModifiers mods, String dc) {
-        int pos = S.pos();
+    protected JCClassDecl enumDeclaration(JCModifiers mods, String dc) {
+        int pos = token.pos;
         accept(ENUM);
         Name name = ident();
 
         List<JCExpression> implementing = List.nil();
-        if (S.token() == IMPLEMENTS) {
-            S.nextToken();
+        if (token.kind == IMPLEMENTS) {
+            nextToken();
             implementing = typeList();
         }
 
@@ -2747,27 +2941,27 @@ public class JavacParser implements Parser {
     List<JCTree> enumBody(Name enumName) {
         accept(LBRACE);
         ListBuffer<JCTree> defs = new ListBuffer<JCTree>();
-        if (S.token() == COMMA) {
-            S.nextToken();
-        } else if (S.token() != RBRACE && S.token() != SEMI) {
+        if (token.kind == COMMA) {
+            nextToken();
+        } else if (token.kind != RBRACE && token.kind != SEMI) {
             defs.append(enumeratorDeclaration(enumName));
-            while (S.token() == COMMA) {
-                S.nextToken();
-                if (S.token() == RBRACE || S.token() == SEMI) break;
+            while (token.kind == COMMA) {
+                nextToken();
+                if (token.kind == RBRACE || token.kind == SEMI) break;
                 defs.append(enumeratorDeclaration(enumName));
             }
-            if (S.token() != SEMI && S.token() != RBRACE) {
-                defs.append(syntaxError(S.pos(), "expected3",
+            if (token.kind != SEMI && token.kind != RBRACE) {
+                defs.append(syntaxError(token.pos, "expected3",
                                 COMMA, RBRACE, SEMI));
-                S.nextToken();
+                nextToken();
             }
         }
-        if (S.token() == SEMI) {
-            S.nextToken();
-            while (S.token() != RBRACE && S.token() != EOF) {
+        if (token.kind == SEMI) {
+            nextToken();
+            while (token.kind != RBRACE && token.kind != EOF) {
                 defs.appendList(classOrInterfaceBodyDeclaration(enumName,
-                                                                ENUM));
-                if (S.pos() <= errorEndPos) {
+                                                                false));
+                if (token.pos <= endPosTable.errorEndPos) {
                     // error recovery
                    skip(false, true, true, false);
                 }
@@ -2780,25 +2974,24 @@ public class JavacParser implements Parser {
     /** EnumeratorDeclaration = AnnotationsOpt [TypeArguments] IDENTIFIER [ Arguments ] [ "{" ClassBody "}" ]
      */
     JCTree enumeratorDeclaration(Name enumName) {
-        String dc = S.docComment();
+        String dc = token.comment(CommentStyle.JAVADOC);
         int flags = Flags.PUBLIC|Flags.STATIC|Flags.FINAL|Flags.ENUM;
-        if (S.deprecatedFlag()) {
+        if (token.deprecatedFlag()) {
             flags |= Flags.DEPRECATED;
-            S.resetDeprecatedFlag();
         }
-        int pos = S.pos();
+        int pos = token.pos;
         List<JCAnnotation> annotations = annotationsOpt();
         JCModifiers mods = F.at(annotations.isEmpty() ? Position.NOPOS : pos).Modifiers(flags, annotations);
         List<JCExpression> typeArgs = typeArgumentsOpt();
-        int identPos = S.pos();
+        int identPos = token.pos;
         Name name = ident();
-        int createPos = S.pos();
-        List<JCExpression> args = (S.token() == LPAREN)
+        int createPos = token.pos;
+        List<JCExpression> args = (token.kind == LPAREN)
             ? arguments() : List.<JCExpression>nil();
         JCClassDecl body = null;
-        if (S.token() == LBRACE) {
+        if (token.kind == LBRACE) {
             JCModifiers mods1 = F.at(Position.NOPOS).Modifiers(Flags.ENUM | Flags.STATIC);
-            List<JCTree> defs = classOrInterfaceBody(names.empty, CLASS);
+            List<JCTree> defs = classOrInterfaceBody(names.empty, false);
             body = toP(F.at(identPos).AnonymousClassDef(mods1, defs));
         }
         if (args.isEmpty() && body == null)
@@ -2806,7 +2999,7 @@ public class JavacParser implements Parser {
         JCIdent ident = F.at(identPos).Ident(enumName);
         JCNewClass create = F.at(createPos).NewClass(null, typeArgs, ident, args, body);
         if (createPos != identPos)
-            storeEnd(create, S.prevEndPos());
+            storeEnd(create, S.prevToken().endPos);
         ident = F.at(identPos).Ident(enumName);
         JCTree result = toP(F.at(pos).VarDef(mods, name, ident, create));
         attach(result, dc);
@@ -2818,8 +3011,8 @@ public class JavacParser implements Parser {
     List<JCExpression> typeList() {
         ListBuffer<JCExpression> ts = new ListBuffer<JCExpression>();
         ts.append(parseType());
-        while (S.token() == COMMA) {
-            S.nextToken();
+        while (token.kind == COMMA) {
+            nextToken();
             ts.append(parseType());
         }
         return ts.toList();
@@ -2828,18 +3021,18 @@ public class JavacParser implements Parser {
     /** ClassBody     = "{" {ClassBodyDeclaration} "}"
      *  InterfaceBody = "{" {InterfaceBodyDeclaration} "}"
      */
-    List<JCTree> classOrInterfaceBody(Name className, Token encl) {
+    List<JCTree> classOrInterfaceBody(Name className, boolean isInterface) {
         accept(LBRACE);
-        if (S.pos() <= errorEndPos) {
+        if (token.pos <= endPosTable.errorEndPos) {
             // error recovery
             skip(false, true, false, false);
-            if (S.token() == LBRACE)
-                S.nextToken();
+            if (token.kind == LBRACE)
+                nextToken();
         }
         ListBuffer<JCTree> defs = new ListBuffer<JCTree>();
-        while (S.token() != RBRACE && S.token() != EOF) {
-            defs.appendList(classOrInterfaceBodyDeclaration(className, encl));
-            if (S.pos() <= errorEndPos) {
+        while (token.kind != RBRACE && token.kind != EOF) {
+            defs.appendList(classOrInterfaceBodyDeclaration(className, isInterface));
+            if (token.pos <= endPosTable.errorEndPos) {
                // error recovery
                skip(false, true, true, false);
            }
@@ -2865,25 +3058,24 @@ public class JavacParser implements Parser {
      *    | ModifiersOpt Type Ident
      *      ( ConstantDeclaratorsRest | InterfaceMethodDeclaratorRest ";" )
      */
-    protected List<JCTree> classOrInterfaceBodyDeclaration(Name className, Token encl) {
-        if (S.token() == SEMI) {
-            S.nextToken();
-            return List.<JCTree>of(F.at(Position.NOPOS).Block(0, List.<JCStatement>nil()));
+    protected List<JCTree> classOrInterfaceBodyDeclaration(Name className, boolean isInterface) {
+        if (token.kind == SEMI) {
+            nextToken();
+            return List.<JCTree>nil();
         } else {
-            boolean isInterface = (encl == INTERFACE);
-            String dc = S.docComment();
-            int pos = S.pos();
-            JCModifiers mods = modifiersOpt(ModuleModifierKind.LOOKAHEAD, (encl == CLASS ? className : null));
-            if (S.token() == CLASS ||
-                S.token() == INTERFACE ||
-                allowEnums && S.token() == ENUM) {
+            String dc = token.comment(CommentStyle.JAVADOC);
+            int pos = token.pos;
+            JCModifiers mods = modifiersOpt();
+            if (token.kind == CLASS ||
+                token.kind == INTERFACE ||
+                allowEnums && token.kind == ENUM) {
                 return List.<JCTree>of(classOrInterfaceOrEnumDeclaration(mods, dc));
-            } else if (S.token() == LBRACE && !isInterface &&
+            } else if (token.kind == LBRACE && !isInterface &&
                        (mods.flags & Flags.StandardFlags & ~Flags.STATIC) == 0 &&
                        mods.annotations.isEmpty()) {
                 return List.<JCTree>of(block(pos, mods.flags));
             } else {
-                pos = S.pos();
+                pos = token.pos;
                 List<JCTypeParameter> typarams = typeParametersOpt();
                 // if there are type parameters but no modifiers, save the start
                 // position of the method in the modifiers.
@@ -2891,26 +3083,26 @@ public class JavacParser implements Parser {
                     mods.pos = pos;
                     storeEnd(mods, pos);
                 }
-                Name name = S.name();
-                pos = S.pos();
+                Token tk = token;
+                pos = token.pos;
                 JCExpression type;
-                boolean isVoid = S.token() == VOID;
+                boolean isVoid = token.kind == VOID;
                 if (isVoid) {
                     type = to(F.at(pos).TypeIdent(TypeTags.VOID));
-                    S.nextToken();
+                    nextToken();
                 } else {
                     type = parseType();
                 }
-                if (S.token() == LPAREN && !isInterface && type.getTag() == JCTree.IDENT) {
-                    if (isInterface || name != className)
+                if (token.kind == LPAREN && !isInterface && type.hasTag(IDENT)) {
+                    if (isInterface || tk.name() != className)
                         error(pos, "invalid.meth.decl.ret.type.req");
                     return List.of(methodDeclaratorRest(
                         pos, mods, null, names.init, typarams,
                         isInterface, true, dc));
                 } else {
-                    pos = S.pos();
-                    name = ident();
-                    if (S.token() == LPAREN) {
+                    pos = token.pos;
+                    Name name = ident();
+                    if (token.kind == LPAREN) {
                         return List.of(methodDeclaratorRest(
                             pos, mods, type, name, typarams,
                             isInterface, isVoid, dc));
@@ -2918,16 +3110,16 @@ public class JavacParser implements Parser {
                         List<JCTree> defs =
                             variableDeclaratorsRest(pos, mods, type, name, isInterface, dc,
                                                     new ListBuffer<JCTree>()).toList();
-                        storeEnd(defs.last(), S.endPos());
+                        storeEnd(defs.last(), token.endPos);
                         accept(SEMI);
                         return defs;
                     } else {
-                        pos = S.pos();
+                        pos = token.pos;
                         List<JCTree> err = isVoid
                             ? List.<JCTree>of(toP(F.at(pos).MethodDef(mods, name, type, typarams,
                                 List.<JCVariableDecl>nil(), List.<JCExpression>nil(), null, null)))
                             : null;
-                        return List.<JCTree>of(syntaxError(S.pos(), err, "expected", LPAREN));
+                        return List.<JCTree>of(syntaxError(token.pos, err, "expected", LPAREN));
                     }
                 }
             }
@@ -2945,7 +3137,7 @@ public class JavacParser implements Parser {
      *  ConstructorDeclaratorRest =
      *      "(" FormalParameterListOpt ")" [THROWS TypeList] MethodBody
      */
-    JCTree methodDeclaratorRest(int pos,
+    protected JCTree methodDeclaratorRest(int pos,
                               JCModifiers mods,
                               JCExpression type,
                               Name name,
@@ -2955,27 +3147,27 @@ public class JavacParser implements Parser {
         List<JCVariableDecl> params = formalParameters();
         if (!isVoid) type = bracketsOpt(type);
         List<JCExpression> thrown = List.nil();
-        if (S.token() == THROWS) {
-            S.nextToken();
+        if (token.kind == THROWS) {
+            nextToken();
             thrown = qualidentList();
         }
         JCBlock body = null;
         JCExpression defaultValue;
-        if (S.token() == LBRACE) {
+        if (token.kind == LBRACE) {
             body = block();
             defaultValue = null;
         } else {
-            if (S.token() == DEFAULT) {
+            if (token.kind == DEFAULT) {
                 accept(DEFAULT);
                 defaultValue = annotationValue();
             } else {
                 defaultValue = null;
             }
             accept(SEMI);
-            if (S.pos() <= errorEndPos) {
+            if (token.pos <= endPosTable.errorEndPos) {
                 // error recovery
                 skip(false, true, false, false);
-                if (S.token() == LBRACE) {
+                if (token.kind == LBRACE) {
                     body = block();
                 }
             }
@@ -2994,8 +3186,8 @@ public class JavacParser implements Parser {
     List<JCExpression> qualidentList() {
         ListBuffer<JCExpression> ts = new ListBuffer<JCExpression>();
         ts.append(qualident());
-        while (S.token() == COMMA) {
-            S.nextToken();
+        while (token.kind == COMMA) {
+            nextToken();
             ts.append(qualident());
         }
         return ts.toList();
@@ -3004,13 +3196,13 @@ public class JavacParser implements Parser {
     /** TypeParametersOpt = ["<" TypeParameter {"," TypeParameter} ">"]
      */
     List<JCTypeParameter> typeParametersOpt() {
-        if (S.token() == LT) {
+        if (token.kind == LT) {
             checkGenerics();
             ListBuffer<JCTypeParameter> typarams = new ListBuffer<JCTypeParameter>();
-            S.nextToken();
+            nextToken();
             typarams.append(typeParameter());
-            while (S.token() == COMMA) {
-                S.nextToken();
+            while (token.kind == COMMA) {
+                nextToken();
                 typarams.append(typeParameter());
             }
             accept(GT);
@@ -3025,14 +3217,14 @@ public class JavacParser implements Parser {
      *  TypeVariable = Ident
      */
     JCTypeParameter typeParameter() {
-        int pos = S.pos();
+        int pos = token.pos;
         Name name = ident();
         ListBuffer<JCExpression> bounds = new ListBuffer<JCExpression>();
-        if (S.token() == EXTENDS) {
-            S.nextToken();
+        if (token.kind == EXTENDS) {
+            nextToken();
             bounds.append(parseType());
-            while (S.token() == AMP) {
-                S.nextToken();
+            while (token.kind == AMP) {
+                nextToken();
                 bounds.append(parseType());
             }
         }
@@ -3047,10 +3239,10 @@ public class JavacParser implements Parser {
         ListBuffer<JCVariableDecl> params = new ListBuffer<JCVariableDecl>();
         JCVariableDecl lastParam = null;
         accept(LPAREN);
-        if (S.token() != RPAREN) {
+        if (token.kind != RPAREN) {
             params.append(lastParam = formalParameter());
-            while ((lastParam.mods.flags & Flags.VARARGS) == 0 && S.token() == COMMA) {
-                S.nextToken();
+            while ((lastParam.mods.flags & Flags.VARARGS) == 0 && token.kind == COMMA) {
+                nextToken();
                 params.append(lastParam = formalParameter());
             }
         }
@@ -3058,8 +3250,26 @@ public class JavacParser implements Parser {
         return params.toList();
     }
 
+    List<JCVariableDecl> implicitParameters(boolean hasParens) {
+        if (hasParens) {
+            accept(LPAREN);
+        }
+        ListBuffer<JCVariableDecl> params = new ListBuffer<JCVariableDecl>();
+        if (token.kind != RPAREN && token.kind != ARROW) {
+            params.append(implicitParameter());
+            while (token.kind == COMMA) {
+                nextToken();
+                params.append(implicitParameter());
+            }
+        }
+        if (hasParens) {
+            accept(RPAREN);
+        }
+        return params.toList();
+    }
+
     JCModifiers optFinal(long flags) {
-        JCModifiers mods = modifiersOpt(ModuleModifierKind.DISALLOWED);
+        JCModifiers mods = modifiersOpt();
         checkNoMods(mods.flags & ~(Flags.FINAL | Flags.DEPRECATED));
         mods.flags |= flags;
         return mods;
@@ -3071,15 +3281,20 @@ public class JavacParser implements Parser {
     protected JCVariableDecl formalParameter() {
         JCModifiers mods = optFinal(Flags.PARAMETER);
         JCExpression type = parseType();
-        if (S.token() == ELLIPSIS) {
+        if (token.kind == ELLIPSIS) {
             checkVarargs();
             mods.flags |= Flags.VARARGS;
-            type = to(F.at(S.pos()).TypeArray(type));
-            S.nextToken();
+            type = to(F.at(token.pos).TypeArray(type));
+            nextToken();
         }
         return variableDeclaratorId(mods, type);
     }
 
+    protected JCVariableDecl implicitParameter() {
+        JCModifiers mods = F.at(token.pos).Modifiers(Flags.PARAMETER);
+        return variableDeclaratorId(mods, null);
+    }
+
 /* ---------- auxiliary methods -------------- */
 
     void error(int pos, String key, Object ... args) {
@@ -3098,15 +3313,15 @@ public class JavacParser implements Parser {
      */
     protected JCExpression checkExprStat(JCExpression t) {
         switch(t.getTag()) {
-        case JCTree.PREINC: case JCTree.PREDEC:
-        case JCTree.POSTINC: case JCTree.POSTDEC:
-        case JCTree.ASSIGN:
-        case JCTree.BITOR_ASG: case JCTree.BITXOR_ASG: case JCTree.BITAND_ASG:
-        case JCTree.SL_ASG: case JCTree.SR_ASG: case JCTree.USR_ASG:
-        case JCTree.PLUS_ASG: case JCTree.MINUS_ASG:
-        case JCTree.MUL_ASG: case JCTree.DIV_ASG: case JCTree.MOD_ASG:
-        case JCTree.APPLY: case JCTree.NEWCLASS:
-        case JCTree.ERRONEOUS:
+        case PREINC: case PREDEC:
+        case POSTINC: case POSTDEC:
+        case ASSIGN:
+        case BITOR_ASG: case BITXOR_ASG: case BITAND_ASG:
+        case SL_ASG: case SR_ASG: case USR_ASG:
+        case PLUS_ASG: case MINUS_ASG:
+        case MUL_ASG: case DIV_ASG: case MOD_ASG:
+        case APPLY: case NEWCLASS:
+        case ERRONEOUS:
             return t;
         default:
             JCExpression ret = F.at(t.pos).Erroneous(List.<JCTree>of(t));
@@ -3118,9 +3333,9 @@ public class JavacParser implements Parser {
     /** Return precedence of operator represented by token,
      *  -1 if token is not a binary operator. @see TreeInfo.opPrec
      */
-    static int prec(Token token) {
-        int oc = optag(token);
-        return (oc >= 0) ? TreeInfo.opPrec(oc) : -1;
+    static int prec(TokenKind token) {
+        JCTree.Tag oc = optag(token);
+        return (oc != NO_TAG) ? TreeInfo.opPrec(oc) : -1;
     }
 
     /**
@@ -3136,103 +3351,103 @@ public class JavacParser implements Parser {
     }
 
     /** Return operation tag of binary operator represented by token,
-     *  -1 if token is not a binary operator.
+     *  No_TAG if token is not a binary operator.
      */
-    static int optag(Token token) {
+    static JCTree.Tag optag(TokenKind token) {
         switch (token) {
         case BARBAR:
-            return JCTree.OR;
+            return OR;
         case AMPAMP:
-            return JCTree.AND;
+            return AND;
         case BAR:
-            return JCTree.BITOR;
+            return BITOR;
         case BAREQ:
-            return JCTree.BITOR_ASG;
+            return BITOR_ASG;
         case CARET:
-            return JCTree.BITXOR;
+            return BITXOR;
         case CARETEQ:
-            return JCTree.BITXOR_ASG;
+            return BITXOR_ASG;
         case AMP:
-            return JCTree.BITAND;
+            return BITAND;
         case AMPEQ:
-            return JCTree.BITAND_ASG;
+            return BITAND_ASG;
         case EQEQ:
-            return JCTree.EQ;
+            return JCTree.Tag.EQ;
         case BANGEQ:
-            return JCTree.NE;
+            return NE;
         case LT:
-            return JCTree.LT;
+            return JCTree.Tag.LT;
         case GT:
-            return JCTree.GT;
+            return JCTree.Tag.GT;
         case LTEQ:
-            return JCTree.LE;
+            return LE;
         case GTEQ:
-            return JCTree.GE;
+            return GE;
         case LTLT:
-            return JCTree.SL;
+            return SL;
         case LTLTEQ:
-            return JCTree.SL_ASG;
+            return SL_ASG;
         case GTGT:
-            return JCTree.SR;
+            return SR;
         case GTGTEQ:
-            return JCTree.SR_ASG;
+            return SR_ASG;
         case GTGTGT:
-            return JCTree.USR;
+            return USR;
         case GTGTGTEQ:
-            return JCTree.USR_ASG;
+            return USR_ASG;
         case PLUS:
-            return JCTree.PLUS;
+            return JCTree.Tag.PLUS;
         case PLUSEQ:
-            return JCTree.PLUS_ASG;
+            return PLUS_ASG;
         case SUB:
-            return JCTree.MINUS;
+            return MINUS;
         case SUBEQ:
-            return JCTree.MINUS_ASG;
+            return MINUS_ASG;
         case STAR:
-            return JCTree.MUL;
+            return MUL;
         case STAREQ:
-            return JCTree.MUL_ASG;
+            return MUL_ASG;
         case SLASH:
-            return JCTree.DIV;
+            return DIV;
         case SLASHEQ:
-            return JCTree.DIV_ASG;
+            return DIV_ASG;
         case PERCENT:
-            return JCTree.MOD;
+            return MOD;
         case PERCENTEQ:
-            return JCTree.MOD_ASG;
+            return MOD_ASG;
         case INSTANCEOF:
-            return JCTree.TYPETEST;
+            return TYPETEST;
         default:
-            return -1;
+            return NO_TAG;
         }
     }
 
     /** Return operation tag of unary operator represented by token,
-     *  -1 if token is not a binary operator.
+     *  No_TAG if token is not a binary operator.
      */
-    static int unoptag(Token token) {
+    static JCTree.Tag unoptag(TokenKind token) {
         switch (token) {
         case PLUS:
-            return JCTree.POS;
+            return POS;
         case SUB:
-            return JCTree.NEG;
+            return NEG;
         case BANG:
-            return JCTree.NOT;
+            return NOT;
         case TILDE:
-            return JCTree.COMPL;
+            return COMPL;
         case PLUSPLUS:
-            return JCTree.PREINC;
+            return PREINC;
         case SUBSUB:
-            return JCTree.PREDEC;
+            return PREDEC;
         default:
-            return -1;
+            return NO_TAG;
         }
     }
 
     /** Return type tag of basic type represented by token,
      *  -1 if token is not a basic type identifier.
      */
-    static int typetag(Token token) {
+    static int typetag(TokenKind token) {
         switch (token) {
         case BYTE:
             return TypeTags.BYTE;
@@ -3257,50 +3472,170 @@ public class JavacParser implements Parser {
 
     void checkGenerics() {
         if (!allowGenerics) {
-            error(S.pos(), "generics.not.supported.in.source", source.name);
+            error(token.pos, "generics.not.supported.in.source", source.name);
             allowGenerics = true;
         }
     }
     void checkVarargs() {
         if (!allowVarargs) {
-            error(S.pos(), "varargs.not.supported.in.source", source.name);
+            error(token.pos, "varargs.not.supported.in.source", source.name);
             allowVarargs = true;
         }
     }
     void checkForeach() {
         if (!allowForeach) {
-            error(S.pos(), "foreach.not.supported.in.source", source.name);
+            error(token.pos, "foreach.not.supported.in.source", source.name);
             allowForeach = true;
         }
     }
     void checkStaticImports() {
         if (!allowStaticImport) {
-            error(S.pos(), "static.import.not.supported.in.source", source.name);
+            error(token.pos, "static.import.not.supported.in.source", source.name);
             allowStaticImport = true;
         }
     }
     void checkAnnotations() {
         if (!allowAnnotations) {
-            error(S.pos(), "annotations.not.supported.in.source", source.name);
+            error(token.pos, "annotations.not.supported.in.source", source.name);
             allowAnnotations = true;
         }
     }
     void checkDiamond() {
         if (!allowDiamond) {
-            error(S.pos(), "diamond.not.supported.in.source", source.name);
+            error(token.pos, "diamond.not.supported.in.source", source.name);
             allowDiamond = true;
         }
     }
     void checkMulticatch() {
         if (!allowMulticatch) {
-            error(S.pos(), "multicatch.not.supported.in.source", source.name);
+            error(token.pos, "multicatch.not.supported.in.source", source.name);
             allowMulticatch = true;
         }
     }
     void checkTryWithResources() {
         if (!allowTWR) {
-            error(S.pos(), "try.with.resources.not.supported.in.source", source.name);
+            error(token.pos, "try.with.resources.not.supported.in.source", source.name);
             allowTWR = true;
         }
     }
+    void checkLambda() {
+        if (!allowLambda) {
+            log.error(token.pos, "lambda.not.supported.in.source", source.name);
+            allowLambda = true;
+        }
+    }
+    void checkMethodReferences() {
+        if (!allowMethodReferences) {
+            log.error(token.pos, "method.references.not.supported.in.source", source.name);
+            allowMethodReferences = true;
+        }
+    }
+
+    /*
+     * a functional source tree and end position mappings
+     */
+    protected class SimpleEndPosTable extends AbstractEndPosTable {
+
+        private final Map<JCTree, Integer> endPosMap;
+
+        SimpleEndPosTable() {
+            endPosMap = new HashMap<JCTree, Integer>();
+        }
+
+        protected void storeEnd(JCTree tree, int endpos) {
+            endPosMap.put(tree, errorEndPos > endpos ? errorEndPos : endpos);
+        }
+
+        protected <T extends JCTree> T to(T t) {
+            storeEnd(t, token.endPos);
+            return t;
+        }
+
+        protected <T extends JCTree> T toP(T t) {
+            storeEnd(t, S.prevToken().endPos);
+            return t;
+        }
+
+        public int getEndPos(JCTree tree) {
+            Integer value = endPosMap.get(tree);
+            return (value == null) ? Position.NOPOS : value;
+        }
+
+        public int replaceTree(JCTree oldTree, JCTree newTree) {
+            Integer pos = endPosMap.remove(oldTree);
+            if (pos != null) {
+                endPosMap.put(newTree, pos);
+                return pos;
+            }
+            return Position.NOPOS;
+        }
+    }
+
+    /*
+     * a default skeletal implementation without any mapping overhead.
+     */
+    protected class EmptyEndPosTable extends AbstractEndPosTable {
+
+        protected void storeEnd(JCTree tree, int endpos) { /* empty */ }
+
+        protected <T extends JCTree> T to(T t) {
+            return t;
+        }
+
+        protected <T extends JCTree> T toP(T t) {
+            return t;
+        }
+
+        public int getEndPos(JCTree tree) {
+            return Position.NOPOS;
+        }
+
+        public int replaceTree(JCTree oldTree, JCTree newTree) {
+            return Position.NOPOS;
+        }
+
+    }
+
+    protected abstract class AbstractEndPosTable implements EndPosTable {
+
+        /**
+         * Store the last error position.
+         */
+        protected int errorEndPos;
+
+        /**
+         * Store ending position for a tree, the value of which is the greater
+         * of last error position and the given ending position.
+         * @param tree   The tree.
+         * @param endpos The ending position to associate with the tree.
+         */
+        protected abstract void storeEnd(JCTree tree, int endpos);
+
+        /**
+         * Store current token's ending position for a tree, the value of which
+         * will be the greater of last error position and the ending position of
+         * the current token.
+         * @param t The tree.
+         */
+        protected abstract <T extends JCTree> T to(T t);
+
+        /**
+         * Store current token's ending position for a tree, the value of which
+         * will be the greater of last error position and the ending position of
+         * the previous token.
+         * @param t The tree.
+         */
+        protected abstract <T extends JCTree> T toP(T t);
+
+        /**
+         * Set the error position during the parsing phases, the value of which
+         * will be set only if it is greater than the last stored error position.
+         * @param errPos The error position
+         */
+        protected void setErrorEndPos(int errPos) {
+            if (errPos > errorEndPos) {
+                errorEndPos = errPos;
+            }
+        }
+    }
 }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java b/langtools/src/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java
new file mode 100644
index 0000000..4aac62c
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java
@@ -0,0 +1,355 @@
+/*
+ * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package com.sun.tools.javac.parser;
+
+import com.sun.tools.javac.parser.Tokens.Comment;
+import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
+import com.sun.tools.javac.util.*;
+
+import java.nio.*;
+
+import static com.sun.tools.javac.util.LayoutCharacters.*;
+
+/** An extension to the base lexical analyzer that captures
+ *  and processes the contents of doc comments.  It does so by
+ *  translating Unicode escape sequences and by stripping the
+ *  leading whitespace and starts from each line of the comment.
+ *
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ */
+public class JavadocTokenizer extends JavaTokenizer {
+
+    /** Create a scanner from the input buffer.  buffer must implement
+     *  array() and compact(), and remaining() must be less than limit().
+     */
+    protected JavadocTokenizer(ScannerFactory fac, CharBuffer buffer) {
+        super(fac, buffer);
+    }
+
+    /** Create a scanner from the input array.  The array must have at
+     *  least a single character of extra space.
+     */
+    protected JavadocTokenizer(ScannerFactory fac, char[] input, int inputLength) {
+        super(fac, input, inputLength);
+    }
+
+    @Override
+    protected Comment processComment(int pos, int endPos, CommentStyle style) {
+        char[] buf = reader.getRawCharacters(pos, endPos);
+        return new JavadocComment(new ColReader(fac, buf, buf.length), style);
+    }
+
+    /**
+     * This is a specialized version of UnicodeReader that keeps track of the
+     * column position within a given character stream (used for Javadoc processing).
+     */
+    static class ColReader extends UnicodeReader {
+
+         int col;
+
+         ColReader(ScannerFactory fac, char[] input, int inputLength) {
+             super(fac, input, inputLength);
+         }
+
+         @Override
+         protected void convertUnicode() {
+             if (ch == '\\' && unicodeConversionBp != bp) {
+                 bp++; ch = buf[bp]; col++;
+                 if (ch == 'u') {
+                     do {
+                         bp++; ch = buf[bp]; col++;
+                     } while (ch == 'u');
+                     int limit = bp + 3;
+                     if (limit < buflen) {
+                         int d = digit(bp, 16);
+                         int code = d;
+                         while (bp < limit && d >= 0) {
+                             bp++; ch = buf[bp]; col++;
+                             d = digit(bp, 16);
+                             code = (code << 4) + d;
+                         }
+                         if (d >= 0) {
+                             ch = (char)code;
+                             unicodeConversionBp = bp;
+                             return;
+                         }
+                     }
+                     // "illegal.Unicode.esc", reported by base scanner
+                 } else {
+                     bp--;
+                     ch = '\\';
+                     col--;
+                 }
+             }
+         }
+
+         @Override
+         protected void scanCommentChar() {
+             scanChar();
+             if (ch == '\\') {
+                 if (peekChar() == '\\' && !isUnicode()) {
+                     putChar(ch, false);
+                     bp++; col++;
+                 } else {
+                     convertUnicode();
+                 }
+             }
+         }
+
+         @Override
+         protected void scanChar() {
+             bp++;
+             ch = buf[bp];
+             switch (ch) {
+             case '\r': // return
+                 col = 0;
+                 break;
+             case '\n': // newline
+                 if (bp == 0 || buf[bp-1] != '\r') {
+                     col = 0;
+                 }
+                 break;
+             case '\t': // tab
+                 col = (col / TabInc * TabInc) + TabInc;
+                 break;
+             case '\\': // possible Unicode
+                 col++;
+                 convertUnicode();
+                 break;
+             default:
+                 col++;
+                 break;
+             }
+         }
+     }
+
+     protected class JavadocComment extends JavaTokenizer.BasicComment<ColReader> {
+
+        /**
+        * Translated and stripped contents of doc comment
+        */
+        private String docComment = null;
+
+        JavadocComment(ColReader comment_reader, CommentStyle cs) {
+            super(comment_reader, cs);
+        }
+
+        public String getText() {
+            if (!scanned && cs == CommentStyle.JAVADOC) {
+                scanDocComment();
+            }
+            return docComment;
+        }
+
+        @Override
+        @SuppressWarnings("fallthrough")
+        protected void scanDocComment() {
+             try {
+                 boolean firstLine = true;
+
+                 // Skip over first slash
+                 comment_reader.scanCommentChar();
+                 // Skip over first star
+                 comment_reader.scanCommentChar();
+
+                 // consume any number of stars
+                 while (comment_reader.bp < comment_reader.buflen && comment_reader.ch == '*') {
+                     comment_reader.scanCommentChar();
+                 }
+                 // is the comment in the form /**/, /***/, /****/, etc. ?
+                 if (comment_reader.bp < comment_reader.buflen && comment_reader.ch == '/') {
+                     docComment = "";
+                     return;
+                 }
+
+                 // skip a newline on the first line of the comment.
+                 if (comment_reader.bp < comment_reader.buflen) {
+                     if (comment_reader.ch == LF) {
+                         comment_reader.scanCommentChar();
+                         firstLine = false;
+                     } else if (comment_reader.ch == CR) {
+                         comment_reader.scanCommentChar();
+                         if (comment_reader.ch == LF) {
+                             comment_reader.scanCommentChar();
+                             firstLine = false;
+                         }
+                     }
+                 }
+
+             outerLoop:
+
+                 // The outerLoop processes the doc comment, looping once
+                 // for each line.  For each line, it first strips off
+                 // whitespace, then it consumes any stars, then it
+                 // puts the rest of the line into our buffer.
+                 while (comment_reader.bp < comment_reader.buflen) {
+
+                     // The wsLoop consumes whitespace from the beginning
+                     // of each line.
+                 wsLoop:
+
+                     while (comment_reader.bp < comment_reader.buflen) {
+                         switch(comment_reader.ch) {
+                         case ' ':
+                             comment_reader.scanCommentChar();
+                             break;
+                         case '\t':
+                             comment_reader.col = ((comment_reader.col - 1) / TabInc * TabInc) + TabInc;
+                             comment_reader.scanCommentChar();
+                             break;
+                         case FF:
+                             comment_reader.col = 0;
+                             comment_reader.scanCommentChar();
+                             break;
+         // Treat newline at beginning of line (blank line, no star)
+         // as comment text.  Old Javadoc compatibility requires this.
+         /*---------------------------------*
+                         case CR: // (Spec 3.4)
+                             doc_reader.scanCommentChar();
+                             if (ch == LF) {
+                                 col = 0;
+                                 doc_reader.scanCommentChar();
+                             }
+                             break;
+                         case LF: // (Spec 3.4)
+                             doc_reader.scanCommentChar();
+                             break;
+         *---------------------------------*/
+                         default:
+                             // we've seen something that isn't whitespace;
+                             // jump out.
+                             break wsLoop;
+                         }
+                     }
+
+                     // Are there stars here?  If so, consume them all
+                     // and check for the end of comment.
+                     if (comment_reader.ch == '*') {
+                         // skip all of the stars
+                         do {
+                             comment_reader.scanCommentChar();
+                         } while (comment_reader.ch == '*');
+
+                         // check for the closing slash.
+                         if (comment_reader.ch == '/') {
+                             // We're done with the doc comment
+                             // scanChar() and breakout.
+                             break outerLoop;
+                         }
+                     } else if (! firstLine) {
+                         //The current line does not begin with a '*' so we will indent it.
+                         for (int i = 1; i < comment_reader.col; i++) {
+                             comment_reader.putChar(' ', false);
+                         }
+                     }
+                     // The textLoop processes the rest of the characters
+                     // on the line, adding them to our buffer.
+                 textLoop:
+                     while (comment_reader.bp < comment_reader.buflen) {
+                         switch (comment_reader.ch) {
+                         case '*':
+                             // Is this just a star?  Or is this the
+                             // end of a comment?
+                             comment_reader.scanCommentChar();
+                             if (comment_reader.ch == '/') {
+                                 // This is the end of the comment,
+                                 // set ch and return our buffer.
+                                 break outerLoop;
+                             }
+                             // This is just an ordinary star.  Add it to
+                             // the buffer.
+                             comment_reader.putChar('*', false);
+                             break;
+                         case ' ':
+                         case '\t':
+                             comment_reader.putChar(comment_reader.ch, false);
+                             comment_reader.scanCommentChar();
+                             break;
+                         case FF:
+                             comment_reader.scanCommentChar();
+                             break textLoop; // treat as end of line
+                         case CR: // (Spec 3.4)
+                             comment_reader.scanCommentChar();
+                             if (comment_reader.ch != LF) {
+                                 // Canonicalize CR-only line terminator to LF
+                                 comment_reader.putChar((char)LF, false);
+                                 break textLoop;
+                             }
+                             /* fall through to LF case */
+                         case LF: // (Spec 3.4)
+                             // We've seen a newline.  Add it to our
+                             // buffer and break out of this loop,
+                             // starting fresh on a new line.
+                             comment_reader.putChar(comment_reader.ch, false);
+                             comment_reader.scanCommentChar();
+                             break textLoop;
+                         default:
+                             // Add the character to our buffer.
+                             comment_reader.putChar(comment_reader.ch, false);
+                             comment_reader.scanCommentChar();
+                         }
+                     } // end textLoop
+                     firstLine = false;
+                 } // end outerLoop
+
+                 if (comment_reader.sp > 0) {
+                     int i = comment_reader.sp - 1;
+                 trailLoop:
+                     while (i > -1) {
+                         switch (comment_reader.sbuf[i]) {
+                         case '*':
+                             i--;
+                             break;
+                         default:
+                             break trailLoop;
+                         }
+                     }
+                     comment_reader.sp = i + 1;
+
+                     // Store the text of the doc comment
+                    docComment = comment_reader.chars();
+                } else {
+                    docComment = "";
+                }
+            } finally {
+                scanned = true;
+                if (docComment != null &&
+                        docComment.matches("(?sm).*^\\s*@deprecated( |$).*")) {
+                    deprecatedFlag = true;
+                }
+            }
+        }
+    }
+
+    @Override
+    public Position.LineMap getLineMap() {
+        char[] buf = reader.getRawCharacters();
+        return Position.makeLineMap(buf, buf.length, true);
+    }
+}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/Lexer.java b/langtools/src/share/classes/com/sun/tools/javac/parser/Lexer.java
index 6a2eadc..a02d7b6 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/Lexer.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Lexer.java
@@ -25,7 +25,7 @@
 
 package com.sun.tools.javac.parser;
 
-import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.parser.Tokens.Token;
 import com.sun.tools.javac.util.Position.LineMap;
 
 /**
@@ -40,22 +40,31 @@ import com.sun.tools.javac.util.Position.LineMap;
 public interface Lexer {
 
     /**
-     * Has a @deprecated been encountered in last doc comment?
-     * This needs to be reset by client with resetDeprecatedFlag.
+     * Consume the next token.
      */
-    boolean deprecatedFlag();
+    void nextToken();
+
+    /**
+     * Return current token.
+     */
+    Token token();
 
-    void resetDeprecatedFlag();
+    /**
+     * Return token with given lookahead.
+     */
+    Token token(int lookahead);
 
     /**
-     * Returns the documentation string of the current token.
+     * Return the last character position of the previous token.
      */
-    String docComment();
+    Token prevToken();
 
     /**
-     * Return the last character position of the current token.
+     * Splits the current token in two and return the first (splitted) token.
+     * For instance '<<<' is splitted into two tokens '<' and '<<' respectively,
+     * and the latter is returned.
      */
-    int endPos();
+    Token split();
 
     /**
      * Return the position where a lexical error occurred;
@@ -75,79 +84,8 @@ public interface Lexer {
      */
     LineMap getLineMap();
 
-    /**
-     * Returns a copy of the input buffer, up to its inputLength.
-     * Unicode escape sequences are not translated.
-     */
-    char[] getRawCharacters();
-
-    /**
-     * Returns a copy of a character array subset of the input buffer.
-     * The returned array begins at the <code>beginIndex</code> and
-     * extends to the character at index <code>endIndex - 1</code>.
-     * Thus the length of the substring is <code>endIndex-beginIndex</code>.
-     * This behavior is like
-     * <code>String.substring(beginIndex, endIndex)</code>.
-     * Unicode escape sequences are not translated.
-     *
-     * @param beginIndex the beginning index, inclusive.
-     * @param endIndex the ending index, exclusive.
-     * @throws IndexOutOfBounds if either offset is outside of the
-     *         array bounds
-     */
-    char[] getRawCharacters(int beginIndex, int endIndex);
-
-    /**
-     * Return the name of an identifier or token for the current token.
-     */
-    Name name();
-
-    /**
-     * Read token.
-     */
-    void nextToken();
-
-    /**
-     * Return the current token's position: a 0-based
-     *  offset from beginning of the raw input stream
-     *  (before unicode translation)
-     */
-    int pos();
-
-    /**
-     * Return the last character position of the previous token.
-     */
-    int prevEndPos();
-
-    /**
-     * Return the radix of a numeric literal token.
-     */
-    int radix();
-
-    /**
-     * The value of a literal token, recorded as a string.
-     *  For integers, leading 0x and 'l' suffixes are suppressed.
-     */
-    String stringVal();
+    boolean allowVersionLiteral();
+    void allowVersionLiteral(boolean allow);
 
-    /**
-     * Return the current token, set by nextToken().
-     */
-    Token token();
-
-    /**
-     * Sets the current token.
-     */
-    void token(Token token);
-
-    /**
-     * Very simple mark/reset support. At most one position may be marked.
-     */
-    void mark();
-
-    /**
-     * Reset the lexer back to the last marked position. No-op if no position
-     * has been set.
-     */
-    void reset();
+    UnicodeReader getReader();
 }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java b/langtools/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java
index 709bd5f..aa50922 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@ public class ParserFactory {
 
     final TreeMaker F;
     final Log log;
-    final Keywords keywords;
+    final Tokens tokens;
     final Source source;
     final Names names;
     final Options options;
@@ -67,7 +67,7 @@ public class ParserFactory {
         this.F = TreeMaker.instance(context);
         this.log = Log.instance(context);
         this.names = Names.instance(context);
-        this.keywords = Keywords.instance(context);
+        this.tokens = Tokens.instance(context);
         this.source = Source.instance(context);
         this.options = Options.instance(context);
         this.scannerFactory = ScannerFactory.instance(context);
@@ -75,10 +75,6 @@ public class ParserFactory {
 
     public Parser newParser(CharSequence input, boolean keepDocComments, boolean keepEndPos, boolean keepLineMap) {
         Lexer lexer = scannerFactory.newScanner(input, keepDocComments);
-        if (keepEndPos) {
-            return new EndPosParser(this, lexer, keepDocComments, keepLineMap);
-        } else {
-            return new JavacParser(this, lexer, keepDocComments, keepLineMap);
-        }
+        return new JavacParser(this, lexer, keepDocComments, keepLineMap, keepEndPos);
     }
 }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java b/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java
index 5325ec7..52a7195 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java
@@ -26,14 +26,13 @@
 package com.sun.tools.javac.parser;
 
 import java.nio.*;
+import java.util.List;
+import java.util.ArrayList;
 
-import com.sun.tools.javac.code.Source;
-import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.Position.LineMap;
+import com.sun.tools.javac.parser.JavaTokenizer.*;
 
-
-import static com.sun.tools.javac.parser.Token.*;
-import static com.sun.tools.javac.util.LayoutCharacters.*;
+import static com.sun.tools.javac.parser.Tokens.*;
 
 /** The lexical analyzer maps an input stream consisting of
  *  ASCII characters and Unicode escapes into a token sequence.
@@ -45,176 +44,21 @@ import static com.sun.tools.javac.util.LayoutCharacters.*;
  */
 public class Scanner implements Lexer {
 
-    private static boolean scannerDebug = false;
-
-    static class Mark {
-        /** Save the observable state of scanner as updated by nextToken().
-         */
-        Mark(Scanner s) {
-            bp = s.bp;
-            ch = s.ch;
-            deprecatedFlag = s.deprecatedFlag;
-            docComment = s.docComment();
-            endPos = s.endPos;
-            errPos = s.errPos;
-            name = s.name;
-            pos = s.pos;
-            prevEndPos = s.prevEndPos;
-            radix = s.radix;
-            stringVal = s.stringVal();
-            token = s.token;
-        }
-
-        void apply(Scanner s) {
-            s.bp = bp;
-            s.ch = ch;
-            s.deprecatedFlag = deprecatedFlag;
-            // currently, there is no way to reset the docComment, but for the
-            // limited context for mark/reset this is probably not an issue
-            //s.docComment = docComment;
-            s.endPos = endPos;
-            s.errPos = errPos;
-            s.name = name;
-            s.pos = pos;
-            s.prevEndPos = prevEndPos;
-            s.radix = radix;
-            assert stringVal.length() < s.sbuf.length;
-            s.sp = stringVal.length();
-            for (int i = 0; i < s.sp; i++)
-                s.sbuf[i] = stringVal.charAt(i);
-            s.token = token;
-
-        }
-
-        final int bp;
-        final char ch;
-        final boolean deprecatedFlag;
-        final String docComment;
-        final int endPos;
-        final int errPos;
-        final Name name;
-        final int pos;
-        final int prevEndPos;
-        final int radix;
-        final String stringVal;
-        final Token token;
-    }
-
-    /* Output variables; set by nextToken():
-     */
+    private Tokens tokens;
 
     /** The token, set by nextToken().
      */
     private Token token;
 
-    /** Allow hex floating-point literals.
-     */
-    private boolean allowHexFloats;
-
-    /** Allow binary literals.
-     */
-    private boolean allowBinaryLiterals;
-
-    /** Allow underscores in literals.
-     */
-    private boolean allowUnderscoresInLiterals;
-
-    /** The source language setting.
-     */
-    private Source source;
-
-    /** The token's position, 0-based offset from beginning of text.
-     */
-    private int pos;
-
-    /** Character position just after the last character of the token.
-     */
-    private int endPos;
-
-    /** The last character position of the previous token.
-     */
-    private int prevEndPos;
-
-    /** The position where a lexical error occurred;
-     */
-    private int errPos = Position.NOPOS;
-
-    /** The name of an identifier or token:
-     */
-    private Name name;
-
-    /** The radix of a numeric literal token.
+    /** The previous token, set by nextToken().
      */
-    private int radix;
+    private Token prevToken;
 
-    /** Has a @deprecated been encountered in last doc comment?
-     *  this needs to be reset by client.
+    /** Buffer of saved tokens (used during lookahead)
      */
-    protected boolean deprecatedFlag = false;
-
-    /** A character buffer for literals.
-     */
-    private char[] sbuf = new char[128];
-    private int sp;
-
-    /** The input buffer, index of next chacter to be read,
-     *  index of one past last character in buffer.
-     */
-    private char[] buf;
-    private int bp;
-    private int buflen;
-    private int eofPos;
-
-    /** The current character.
-     */
-    private char ch;
-
-    /** The buffer index of the last converted unicode character
-     */
-    private int unicodeConversionBp = -1;
-
-    /** The last marked position.
-     */
-    private Mark mark;
-
-    /** The log to be used for error reporting.
-     */
-    private final Log log;
-
-    /** The name table. */
-    private final Names names;
-
-    /** The keyword table. */
-    private final Keywords keywords;
-
-    /** Common code for constructors. */
-    private Scanner(ScannerFactory fac) {
-        log = fac.log;
-        names = fac.names;
-        keywords = fac.keywords;
-        source = fac.source;
-        allowBinaryLiterals = source.allowBinaryLiterals();
-        allowHexFloats = source.allowHexFloats();
-        allowUnderscoresInLiterals = source.allowUnderscoresInLiterals();
-    }
-
-    private static final boolean hexFloatsWork = hexFloatsWork();
-    private static boolean hexFloatsWork() {
-        try {
-            Float.valueOf("0x1.0p1");
-            return true;
-        } catch (NumberFormatException ex) {
-            return false;
-        }
-    }
-
-    /** Create a scanner from the input buffer.  buffer must implement
-     *  array() and compact(), and remaining() must be less than limit().
-     */
-    protected Scanner(ScannerFactory fac, CharBuffer buffer) {
-        this(fac, JavacFileManager.toArray(buffer), buffer.limit());
-    }
+    private List<Token> savedTokens = new ArrayList<Token>();
 
+    private JavaTokenizer tokenizer;
     /**
      * Create a scanner from the input array.  This method might
      * modify the array.  To avoid copying the input array, ensure
@@ -226,1032 +70,80 @@ public class Scanner implements Lexer {
      * @param inputLength the size of the input.
      * Must be positive and less than or equal to input.length.
      */
-    protected Scanner(ScannerFactory fac, char[] input, int inputLength) {
-        this(fac);
-        eofPos = inputLength;
-        if (inputLength == input.length) {
-            if (input.length > 0 && Character.isWhitespace(input[input.length - 1])) {
-                inputLength--;
-            } else {
-                char[] newInput = new char[inputLength + 1];
-                System.arraycopy(input, 0, newInput, 0, input.length);
-                input = newInput;
-            }
-        }
-        buf = input;
-        buflen = inputLength;
-        buf[buflen] = EOI;
-        bp = -1;
-        scanChar();
+    protected Scanner(ScannerFactory fac, CharBuffer buf) {
+        this(fac, new JavaTokenizer(fac, buf));
     }
 
-    /** Report an error at the given position using the provided arguments.
-     */
-    private void lexError(int pos, String key, Object... args) {
-        log.error(pos, key, args);
-        token = ERROR;
-        errPos = pos;
+    protected Scanner(ScannerFactory fac, char[] buf, int inputLength) {
+        this(fac, new JavaTokenizer(fac, buf, inputLength));
     }
 
-    /** Report an error at the current token position using the provided
-     *  arguments.
-     */
-    private void lexError(String key, Object... args) {
-        lexError(pos, key, args);
+    protected Scanner(ScannerFactory fac, JavaTokenizer tokenizer) {
+        this.tokenizer = tokenizer;
+        tokens = fac.tokens;
+        token = prevToken = DUMMY;
     }
 
-    /** Convert an ASCII digit from its base (8, 10, or 16)
-     *  to its value.
-     */
-    private int digit(int base) {
-        char c = ch;
-        int result = Character.digit(c, base);
-        if (result >= 0 && c > 0x7f) {
-            lexError(pos+1, "illegal.nonascii.digit");
-            ch = "0123456789abcdef".charAt(result);
-        }
-        return result;
-    }
-
-    /** Convert unicode escape; bp points to initial '\' character
-     *  (Spec 3.3).
-     */
-    private void convertUnicode() {
-        if (ch == '\\' && unicodeConversionBp != bp) {
-            bp++; ch = buf[bp];
-            if (ch == 'u') {
-                do {
-                    bp++; ch = buf[bp];
-                } while (ch == 'u');
-                int limit = bp + 3;
-                if (limit < buflen) {
-                    int d = digit(16);
-                    int code = d;
-                    while (bp < limit && d >= 0) {
-                        bp++; ch = buf[bp];
-                        d = digit(16);
-                        code = (code << 4) + d;
-                    }
-                    if (d >= 0) {
-                        ch = (char)code;
-                        unicodeConversionBp = bp;
-                        return;
-                    }
-                }
-                lexError(bp, "illegal.unicode.esc");
-            } else {
-                bp--;
-                ch = '\\';
-            }
-        }
-    }
-
-    /** Read next character.
-     */
-    private void scanChar() {
-        ch = buf[++bp];
-        if (ch == '\\') {
-            convertUnicode();
-        }
-    }
-
-    /** Read next character in comment, skipping over double '\' characters.
-     */
-    private void scanCommentChar() {
-        scanChar();
-        if (ch == '\\') {
-            if (buf[bp+1] == '\\' && unicodeConversionBp != bp) {
-                bp++;
-            } else {
-                convertUnicode();
-            }
-        }
-    }
-
-    /** Append a character to sbuf.
-     */
-    private void putChar(char ch) {
-        if (sp == sbuf.length) {
-            char[] newsbuf = new char[sbuf.length * 2];
-            System.arraycopy(sbuf, 0, newsbuf, 0, sbuf.length);
-            sbuf = newsbuf;
-        }
-        sbuf[sp++] = ch;
-    }
-
-    /** Read next character in character or string literal and copy into sbuf.
-     */
-    private void scanLitChar() {
-        if (ch == '\\') {
-            if (buf[bp+1] == '\\' && unicodeConversionBp != bp) {
-                bp++;
-                putChar('\\');
-                scanChar();
-            } else {
-                scanChar();
-                switch (ch) {
-                case '0': case '1': case '2': case '3':
-                case '4': case '5': case '6': case '7':
-                    char leadch = ch;
-                    int oct = digit(8);
-                    scanChar();
-                    if ('0' <= ch && ch <= '7') {
-                        oct = oct * 8 + digit(8);
-                        scanChar();
-                        if (leadch <= '3' && '0' <= ch && ch <= '7') {
-                            oct = oct * 8 + digit(8);
-                            scanChar();
-                        }
-                    }
-                    putChar((char)oct);
-                    break;
-                case 'b':
-                    putChar('\b'); scanChar(); break;
-                case 't':
-                    putChar('\t'); scanChar(); break;
-                case 'n':
-                    putChar('\n'); scanChar(); break;
-                case 'f':
-                    putChar('\f'); scanChar(); break;
-                case 'r':
-                    putChar('\r'); scanChar(); break;
-                case '\'':
-                    putChar('\''); scanChar(); break;
-                case '\"':
-                    putChar('\"'); scanChar(); break;
-                case '\\':
-                    putChar('\\'); scanChar(); break;
-                default:
-                    lexError(bp, "illegal.esc.char");
-                }
-            }
-        } else if (bp != buflen) {
-            putChar(ch); scanChar();
-        }
-    }
-
-    private void scanDigits(int digitRadix) {
-        char saveCh;
-        int savePos;
-        do {
-            if (ch != '_') {
-                putChar(ch);
-            } else {
-                if (!allowUnderscoresInLiterals) {
-                    lexError("unsupported.underscore.lit", source.name);
-                    allowUnderscoresInLiterals = true;
-                }
-            }
-            saveCh = ch;
-            savePos = bp;
-            scanChar();
-        } while (digit(digitRadix) >= 0 || ch == '_');
-        if (saveCh == '_')
-            lexError(savePos, "illegal.underscore");
-    }
-
-    /** Read fractional part of hexadecimal floating point number.
-     */
-    private void scanHexExponentAndSuffix() {
-        if (ch == 'p' || ch == 'P') {
-            putChar(ch);
-            scanChar();
-            skipIllegalUnderscores();
-            if (ch == '+' || ch == '-') {
-                putChar(ch);
-                scanChar();
-            }
-            skipIllegalUnderscores();
-            if ('0' <= ch && ch <= '9') {
-                scanDigits(10);
-                if (!allowHexFloats) {
-                    lexError("unsupported.fp.lit", source.name);
-                    allowHexFloats = true;
-                }
-                else if (!hexFloatsWork)
-                    lexError("unsupported.cross.fp.lit");
-            } else
-                lexError("malformed.fp.lit");
-        } else {
-            lexError("malformed.fp.lit");
-        }
-        if (ch == 'f' || ch == 'F') {
-            putChar(ch);
-            scanChar();
-            token = FLOATLITERAL;
-        } else {
-            if (ch == 'd' || ch == 'D') {
-                putChar(ch);
-                scanChar();
-            }
-            token = DOUBLELITERAL;
-        }
-    }
-
-    /** Read fractional part of floating point number.
-     */
-    private void scanFraction() {
-        skipIllegalUnderscores();
-        if ('0' <= ch && ch <= '9') {
-            scanDigits(10);
-        }
-        int sp1 = sp;
-        if (ch == 'e' || ch == 'E') {
-            putChar(ch);
-            scanChar();
-            skipIllegalUnderscores();
-            if (ch == '+' || ch == '-') {
-                putChar(ch);
-                scanChar();
-            }
-            skipIllegalUnderscores();
-            if ('0' <= ch && ch <= '9') {
-                scanDigits(10);
-                return;
-            }
-            lexError("malformed.fp.lit");
-            sp = sp1;
-        }
-    }
-
-    /** Read fractional part and 'd' or 'f' suffix of floating point number.
-     */
-    private void scanFractionAndSuffix() {
-        this.radix = 10;
-        scanFraction();
-        if (ch == 'f' || ch == 'F') {
-            putChar(ch);
-            scanChar();
-            token = FLOATLITERAL;
-        } else {
-            if (ch == 'd' || ch == 'D') {
-                putChar(ch);
-                scanChar();
-            }
-            token = DOUBLELITERAL;
-        }
-    }
-
-    /** Read fractional part and 'd' or 'f' suffix of floating point number.
-     */
-    private void scanHexFractionAndSuffix(boolean seendigit) {
-        this.radix = 16;
-        Assert.check(ch == '.');
-        putChar(ch);
-        scanChar();
-        skipIllegalUnderscores();
-        if (digit(16) >= 0) {
-            seendigit = true;
-            scanDigits(16);
-        }
-        if (!seendigit)
-            lexError("invalid.hex.number");
-        else
-            scanHexExponentAndSuffix();
-    }
-
-    private void skipIllegalUnderscores() {
-        if (ch == '_') {
-            lexError(bp, "illegal.underscore");
-            while (ch == '_')
-                scanChar();
-        }
+    public Token token() {
+        return token(0);
     }
 
-    /** Read a number.
-     *  @param radix  The radix of the number; one of 2, j8, 10, 16.
-     */
-    private void scanNumber(int radix) {
-        this.radix = radix;
-        // for octal, allow base-10 digit in case it's a float literal
-        int digitRadix = (radix == 8 ? 10 : radix);
-        boolean seendigit = false;
-        if (digit(digitRadix) >= 0) {
-            seendigit = true;
-            scanDigits(digitRadix);
-        }
-        if (radix == 16 && ch == '.') {
-            scanHexFractionAndSuffix(seendigit);
-        } else if (seendigit && radix == 16 && (ch == 'p' || ch == 'P')) {
-            scanHexExponentAndSuffix();
-        } else if (digitRadix == 10 && ch == '.') {
-            putChar(ch);
-            scanChar();
-            scanFractionAndSuffix();
-        } else if (digitRadix == 10 &&
-                   (ch == 'e' || ch == 'E' ||
-                    ch == 'f' || ch == 'F' ||
-                    ch == 'd' || ch == 'D')) {
-            scanFractionAndSuffix();
+    public Token token(int lookahead) {
+        if (lookahead == 0) {
+            return token;
         } else {
-            if (ch == 'l' || ch == 'L') {
-                scanChar();
-                token = LONGLITERAL;
-            } else {
-                token = INTLITERAL;
-            }
-        }
-    }
-
-    /** Read an identifier.
-     */
-    private void scanIdent() {
-        boolean isJavaIdentifierPart;
-        char high;
-        do {
-            if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
-            // optimization, was: putChar(ch);
-
-            scanChar();
-            switch (ch) {
-            case 'A': case 'B': case 'C': case 'D': case 'E':
-            case 'F': case 'G': case 'H': case 'I': case 'J':
-            case 'K': case 'L': case 'M': case 'N': case 'O':
-            case 'P': case 'Q': case 'R': case 'S': case 'T':
-            case 'U': case 'V': case 'W': case 'X': case 'Y':
-            case 'Z':
-            case 'a': case 'b': case 'c': case 'd': case 'e':
-            case 'f': case 'g': case 'h': case 'i': case 'j':
-            case 'k': case 'l': case 'm': case 'n': case 'o':
-            case 'p': case 'q': case 'r': case 's': case 't':
-            case 'u': case 'v': case 'w': case 'x': case 'y':
-            case 'z':
-            case '$': case '_':
-            case '0': case '1': case '2': case '3': case '4':
-            case '5': case '6': case '7': case '8': case '9':
-            case '\u0000': case '\u0001': case '\u0002': case '\u0003':
-            case '\u0004': case '\u0005': case '\u0006': case '\u0007':
-            case '\u0008': case '\u000E': case '\u000F': case '\u0010':
-            case '\u0011': case '\u0012': case '\u0013': case '\u0014':
-            case '\u0015': case '\u0016': case '\u0017':
-            case '\u0018': case '\u0019': case '\u001B':
-            case '\u007F':
-                break;
-            case '\u001A': // EOI is also a legal identifier part
-                if (bp >= buflen) {
-                    name = names.fromChars(sbuf, 0, sp);
-                    token = keywords.key(name);
-                    return;
-                }
-                break;
-            default:
-                if (ch < '\u0080') {
-                    // all ASCII range chars already handled, above
-                    isJavaIdentifierPart = false;
-                } else {
-                    high = scanSurrogates();
-                    if (high != 0) {
-                        if (sp == sbuf.length) {
-                            putChar(high);
-                        } else {
-                            sbuf[sp++] = high;
-                        }
-                        isJavaIdentifierPart = Character.isJavaIdentifierPart(
-                            Character.toCodePoint(high, ch));
-                    } else {
-                        isJavaIdentifierPart = Character.isJavaIdentifierPart(ch);
-                    }
-                }
-                if (!isJavaIdentifierPart) {
-                    name = names.fromChars(sbuf, 0, sp);
-                    token = keywords.key(name);
-                    return;
-                }
-            }
-        } while (true);
-    }
-
-    /** Are surrogates supported?
-     */
-    final static boolean surrogatesSupported = surrogatesSupported();
-    private static boolean surrogatesSupported() {
-        try {
-            Character.isHighSurrogate('a');
-            return true;
-        } catch (NoSuchMethodError ex) {
-            return false;
-        }
-    }
-
-    /** Scan surrogate pairs.  If 'ch' is a high surrogate and
-     *  the next character is a low surrogate, then put the low
-     *  surrogate in 'ch', and return the high surrogate.
-     *  otherwise, just return 0.
-     */
-    private char scanSurrogates() {
-        if (surrogatesSupported && Character.isHighSurrogate(ch)) {
-            char high = ch;
-
-            scanChar();
-
-            if (Character.isLowSurrogate(ch)) {
-                return high;
-            }
-
-            ch = high;
-        }
-
-        return 0;
-    }
-
-    /** Return true if ch can be part of an operator.
-     */
-    private boolean isSpecial(char ch) {
-        switch (ch) {
-        case '!': case '%': case '&': case '*': case '?':
-        case '+': case '-': case ':': case '<': case '=':
-        case '>': case '^': case '|': case '~':
-        case '@':
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    /** Read longest possible sequence of special characters and convert
-     *  to token.
-     */
-    private void scanOperator() {
-        while (true) {
-            putChar(ch);
-            Name newname = names.fromChars(sbuf, 0, sp);
-            if (keywords.key(newname) == IDENTIFIER) {
-                sp--;
-                break;
-            }
-            name = newname;
-            token = keywords.key(newname);
-            scanChar();
-            if (!isSpecial(ch)) break;
+            ensureLookahead(lookahead);
+            return savedTokens.get(lookahead - 1);
         }
     }
-
-    /**
-     * Scan a documention comment; determine if a deprecated tag is present.
-     * Called once the initial /, * have been skipped, positioned at the second *
-     * (which is treated as the beginning of the first line).
-     * Stops positioned at the closing '/'.
-     */
-    @SuppressWarnings("fallthrough")
-    private void scanDocComment() {
-        boolean deprecatedPrefix = false;
-
-        forEachLine:
-        while (bp < buflen) {
-
-            // Skip optional WhiteSpace at beginning of line
-            while (bp < buflen && (ch == ' ' || ch == '\t' || ch == FF)) {
-                scanCommentChar();
-            }
-
-            // Skip optional consecutive Stars
-            while (bp < buflen && ch == '*') {
-                scanCommentChar();
-                if (ch == '/') {
-                    return;
-                }
-            }
-
-            // Skip optional WhiteSpace after Stars
-            while (bp < buflen && (ch == ' ' || ch == '\t' || ch == FF)) {
-                scanCommentChar();
-            }
-
-            deprecatedPrefix = false;
-            // At beginning of line in the JavaDoc sense.
-            if (bp < buflen && ch == '@' && !deprecatedFlag) {
-                scanCommentChar();
-                if (bp < buflen && ch == 'd') {
-                    scanCommentChar();
-                    if (bp < buflen && ch == 'e') {
-                        scanCommentChar();
-                        if (bp < buflen && ch == 'p') {
-                            scanCommentChar();
-                            if (bp < buflen && ch == 'r') {
-                                scanCommentChar();
-                                if (bp < buflen && ch == 'e') {
-                                    scanCommentChar();
-                                    if (bp < buflen && ch == 'c') {
-                                        scanCommentChar();
-                                        if (bp < buflen && ch == 'a') {
-                                            scanCommentChar();
-                                            if (bp < buflen && ch == 't') {
-                                                scanCommentChar();
-                                                if (bp < buflen && ch == 'e') {
-                                                    scanCommentChar();
-                                                    if (bp < buflen && ch == 'd') {
-                                                        deprecatedPrefix = true;
-                                                        scanCommentChar();
-                                                    }}}}}}}}}}}
-            if (deprecatedPrefix && bp < buflen) {
-                if (Character.isWhitespace(ch)) {
-                    deprecatedFlag = true;
-                } else if (ch == '*') {
-                    scanCommentChar();
-                    if (ch == '/') {
-                        deprecatedFlag = true;
-                        return;
-                    }
-                }
-            }
-
-            // Skip rest of line
-            while (bp < buflen) {
-                switch (ch) {
-                case '*':
-                    scanCommentChar();
-                    if (ch == '/') {
-                        return;
-                    }
-                    break;
-                case CR: // (Spec 3.4)
-                    scanCommentChar();
-                    if (ch != LF) {
-                        continue forEachLine;
-                    }
-                    /* fall through to LF case */
-                case LF: // (Spec 3.4)
-                    scanCommentChar();
-                    continue forEachLine;
-                default:
-                    scanCommentChar();
-                }
-            } // rest of line
-        } // forEachLine
-        return;
-    }
-
-    private void scanModuleVersion() {
-        do {
-            putChar(ch);
-            scanChar();
-            switch (ch) {
-                case ' ': case '\t':
-                case FF: case CR: case LF:
-                case '\"': case '\'': case '\\':
-                case ',': case ';':
-                case EOI:
-                    token = MODULEVERSIONLITERAL;
-                    return;
+    //where
+        private void ensureLookahead(int lookahead) {
+            for (int i = savedTokens.size() ; i < lookahead ; i ++) {
+                savedTokens.add(tokenizer.readToken());
             }
-        } while(true);
-    }
-
-    /** Return true if ch can be part of an operator.
-     */
-    private boolean isModuleStart(char ch) {
-        switch (ch) {
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-        case '(': case '[': case '<': case '=': case '>':
-            return true;
-        default:
-            return false;
         }
-    }
 
-    /** The value of a literal token, recorded as a string.
-     *  For integers, leading 0x and 'l' suffixes are suppressed.
-     */
-    public String stringVal() {
-        return new String(sbuf, 0, sp);
+    public Token prevToken() {
+        return prevToken;
     }
 
-    /** Read token.
-     */
     public void nextToken() {
-
-        try {
-            prevEndPos = endPos;
-            sp = 0;
-
-            while (true) {
-                pos = bp;
-                switch (ch) {
-                case ' ': // (Spec 3.6)
-                case '\t': // (Spec 3.6)
-                case FF: // (Spec 3.6)
-                    do {
-                        scanChar();
-                    } while (ch == ' ' || ch == '\t' || ch == FF);
-                    endPos = bp;
-                    processWhiteSpace();
-                    break;
-                case LF: // (Spec 3.4)
-                    scanChar();
-                    endPos = bp;
-                    processLineTerminator();
-                    break;
-                case CR: // (Spec 3.4)
-                    scanChar();
-                    if (ch == LF) {
-                        scanChar();
-                    }
-                    endPos = bp;
-                    processLineTerminator();
-                    break;
-                case 'A': case 'B': case 'C': case 'D': case 'E':
-                case 'F': case 'G': case 'H': case 'I': case 'J':
-                case 'K': case 'L': case 'M': case 'N': case 'O':
-                case 'P': case 'Q': case 'R': case 'S': case 'T':
-                case 'U': case 'V': case 'W': case 'X': case 'Y':
-                case 'Z':
-                case 'a': case 'b': case 'c': case 'd': case 'e':
-                case 'f': case 'g': case 'h': case 'i': case 'j':
-                case 'k': case 'l': case 'm': case 'n': case 'o':
-                case 'p': case 'q': case 'r': case 's': case 't':
-                case 'u': case 'v': case 'w': case 'x': case 'y':
-                case 'z':
-                case '$': case '_':
-                    scanIdent();
-                    return;
-                case '0':
-                    if (token == MONKEYS_AT) {
-                        scanModuleVersion();
-                    } else {
-                        scanChar();
-                        if (ch == 'x' || ch == 'X') {
-                            scanChar();
-                            skipIllegalUnderscores();
-                            if (ch == '.') {
-                                scanHexFractionAndSuffix(false);
-                            } else if (digit(16) < 0) {
-                                lexError("invalid.hex.number");
-                            } else {
-                                scanNumber(16);
-                            }
-                        } else if (ch == 'b' || ch == 'B') {
-                            if (!allowBinaryLiterals) {
-                                lexError("unsupported.binary.lit", source.name);
-                                allowBinaryLiterals = true;
-                            }
-                            scanChar();
-                            skipIllegalUnderscores();
-                            if (digit(2) < 0) {
-                                lexError("invalid.binary.number");
-                            } else {
-                                scanNumber(2);
-                            }
-                        } else {
-                            putChar('0');
-                            if (ch == '_') {
-                                int savePos = bp;
-                                do {
-                                    scanChar();
-                                } while (ch == '_');
-                                if (digit(10) < 0) {
-                                    lexError(savePos, "illegal.underscore");
-                                }
-                            }
-                            scanNumber(8);
-                        }
-                    }
-                    return;
-                case '1': case '2': case '3': case '4':
-                case '5': case '6': case '7': case '8': case '9':
-                    if (token == MONKEYS_AT) {
-                        scanModuleVersion();
-                    } else {
-                        scanNumber(10);
-                    }
-                    return;
-                case '.':
-                    scanChar();
-                    if ('0' <= ch && ch <= '9') {
-                        putChar('.');
-                        scanFractionAndSuffix();
-                    } else if (ch == '.') {
-                        putChar('.'); putChar('.');
-                        scanChar();
-                        if (ch == '.') {
-                            scanChar();
-                            putChar('.');
-                            token = ELLIPSIS;
-                        } else {
-                            lexError("malformed.fp.lit");
-                        }
-                    } else {
-                        token = DOT;
-                    }
-                    return;
-                case ',':
-                    scanChar(); token = COMMA; return;
-                case ';':
-                    scanChar(); token = SEMI; return;
-                case '(':
-                    if (token == MONKEYS_AT) {
-                        scanModuleVersion();
-                    } else {
-                        scanChar();
-                        token = LPAREN;
-                    }
-                    return;
-                case ')':
-                    scanChar(); token = RPAREN; return;
-                case '[':
-                    if (token == MONKEYS_AT) {
-                        scanModuleVersion();
-                    } else {
-                        scanChar();
-                        token = LBRACKET;
-                    }
-                    return;
-                case ']':
-                    scanChar(); token = RBRACKET; return;
-                case '{':
-                    scanChar(); token = LBRACE; return;
-                case '}':
-                    scanChar(); token = RBRACE; return;
-                case '/':
-                    scanChar();
-                    if (ch == '/') {
-                        do {
-                            scanCommentChar();
-                        } while (ch != CR && ch != LF && bp < buflen);
-                        if (bp < buflen) {
-                            endPos = bp;
-                            processComment(CommentStyle.LINE);
-                        }
-                        break;
-                    } else if (ch == '*') {
-                        scanChar();
-                        CommentStyle style;
-                        if (ch == '*') {
-                            style = CommentStyle.JAVADOC;
-                            scanDocComment();
-                        } else {
-                            style = CommentStyle.BLOCK;
-                            while (bp < buflen) {
-                                if (ch == '*') {
-                                    scanChar();
-                                    if (ch == '/') break;
-                                } else {
-                                    scanCommentChar();
-                                }
-                            }
-                        }
-                        if (ch == '/') {
-                            scanChar();
-                            endPos = bp;
-                            processComment(style);
-                            break;
-                        } else {
-                            lexError("unclosed.comment");
-                            return;
-                        }
-                    } else if (ch == '=') {
-                        name = names.slashequals;
-                        token = SLASHEQ;
-                        scanChar();
-                    } else {
-                        name = names.slash;
-                        token = SLASH;
-                    }
-                    return;
-                case '\'':
-                    scanChar();
-                    if (ch == '\'') {
-                        lexError("empty.char.lit");
-                    } else {
-                        if (ch == CR || ch == LF)
-                            lexError(pos, "illegal.line.end.in.char.lit");
-                        scanLitChar();
-                        if (ch == '\'') {
-                            scanChar();
-                            token = CHARLITERAL;
-                        } else {
-                            lexError(pos, "unclosed.char.lit");
-                        }
-                    }
-                    return;
-                case '\"':
-                    scanChar();
-                    while (ch != '\"' && ch != CR && ch != LF && bp < buflen)
-                        scanLitChar();
-                    if (ch == '\"') {
-                        token = STRINGLITERAL;
-                        scanChar();
-                    } else {
-                        lexError(pos, "unclosed.str.lit");
-                    }
-                    return;
-                default:
-                    if (token == MONKEYS_AT && isModuleStart(ch)) {
-                        scanModuleVersion();
-                    } else if (isSpecial(ch)) {
-                        scanOperator();
-                    } else {
-                        boolean isJavaIdentifierStart;
-                        if (ch < '\u0080') {
-                            // all ASCII range chars already handled, above
-                            isJavaIdentifierStart = false;
-                        } else {
-                            char high = scanSurrogates();
-                            if (high != 0) {
-                                if (sp == sbuf.length) {
-                                    putChar(high);
-                                } else {
-                                    sbuf[sp++] = high;
-                                }
-
-                                isJavaIdentifierStart = Character.isJavaIdentifierStart(
-                                    Character.toCodePoint(high, ch));
-                            } else {
-                                isJavaIdentifierStart = Character.isJavaIdentifierStart(ch);
-                            }
-                        }
-                        if (isJavaIdentifierStart) {
-                            scanIdent();
-                        } else if (bp == buflen || ch == EOI && bp+1 == buflen) { // JLS 3.5
-                            token = EOF;
-                            pos = bp = eofPos;
-                        } else {
-                            lexError("illegal.char", String.valueOf((int)ch));
-                            scanChar();
-                        }
-                    }
-                    return;
-                }
-            }
-        } finally {
-            endPos = bp;
-            if (scannerDebug)
-                System.out.println("nextToken(" + pos
-                                   + "," + endPos + ")=|" +
-                                   new String(getRawCharacters(pos, endPos))
-                                   + "|");
+        prevToken = token;
+        if (!savedTokens.isEmpty()) {
+            token = savedTokens.remove(0);
+        } else {
+            token = tokenizer.readToken();
         }
     }
 
-    /** Return the current token, set by nextToken().
-     */
-    public Token token() {
+    public Token split() {
+        Token[] splitTokens = token.split(tokens);
+        prevToken = splitTokens[0];
+        token = splitTokens[1];
         return token;
     }
 
-    /** Sets the current token.
-     * This method is primarily used to update the token stream when the
-     * parser is handling the end of nested type arguments such as
-     * {@code List<List<String>>} and needs to disambiguate between
-     * repeated use of ">" and relation operators such as ">>" and ">>>". Noting
-     * that this does not handle arbitrary tokens containing Unicode escape
-     * sequences.
-     */
-    public void token(Token token) {
-        pos += this.token.name.length() - token.name.length();
-        prevEndPos = pos;
-        this.token = token;
-    }
-
-    /** Return the current token's position: a 0-based
-     *  offset from beginning of the raw input stream
-     *  (before unicode translation)
-     */
-    public int pos() {
-        return pos;
-    }
-
-    /** Return the last character position of the current token.
-     */
-    public int endPos() {
-        return endPos;
+    public LineMap getLineMap() {
+        return tokenizer.getLineMap();
     }
 
-    /** Return the last character position of the previous token.
-     */
-    public int prevEndPos() {
-        return prevEndPos;
-    }
-
-    /** Return the position where a lexical error occurred;
-     */
     public int errPos() {
-        return errPos;
+        return tokenizer.errPos();
     }
 
-    /** Set the position where a lexical error occurred;
-     */
     public void errPos(int pos) {
-        errPos = pos;
-    }
-
-    /** Return the name of an identifier or token for the current token.
-     */
-    public Name name() {
-        return name;
-    }
-
-    /** Return the radix of a numeric literal token.
-     */
-    public int radix() {
-        return radix;
+        tokenizer.errPos(pos);
     }
 
-    /** Has a @deprecated been encountered in last doc comment?
-     *  This needs to be reset by client with resetDeprecatedFlag.
-     */
-    public boolean deprecatedFlag() {
-        return deprecatedFlag;
+    public boolean allowVersionLiteral() {
+        return tokenizer.allowVersionLiteral();
     }
 
-    public void resetDeprecatedFlag() {
-        deprecatedFlag = false;
+    public void allowVersionLiteral(boolean allow) {
+        tokenizer.allowVersionLiteral(allow);
     }
 
-    /**
-     * Returns the documentation string of the current token.
-     */
-    public String docComment() {
-        return null;
-    }
-
-    /**
-     * Returns a copy of the input buffer, up to its inputLength.
-     * Unicode escape sequences are not translated.
-     */
-    public char[] getRawCharacters() {
-        char[] chars = new char[buflen];
-        System.arraycopy(buf, 0, chars, 0, buflen);
-        return chars;
+    public UnicodeReader getReader() {
+        return tokenizer.reader;
     }
-
-    /**
-     * Returns a copy of a character array subset of the input buffer.
-     * The returned array begins at the <code>beginIndex</code> and
-     * extends to the character at index <code>endIndex - 1</code>.
-     * Thus the length of the substring is <code>endIndex-beginIndex</code>.
-     * This behavior is like
-     * <code>String.substring(beginIndex, endIndex)</code>.
-     * Unicode escape sequences are not translated.
-     *
-     * @param beginIndex the beginning index, inclusive.
-     * @param endIndex the ending index, exclusive.
-     * @throws IndexOutOfBounds if either offset is outside of the
-     *         array bounds
-     */
-    public char[] getRawCharacters(int beginIndex, int endIndex) {
-        int length = endIndex - beginIndex;
-        char[] chars = new char[length];
-        System.arraycopy(buf, beginIndex, chars, 0, length);
-        return chars;
-    }
-
-    public enum CommentStyle {
-        LINE,
-        BLOCK,
-        JAVADOC,
-    }
-
-    /**
-     * Called when a complete comment has been scanned. pos and endPos
-     * will mark the comment boundary.
-     */
-    protected void processComment(CommentStyle style) {
-        if (scannerDebug)
-            System.out.println("processComment(" + pos
-                               + "," + endPos + "," + style + ")=|"
-                               + new String(getRawCharacters(pos, endPos))
-                               + "|");
-    }
-
-    /**
-     * Called when a complete whitespace run has been scanned. pos and endPos
-     * will mark the whitespace boundary.
-     */
-    protected void processWhiteSpace() {
-        if (scannerDebug)
-            System.out.println("processWhitespace(" + pos
-                               + "," + endPos + ")=|" +
-                               new String(getRawCharacters(pos, endPos))
-                               + "|");
-    }
-
-    /**
-     * Called when a line terminator has been processed.
-     */
-    protected void processLineTerminator() {
-        if (scannerDebug)
-            System.out.println("processTerminator(" + pos
-                               + "," + endPos + ")=|" +
-                               new String(getRawCharacters(pos, endPos))
-                               + "|");
-    }
-
-    /** Build a map for translating between line numbers and
-     * positions in the input.
-     *
-     * @return a LineMap */
-    public Position.LineMap getLineMap() {
-        return Position.makeLineMap(buf, buflen, false);
-    }
-
-    public void mark() {
-        mark = new Mark(this);
-    }
-
-    public void reset() {
-        if (mark != null)
-            mark.apply(this);
-    }
-
 }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/ScannerFactory.java b/langtools/src/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
index 86c9bb2..d03d77b 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
@@ -57,7 +57,7 @@ public class ScannerFactory {
     final Log log;
     final Names names;
     final Source source;
-    final Keywords keywords;
+    final Tokens tokens;
 
     /** Create a new scanner factory. */
     protected ScannerFactory(Context context) {
@@ -65,14 +65,14 @@ public class ScannerFactory {
         this.log = Log.instance(context);
         this.names = Names.instance(context);
         this.source = Source.instance(context);
-        this.keywords = Keywords.instance(context);
+        this.tokens = Tokens.instance(context);
     }
 
     public Scanner newScanner(CharSequence input, boolean keepDocComments) {
         if (input instanceof CharBuffer) {
             CharBuffer buf = (CharBuffer) input;
             if (keepDocComments)
-                return new DocCommentScanner(this, buf);
+                return new Scanner(this, new JavadocTokenizer(this, buf));
             else
                 return new Scanner(this, buf);
         } else {
@@ -83,7 +83,7 @@ public class ScannerFactory {
 
     public Scanner newScanner(char[] input, int inputLength, boolean keepDocComments) {
         if (keepDocComments)
-            return new DocCommentScanner(this, input, inputLength);
+            return new Scanner(this, new JavadocTokenizer(this, input, inputLength));
         else
             return new Scanner(this, input, inputLength);
     }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/Tokens.java b/langtools/src/share/classes/com/sun/tools/javac/parser/Tokens.java
new file mode 100644
index 0000000..4fec96d
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Tokens.java
@@ -0,0 +1,481 @@
+/*
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package com.sun.tools.javac.parser;
+
+import java.util.Locale;
+
+import com.sun.tools.javac.api.Formattable;
+import com.sun.tools.javac.api.Messages;
+import com.sun.tools.javac.parser.Tokens.Token.Tag;
+import com.sun.tools.javac.util.List;
+import com.sun.tools.javac.util.Name;
+import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.ListBuffer;
+import com.sun.tools.javac.util.Names;
+
+/** A class that defines codes/utilities for Java source tokens
+ *  returned from lexical analysis.
+ *
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ */
+public class Tokens {
+
+    private final Names names;
+
+    /**
+     * Keyword array. Maps name indices to Token.
+     */
+    private final TokenKind[] key;
+
+    /**  The number of the last entered keyword.
+     */
+    private int maxKey = 0;
+
+    /** The names of all tokens.
+     */
+    private Name[] tokenName = new Name[TokenKind.values().length];
+
+    public static final Context.Key<Tokens> tokensKey =
+        new Context.Key<Tokens>();
+
+    public static Tokens instance(Context context) {
+        Tokens instance = context.get(tokensKey);
+        if (instance == null)
+            instance = new Tokens(context);
+        return instance;
+    }
+
+    protected Tokens(Context context) {
+        context.put(tokensKey, this);
+        names = Names.instance(context);
+
+        for (TokenKind t : TokenKind.values()) {
+            if (t.name != null)
+                enterKeyword(t.name, t);
+            else
+                tokenName[t.ordinal()] = null;
+        }
+
+        key = new TokenKind[maxKey+1];
+        for (int i = 0; i <= maxKey; i++) key[i] = TokenKind.IDENTIFIER;
+        for (TokenKind t : TokenKind.values()) {
+            if (t.name != null)
+            key[tokenName[t.ordinal()].getIndex()] = t;
+        }
+    }
+
+    private void enterKeyword(String s, TokenKind token) {
+        Name n = names.fromString(s);
+        tokenName[token.ordinal()] = n;
+        if (n.getIndex() > maxKey) maxKey = n.getIndex();
+    }
+
+    /**
+     * Create a new token given a name; if the name corresponds to a token name,
+     * a new token of the corresponding kind is returned; otherwise, an
+     * identifier token is returned.
+     */
+    TokenKind lookupKind(Name name) {
+        return (name.getIndex() > maxKey) ? TokenKind.IDENTIFIER : key[name.getIndex()];
+    }
+
+    TokenKind lookupKind(String name) {
+        return lookupKind(names.fromString(name));
+    }
+
+    /**
+     * This enum defines all tokens used by the javac scanner. A token is
+     * optionally associated with a name.
+     */
+    public enum TokenKind implements Formattable {
+        EOF(),
+        ERROR(),
+        IDENTIFIER(Tag.NAMED),
+        ABSTRACT("abstract"),
+        ASSERT("assert", Tag.NAMED),
+        BOOLEAN("boolean", Tag.NAMED),
+        BREAK("break"),
+        BYTE("byte", Tag.NAMED),
+        CASE("case"),
+        CATCH("catch"),
+        CHAR("char", Tag.NAMED),
+        CLASS("class"),
+        CONST("const"),
+        CONTINUE("continue"),
+        DEFAULT("default"),
+        DO("do"),
+        DOUBLE("double", Tag.NAMED),
+        ELSE("else"),
+        ENUM("enum", Tag.NAMED),
+        EXTENDS("extends"),
+        FINAL("final"),
+        FINALLY("finally"),
+        FLOAT("float", Tag.NAMED),
+        FOR("for"),
+        GOTO("goto"),
+        IF("if"),
+        IMPLEMENTS("implements"),
+        IMPORT("import"),
+        INSTANCEOF("instanceof"),
+        INT("int", Tag.NAMED),
+        INTERFACE("interface"),
+        LONG("long", Tag.NAMED),
+        NATIVE("native"),
+        NEW("new"),
+        PACKAGE("package"),
+        PRIVATE("private"),
+        PROTECTED("protected"),
+        PUBLIC("public"),
+        RETURN("return"),
+        SHORT("short", Tag.NAMED),
+        STATIC("static"),
+        STRICTFP("strictfp"),
+        SUPER("super", Tag.NAMED),
+        SWITCH("switch"),
+        SYNCHRONIZED("synchronized"),
+        THIS("this", Tag.NAMED),
+        THROW("throw"),
+        THROWS("throws"),
+        TRANSIENT("transient"),
+        TRY("try"),
+        VOID("void", Tag.NAMED),
+        VOLATILE("volatile"),
+        WHILE("while"),
+        INTLITERAL(Tag.NUMERIC),
+        LONGLITERAL(Tag.NUMERIC),
+        FLOATLITERAL(Tag.NUMERIC),
+        DOUBLELITERAL(Tag.NUMERIC),
+        CHARLITERAL(Tag.NUMERIC),
+        STRINGLITERAL(Tag.STRING),
+        VERSIONLITERAL(Tag.NAMED),
+        TRUE("true", Tag.NAMED),
+        FALSE("false", Tag.NAMED),
+        NULL("null", Tag.NAMED),
+        ARROW("->"),
+        HASH("#"),
+        LPAREN("("),
+        RPAREN(")"),
+        LBRACE("{"),
+        RBRACE("}"),
+        LBRACKET("["),
+        RBRACKET("]"),
+        SEMI(";"),
+        COMMA(","),
+        DOT("."),
+        ELLIPSIS("..."),
+        EQ("="),
+        GT(">"),
+        LT("<"),
+        BANG("!"),
+        TILDE("~"),
+        QUES("?"),
+        COLON(":"),
+        EQEQ("=="),
+        LTEQ("<="),
+        GTEQ(">="),
+        BANGEQ("!="),
+        AMPAMP("&&"),
+        BARBAR("||"),
+        PLUSPLUS("++"),
+        SUBSUB("--"),
+        PLUS("+"),
+        SUB("-"),
+        STAR("*"),
+        STARSTAR("**"),
+        SLASH("/"),
+        AMP("&"),
+        BAR("|"),
+        CARET("^"),
+        PERCENT("%"),
+        LTLT("<<"),
+        GTGT(">>"),
+        GTGTGT(">>>"),
+        PLUSEQ("+="),
+        SUBEQ("-="),
+        STAREQ("*="),
+        SLASHEQ("/="),
+        AMPEQ("&="),
+        BAREQ("|="),
+        CARETEQ("^="),
+        PERCENTEQ("%="),
+        LTLTEQ("<<="),
+        GTGTEQ(">>="),
+        GTGTGTEQ(">>>="),
+        MONKEYS_AT("@"),
+        CUSTOM;
+
+        public final String name;
+        final Tag tag;
+
+        TokenKind() {
+            this(null, Tag.DEFAULT);
+        }
+
+        TokenKind(String name) {
+            // TEMP HACK
+            this(name, Character.isLetter(name.charAt(0)) ? Tag.NAMED : Tag.DEFAULT);
+        }
+
+        TokenKind(Tag tag) {
+            this(null, tag);
+        }
+
+        TokenKind(String name, Tag tag) {
+            this.name = name;
+            this.tag = tag;
+        }
+
+        @Override
+        public String toString() {
+            switch (this) {
+            case IDENTIFIER:
+                return "token.identifier";
+            case CHARLITERAL:
+                return "token.character";
+            case STRINGLITERAL:
+                return "token.string";
+            case INTLITERAL:
+                return "token.integer";
+            case LONGLITERAL:
+                return "token.long-integer";
+            case FLOATLITERAL:
+                return "token.float";
+            case DOUBLELITERAL:
+                return "token.double";
+            case ERROR:
+                return "token.bad-symbol";
+            case EOF:
+                return "token.end-of-input";
+            case DOT: case COMMA: case SEMI: case LPAREN: case RPAREN:
+            case LBRACKET: case RBRACKET: case LBRACE: case RBRACE:
+                return "'" + name + "'";
+            default:
+                return name;
+            }
+        }
+
+        public String getKind() {
+            return "Token";
+        }
+
+        public String toString(Locale locale, Messages messages) {
+            return name != null ? toString() : messages.getLocalizedString(locale, "compiler.misc." + toString());
+        }
+    }
+
+    public interface Comment {
+
+        enum CommentStyle {
+            LINE,
+            BLOCK,
+            JAVADOC,
+        }
+
+        String getText();
+        CommentStyle getStyle();
+        boolean isDeprecated();
+    }
+
+    /**
+     * This is the class representing a javac token. Each token has several fields
+     * that are set by the javac lexer (i.e. start/end position, string value, etc).
+     */
+    public static class Token {
+
+        /** tags constants **/
+        enum Tag {
+            DEFAULT,
+            NAMED,
+            STRING,
+            NUMERIC;
+        }
+
+        /** The token kind */
+        public final TokenKind kind;
+
+        /** The start position of this token */
+        public final int pos;
+
+        /** The end position of this token */
+        public final int endPos;
+
+        /** Comment reader associated with this token */
+        public final List<Comment> comments;
+
+        Token(TokenKind kind, int pos, int endPos, List<Comment> comments) {
+            this.kind = kind;
+            this.pos = pos;
+            this.endPos = endPos;
+            this.comments = comments;
+            checkKind();
+        }
+
+        Token[] split(Tokens tokens) {
+            if (kind.name.length() < 2 || kind.tag != Tag.DEFAULT) {
+                throw new AssertionError("Cant split" + kind);
+            }
+
+            TokenKind t1 = tokens.lookupKind(kind.name.substring(0, 1));
+            TokenKind t2 = tokens.lookupKind(kind.name.substring(1));
+
+            if (t1 == null || t2 == null) {
+                throw new AssertionError("Cant split - bad subtokens");
+            }
+            return new Token[] {
+                new Token(t1, pos, pos + t1.name.length(), comments),
+                new Token(t2, pos + t1.name.length(), endPos, null)
+            };
+        }
+
+        protected void checkKind() {
+            if (kind.tag != Tag.DEFAULT) {
+                throw new AssertionError("Bad token kind - expected " + Tag.STRING);
+            }
+        }
+
+        public Name name() {
+            throw new UnsupportedOperationException();
+        }
+
+        public String stringVal() {
+            throw new UnsupportedOperationException();
+        }
+
+        public int radix() {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * Preserve classic semantics - if multiple javadocs are found on the token
+         * the last one is returned
+         */
+        public String comment(Comment.CommentStyle style) {
+            List<Comment> readers = getReaders(Comment.CommentStyle.JAVADOC);
+            return readers.isEmpty() ?
+                    null :
+                    readers.head.getText();
+        }
+
+        /**
+         * Preserve classic semantics - deprecated should be set if at least one
+         * javadoc comment attached to this token contains the '@deprecated' string
+         */
+        public boolean deprecatedFlag() {
+            for (Comment r : getReaders(Comment.CommentStyle.JAVADOC)) {
+                if (r.isDeprecated()) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        private List<Comment> getReaders(Comment.CommentStyle style) {
+            if (comments == null) {
+                return List.nil();
+            } else {
+                ListBuffer<Comment> buf = ListBuffer.lb();
+                for (Comment r : comments) {
+                    if (r.getStyle() == style) {
+                        buf.add(r);
+                    }
+                }
+                return buf.toList();
+            }
+        }
+    }
+
+    final static class NamedToken extends Token {
+        /** The name of this token */
+        public final Name name;
+
+        public NamedToken(TokenKind kind, int pos, int endPos, Name name, List<Comment> comments) {
+            super(kind, pos, endPos, comments);
+            this.name = name;
+        }
+
+        @Override
+        protected void checkKind() {
+            if (kind.tag != Tag.NAMED) {
+                throw new AssertionError("Bad token kind - expected " + Tag.NAMED);
+            }
+        }
+
+        @Override
+        public Name name() {
+            return name;
+        }
+    }
+
+    static class StringToken extends Token {
+        /** The string value of this token */
+        public final String stringVal;
+
+        public StringToken(TokenKind kind, int pos, int endPos, String stringVal, List<Comment> comments) {
+            super(kind, pos, endPos, comments);
+            this.stringVal = stringVal;
+        }
+
+        @Override
+        protected void checkKind() {
+            if (kind.tag != Tag.STRING) {
+                throw new AssertionError("Bad token kind - expected " + Tag.STRING);
+            }
+        }
+
+        @Override
+        public String stringVal() {
+            return stringVal;
+        }
+    }
+
+    final static class NumericToken extends StringToken {
+        /** The 'radix' value of this token */
+        public final int radix;
+
+        public NumericToken(TokenKind kind, int pos, int endPos, String stringVal, int radix, List<Comment> comments) {
+            super(kind, pos, endPos, stringVal, comments);
+            this.radix = radix;
+        }
+
+        @Override
+        protected void checkKind() {
+            if (kind.tag != Tag.NUMERIC) {
+                throw new AssertionError("Bad token kind - expected " + Tag.NUMERIC);
+            }
+        }
+
+        @Override
+        public int radix() {
+            return radix;
+        }
+    }
+
+    public static final Token DUMMY =
+                new Token(TokenKind.ERROR, 0, 0, null);
+}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java b/langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java
new file mode 100644
index 0000000..f1b6d8b
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java
@@ -0,0 +1,280 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package com.sun.tools.javac.parser;
+
+import com.sun.tools.javac.file.JavacFileManager;
+import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.Name;
+import com.sun.tools.javac.util.Names;
+
+import java.nio.CharBuffer;
+
+import static com.sun.tools.javac.util.LayoutCharacters.*;
+
+/** The char reader used by the javac lexer/tokenizer. Returns the sequence of
+ * characters contained in the input stream, handling unicode escape accordingly.
+ * Additionally, it provide features for saving chars into a buffer and to retrieve
+ * them at a later stage.
+ *
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ */
+public class UnicodeReader {
+
+    /** The input buffer, index of next character to be read,
+     *  index of one past last character in buffer.
+     */
+    protected char[] buf;
+    protected int bp;
+    protected final int buflen;
+
+    /** The current character.
+     */
+    protected char ch;
+
+    /** The buffer index of the last converted unicode character
+     */
+    protected int unicodeConversionBp = -1;
+
+    protected Log log;
+    protected Names names;
+
+    /** A character buffer for saved chars.
+     */
+    protected char[] sbuf = new char[128];
+    protected int sp;
+
+    /**
+     * Create a scanner from the input array.  This method might
+     * modify the array.  To avoid copying the input array, ensure
+     * that {@code inputLength < input.length} or
+     * {@code input[input.length -1]} is a white space character.
+     *
+     * @param fac the factory which created this Scanner
+     * @param input the input, might be modified
+     * @param inputLength the size of the input.
+     * Must be positive and less than or equal to input.length.
+     */
+    protected UnicodeReader(ScannerFactory sf, CharBuffer buffer) {
+        this(sf, JavacFileManager.toArray(buffer), buffer.limit());
+    }
+
+    protected UnicodeReader(ScannerFactory sf, char[] input, int inputLength) {
+        log = sf.log;
+        names = sf.names;
+        if (inputLength == input.length) {
+            if (input.length > 0 && Character.isWhitespace(input[input.length - 1])) {
+                inputLength--;
+            } else {
+                char[] newInput = new char[inputLength + 1];
+                System.arraycopy(input, 0, newInput, 0, input.length);
+                input = newInput;
+            }
+        }
+        buf = input;
+        buflen = inputLength;
+        buf[buflen] = EOI;
+        bp = -1;
+        scanChar();
+    }
+
+    /** Read next character.
+     */
+    protected void scanChar() {
+        if (bp < buflen) {
+            ch = buf[++bp];
+            if (ch == '\\') {
+                convertUnicode();
+            }
+        }
+    }
+
+    /** Read next character in comment, skipping over double '\' characters.
+     */
+    protected void scanCommentChar() {
+        scanChar();
+        if (ch == '\\') {
+            if (peekChar() == '\\' && !isUnicode()) {
+                skipChar();
+            } else {
+                convertUnicode();
+            }
+        }
+    }
+
+    /** Append a character to sbuf.
+     */
+    protected void putChar(char ch, boolean scan) {
+        if (sp == sbuf.length) {
+            char[] newsbuf = new char[sbuf.length * 2];
+            System.arraycopy(sbuf, 0, newsbuf, 0, sbuf.length);
+            sbuf = newsbuf;
+        }
+        sbuf[sp++] = ch;
+        if (scan)
+            scanChar();
+    }
+
+    protected void putChar(char ch) {
+        putChar(ch, false);
+    }
+
+    protected void putChar(boolean scan) {
+        putChar(ch, scan);
+    }
+
+    Name name() {
+        return names.fromChars(sbuf, 0, sp);
+    }
+
+    String chars() {
+        return new String(sbuf, 0, sp);
+    }
+
+    /** Convert unicode escape; bp points to initial '\' character
+     *  (Spec 3.3).
+     */
+    protected void convertUnicode() {
+        if (ch == '\\' && unicodeConversionBp != bp) {
+            bp++; ch = buf[bp];
+            if (ch == 'u') {
+                do {
+                    bp++; ch = buf[bp];
+                } while (ch == 'u');
+                int limit = bp + 3;
+                if (limit < buflen) {
+                    int d = digit(bp, 16);
+                    int code = d;
+                    while (bp < limit && d >= 0) {
+                        bp++; ch = buf[bp];
+                        d = digit(bp, 16);
+                        code = (code << 4) + d;
+                    }
+                    if (d >= 0) {
+                        ch = (char)code;
+                        unicodeConversionBp = bp;
+                        return;
+                    }
+                }
+                log.error(bp, "illegal.unicode.esc");
+            } else {
+                bp--;
+                ch = '\\';
+            }
+        }
+    }
+
+    /** Are surrogates supported?
+     */
+    final static boolean surrogatesSupported = surrogatesSupported();
+    private static boolean surrogatesSupported() {
+        try {
+            Character.isHighSurrogate('a');
+            return true;
+        } catch (NoSuchMethodError ex) {
+            return false;
+        }
+    }
+
+    /** Scan surrogate pairs.  If 'ch' is a high surrogate and
+     *  the next character is a low surrogate, then put the low
+     *  surrogate in 'ch', and return the high surrogate.
+     *  otherwise, just return 0.
+     */
+    protected char scanSurrogates() {
+        if (surrogatesSupported && Character.isHighSurrogate(ch)) {
+            char high = ch;
+
+            scanChar();
+
+            if (Character.isLowSurrogate(ch)) {
+                return high;
+            }
+
+            ch = high;
+        }
+
+        return 0;
+    }
+
+    /** Convert an ASCII digit from its base (8, 10, or 16)
+     *  to its value.
+     */
+    protected int digit(int pos, int base) {
+        char c = ch;
+        int result = Character.digit(c, base);
+        if (result >= 0 && c > 0x7f) {
+            log.error(pos + 1, "illegal.nonascii.digit");
+            ch = "0123456789abcdef".charAt(result);
+        }
+        return result;
+    }
+
+    protected boolean isUnicode() {
+        return unicodeConversionBp == bp;
+    }
+
+    protected void skipChar() {
+        bp++;
+    }
+
+    protected char peekChar() {
+        return buf[bp + 1];
+    }
+
+    /**
+     * Returns a copy of the input buffer, up to its inputLength.
+     * Unicode escape sequences are not translated.
+     */
+    public char[] getRawCharacters() {
+        char[] chars = new char[buflen];
+        System.arraycopy(buf, 0, chars, 0, buflen);
+        return chars;
+    }
+
+    /**
+     * Returns a copy of a character array subset of the input buffer.
+     * The returned array begins at the <code>beginIndex</code> and
+     * extends to the character at index <code>endIndex - 1</code>.
+     * Thus the length of the substring is <code>endIndex-beginIndex</code>.
+     * This behavior is like
+     * <code>String.substring(beginIndex, endIndex)</code>.
+     * Unicode escape sequences are not translated.
+     *
+     * @param beginIndex the beginning index, inclusive.
+     * @param endIndex the ending index, exclusive.
+     * @throws IndexOutOfBounds if either offset is outside of the
+     *         array bounds
+     */
+    public char[] getRawCharacters(int beginIndex, int endIndex) {
+        int length = endIndex - beginIndex;
+        char[] chars = new char[length];
+        System.arraycopy(buf, beginIndex, chars, 0, length);
+        return chars;
+    }
+}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
index 540d38a..93215be 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
@@ -82,7 +82,7 @@ import com.sun.tools.javac.util.Options;
 
 import static javax.tools.StandardLocation.*;
 import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag.*;
-import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.main.Option.*;
 import static com.sun.tools.javac.code.Lint.LintCategory.PROCESSING;
 
 /**
@@ -688,7 +688,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
                 ps.removeSupportedOptions(unmatchedProcessorOptions);
 
                 if (printProcessorInfo || verbose) {
-                    log.printNoteLines("x.print.processor.info",
+                    log.printLines("x.print.processor.info",
                             ps.processor.getClass().getName(),
                             matchedNames.toString(),
                             processingResult);
@@ -1014,7 +1014,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
             if (printRounds || verbose) {
                 List<ClassSymbol> tlc = lastRound ? List.<ClassSymbol>nil() : topLevelClasses;
                 Set<TypeElement> ap = lastRound ? Collections.<TypeElement>emptySet() : annotationsPresent;
-                log.printNoteLines("x.print.rounds",
+                log.printLines("x.print.rounds",
                         number,
                         "{" + tlc.toString(", ") + "}",
                         ap,
@@ -1033,12 +1033,10 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
             Assert.checkNonNull(options);
             next.put(Options.optionsKey, options);
 
-            PrintWriter out = context.get(Log.outKey);
-            Assert.checkNonNull(out);
-            next.put(Log.outKey, out);
             Locale locale = context.get(Locale.class);
             if (locale != null)
                 next.put(Locale.class, locale);
+
             Assert.checkNonNull(messages);
             next.put(JavacMessages.messagesKey, messages);
 
@@ -1072,9 +1070,12 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
             Assert.checkNonNull(names);
             next.put(Names.namesKey, names);
 
-            Keywords keywords = Keywords.instance(context);
-            Assert.checkNonNull(keywords);
-            next.put(Keywords.keywordsKey, keywords);
+            Tokens tokens = Tokens.instance(context);
+            Assert.checkNonNull(tokens);
+            next.put(Tokens.tokensKey, tokens);
+
+            // propogate the log's writers directly, instead of going through context
+            Log.instance(next).setWriters(log);
 
             JavaCompiler oldCompiler = JavaCompiler.instance(context);
             JavaCompiler nextCompiler = JavaCompiler.instance(next);
@@ -1222,7 +1223,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
         List<ClassSymbol> classes = List.nil();
         for (JCCompilationUnit unit : units) {
             for (JCTree node : unit.defs) {
-                if (node.getTag() == JCTree.CLASSDEF) {
+                if (node.hasTag(JCTree.Tag.CLASSDEF)) {
                     ClassSymbol sym = ((JCClassDecl) node).sym;
                     Assert.checkNonNull(sym);
                     classes = classes.prepend(sym);
@@ -1482,14 +1483,6 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
         return context;
     }
 
-    /**
-     * Internal use method to return the writer being used by the
-     * processing environment.
-     */
-    public PrintWriter getWriter() {
-        return context.get(Log.outKey);
-    }
-
     public String toString() {
         return "javac ProcessingEnvironment";
     }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
index 5bff872..e02fedb 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -384,6 +384,9 @@ compiler.err.illegal.nonascii.digit=\
 compiler.err.illegal.underscore=\
     illegal underscore
 
+compiler.err.illegal.dot=\
+    illegal ''.''
+
 # 0: symbol
 compiler.err.illegal.qual.not.icls=\
     illegal qualifier; {0} is not an inner class
@@ -792,7 +795,7 @@ compiler.err.invalid.inferred.types=\
 compiler.err.cant.apply.diamond=\
     cannot infer type arguments for {0}
 
-# 0: message segment, 1: message segment
+# 0: message segment or type, 1: message segment
 compiler.err.cant.apply.diamond.1=\
     cannot infer type arguments for {0};\n\
     reason: {1}
@@ -854,7 +857,7 @@ compiler.misc.varargs.trustme.on.non.varargs.meth=\
 compiler.misc.varargs.trustme.on.virtual.varargs=\
     Instance method {0} is not final.
 
-# 0: type, 1: kind, 2: symbol
+# 0: type, 1: symbol kind, 2: symbol
 compiler.misc.inaccessible.varargs.type=\
     formal varargs element type {0} is not accessible from {1} {2}
 
@@ -1658,6 +1661,7 @@ compiler.misc.diamond=\
 compiler.misc.diamond.non.generic=\
     cannot use ''<>'' with non-generic class {0}
 
+# 0: unused
 compiler.misc.diamond.and.explicit.params=\
     cannot use ''<>'' with explicit type parameters for constructor
 
@@ -1739,7 +1743,7 @@ compiler.err.cant.resolve.location.args.params=\
 ## The second argument {1} is the location name
 ## The third argument {2} is the location type (only when {1} is a variable name)
 
-# 0: symbol kind, 1: symbol, 2: unused
+# 0: symbol kind, 1: type or symbol, 2: unused
 compiler.misc.location=\
     {0} {1}
 
@@ -1877,6 +1881,7 @@ compiler.misc.varargs.implement=\
 compiler.misc.varargs.clash.with=\
     {0} in {1} overrides {2} in {3}
 
+# 0: unused
 compiler.misc.diamond.and.anon.class=\
     cannot use ''<>'' with anonymous inner classes
 
@@ -1973,9 +1978,69 @@ compiler.err.string.switch.not.supported.in.source=\
     strings in switch are not supported in -source {0}\n\
     (use -source 7 or higher to enable strings in switch)
 
+# 0: string
+compiler.err.lambda.not.supported.in.source=\
+    lambda expressions are not supported in -source {0}\n\
+    (use -source 8 or higher to enable lambda expressions)
+
+# 0: string
+compiler.err.method.references.not.supported.in.source=\
+    method references are not supported in -source {0}\n\
+    (use -source 8 or higher to enable method references)
+
+# 0: string
 compiler.err.modules.not.supported.in.source=\
     modules are not supported in -source {0}\n\
-(use -source 7 or higher to enable modules)
+(use -source 8 or higher to enable modules)
+
+########################################
+# Diagnostics for verbose resolution
+# used by Resolve (debug only)
+########################################
+
+# 0: number, 1: symbol, 2: unused
+compiler.misc.applicable.method.found=\
+    #{0} applicable method found: {1}
+
+# 0: number, 1: symbol, 2: message segment
+compiler.misc.applicable.method.found.1=\
+    #{0} applicable method found: {1}\n\
+    ({2})
+
+# 0: number, 1: symbol, 2: message segment
+compiler.misc.not.applicable.method.found=\
+    #{0} not applicable method found: {1}\n\
+    ({2})
+
+# 0: type
+compiler.misc.full.inst.sig=\
+    fully instantiated to: {0}
+
+# 0: type
+compiler.misc.partial.inst.sig=\
+    partially instantiated to: {0}
+
+# 0: name, 1: symbol, 2: number, 3: MethodResolutionPhase, 4: list of type or message segment, 5: list of type or message segment
+compiler.note.verbose.resolve.multi=\
+    resolving method {0} in type {1} to candidate {2}\n\
+    phase: {3}\n\
+    with actuals: {4}\n\
+    with type-args: {5}\n\
+    candidates:
+
+# 0: name, 1: symbol, 2: unused, 3: MethodResolutionPhase, 4: list of type or message segment, 5: list of type or message segment
+compiler.note.verbose.resolve.multi.1=\
+    erroneous resolution for method {0} in type {1}\n\
+    phase: {3}\n\
+    with actuals: {4}\n\
+    with type-args: {5}\n\
+    candidates:
+
+# 0: symbol, 1: type, 2: type
+compiler.note.deferred.method.inst=\
+    Deferred instantiation of method {0}\n\
+    instantiated signature: {1}\n\
+    target-type: {2}
 
 ########################################
 # Diagnostics for where clause implementation
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java
index 023f5fa..0c56e43 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java
@@ -40,9 +40,13 @@ import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.code.*;
 import com.sun.tools.javac.code.Scope.*;
 import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.parser.EndPosTable;
 import com.sun.source.tree.*;
+import com.sun.source.tree.LambdaExpressionTree.BodyKind;
+import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
 
 import static com.sun.tools.javac.code.BoundKind.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
 
 /**
  * Root class for abstract syntax tree nodes. It provides definitions
@@ -80,262 +84,311 @@ import static com.sun.tools.javac.code.BoundKind.*;
 public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
 
     /* Tree tag values, identifying kinds of trees */
+    public enum Tag{
+        /** For methods that return an invalid tag if a given condition is not met
+         */
+        NO_TAG,
 
-    /** Toplevel nodes, of type TopLevel, representing entire source files.
-     */
-    public static final int  TOPLEVEL = 1;
+        /** Toplevel nodes, of type TopLevel, representing entire source files.
+        */
+        TOPLEVEL,
 
-    /** Import clauses, of type Import.
-     */
-    public static final int IMPORT = TOPLEVEL + 1;
+        /** Import clauses, of type Import.
+         */
+        IMPORT,
 
-    /** Class definitions, of type ClassDef.
-     */
-    public static final int CLASSDEF = IMPORT + 1;
+        /** Class definitions, of type ClassDef.
+         */
+        CLASSDEF,
 
-    /** Method definitions, of type MethodDef.
-     */
-    public static final int METHODDEF = CLASSDEF + 1;
+        /** Method definitions, of type MethodDef.
+         */
+        METHODDEF,
 
-    /** Variable definitions, of type VarDef.
-     */
-    public static final int VARDEF = METHODDEF + 1;
+        /** Variable definitions, of type VarDef.
+         */
+        VARDEF,
 
-    /** The no-op statement ";", of type Skip
-     */
-    public static final int SKIP = VARDEF + 1;
+        /** The no-op statement ";", of type Skip
+         */
+        SKIP,
 
-    /** Blocks, of type Block.
-     */
-    public static final int BLOCK = SKIP + 1;
+        /** Blocks, of type Block.
+         */
+        BLOCK,
 
-    /** Do-while loops, of type DoLoop.
-     */
-    public static final int DOLOOP = BLOCK + 1;
+        /** Do-while loops, of type DoLoop.
+         */
+        DOLOOP,
 
-    /** While-loops, of type WhileLoop.
-     */
-    public static final int WHILELOOP = DOLOOP + 1;
+        /** While-loops, of type WhileLoop.
+         */
+        WHILELOOP,
 
-    /** For-loops, of type ForLoop.
-     */
-    public static final int FORLOOP = WHILELOOP + 1;
+        /** For-loops, of type ForLoop.
+         */
+        FORLOOP,
 
-    /** Foreach-loops, of type ForeachLoop.
-     */
-    public static final int FOREACHLOOP = FORLOOP + 1;
+        /** Foreach-loops, of type ForeachLoop.
+         */
+        FOREACHLOOP,
 
-    /** Labelled statements, of type Labelled.
-     */
-    public static final int LABELLED = FOREACHLOOP + 1;
+        /** Labelled statements, of type Labelled.
+         */
+        LABELLED,
 
-    /** Switch statements, of type Switch.
-     */
-    public static final int SWITCH = LABELLED + 1;
+        /** Switch statements, of type Switch.
+         */
+        SWITCH,
 
-    /** Case parts in switch statements, of type Case.
-     */
-    public static final int CASE = SWITCH + 1;
+        /** Case parts in switch statements, of type Case.
+         */
+        CASE,
 
-    /** Synchronized statements, of type Synchonized.
-     */
-    public static final int SYNCHRONIZED = CASE + 1;
+        /** Synchronized statements, of type Synchonized.
+         */
+        SYNCHRONIZED,
 
-    /** Try statements, of type Try.
-     */
-    public static final int TRY = SYNCHRONIZED + 1;
+        /** Try statements, of type Try.
+         */
+        TRY,
 
-    /** Catch clauses in try statements, of type Catch.
-     */
-    public static final int CATCH = TRY + 1;
+        /** Catch clauses in try statements, of type Catch.
+         */
+        CATCH,
 
-    /** Conditional expressions, of type Conditional.
-     */
-    public static final int CONDEXPR = CATCH + 1;
+        /** Conditional expressions, of type Conditional.
+         */
+        CONDEXPR,
 
-    /** Conditional statements, of type If.
-     */
-    public static final int IF = CONDEXPR + 1;
+        /** Conditional statements, of type If.
+         */
+        IF,
 
-    /** Expression statements, of type Exec.
-     */
-    public static final int EXEC = IF + 1;
-
-    /** Break statements, of type Break.
-     */
-    public static final int BREAK = EXEC + 1;
-
-    /** Continue statements, of type Continue.
-     */
-    public static final int CONTINUE = BREAK + 1;
-
-    /** Return statements, of type Return.
-     */
-    public static final int RETURN = CONTINUE + 1;
-
-    /** Throw statements, of type Throw.
-     */
-    public static final int THROW = RETURN + 1;
+        /** Expression statements, of type Exec.
+         */
+        EXEC,
 
-    /** Assert statements, of type Assert.
-     */
-    public static final int ASSERT = THROW + 1;
-
-    /** Method invocation expressions, of type Apply.
-     */
-    public static final int APPLY = ASSERT + 1;
-
-    /** Class instance creation expressions, of type NewClass.
-     */
-    public static final int NEWCLASS = APPLY + 1;
-
-    /** Array creation expressions, of type NewArray.
-     */
-    public static final int NEWARRAY = NEWCLASS + 1;
-
-    /** Parenthesized subexpressions, of type Parens.
-     */
-    public static final int PARENS = NEWARRAY + 1;
+        /** Break statements, of type Break.
+         */
+        BREAK,
 
-    /** Assignment expressions, of type Assign.
-     */
-    public static final int ASSIGN = PARENS + 1;
+        /** Continue statements, of type Continue.
+         */
+        CONTINUE,
 
-    /** Type cast expressions, of type TypeCast.
-     */
-    public static final int TYPECAST = ASSIGN + 1;
+        /** Return statements, of type Return.
+         */
+        RETURN,
 
-    /** Type test expressions, of type TypeTest.
-     */
-    public static final int TYPETEST = TYPECAST + 1;
+        /** Throw statements, of type Throw.
+         */
+        THROW,
 
-    /** Indexed array expressions, of type Indexed.
-     */
-    public static final int INDEXED = TYPETEST + 1;
+        /** Assert statements, of type Assert.
+         */
+        ASSERT,
 
-    /** Selections, of type Select.
-     */
-    public static final int SELECT = INDEXED + 1;
+        /** Method invocation expressions, of type Apply.
+         */
+        APPLY,
+
+        /** Class instance creation expressions, of type NewClass.
+         */
+        NEWCLASS,
+
+        /** Array creation expressions, of type NewArray.
+         */
+        NEWARRAY,
+
+        /** Lambda expression, of type Lambda.
+         */
+        LAMBDA,
+
+        /** Parenthesized subexpressions, of type Parens.
+         */
+        PARENS,
+
+        /** Assignment expressions, of type Assign.
+         */
+        ASSIGN,
+
+        /** Type cast expressions, of type TypeCast.
+         */
+        TYPECAST,
+
+        /** Type test expressions, of type TypeTest.
+         */
+        TYPETEST,
+
+        /** Indexed array expressions, of type Indexed.
+         */
+        INDEXED,
+
+        /** Selections, of type Select.
+         */
+        SELECT,
+
+        /** Member references, of type Reference.
+         */
+        REFERENCE,
+
+        /** Simple identifiers, of type Ident.
+         */
+        IDENT,
+
+        /** Literals, of type Literal.
+         */
+        LITERAL,
+
+        /** Basic type identifiers, of type TypeIdent.
+         */
+        TYPEIDENT,
+
+        /** Array types, of type TypeArray.
+         */
+        TYPEARRAY,
+
+        /** Parameterized types, of type TypeApply.
+         */
+        TYPEAPPLY,
+
+        /** Union types, of type TypeUnion
+         */
+        TYPEUNION,
+
+        /** Formal type parameters, of type TypeParameter.
+         */
+        TYPEPARAMETER,
+
+        /** Type argument.
+         */
+        WILDCARD,
+
+        /** Bound kind: extends, super, exact, or unbound
+         */
+        TYPEBOUNDKIND,
+
+        /** metadata: Annotation.
+         */
+        ANNOTATION,
+
+        /** metadata: Modifiers
+         */
+        MODIFIERS,
+
+        ANNOTATED_TYPE,
+
+        /** Error trees, of type Erroneous.
+         */
+        ERRONEOUS,
+
+        /** Unary operators, of type Unary.
+         */
+        POS,                             // +
+        NEG,                             // -
+        NOT,                             // !
+        COMPL,                           // ~
+        PREINC,                          // ++ _
+        PREDEC,                          // -- _
+        POSTINC,                         // _ ++
+        POSTDEC,                         // _ --
 
-    /** Simple identifiers, of type Ident.
-     */
-    public static final int IDENT = SELECT + 1;
+        /** unary operator for null reference checks, only used internally.
+         */
+        NULLCHK,
 
-    /** Literals, of type Literal.
-     */
-    public static final int LITERAL = IDENT + 1;
+        /** Binary operators, of type Binary.
+         */
+        OR,                              // ||
+        AND,                             // &&
+        BITOR,                           // |
+        BITXOR,                          // ^
+        BITAND,                          // &
+        EQ,                              // ==
+        NE,                              // !=
+        LT,                              // <
+        GT,                              // >
+        LE,                              // <=
+        GE,                              // >=
+        SL,                              // <<
+        SR,                              // >>
+        USR,                             // >>>
+        PLUS,                            // +
+        MINUS,                           // -
+        MUL,                             // *
+        DIV,                             // /
+        MOD,                             // %
 
-    /** Basic type identifiers, of type TypeIdent.
-     */
-    public static final int TYPEIDENT = LITERAL + 1;
+        /** Assignment operators, of type Assignop.
+         */
+        BITOR_ASG(BITOR),                // |=
+        BITXOR_ASG(BITXOR),              // ^=
+        BITAND_ASG(BITAND),              // &=
 
-    /** Array types, of type TypeArray.
-     */
-    public static final int TYPEARRAY = TYPEIDENT + 1;
+        SL_ASG(SL),                      // <<=
+        SR_ASG(SR),                      // >>=
+        USR_ASG(USR),                    // >>>=
+        PLUS_ASG(PLUS),                  // +=
+        MINUS_ASG(MINUS),                // -=
+        MUL_ASG(MUL),                    // *=
+        DIV_ASG(DIV),                    // /=
+        MOD_ASG(MOD),                    // %=
 
-    /** Parameterized types, of type TypeApply.
-     */
-    public static final int TYPEAPPLY = TYPEARRAY + 1;
+        MODULE,
+        MODULE_ID,
+        MODULE_ID_QUERY,
+        VIEW_DECLARATION,
+        ENTRYPOINT_DIRECTIVE,
+        EXPORT_DIRECTIVE,
+        PERMITS_DIRECTIVE,
+        PROVIDES_MODULE_DIRECTIVE,
+        PROVIDES_SERVICE_DIRECTIVE,
+        REQUIRES_MODULE_DIRECTIVE,
+        REQUIRES_SERVICE_DIRECTIVE,
+        PACKAGE,
 
-    /** Union types, of type TypeUnion
-     */
-    public static final int TYPEUNION = TYPEAPPLY + 1;
+        /** A synthetic let expression, of type LetExpr.
+         */
+        LETEXPR;                         // ala scheme
 
-    /** Formal type parameters, of type TypeParameter.
-     */
-    public static final int TYPEPARAMETER = TYPEUNION + 1;
+        private Tag noAssignTag;
 
-    /** Type argument.
-     */
-    public static final int WILDCARD = TYPEPARAMETER + 1;
+        private static int numberOfOperators = MOD.ordinal() - POS.ordinal() + 1;
 
-    /** Bound kind: extends, super, exact, or unbound
-     */
-    public static final int TYPEBOUNDKIND = WILDCARD + 1;
+        private Tag(Tag noAssignTag) {
+            this.noAssignTag = noAssignTag;
+        }
 
-    /** metadata: Annotation.
-     */
-    public static final int ANNOTATION = TYPEBOUNDKIND + 1;
+        private Tag() { }
 
-    /** metadata: Modifiers
-     */
-    public static final int MODIFIERS = ANNOTATION + 1;
+        public static int getNumberOfOperators() {
+            return numberOfOperators;
+        }
 
-    public static final int ANNOTATED_TYPE = MODIFIERS + 1;
+        public Tag noAssignOp() {
+            if (noAssignTag != null)
+                return noAssignTag;
+            throw new AssertionError("noAssignOp() method is not available for non assignment tags");
+        }
 
-    /** Error trees, of type Erroneous.
-     */
-    public static final int ERRONEOUS = ANNOTATED_TYPE + 1;
+        public boolean isPostUnaryOp() {
+            return (this == POSTINC || this == POSTDEC);
+        }
 
-    /** Unary operators, of type Unary.
-     */
-    public static final int POS = ERRONEOUS + 1;             // +
-    public static final int NEG = POS + 1;                   // -
-    public static final int NOT = NEG + 1;                   // !
-    public static final int COMPL = NOT + 1;                 // ~
-    public static final int PREINC = COMPL + 1;              // ++ _
-    public static final int PREDEC = PREINC + 1;             // -- _
-    public static final int POSTINC = PREDEC + 1;            // _ ++
-    public static final int POSTDEC = POSTINC + 1;           // _ --
-
-    /** unary operator for null reference checks, only used internally.
-     */
-    public static final int NULLCHK = POSTDEC + 1;
+        public boolean isIncOrDecUnaryOp() {
+            return (this == PREINC || this == PREDEC || this == POSTINC || this == POSTDEC);
+        }
 
-    /** Binary operators, of type Binary.
-     */
-    public static final int OR = NULLCHK + 1;                // ||
-    public static final int AND = OR + 1;                    // &&
-    public static final int BITOR = AND + 1;                 // |
-    public static final int BITXOR = BITOR + 1;              // ^
-    public static final int BITAND = BITXOR + 1;             // &
-    public static final int EQ = BITAND + 1;                 // ==
-    public static final int NE = EQ + 1;                     // !=
-    public static final int LT = NE + 1;                     // <
-    public static final int GT = LT + 1;                     // >
-    public static final int LE = GT + 1;                     // <=
-    public static final int GE = LE + 1;                     // >=
-    public static final int SL = GE + 1;                     // <<
-    public static final int SR = SL + 1;                     // >>
-    public static final int USR = SR + 1;                    // >>>
-    public static final int PLUS = USR + 1;                  // +
-    public static final int MINUS = PLUS + 1;                // -
-    public static final int MUL = MINUS + 1;                 // *
-    public static final int DIV = MUL + 1;                   // /
-    public static final int MOD = DIV + 1;                   // %
-
-    /** Assignment operators, of type Assignop.
-     */
-    public static final int BITOR_ASG = MOD + 1;             // |=
-    public static final int BITXOR_ASG = BITOR_ASG + 1;      // ^=
-    public static final int BITAND_ASG = BITXOR_ASG + 1;     // &=
-
-    public static final int SL_ASG = SL + BITOR_ASG - BITOR; // <<=
-    public static final int SR_ASG = SL_ASG + 1;             // >>=
-    public static final int USR_ASG = SR_ASG + 1;            // >>>=
-    public static final int PLUS_ASG = USR_ASG + 1;          // +=
-    public static final int MINUS_ASG = PLUS_ASG + 1;        // -=
-    public static final int MUL_ASG = MINUS_ASG + 1;         // *=
-    public static final int DIV_ASG = MUL_ASG + 1;           // /=
-    public static final int MOD_ASG = DIV_ASG + 1;           // %=
-
-    public static final int MODULE = MOD_ASG + 1;
-    public static final int MODULE_CLASS = MODULE + 1;
-    public static final int MODULE_EXPORT = MODULE_CLASS + 1;
-    public static final int MODULE_ID = MODULE_EXPORT + 1;
-    public static final int MODULE_PERMITS = MODULE_ID + 1;
-    public static final int MODULE_REQUIRES = MODULE_PERMITS + 1;
-
-    public static final int PACKAGE = MODULE_REQUIRES + 1;
-
-    /** A synthetic let expression, of type LetExpr.
-     */
-    public static final int LETEXPR = PACKAGE + 1;           // ala scheme
+        public boolean isAssignop() {
+            return noAssignTag != null;
+        }
 
+        public int operatorIndex() {
+            return (this.ordinal() - POS.ordinal());
+        }
+    }
 
-    /** The offset between assignment operators and normal operators.
-     */
-    public static final int ASGOffset = BITOR_ASG - BITOR;
 
     /* The (encoded) position in the source file. @see util.Position.
      */
@@ -347,7 +400,13 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
 
     /* The tag of this node -- one of the constants declared above.
      */
-    public abstract int getTag();
+    public abstract Tag getTag();
+
+    /* Returns true if the tag of this node is equals to tag.
+     */
+    public boolean hasTag(Tag tag) {
+        return tag == getTag();
+    }
 
     /** Convert a tree to a pretty-printed string. */
     @Override
@@ -417,7 +476,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
     }
 
     // for default DiagnosticPosition
-    public int getEndPosition(Map<JCTree, Integer> endPosTable) {
+    public int getEndPosition(EndPosTable endPosTable) {
         return TreeInfo.getEndPos(this, endPosTable);
     }
 
@@ -434,7 +493,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
      * @param docComments      A hashtable that stores all documentation comments
      *                         indexed by the tree nodes they refer to.
      *                         defined only if option -s is set.
-     * @param endPositions     A hashtable that stores ending positions of source
+     * @param endPositions     An object encapsulating ending positions of source
      *                         ranges indexed by the tree nodes they belong to.
      *                         Defined only if option -Xjcov is set.
      */
@@ -448,7 +507,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         public StarImportScope starImportScope;
         public Position.LineMap lineMap = null;
         public Map<JCTree, String> docComments = null;
-        public Map<JCTree, Integer> endPositions = null;
+        public EndPosTable endPositions = null;
         protected JCCompilationUnit(List<JCTree> defs,
                         JavaFileObject sourcefile,
                         PackageSymbol packge,
@@ -471,10 +530,9 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         public List<JCImport> getImports() {
             ListBuffer<JCImport> imports = new ListBuffer<JCImport>();
             for (JCTree tree : defs) {
-                int tag = tree.getTag();
-                if (tag == IMPORT)
+                if (tree.hasTag(IMPORT))
                     imports.append((JCImport)tree);
-                else if (tag != SKIP)
+                else if (!tree.hasTag(SKIP))
                     break;
             }
             return imports.toList();
@@ -492,7 +550,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         public List<JCTree> getTypeDecls() {
             List<JCTree> typeDefs;
             for (typeDefs = defs; !typeDefs.isEmpty(); typeDefs = typeDefs.tail)
-                if (typeDefs.head.getTag() != IMPORT)
+                if (!typeDefs.head.hasTag(IMPORT))
                     break;
             return typeDefs;
         }
@@ -502,7 +560,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
 
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return TOPLEVEL;
         }
     }
@@ -531,7 +589,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
 
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return IMPORT;
         }
     }
@@ -628,7 +686,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
 
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return CLASSDEF;
         }
     }
@@ -700,7 +758,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
 
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return METHODDEF;
         }
   }
@@ -746,7 +804,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
 
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return VARDEF;
         }
     }
@@ -767,7 +825,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
 
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return SKIP;
         }
     }
@@ -800,7 +858,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
 
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return BLOCK;
         }
     }
@@ -827,7 +885,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
 
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return DOLOOP;
         }
     }
@@ -854,7 +912,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
 
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return WHILELOOP;
         }
     }
@@ -895,7 +953,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
 
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return FORLOOP;
         }
     }
@@ -924,7 +982,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitEnhancedForLoop(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return FOREACHLOOP;
         }
     }
@@ -949,7 +1007,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitLabeledStatement(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return LABELLED;
         }
     }
@@ -975,7 +1033,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitSwitch(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return SWITCH;
         }
     }
@@ -1001,7 +1059,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitCase(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return CASE;
         }
     }
@@ -1027,7 +1085,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitSynchronized(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return SYNCHRONIZED;
         }
     }
@@ -1067,7 +1125,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return resources;
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return TRY;
         }
     }
@@ -1093,7 +1151,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitCatch(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return CATCH;
         }
     }
@@ -1125,7 +1183,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitConditionalExpression(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return CONDEXPR;
         }
     }
@@ -1157,7 +1215,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitIf(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return IF;
         }
     }
@@ -1182,7 +1240,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitExpressionStatement(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return EXEC;
         }
 
@@ -1222,7 +1280,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitBreak(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return BREAK;
         }
     }
@@ -1247,7 +1305,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitContinue(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return CONTINUE;
         }
     }
@@ -1270,7 +1328,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitReturn(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return RETURN;
         }
     }
@@ -1293,7 +1351,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitThrow(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return THROW;
         }
     }
@@ -1319,7 +1377,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitAssert(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return ASSERT;
         }
     }
@@ -1362,7 +1420,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return this;
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return(APPLY);
         }
     }
@@ -1412,7 +1470,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitNewClass(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return NEWCLASS;
         }
     }
@@ -1448,12 +1506,62 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitNewArray(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return NEWARRAY;
         }
     }
 
     /**
+     * A lambda expression.
+     */
+    public static class JCLambda extends JCExpression implements LambdaExpressionTree {
+
+        public List<JCVariableDecl> params;
+        public JCTree body;
+        public Type targetType;
+        public boolean canCompleteNormally = true;
+        public List<Type> inferredThrownTypes;
+
+        public JCLambda(List<JCVariableDecl> params,
+                        JCTree body) {
+            this.params = params;
+            this.body = body;
+        }
+        @Override
+        public Tag getTag() {
+            return LAMBDA;
+        }
+        @Override
+        public void accept(Visitor v) {
+            v.visitLambda(this);
+        }
+        @Override
+        public <R, D> R accept(TreeVisitor<R, D> v, D d) {
+            return v.visitLambdaExpression(this, d);
+        }
+        public Kind getKind() {
+            return Kind.LAMBDA_EXPRESSION;
+        }
+        public JCTree getBody() {
+            return body;
+        }
+        public java.util.List<? extends VariableTree> getParameters() {
+            return params;
+        }
+        @Override
+        public JCLambda setType(Type type) {
+            super.setType(type);
+            return this;
+        }
+        @Override
+        public BodyKind getBodyKind() {
+            return body.hasTag(BLOCK) ?
+                    BodyKind.STATEMENT :
+                    BodyKind.EXPRESSION;
+        }
+    }
+
+    /**
      * A parenthesized subexpression ( ... )
      */
     public static class JCParens extends JCExpression implements ParenthesizedTree {
@@ -1471,7 +1579,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitParenthesized(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return PARENS;
         }
     }
@@ -1497,7 +1605,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitAssignment(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return ASSIGN;
         }
     }
@@ -1506,11 +1614,11 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
      * An assignment with "+=", "|=" ...
      */
     public static class JCAssignOp extends JCExpression implements CompoundAssignmentTree {
-        private int opcode;
+        private Tag opcode;
         public JCExpression lhs;
         public JCExpression rhs;
         public Symbol operator;
-        protected JCAssignOp(int opcode, JCTree lhs, JCTree rhs, Symbol operator) {
+        protected JCAssignOp(Tag opcode, JCTree lhs, JCTree rhs, Symbol operator) {
             this.opcode = opcode;
             this.lhs = (JCExpression)lhs;
             this.rhs = (JCExpression)rhs;
@@ -1530,7 +1638,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitCompoundAssignment(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return opcode;
         }
     }
@@ -1539,10 +1647,10 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
      * A unary operation.
      */
     public static class JCUnary extends JCExpression implements UnaryTree {
-        private int opcode;
+        private Tag opcode;
         public JCExpression arg;
         public Symbol operator;
-        protected JCUnary(int opcode, JCExpression arg) {
+        protected JCUnary(Tag opcode, JCExpression arg) {
             this.opcode = opcode;
             this.arg = arg;
         }
@@ -1559,11 +1667,11 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitUnary(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return opcode;
         }
 
-        public void setTag(int tag) {
+        public void setTag(Tag tag) {
             opcode = tag;
         }
     }
@@ -1572,11 +1680,11 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
      * A binary operation.
      */
     public static class JCBinary extends JCExpression implements BinaryTree {
-        private int opcode;
+        private Tag opcode;
         public JCExpression lhs;
         public JCExpression rhs;
         public Symbol operator;
-        protected JCBinary(int opcode,
+        protected JCBinary(Tag opcode,
                          JCExpression lhs,
                          JCExpression rhs,
                          Symbol operator) {
@@ -1599,7 +1707,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitBinary(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return opcode;
         }
     }
@@ -1625,7 +1733,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitTypeCast(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return TYPECAST;
         }
     }
@@ -1651,7 +1759,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitInstanceOf(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return TYPETEST;
         }
     }
@@ -1677,7 +1785,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitArrayAccess(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return INDEXED;
         }
     }
@@ -1708,12 +1816,52 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
         public Name getIdentifier() { return name; }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return SELECT;
         }
     }
 
     /**
+     * Selects a member expression.
+     */
+    public static class JCMemberReference extends JCExpression implements MemberReferenceTree {
+        public ReferenceMode mode;
+        public Name name;
+        public JCExpression expr;
+        public List<JCExpression> typeargs;
+        public Type targetType;
+        public Symbol sym;
+
+        protected JCMemberReference(ReferenceMode mode, Name name, JCExpression expr, List<JCExpression> typeargs) {
+            this.mode = mode;
+            this.name = name;
+            this.expr = expr;
+            this.typeargs = typeargs;
+        }
+        @Override
+        public void accept(Visitor v) { v.visitReference(this); }
+
+        public Kind getKind() { return Kind.MEMBER_REFERENCE; }
+        @Override
+        public ReferenceMode getMode() { return mode; }
+        @Override
+        public JCExpression getQualifierExpression() { return expr; }
+        @Override
+        public Name getName() { return name; }
+        @Override
+        public List<JCExpression> getTypeArguments() { return typeargs; }
+
+        @Override
+        public <R,D> R accept(TreeVisitor<R,D> v, D d) {
+            return v.visitMemberReference(this, d);
+        }
+        @Override
+        public Tag getTag() {
+            return REFERENCE;
+        }
+    }
+
+    /**
      * An identifier
      * @param idname the name
      * @param sym the symbol
@@ -1734,7 +1882,8 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         public <R,D> R accept(TreeVisitor<R,D> v, D d) {
             return v.visitIdentifier(this, d);
         }
-        public int getTag() {
+        @Override
+        public Tag getTag() {
             return IDENT;
         }
     }
@@ -1800,7 +1949,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return this;
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return LITERAL;
         }
     }
@@ -1848,7 +1997,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitPrimitiveType(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return TYPEIDENT;
         }
     }
@@ -1871,7 +2020,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitArrayType(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return TYPEARRAY;
         }
     }
@@ -1899,7 +2048,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitParameterizedType(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return TYPEAPPLY;
         }
     }
@@ -1927,7 +2076,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitUnionType(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return TYPEUNION;
         }
     }
@@ -1957,7 +2106,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitTypeParameter(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return TYPEPARAMETER;
         }
     }
@@ -1991,7 +2140,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitWildcard(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return WILDCARD;
         }
     }
@@ -2012,7 +2161,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             throw new AssertionError("TypeBoundKind is not part of a public API");
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return TYPEBOUNDKIND;
         }
     }
@@ -2037,7 +2186,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitAnnotation(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return ANNOTATION;
         }
     }
@@ -2064,44 +2213,118 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitModifiers(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return MODIFIERS;
         }
     }
 
-    public static class JCModuleDecl extends JCTree implements com.sun.source.tree.ModuleTree {
-        public List<JCAnnotation> annots;
+    public static class JCModuleId extends JCTree implements ModuleIdTree {
+        public JCTree qualId;
+        public Name version;
+        protected JCModuleId(JCTree qualId, Name version) {
+            this.qualId = qualId;
+            this.version = version;
+        }
+
+        @Override
+        public void accept(Visitor v) { v.visitModuleId(this); }
+
+        @Override
+        public Kind getKind() {
+            return Kind.MODULE_ID;
+        }
+
+        @Override
+        public JCTree getName() {
+            return qualId;
+        }
+
+        @Override
+        public Name getVersion() {
+            return version;
+        }
+
+        @Override
+        public <R, D> R accept(TreeVisitor<R, D> v, D d) {
+            return v.visitModuleId(this, d);
+        }
+
+        @Override
+        public Tag getTag() {
+            return MODULE_ID;
+        }
+    }
+
+    public static class JCModuleIdQuery extends JCTree implements ModuleIdQueryTree {
+        public JCTree qualId;
+        public Name versionQuery;
+        protected JCModuleIdQuery(JCTree qualId, Name versionQuery) {
+            this.qualId = qualId;
+            this.versionQuery = versionQuery;
+        }
+
+        @Override
+        public void accept(Visitor v) { v.visitModuleIdQuery(this); }
+
+        @Override
+        public Kind getKind() {
+            return Kind.MODULE_ID_QUERY;
+        }
+
+        @Override
+        public JCTree getName() {
+            return qualId;
+        }
+
+        @Override
+        public Name getVersionQuery() {
+            return versionQuery;
+        }
+
+        @Override
+        public <R, D> R accept(TreeVisitor<R, D> v, D d) {
+            return v.visitModuleIdQuery(this, d);
+        }
+
+        @Override
+        public Tag getTag() {
+            return MODULE_ID;
+        }
+    }
+
+    public static class JCModuleDecl extends JCTree implements ModuleTree {
         public JCModuleId id;
-        public List<JCModuleId> provides;
-        public List<JCModuleMetadata> metadata;
+        public List<JCModuleDirective> directives;
+        public Name metadata;
         public ModuleSymbol sym;
-        protected JCModuleDecl(List<JCAnnotation> annots, JCModuleId id,
-                List<JCModuleId> provides, List<JCModuleMetadata> metadata) {
-            this.annots = annots;
+
+        protected JCModuleDecl(JCModuleId id,
+                List<JCModuleDirective> directives, Name metadata) {
             this.id = id;
-            this.provides = provides;
+            this.directives = directives;
             this.metadata = metadata;
         }
+
         @Override
         public void accept(Visitor v) { v.visitModuleDef(this); }
 
+        @Override
         public Kind getKind() {
             return Kind.MODULE;
         }
 
-        public List<JCAnnotation> getAnnotations() {
-            return annots;
-        }
-
+        @Override
         public JCModuleId getId() {
             return id;
         }
 
-        public List<JCModuleId> getProvides() {
-            return provides;
+        @Override
+        public List<JCModuleDirective> getDirectives() {
+            return directives;
         }
 
-        public List<JCModuleMetadata> getMetadataList() {
+        @Override
+        public Name getExtendedMetadata() {
             return metadata;
         }
 
@@ -2111,180 +2334,293 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
 
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return MODULE;
         }
     }
 
-    public static class JCModuleId extends JCTree implements com.sun.source.tree.ModuleIdTree {
-        public JCTree qualId;
-        public Name version;
-        protected JCModuleId(JCTree qualId, Name version) {
+    public static abstract class JCModuleDirective extends JCTree implements ModuleDirectiveTree {
+    }
+
+    public static class JCViewDecl extends JCModuleDirective implements ViewDeclarationTree {
+        public JCExpression name;
+        public List<JCModuleDirective> directives;
+
+        protected JCViewDecl(JCExpression name, List<JCModuleDirective> directives) {
+            this.name = name;
+            this.directives = directives;
+        }
+
+        @Override
+        public void accept(Visitor v) { v.visitView(this); }
+
+        @Override
+        public Kind getKind() {
+            return Kind.VIEW_DECLARATION;
+        }
+
+        @Override
+        public JCExpression getName() {
+            return name;
+        }
+
+        @Override
+        public List<JCModuleDirective> getDirectives() {
+            return directives;
+        }
+
+        @Override
+        public <R, D> R accept(TreeVisitor<R, D> v, D d) {
+            return v.visitView(this, d);
+        }
+
+        @Override
+        public Tag getTag() {
+            return VIEW_DECLARATION;
+        }
+    }
+
+    public static class JCEntrypointDirective extends JCModuleDirective
+            implements EntrypointDirectiveTree {
+        public JCExpression qualId;
+        protected JCEntrypointDirective(JCExpression qualId) {
             this.qualId = qualId;
-            this.version = version;
         }
 
         @Override
-        public void accept(Visitor v) { v.visitModuleId(this); }
+        public void accept(Visitor v) { v.visitEntrypoint(this); }
 
+        @Override
         public Kind getKind() {
-            return Kind.MODULE_ID;
+            return Kind.ENTRYPOINT_DIRECTIVE;
         }
 
-        public JCTree getModuleName() {
+        @Override
+        public JCExpression getClassName() {
             return qualId;
         }
 
-        public Name getModuleVersion() {
-            return version;
+        @Override
+        public <R, D> R accept(TreeVisitor<R, D> v, D d) {
+            return v.visitEntrypoint(this, d);
+        }
+
+        @Override
+        public Tag getTag() {
+            return ENTRYPOINT_DIRECTIVE;
+        }
+    }
+
+    public static class JCExportDirective extends JCModuleDirective
+            implements ExportDirectiveTree {
+        public JCExpression qualid;
+
+        protected JCExportDirective(JCExpression qualId) {
+            this.qualid = qualId;
+        }
+
+        @Override
+        public void accept(Visitor v) { v.visitExports(this); }
+
+        @Override
+        public Kind getKind() {
+            return Kind.EXPORT_DIRECTIVE;
+        }
+
+        @Override
+        public JCExpression getExportName() {
+            return qualid;
         }
 
         @Override
         public <R, D> R accept(TreeVisitor<R, D> v, D d) {
-            return v.visitModuleId(this, d);
+            return v.visitExport(this, d);
         }
 
         @Override
-        public int getTag() {
-            return MODULE_ID;
+        public Tag getTag() {
+            return EXPORT_DIRECTIVE;
         }
     }
 
-    public static abstract class JCModuleMetadata extends JCTree {
+    public static class JCPermitsDirective extends JCModuleDirective
+            implements PermitsDirectiveTree {
+        public JCExpression moduleName;
+
+        protected JCPermitsDirective(JCExpression moduleName) {
+            this.moduleName = moduleName;
+        }
 
+        @Override
+        public void accept(Visitor v) { v.visitPermits(this); }
+
+        @Override
+        public Kind getKind() {
+            return Kind.PERMITS_DIRECTIVE;
+        }
+
+        @Override
+        public <R, D> R accept(TreeVisitor<R, D> v, D d) {
+            return v.visitPermits(this, d);
+        }
+
+        @Override
+        public JCExpression getModuleName() {
+            return moduleName;
+        }
+
+        @Override
+        public Tag getTag() {
+            return PERMITS_DIRECTIVE;
+        }
     }
 
-    public static class JCModuleClass extends JCModuleMetadata implements com.sun.source.tree.ModuleClassTree {
-        public JCTree qualId;
-        public List<Name> flags;
-        protected JCModuleClass(List<Name> flags, JCTree qualId) {
-            this.qualId = qualId;
+    public static class JCRequiresModuleDirective extends JCModuleDirective
+            implements RequiresModuleDirectiveTree {
+        public List<RequiresFlag> flags;
+        public JCModuleIdQuery moduleIdQuery;
+
+        protected JCRequiresModuleDirective(List<RequiresFlag> flags, JCModuleIdQuery moduleIdQuery) {
             this.flags = flags;
+            this.moduleIdQuery = moduleIdQuery;
         }
 
         @Override
-        public void accept(Visitor v) { v.visitModuleClass(this); }
+        public void accept(Visitor v) { v.visitRequiresModule(this); }
 
+        @Override
         public Kind getKind() {
-            return Kind.MODULE_CLASS;
+            return Kind.REQUIRES_MODULE_DIRECTIVE;
         }
 
-        public JCTree getClassName() {
-            return qualId;
+        @Override
+        public <R, D> R accept(TreeVisitor<R, D> v, D d) {
+            return v.visitRequiresModule(this, d);
         }
 
-        public List<Name> getFlags() {
+        @Override
+        public List<RequiresFlag> getFlags() {
             return flags;
         }
 
         @Override
-        public <R, D> R accept(TreeVisitor<R, D> v, D d) {
-            return v.visitModuleClass(this, d);
+        public JCModuleIdQuery getModuleIdQuery() {
+            return moduleIdQuery;
         }
 
         @Override
-        public int getTag() {
-            return MODULE_CLASS;
+        public Tag getTag() {
+            return REQUIRES_MODULE_DIRECTIVE;
         }
     }
 
-    public static class JCModuleExport extends JCModuleMetadata implements com.sun.source.tree.ModuleExportTree {
-        public JCTree qualid;
-        public List<Name> flags;
-        protected JCModuleExport(List<Name> flags, JCTree qualId) {
-            this.qualid = qualId;
+    public static class JCRequiresServiceDirective extends JCModuleDirective
+            implements RequiresServiceDirectiveTree {
+        public List<RequiresFlag> flags;
+        public JCExpression serviceName;
+
+        protected JCRequiresServiceDirective(List<RequiresFlag> flags, JCExpression serviceName) {
             this.flags = flags;
+            this.serviceName = serviceName;
         }
 
         @Override
-        public void accept(Visitor v) { v.visitModuleExport(this); }
+        public void accept(Visitor v) { v.visitRequiresService(this); }
 
+        @Override
         public Kind getKind() {
-            return Kind.MODULE_EXPORT;
+            return Kind.REQUIRES_SERVICE_DIRECTIVE;
         }
 
-        public JCTree getExportName() {
-            return qualid;
+        @Override
+        public <R, D> R accept(TreeVisitor<R, D> v, D d) {
+            return v.visitRequiresService(this, d);
         }
 
-        public List<Name> getFlags() {
+        @Override
+        public List<RequiresFlag> getFlags() {
             return flags;
         }
 
         @Override
-        public <R, D> R accept(TreeVisitor<R, D> v, D d) {
-            return v.visitModuleExport(this, d);
+        public JCExpression getServiceName() {
+            return serviceName;
         }
 
         @Override
-        public int getTag() {
-            return MODULE_EXPORT;
+        public Tag getTag() {
+            return REQUIRES_SERVICE_DIRECTIVE;
         }
     }
 
-    public static class JCModulePermits extends JCModuleMetadata
-            implements com.sun.source.tree.ModulePermitsTree {
-        public List<JCExpression> moduleNames;
+    public static class JCProvidesModuleDirective extends JCModuleDirective
+            implements ProvidesModuleDirectiveTree {
+        public JCModuleId moduleId;
 
-        protected JCModulePermits(List<JCExpression> moduleNames) {
-            this.moduleNames = moduleNames;
+        protected JCProvidesModuleDirective(JCModuleId moduleId) {
+            this.moduleId = moduleId;
         }
 
         @Override
-        public void accept(Visitor v) { v.visitModulePermits(this); }
+        public void accept(Visitor v) { v.visitProvidesModule(this); }
 
+        @Override
         public Kind getKind() {
-            return Kind.MODULE_PERMITS;
+            return Kind.PROVIDES_MODULE_DIRECTIVE;
         }
 
         @Override
         public <R, D> R accept(TreeVisitor<R, D> v, D d) {
-            return v.visitModulePermits(this, d);
+            return v.visitProvidesModule(this, d);
         }
 
-        public List<JCExpression> getModuleNames() {
-            return moduleNames;
+        @Override
+        public JCModuleId getModuleId() {
+            return moduleId;
         }
 
         @Override
-        public int getTag() {
-            return MODULE_PERMITS;
+        public Tag getTag() {
+            return PROVIDES_MODULE_DIRECTIVE;
         }
     }
 
-    public static class JCModuleRequires extends JCModuleMetadata
-            implements com.sun.source.tree.ModuleRequiresTree {
-        public List<Name> flags;
-        public List<JCModuleId> moduleIds;
+    public static class JCProvidesServiceDirective extends JCModuleDirective
+            implements ProvidesServiceDirectiveTree {
+        public JCExpression serviceName;
+        public JCExpression implName;
 
-        protected JCModuleRequires(List<Name> flags, List<JCModuleId> moduleIds) {
-            this.flags = flags;
-            this.moduleIds = moduleIds;
+        protected JCProvidesServiceDirective(JCExpression serviceName, JCExpression implName) {
+            this.serviceName = serviceName;
+            this.implName = implName;
         }
 
         @Override
-        public void accept(Visitor v) { v.visitModuleRequires(this); }
+        public void accept(Visitor v) { v.visitProvidesService(this); }
 
+        @Override
         public Kind getKind() {
-            return Kind.MODULE_REQUIRES;
+            return Kind.PROVIDES_SERVICE_DIRECTIVE;
         }
 
         @Override
         public <R, D> R accept(TreeVisitor<R, D> v, D d) {
-            return v.visitModuleRequires(this, d);
+            return v.visitProvidesService(this, d);
         }
 
-        public List<Name> getFlags() {
-            return flags;
+        @Override
+        public JCExpression getServiceName() {
+            return serviceName;
         }
 
-        public List<JCModuleId> getModuleIds() {
-            return moduleIds;
+        @Override
+        public JCExpression getImplementationName() {
+            return implName;
         }
 
         @Override
-        public int getTag() {
-            return MODULE_REQUIRES;
+        public Tag getTag() {
+            return PROVIDES_SERVICE_DIRECTIVE;
         }
     }
 
@@ -2317,7 +2653,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
 
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return PACKAGE;
         }
     }
@@ -2342,7 +2678,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             return v.visitErroneous(this, d);
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return ERRONEOUS;
         }
     }
@@ -2366,7 +2702,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             throw new AssertionError("LetExpr is not part of a public API");
         }
         @Override
-        public int getTag() {
+        public Tag getTag() {
             return LETEXPR;
         }
     }
@@ -2436,9 +2772,9 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
                           List<JCExpression> elems);
         JCParens Parens(JCExpression expr);
         JCAssign Assign(JCExpression lhs, JCExpression rhs);
-        JCAssignOp Assignop(int opcode, JCTree lhs, JCTree rhs);
-        JCUnary Unary(int opcode, JCExpression arg);
-        JCBinary Binary(int opcode, JCExpression lhs, JCExpression rhs);
+        JCAssignOp Assignop(Tag opcode, JCTree lhs, JCTree rhs);
+        JCUnary Unary(Tag opcode, JCExpression arg);
+        JCBinary Binary(Tag opcode, JCExpression lhs, JCExpression rhs);
         JCTypeCast TypeCast(JCTree expr, JCExpression type);
         JCInstanceOf TypeTest(JCExpression expr, JCTree clazz);
         JCArrayAccess Indexed(JCExpression indexed, JCExpression index);
@@ -2454,10 +2790,17 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         JCAnnotation Annotation(JCTree annotationType, List<JCExpression> args);
         JCModifiers Modifiers(long flags, List<JCAnnotation> annotations);
         JCErroneous Erroneous(List<? extends JCTree> errs);
+        JCModuleDecl Module(JCModuleId moduleId, List<JCModuleDirective> directives, Name metadata);
+        JCViewDecl View(JCExpression name, List<JCModuleDirective> directives);
         JCModuleId ModuleId(JCTree qualId, Name version);
-        JCModuleMetadata ModuleClass(List<Name> flags, JCTree qualId);
-        JCModuleMetadata ModulePermits(List<JCExpression> qualIds);
-        JCModuleMetadata ModuleRequires(List<Name> flags, List<JCModuleId> moduleIds);
+        JCModuleIdQuery ModuleIdQuery(JCTree qualId, Name versionQuery);
+        JCEntrypointDirective Entrypoint(JCExpression qualId);
+        JCExportDirective Exports(JCExpression qualId);
+        JCPermitsDirective Permits(JCExpression qualId);
+        JCProvidesModuleDirective ProvidesModule(JCModuleId moduleId);
+        JCProvidesServiceDirective ProvidesService(JCExpression serviceName, JCExpression implementationName);
+        JCRequiresModuleDirective RequiresModule(List<RequiresFlag> flags, JCModuleIdQuery moduleIdQuery);
+        JCRequiresServiceDirective RequiresService(List<RequiresFlag> flags, JCExpression serviceName);
         LetExpr LetExpr(List<JCVariableDecl> defs, JCTree expr);
     }
 
@@ -2492,6 +2835,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         public void visitApply(JCMethodInvocation that)      { visitTree(that); }
         public void visitNewClass(JCNewClass that)           { visitTree(that); }
         public void visitNewArray(JCNewArray that)           { visitTree(that); }
+        public void visitLambda(JCLambda that)               { visitTree(that); }
         public void visitParens(JCParens that)               { visitTree(that); }
         public void visitAssign(JCAssign that)               { visitTree(that); }
         public void visitAssignop(JCAssignOp that)           { visitTree(that); }
@@ -2501,6 +2845,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         public void visitTypeTest(JCInstanceOf that)         { visitTree(that); }
         public void visitIndexed(JCArrayAccess that)         { visitTree(that); }
         public void visitSelect(JCFieldAccess that)          { visitTree(that); }
+        public void visitReference(JCMemberReference that)   { visitTree(that); }
         public void visitIdent(JCIdent that)                 { visitTree(that); }
         public void visitLiteral(JCLiteral that)             { visitTree(that); }
         public void visitTypeIdent(JCPrimitiveTypeTree that) { visitTree(that); }
@@ -2514,11 +2859,16 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         public void visitModifiers(JCModifiers that)         { visitTree(that); }
         public void visitErroneous(JCErroneous that)         { visitTree(that); }
         public void visitModuleDef(JCModuleDecl that)        { visitTree(that); }
-        public void visitModuleClass(JCModuleClass that)     { visitTree(that); }
-        public void visitModuleExport(JCModuleExport that)   { visitTree(that); }
+        public void visitEntrypoint(JCEntrypointDirective that) { visitTree(that); }
+        public void visitExports(JCExportDirective that)   { visitTree(that); }
         public void visitModuleId(JCModuleId that)           { visitTree(that); }
-        public void visitModulePermits(JCModulePermits that) { visitTree(that); }
-        public void visitModuleRequires(JCModuleRequires that) { visitTree(that); }
+        public void visitModuleIdQuery(JCModuleIdQuery that) { visitTree(that); }
+        public void visitPermits(JCPermitsDirective that) { visitTree(that); }
+        public void visitProvidesModule(JCProvidesModuleDirective that) { visitTree(that); }
+        public void visitProvidesService(JCProvidesServiceDirective that) { visitTree(that); }
+        public void visitRequiresModule(JCRequiresModuleDirective that) { visitTree(that); }
+        public void visitRequiresService(JCRequiresServiceDirective that) { visitTree(that); }
+        public void visitView(JCViewDecl that) { visitTree(that); }
         public void visitPackageDef(JCPackageDecl that)      { visitTree(that); }
         public void visitLetExpr(LetExpr that)               { visitTree(that); }
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java b/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java
index 2c90abe..79d81b5 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java
@@ -25,9 +25,12 @@
 
 package com.sun.tools.javac.tree;
 
+import com.sun.source.tree.RequiresFlag;
 import java.io.*;
 import java.util.*;
 
+import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
+
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.code.*;
@@ -36,6 +39,8 @@ import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.tree.JCTree.*;
 
 import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.ANNOTATION;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
 
 /** Prints out a tree as an indented Java source program.
  *
@@ -310,7 +315,7 @@ public class Pretty extends JCTree.Visitor {
 
     /** Is the given tree an enumerator definition? */
     boolean isEnumerator(JCTree t) {
-        return t.getTag() == JCTree.VARDEF && (((JCVariableDecl) t).mods.flags & ENUM) != 0;
+        return t.hasTag(VARDEF) && (((JCVariableDecl) t).mods.flags & ENUM) != 0;
     }
 
     /** Print unit consisting of package clause and import statements in toplevel,
@@ -327,7 +332,7 @@ public class Pretty extends JCTree.Visitor {
         boolean inImports = false;
         for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
             switch (l.head.getTag()) {
-                case JCTree.IMPORT:
+                case IMPORT:
                     JCImport imp = (JCImport)l.head;
                     Name name = TreeInfo.name(imp.qualid);
                     if (name == name.table.names.asterisk ||
@@ -346,8 +351,8 @@ public class Pretty extends JCTree.Visitor {
                         break;
                     // fall-through
 
-                case JCTree.MODULE:
-                case JCTree.PACKAGE:
+                case MODULE:
+                case PACKAGE:
                     if (inImports) {
                         inImports = false;
                         println();
@@ -389,20 +394,15 @@ public class Pretty extends JCTree.Visitor {
         }
     }
 
+    @Override
     public void visitModuleDef(JCModuleDecl tree) {
         try {
-            printAnnotations(tree.annots);
             print("module ");
             printExpr(tree.id);
-            if (tree.metadata == null) {
+            if (tree.directives == null) {
                 print(";");
             } else {
-                if (tree.provides.nonEmpty()) {
-                    print(" provides ");
-                    printExprs(tree.provides);
-                    print(" ");
-                }
-                printBlock(tree.metadata);
+                printBlock(tree.directives);
             }
             println();
         } catch (IOException e) {
@@ -410,6 +410,7 @@ public class Pretty extends JCTree.Visitor {
         }
     }
 
+    @Override
     public void visitModuleId(JCModuleId tree) {
         try {
             printExpr(tree.qualId);
@@ -422,13 +423,23 @@ public class Pretty extends JCTree.Visitor {
         }
     }
 
-    public void visitModuleClass(JCModuleClass tree) {
+    @Override
+    public void visitModuleIdQuery(JCModuleIdQuery tree) {
         try {
-            print("class ");
-            for (List<Name> l = tree.flags; l.nonEmpty(); l = l.tail ) {
-                print(l.head);
-                print(" ");
+            printExpr(tree.qualId);
+            if (tree.versionQuery != null) {
+                print(" @ ");
+                print(tree.versionQuery);  // JIGSAW FIXME -- CHECK IF QUOTES REQUIRED
             }
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @Override
+    public void visitEntrypoint(JCEntrypointDirective tree) {
+        try {
+            print("class ");
             printExpr(tree.qualId);
             print(";");
         } catch (IOException e) {
@@ -436,13 +447,10 @@ public class Pretty extends JCTree.Visitor {
         }
     }
 
-    public void visitModuleExport(JCModuleExport tree) {
+    @Override
+    public void visitExports(JCExportDirective tree) {
         try {
             print("export ");
-            for (List<Name> l = tree.flags; l.nonEmpty(); l = l.tail ) {
-                print(l.head);
-                print(" ");
-            }
             printExpr(tree.qualid);
             print(";");
         } catch (IOException e) {
@@ -450,30 +458,83 @@ public class Pretty extends JCTree.Visitor {
         }
     }
 
-    public void visitModulePermits(JCModulePermits tree) {
+    @Override
+    public void visitPermits(JCPermitsDirective tree) {
         try {
             print("permits ");
-            printExprs(tree.moduleNames);
+            printExpr(tree.moduleName);
+            print(";");
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @Override
+    public void visitProvidesModule(JCProvidesModuleDirective tree) {
+        try {
+            print("provides ");
+            printExpr(tree.moduleId);
+            print(";");
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @Override
+    public void visitProvidesService(JCProvidesServiceDirective tree) {
+        try {
+            print("provides service ");
+            printExpr(tree.serviceName);
+            print(" with ");
+            printExpr(tree.implName);
             print(";");
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
     }
 
-    public void visitModuleRequires(JCModuleRequires tree) {
+    @Override
+    public void visitRequiresModule(JCRequiresModuleDirective tree) {
         try {
             print("requires ");
-            for (List<Name> l = tree.flags; l.nonEmpty(); l = l.tail ) {
+            for (List<RequiresFlag> l = tree.flags; l.nonEmpty(); l = l.tail ) {
+                print(l.head);
+                print(" ");
+            }
+            printExpr(tree.moduleIdQuery);
+            print(";");
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @Override
+    public void visitRequiresService(JCRequiresServiceDirective tree) {
+        try {
+            print("requires service ");
+            for (List<RequiresFlag> l = tree.flags; l.nonEmpty(); l = l.tail ) {
                 print(l.head);
                 print(" ");
             }
-            printExprs(tree.moduleIds);
+            printExpr(tree.serviceName);
             print(";");
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
     }
 
+    @Override
+    public void visitView(JCViewDecl tree) {
+        try {
+            print("module ");
+            printExpr(tree.name);
+            printBlock(tree.directives);
+            println();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
     public void visitPackageDef(JCPackageDecl tree) {
         try {
             printAnnotations(tree.annots);
@@ -588,7 +649,7 @@ public class Pretty extends JCTree.Visitor {
                 print("/*public static final*/ ");
                 print(tree.name);
                 if (tree.init != null) {
-                    if (sourceOutput && tree.init.getTag() == JCTree.NEWCLASS) {
+                    if (sourceOutput && tree.init.hasTag(NEWCLASS)) {
                         print(" /*enum*/ ");
                         JCNewClass init = (JCNewClass) tree.init;
                         if (init.args != null && init.args.nonEmpty()) {
@@ -649,7 +710,7 @@ public class Pretty extends JCTree.Visitor {
             printStat(tree.body);
             align();
             print(" while ");
-            if (tree.cond.getTag() == JCTree.PARENS) {
+            if (tree.cond.hasTag(PARENS)) {
                 printExpr(tree.cond);
             } else {
                 print("(");
@@ -665,7 +726,7 @@ public class Pretty extends JCTree.Visitor {
     public void visitWhileLoop(JCWhileLoop tree) {
         try {
             print("while ");
-            if (tree.cond.getTag() == JCTree.PARENS) {
+            if (tree.cond.hasTag(PARENS)) {
                 printExpr(tree.cond);
             } else {
                 print("(");
@@ -683,7 +744,7 @@ public class Pretty extends JCTree.Visitor {
         try {
             print("for (");
             if (tree.init.nonEmpty()) {
-                if (tree.init.head.getTag() == JCTree.VARDEF) {
+                if (tree.init.head.hasTag(VARDEF)) {
                     printExpr(tree.init.head);
                     for (List<JCStatement> l = tree.init.tail; l.nonEmpty(); l = l.tail) {
                         JCVariableDecl vdef = (JCVariableDecl)l.head;
@@ -730,7 +791,7 @@ public class Pretty extends JCTree.Visitor {
     public void visitSwitch(JCSwitch tree) {
         try {
             print("switch ");
-            if (tree.selector.getTag() == JCTree.PARENS) {
+            if (tree.selector.hasTag(PARENS)) {
                 printExpr(tree.selector);
             } else {
                 print("(");
@@ -769,7 +830,7 @@ public class Pretty extends JCTree.Visitor {
     public void visitSynchronized(JCSynchronized tree) {
         try {
             print("synchronized ");
-            if (tree.lock.getTag() == JCTree.PARENS) {
+            if (tree.lock.hasTag(PARENS)) {
                 printExpr(tree.lock);
             } else {
                 print("(");
@@ -840,7 +901,7 @@ public class Pretty extends JCTree.Visitor {
     public void visitIf(JCIf tree) {
         try {
             print("if ");
-            if (tree.cond.getTag() == JCTree.PARENS) {
+            if (tree.cond.hasTag(PARENS)) {
                 printExpr(tree.cond);
             } else {
                 print("(");
@@ -927,7 +988,7 @@ public class Pretty extends JCTree.Visitor {
     public void visitApply(JCMethodInvocation tree) {
         try {
             if (!tree.typeargs.isEmpty()) {
-                if (tree.meth.getTag() == JCTree.SELECT) {
+                if (tree.meth.hasTag(SELECT)) {
                     JCFieldAccess left = (JCFieldAccess)tree.meth;
                     printExpr(left.selected);
                     print(".<");
@@ -986,7 +1047,7 @@ public class Pretty extends JCTree.Visitor {
             if (tree.elemtype != null) {
                 print("new ");
                 JCTree elem = tree.elemtype;
-                if (elem.getTag() == JCTree.TYPEARRAY)
+                if (elem.hasTag(TYPEARRAY))
                     printBaseElementType((JCArrayTypeTree) elem);
                 else
                     printExpr(elem);
@@ -1009,6 +1070,17 @@ public class Pretty extends JCTree.Visitor {
         }
     }
 
+    public void visitLambda(JCLambda tree) {
+        try {
+            print("(");
+            printExprs(tree.params);
+            print(")->");
+            printExpr(tree.body);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
     public void visitParens(JCParens tree) {
         try {
             print("(");
@@ -1031,36 +1103,36 @@ public class Pretty extends JCTree.Visitor {
         }
     }
 
-    public String operatorName(int tag) {
+    public String operatorName(JCTree.Tag tag) {
         switch(tag) {
-            case JCTree.POS:     return "+";
-            case JCTree.NEG:     return "-";
-            case JCTree.NOT:     return "!";
-            case JCTree.COMPL:   return "~";
-            case JCTree.PREINC:  return "++";
-            case JCTree.PREDEC:  return "--";
-            case JCTree.POSTINC: return "++";
-            case JCTree.POSTDEC: return "--";
-            case JCTree.NULLCHK: return "<*nullchk*>";
-            case JCTree.OR:      return "||";
-            case JCTree.AND:     return "&&";
-            case JCTree.EQ:      return "==";
-            case JCTree.NE:      return "!=";
-            case JCTree.LT:      return "<";
-            case JCTree.GT:      return ">";
-            case JCTree.LE:      return "<=";
-            case JCTree.GE:      return ">=";
-            case JCTree.BITOR:   return "|";
-            case JCTree.BITXOR:  return "^";
-            case JCTree.BITAND:  return "&";
-            case JCTree.SL:      return "<<";
-            case JCTree.SR:      return ">>";
-            case JCTree.USR:     return ">>>";
-            case JCTree.PLUS:    return "+";
-            case JCTree.MINUS:   return "-";
-            case JCTree.MUL:     return "*";
-            case JCTree.DIV:     return "/";
-            case JCTree.MOD:     return "%";
+            case POS:     return "+";
+            case NEG:     return "-";
+            case NOT:     return "!";
+            case COMPL:   return "~";
+            case PREINC:  return "++";
+            case PREDEC:  return "--";
+            case POSTINC: return "++";
+            case POSTDEC: return "--";
+            case NULLCHK: return "<*nullchk*>";
+            case OR:      return "||";
+            case AND:     return "&&";
+            case EQ:      return "==";
+            case NE:      return "!=";
+            case LT:      return "<";
+            case GT:      return ">";
+            case LE:      return "<=";
+            case GE:      return ">=";
+            case BITOR:   return "|";
+            case BITXOR:  return "^";
+            case BITAND:  return "&";
+            case SL:      return "<<";
+            case SR:      return ">>";
+            case USR:     return ">>>";
+            case PLUS:    return "+";
+            case MINUS:   return "-";
+            case MUL:     return "*";
+            case DIV:     return "/";
+            case MOD:     return "%";
             default: throw new Error();
         }
     }
@@ -1069,7 +1141,7 @@ public class Pretty extends JCTree.Visitor {
         try {
             open(prec, TreeInfo.assignopPrec);
             printExpr(tree.lhs, TreeInfo.assignopPrec + 1);
-            print(" " + operatorName(tree.getTag() - JCTree.ASGOffset) + "= ");
+            print(" " + operatorName(tree.getTag().noAssignOp()) + "= ");
             printExpr(tree.rhs, TreeInfo.assignopPrec);
             close(prec, TreeInfo.assignopPrec);
         } catch (IOException e) {
@@ -1082,7 +1154,7 @@ public class Pretty extends JCTree.Visitor {
             int ownprec = TreeInfo.opPrec(tree.getTag());
             String opname = operatorName(tree.getTag());
             open(prec, ownprec);
-            if (tree.getTag() <= JCTree.PREDEC) {
+            if (!tree.getTag().isPostUnaryOp()) {
                 print(opname);
                 printExpr(tree.arg, ownprec);
             } else {
@@ -1154,6 +1226,21 @@ public class Pretty extends JCTree.Visitor {
         }
     }
 
+    public void visitReference(JCMemberReference tree) {
+        try {
+            printExpr(tree.expr);
+            print("#");
+            if (tree.typeargs != null) {
+                print("<");
+                printExprs(tree.typeargs);
+                print(">");
+            }
+            print(tree.getMode() == ReferenceMode.INVOKE ? tree.name : "new");
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
     public void visitIdent(JCIdent tree) {
         try {
             print(tree.name);
@@ -1257,7 +1344,7 @@ public class Pretty extends JCTree.Visitor {
         while (true) {
             elem = tree.elemtype;
             print("[]");
-            if (elem.getTag() != JCTree.TYPEARRAY) break;
+            if (!elem.hasTag(TYPEARRAY)) break;
             tree = (JCArrayTypeTree) elem;
         }
     }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java
index ce34cba..86e357e 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java
@@ -272,6 +272,13 @@ public class TreeCopier<P> implements TreeVisitor<JCTree,P> {
         return M.at(t.pos).NewClass(encl, typeargs, clazz, args, def);
     }
 
+    public JCTree visitLambdaExpression(LambdaExpressionTree node, P p) {
+        JCLambda t = (JCLambda) node;
+        List<JCVariableDecl> params = copy(t.params, p);
+        JCTree body = copy(t.body, p);
+        return M.at(t.pos).Lambda(params, body);
+    }
+
     public JCTree visitParenthesized(ParenthesizedTree node, P p) {
         JCParens t = (JCParens) node;
         JCExpression expr = copy(t.expr, p);
@@ -290,6 +297,13 @@ public class TreeCopier<P> implements TreeVisitor<JCTree,P> {
         return M.at(t.pos).Select(selected, t.name);
     }
 
+    public JCTree visitMemberReference(MemberReferenceTree node, P p) {
+        JCMemberReference t = (JCMemberReference) node;
+        JCExpression expr = copy(t.expr, p);
+        List<JCExpression> typeargs = copy(t.typeargs, p);
+        return M.at(t.pos).Reference(t.mode, t.name, expr, typeargs);
+    }
+
     public JCTree visitEmptyStatement(EmptyStatementTree node, P p) {
         JCSkip t = (JCSkip) node;
         return M.at(t.pos).Skip();
@@ -402,45 +416,88 @@ public class TreeCopier<P> implements TreeVisitor<JCTree,P> {
         return M.at(t.pos).Wildcard(kind, inner);
     }
 
+    @Override
     public JCTree visitModule(ModuleTree node, P p) {
         JCModuleDecl t = (JCModuleDecl) node;
-        List<JCAnnotation> annots = copy(t.annots, p);
         JCModuleId moduleId = copy(t.id);
-        List<JCModuleId> provides = copy(t.provides);
-        List<JCModuleMetadata> metadataList = copy(t.metadata, p);
-        return M.at(t.pos).Module(annots, moduleId, provides, metadataList);
+        List<JCModuleDirective> directives = copy(t.directives);
+        return M.at(t.pos).Module(moduleId, directives, t.metadata);
     }
 
-    public JCModuleClass visitModuleClass(ModuleClassTree node, P p) {
-        JCModuleClass t = (JCModuleClass) node;
-        JCTree qualId = copy(t.qualId, p);
-        return M.at(t.pos).ModuleClass(t.flags, qualId);
+    @Override
+    public JCTree visitView(ViewDeclarationTree node, P p) {
+        JCViewDecl t = (JCViewDecl) node;
+        JCExpression name = copy(t.name);
+        List<JCModuleDirective> directives = copy(t.directives);
+        return M.at(t.pos).View(name, directives);
+    }
+
+    @Override
+    public JCEntrypointDirective visitEntrypoint(EntrypointDirectiveTree node, P p) {
+        JCEntrypointDirective t = (JCEntrypointDirective) node;
+        JCExpression qualId = copy(t.qualId, p);
+        return M.at(t.pos).Entrypoint(qualId);
     }
 
-    public JCModuleExport visitModuleExport(ModuleExportTree node, P p) {
-        JCModuleExport t = (JCModuleExport) node;
-        JCExpression qualId = (JCExpression) copy(t.qualid, p);
-        return M.at(t.pos).ModuleExport(t.flags, qualId);
+    @Override
+    public JCExportDirective visitExport(ExportDirectiveTree node, P p) {
+        JCExportDirective t = (JCExportDirective) node;
+        JCExpression qualId = copy(t.qualid, p);
+        return M.at(t.pos).Exports(qualId);
     }
 
-    public JCTree visitModuleId(ModuleIdTree node, P p) {
+    @Override
+    public JCModuleId visitModuleId(ModuleIdTree node, P p) {
         JCModuleId t = (JCModuleId) node;
         JCTree qualId = copy(t.qualId, p);
         Name version = t.version;
         return M.at(t.pos).ModuleId(qualId, version);
     }
 
-    public JCModulePermits visitModulePermits(ModulePermitsTree node, P p) {
-        JCModulePermits t = (JCModulePermits) node;
-        List<JCExpression> moduleNames = copy(t.moduleNames, p);
-        return M.at(t.pos).ModulePermits(moduleNames);
+    @Override
+    public JCModuleIdQuery visitModuleIdQuery(ModuleIdQueryTree node, P p) {
+        JCModuleIdQuery t = (JCModuleIdQuery) node;
+        JCTree qualId = copy(t.qualId, p);
+        Name versionQuery = t.versionQuery;
+        return M.at(t.pos).ModuleIdQuery(qualId, versionQuery);
+    }
+
+    @Override
+    public JCPermitsDirective visitPermits(PermitsDirectiveTree node, P p) {
+        JCPermitsDirective t = (JCPermitsDirective) node;
+        JCExpression moduleName = copy(t.moduleName, p);
+        return M.at(t.pos).Permits(moduleName);
+    }
+
+    @Override
+    public JCProvidesModuleDirective visitProvidesModule(ProvidesModuleDirectiveTree node, P p) {
+        JCProvidesModuleDirective t = (JCProvidesModuleDirective) node;
+        JCModuleId moduleId = copy(t.moduleId, p);
+        return M.at(t.pos).ProvidesModule(moduleId);
+    }
+
+    @Override
+    public JCProvidesServiceDirective visitProvidesService(ProvidesServiceDirectiveTree node, P p) {
+        JCProvidesServiceDirective t = (JCProvidesServiceDirective) node;
+        JCExpression serviceName = copy(t.serviceName, p);
+        JCExpression implName = copy(t.implName, p);
+        return M.at(t.pos).ProvidesService(serviceName, implName);
+    }
+
+    @Override
+    public JCRequiresModuleDirective visitRequiresModule(RequiresModuleDirectiveTree node, P p) {
+        JCRequiresModuleDirective t = (JCRequiresModuleDirective) node;
+        List<RequiresFlag> flags = t.flags;
+        JCModuleIdQuery moduleIdQuery = copy(t.moduleIdQuery, p);
+        return M.at(t.pos).RequiresModule(flags, moduleIdQuery);
     }
 
-    public JCModuleRequires visitModuleRequires(ModuleRequiresTree node, P p) {
-        JCModuleRequires t = (JCModuleRequires) node;
-        List<Name> flags = t.flags;
-        List<JCModuleId> moduleIds = copy(t.moduleIds, p);
-        return M.at(t.pos).ModuleRequires(flags, moduleIds);
+    @Override
+    public JCRequiresServiceDirective visitRequiresService(RequiresServiceDirectiveTree node, P p) {
+        JCRequiresServiceDirective t = (JCRequiresServiceDirective) node;
+        List<RequiresFlag> flags = t.flags;
+        JCExpression serviceName = copy(t.serviceName, p);
+        return M.at(t.pos).RequiresService(flags, serviceName);
     }
 
     public JCTree visitPackage(PackageTree node, P p) {
@@ -453,7 +510,7 @@ public class TreeCopier<P> implements TreeVisitor<JCTree,P> {
     public JCTree visitOther(Tree node, P p) {
         JCTree tree = (JCTree) node;
         switch (tree.getTag()) {
-            case JCTree.LETEXPR: {
+            case LETEXPR: {
                 LetExpr t = (LetExpr) node;
                 List<JCVariableDecl> defs = copy(t.defs, p);
                 JCTree expr = copy(t.expr, p);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
index 71d00d8..3e0cc17 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
@@ -28,14 +28,17 @@ package com.sun.tools.javac.tree;
 import com.sun.source.tree.Tree;
 import com.sun.tools.javac.comp.AttrContext;
 import com.sun.tools.javac.comp.Env;
-import java.util.Map;
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 import com.sun.tools.javac.code.*;
+import com.sun.tools.javac.parser.EndPosTable;
 import com.sun.tools.javac.tree.JCTree.*;
 
 import javax.tools.JavaFileObject;
 import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.BLOCK;
+import static com.sun.tools.javac.tree.JCTree.Tag.SYNCHRONIZED;
 
 /** Utility class containing inspector methods for trees.
  *
@@ -57,53 +60,60 @@ public class TreeInfo {
 
     /** The names of all operators.
      */
-    private Name[] opname = new Name[JCTree.MOD - JCTree.POS + 1];
+    private Name[] opname = new Name[Tag.getNumberOfOperators()];
+
+    private void setOpname(Tag tag, String name, Names names) {
+         setOpname(tag, names.fromString(name));
+     }
+     private void setOpname(Tag tag, Name name) {
+         opname[tag.operatorIndex()] = name;
+     }
 
     private TreeInfo(Context context) {
         context.put(treeInfoKey, this);
 
         Names names = Names.instance(context);
-        opname[JCTree.POS     - JCTree.POS] = names.fromString("+");
-        opname[JCTree.NEG     - JCTree.POS] = names.hyphen;
-        opname[JCTree.NOT     - JCTree.POS] = names.fromString("!");
-        opname[JCTree.COMPL   - JCTree.POS] = names.fromString("~");
-        opname[JCTree.PREINC  - JCTree.POS] = names.fromString("++");
-        opname[JCTree.PREDEC  - JCTree.POS] = names.fromString("--");
-        opname[JCTree.POSTINC - JCTree.POS] = names.fromString("++");
-        opname[JCTree.POSTDEC - JCTree.POS] = names.fromString("--");
-        opname[JCTree.NULLCHK - JCTree.POS] = names.fromString("<*nullchk*>");
-        opname[JCTree.OR      - JCTree.POS] = names.fromString("||");
-        opname[JCTree.AND     - JCTree.POS] = names.fromString("&&");
-        opname[JCTree.EQ      - JCTree.POS] = names.fromString("==");
-        opname[JCTree.NE      - JCTree.POS] = names.fromString("!=");
-        opname[JCTree.LT      - JCTree.POS] = names.fromString("<");
-        opname[JCTree.GT      - JCTree.POS] = names.fromString(">");
-        opname[JCTree.LE      - JCTree.POS] = names.fromString("<=");
-        opname[JCTree.GE      - JCTree.POS] = names.fromString(">=");
-        opname[JCTree.BITOR   - JCTree.POS] = names.fromString("|");
-        opname[JCTree.BITXOR  - JCTree.POS] = names.fromString("^");
-        opname[JCTree.BITAND  - JCTree.POS] = names.fromString("&");
-        opname[JCTree.SL      - JCTree.POS] = names.fromString("<<");
-        opname[JCTree.SR      - JCTree.POS] = names.fromString(">>");
-        opname[JCTree.USR     - JCTree.POS] = names.fromString(">>>");
-        opname[JCTree.PLUS    - JCTree.POS] = names.fromString("+");
-        opname[JCTree.MINUS   - JCTree.POS] = names.hyphen;
-        opname[JCTree.MUL     - JCTree.POS] = names.asterisk;
-        opname[JCTree.DIV     - JCTree.POS] = names.slash;
-        opname[JCTree.MOD     - JCTree.POS] = names.fromString("%");
+        setOpname(POS, "+", names);
+        setOpname(NEG, names.hyphen);
+        setOpname(NOT, "!", names);
+        setOpname(COMPL, "~", names);
+        setOpname(PREINC, "++", names);
+        setOpname(PREDEC, "--", names);
+        setOpname(POSTINC, "++", names);
+        setOpname(POSTDEC, "--", names);
+        setOpname(NULLCHK, "<*nullchk*>", names);
+        setOpname(OR, "||", names);
+        setOpname(AND, "&&", names);
+        setOpname(EQ, "==", names);
+        setOpname(NE, "!=", names);
+        setOpname(LT, "<", names);
+        setOpname(GT, ">", names);
+        setOpname(LE, "<=", names);
+        setOpname(GE, ">=", names);
+        setOpname(BITOR, "|", names);
+        setOpname(BITXOR, "^", names);
+        setOpname(BITAND, "&", names);
+        setOpname(SL, "<<", names);
+        setOpname(SR, ">>", names);
+        setOpname(USR, ">>>", names);
+        setOpname(PLUS, "+", names);
+        setOpname(MINUS, names.hyphen);
+        setOpname(MUL, names.asterisk);
+        setOpname(DIV, names.slash);
+        setOpname(MOD, "%", names);
     }
 
 
     /** Return name of operator with given tree tag.
      */
-    public Name operatorName(int tag) {
-        return opname[tag - JCTree.POS];
+    public Name operatorName(JCTree.Tag tag) {
+        return opname[tag.operatorIndex()];
     }
 
     /** Is tree a constructor declaration?
      */
     public static boolean isConstructor(JCTree tree) {
-        if (tree.getTag() == JCTree.METHODDEF) {
+        if (tree.hasTag(METHODDEF)) {
             Name name = ((JCMethodDecl) tree).name;
             return name == name.table.names.init;
         } else {
@@ -120,17 +130,17 @@ public class TreeInfo {
     }
 
     public static boolean isMultiCatch(JCCatch catchClause) {
-        return catchClause.param.vartype.getTag() == JCTree.TYPEUNION;
+        return catchClause.param.vartype.hasTag(TYPEUNION);
     }
 
     /** Is statement an initializer for a synthetic field?
      */
     public static boolean isSyntheticInit(JCTree stat) {
-        if (stat.getTag() == JCTree.EXEC) {
+        if (stat.hasTag(EXEC)) {
             JCExpressionStatement exec = (JCExpressionStatement)stat;
-            if (exec.expr.getTag() == JCTree.ASSIGN) {
+            if (exec.expr.hasTag(ASSIGN)) {
                 JCAssign assign = (JCAssign)exec.expr;
-                if (assign.lhs.getTag() == JCTree.SELECT) {
+                if (assign.lhs.hasTag(SELECT)) {
                     JCFieldAccess select = (JCFieldAccess)assign.lhs;
                     if (select.sym != null &&
                         (select.sym.flags() & SYNTHETIC) != 0) {
@@ -147,9 +157,9 @@ public class TreeInfo {
     /** If the expression is a method call, return the method name, null
      *  otherwise. */
     public static Name calledMethodName(JCTree tree) {
-        if (tree.getTag() == JCTree.EXEC) {
+        if (tree.hasTag(EXEC)) {
             JCExpressionStatement exec = (JCExpressionStatement)tree;
-            if (exec.expr.getTag() == JCTree.APPLY) {
+            if (exec.expr.hasTag(APPLY)) {
                 Name mname = TreeInfo.name(((JCMethodInvocation) exec.expr).meth);
                 return mname;
             }
@@ -193,7 +203,7 @@ public class TreeInfo {
 
     /** Return the first call in a constructor definition. */
     public static JCMethodInvocation firstConstructorCall(JCTree tree) {
-        if (tree.getTag() != JCTree.METHODDEF) return null;
+        if (!tree.hasTag(METHODDEF)) return null;
         JCMethodDecl md = (JCMethodDecl) tree;
         Names names = md.name.table.names;
         if (md.name != names.init) return null;
@@ -203,24 +213,52 @@ public class TreeInfo {
         while (stats.nonEmpty() && isSyntheticInit(stats.head))
             stats = stats.tail;
         if (stats.isEmpty()) return null;
-        if (stats.head.getTag() != JCTree.EXEC) return null;
+        if (!stats.head.hasTag(EXEC)) return null;
         JCExpressionStatement exec = (JCExpressionStatement) stats.head;
-        if (exec.expr.getTag() != JCTree.APPLY) return null;
+        if (!exec.expr.hasTag(APPLY)) return null;
         return (JCMethodInvocation)exec.expr;
     }
 
     /** Return true if a tree represents a diamond new expr. */
     public static boolean isDiamond(JCTree tree) {
         switch(tree.getTag()) {
-            case JCTree.TYPEAPPLY: return ((JCTypeApply)tree).getTypeArguments().isEmpty();
-            case JCTree.NEWCLASS: return isDiamond(((JCNewClass)tree).clazz);
+            case TYPEAPPLY: return ((JCTypeApply)tree).getTypeArguments().isEmpty();
+            case NEWCLASS: return isDiamond(((JCNewClass)tree).clazz);
             default: return false;
         }
     }
 
+    /**
+     * Return true if the AST corresponds to a static select of the kind A.B
+     */
+    public static boolean isStaticSelector(JCTree base, Names names) {
+        if (base == null)
+            return false;
+        switch (base.getTag()) {
+            case IDENT:
+                JCIdent id = (JCIdent)base;
+                return id.name != names._this &&
+                        id.name != names._super &&
+                        isStaticSym(base);
+            case SELECT:
+                return isStaticSym(base) &&
+                    isStaticSelector(((JCFieldAccess)base).selected, names);
+            case TYPEAPPLY:
+                return true;
+            default:
+                return false;
+        }
+    }
+    //where
+        private static boolean isStaticSym(JCTree tree) {
+            Symbol sym = symbol(tree);
+            return (sym.kind == Kinds.TYP ||
+                    sym.kind == Kinds.PCK);
+        }
+
     /** Return true if a tree represents the null literal. */
     public static boolean isNull(JCTree tree) {
-        if (tree.getTag() != JCTree.LITERAL)
+        if (!tree.hasTag(LITERAL))
             return false;
         JCLiteral lit = (JCLiteral) tree;
         return (lit.typetag == TypeTags.BOT);
@@ -230,7 +268,7 @@ public class TreeInfo {
      *  the block itself if it is empty.
      */
     public static int firstStatPos(JCTree tree) {
-        if (tree.getTag() == JCTree.BLOCK && ((JCBlock) tree).stats.nonEmpty())
+        if (tree.hasTag(BLOCK) && ((JCBlock) tree).stats.nonEmpty())
             return ((JCBlock) tree).stats.head.pos;
         else
             return tree.pos;
@@ -240,11 +278,11 @@ public class TreeInfo {
      *  defined endpos.
      */
     public static int endPos(JCTree tree) {
-        if (tree.getTag() == JCTree.BLOCK && ((JCBlock) tree).endpos != Position.NOPOS)
+        if (tree.hasTag(BLOCK) && ((JCBlock) tree).endpos != Position.NOPOS)
             return ((JCBlock) tree).endpos;
-        else if (tree.getTag() == JCTree.SYNCHRONIZED)
+        else if (tree.hasTag(SYNCHRONIZED))
             return endPos(((JCSynchronized) tree).body);
-        else if (tree.getTag() == JCTree.TRY) {
+        else if (tree.hasTag(TRY)) {
             JCTry t = (JCTry) tree;
             return endPos((t.finalizer != null)
                           ? t.finalizer
@@ -264,172 +302,172 @@ public class TreeInfo {
             return Position.NOPOS;
 
         switch(tree.getTag()) {
-        case(JCTree.APPLY):
-            return getStartPos(((JCMethodInvocation) tree).meth);
-        case(JCTree.ASSIGN):
-            return getStartPos(((JCAssign) tree).lhs);
-        case(JCTree.BITOR_ASG): case(JCTree.BITXOR_ASG): case(JCTree.BITAND_ASG):
-        case(JCTree.SL_ASG): case(JCTree.SR_ASG): case(JCTree.USR_ASG):
-        case(JCTree.PLUS_ASG): case(JCTree.MINUS_ASG): case(JCTree.MUL_ASG):
-        case(JCTree.DIV_ASG): case(JCTree.MOD_ASG):
-            return getStartPos(((JCAssignOp) tree).lhs);
-        case(JCTree.OR): case(JCTree.AND): case(JCTree.BITOR):
-        case(JCTree.BITXOR): case(JCTree.BITAND): case(JCTree.EQ):
-        case(JCTree.NE): case(JCTree.LT): case(JCTree.GT):
-        case(JCTree.LE): case(JCTree.GE): case(JCTree.SL):
-        case(JCTree.SR): case(JCTree.USR): case(JCTree.PLUS):
-        case(JCTree.MINUS): case(JCTree.MUL): case(JCTree.DIV):
-        case(JCTree.MOD):
-            return getStartPos(((JCBinary) tree).lhs);
-        case(JCTree.CLASSDEF): {
-            JCClassDecl node = (JCClassDecl)tree;
-            if (node.mods.pos != Position.NOPOS)
-                return node.mods.pos;
-            break;
-        }
-        case(JCTree.CONDEXPR):
-            return getStartPos(((JCConditional) tree).cond);
-        case(JCTree.EXEC):
-            return getStartPos(((JCExpressionStatement) tree).expr);
-        case(JCTree.INDEXED):
-            return getStartPos(((JCArrayAccess) tree).indexed);
-        case(JCTree.METHODDEF): {
-            JCMethodDecl node = (JCMethodDecl)tree;
-            if (node.mods.pos != Position.NOPOS)
-                return node.mods.pos;
-            if (node.typarams.nonEmpty()) // List.nil() used for no typarams
-                return getStartPos(node.typarams.head);
-            return node.restype == null ? node.pos : getStartPos(node.restype);
-        }
-        case(JCTree.SELECT):
-            return getStartPos(((JCFieldAccess) tree).selected);
-        case(JCTree.TYPEAPPLY):
-            return getStartPos(((JCTypeApply) tree).clazz);
-        case(JCTree.TYPEARRAY):
-            return getStartPos(((JCArrayTypeTree) tree).elemtype);
-        case(JCTree.TYPETEST):
-            return getStartPos(((JCInstanceOf) tree).expr);
-        case(JCTree.POSTINC):
-        case(JCTree.POSTDEC):
-            return getStartPos(((JCUnary) tree).arg);
-        case(JCTree.NEWCLASS): {
-            JCNewClass node = (JCNewClass)tree;
-            if (node.encl != null)
-                return getStartPos(node.encl);
-            break;
-        }
-        case(JCTree.VARDEF): {
-            JCVariableDecl node = (JCVariableDecl)tree;
-            if (node.mods.pos != Position.NOPOS) {
-                return node.mods.pos;
-            } else {
-                return getStartPos(node.vartype);
+            case APPLY:
+                return getStartPos(((JCMethodInvocation) tree).meth);
+            case ASSIGN:
+                return getStartPos(((JCAssign) tree).lhs);
+            case BITOR_ASG: case BITXOR_ASG: case BITAND_ASG:
+            case SL_ASG: case SR_ASG: case USR_ASG:
+            case PLUS_ASG: case MINUS_ASG: case MUL_ASG:
+            case DIV_ASG: case MOD_ASG:
+                return getStartPos(((JCAssignOp) tree).lhs);
+            case OR: case AND: case BITOR:
+            case BITXOR: case BITAND: case EQ:
+            case NE: case LT: case GT:
+            case LE: case GE: case SL:
+            case SR: case USR: case PLUS:
+            case MINUS: case MUL: case DIV:
+            case MOD:
+                return getStartPos(((JCBinary) tree).lhs);
+            case CLASSDEF: {
+                JCClassDecl node = (JCClassDecl)tree;
+                if (node.mods.pos != Position.NOPOS)
+                    return node.mods.pos;
+                break;
             }
-        }
-        case(JCTree.PACKAGE): {
+            case CONDEXPR:
+                return getStartPos(((JCConditional) tree).cond);
+            case EXEC:
+                return getStartPos(((JCExpressionStatement) tree).expr);
+            case INDEXED:
+                return getStartPos(((JCArrayAccess) tree).indexed);
+            case METHODDEF: {
+                JCMethodDecl node = (JCMethodDecl)tree;
+                if (node.mods.pos != Position.NOPOS)
+                    return node.mods.pos;
+                if (node.typarams.nonEmpty()) // List.nil() used for no typarams
+                    return getStartPos(node.typarams.head);
+                return node.restype == null ? node.pos : getStartPos(node.restype);
+            }
+            case SELECT:
+                return getStartPos(((JCFieldAccess) tree).selected);
+            case TYPEAPPLY:
+                return getStartPos(((JCTypeApply) tree).clazz);
+            case TYPEARRAY:
+                return getStartPos(((JCArrayTypeTree) tree).elemtype);
+            case TYPETEST:
+                return getStartPos(((JCInstanceOf) tree).expr);
+            case POSTINC:
+            case POSTDEC:
+                return getStartPos(((JCUnary) tree).arg);
+            case NEWCLASS: {
+                JCNewClass node = (JCNewClass)tree;
+                if (node.encl != null)
+                    return getStartPos(node.encl);
+                break;
+            }
+            case VARDEF: {
+                JCVariableDecl node = (JCVariableDecl)tree;
+                if (node.mods.pos != Position.NOPOS) {
+                    return node.mods.pos;
+                } else {
+                    return getStartPos(node.vartype);
+                }
+            }
+        case PACKAGE: {
             JCPackageDecl node = (JCPackageDecl)tree;
             if (node.annots.nonEmpty())
                 return getStartPos(node.annots.head);
             break;
         }
-        case(JCTree.MODULE_ID): {
+        case MODULE_ID: {
             JCModuleId node = (JCModuleId)tree;
             return getStartPos(node.qualId);
         }
-        case(JCTree.ERRONEOUS): {
-            JCErroneous node = (JCErroneous)tree;
-            if (node.errs != null && node.errs.nonEmpty())
-                return getStartPos(node.errs.head);
-        }
+            case ERRONEOUS: {
+                JCErroneous node = (JCErroneous)tree;
+                if (node.errs != null && node.errs.nonEmpty())
+                    return getStartPos(node.errs.head);
+            }
         }
         return tree.pos;
     }
 
     /** The end position of given tree, given  a table of end positions generated by the parser
      */
-    public static int getEndPos(JCTree tree, Map<JCTree, Integer> endPositions) {
+    public static int getEndPos(JCTree tree, EndPosTable endPosTable) {
         if (tree == null)
             return Position.NOPOS;
 
-        if (endPositions == null) {
+        if (endPosTable == null) {
             // fall back on limited info in the tree
             return endPos(tree);
         }
 
-        Integer mapPos = endPositions.get(tree);
-        if (mapPos != null)
+        int mapPos = endPosTable.getEndPos(tree);
+        if (mapPos != Position.NOPOS)
             return mapPos;
 
         switch(tree.getTag()) {
-        case(JCTree.BITOR_ASG): case(JCTree.BITXOR_ASG): case(JCTree.BITAND_ASG):
-        case(JCTree.SL_ASG): case(JCTree.SR_ASG): case(JCTree.USR_ASG):
-        case(JCTree.PLUS_ASG): case(JCTree.MINUS_ASG): case(JCTree.MUL_ASG):
-        case(JCTree.DIV_ASG): case(JCTree.MOD_ASG):
-            return getEndPos(((JCAssignOp) tree).rhs, endPositions);
-        case(JCTree.OR): case(JCTree.AND): case(JCTree.BITOR):
-        case(JCTree.BITXOR): case(JCTree.BITAND): case(JCTree.EQ):
-        case(JCTree.NE): case(JCTree.LT): case(JCTree.GT):
-        case(JCTree.LE): case(JCTree.GE): case(JCTree.SL):
-        case(JCTree.SR): case(JCTree.USR): case(JCTree.PLUS):
-        case(JCTree.MINUS): case(JCTree.MUL): case(JCTree.DIV):
-        case(JCTree.MOD):
-            return getEndPos(((JCBinary) tree).rhs, endPositions);
-        case(JCTree.CASE):
-            return getEndPos(((JCCase) tree).stats.last(), endPositions);
-        case(JCTree.CATCH):
-            return getEndPos(((JCCatch) tree).body, endPositions);
-        case(JCTree.CONDEXPR):
-            return getEndPos(((JCConditional) tree).falsepart, endPositions);
-        case(JCTree.FORLOOP):
-            return getEndPos(((JCForLoop) tree).body, endPositions);
-        case(JCTree.FOREACHLOOP):
-            return getEndPos(((JCEnhancedForLoop) tree).body, endPositions);
-        case(JCTree.IF): {
-            JCIf node = (JCIf)tree;
-            if (node.elsepart == null) {
-                return getEndPos(node.thenpart, endPositions);
-            } else {
-                return getEndPos(node.elsepart, endPositions);
+            case BITOR_ASG: case BITXOR_ASG: case BITAND_ASG:
+            case SL_ASG: case SR_ASG: case USR_ASG:
+            case PLUS_ASG: case MINUS_ASG: case MUL_ASG:
+            case DIV_ASG: case MOD_ASG:
+                return getEndPos(((JCAssignOp) tree).rhs, endPosTable);
+            case OR: case AND: case BITOR:
+            case BITXOR: case BITAND: case EQ:
+            case NE: case LT: case GT:
+            case LE: case GE: case SL:
+            case SR: case USR: case PLUS:
+            case MINUS: case MUL: case DIV:
+            case MOD:
+                return getEndPos(((JCBinary) tree).rhs, endPosTable);
+            case CASE:
+                return getEndPos(((JCCase) tree).stats.last(), endPosTable);
+            case CATCH:
+                return getEndPos(((JCCatch) tree).body, endPosTable);
+            case CONDEXPR:
+                return getEndPos(((JCConditional) tree).falsepart, endPosTable);
+            case FORLOOP:
+                return getEndPos(((JCForLoop) tree).body, endPosTable);
+            case FOREACHLOOP:
+                return getEndPos(((JCEnhancedForLoop) tree).body, endPosTable);
+            case IF: {
+                JCIf node = (JCIf)tree;
+                if (node.elsepart == null) {
+                    return getEndPos(node.thenpart, endPosTable);
+                } else {
+                    return getEndPos(node.elsepart, endPosTable);
+                }
             }
-        }
-        case(JCTree.LABELLED):
-            return getEndPos(((JCLabeledStatement) tree).body, endPositions);
-        case(JCTree.MODIFIERS):
-            return getEndPos(((JCModifiers) tree).annotations.last(), endPositions);
-        case(JCTree.SYNCHRONIZED):
-            return getEndPos(((JCSynchronized) tree).body, endPositions);
-        case(JCTree.TOPLEVEL):
-            return getEndPos(((JCCompilationUnit) tree).defs.last(), endPositions);
-        case(JCTree.TRY): {
-            JCTry node = (JCTry)tree;
-            if (node.finalizer != null) {
-                return getEndPos(node.finalizer, endPositions);
-            } else if (!node.catchers.isEmpty()) {
-                return getEndPos(node.catchers.last(), endPositions);
-            } else {
-                return getEndPos(node.body, endPositions);
+            case LABELLED:
+                return getEndPos(((JCLabeledStatement) tree).body, endPosTable);
+            case MODIFIERS:
+                return getEndPos(((JCModifiers) tree).annotations.last(), endPosTable);
+            case SYNCHRONIZED:
+                return getEndPos(((JCSynchronized) tree).body, endPosTable);
+            case TOPLEVEL:
+                return getEndPos(((JCCompilationUnit) tree).defs.last(), endPosTable);
+            case TRY: {
+                JCTry node = (JCTry)tree;
+                if (node.finalizer != null) {
+                    return getEndPos(node.finalizer, endPosTable);
+                } else if (!node.catchers.isEmpty()) {
+                    return getEndPos(node.catchers.last(), endPosTable);
+                } else {
+                    return getEndPos(node.body, endPosTable);
+                }
+            }
+            case WILDCARD:
+                return getEndPos(((JCWildcard) tree).inner, endPosTable);
+            case TYPECAST:
+                return getEndPos(((JCTypeCast) tree).expr, endPosTable);
+            case TYPETEST:
+                return getEndPos(((JCInstanceOf) tree).clazz, endPosTable);
+            case POS:
+            case NEG:
+            case NOT:
+            case COMPL:
+            case PREINC:
+            case PREDEC:
+                return getEndPos(((JCUnary) tree).arg, endPosTable);
+            case WHILELOOP:
+                return getEndPos(((JCWhileLoop) tree).body, endPosTable);
+            case ERRONEOUS: {
+                JCErroneous node = (JCErroneous)tree;
+                if (node.errs != null && node.errs.nonEmpty())
+                    return getEndPos(node.errs.last(), endPosTable);
             }
-        }
-        case(JCTree.WILDCARD):
-            return getEndPos(((JCWildcard) tree).inner, endPositions);
-        case(JCTree.TYPECAST):
-            return getEndPos(((JCTypeCast) tree).expr, endPositions);
-        case(JCTree.TYPETEST):
-            return getEndPos(((JCInstanceOf) tree).clazz, endPositions);
-        case(JCTree.POS):
-        case(JCTree.NEG):
-        case(JCTree.NOT):
-        case(JCTree.COMPL):
-        case(JCTree.PREINC):
-        case(JCTree.PREDEC):
-            return getEndPos(((JCUnary) tree).arg, endPositions);
-        case(JCTree.WHILELOOP):
-            return getEndPos(((JCWhileLoop) tree).body, endPositions);
-        case(JCTree.ERRONEOUS): {
-            JCErroneous node = (JCErroneous)tree;
-            if (node.errs != null && node.errs.nonEmpty())
-                return getEndPos(node.errs.last(), endPositions);
-        }
         }
         return Position.NOPOS;
     }
@@ -445,7 +483,7 @@ public class TreeInfo {
             public JCTree getTree() { return tree; }
             public int getStartPosition() { return TreeInfo.getStartPos(tree); }
             public int getPreferredPosition() { return endPos; }
-            public int getEndPosition(Map<JCTree, Integer> endPosTable) {
+            public int getEndPosition(EndPosTable endPosTable) {
                 return TreeInfo.getEndPos(tree, endPosTable);
             }
         };
@@ -454,11 +492,11 @@ public class TreeInfo {
     /** The position of the finalizer of given try/synchronized statement.
      */
     public static int finalizerPos(JCTree tree) {
-        if (tree.getTag() == JCTree.TRY) {
+        if (tree.hasTag(TRY)) {
             JCTry t = (JCTry) tree;
             Assert.checkNonNull(t.finalizer);
             return firstStatPos(t.finalizer);
-        } else if (tree.getTag() == JCTree.SYNCHRONIZED) {
+        } else if (tree.hasTag(SYNCHRONIZED)) {
             return endPos(((JCSynchronized) tree).body);
         } else {
             throw new AssertionError();
@@ -509,6 +547,7 @@ public class TreeInfo {
                 if (that.sym == sym) result = that;
                 else super.visitVarDef(that);
             }
+            @Override
             public void visitTypeParameter(JCTypeParameter that) {
                 if (that.type != null && that.type.tsym == sym) result = that;
                 else super.visitTypeParameter(that);
@@ -564,9 +603,9 @@ public class TreeInfo {
     public static JCTree referencedStatement(JCLabeledStatement tree) {
         JCTree t = tree;
         do t = ((JCLabeledStatement) t).body;
-        while (t.getTag() == JCTree.LABELLED);
+        while (t.hasTag(LABELLED));
         switch (t.getTag()) {
-        case JCTree.DOLOOP: case JCTree.WHILELOOP: case JCTree.FORLOOP: case JCTree.FOREACHLOOP: case JCTree.SWITCH:
+        case DOLOOP: case WHILELOOP: case FORLOOP: case FOREACHLOOP: case SWITCH:
             return t;
         default:
             return tree;
@@ -576,7 +615,7 @@ public class TreeInfo {
     /** Skip parens and return the enclosed expression
      */
     public static JCExpression skipParens(JCExpression tree) {
-        while (tree.getTag() == JCTree.PARENS) {
+        while (tree.hasTag(PARENS)) {
             tree = ((JCParens) tree).expr;
         }
         return tree;
@@ -585,7 +624,7 @@ public class TreeInfo {
     /** Skip parens and return the enclosed expression
      */
     public static JCTree skipParens(JCTree tree) {
-        if (tree.getTag() == JCTree.PARENS)
+        if (tree.hasTag(PARENS))
             return skipParens((JCParens)tree);
         else
             return tree;
@@ -605,11 +644,11 @@ public class TreeInfo {
      */
     public static Name name(JCTree tree) {
         switch (tree.getTag()) {
-        case JCTree.IDENT:
+        case IDENT:
             return ((JCIdent) tree).name;
-        case JCTree.SELECT:
+        case SELECT:
             return ((JCFieldAccess) tree).name;
-        case JCTree.TYPEAPPLY:
+        case TYPEAPPLY:
             return name(((JCTypeApply) tree).clazz);
         default:
             return null;
@@ -622,9 +661,9 @@ public class TreeInfo {
     public static Name fullName(JCTree tree) {
         tree = skipParens(tree);
         switch (tree.getTag()) {
-        case JCTree.IDENT:
+        case IDENT:
             return ((JCIdent) tree).name;
-        case JCTree.SELECT:
+        case SELECT:
             Name sname = fullName(((JCFieldAccess) tree).selected);
             return sname == null ? null : sname.append('.', name(tree));
         default:
@@ -635,11 +674,11 @@ public class TreeInfo {
     public static Symbol symbolFor(JCTree node) {
         node = skipParens(node);
         switch (node.getTag()) {
-        case JCTree.CLASSDEF:
+        case CLASSDEF:
             return ((JCClassDecl) node).sym;
-        case JCTree.METHODDEF:
+        case METHODDEF:
             return ((JCMethodDecl) node).sym;
-        case JCTree.VARDEF:
+        case VARDEF:
             return ((JCVariableDecl) node).sym;
         default:
             return null;
@@ -649,9 +688,9 @@ public class TreeInfo {
     public static boolean isDeclaration(JCTree node) {
         node = skipParens(node);
         switch (node.getTag()) {
-        case JCTree.CLASSDEF:
-        case JCTree.METHODDEF:
-        case JCTree.VARDEF:
+        case CLASSDEF:
+        case METHODDEF:
+        case VARDEF:
             return true;
         default:
             return false;
@@ -664,11 +703,11 @@ public class TreeInfo {
     public static Symbol symbol(JCTree tree) {
         tree = skipParens(tree);
         switch (tree.getTag()) {
-        case JCTree.IDENT:
+        case IDENT:
             return ((JCIdent) tree).sym;
-        case JCTree.SELECT:
+        case SELECT:
             return ((JCFieldAccess) tree).sym;
-        case JCTree.TYPEAPPLY:
+        case TYPEAPPLY:
             return symbol(((JCTypeApply) tree).clazz);
         default:
             return null;
@@ -678,7 +717,7 @@ public class TreeInfo {
     /** Return true if this is a nonstatic selection. */
     public static boolean nonstaticSelect(JCTree tree) {
         tree = skipParens(tree);
-        if (tree.getTag() != JCTree.SELECT) return false;
+        if (!tree.hasTag(SELECT)) return false;
         JCFieldAccess s = (JCFieldAccess) tree;
         Symbol e = symbol(s.selected);
         return e == null || (e.kind != Kinds.PCK && e.kind != Kinds.TYP);
@@ -689,9 +728,9 @@ public class TreeInfo {
     public static void setSymbol(JCTree tree, Symbol sym) {
         tree = skipParens(tree);
         switch (tree.getTag()) {
-        case JCTree.IDENT:
+        case IDENT:
             ((JCIdent) tree).sym = sym; break;
-        case JCTree.SELECT:
+        case SELECT:
             ((JCFieldAccess) tree).sym = sym; break;
         default:
         }
@@ -702,13 +741,13 @@ public class TreeInfo {
      */
     public static long flags(JCTree tree) {
         switch (tree.getTag()) {
-        case JCTree.VARDEF:
+        case VARDEF:
             return ((JCVariableDecl) tree).mods.flags;
-        case JCTree.METHODDEF:
+        case METHODDEF:
             return ((JCMethodDecl) tree).mods.flags;
-        case JCTree.CLASSDEF:
+        case CLASSDEF:
             return ((JCClassDecl) tree).mods.flags;
-        case JCTree.BLOCK:
+        case BLOCK:
             return ((JCBlock) tree).flags;
         default:
             return 0;
@@ -756,155 +795,155 @@ public class TreeInfo {
 
     /** Map operators to their precedence levels.
      */
-    public static int opPrec(int op) {
+    public static int opPrec(JCTree.Tag op) {
         switch(op) {
-        case JCTree.POS:
-        case JCTree.NEG:
-        case JCTree.NOT:
-        case JCTree.COMPL:
-        case JCTree.PREINC:
-        case JCTree.PREDEC: return prefixPrec;
-        case JCTree.POSTINC:
-        case JCTree.POSTDEC:
-        case JCTree.NULLCHK: return postfixPrec;
-        case JCTree.ASSIGN: return assignPrec;
-        case JCTree.BITOR_ASG:
-        case JCTree.BITXOR_ASG:
-        case JCTree.BITAND_ASG:
-        case JCTree.SL_ASG:
-        case JCTree.SR_ASG:
-        case JCTree.USR_ASG:
-        case JCTree.PLUS_ASG:
-        case JCTree.MINUS_ASG:
-        case JCTree.MUL_ASG:
-        case JCTree.DIV_ASG:
-        case JCTree.MOD_ASG: return assignopPrec;
-        case JCTree.OR: return orPrec;
-        case JCTree.AND: return andPrec;
-        case JCTree.EQ:
-        case JCTree.NE: return eqPrec;
-        case JCTree.LT:
-        case JCTree.GT:
-        case JCTree.LE:
-        case JCTree.GE: return ordPrec;
-        case JCTree.BITOR: return bitorPrec;
-        case JCTree.BITXOR: return bitxorPrec;
-        case JCTree.BITAND: return bitandPrec;
-        case JCTree.SL:
-        case JCTree.SR:
-        case JCTree.USR: return shiftPrec;
-        case JCTree.PLUS:
-        case JCTree.MINUS: return addPrec;
-        case JCTree.MUL:
-        case JCTree.DIV:
-        case JCTree.MOD: return mulPrec;
-        case JCTree.TYPETEST: return ordPrec;
+        case POS:
+        case NEG:
+        case NOT:
+        case COMPL:
+        case PREINC:
+        case PREDEC: return prefixPrec;
+        case POSTINC:
+        case POSTDEC:
+        case NULLCHK: return postfixPrec;
+        case ASSIGN: return assignPrec;
+        case BITOR_ASG:
+        case BITXOR_ASG:
+        case BITAND_ASG:
+        case SL_ASG:
+        case SR_ASG:
+        case USR_ASG:
+        case PLUS_ASG:
+        case MINUS_ASG:
+        case MUL_ASG:
+        case DIV_ASG:
+        case MOD_ASG: return assignopPrec;
+        case OR: return orPrec;
+        case AND: return andPrec;
+        case EQ:
+        case NE: return eqPrec;
+        case LT:
+        case GT:
+        case LE:
+        case GE: return ordPrec;
+        case BITOR: return bitorPrec;
+        case BITXOR: return bitxorPrec;
+        case BITAND: return bitandPrec;
+        case SL:
+        case SR:
+        case USR: return shiftPrec;
+        case PLUS:
+        case MINUS: return addPrec;
+        case MUL:
+        case DIV:
+        case MOD: return mulPrec;
+        case TYPETEST: return ordPrec;
         default: throw new AssertionError();
         }
     }
 
-    static Tree.Kind tagToKind(int tag) {
+    static Tree.Kind tagToKind(JCTree.Tag tag) {
         switch (tag) {
         // Postfix expressions
-        case JCTree.POSTINC:           // _ ++
+        case POSTINC:           // _ ++
             return Tree.Kind.POSTFIX_INCREMENT;
-        case JCTree.POSTDEC:           // _ --
+        case POSTDEC:           // _ --
             return Tree.Kind.POSTFIX_DECREMENT;
 
         // Unary operators
-        case JCTree.PREINC:            // ++ _
+        case PREINC:            // ++ _
             return Tree.Kind.PREFIX_INCREMENT;
-        case JCTree.PREDEC:            // -- _
+        case PREDEC:            // -- _
             return Tree.Kind.PREFIX_DECREMENT;
-        case JCTree.POS:               // +
+        case POS:               // +
             return Tree.Kind.UNARY_PLUS;
-        case JCTree.NEG:               // -
+        case NEG:               // -
             return Tree.Kind.UNARY_MINUS;
-        case JCTree.COMPL:             // ~
+        case COMPL:             // ~
             return Tree.Kind.BITWISE_COMPLEMENT;
-        case JCTree.NOT:               // !
+        case NOT:               // !
             return Tree.Kind.LOGICAL_COMPLEMENT;
 
         // Binary operators
 
         // Multiplicative operators
-        case JCTree.MUL:               // *
+        case MUL:               // *
             return Tree.Kind.MULTIPLY;
-        case JCTree.DIV:               // /
+        case DIV:               // /
             return Tree.Kind.DIVIDE;
-        case JCTree.MOD:               // %
+        case MOD:               // %
             return Tree.Kind.REMAINDER;
 
         // Additive operators
-        case JCTree.PLUS:              // +
+        case PLUS:              // +
             return Tree.Kind.PLUS;
-        case JCTree.MINUS:             // -
+        case MINUS:             // -
             return Tree.Kind.MINUS;
 
         // Shift operators
-        case JCTree.SL:                // <<
+        case SL:                // <<
             return Tree.Kind.LEFT_SHIFT;
-        case JCTree.SR:                // >>
+        case SR:                // >>
             return Tree.Kind.RIGHT_SHIFT;
-        case JCTree.USR:               // >>>
+        case USR:               // >>>
             return Tree.Kind.UNSIGNED_RIGHT_SHIFT;
 
         // Relational operators
-        case JCTree.LT:                // <
+        case LT:                // <
             return Tree.Kind.LESS_THAN;
-        case JCTree.GT:                // >
+        case GT:                // >
             return Tree.Kind.GREATER_THAN;
-        case JCTree.LE:                // <=
+        case LE:                // <=
             return Tree.Kind.LESS_THAN_EQUAL;
-        case JCTree.GE:                // >=
+        case GE:                // >=
             return Tree.Kind.GREATER_THAN_EQUAL;
 
         // Equality operators
-        case JCTree.EQ:                // ==
+        case EQ:                // ==
             return Tree.Kind.EQUAL_TO;
-        case JCTree.NE:                // !=
+        case NE:                // !=
             return Tree.Kind.NOT_EQUAL_TO;
 
         // Bitwise and logical operators
-        case JCTree.BITAND:            // &
+        case BITAND:            // &
             return Tree.Kind.AND;
-        case JCTree.BITXOR:            // ^
+        case BITXOR:            // ^
             return Tree.Kind.XOR;
-        case JCTree.BITOR:             // |
+        case BITOR:             // |
             return Tree.Kind.OR;
 
         // Conditional operators
-        case JCTree.AND:               // &&
+        case AND:               // &&
             return Tree.Kind.CONDITIONAL_AND;
-        case JCTree.OR:                // ||
+        case OR:                // ||
             return Tree.Kind.CONDITIONAL_OR;
 
         // Assignment operators
-        case JCTree.MUL_ASG:           // *=
+        case MUL_ASG:           // *=
             return Tree.Kind.MULTIPLY_ASSIGNMENT;
-        case JCTree.DIV_ASG:           // /=
+        case DIV_ASG:           // /=
             return Tree.Kind.DIVIDE_ASSIGNMENT;
-        case JCTree.MOD_ASG:           // %=
+        case MOD_ASG:           // %=
             return Tree.Kind.REMAINDER_ASSIGNMENT;
-        case JCTree.PLUS_ASG:          // +=
+        case PLUS_ASG:          // +=
             return Tree.Kind.PLUS_ASSIGNMENT;
-        case JCTree.MINUS_ASG:         // -=
+        case MINUS_ASG:         // -=
             return Tree.Kind.MINUS_ASSIGNMENT;
-        case JCTree.SL_ASG:            // <<=
+        case SL_ASG:            // <<=
             return Tree.Kind.LEFT_SHIFT_ASSIGNMENT;
-        case JCTree.SR_ASG:            // >>=
+        case SR_ASG:            // >>=
             return Tree.Kind.RIGHT_SHIFT_ASSIGNMENT;
-        case JCTree.USR_ASG:           // >>>=
+        case USR_ASG:           // >>>=
             return Tree.Kind.UNSIGNED_RIGHT_SHIFT_ASSIGNMENT;
-        case JCTree.BITAND_ASG:        // &=
+        case BITAND_ASG:        // &=
             return Tree.Kind.AND_ASSIGNMENT;
-        case JCTree.BITXOR_ASG:        // ^=
+        case BITXOR_ASG:        // ^=
             return Tree.Kind.XOR_ASSIGNMENT;
-        case JCTree.BITOR_ASG:         // |=
+        case BITOR_ASG:         // |=
             return Tree.Kind.OR_ASSIGNMENT;
 
         // Null check (implementation detail), for example, __.getClass()
-        case JCTree.NULLCHK:
+        case NULLCHK:
             return Tree.Kind.OTHER;
 
         default:
@@ -918,13 +957,13 @@ public class TreeInfo {
      */
     public static JCExpression typeIn(JCExpression tree) {
         switch (tree.getTag()) {
-        case JCTree.IDENT: /* simple names */
-        case JCTree.TYPEIDENT: /* primitive name */
-        case JCTree.SELECT: /* qualified name */
-        case JCTree.TYPEARRAY: /* array types */
-        case JCTree.WILDCARD: /* wild cards */
-        case JCTree.TYPEPARAMETER: /* type parameters */
-        case JCTree.TYPEAPPLY: /* parameterized types */
+        case IDENT: /* simple names */
+        case TYPEIDENT: /* primitive name */
+        case SELECT: /* qualified name */
+        case TYPEARRAY: /* array types */
+        case WILDCARD: /* wild cards */
+        case TYPEPARAMETER: /* type parameters */
+        case TYPEAPPLY: /* parameterized types */
             return tree;
         default:
             throw new AssertionError("Unexpected type tree: " + tree);
@@ -933,9 +972,9 @@ public class TreeInfo {
 
     public static JCTree innermostType(JCTree type) {
         switch (type.getTag()) {
-        case JCTree.TYPEARRAY:
+        case TYPEARRAY:
             return innermostType(((JCArrayTypeTree)type).elemtype);
-        case JCTree.WILDCARD:
+        case WILDCARD:
             return innermostType(((JCWildcard)type).inner);
         default:
             return type;
@@ -948,9 +987,9 @@ public class TreeInfo {
     public static JCModuleDecl getModule(JCCompilationUnit t) {
         for (JCTree def: t.defs) {
             switch (def.getTag()) {
-                case JCTree.IMPORT:
+                case IMPORT:
                     continue;
-                case JCTree.MODULE:
+                case MODULE:
                     return (JCModuleDecl) def;
                 default:
                     break;
@@ -966,9 +1005,9 @@ public class TreeInfo {
     public static JCPackageDecl getPackage(JCCompilationUnit t) {
         for (JCTree def: t.defs) {
             switch (def.getTag()) {
-                case JCTree.IMPORT:
+                case IMPORT:
                     continue;
-                case JCTree.PACKAGE:
+                case PACKAGE:
                     return (JCPackageDecl) def;
                 default:
                     break;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java
index 5c454e2..ea85438 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java
@@ -25,12 +25,13 @@
 
 package com.sun.tools.javac.tree;
 
+import com.sun.source.tree.RequiresFlag;
+
 import com.sun.tools.javac.code.*;
 import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.code.Type.*;
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
-
 import com.sun.tools.javac.tree.JCTree.*;
 
 import static com.sun.tools.javac.code.Flags.*;
@@ -125,7 +126,6 @@ public class TreeMaker implements JCTree.Factory {
                 || node instanceof JCImport
                 || node instanceof JCPackageDecl
                 || node instanceof JCModuleDecl
-                || node instanceof JCModuleMetadata
                 || node instanceof JCSkip
                 || node instanceof JCErroneous
                 || (node instanceof JCExpressionStatement
@@ -351,6 +351,14 @@ public class TreeMaker implements JCTree.Factory {
         return tree;
     }
 
+    public JCLambda Lambda(List<JCVariableDecl> params,
+                           JCTree body)
+    {
+        JCLambda tree = new JCLambda(params, body);
+        tree.pos = pos;
+        return tree;
+    }
+
     public JCParens Parens(JCExpression expr) {
         JCParens tree = new JCParens(expr);
         tree.pos = pos;
@@ -363,19 +371,19 @@ public class TreeMaker implements JCTree.Factory {
         return tree;
     }
 
-    public JCAssignOp Assignop(int opcode, JCTree lhs, JCTree rhs) {
+    public JCAssignOp Assignop(JCTree.Tag opcode, JCTree lhs, JCTree rhs) {
         JCAssignOp tree = new JCAssignOp(opcode, lhs, rhs, null);
         tree.pos = pos;
         return tree;
     }
 
-    public JCUnary Unary(int opcode, JCExpression arg) {
+    public JCUnary Unary(JCTree.Tag opcode, JCExpression arg) {
         JCUnary tree = new JCUnary(opcode, arg);
         tree.pos = pos;
         return tree;
     }
 
-    public JCBinary Binary(int opcode, JCExpression lhs, JCExpression rhs) {
+    public JCBinary Binary(JCTree.Tag opcode, JCExpression lhs, JCExpression rhs) {
         JCBinary tree = new JCBinary(opcode, lhs, rhs, null);
         tree.pos = pos;
         return tree;
@@ -405,6 +413,13 @@ public class TreeMaker implements JCTree.Factory {
         return tree;
     }
 
+    public JCMemberReference Reference(JCMemberReference.ReferenceMode mode, Name name,
+            JCExpression expr, List<JCExpression> typeargs) {
+        JCMemberReference tree = new JCMemberReference(mode, name, expr, typeargs);
+        tree.pos = pos;
+        return tree;
+    }
+
     public JCIdent Ident(Name name) {
         JCIdent tree = new JCIdent(name, null);
         tree.pos = pos;
@@ -476,39 +491,81 @@ public class TreeMaker implements JCTree.Factory {
         return Modifiers(flags, List.<JCAnnotation>nil());
     }
 
-    public JCModuleDecl Module(List<JCAnnotation> annots, JCModuleId moduleId,
-            List<JCModuleId> provides, List<JCModuleMetadata> metadata) {
-        JCModuleDecl tree = new JCModuleDecl(annots, moduleId, provides, metadata);
+    @Override
+    public JCModuleDecl Module(JCModuleId moduleId,
+            List<JCModuleDirective> directives, Name metadata) {
+        JCModuleDecl tree = new JCModuleDecl(moduleId, directives, metadata);
+        tree.pos = pos;
+        return tree;
+    }
+
+    @Override
+    public JCViewDecl View(JCExpression name,
+            List<JCModuleDirective> directives) {
+        JCViewDecl tree = new JCViewDecl(name, directives);
         tree.pos = pos;
         return tree;
     }
 
-    public JCModuleClass ModuleClass(List<Name> flags, JCTree qualId) {
-        JCModuleClass tree = new JCModuleClass(flags, qualId);
+    @Override
+    public JCEntrypointDirective Entrypoint(JCExpression qualId) {
+        JCEntrypointDirective tree = new JCEntrypointDirective(qualId);
         tree.pos = pos;
         return tree;
     }
 
-    public JCModuleExport ModuleExport(List<Name> flags, JCExpression qualId) {
-        JCModuleExport tree = new JCModuleExport(flags, qualId);
+    @Override
+    public JCExportDirective Exports(JCExpression qualId) {
+        JCExportDirective tree = new JCExportDirective(qualId);
         tree.pos = pos;
         return tree;
     }
 
+    @Override
     public JCModuleId ModuleId(JCTree qualId, Name version) {
         JCModuleId tree = new JCModuleId(qualId, version);
         tree.pos = pos;
         return tree;
     }
 
-    public JCModulePermits ModulePermits(List<JCExpression> qualIds) {
-        JCModulePermits tree = new JCModulePermits(qualIds);
+    @Override
+    public JCModuleIdQuery ModuleIdQuery(JCTree qualId, Name versionQuery) {
+        JCModuleIdQuery tree = new JCModuleIdQuery(qualId, versionQuery);
+        tree.pos = pos;
+        return tree;
+    }
+
+    @Override
+    public JCPermitsDirective Permits(JCExpression qualId) {
+        JCPermitsDirective tree = new JCPermitsDirective(qualId);
+        tree.pos = pos;
+        return tree;
+    }
+
+    @Override
+    public JCProvidesModuleDirective ProvidesModule(JCModuleId moduleId) {
+        JCProvidesModuleDirective tree = new JCProvidesModuleDirective(moduleId);
+        tree.pos = pos;
+        return tree;
+    }
+
+    @Override
+    public JCProvidesServiceDirective ProvidesService(JCExpression service, JCExpression impl) {
+        JCProvidesServiceDirective tree = new JCProvidesServiceDirective(service, impl);
+        tree.pos = pos;
+        return tree;
+    }
+
+    @Override
+    public JCRequiresModuleDirective RequiresModule(List<RequiresFlag> flags, JCModuleIdQuery moduleIdQuery) {
+        JCRequiresModuleDirective tree = new JCRequiresModuleDirective(flags, moduleIdQuery);
         tree.pos = pos;
         return tree;
     }
 
-    public JCModuleRequires ModuleRequires(List<Name> flags, List<JCModuleId> moduleIds) {
-        JCModuleRequires tree = new JCModuleRequires(flags, moduleIds);
+    @Override
+    public JCRequiresServiceDirective RequiresService(List<RequiresFlag> flags, JCExpression serviceName) {
+        JCRequiresServiceDirective tree = new JCRequiresServiceDirective(flags, serviceName);
         tree.pos = pos;
         return tree;
     }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java
index 2cf3924..b656f80 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java
@@ -63,35 +63,66 @@ public class TreeScanner extends Visitor {
  * Visitor methods
  ****************************************************************************/
 
+    @Override
     public void visitTopLevel(JCCompilationUnit tree) {
         scan(tree.defs);
     }
 
+    @Override
     public void visitModuleDef(JCModuleDecl tree) {
-        scan(tree.annots);
         scan(tree.id);
-        scan(tree.provides);
-        scan(tree.metadata);
+        scan(tree.directives);
     }
 
+    @Override
     public void visitModuleId(JCModuleId tree) {
         scan(tree.qualId);
     }
 
-    public void visitModuleClass(JCModuleClass tree) {
+    @Override
+    public void visitModuleIdQuery(JCModuleIdQuery tree) {
+        scan(tree.qualId);
+    }
+
+    @Override
+    public void visitEntrypoint(JCEntrypointDirective tree) {
         scan(tree.qualId);
     }
 
-    public void visitModuleExport(JCModuleExport tree) {
+    @Override
+    public void visitExports(JCExportDirective tree) {
         scan(tree.qualid);
     }
 
-    public void visitModulePermits(JCModulePermits tree) {
-        scan(tree.moduleNames);
+    @Override
+    public void visitPermits(JCPermitsDirective tree) {
+        scan(tree.moduleName);
+    }
+
+    @Override
+    public void visitProvidesModule(JCProvidesModuleDirective tree) {
+        scan(tree.moduleId);
+    }
+
+    @Override
+    public void visitProvidesService(JCProvidesServiceDirective tree) {
+        scan(tree.serviceName);
+        scan(tree.implName);
+    }
+
+    @Override
+    public void visitRequiresModule(JCRequiresModuleDirective tree) {
+        scan(tree.moduleIdQuery);
     }
 
-    public void visitModuleRequires(JCModuleRequires tree) {
-        scan(tree.moduleIds);
+    @Override
+    public void visitRequiresService(JCRequiresServiceDirective tree) {
+        scan(tree.serviceName);
+    }
+
+    @Override
+    public void visitView(JCViewDecl tree) {
+        scan(tree.directives);
     }
 
     public void visitPackageDef(JCPackageDecl tree) {
@@ -243,6 +274,11 @@ public class TreeScanner extends Visitor {
         scan(tree.elems);
     }
 
+    public void visitLambda(JCLambda tree) {
+        scan(tree.body);
+        scan(tree.params);
+    }
+
     public void visitParens(JCParens tree) {
         scan(tree.expr);
     }
@@ -285,6 +321,11 @@ public class TreeScanner extends Visitor {
         scan(tree.selected);
     }
 
+    public void visitReference(JCMemberReference tree) {
+        scan(tree.expr);
+        scan(tree.typeargs);
+    }
+
     public void visitIdent(JCIdent tree) {
     }
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java
index cfa69df..a33146a 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java
@@ -286,6 +286,12 @@ public class TreeTranslator extends JCTree.Visitor {
         result = tree;
     }
 
+    public void visitLambda(JCLambda tree) {
+        tree.params = translate(tree.params);
+        tree.body = translate(tree.body);
+        result = tree;
+    }
+
     public void visitNewArray(JCNewArray tree) {
         tree.elemtype = translate(tree.elemtype);
         tree.dims = translate(tree.dims);
@@ -344,6 +350,11 @@ public class TreeTranslator extends JCTree.Visitor {
         result = tree;
     }
 
+    public void visitReference(JCMemberReference tree) {
+        tree.expr = translate(tree.expr);
+        result = tree;
+    }
+
     public void visitIdent(JCIdent tree) {
         result = tree;
     }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java b/langtools/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java
index c9d7d8b..db3d662 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java
@@ -25,11 +25,6 @@
 
 package com.sun.tools.javac.util;
 
-import com.sun.tools.javac.code.Source;
-import com.sun.tools.javac.main.JavacOption;
-import com.sun.tools.javac.main.OptionName;
-import com.sun.tools.javac.main.RecognizedOptions;
-import com.sun.tools.javac.util.JCDiagnostic.SimpleDiagnosticPosition;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.IOException;
@@ -51,9 +46,19 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 import javax.tools.JavaFileObject;
 import javax.tools.JavaFileObject.Kind;
 
+import com.sun.tools.javac.code.Lint;
+import com.sun.tools.javac.code.Source;
+import com.sun.tools.javac.file.FSInfo;
+import com.sun.tools.javac.file.Locations;
+import com.sun.tools.javac.main.Option;
+import com.sun.tools.javac.main.OptionHelper;
+import com.sun.tools.javac.main.OptionHelper.GrumpyHelper;
+import com.sun.tools.javac.util.JCDiagnostic.SimpleDiagnosticPosition;
+
 /**
  * Utility methods for building a filemanager.
  * There are no references here to file-system specific objects such as
@@ -63,15 +68,21 @@ public abstract class BaseFileManager {
     protected BaseFileManager(Charset charset) {
         this.charset = charset;
         byteBufferCache = new ByteBufferCache();
+        locations = createLocations();
     }
 
     /**
      * Set the context for JavacPathFileManager.
      */
-    protected void setContext(Context context) {
+    public void setContext(Context context) {
         log = Log.instance(context);
         options = Options.instance(context);
         classLoaderClass = options.get("procloader");
+        locations.update(log, options, Lint.instance(context), FSInfo.instance(context));
+    }
+
+    protected Locations createLocations() {
+        return new Locations();
     }
 
     /**
@@ -88,8 +99,10 @@ public abstract class BaseFileManager {
 
     protected String classLoaderClass;
 
+    protected Locations locations;
+
     protected Source getSource() {
-        String sourceName = options.get(OptionName.SOURCE);
+        String sourceName = options.get(Option.SOURCE);
         Source source = null;
         if (sourceName != null)
             source = Source.lookup(sourceName);
@@ -133,15 +146,31 @@ public abstract class BaseFileManager {
 
     // <editor-fold defaultstate="collapsed" desc="Option handling">
     public boolean handleOption(String current, Iterator<String> remaining) {
-        for (JavacOption o: javacFileManagerOptions) {
+        OptionHelper helper = new GrumpyHelper(log) {
+            @Override
+            public String get(Option option) {
+                return options.get(option.getText());
+            }
+
+            @Override
+            public void put(String name, String value) {
+                options.put(name, value);
+            }
+
+            @Override
+            public void remove(String name) {
+                options.remove(name);
+            }
+        };
+        for (Option o: javacFileManagerOptions) {
             if (o.matches(current))  {
                 if (o.hasArg()) {
                     if (remaining.hasNext()) {
-                        if (!o.process(options, current, remaining.next()))
+                        if (!o.process(helper, current, remaining.next()))
                             return true;
                     }
                 } else {
-                    if (!o.process(options, current))
+                    if (!o.process(helper, current))
                         return true;
                 }
                 // operand missing, or process returned false
@@ -152,12 +181,11 @@ public abstract class BaseFileManager {
         return false;
     }
     // where
-        private static JavacOption[] javacFileManagerOptions =
-            RecognizedOptions.getJavacFileManagerOptions(
-            new RecognizedOptions.GrumpyHelper());
+        private static Set<Option> javacFileManagerOptions =
+            Option.getJavacFileManagerOptions();
 
     public int isSupportedOption(String option) {
-        for (JavacOption o : javacFileManagerOptions) {
+        for (Option o : javacFileManagerOptions) {
             if (o.matches(option))
                 return o.hasArg() ? 1 : 0;
         }
@@ -179,7 +207,7 @@ public abstract class BaseFileManager {
     }
 
     public String getEncodingName() {
-        String encName = options.get(OptionName.ENCODING);
+        String encName = options.get(Option.ENCODING);
         if (encName == null)
             return getDefaultEncodingName();
         else
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Debug.java b/langtools/src/share/classes/com/sun/tools/javac/util/Debug.java
index b7a9104..6a8be5f 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Debug.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Debug.java
@@ -37,6 +37,10 @@ public class Debug {
     public final PrintWriter out;
     Set<String> opts;
 
+    public Debug(String name, Options options, Log log) {
+        this(name, options, log.noticeWriter);
+    }
+
     public Debug(String name, Options options, PrintWriter out) {
         if (out == null) out = new PrintWriter(System.err);
         this.out = new DebugPrinter(name, out);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java b/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java
index 2f13717..7378d7e 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import java.util.Map;
 import javax.tools.JavaFileObject;
 
 import com.sun.tools.javac.file.JavacFileManager;
+import com.sun.tools.javac.parser.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 
 import static com.sun.tools.javac.util.LayoutCharacters.*;
@@ -128,11 +129,11 @@ public class DiagnosticSource {
         }
     }
 
-    public Map<JCTree, Integer> getEndPosTable() {
+    public EndPosTable getEndPosTable() {
         return endPosTable;
     }
 
-    public void setEndPosTable(Map<JCTree, Integer> t) {
+    public void setEndPosTable(EndPosTable t) {
         if (endPosTable != null && endPosTable != t)
             throw new IllegalStateException("endPosTable already set");
         endPosTable = t;
@@ -199,7 +200,7 @@ public class DiagnosticSource {
     /** The underlying file object. */
     protected JavaFileObject fileObject;
 
-    protected Map<JCTree, Integer> endPosTable;
+    protected EndPosTable endPosTable;
 
     /** A soft reference to the content of the file object. */
     protected SoftReference<char[]> refBuf;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java b/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
index 25fdf04..60506f2 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@ import javax.tools.JavaFileObject;
 
 import com.sun.tools.javac.api.DiagnosticFormatter;
 import com.sun.tools.javac.code.Lint.LintCategory;
+import com.sun.tools.javac.parser.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 
 import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticType.*;
@@ -70,7 +71,16 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
             this(JavacMessages.instance(context), "compiler");
             context.put(diagnosticFactoryKey, this);
 
-            Options options = Options.instance(context);
+            final Options options = Options.instance(context);
+            initOptions(options);
+            options.addListener(new Runnable() {
+               public void run() {
+                   initOptions(options);
+               }
+            });
+        }
+
+        private void initOptions(Options options) {
             if (options.isSet("onlySyntaxErrorsUnrecoverable"))
                 defaultErrorFlags.add(DiagnosticFlag.RECOVERABLE);
         }
@@ -304,7 +314,7 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
         /** If there is a tree node, and if endPositions are available, get
          *  the end position of the tree node. Otherwise, just returns the
          *  same as getPreferredPosition(). */
-        int getEndPosition(Map<JCTree, Integer> endPosTable);
+        int getEndPosition(EndPosTable endPosTable);
     }
 
     /**
@@ -328,7 +338,7 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
             return pos;
         }
 
-        public int getEndPosition(Map<JCTree, Integer> endPosTable) {
+        public int getEndPosition(EndPosTable endPosTable) {
             return pos;
         }
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/JavacMessages.java b/langtools/src/share/classes/com/sun/tools/javac/util/JavacMessages.java
index dbd6993..77d2ac8 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/JavacMessages.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/JavacMessages.java
@@ -82,14 +82,14 @@ public class JavacMessages implements Messages {
     }
 
     /** Creates a JavacMessages object.
-     * @param bundleName the name to identify the resource buundle of localized messages.
+     * @param bundleName the name to identify the resource bundle of localized messages.
      */
     public JavacMessages(String bundleName) throws MissingResourceException {
         this(bundleName, null);
     }
 
     /** Creates a JavacMessages object.
-     * @param bundleName the name to identify the resource buundle of localized messages.
+     * @param bundleName the name to identify the resource bundle of localized messages.
      */
     public JavacMessages(String bundleName, Locale locale) throws MissingResourceException {
         bundleNames = List.nil();
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Log.java b/langtools/src/share/classes/com/sun/tools/javac/util/Log.java
index 869da39..3f22b8c 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Log.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Log.java
@@ -29,19 +29,19 @@ import java.io.*;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Queue;
 import java.util.Set;
 import javax.tools.DiagnosticListener;
 import javax.tools.JavaFileObject;
 
 import com.sun.tools.javac.api.DiagnosticFormatter;
-import com.sun.tools.javac.main.OptionName;
-import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.main.Main;
+import com.sun.tools.javac.main.Option;
+import com.sun.tools.javac.parser.EndPosTable;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType;
 
-import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.main.Option.*;
 
 /** A class for error logs. Reports errors and warnings, and
  *  keeps track of error numbers and positions.
@@ -60,19 +60,31 @@ public class Log extends AbstractLog {
     public static final Context.Key<PrintWriter> outKey =
         new Context.Key<PrintWriter>();
 
-    //@Deprecated
-    public final PrintWriter errWriter;
+    /* TODO: Should unify this with prefix handling in JCDiagnostic.Factory. */
+    public enum PrefixKind {
+        JAVAC("javac."),
+        COMPILER_MISC("compiler.misc.");
+        PrefixKind(String v) {
+            value = v;
+        }
+        public String key(String k) {
+            return value + k;
+        }
+        final String value;
+    }
+
+    public enum WriterKind { NOTICE, WARNING, ERROR };
 
-    //@Deprecated
-    public final PrintWriter warnWriter;
+    protected PrintWriter errWriter;
 
-    //@Deprecated
-    public final PrintWriter noticeWriter;
+    protected PrintWriter warnWriter;
+
+    protected PrintWriter noticeWriter;
 
     /** The maximum number of errors/warnings that are reported.
      */
-    public final int MaxErrors;
-    public final int MaxWarnings;
+    protected int MaxErrors;
+    protected int MaxWarnings;
 
     /** Switch: prompt user on each error.
      */
@@ -123,7 +135,6 @@ public class Log extends AbstractLog {
 
     /** Construct a log with given I/O redirections.
      */
-    @Deprecated
     protected Log(Context context, PrintWriter errWriter, PrintWriter warnWriter, PrintWriter noticeWriter) {
         super(JCDiagnostic.Factory.instance(context));
         context.put(logKey, this);
@@ -131,30 +142,42 @@ public class Log extends AbstractLog {
         this.warnWriter = warnWriter;
         this.noticeWriter = noticeWriter;
 
-        Options options = Options.instance(context);
-        this.dumpOnError = options.isSet(DOE);
-        this.promptOnError = options.isSet(PROMPT);
-        this.emitWarnings = options.isUnset(XLINT_CUSTOM, "none");
-        this.suppressNotes = options.isSet("suppressNotes");
-        this.MaxErrors = getIntOption(options, XMAXERRS, getDefaultMaxErrors());
-        this.MaxWarnings = getIntOption(options, XMAXWARNS, getDefaultMaxWarnings());
-
-        boolean rawDiagnostics = options.isSet("rawDiagnostics");
-        messages = JavacMessages.instance(context);
-        this.diagFormatter = rawDiagnostics ? new RawDiagnosticFormatter(options) :
-                                              new BasicDiagnosticFormatter(options, messages);
         @SuppressWarnings("unchecked") // FIXME
         DiagnosticListener<? super JavaFileObject> dl =
             context.get(DiagnosticListener.class);
         this.diagListener = dl;
 
-        String ek = options.get("expectKeys");
-        if (ek != null)
-            expectDiagKeys = new HashSet<String>(Arrays.asList(ek.split(", *")));
+        messages = JavacMessages.instance(context);
+        messages.add(Main.javacBundleName);
+
+        final Options options = Options.instance(context);
+        initOptions(options);
+        options.addListener(new Runnable() {
+            public void run() {
+                initOptions(options);
+            }
+        });
     }
     // where
-        private int getIntOption(Options options, OptionName optionName, int defaultValue) {
-            String s = options.get(optionName);
+        private void initOptions(Options options) {
+            this.dumpOnError = options.isSet(DOE);
+            this.promptOnError = options.isSet(PROMPT);
+            this.emitWarnings = options.isUnset(XLINT_CUSTOM, "none");
+            this.suppressNotes = options.isSet("suppressNotes");
+            this.MaxErrors = getIntOption(options, XMAXERRS, getDefaultMaxErrors());
+            this.MaxWarnings = getIntOption(options, XMAXWARNS, getDefaultMaxWarnings());
+
+            boolean rawDiagnostics = options.isSet("rawDiagnostics");
+            this.diagFormatter = rawDiagnostics ? new RawDiagnosticFormatter(options) :
+                                                  new BasicDiagnosticFormatter(options, messages);
+
+            String ek = options.get("expectKeys");
+            if (ek != null)
+                expectDiagKeys = new HashSet<String>(Arrays.asList(ek.split(", *")));
+        }
+
+        private int getIntOption(Options options, Option option, int defaultValue) {
+            String s = options.get(option);
             try {
                 if (s != null) {
                     int n = Integer.parseInt(s);
@@ -180,7 +203,7 @@ public class Log extends AbstractLog {
 
     /** The default writer for diagnostics
      */
-    static final PrintWriter defaultWriter(Context context) {
+    static PrintWriter defaultWriter(Context context) {
         PrintWriter result = context.get(outKey);
         if (result == null)
             context.put(outKey, result = new PrintWriter(System.err));
@@ -225,9 +248,9 @@ public class Log extends AbstractLog {
         return diagListener != null;
     }
 
-    public void setEndPosTable(JavaFileObject name, Map<JCTree, Integer> table) {
+    public void setEndPosTable(JavaFileObject name, EndPosTable endPosTable) {
         name.getClass(); // null check
-        getSource(name).setEndPosTable(table);
+        getSource(name).setEndPosTable(endPosTable);
     }
 
     /** Return current sourcefile.
@@ -248,6 +271,36 @@ public class Log extends AbstractLog {
         this.diagFormatter = diagFormatter;
     }
 
+    public PrintWriter getWriter(WriterKind kind) {
+        switch (kind) {
+            case NOTICE:    return noticeWriter;
+            case WARNING:   return warnWriter;
+            case ERROR:     return errWriter;
+            default:        throw new IllegalArgumentException();
+        }
+    }
+
+    public void setWriter(WriterKind kind, PrintWriter pw) {
+        pw.getClass();
+        switch (kind) {
+            case NOTICE:    noticeWriter = pw;  break;
+            case WARNING:   warnWriter = pw;    break;
+            case ERROR:     errWriter = pw;     break;
+            default:        throw new IllegalArgumentException();
+        }
+    }
+
+    public void setWriters(PrintWriter pw) {
+        pw.getClass();
+        noticeWriter = warnWriter = errWriter = pw;
+    }
+
+    public void setWriters(Log other) {
+        this.noticeWriter = other.noticeWriter;
+        this.warnWriter = other.warnWriter;
+        this.errWriter = other.errWriter;
+    }
+
     /** Flush the logs
      */
     public void flush() {
@@ -256,6 +309,10 @@ public class Log extends AbstractLog {
         noticeWriter.flush();
     }
 
+    public void flush(WriterKind kind) {
+        getWriter(kind).flush();
+    }
+
     /** Returns true if an error needs to be reported for a given
      * source name and pos.
      */
@@ -275,7 +332,6 @@ public class Log extends AbstractLog {
     public void prompt() {
         if (promptOnError) {
             System.err.println(localize("resume.abort"));
-            char ch;
             try {
                 while (true) {
                     switch (System.in.read()) {
@@ -302,7 +358,7 @@ public class Log extends AbstractLog {
             return;
         int col = source.getColumnNumber(pos, false);
 
-        printLines(writer, line);
+        printRawLines(writer, line);
         for (int i = 0; i < col - 1; i++) {
             writer.print((line.charAt(i) == '\t') ? "\t" : " ");
         }
@@ -310,30 +366,54 @@ public class Log extends AbstractLog {
         writer.flush();
     }
 
+    public void printNewline() {
+        noticeWriter.println();
+    }
+
+    public void printNewline(WriterKind wk) {
+        getWriter(wk).println();
+    }
+
+    public void printLines(String key, Object... args) {
+        printRawLines(noticeWriter, localize(key, args));
+    }
+
+    public void printLines(PrefixKind pk, String key, Object... args) {
+        printRawLines(noticeWriter, localize(pk, key, args));
+    }
+
+    public void printLines(WriterKind wk, String key, Object... args) {
+        printRawLines(getWriter(wk), localize(key, args));
+    }
+
+    public void printLines(WriterKind wk, PrefixKind pk, String key, Object... args) {
+        printRawLines(getWriter(wk), localize(pk, key, args));
+    }
+
     /** Print the text of a message, translating newlines appropriately
      *  for the platform.
      */
-    public static void printLines(PrintWriter writer, String msg) {
-        int nl;
-        while ((nl = msg.indexOf('\n')) != -1) {
-            writer.println(msg.substring(0, nl));
-            msg = msg.substring(nl+1);
-        }
-        if (msg.length() != 0) writer.println(msg);
+    public void printRawLines(String msg) {
+        printRawLines(noticeWriter, msg);
     }
 
-    /** Print the text of a message to the errWriter stream,
-     *  translating newlines appropriately for the platform.
+    /** Print the text of a message, translating newlines appropriately
+     *  for the platform.
      */
-    public void printErrLines(String key, Object... args) {
-        printLines(errWriter, localize(key, args));
+    public void printRawLines(WriterKind kind, String msg) {
+        printRawLines(getWriter(kind), msg);
     }
 
-    /** Print the text of a message to the noticeWriter stream,
-     *  translating newlines appropriately for the platform.
+    /** Print the text of a message, translating newlines appropriately
+     *  for the platform.
      */
-    public void printNoteLines(String key, Object... args) {
-        printLines(noticeWriter, localize(key, args));
+    public static void printRawLines(PrintWriter writer, String msg) {
+        int nl;
+        while ((nl = msg.indexOf('\n')) != -1) {
+            writer.println(msg.substring(0, nl));
+            msg = msg.substring(nl+1);
+        }
+        if (msg.length() != 0) writer.println(msg);
     }
 
     /**
@@ -341,11 +421,11 @@ public class Log extends AbstractLog {
      * noticeWriter stream.
      */
     public void printVerbose(String key, Object... args) {
-        printLines(noticeWriter, localize("verbose." + key, args));
+        printRawLines(noticeWriter, localize("verbose." + key, args));
     }
 
     protected void directError(String key, Object... args) {
-        printErrLines(key, args);
+        printRawLines(errWriter, localize(key, args));
         errWriter.flush();
     }
 
@@ -431,7 +511,7 @@ public class Log extends AbstractLog {
 
         PrintWriter writer = getWriterForDiagnosticType(diag.getType());
 
-        printLines(writer, diagFormatter.format(diag, messages.getCurrentLocale()));
+        printRawLines(writer, diagFormatter.format(diag, messages.getCurrentLocale()));
 
         if (promptOnError) {
             switch (diag.getType()) {
@@ -474,7 +554,7 @@ public class Log extends AbstractLog {
      *  @param args   Fields to substitute into the string.
      */
     public static String getLocalizedString(String key, Object ... args) {
-        return JavacMessages.getDefaultLocalizedString("compiler.misc." + key, args);
+        return JavacMessages.getDefaultLocalizedString(PrefixKind.COMPILER_MISC.key(key), args);
     }
 
     /** Find a localized string in the resource bundle.
@@ -482,9 +562,23 @@ public class Log extends AbstractLog {
      *  @param args   Fields to substitute into the string.
      */
     public String localize(String key, Object... args) {
-        return messages.getLocalizedString("compiler.misc." + key, args);
+        return localize(PrefixKind.COMPILER_MISC, key, args);
     }
 
+    /** Find a localized string in the resource bundle.
+     *  @param key    The key for the localized string.
+     *  @param args   Fields to substitute into the string.
+     */
+    public String localize(PrefixKind pk, String key, Object... args) {
+        if (useRawMessages)
+            return pk.key(key);
+        else
+            return messages.getLocalizedString(pk.key(key), args);
+    }
+    // where
+        // backdoor hook for testing, should transition to use -XDrawDiagnostics
+        private static boolean useRawMessages = false;
+
 /***************************************************************************
  * raw error messages without internationalization; used for experimentation
  * and quick prototyping
@@ -494,12 +588,12 @@ public class Log extends AbstractLog {
      */
     private void printRawError(int pos, String msg) {
         if (source == null || pos == Position.NOPOS) {
-            printLines(errWriter, "error: " + msg);
+            printRawLines(errWriter, "error: " + msg);
         } else {
             int line = source.getLineNumber(pos);
             JavaFileObject file = source.getFile();
             if (file != null)
-                printLines(errWriter,
+                printRawLines(errWriter,
                            file.getName() + ":" +
                            line + ": " + msg);
             printErrLine(pos, errWriter);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Names.java b/langtools/src/share/classes/com/sun/tools/javac/util/Names.java
index 3629aea..cffb391 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Names.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Names.java
@@ -153,16 +153,23 @@ public class Names {
     public final Name addSuppressed;
     public final Name module;
     public final Name Module;
-    public final Name export;
+    public final Name exports;
     public final Name requires;
     public final Name provides;
     public final Name permits;
+    public final Name service;
     public final Name synthetic;
+    public final Name view;
+    public final Name with;
     public final Name ModuleClass;
+    public final Name ModuleData;
     public final Name ModuleExport;
     public final Name ModulePermits;
     public final Name ModuleProvides;
     public final Name ModuleRequires;
+    public final Name _public;
+    public final Name optional;
+    public final Name local;
 
     public final Name.Table table;
 
@@ -284,16 +291,24 @@ public class Names {
         addSuppressed = fromString("addSuppressed");
         module = fromString("module");
         Module = fromString("Module");
-        export = fromString("export");
+        exports = fromString("exports");
         requires = fromString("requires");
         provides = fromString("provides");
         permits = fromString("permits");
+        service = fromString("service");
         synthetic = fromString("synthetic");
+        view = fromString("view");
+        with = fromString("with");
         ModuleClass = fromString("ModuleClass");
+        ModuleData = fromString("ModuleData");
         ModuleExport = fromString("ModuleExport");
         ModulePermits = fromString("ModulePermits");
         ModuleProvides = fromString("ModuleProvides");
         ModuleRequires = fromString("ModuleRequires");
+        _public = fromString("public");
+        optional = fromString("optional");
+        local = fromString("local");
+
     }
 
     protected Name.Table createTable(Options options) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Options.java b/langtools/src/share/classes/com/sun/tools/javac/util/Options.java
index db13b65..c3bd4d5 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Options.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Options.java
@@ -26,8 +26,8 @@
 package com.sun.tools.javac.util;
 
 import java.util.*;
-import com.sun.tools.javac.main.OptionName;
-import static com.sun.tools.javac.main.OptionName.*;
+import com.sun.tools.javac.main.Option;
+import static com.sun.tools.javac.main.Option.*;
 
 /** A table of all command-line options.
  *  If an option has an argument, the option name is mapped to the argument.
@@ -71,8 +71,8 @@ public class Options {
     /**
      * Get the value for an option.
      */
-    public String get(OptionName name) {
-        return values.get(name.optionName);
+    public String get(Option option) {
+        return values.get(option.text);
     }
 
     /**
@@ -101,15 +101,15 @@ public class Options {
     /**
      * Check if the value for an option has been set.
      */
-    public boolean isSet(OptionName name) {
-        return (values.get(name.optionName) != null);
+    public boolean isSet(Option option) {
+        return (values.get(option.text) != null);
     }
 
     /**
      * Check if the value for a choice option has been set to a specific value.
      */
-    public boolean isSet(OptionName name, String value) {
-        return (values.get(name.optionName + value) != null);
+    public boolean isSet(Option option, String value) {
+        return (values.get(option.text + value) != null);
     }
 
     /**
@@ -122,23 +122,23 @@ public class Options {
     /**
      * Check if the value for an option has not been set.
      */
-    public boolean isUnset(OptionName name) {
-        return (values.get(name.optionName) == null);
+    public boolean isUnset(Option option) {
+        return (values.get(option.text) == null);
     }
 
     /**
      * Check if the value for a choice option has not been set to a specific value.
      */
-    public boolean isUnset(OptionName name, String value) {
-        return (values.get(name.optionName + value) == null);
+    public boolean isUnset(Option option, String value) {
+        return (values.get(option.text + value) == null);
     }
 
     public void put(String name, String value) {
         values.put(name, value);
     }
 
-    public void put(OptionName name, String value) {
-        values.put(name.optionName, value);
+    public void put(Option option, String value) {
+        values.put(option.text, value);
     }
 
     public void putAll(Options options) {
@@ -157,6 +157,19 @@ public class Options {
         return values.size();
     }
 
+    // light-weight notification mechanism
+
+    private List<Runnable> listeners = List.nil();
+
+    public void addListener(Runnable listener) {
+        listeners = listeners.prepend(listener);
+    }
+
+    public void notifyListeners() {
+        for (Runnable r: listeners)
+            r.run();
+    }
+
     /** Check for a lint suboption. */
     public boolean lint(String s) {
         // return true if either the specific option is enabled, or
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
index 592d0be..a5fed4b 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
@@ -65,6 +65,7 @@ import com.sun.tools.javac.util.Names;
 import com.sun.tools.javac.util.Position;
 
 import static com.sun.tools.javac.code.Kinds.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
 
 /**
  * Represents a java class and provides access to information
@@ -1083,7 +1084,7 @@ public class ClassDocImpl extends ProgramElementDocImpl implements ClassDoc {
 
         Name asterisk = tsym.name.table.names.asterisk;
         for (JCTree t : compenv.toplevel.defs) {
-            if (t.getTag() == JCTree.IMPORT) {
+            if (t.hasTag(IMPORT)) {
                 JCTree imp = ((JCImport) t).qualid;
                 if ((TreeInfo.name(imp) != asterisk) &&
                         (imp.type.tsym.kind & Kinds.TYP) != 0) {
@@ -1124,7 +1125,7 @@ public class ClassDocImpl extends ProgramElementDocImpl implements ClassDoc {
         if (compenv == null) return new PackageDocImpl[0];
 
         for (JCTree t : compenv.toplevel.defs) {
-            if (t.getTag() == JCTree.IMPORT) {
+            if (t.hasTag(IMPORT)) {
                 JCTree imp = ((JCImport) t).qualid;
                 if (TreeInfo.name(imp) == names.asterisk) {
                     JCFieldAccess sel = (JCFieldAccess)imp;
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java b/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
index 07402f9..d9b2e69 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
@@ -80,7 +80,7 @@ public class DocletInvoker {
         cpString = appendPath(System.getProperty("env.class.path"), cpString);
         cpString = appendPath(System.getProperty("java.class.path"), cpString);
         cpString = appendPath(docletPath, cpString);
-        URL[] urls = com.sun.tools.javac.file.Paths.pathToURLs(cpString);
+        URL[] urls = com.sun.tools.javac.file.Locations.pathToURLs(cpString);
         if (docletParentClassLoader == null)
             appClassLoader = new URLClassLoader(urls, getDelegationClassLoader(docletClassName));
         else
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java
index 1209686..81bcdbd 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java
@@ -39,7 +39,6 @@ import javax.tools.StandardLocation;
 
 import com.sun.tools.javac.code.Symbol.CompletionFailure;
 import com.sun.tools.javac.comp.Annotate;
-import com.sun.tools.javac.parser.DocCommentScanner;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCClassDecl;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
@@ -420,7 +419,7 @@ public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler {
         ListBuffer<JCClassDecl> result = new ListBuffer<JCClassDecl>();
         for (JCCompilationUnit t : trees) {
             for (JCTree def : t.defs) {
-                if (def.getTag() == JCTree.CLASSDEF)
+                if (def.hasTag(JCTree.Tag.CLASSDEF))
                     result.append((JCClassDecl)def);
             }
         }
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/Start.java b/langtools/src/share/classes/com/sun/tools/javadoc/Start.java
index ef65296..66514f4 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/Start.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/Start.java
@@ -31,6 +31,7 @@ import com.sun.tools.javac.main.CommandLine;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.util.ListBuffer;
+import com.sun.tools.javac.util.Log;
 import com.sun.tools.javac.util.Options;
 
 import java.io.IOException;
@@ -76,9 +77,6 @@ class Start {
 
     private DocletInvoker docletInvoker;
 
-    private static final int F_VERBOSE = 1 << 0;
-    private static final int F_WARNINGS = 1 << 2;
-
     /* Treat warnings as errors. */
     private boolean rejectWarnings = false;
 
@@ -171,11 +169,11 @@ class Start {
             messager.error(null, "main.out.of.memory");
             failed = true;
         } catch (Error ee) {
-            ee.printStackTrace();
+            ee.printStackTrace(System.err);
             messager.error(null, "main.fatal.error");
             failed = true;
         } catch (Exception ee) {
-            ee.printStackTrace();
+            ee.printStackTrace(System.err);
             messager.error(null, "main.fatal.exception");
             failed = true;
         } finally {
@@ -211,7 +209,7 @@ class Start {
             messager.error(null, "main.cant.read", e.getMessage());
             exit();
         } catch (IOException e) {
-            e.printStackTrace();
+            e.printStackTrace(System.err);
             exit();
         }
 
@@ -225,7 +223,9 @@ class Start {
         // options that may be set up below.
         Messager.preRegister(context,
                 messager.programName,
-                messager.errWriter, messager.warnWriter, messager.noticeWriter);
+                messager.getWriter(Log.WriterKind.ERROR),
+                messager.getWriter(Log.WriterKind.WARNING),
+                messager.getWriter(Log.WriterKind.NOTICE));
 
         Options compOpts = Options.instance(context);
         boolean docClasses = false;
diff --git a/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java b/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java
index 0c9b59d..fd46f84 100644
--- a/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java
@@ -25,7 +25,6 @@
 
 package com.sun.tools.javap;
 
-import java.util.Arrays;
 import java.util.Formatter;
 
 import com.sun.tools.classfile.AccessFlags;
@@ -47,9 +46,7 @@ import com.sun.tools.classfile.InnerClasses_attribute;
 import com.sun.tools.classfile.LineNumberTable_attribute;
 import com.sun.tools.classfile.LocalVariableTable_attribute;
 import com.sun.tools.classfile.LocalVariableTypeTable_attribute;
-import com.sun.tools.classfile.ModuleClass_attribute;
-import com.sun.tools.classfile.ModuleExport_attribute;
-import com.sun.tools.classfile.ModulePermits_attribute;
+import com.sun.tools.classfile.ModuleData_attribute;
 import com.sun.tools.classfile.ModuleProvides_attribute;
 import com.sun.tools.classfile.ModuleRequires_attribute;
 import com.sun.tools.classfile.Module_attribute;
@@ -394,7 +391,7 @@ public class AttributeWriter extends BasicWriter
     }
 
     public Void visitModule(Module_attribute attr, Void ignore) {
-        println("  Module: " + constantWriter.stringValue(attr.module_id_index));
+        println("Module: " + constantWriter.stringValue(attr.module_id_index));
         return null;
     }
 
@@ -406,49 +403,107 @@ public class AttributeWriter extends BasicWriter
         }
     }
 
-    public Void visitModuleClass(ModuleClass_attribute attr, Void ignore) {
-        println("  ModuleClass: ");
-        println("  #" + attr.class_index + "," + Arrays.toString(attr.attributes)
-                + "\t// " + constantWriter.stringValues(attr.attributes, " ")
-                + " " + constantWriter.stringValue(attr.class_index));
-        return null;
-    }
-
-    public Void visitModuleExport(ModuleExport_attribute attr, Void ignore) {
-        println("  ModuleExport: ");
-        for (ModuleExport_attribute.Entry e: attr.export_table) {
-            println("  #" + e.export_index + "," + Integer.toHexString(e.flags)
-                    + "\t// " + constantWriter.stringValue(e.export_index));
-        }
+    public Void visitModuleData(ModuleData_attribute attr, Void ignore) {
+        println("ModuleData: ");
+        indent(+1);
+        println("#" + attr.data_index
+                + "\t// " + constantWriter.stringValue(attr.data_index));
+        indent(-1);
         return null;
     }
 
-    public Void visitModulePermits(ModulePermits_attribute attr, Void ignore) {
-        println("  ModulePermits: ");
-        for (int i = 0; i < attr.permits_table.length; i++) {
-            int permits_index = attr.permits_table[i];
-            println("  #" + permits_index + "\t// " + constantWriter.stringValue(permits_index));
+    public Void visitModuleProvides(ModuleProvides_attribute attr, Void ignore) {
+        println("ModuleProvides: ");
+        indent(+1);
+        for (int i = 0; i < attr.view_table.length; i++) {
+            println("View " + i);
+            indent(+1);
+            ModuleProvides_attribute.View v = attr.view_table[i];
+            String view_name = (v.view_name_index == 0)
+                    ? "(default)" : constantWriter.stringValue(v.view_name_index);
+            println("#" + v.view_name_index + "\t// view " + view_name);
+            String entrypoint_name = (v.entrypoint_index == 0)
+                    ? "(none)" : constantWriter.stringValue(v.entrypoint_index);
+            println("#" + v.entrypoint_index + "\t// class " + entrypoint_name);
+            println(v.alias_length + "\t// aliases ");
+            indent(+1);
+            for (int ai = 0; ai < v.alias_length; ai++) {
+                int a = v.alias_table[ai];
+                println(a + "\t// provides " + constantWriter.stringValue(a));
+            }
+            indent(-1);
+            println(v.service_length + "\t// services ");
+            indent(+1);
+            for (int si = 0; si < v.service_length; si++) {
+                ModuleProvides_attribute.Service s = v.service_table[si];
+                println("#" + s.service_index + ", " + "#" + s.impl_index
+                        +"\t// provides service " + constantWriter.stringValue(s.service_index)
+                        + " with " + constantWriter.stringValue(s.impl_index));
+            }
+            indent(-1);
+            println(v.export_length + "\t// exports ");
+            indent(+1);
+            for (int ei = 0; ei < v.export_length; ei++) {
+                ModuleProvides_attribute.Export e = v.export_table[ei];
+                String name = constantWriter.stringValue(e.export_index);
+                int needsAsteriskMask =
+                        ModuleProvides_attribute.Export.TYPE_AND_MEMBERS
+                        | ModuleProvides_attribute.Export.PACKAGE_AND_SUBPACKAGES;
+                int isPackageMask =
+                        ModuleProvides_attribute.Export.PACKAGE
+                        | ModuleProvides_attribute.Export.PACKAGE_AND_SUBPACKAGES;
+                boolean needsAsterisk = ((e.export_flags & needsAsteriskMask) != 0);
+                boolean isPackage = ((e.export_flags & isPackageMask) != 0);
+                println("#" + e.export_index + ", " + "0x" + e.export_flags + ", #" + e.source_index
+                        + "\t// exports " + (isPackage ? "(package) " : "")
+                        + name + (needsAsterisk ? ".*" : "")
+                        + " (from "
+                        +  (e.source_index == 0 ? "unknown"
+                            : constantWriter.stringValue(e.source_index))
+                        + ")");
+            }
+            indent(-1);
+            println(v.permit_length + "\t// permits ");
+            indent(+1);
+            for (int pi = 0; pi < v.permit_length; pi++) {
+                int p = v.permit_table[pi];
+                println("#" + p +"\t// permits " + constantWriter.stringValue(p));
+            }
+            indent(-1); // end of permits
+            indent(-1); // end of ModuleProvides
         }
+        indent(-1);
         return null;
     }
 
-    public Void visitModuleProvides(ModuleProvides_attribute attr, Void ignore) {
-        println("  ModuleProvides: ");
-        for (int i = 0; i < attr.provides_table.length; i++) {
-            int provides_index = attr.provides_table[i];
-            println("  #" + provides_index + "\t// " + constantWriter.stringValue(provides_index));
-        }
+    public Void visitModuleRequires(ModuleRequires_attribute attr, Void ignore) {
+        println("ModuleRequires: ");
+        indent(+1);
+        writeRequiresTable(attr.module_table, false);
+        writeRequiresTable(attr.service_table, true);
+        indent(-1);
         return null;
     }
 
-    public Void visitModuleRequires(ModuleRequires_attribute attr, Void ignore) {
-        println("  ModuleRequires: ");
-        for (ModuleRequires_attribute.Entry e: attr.requires_table) {
-            println("  #" + e.requires_index + "," + Arrays.toString(e.attributes)
-                    + "\t// " + constantWriter.stringValues(e.attributes, " ")
-                    + " " + constantWriter.stringValue(e.requires_index));
+    protected void writeRequiresTable(ModuleRequires_attribute.Entry[] entries,
+            boolean service) {
+        println(entries.length + "\t// " + (service ? "services" : "modules"));
+        indent(+1);
+        for (ModuleRequires_attribute.Entry e: entries) {
+            print("#" + e.index + "," + String.format("%x", e.flags)+ "\t// requires");
+            if ((e.flags & ModuleRequires_attribute.MR_OPTIONAL) != 0)
+                print(" optional");
+            if ((e.flags & ModuleRequires_attribute.MR_LOCAL) != 0)
+                print(" local");
+            if ((e.flags & ModuleRequires_attribute.MR_PUBLIC) != 0)
+                print(" public");
+            if ((e.flags & ModuleRequires_attribute.MR_SYNTHETIC) != 0)
+                print(" (synthetic)");
+            if (service)
+                print(" service");
+            println(" " + constantWriter.stringValue(e.index));
         }
-        return null;
+        indent(-1);
     }
 
     public Void visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, Void ignore) {
diff --git a/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java b/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java
index 331a7b9..8ba0a82 100644
--- a/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java
@@ -202,13 +202,16 @@ public class ClassWriter extends BasicWriter {
         if (options.verbose) {
             println();
             indent(+1);
-            attrWriter.write(cf, cf.attributes, constant_pool);
+            if (options.compat)
+                attrWriter.write(cf, cf.attributes, constant_pool);
             println("minor version: " + cf.minor_version);
             println("major version: " + cf.major_version);
             if (!options.compat)
               writeList("flags: ", flags.getClassFlags(), NEWLINE);
             indent(-1);
             constantWriter.writeConstantPool();
+            if (!options.compat)
+                attrWriter.write(cf, cf.attributes, constant_pool);
         } else {
             print(" ");
         }
diff --git a/langtools/src/share/classes/javax/lang/model/element/ModuleElement.java b/langtools/src/share/classes/javax/lang/model/element/ModuleElement.java
index b3e165c..d3609a3 100644
--- a/langtools/src/share/classes/javax/lang/model/element/ModuleElement.java
+++ b/langtools/src/share/classes/javax/lang/model/element/ModuleElement.java
@@ -25,26 +25,21 @@
 
 package javax.lang.model.element;
 
-import java.util.List;
-
 /** Interim API. */
 public interface ModuleElement extends Element {
+
+    // consider using java.lang.module.ModuleId
     interface ModuleId {
         CharSequence getName();
         CharSequence getVersion();
     }
 
+    // consider using java.lang.module.ModuleIdQuery
     interface ModuleIdQuery {
         CharSequence getName();
         CharSequence getVersionQuery();
     }
 
-    interface ModuleRequires {
-        ModuleIdQuery getModuleIdQuery();
-        List<? extends CharSequence> getFlags();
-    }
-
     ModuleId getModuleId();
-    List<? extends ModuleRequires> getRequires();
 
 }
diff --git a/langtools/src/share/classes/javax/tools/ModuleFileManager.java b/langtools/src/share/classes/javax/tools/ModuleFileManager.java
index 63babea..c4aa1a6 100644
--- a/langtools/src/share/classes/javax/tools/ModuleFileManager.java
+++ b/langtools/src/share/classes/javax/tools/ModuleFileManager.java
@@ -36,12 +36,31 @@ public interface ModuleFileManager extends JavaFileManager {
 
     enum ModuleMode { SINGLE, MULTIPLE };
 
+    /**
+     * Determine if the file manager is running in "single module mode"
+     * or "multiple module mode". This affects how files are written to
+     * the class output directory.
+     * Multiple module mode is active if a module path has been set,
+     * but not a class path.
+     */
     ModuleMode getModuleMode();
 
+    /**
+     * Get a location representing the "container" for a file object
+     * for a compilation unit in a given package.
+     */
     Location getModuleLocation(Location location, JavaFileObject fo, String packageName)
             throws IllegalArgumentException;
 
+    /**
+     * Get the set of "module locations" available on a "module path",
+     * where each "module location" is determined by the existence of
+     * a subdirectory on the path containing a module-info file.
+     */
     Iterable<? extends Location> getModuleLocations(Location location);
 
+    /**
+     * Join a set of locations into a "search path".
+     */
     Location join(Iterable<? extends Location> locations);
 }
diff --git a/langtools/test/Makefile b/langtools/test/Makefile
index 7f6435f..8964a00 100644
--- a/langtools/test/Makefile
+++ b/langtools/test/Makefile
@@ -19,6 +19,7 @@
 # Get OS/ARCH specifics
 OSNAME = $(shell uname -s)
 ifeq ($(OSNAME), SunOS)
+  SLASH_JAVA = /java
   PLATFORM = solaris
   JT_PLATFORM = solaris
   ARCH = $(shell uname -p)
@@ -27,6 +28,7 @@ ifeq ($(OSNAME), SunOS)
   endif
 endif
 ifeq ($(OSNAME), Linux)
+  SLASH_JAVA = /java
   PLATFORM = linux
   JT_PLATFORM = linux
   ARCH = $(shell uname -m)
@@ -35,7 +37,16 @@ ifeq ($(OSNAME), Linux)
   endif
 endif
 ifeq ($(OSNAME), Windows_NT)
+  # MKS
+  PLATFORM=windows
+endif
+ifeq ($(PLATFORM),)
   PLATFORM = windows
+  CYGPATH = | cygpath -m -s -f -
+endif
+
+ifeq ($(PLATFORM), windows)
+  SLASH_JAVA = J:
   JT_PLATFORM = win32
   ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),ia64)
     ARCH=ia64
@@ -54,7 +65,7 @@ ifeq ($(OSNAME), Windows_NT)
 endif
 
 # Root of this test area (important to use full paths in some places)
-TEST_ROOT := $(shell pwd)
+TEST_ROOT := $(shell pwd $(CYGPATH) )
 
 # Default bundle of all test results (passed or not) (JPRT only)
 ifdef JPRT_JOB_ID
@@ -72,7 +83,7 @@ endif
 ifdef JPRT_JTREG_HOME
   JTREG_HOME = $(JPRT_JTREG_HOME)
 else
-  JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
+  JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.1/promoted/latest/binaries/jtreg
 endif
 JTREG = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtreg
 JTDIFF = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtdiff
@@ -81,7 +92,7 @@ JTDIFF = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtdiff
 ifdef JPRT_JCK_HOME
   JCK_HOME = $(JPRT_JCK_HOME)
 else
-  JCK_HOME = $(SLASH_JAVA)/re/jck/7/promoted/latest/binaries
+  JCK_HOME = $(SLASH_JAVA)/re/jck/8/promoted/latest/binaries
 endif
 
 # Default JDK for JTREG and JCK
@@ -93,7 +104,7 @@ endif
 ifdef JPRT_JAVA_HOME
   JT_JAVA = $(JPRT_JAVA_HOME)
 else
-  JT_JAVA = $(SLASH_JAVA)/re/jdk/1.6.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
+  JT_JAVA = $(SLASH_JAVA)/re/jdk/1.7.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
 endif
 
 # Default JDK to test
@@ -195,7 +206,7 @@ TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools
 ABS_TEST_OUTPUT_DIR := \
 	$(shell mkdir -p $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools; \
 		cd  $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools; \
-		pwd )
+		pwd $(CYGPATH))
 # Subdirectories for different test runs
 JTREG_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jtreg
 JCK_COMPILER_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jck-compiler
@@ -272,15 +283,17 @@ jtreg-summary: FRC
 	fi
 
 # Check to make sure these directories exist
-check-jtreg: $(JT_HOME) $(PRODUCT_HOME) $(JTREG)
+check-jtreg: $(PRODUCT_HOME) $(JTREG)
 
 
 # Run JCK-compiler tests
 #
 # JCK_HOME
 #	Installed location of JCK: should include JCK-compiler, and JCK-extras
+#       Default is JCK 8.
 # JT_JAVA
 #	Version of java used to run JCK.  Should normally be the same as TESTJAVA
+#       Default is JDK 7
 # TESTJAVA
 # 	Version of java to be tested.  
 # JCK_COMPILER_OPTIONS
@@ -297,7 +310,7 @@ jck-compiler-tests: check-jck FRC
 	    $(JCK_COMPILER_OUTPUT_DIR)/diff.html $(JCK_COMPILER_OUTPUT_DIR)/status.txt
 	@mkdir -p $(JCK_COMPILER_OUTPUT_DIR)
 	$(JT_JAVA)/bin/java -XX:MaxPermSize=256m -Xmx512m \
-	    -jar $(JCK_HOME)/JCK-compiler-7/lib/jtjck.jar \
+	    -jar $(JCK_HOME)/JCK-compiler-8/lib/jtjck.jar \
 	    -v:non-pass \
             -r:$(JCK_COMPILER_OUTPUT_DIR)/report \
             -w:$(JCK_COMPILER_OUTPUT_DIR)/work \
@@ -346,7 +359,7 @@ jck-runtime-tests: check-jck FRC
 	    $(JCK_RUNTIME_OUTPUT_DIR)/diff.html $(JCK_RUNTIME_OUTPUT_DIR)/status.txt
 	@mkdir -p $(JCK_RUNTIME_OUTPUT_DIR)
 	$(JT_JAVA)/bin/java -XX:MaxPermSize=256m -Xmx512m \
-	    -jar $(JCK_HOME)/JCK-runtime-7/lib/jtjck.jar \
+	    -jar $(JCK_HOME)/JCK-runtime-8/lib/jtjck.jar \
 	    -v:non-pass \
             -r:$(JCK_RUNTIME_OUTPUT_DIR)/report \
             -w:$(JCK_RUNTIME_OUTPUT_DIR)/work \
@@ -373,7 +386,7 @@ jck-runtime-summary: FRC
 	fi
 
 # Check to make sure these directories exist
-check-jck: $(JT_HOME) $(JCK_HOME) $(PRODUCT_HOME)
+check-jck: $(JCK_HOME) $(PRODUCT_HOME)
 
 all-summary: FRC
 	if [ -n "`find $(TEST_OUTPUT_DIR) -name status.txt`" ]; then
diff --git a/langtools/test/tools/javac/4846262/Test.sh b/langtools/test/tools/javac/4846262/Test.sh
index 15ef247..fd0da0a 100644
--- a/langtools/test/tools/javac/4846262/Test.sh
+++ b/langtools/test/tools/javac/4846262/Test.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -f
 
 #
-# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -72,7 +72,7 @@ rm -f Test.java Test.out
 diff ${DIFFOPTS} -c "${TESTSRC}${FS}Test.out" Test.out
 result=$?
 
-if [ $result -eq o ]
+if [ $result -eq 0 ]
 then
   echo "Passed"
 else
diff --git a/langtools/test/tools/javac/6304921/TestLog.java b/langtools/test/tools/javac/6304921/TestLog.java
index 32217a4..2e3b3bd 100644
--- a/langtools/test/tools/javac/6304921/TestLog.java
+++ b/langtools/test/tools/javac/6304921/TestLog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ import java.net.URI;
 import javax.tools.JavaFileObject;
 import javax.tools.SimpleJavaFileObject;
 import com.sun.tools.javac.file.JavacFileManager;
+import com.sun.tools.javac.parser.EndPosTable;
 import com.sun.tools.javac.parser.Parser;
 import com.sun.tools.javac.parser.ParserFactory;
 import com.sun.tools.javac.tree.JCTree;
@@ -97,9 +98,9 @@ public class TestLog
     }
 
     private static class LogTester extends TreeScanner {
-        LogTester(Log log, java.util.Map<JCTree, Integer> endPositions) {
+        LogTester(Log log, EndPosTable endPosTable) {
             this.log = log;
-            this.endPositions = endPositions;
+            this.endPosTable = endPosTable;
         }
 
         public void visitIf(JCTree.JCIf tree) {
@@ -117,7 +118,7 @@ public class TestLog
         }
 
         private Log log;
-        private java.util.Map<JCTree, Integer> endPositions;
+        private EndPosTable endPosTable;
     }
 
     private static class StringJavaFileObject extends SimpleJavaFileObject {
diff --git a/langtools/test/tools/javac/6410653/T6410653.java b/langtools/test/tools/javac/6410653/T6410653.java
index b1acfad..29d63ed 100644
--- a/langtools/test/tools/javac/6410653/T6410653.java
+++ b/langtools/test/tools/javac/6410653/T6410653.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @author  Peter von der Ah\u00e9
  */
 
-import java.lang.reflect.Method;
+import java.lang.reflect.Field;
 import java.io.File;
 import java.io.ByteArrayOutputStream;
 import javax.tools.*;
@@ -39,12 +39,13 @@ public class T6410653 {
         String source = new File(testSrc, "T6410653.java").getPath();
         ClassLoader cl = ToolProvider.getSystemToolClassLoader();
         Tool compiler = ToolProvider.getSystemJavaCompiler();
-        Class<?> main = Class.forName("com.sun.tools.javac.main.Main", true, cl);
-        Method useRawMessages = main.getMethod("useRawMessages", boolean.class);
-        useRawMessages.invoke(null, true);
+        Class<?> log = Class.forName("com.sun.tools.javac.util.Log", true, cl);
+        Field useRawMessages = log.getDeclaredField("useRawMessages");
+        useRawMessages.setAccessible(true);
+        useRawMessages.setBoolean(null, true);
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         compiler.run(null, null, out, "-d", source, source);
-        useRawMessages.invoke(null, false);
+        useRawMessages.setBoolean(null, false);
         if (!out.toString().equals(String.format("%s%n%s%n",
                                                  "javac: javac.err.file.not.directory",
                                                  "javac.msg.usage"))) {
diff --git a/langtools/test/tools/javac/7102515/T7102515.java b/langtools/test/tools/javac/7102515/T7102515.java
new file mode 100644
index 0000000..da9ec63
--- /dev/null
+++ b/langtools/test/tools/javac/7102515/T7102515.java
@@ -0,0 +1,11 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 7102515
+ * @summary javac running very very long and not returning
+ * @compile/fail/ref=T7102515.out -XDrawDiagnostics T7102515.java
+ */
+
+class T7102515 {
+    T7102515 badBinary = new T7102515() + new T7102515();
+    Object badUnary = badBinary++;
+}
diff --git a/langtools/test/tools/javac/7102515/T7102515.out b/langtools/test/tools/javac/7102515/T7102515.out
new file mode 100644
index 0000000..00df520
--- /dev/null
+++ b/langtools/test/tools/javac/7102515/T7102515.out
@@ -0,0 +1,3 @@
+T7102515.java:9:41: compiler.err.operator.cant.be.applied.1: +, T7102515, T7102515
+T7102515.java:10:32: compiler.err.operator.cant.be.applied: ++, T7102515, null
+2 errors
diff --git a/langtools/test/tools/javac/T7093325.java b/langtools/test/tools/javac/T7093325.java
new file mode 100644
index 0000000..42ea3bc
--- /dev/null
+++ b/langtools/test/tools/javac/T7093325.java
@@ -0,0 +1,262 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 7093325
+ * @summary Redundant entry in bytecode exception table
+ */
+
+import com.sun.source.util.JavacTask;
+import com.sun.tools.classfile.Attribute;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.Code_attribute;
+import com.sun.tools.classfile.ConstantPool.*;
+import com.sun.tools.classfile.Method;
+import com.sun.tools.javac.api.JavacTool;
+
+import java.io.File;
+import java.net.URI;
+import java.util.Arrays;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
+
+
+public class T7093325 {
+
+    /** global decls ***/
+
+    // Create a single file manager and reuse it for each compile to save time.
+    static StandardJavaFileManager fm = JavacTool.create().getStandardFileManager(null, null, null);
+
+    //statistics
+    static int checkCount = 0;
+
+    enum StatementKind {
+        THROW("throw new RuntimeException();", false, false),
+        RETURN_NONEMPTY("System.out.println(); return;", true, false),
+        RETURN_EMPTY("return;", true, true),
+        APPLY("System.out.println();", true, false);
+
+        String stmt;
+        boolean canInline;
+        boolean empty;
+
+        private StatementKind(String stmt, boolean canInline, boolean empty) {
+            this.stmt = stmt;
+            this.canInline = canInline;
+            this.empty = empty;
+        }
+    }
+
+    enum CatchArity {
+        NONE(""),
+        ONE("catch (A a) { #S1 }"),
+        TWO("catch (B b) { #S2 }"),
+        THREE("catch (C c) { #S3 }"),
+        FOUR("catch (D d) { #S4 }");
+
+        String catchStr;
+
+        private CatchArity(String catchStr) {
+            this.catchStr = catchStr;
+        }
+
+        String catchers() {
+            if (this.ordinal() == 0) {
+                return catchStr;
+            } else {
+                return CatchArity.values()[this.ordinal() - 1].catchers() + catchStr;
+            }
+        }
+    }
+
+    public static void main(String... args) throws Exception {
+        for (CatchArity ca : CatchArity.values()) {
+            for (StatementKind stmt0 : StatementKind.values()) {
+                if (ca.ordinal() == 0) {
+                    new T7093325(ca, stmt0).compileAndCheck();
+                    continue;
+                }
+                for (StatementKind stmt1 : StatementKind.values()) {
+                    if (ca.ordinal() == 1) {
+                        new T7093325(ca, stmt0, stmt1).compileAndCheck();
+                        continue;
+                    }
+                    for (StatementKind stmt2 : StatementKind.values()) {
+                        if (ca.ordinal() == 2) {
+                            new T7093325(ca, stmt0, stmt1, stmt2).compileAndCheck();
+                            continue;
+                        }
+                        for (StatementKind stmt3 : StatementKind.values()) {
+                            if (ca.ordinal() == 3) {
+                                new T7093325(ca, stmt0, stmt1, stmt2, stmt3).compileAndCheck();
+                                continue;
+                            }
+                            for (StatementKind stmt4 : StatementKind.values()) {
+                                if (ca.ordinal() == 4) {
+                                    new T7093325(ca, stmt0, stmt1, stmt2, stmt3, stmt4).compileAndCheck();
+                                    continue;
+                                }
+                                for (StatementKind stmt5 : StatementKind.values()) {
+                                    new T7093325(ca, stmt0, stmt1, stmt2, stmt3, stmt4, stmt5).compileAndCheck();
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        System.out.println("Total checks made: " + checkCount);
+    }
+
+    /** instance decls **/
+
+    CatchArity ca;
+    StatementKind[] stmts;
+
+    public T7093325(CatchArity ca, StatementKind... stmts) {
+        this.ca = ca;
+        this.stmts = stmts;
+    }
+
+    void compileAndCheck() throws Exception {
+        final JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
+        JavaSource source = new JavaSource();
+        JavacTask ct = (JavacTask)tool.getTask(null, fm, null,
+                null, null, Arrays.asList(source));
+        ct.call();
+        verifyBytecode(source);
+    }
+
+    void verifyBytecode(JavaSource source) {
+        checkCount++;
+        boolean lastInlined = false;
+        boolean hasCode = false;
+        int gapsCount = 0;
+        for (int i = 0; i < stmts.length ; i++) {
+            lastInlined = stmts[i].canInline;
+            hasCode = hasCode || !stmts[i].empty;
+            if (lastInlined && hasCode) {
+                hasCode = false;
+                gapsCount++;
+            }
+        }
+        if (!lastInlined) {
+            gapsCount++;
+        }
+
+        //System.out.printf("gaps %d \n %s \n", gapsCount, source.toString());
+
+        File compiledTest = new File("Test.class");
+        try {
+            ClassFile cf = ClassFile.read(compiledTest);
+            if (cf == null) {
+                throw new Error("Classfile not found: " + compiledTest.getName());
+            }
+
+            Method test_method = null;
+            for (Method m : cf.methods) {
+                if (m.getName(cf.constant_pool).equals("test")) {
+                    test_method = m;
+                    break;
+                }
+            }
+
+            if (test_method == null) {
+                throw new Error("Method test() not found in class Test");
+            }
+
+            Code_attribute code = null;
+            for (Attribute a : test_method.attributes) {
+                if (a.getName(cf.constant_pool).equals(Attribute.Code)) {
+                    code = (Code_attribute)a;
+                    break;
+                }
+            }
+
+            if (code == null) {
+                throw new Error("Code attribute not found in method test()");
+            }
+
+            int actualGapsCount = 0;
+            for (int i = 0; i < code.exception_table_langth ; i++) {
+                int catchType = code.exception_table[i].catch_type;
+                if (catchType == 0) { //any
+                    actualGapsCount++;
+                }
+            }
+
+            if (actualGapsCount != gapsCount) {
+                throw new Error("Bad exception table for test()\n" +
+                            "expected gaps: " + gapsCount + "\n" +
+                            "found gaps: " + actualGapsCount + "\n" +
+                            source);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new Error("error reading " + compiledTest +": " + e);
+        }
+
+    }
+
+    class JavaSource extends SimpleJavaFileObject {
+
+        static final String source_template =
+                "class A extends RuntimeException {} \n" +
+                "class B extends RuntimeException {} \n" +
+                "class C extends RuntimeException {} \n" +
+                "class D extends RuntimeException {} \n" +
+                "class E extends RuntimeException {} \n" +
+                "class Test {\n" +
+                "   void test() {\n" +
+                "   try { #S0 } #C finally { System.out.println(); }\n" +
+                "   }\n" +
+                "}";
+
+        String source;
+
+        public JavaSource() {
+            super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+            source = source_template.replace("#C", ca.catchers());
+            source = source.replace("#S0", stmts[0].stmt);
+            for (int i = 1; i < ca.ordinal() + 1; i++) {
+                source = source.replace("#S" + i, stmts[i].stmt);
+            }
+        }
+
+        @Override
+        public String toString() {
+            return source;
+        }
+
+        @Override
+        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+            return source;
+        }
+    }
+}
diff --git a/langtools/test/tools/javac/T7120266.java b/langtools/test/tools/javac/T7120266.java
new file mode 100644
index 0000000..f33db02
--- /dev/null
+++ b/langtools/test/tools/javac/T7120266.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 7120266
+ * @summary javac fails to compile hotspot code
+ * @compile T7120266.java
+ */
+
+class T7120266 {
+   void test(int i, int len) { that(i < len, "oopmap"); }
+   void that(boolean b, String s) { };
+}
diff --git a/langtools/test/tools/javac/api/T6838467.java b/langtools/test/tools/javac/api/T6838467.java
index 5087797..1dccda3 100644
--- a/langtools/test/tools/javac/api/T6838467.java
+++ b/langtools/test/tools/javac/api/T6838467.java
@@ -32,7 +32,6 @@ import java.util.*;
 import java.util.zip.*;
 import javax.tools.*;
 import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.main.OptionName;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.Options;
 
diff --git a/langtools/test/tools/javac/api/TestJavacTaskScanner.java b/langtools/test/tools/javac/api/TestJavacTaskScanner.java
index 40bde16..ba50138 100644
--- a/langtools/test/tools/javac/api/TestJavacTaskScanner.java
+++ b/langtools/test/tools/javac/api/TestJavacTaskScanner.java
@@ -32,6 +32,7 @@
 
 import com.sun.tools.javac.api.JavacTaskImpl;
 import com.sun.tools.javac.parser.*;
+import com.sun.tools.javac.parser.Tokens.Token;
 import com.sun.tools.javac.util.*;
 import java.io.*;
 import java.net.*;
@@ -93,7 +94,7 @@ public class TestJavacTaskScanner extends ToolTester {
 
         check(numTokens, "#Tokens", 1222);
         check(numParseTypeElements, "#parseTypeElements", 136);
-        check(numAllMembers, "#allMembers", 67);
+        check(numAllMembers, "#allMembers", 52);
     }
 
     void check(int value, String name, int expected) {
@@ -206,7 +207,8 @@ class MyScanner extends Scanner {
 
     public void nextToken() {
         super.nextToken();
-        System.err.format("Saw token %s (%s)%n", token(), name());
+        Token tk = token();
+        System.err.format("Saw token %s %n", tk.kind);
         test.numTokens++;
     }
 
diff --git a/langtools/test/tools/javac/depDocComment/DeprecatedDocComment3.java b/langtools/test/tools/javac/depDocComment/DeprecatedDocComment3.java
new file mode 100644
index 0000000..d7f4dbc
--- /dev/null
+++ b/langtools/test/tools/javac/depDocComment/DeprecatedDocComment3.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+/**
+ * @test
+ * @bug 7096014
+ * @summary Javac tokens should retain state
+ * @compile -Xlint -Werror DeprecatedDocComment3.java
+ */
+
+class DeprecatedDocComment3 {
+    static class Foo { }
+
+    ; /** @deprecated */ ;
+
+    static class A {}
+
+    static class B {
+       A a; //not deprecated!
+    }
+}
diff --git a/langtools/test/tools/javac/depDocComment/DeprecatedDocComment4.java b/langtools/test/tools/javac/depDocComment/DeprecatedDocComment4.java
new file mode 100644
index 0000000..9e7d936
--- /dev/null
+++ b/langtools/test/tools/javac/depDocComment/DeprecatedDocComment4.java
@@ -0,0 +1,20 @@
+/**
+ * @test  /nodynamiccopyright/
+ * @bug 7104201
+ * @summary Refactor DocCommentScanner
+ * @compile/fail/ref=DeprecatedDocComment4.out -XDrawDiagnostics -Werror -Xlint:dep-ann DeprecatedDocComment4.java
+ */
+
+class DeprecatedDocComment4 {
+    /** @deprecated **/
+    /* block */
+    void test1() {};
+
+    /** @deprecated **/
+    /** double javadoc */
+    void test2() {};
+
+    /** @deprecated **/
+    //line comment
+    void test3() {};
+}
diff --git a/langtools/test/tools/javac/depDocComment/DeprecatedDocComment4.out b/langtools/test/tools/javac/depDocComment/DeprecatedDocComment4.out
new file mode 100644
index 0000000..88622ac
--- /dev/null
+++ b/langtools/test/tools/javac/depDocComment/DeprecatedDocComment4.out
@@ -0,0 +1,6 @@
+DeprecatedDocComment4.java:11:10: compiler.warn.missing.deprecated.annotation
+DeprecatedDocComment4.java:15:10: compiler.warn.missing.deprecated.annotation
+DeprecatedDocComment4.java:19:10: compiler.warn.missing.deprecated.annotation
+- compiler.err.warnings.and.werror
+1 error
+3 warnings
diff --git a/langtools/test/tools/javac/diags/ArgTypeCompilerFactory.java b/langtools/test/tools/javac/diags/ArgTypeCompilerFactory.java
index 0c8c215..6c5ef03 100644
--- a/langtools/test/tools/javac/diags/ArgTypeCompilerFactory.java
+++ b/langtools/test/tools/javac/diags/ArgTypeCompilerFactory.java
@@ -35,7 +35,7 @@ import com.sun.tools.javac.code.*;
 import com.sun.tools.javac.file.*;
 import com.sun.tools.javac.main.Main;
 import com.sun.tools.javac.main.JavaCompiler;
-import com.sun.tools.javac.parser.Token;
+import com.sun.tools.javac.parser.Tokens.TokenKind;
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.AbstractDiagnosticFormatter.SimpleConfiguration;
 import javax.lang.model.SourceVersion;
@@ -105,13 +105,11 @@ class ArgTypeCompilerFactory implements Example.Compiler.Factory {
 
             Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjectsFromFiles(files);
 
-            JavacTaskImpl t = (JavacTaskImpl) tool.getTask(out, fm, null, opts, null, fos);
-            Context c = t.getContext();
+            Context c = new Context();
             ArgTypeMessages.preRegister(c);
             ArgTypeJavaCompiler.preRegister(c);
-            Boolean ok = t.call();
-
-            return ok;
+            JavacTaskImpl t = (JavacTaskImpl) tool.getTask(out, fm, null, opts, null, fos, c);
+            return t.call();
         }
     }
 
@@ -319,7 +317,7 @@ class ArgTypeCompilerFactory implements Example.Compiler.Factory {
             return "modifier";
         if (o instanceof KindName)
             return "symbol kind";
-        if (o instanceof Token)
+        if (o instanceof TokenKind)
             return "token";
         if (o instanceof Symbol)
             return "symbol";
diff --git a/langtools/test/tools/javac/diags/examples/ApplicableMethodFound.java b/langtools/test/tools/javac/diags/examples/ApplicableMethodFound.java
new file mode 100644
index 0000000..6755449
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/ApplicableMethodFound.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+// key: compiler.misc.applicable.method.found
+// key: compiler.note.verbose.resolve.multi
+// options: -XDverboseResolution=applicable,success
+
+class ApplicableMethodFound {
+
+    void m() {}
+
+    { m(); }
+}
diff --git a/langtools/test/tools/javac/diags/examples/ApplicableMethodFound1.java b/langtools/test/tools/javac/diags/examples/ApplicableMethodFound1.java
new file mode 100644
index 0000000..7764d50
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/ApplicableMethodFound1.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+// key: compiler.misc.applicable.method.found.1
+// key: compiler.note.verbose.resolve.multi
+// key: compiler.misc.full.inst.sig
+// options: -XDverboseResolution=applicable,success
+
+class ApplicableMethodFound1 {
+
+    <X> void m(X x) {}
+
+    { m(1); }
+}
diff --git a/langtools/test/tools/javac/diags/examples/CatchWithoutTry.java b/langtools/test/tools/javac/diags/examples/CatchWithoutTry.java
index 2fa7070..51eebed 100644
--- a/langtools/test/tools/javac/diags/examples/CatchWithoutTry.java
+++ b/langtools/test/tools/javac/diags/examples/CatchWithoutTry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,6 @@
 
 // key: compiler.err.catch.without.try
 // key: compiler.err.expected
-// key: compiler.err.not.stmt
 
 class CatchWithoutTry {
     void m() {
diff --git a/langtools/test/tools/javac/diags/examples/DeferredMethodInst.java b/langtools/test/tools/javac/diags/examples/DeferredMethodInst.java
new file mode 100644
index 0000000..ff56e5e
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/DeferredMethodInst.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+// key: compiler.misc.applicable.method.found.1
+// key: compiler.note.verbose.resolve.multi
+// key: compiler.note.deferred.method.inst
+// key: compiler.misc.partial.inst.sig
+// options: -XDverboseResolution=applicable,success,deferred-inference
+
+class DeferredMethodInst {
+
+    <X> X m() { return null; }
+
+    { Integer i = m(); }
+}
diff --git a/langtools/test/tools/javac/diags/examples/FullInstSig.java b/langtools/test/tools/javac/diags/examples/FullInstSig.java
new file mode 100644
index 0000000..fc0d642
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/FullInstSig.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+// key: compiler.misc.applicable.method.found.1
+// key: compiler.note.verbose.resolve.multi
+// key: compiler.misc.full.inst.sig
+// options: -XDverboseResolution=applicable,success
+
+class FullInstSig {
+
+    <X> void m(X x) {}
+
+    { m(1); }
+}
diff --git a/langtools/test/tools/javac/diags/examples/IllegalChar.java b/langtools/test/tools/javac/diags/examples/IllegalChar.java
index 003a7b0..28bf827 100644
--- a/langtools/test/tools/javac/diags/examples/IllegalChar.java
+++ b/langtools/test/tools/javac/diags/examples/IllegalChar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,5 +24,5 @@
 // key: compiler.err.illegal.char
 
 class IllegalChar {
-    int i = #;
+    int i = `;
 }
diff --git a/langtools/test/tools/javac/diags/examples/IllegalDot.java b/langtools/test/tools/javac/diags/examples/IllegalDot.java
new file mode 100644
index 0000000..15684a5
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/IllegalDot.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+// key: compiler.err.illegal.dot
+// key: compiler.err.expected
+// key: compiler.err.illegal.start.of.type
+
+class X {
+    void m(Object.. args) { }
+}
diff --git a/langtools/test/tools/javac/diags/examples/LambdaNotSupported.java b/langtools/test/tools/javac/diags/examples/LambdaNotSupported.java
new file mode 100644
index 0000000..ea57fe4
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/LambdaNotSupported.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+// key: compiler.err.lambda.not.supported.in.source
+// options: -source 7 -Xlint:-options
+
+class LambdaNotSupported {
+    S s = ()->{};
+}
diff --git a/langtools/test/tools/javac/diags/examples/MethodReferencesNotSupported.java b/langtools/test/tools/javac/diags/examples/MethodReferencesNotSupported.java
new file mode 100644
index 0000000..df31980
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/MethodReferencesNotSupported.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+// key: compiler.err.method.references.not.supported.in.source
+// options: -source 7 -Xlint:-options
+
+class MethodReferencesNotSupported {
+    S s = A#foo;
+}
diff --git a/langtools/test/tools/javac/diags/examples/NotAStatement.java b/langtools/test/tools/javac/diags/examples/NotAStatement.java
new file mode 100644
index 0000000..39af85a
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/NotAStatement.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010, 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.
+ */
+
+// key: compiler.err.not.stmt
+
+class NotAStatement {
+    void m() {
+        x + 1;
+    }
+}
diff --git a/langtools/test/tools/javac/diags/examples/NotApplicableMethodFound.java b/langtools/test/tools/javac/diags/examples/NotApplicableMethodFound.java
new file mode 100644
index 0000000..bfd2bfb
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/NotApplicableMethodFound.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+// key: compiler.misc.not.applicable.method.found
+// key: compiler.note.verbose.resolve.multi.1
+// key: compiler.err.cant.apply.symbol.1
+// key: compiler.misc.no.conforming.assignment.exists
+// options: -XDverboseResolution=inapplicable,failure
+
+class NotApplicableMethodFound {
+
+    void m(int i) {}
+
+    { m(""); }
+}
diff --git a/langtools/test/tools/javac/diags/examples/PartialInstSig.java b/langtools/test/tools/javac/diags/examples/PartialInstSig.java
new file mode 100644
index 0000000..c095bdd
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/PartialInstSig.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+// key: compiler.misc.applicable.method.found.1
+// key: compiler.note.verbose.resolve.multi
+// key: compiler.misc.partial.inst.sig
+// options: -XDverboseResolution=applicable,success
+
+class PartialInstSig {
+
+    <X> X m() { return null; }
+
+    { m(); }
+}
diff --git a/langtools/test/tools/javac/diags/examples/UnsupportedEncoding.java b/langtools/test/tools/javac/diags/examples/UnsupportedEncoding.java
index af32e9f..49b0862 100644
--- a/langtools/test/tools/javac/diags/examples/UnsupportedEncoding.java
+++ b/langtools/test/tools/javac/diags/examples/UnsupportedEncoding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,5 +23,6 @@
 
 // key: compiler.err.unsupported.encoding
 // options: -encoding UNSUPPORTED -doe
+// run: simple
 
 class UnsupportedEncoding { }
diff --git a/langtools/test/tools/javac/diags/examples/VerboseResolveMulti.java b/langtools/test/tools/javac/diags/examples/VerboseResolveMulti.java
new file mode 100644
index 0000000..59a8d3c
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/VerboseResolveMulti.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+// key: compiler.misc.applicable.method.found
+// key: compiler.note.verbose.resolve.multi
+// options: -XDverboseResolution=applicable,success
+
+class VerboseResolveMulti {
+
+    void m() {}
+
+    { m(); }
+}
diff --git a/langtools/test/tools/javac/diags/examples/VerboseResolveMulti1.java b/langtools/test/tools/javac/diags/examples/VerboseResolveMulti1.java
new file mode 100644
index 0000000..b72f416
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/VerboseResolveMulti1.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+// key: compiler.misc.not.applicable.method.found
+// key: compiler.note.verbose.resolve.multi.1
+// key: compiler.err.cant.apply.symbol.1
+// key: compiler.misc.no.conforming.assignment.exists
+// options: -XDverboseResolution=inapplicable,failure
+
+class VerboseResolveMulti1 {
+
+    void m(int i) {}
+
+    { m(""); }
+}
diff --git a/langtools/test/tools/javac/failover/CheckAttributedTree.java b/langtools/test/tools/javac/failover/CheckAttributedTree.java
index e249689..b2e55db 100644
--- a/langtools/test/tools/javac/failover/CheckAttributedTree.java
+++ b/langtools/test/tools/javac/failover/CheckAttributedTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,12 +55,8 @@ import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticListener;
 import javax.tools.JavaFileObject;
@@ -72,8 +68,8 @@ import com.sun.source.util.TaskListener;
 import com.sun.tools.javac.api.JavacTool;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Type;
+import com.sun.tools.javac.parser.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
 import com.sun.tools.javac.tree.JCTree.JCImport;
 import com.sun.tools.javac.tree.TreeInfo;
@@ -85,6 +81,8 @@ import java.util.HashSet;
 import java.util.Set;
 import javax.lang.model.element.Element;
 
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
+
 /**
  * Utility and test program to check validity of tree positions for tree nodes.
  * The program can be run standalone, or as a jtreg test.  In standalone mode,
@@ -289,7 +287,7 @@ public class CheckAttributedTree {
             for (CompilationUnitTree t : trees) {
                JCCompilationUnit cu = (JCCompilationUnit)t;
                for (JCTree def : cu.defs) {
-                   if (def.getTag() == JCTree.CLASSDEF &&
+                   if (def.hasTag(CLASSDEF) &&
                            analyzedElems.contains(((JCTree.JCClassDecl)def).sym)) {
                        //System.out.println("Adding pair...");
                        res.add(new Pair<>(cu, def));
@@ -373,9 +371,9 @@ public class CheckAttributedTree {
 
         private boolean mandatoryType(JCTree that) {
             return that instanceof JCTree.JCExpression ||
-                    that.getTag() == JCTree.VARDEF ||
-                    that.getTag() == JCTree.METHODDEF ||
-                    that.getTag() == JCTree.CLASSDEF;
+                    that.hasTag(VARDEF) ||
+                    that.hasTag(METHODDEF) ||
+                    that.hasTag(CLASSDEF);
         }
 
         private final List<String> excludedFields = Arrays.asList("varargsElement");
@@ -419,7 +417,7 @@ public class CheckAttributedTree {
         }
 
         JavaFileObject sourcefile;
-        Map<JCTree, Integer> endPosTable;
+        EndPosTable endPosTable;
         Info encl;
     }
 
@@ -429,13 +427,13 @@ public class CheckAttributedTree {
     private class Info {
         Info() {
             tree = null;
-            tag = JCTree.ERRONEOUS;
+            tag = ERRONEOUS;
             start = 0;
             pos = 0;
             end = Integer.MAX_VALUE;
         }
 
-        Info(JCTree tree, Map<JCTree, Integer> endPosTable) {
+        Info(JCTree tree, EndPosTable endPosTable) {
             this.tree = tree;
             tag = tree.getTag();
             start = TreeInfo.getStartPos(tree);
@@ -449,7 +447,7 @@ public class CheckAttributedTree {
         }
 
         final JCTree tree;
-        final int tag;
+        final JCTree.Tag tag;
         final int start;
         final int pos;
         final int end;
@@ -457,27 +455,10 @@ public class CheckAttributedTree {
 
     /**
      * Names for tree tags.
-     * javac does not provide an API to convert tag values to strings, so this class uses
-     * reflection to determine names of public static final int values in JCTree.
      */
     private static class TreeUtil {
-        String nameFromTag(int tag) {
-            if (names == null) {
-                names = new HashMap<Integer, String>();
-                Class c = JCTree.class;
-                for (Field f : c.getDeclaredFields()) {
-                    if (f.getType().equals(int.class)) {
-                        int mods = f.getModifiers();
-                        if (Modifier.isPublic(mods) && Modifier.isStatic(mods) && Modifier.isFinal(mods)) {
-                            try {
-                                names.put(f.getInt(null), f.getName());
-                            } catch (IllegalAccessException e) {
-                            }
-                        }
-                    }
-                }
-            }
-            String name = names.get(tag);
+        String nameFromTag(JCTree.Tag tag) {
+            String name = tag.name();
             return (name == null) ? "??" : name;
         }
 
@@ -496,8 +477,6 @@ public class CheckAttributedTree {
             }
             return buf;
         }
-
-        private Map<Integer, String> names;
     }
 
     /**
diff --git a/langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java b/langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java
index 3aab739..290d083 100644
--- a/langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java
+++ b/langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java
@@ -284,7 +284,7 @@ public class DiamondAndInnerClassTest {
         try {
             ct.analyze();
         } catch (Throwable ex) {
-            throw new AssertionError("Error thron when compiling the following code:\n" + source.getCharContent(true));
+            throw new AssertionError("Error thrown when compiling the following code:\n" + source.getCharContent(true));
         }
         check();
     }
diff --git a/langtools/test/tools/javac/generics/inference/7086601/T7086601b.java b/langtools/test/tools/javac/generics/inference/7086601/T7086601b.java
index 0eceb7f..64a3c81 100644
--- a/langtools/test/tools/javac/generics/inference/7086601/T7086601b.java
+++ b/langtools/test/tools/javac/generics/inference/7086601/T7086601b.java
@@ -146,7 +146,7 @@ public class T7086601b {
         try {
             ct.analyze();
         } catch (Throwable ex) {
-            throw new AssertionError("Error thron when compiling the following code:\n" + source.getCharContent(true));
+            throw new AssertionError("Error thrown when compiling the following code:\n" + source.getCharContent(true));
         }
         check();
     }
diff --git a/langtools/test/tools/javac/generics/rare/6665356/T6665356.out b/langtools/test/tools/javac/generics/rare/6665356/T6665356.out
index 62a62e6..4994352 100644
--- a/langtools/test/tools/javac/generics/rare/6665356/T6665356.out
+++ b/langtools/test/tools/javac/generics/rare/6665356/T6665356.out
@@ -1,5 +1,5 @@
 T6665356.java:17:37: compiler.err.improperly.formed.type.param.missing
 T6665356.java:18:40: compiler.err.improperly.formed.type.inner.raw.param
-T6665356.java:26:23: compiler.err.improperly.formed.type.param.missing
+T6665356.java:26:22: compiler.err.improperly.formed.type.param.missing
 T6665356.java:27:25: compiler.err.improperly.formed.type.inner.raw.param
 4 errors
diff --git a/langtools/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java b/langtools/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java
index ae1a1cd..de34d4d 100644
--- a/langtools/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java
+++ b/langtools/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java
@@ -210,7 +210,7 @@ public class GenericOverrideTest {
         try {
             ct.analyze();
         } catch (Throwable ex) {
-            throw new AssertionError("Error thron when compiling the following code:\n" + source.getCharContent(true));
+            throw new AssertionError("Error thrown when compiling the following code:\n" + source.getCharContent(true));
         }
         check();
     }
diff --git a/langtools/test/tools/javac/javazip/Test.sh b/langtools/test/tools/javac/javazip/Test.sh
index 896b6a8..c8a59a6 100644
--- a/langtools/test/tools/javac/javazip/Test.sh
+++ b/langtools/test/tools/javac/javazip/Test.sh
@@ -47,7 +47,7 @@ case "$OS" in
     ;;
   CYGWIN* )
     FS="/"
-    SCR=`pwd | cygpath -d`
+    SCR=`pwd | cygpath -d -f -`
     ;;
   Windows* )
     FS="\\"
diff --git a/langtools/test/tools/javac/lambda/LambdaParserTest.java b/langtools/test/tools/javac/lambda/LambdaParserTest.java
new file mode 100644
index 0000000..c728f84
--- /dev/null
+++ b/langtools/test/tools/javac/lambda/LambdaParserTest.java
@@ -0,0 +1,276 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 7115050
+ * @summary Add parser support for lambda expressions
+ */
+
+import com.sun.source.util.JavacTask;
+import java.net.URI;
+import java.util.Arrays;
+import javax.tools.Diagnostic;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
+
+public class LambdaParserTest {
+
+    static int checkCount = 0;
+
+    enum LambdaKind {
+        NILARY_EXPR("()->x"),
+        NILARY_STMT("()->{ return x; }"),
+        ONEARY_SHORT_EXPR("x->x"),
+        ONEARY_SHORT_STMT("x->{ return x; }"),
+        ONEARY_EXPR("(#M1 #T1 x)->x"),
+        ONEARY_STMT("(#M1 #T1 x)->{ return x; }"),
+        TWOARY_EXPR("(#M1 #T1 x, #M2 #T2 y)->x"),
+        TWOARY_STMT("(#M1 #T1 x, #M2 #T2 y)->{ return x; }");
+
+        String lambdaTemplate;
+
+        LambdaKind(String lambdaTemplate) {
+            this.lambdaTemplate = lambdaTemplate;
+        }
+
+        String getLambdaString(LambdaParameterKind pk1, LambdaParameterKind pk2,
+                ModifierKind mk1, ModifierKind mk2) {
+            return lambdaTemplate.replaceAll("#M1", mk1.modifier)
+                    .replaceAll("#M2", mk2.modifier)
+                    .replaceAll("#T1", pk1.parameterType)
+                    .replaceAll("#T2", pk2.parameterType);
+        }
+
+        int arity() {
+            switch (this) {
+                case NILARY_EXPR:
+                case NILARY_STMT: return 0;
+                case ONEARY_SHORT_EXPR:
+                case ONEARY_SHORT_STMT:
+                case ONEARY_EXPR:
+                case ONEARY_STMT: return 1;
+                case TWOARY_EXPR:
+                case TWOARY_STMT: return 2;
+                default: throw new AssertionError("Invalid lambda kind " + this);
+            }
+        }
+
+        boolean isShort() {
+            return this == ONEARY_SHORT_EXPR ||
+                    this == ONEARY_SHORT_STMT;
+        }
+    }
+
+    enum LambdaParameterKind {
+        IMPLICIT(""),
+        EXPLIICT_SIMPLE("A"),
+        EXPLICIT_VARARGS("A..."),
+        EXPLICIT_GENERIC1("A<X>"),
+        EXPLICIT_GENERIC3("A<? extends X, ? super Y>");
+
+        String parameterType;
+
+        LambdaParameterKind(String parameterType) {
+            this.parameterType = parameterType;
+        }
+
+        boolean explicit() {
+            return this != IMPLICIT;
+        }
+    }
+
+    enum ModifierKind {
+        NONE(""),
+        FINAL("final"),
+        PUBLIC("public");
+
+        String modifier;
+
+        ModifierKind(String modifier) {
+            this.modifier = modifier;
+        }
+
+        boolean compatibleWith(LambdaParameterKind pk) {
+            switch (this) {
+                case PUBLIC: return false;
+                case FINAL: return pk != LambdaParameterKind.IMPLICIT;
+                case NONE: return true;
+                default: throw new AssertionError("Invalid modifier kind " + this);
+            }
+        }
+    }
+
+    enum ExprKind {
+        NONE("#L#S"),
+        SINGLE_PAREN1("(#L#S)"),
+        SINGLE_PAREN2("(#L)#S"),
+        DOUBLE_PAREN1("((#L#S))"),
+        DOUBLE_PAREN2("((#L)#S)"),
+        DOUBLE_PAREN3("((#L))#S");
+
+        String expressionTemplate;
+
+        ExprKind(String expressionTemplate) {
+            this.expressionTemplate = expressionTemplate;
+        }
+
+        String expressionString(LambdaParameterKind pk1, LambdaParameterKind pk2,
+                ModifierKind mk1, ModifierKind mk2, LambdaKind lk, SubExprKind sk) {
+            return expressionTemplate.replaceAll("#L", lk.getLambdaString(pk1, pk2, mk1, mk2))
+                    .replaceAll("#S", sk.subExpression);
+        }
+    }
+
+    enum SubExprKind {
+        NONE(""),
+        SELECT_FIELD(".f"),
+        SELECT_METHOD(".f()"),
+        SELECT_NEW(".new Foo()"),
+        POSTINC("++"),
+        POSTDEC("--");
+
+        String subExpression;
+
+        SubExprKind(String subExpression) {
+            this.subExpression = subExpression;
+        }
+    }
+
+    public static void main(String... args) throws Exception {
+
+        //create default shared JavaCompiler - reused across multiple compilations
+        JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
+        StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null);
+
+        for (LambdaKind lk : LambdaKind.values()) {
+            for (LambdaParameterKind pk1 : LambdaParameterKind.values()) {
+                if (lk.arity() < 1 && pk1 != LambdaParameterKind.IMPLICIT) continue;
+                for (LambdaParameterKind pk2 : LambdaParameterKind.values()) {
+                    if (lk.arity() < 2 && pk2 != LambdaParameterKind.IMPLICIT) continue;
+                    for (ModifierKind mk1 : ModifierKind.values()) {
+                        if (mk1 != ModifierKind.NONE && lk.isShort()) continue;
+                        if (lk.arity() < 1 && mk1 != ModifierKind.NONE) continue;
+                        for (ModifierKind mk2 : ModifierKind.values()) {
+                            if (lk.arity() < 2 && mk2 != ModifierKind.NONE) continue;
+                            for (SubExprKind sk : SubExprKind.values()) {
+                                for (ExprKind ek : ExprKind.values()) {
+                                    new LambdaParserTest(pk1, pk2, mk1, mk2, lk, sk, ek)
+                                            .run(comp, fm);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        System.out.println("Total check executed: " + checkCount);
+    }
+
+    LambdaParameterKind pk1;
+    LambdaParameterKind pk2;
+    ModifierKind mk1;
+    ModifierKind mk2;
+    LambdaKind lk;
+    SubExprKind sk;
+    ExprKind ek;
+    JavaSource source;
+    DiagnosticChecker diagChecker;
+
+    LambdaParserTest(LambdaParameterKind pk1, LambdaParameterKind pk2, ModifierKind mk1,
+            ModifierKind mk2, LambdaKind lk, SubExprKind sk, ExprKind ek) {
+        this.pk1 = pk1;
+        this.pk2 = pk2;
+        this.mk1 = mk1;
+        this.mk2 = mk2;
+        this.lk = lk;
+        this.sk = sk;
+        this.ek = ek;
+        this.source = new JavaSource();
+        this.diagChecker = new DiagnosticChecker();
+    }
+
+    class JavaSource extends SimpleJavaFileObject {
+
+        String template = "class Test {\n" +
+                          "   SAM s = #E;\n" +
+                          "}";
+
+        String source;
+
+        public JavaSource() {
+            super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+            source = template.replaceAll("#E", ek.expressionString(pk1, pk2, mk1, mk2, lk, sk));
+        }
+
+        @Override
+        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+            return source;
+        }
+    }
+
+    void run(JavaCompiler tool, StandardJavaFileManager fm) throws Exception {
+        JavacTask ct = (JavacTask)tool.getTask(null, fm, diagChecker,
+                Arrays.asList("-XDallowLambda"), null, Arrays.asList(source));
+        try {
+            ct.parse();
+        } catch (Throwable ex) {
+            throw new AssertionError("Error thrown when parsing the following source:\n" + source.getCharContent(true));
+        }
+        check();
+    }
+
+    void check() {
+        checkCount++;
+
+        boolean errorExpected = (lk.arity() > 0 && !mk1.compatibleWith(pk1)) ||
+                (lk.arity() > 1 && !mk2.compatibleWith(pk2));
+
+        if (lk.arity() == 2 &&
+                (pk1.explicit() != pk2.explicit() ||
+                pk1 == LambdaParameterKind.EXPLICIT_VARARGS)) {
+            errorExpected = true;
+        }
+
+        if (errorExpected != diagChecker.errorFound) {
+            throw new Error("invalid diagnostics for source:\n" +
+                source.getCharContent(true) +
+                "\nFound error: " + diagChecker.errorFound +
+                "\nExpected error: " + errorExpected);
+        }
+    }
+
+    static class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> {
+
+        boolean errorFound;
+
+        public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+            if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
+                errorFound = true;
+            }
+        }
+    }
+}
diff --git a/langtools/test/tools/javac/lambda/MethodReferenceParserTest.java b/langtools/test/tools/javac/lambda/MethodReferenceParserTest.java
new file mode 100644
index 0000000..1ce126f
--- /dev/null
+++ b/langtools/test/tools/javac/lambda/MethodReferenceParserTest.java
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 7115052
+ * @ignore 7120266
+ * @summary Add parser support for method references
+ */
+
+import com.sun.source.util.JavacTask;
+import java.net.URI;
+import java.util.Arrays;
+import javax.tools.Diagnostic;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
+
+public class MethodReferenceParserTest {
+
+    static int checkCount = 0;
+
+    enum ReferenceKind {
+        METHOD_REF("#Q##Gm"),
+        CONSTRUCTOR_REF("#Q##Gnew"),
+        FALSE_REF("min < max"),
+        ERR_SUPER("#Q##Gsuper"),
+        ERR_METH0("#Q##Gm()"),
+        ERR_METH1("#Q##Gm(X)"),
+        ERR_CONSTR0("#Q##Gnew()"),
+        ERR_CONSTR1("#Q##Gnew(X)");
+
+        String referenceTemplate;
+
+        ReferenceKind(String referenceTemplate) {
+            this.referenceTemplate = referenceTemplate;
+        }
+
+        String getReferenceString(QualifierKind qk, GenericKind gk) {
+            return referenceTemplate
+                    .replaceAll("#Q", qk.qualifier)
+                    .replaceAll("#G", gk.typeParameters);
+        }
+
+        boolean erroneous() {
+            switch (this) {
+                case ERR_SUPER:
+                case ERR_METH0:
+                case ERR_METH1:
+                case ERR_CONSTR0:
+                case ERR_CONSTR1:
+                    return true;
+                default: return false;
+            }
+        }
+    }
+
+    enum ContextKind {
+        ASSIGN("SAM s = #E;"),
+        METHOD("m(#E, i);");
+
+        String contextTemplate;
+
+        ContextKind(String contextTemplate) {
+            this.contextTemplate = contextTemplate;
+        }
+
+        String contextString(ExprKind ek, ReferenceKind rk, QualifierKind qk, GenericKind gk, SubExprKind sk) {
+            return contextTemplate.replaceAll("#E", ek.expressionString(rk, qk, gk, sk));
+        }
+    }
+
+    enum GenericKind {
+        NONE(""),
+        ONE("<X>"),
+        TWO("<X,Y>");
+
+        String typeParameters;
+
+        GenericKind(String typeParameters) {
+            this.typeParameters = typeParameters;
+        }
+    }
+
+    enum QualifierKind {
+        THIS("this"),
+        SUPER("super"),
+        NEW("new Foo()"),
+        METHOD("m()"),
+        FIELD("a.f"),
+        UBOUND_SIMPLE("A"),
+        UNBOUND_GENERIC1("A<X>"),
+        UNBOUND_GENERIC2("A<X, Y>"),
+        UNBOUND_GENERIC3("A<? extends X, ? super Y>"),
+        UNBOUND_GENERIC4("A<int[], short[][]>"),
+        NESTED_GENERIC1("A<A<X,Y>, A<X,Y>>"),
+        NESTED_GENERIC2("A<A<A<X,Y>,A<X,Y>>, A<A<X,Y>,A<X,Y>>>");
+
+        String qualifier;
+
+        QualifierKind(String qualifier) {
+            this.qualifier = qualifier;
+        }
+    }
+
+    enum ExprKind {
+        NONE("#R#S"),
+        SINGLE_PAREN1("(#R#S)"),
+        SINGLE_PAREN2("(#R)#S"),
+        DOUBLE_PAREN1("((#R#S))"),
+        DOUBLE_PAREN2("((#R)#S)"),
+        DOUBLE_PAREN3("((#R))#S");
+
+        String expressionTemplate;
+
+        ExprKind(String expressionTemplate) {
+            this.expressionTemplate = expressionTemplate;
+        }
+
+        String expressionString(ReferenceKind rk, QualifierKind qk, GenericKind gk, SubExprKind sk) {
+            return expressionTemplate
+                    .replaceAll("#R", rk.getReferenceString(qk, gk))
+                    .replaceAll("#S", sk.subExpression);
+        }
+    }
+
+    enum SubExprKind {
+        NONE(""),
+        SELECT_FIELD(".f"),
+        SELECT_METHOD(".f()"),
+        SELECT_NEW(".new Foo()"),
+        POSTINC("++"),
+        POSTDEC("--");
+
+        String subExpression;
+
+        SubExprKind(String subExpression) {
+            this.subExpression = subExpression;
+        }
+    }
+
+    public static void main(String... args) throws Exception {
+
+        //create default shared JavaCompiler - reused across multiple compilations
+        JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
+        StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null);
+
+        for (ReferenceKind rk : ReferenceKind.values()) {
+            for (QualifierKind qk : QualifierKind.values()) {
+                for (GenericKind gk : GenericKind.values()) {
+                    for (SubExprKind sk : SubExprKind.values()) {
+                        for (ExprKind ek : ExprKind.values()) {
+                            for (ContextKind ck : ContextKind.values()) {
+                                new MethodReferenceParserTest(rk, qk, gk, sk, ek, ck).run(comp, fm);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        System.out.println("Total check executed: " + checkCount);
+    }
+
+    ReferenceKind rk;
+    QualifierKind qk;
+    GenericKind gk;
+    SubExprKind sk;
+    ExprKind ek;
+    ContextKind ck;
+    JavaSource source;
+    DiagnosticChecker diagChecker;
+
+    MethodReferenceParserTest(ReferenceKind rk, QualifierKind qk, GenericKind gk, SubExprKind sk, ExprKind ek, ContextKind ck) {
+        this.rk = rk;
+        this.qk = qk;
+        this.gk = gk;
+        this.sk = sk;
+        this.ek = ek;
+        this.ck = ck;
+        this.source = new JavaSource();
+        this.diagChecker = new DiagnosticChecker();
+    }
+
+    class JavaSource extends SimpleJavaFileObject {
+
+        String template = "class Test {\n" +
+                          "   void test() {\n" +
+                          "      #C\n" +
+                          "   }" +
+                          "}";
+
+        String source;
+
+        public JavaSource() {
+            super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+            source = template.replaceAll("#C", ck.contextString(ek, rk, qk, gk, sk));
+        }
+
+        @Override
+        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+            return source;
+        }
+    }
+
+    void run(JavaCompiler tool, StandardJavaFileManager fm) throws Exception {
+        JavacTask ct = (JavacTask)tool.getTask(null, fm, diagChecker,
+                Arrays.asList("-XDallowMethodReferences"), null, Arrays.asList(source));
+        try {
+            ct.parse();
+        } catch (Throwable ex) {
+            throw new AssertionError("Error thrown when parsing the following source:\n" + source.getCharContent(true));
+        }
+        check();
+    }
+
+    void check() {
+        checkCount++;
+
+        if (diagChecker.errorFound != rk.erroneous()) {
+            throw new Error("invalid diagnostics for source:\n" +
+                source.getCharContent(true) +
+                "\nFound error: " + diagChecker.errorFound +
+                "\nExpected error: " + rk.erroneous());
+        }
+    }
+
+    static class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> {
+
+        boolean errorFound;
+
+        public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+            if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
+                errorFound = true;
+            }
+        }
+    }
+}
diff --git a/langtools/test/tools/javac/parser/JavacParserTest.java b/langtools/test/tools/javac/parser/JavacParserTest.java
new file mode 100644
index 0000000..7cfd007
--- /dev/null
+++ b/langtools/test/tools/javac/parser/JavacParserTest.java
@@ -0,0 +1,883 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 7073631
+ * @summary tests error and diagnostics positions
+ * @author  Jan Lahoda
+ */
+
+import com.sun.source.tree.BinaryTree;
+import com.sun.source.tree.BlockTree;
+import com.sun.source.tree.ClassTree;
+import com.sun.source.tree.CompilationUnitTree;
+import com.sun.source.tree.ErroneousTree;
+import com.sun.source.tree.ExpressionStatementTree;
+import com.sun.source.tree.ExpressionTree;
+import com.sun.source.tree.MethodInvocationTree;
+import com.sun.source.tree.MethodTree;
+import com.sun.source.tree.ModifiersTree;
+import com.sun.source.tree.StatementTree;
+import com.sun.source.tree.Tree;
+import com.sun.source.tree.Tree.Kind;
+import com.sun.source.tree.VariableTree;
+import com.sun.source.tree.WhileLoopTree;
+import com.sun.source.util.SourcePositions;
+import com.sun.source.util.TreeScanner;
+import com.sun.source.util.Trees;
+import com.sun.tools.javac.api.JavacTaskImpl;
+import com.sun.tools.javac.tree.JCTree;
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticCollector;
+import javax.tools.DiagnosticListener;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+public class JavacParserTest extends TestCase {
+    final JavaCompiler tool;
+    public JavacParserTest(String testName) {
+        tool = ToolProvider.getSystemJavaCompiler();
+        System.out.println("java.home=" + System.getProperty("java.home"));
+    }
+
+    static class MyFileObject extends SimpleJavaFileObject {
+
+        private String text;
+
+        public MyFileObject(String text) {
+            super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+            this.text = text;
+        }
+
+        @Override
+        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+            return text;
+        }
+    }
+    /*
+     * converts Windows to Unix style LFs for comparing strings
+     */
+    private String normalize(String in) {
+        return in.replace(System.getProperty("line.separator"), "\n");
+    }
+
+    public CompilationUnitTree getCompilationUnitTree(String code) throws IOException {
+
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null,
+                null, Arrays.asList(new MyFileObject(code)));
+        CompilationUnitTree cut = ct.parse().iterator().next();
+        return cut;
+    }
+
+    public List<String> getErroneousTreeValues(ErroneousTree node) {
+
+        List<String> values = new ArrayList<>();
+        if (node.getErrorTrees() != null) {
+            for (Tree t : node.getErrorTrees()) {
+                values.add(t.toString());
+            }
+        } else {
+            throw new RuntimeException("ERROR: No Erroneous tree "
+                    + "has been created.");
+        }
+        return values;
+    }
+
+    public void testPositionForSuperConstructorCalls() throws IOException {
+        assert tool != null;
+
+        String code = "package test; public class Test {public Test() {super();}}";
+
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null,
+                null, Arrays.asList(new MyFileObject(code)));
+        CompilationUnitTree cut = ct.parse().iterator().next();
+        SourcePositions pos = Trees.instance(ct).getSourcePositions();
+
+        MethodTree method =
+                (MethodTree) ((ClassTree) cut.getTypeDecls().get(0)).getMembers().get(0);
+        ExpressionStatementTree es =
+                (ExpressionStatementTree) method.getBody().getStatements().get(0);
+
+        final int esStartPos = code.indexOf(es.toString());
+        final int esEndPos = esStartPos + es.toString().length();
+        assertEquals("testPositionForSuperConstructorCalls",
+                esStartPos, pos.getStartPosition(cut, es));
+        assertEquals("testPositionForSuperConstructorCalls",
+                esEndPos, pos.getEndPosition(cut, es));
+
+        MethodInvocationTree mit = (MethodInvocationTree) es.getExpression();
+
+        final int mitStartPos = code.indexOf(mit.toString());
+        final int mitEndPos = mitStartPos + mit.toString().length();
+        assertEquals("testPositionForSuperConstructorCalls",
+                mitStartPos, pos.getStartPosition(cut, mit));
+        assertEquals("testPositionForSuperConstructorCalls",
+                mitEndPos, pos.getEndPosition(cut, mit));
+
+        final int methodStartPos = mitStartPos;
+        final int methodEndPos = methodStartPos + mit.getMethodSelect().toString().length();
+        assertEquals("testPositionForSuperConstructorCalls",
+                methodStartPos, pos.getStartPosition(cut, mit.getMethodSelect()));
+        assertEquals("testPositionForSuperConstructorCalls",
+                methodEndPos, pos.getEndPosition(cut, mit.getMethodSelect()));
+
+    }
+
+    public void testPositionForEnumModifiers() throws IOException {
+
+        String code = "package test; public enum Test {A;}";
+
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null,
+                null, Arrays.asList(new MyFileObject(code)));
+        CompilationUnitTree cut = ct.parse().iterator().next();
+        SourcePositions pos = Trees.instance(ct).getSourcePositions();
+
+        ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+        ModifiersTree mt = clazz.getModifiers();
+
+        assertEquals("testPositionForEnumModifiers",
+                38 - 24, pos.getStartPosition(cut, mt));
+        assertEquals("testPositionForEnumModifiers",
+                44 - 24, pos.getEndPosition(cut, mt));
+    }
+
+    public void testNewClassWithEnclosing() throws IOException {
+
+
+        String code = "package test; class Test { " +
+                "class d {} private void method() { " +
+                "Object o = Test.this.new d(); } }";
+
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null,
+                null, Arrays.asList(new MyFileObject(code)));
+        CompilationUnitTree cut = ct.parse().iterator().next();
+        SourcePositions pos = Trees.instance(ct).getSourcePositions();
+
+        ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+        ExpressionTree est =
+                ((VariableTree) ((MethodTree) clazz.getMembers().get(1)).getBody().getStatements().get(0)).getInitializer();
+
+        assertEquals("testNewClassWithEnclosing",
+                97 - 24, pos.getStartPosition(cut, est));
+        assertEquals("testNewClassWithEnclosing",
+                114 - 24, pos.getEndPosition(cut, est));
+    }
+
+    public void testPreferredPositionForBinaryOp() throws IOException {
+
+        String code = "package test; public class Test {"
+                + "private void test() {"
+                + "Object o = null; boolean b = o != null && o instanceof String;"
+                + "} private Test() {}}";
+
+        CompilationUnitTree cut = getCompilationUnitTree(code);
+        ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+        MethodTree method = (MethodTree) clazz.getMembers().get(0);
+        VariableTree condSt = (VariableTree) method.getBody().getStatements().get(1);
+        BinaryTree cond = (BinaryTree) condSt.getInitializer();
+
+        JCTree condJC = (JCTree) cond;
+        int condStartPos = code.indexOf("&&");
+        assertEquals("testPreferredPositionForBinaryOp",
+                condStartPos, condJC.pos);
+    }
+
+    public void testPositionBrokenSource126732a() throws IOException {
+        String[] commands = new String[]{
+            "return Runnable()",
+            "do { } while (true)",
+            "throw UnsupportedOperationException()",
+            "assert true",
+            "1 + 1",};
+
+        for (String command : commands) {
+
+            String code = "package test;\n"
+                    + "public class Test {\n"
+                    + "    public static void test() {\n"
+                    + "        " + command + " {\n"
+                    + "                new Runnable() {\n"
+                    + "        };\n"
+                    + "    }\n"
+                    + "}";
+            JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null,
+                    null, null, Arrays.asList(new MyFileObject(code)));
+            CompilationUnitTree cut = ct.parse().iterator().next();
+
+            ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+            MethodTree method = (MethodTree) clazz.getMembers().get(0);
+            List<? extends StatementTree> statements =
+                    method.getBody().getStatements();
+
+            StatementTree ret = statements.get(0);
+            StatementTree block = statements.get(1);
+
+            Trees t = Trees.instance(ct);
+            int len = code.indexOf(command + " {") + (command + " ").length();
+            assertEquals(command, len,
+                    t.getSourcePositions().getEndPosition(cut, ret));
+            assertEquals(command, len,
+                    t.getSourcePositions().getStartPosition(cut, block));
+        }
+    }
+
+    public void testPositionBrokenSource126732b() throws IOException {
+        String[] commands = new String[]{
+            "break",
+            "break A",
+            "continue ",
+            "continue A",};
+
+        for (String command : commands) {
+
+            String code = "package test;\n"
+                    + "public class Test {\n"
+                    + "    public static void test() {\n"
+                    + "        while (true) {\n"
+                    + "            " + command + " {\n"
+                    + "                new Runnable() {\n"
+                    + "        };\n"
+                    + "        }\n"
+                    + "    }\n"
+                    + "}";
+
+            JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null,
+                    null, null, Arrays.asList(new MyFileObject(code)));
+            CompilationUnitTree cut = ct.parse().iterator().next();
+
+            ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+            MethodTree method = (MethodTree) clazz.getMembers().get(0);
+            List<? extends StatementTree> statements =
+                    ((BlockTree) ((WhileLoopTree) method.getBody().getStatements().get(0)).getStatement()).getStatements();
+
+            StatementTree ret = statements.get(0);
+            StatementTree block = statements.get(1);
+
+            Trees t = Trees.instance(ct);
+            int len = code.indexOf(command + " {") + (command + " ").length();
+            assertEquals(command, len,
+                    t.getSourcePositions().getEndPosition(cut, ret));
+            assertEquals(command, len,
+                    t.getSourcePositions().getStartPosition(cut, block));
+        }
+    }
+
+    public void testErrorRecoveryForEnhancedForLoop142381() throws IOException {
+
+        String code = "package test; class Test { " +
+                "private void method() { " +
+                "java.util.Set<String> s = null; for (a : s) {} } }";
+
+        final List<Diagnostic<? extends JavaFileObject>> errors =
+                new LinkedList<Diagnostic<? extends JavaFileObject>>();
+
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null,
+                new DiagnosticListener<JavaFileObject>() {
+            public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+                errors.add(diagnostic);
+            }
+        }, null, null, Arrays.asList(new MyFileObject(code)));
+
+        CompilationUnitTree cut = ct.parse().iterator().next();
+
+        ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+        StatementTree forStatement =
+                ((MethodTree) clazz.getMembers().get(0)).getBody().getStatements().get(1);
+
+        assertEquals("testErrorRecoveryForEnhancedForLoop142381",
+                Kind.ENHANCED_FOR_LOOP, forStatement.getKind());
+        assertFalse("testErrorRecoveryForEnhancedForLoop142381", errors.isEmpty());
+    }
+
+    public void testPositionAnnotationNoPackage187551() throws IOException {
+
+        String code = "\n at interface Test {}";
+
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null,
+                null, Arrays.asList(new MyFileObject(code)));
+
+        CompilationUnitTree cut = ct.parse().iterator().next();
+        ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+        Trees t = Trees.instance(ct);
+
+        assertEquals("testPositionAnnotationNoPackage187551",
+                1, t.getSourcePositions().getStartPosition(cut, clazz));
+    }
+
+    public void testPositionsSane() throws IOException {
+        performPositionsSanityTest("package test; class Test { " +
+                "private void method() { " +
+                "java.util.List<? extends java.util.List<? extends String>> l; " +
+                "} }");
+        performPositionsSanityTest("package test; class Test { " +
+                "private void method() { " +
+                "java.util.List<? super java.util.List<? super String>> l; " +
+                "} }");
+        performPositionsSanityTest("package test; class Test { " +
+                "private void method() { " +
+                "java.util.List<? super java.util.List<?>> l; } }");
+    }
+
+    private void performPositionsSanityTest(String code) throws IOException {
+
+        final List<Diagnostic<? extends JavaFileObject>> errors =
+                new LinkedList<Diagnostic<? extends JavaFileObject>>();
+
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null,
+                new DiagnosticListener<JavaFileObject>() {
+
+            public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+                errors.add(diagnostic);
+            }
+        }, null, null, Arrays.asList(new MyFileObject(code)));
+
+        final CompilationUnitTree cut = ct.parse().iterator().next();
+        final Trees trees = Trees.instance(ct);
+
+        new TreeScanner<Void, Void>() {
+
+            private long parentStart = 0;
+            private long parentEnd = Integer.MAX_VALUE;
+
+            @Override
+            public Void scan(Tree node, Void p) {
+                if (node == null) {
+                    return null;
+                }
+
+                long start = trees.getSourcePositions().getStartPosition(cut, node);
+
+                if (start == (-1)) {
+                    return null; //synthetic tree
+                }
+                assertTrue(node.toString() + ":" + start + "/" + parentStart,
+                        parentStart <= start);
+
+                long prevParentStart = parentStart;
+
+                parentStart = start;
+
+                long end = trees.getSourcePositions().getEndPosition(cut, node);
+
+                assertTrue(node.toString() + ":" + end + "/" + parentEnd,
+                        end <= parentEnd);
+
+                long prevParentEnd = parentEnd;
+
+                parentEnd = end;
+
+                super.scan(node, p);
+
+                parentStart = prevParentStart;
+                parentEnd = prevParentEnd;
+
+                return null;
+            }
+
+            private void assertTrue(String message, boolean b) {
+                if (!b) fail(message);
+            }
+        }.scan(cut, null);
+    }
+
+    public void testCorrectWilcardPositions() throws IOException {
+        performWildcardPositionsTest("package test; import java.util.List; " +
+                "class Test { private void method() { List<? extends List<? extends String>> l; } }",
+
+                Arrays.asList("List<? extends List<? extends String>> l;",
+                "List<? extends List<? extends String>>",
+                "List",
+                "? extends List<? extends String>",
+                "List<? extends String>",
+                "List",
+                "? extends String",
+                "String"));
+        performWildcardPositionsTest("package test; import java.util.List; " +
+                "class Test { private void method() { List<? super List<? super String>> l; } }",
+
+                Arrays.asList("List<? super List<? super String>> l;",
+                "List<? super List<? super String>>",
+                "List",
+                "? super List<? super String>",
+                "List<? super String>",
+                "List",
+                "? super String",
+                "String"));
+        performWildcardPositionsTest("package test; import java.util.List; " +
+                "class Test { private void method() { List<? super List<?>> l; } }",
+
+                Arrays.asList("List<? super List<?>> l;",
+                "List<? super List<?>>",
+                "List",
+                "? super List<?>",
+                "List<?>",
+                "List",
+                "?"));
+        performWildcardPositionsTest("package test; import java.util.List; " +
+                "class Test { private void method() { " +
+                "List<? extends List<? extends List<? extends String>>> l; } }",
+
+                Arrays.asList("List<? extends List<? extends List<? extends String>>> l;",
+                "List<? extends List<? extends List<? extends String>>>",
+                "List",
+                "? extends List<? extends List<? extends String>>",
+                "List<? extends List<? extends String>>",
+                "List",
+                "? extends List<? extends String>",
+                "List<? extends String>",
+                "List",
+                "? extends String",
+                "String"));
+        performWildcardPositionsTest("package test; import java.util.List; " +
+                "class Test { private void method() { " +
+                "List<? extends List<? extends List<? extends String   >>> l; } }",
+                Arrays.asList("List<? extends List<? extends List<? extends String   >>> l;",
+                "List<? extends List<? extends List<? extends String   >>>",
+                "List",
+                "? extends List<? extends List<? extends String   >>",
+                "List<? extends List<? extends String   >>",
+                "List",
+                "? extends List<? extends String   >",
+                "List<? extends String   >",
+                "List",
+                "? extends String",
+                "String"));
+    }
+
+    public void performWildcardPositionsTest(final String code,
+            List<String> golden) throws IOException {
+
+        final List<Diagnostic<? extends JavaFileObject>> errors =
+                new LinkedList<Diagnostic<? extends JavaFileObject>>();
+
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null,
+                new DiagnosticListener<JavaFileObject>() {
+                    public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+                        errors.add(diagnostic);
+                    }
+                }, null, null, Arrays.asList(new MyFileObject(code)));
+
+        final CompilationUnitTree cut = ct.parse().iterator().next();
+        final List<String> content = new LinkedList<String>();
+        final Trees trees = Trees.instance(ct);
+
+        new TreeScanner<Void, Void>() {
+            @Override
+            public Void scan(Tree node, Void p) {
+                if (node == null) {
+                    return null;
+                }
+                long start = trees.getSourcePositions().getStartPosition(cut, node);
+
+                if (start == (-1)) {
+                    return null; //synthetic tree
+                }
+                long end = trees.getSourcePositions().getEndPosition(cut, node);
+                String s = code.substring((int) start, (int) end);
+                content.add(s);
+
+                return super.scan(node, p);
+            }
+        }.scan(((MethodTree) ((ClassTree) cut.getTypeDecls().get(0)).getMembers().get(0)).getBody().getStatements().get(0), null);
+
+        assertEquals("performWildcardPositionsTest",golden.toString(),
+                content.toString());
+    }
+
+    public void testStartPositionForMethodWithoutModifiers() throws IOException {
+
+        String code = "package t; class Test { <T> void t() {} }";
+
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null,
+                null, Arrays.asList(new MyFileObject(code)));
+        CompilationUnitTree cut = ct.parse().iterator().next();
+        ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+        MethodTree mt = (MethodTree) clazz.getMembers().get(0);
+        Trees t = Trees.instance(ct);
+        int start = (int) t.getSourcePositions().getStartPosition(cut, mt);
+        int end = (int) t.getSourcePositions().getEndPosition(cut, mt);
+
+        assertEquals("testStartPositionForMethodWithoutModifiers",
+                "<T> void t() {}", code.substring(start, end));
+    }
+
+    public void testStartPositionEnumConstantInit() throws IOException {
+
+        String code = "package t; enum Test { AAA; }";
+
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null,
+                null, Arrays.asList(new MyFileObject(code)));
+        CompilationUnitTree cut = ct.parse().iterator().next();
+        ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+        VariableTree enumAAA = (VariableTree) clazz.getMembers().get(0);
+        Trees t = Trees.instance(ct);
+        int start = (int) t.getSourcePositions().getStartPosition(cut,
+                enumAAA.getInitializer());
+
+        assertEquals("testStartPositionEnumConstantInit", -1, start);
+    }
+
+    public void testVariableInIfThen1() throws IOException {
+
+        String code = "package t; class Test { " +
+                "private static void t(String name) { " +
+                "if (name != null) String nn = name.trim(); } }";
+
+        DiagnosticCollector<JavaFileObject> coll =
+                new DiagnosticCollector<JavaFileObject>();
+
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, coll, null,
+                null, Arrays.asList(new MyFileObject(code)));
+
+        ct.parse();
+
+        List<String> codes = new LinkedList<String>();
+
+        for (Diagnostic<? extends JavaFileObject> d : coll.getDiagnostics()) {
+            codes.add(d.getCode());
+        }
+
+        assertEquals("testVariableInIfThen1",
+                Arrays.<String>asList("compiler.err.variable.not.allowed"),
+                codes);
+    }
+
+    public void testVariableInIfThen2() throws IOException {
+
+        String code = "package t; class Test { " +
+                "private static void t(String name) { " +
+                "if (name != null) class X {} } }";
+        DiagnosticCollector<JavaFileObject> coll =
+                new DiagnosticCollector<JavaFileObject>();
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, coll, null,
+                null, Arrays.asList(new MyFileObject(code)));
+
+        ct.parse();
+
+        List<String> codes = new LinkedList<String>();
+
+        for (Diagnostic<? extends JavaFileObject> d : coll.getDiagnostics()) {
+            codes.add(d.getCode());
+        }
+
+        assertEquals("testVariableInIfThen2",
+                Arrays.<String>asList("compiler.err.class.not.allowed"), codes);
+    }
+
+    public void testVariableInIfThen3() throws IOException {
+
+        String code = "package t; class Test { "+
+                "private static void t(String name) { " +
+                "if (name != null) abstract } }";
+        DiagnosticCollector<JavaFileObject> coll =
+                new DiagnosticCollector<JavaFileObject>();
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, coll, null,
+                null, Arrays.asList(new MyFileObject(code)));
+
+        ct.parse();
+
+        List<String> codes = new LinkedList<String>();
+
+        for (Diagnostic<? extends JavaFileObject> d : coll.getDiagnostics()) {
+            codes.add(d.getCode());
+        }
+
+        assertEquals("testVariableInIfThen3",
+                Arrays.<String>asList("compiler.err.illegal.start.of.expr"),
+                codes);
+    }
+
+    //see javac bug #6882235, NB bug #98234:
+    public void testMissingExponent() throws IOException {
+
+        String code = "\nclass Test { { System.err.println(0e); } }";
+
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null,
+                null, Arrays.asList(new MyFileObject(code)));
+
+        assertNotNull(ct.parse().iterator().next());
+    }
+
+    public void testTryResourcePos() throws IOException {
+
+        final String code = "package t; class Test { " +
+                "{ try (java.io.InputStream in = null) { } } }";
+
+        CompilationUnitTree cut = getCompilationUnitTree(code);
+
+        new TreeScanner<Void, Void>() {
+            @Override
+            public Void visitVariable(VariableTree node, Void p) {
+                if ("in".contentEquals(node.getName())) {
+                    JCTree.JCVariableDecl var = (JCTree.JCVariableDecl) node;
+                    System.out.println(node.getName() + "," + var.pos);
+                    assertEquals("testTryResourcePos", "in = null) { } } }",
+                            code.substring(var.pos));
+                }
+                return super.visitVariable(node, p);
+            }
+        }.scan(cut, null);
+    }
+
+    public void testVarPos() throws IOException {
+
+        final String code = "package t; class Test { " +
+                "{ java.io.InputStream in = null; } }";
+
+        CompilationUnitTree cut = getCompilationUnitTree(code);
+
+        new TreeScanner<Void, Void>() {
+
+            @Override
+            public Void visitVariable(VariableTree node, Void p) {
+                if ("in".contentEquals(node.getName())) {
+                    JCTree.JCVariableDecl var = (JCTree.JCVariableDecl) node;
+                    assertEquals("testVarPos","in = null; } }",
+                            code.substring(var.pos));
+                }
+                return super.visitVariable(node, p);
+            }
+        }.scan(cut, null);
+    }
+
+    // expected erroneous tree: int x = y;(ERROR);
+    public void testOperatorMissingError() throws IOException {
+
+        String code = "package test; public class ErrorTest { "
+                + "void method() { int x = y  z } }";
+        CompilationUnitTree cut = getCompilationUnitTree(code);
+        final List<String> values = new ArrayList<>();
+        final List<String> expectedValues =
+                new ArrayList<>(Arrays.asList("[z]"));
+
+        new TreeScanner<Void, Void>() {
+
+            @Override
+            public Void visitErroneous(ErroneousTree node, Void p) {
+
+                values.add(getErroneousTreeValues(node).toString());
+                return null;
+
+            }
+        }.scan(cut, null);
+
+        assertEquals("testSwitchError: The Erroneous tree "
+                + "error values: " + values
+                + " do not match expected error values: "
+                + expectedValues, values, expectedValues);
+    }
+
+    //expected erroneous tree:  String s = (ERROR);
+    public void testMissingParenthesisError() throws IOException {
+
+        String code = "package test; public class ErrorTest { "
+                + "void f() {String s = new String; } }";
+        CompilationUnitTree cut = getCompilationUnitTree(code);
+        final List<String> values = new ArrayList<>();
+        final List<String> expectedValues =
+                new ArrayList<>(Arrays.asList("[new String()]"));
+
+        new TreeScanner<Void, Void>() {
+
+            @Override
+            public Void visitErroneous(ErroneousTree node, Void p) {
+
+                values.add(getErroneousTreeValues(node).toString());
+                return null;
+            }
+        }.scan(cut, null);
+
+        assertEquals("testSwitchError: The Erroneous tree "
+                + "error values: " + values
+                + " do not match expected error values: "
+                + expectedValues, values, expectedValues);
+    }
+
+    //expected erroneous tree: package test; (ERROR)(ERROR)
+    public void testMissingClassError() throws IOException {
+
+        String code = "package Test; clas ErrorTest {  "
+                + "void f() {String s = new String(); } }";
+        CompilationUnitTree cut = getCompilationUnitTree(code);
+        final List<String> values = new ArrayList<>();
+        final List<String> expectedValues =
+                new ArrayList<>(Arrays.asList("[, clas]", "[]"));
+
+        new TreeScanner<Void, Void>() {
+
+            @Override
+            public Void visitErroneous(ErroneousTree node, Void p) {
+
+                values.add(getErroneousTreeValues(node).toString());
+                return null;
+            }
+        }.scan(cut, null);
+
+        assertEquals("testSwitchError: The Erroneous tree "
+                + "error values: " + values
+                + " do not match expected error values: "
+                + expectedValues, values, expectedValues);
+    }
+
+    //expected erroneous tree: void m1(int i) {(ERROR);{(ERROR);}
+    public void testSwitchError() throws IOException {
+
+        String code = "package test; public class ErrorTest { "
+                + "int numDays; void m1(int i) { switchh {i} { case 1: "
+                + "numDays = 31; break; } } }";
+        CompilationUnitTree cut = getCompilationUnitTree(code);
+        final List<String> values = new ArrayList<>();
+        final List<String> expectedValues =
+                new ArrayList<>(Arrays.asList("[switchh]", "[i]"));
+
+        new TreeScanner<Void, Void>() {
+
+            @Override
+            public Void visitErroneous(ErroneousTree node, Void p) {
+
+                values.add(getErroneousTreeValues(node).toString());
+                return null;
+            }
+        }.scan(cut, null);
+
+        assertEquals("testSwitchError: The Erroneous tree "
+                + "error values: " + values
+                + " do not match expected error values: "
+                + expectedValues, values, expectedValues);
+    }
+
+    //expected erroneous tree: class ErrorTest {(ERROR)
+    public void testMethodError() throws IOException {
+
+        String code = "package Test; class ErrorTest {  "
+                + "static final void f) {String s = new String(); } }";
+        CompilationUnitTree cut = getCompilationUnitTree(code);
+        final List<String> values = new ArrayList<>();
+        final List<String> expectedValues =
+                new ArrayList<>(Arrays.asList("[\nstatic final void f();]"));
+
+        new TreeScanner<Void, Void>() {
+
+            @Override
+            public Void visitErroneous(ErroneousTree node, Void p) {
+
+                values.add(normalize(getErroneousTreeValues(node).toString()));
+                return null;
+            }
+        }.scan(cut, null);
+
+        assertEquals("testMethodError: The Erroneous tree "
+                + "error value: " + values
+                + " does not match expected error values: "
+                + expectedValues, values, expectedValues);
+    }
+
+    void testsNotWorking() throws IOException {
+
+        // Fails with nb-javac, needs further investigation
+        testPositionBrokenSource126732a();
+        testPositionBrokenSource126732b();
+
+        // Fails, these tests yet to be addressed
+        testVariableInIfThen1();
+        testVariableInIfThen2();
+        testPositionForEnumModifiers();
+        testStartPositionEnumConstantInit();
+    }
+    void testPositions() throws IOException {
+        testPositionsSane();
+        testCorrectWilcardPositions();
+        testPositionAnnotationNoPackage187551();
+        testPositionForSuperConstructorCalls();
+        testPreferredPositionForBinaryOp();
+        testStartPositionForMethodWithoutModifiers();
+        testVarPos();
+        testVariableInIfThen3();
+        testMissingExponent();
+        testTryResourcePos();
+        testOperatorMissingError();
+        testMissingParenthesisError();
+        testMissingClassError();
+        testSwitchError();
+        testMethodError();
+    }
+
+    public static void main(String... args) throws IOException {
+        JavacParserTest jpt = new JavacParserTest("JavacParserTest");
+        jpt.testPositions();
+        System.out.println("PASS");
+    }
+}
+
+abstract class TestCase {
+
+    void assertEquals(String message, int i, int pos) {
+        if (i != pos) {
+            fail(message);
+        }
+    }
+
+    void assertFalse(String message, boolean empty) {
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+    void assertEquals(String message, int i, long l) {
+        if (i != l) {
+            fail(message + ":" + i + ":" + l);
+        }
+    }
+
+    void assertEquals(String message, Object o1, Object o2) {
+        System.out.println(o1);
+        System.out.println(o2);
+        if (o1 != null && o2 != null && !o1.equals(o2)) {
+            fail(message);
+        }
+        if (o1 == null && o2 != null) {
+            fail(message);
+        }
+    }
+
+    void assertNotNull(Object o) {
+        if (o == null) {
+            fail();
+        }
+    }
+
+    void fail() {
+        fail("test failed");
+    }
+
+    void fail(String message) {
+        throw new RuntimeException(message);
+    }
+}
diff --git a/langtools/test/tools/javac/parser/T4881269.java b/langtools/test/tools/javac/parser/T4881269.java
new file mode 100644
index 0000000..c830a4e
--- /dev/null
+++ b/langtools/test/tools/javac/parser/T4881269.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4881269
+ * @summary improve diagnostic for ill-formed tokens
+ * @compile/fail/ref=T4881269.out -XDrawDiagnostics T4881269.java
+ */
+
+public class T4881269 {
+    java.io..PrintStream s;
+    void m() { System.err..println(); }
+    void m(Object.. o) { }
+}
diff --git a/langtools/test/tools/javac/parser/T4881269.out b/langtools/test/tools/javac/parser/T4881269.out
new file mode 100644
index 0000000..b6b2698
--- /dev/null
+++ b/langtools/test/tools/javac/parser/T4881269.out
@@ -0,0 +1,9 @@
+T4881269.java:32:13: compiler.err.illegal.dot
+T4881269.java:33:27: compiler.err.illegal.dot
+T4881269.java:33:22: compiler.err.not.stmt
+T4881269.java:34:19: compiler.err.illegal.dot
+T4881269.java:34:20: compiler.err.expected: ';'
+T4881269.java:34:22: compiler.err.illegal.start.of.type
+T4881269.java:34:23: compiler.err.expected: token.identifier
+T4881269.java:34:25: compiler.err.expected: ';'
+8 errors
diff --git a/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java b/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java
new file mode 100644
index 0000000..e11a39f
--- /dev/null
+++ b/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 6987384
+ * @summary -XprintProcessorRoundsInfo message printed with different timing than previous
+ * @library ../../../lib
+ * @build JavacTestingAbstractProcessor Test TestWithXstdout
+ * @run main TestWithXstdout
+ */
+
+import java.io.*;
+import java.nio.charset.*;
+import java.nio.file.*;
+import java.util.*;
+
+public class TestWithXstdout {
+    public static void main(String... args) throws Exception {
+        File testSrc = new File(System.getProperty("test.src"));
+        File testClasses = new File(System.getProperty("test.classes"));
+        File stdout = new File("stdout.out");
+        run_javac("-XDrawDiagnostics",
+                "-XprintProcessorInfo",
+                "-Werror",
+                "-proc:only",
+                "-processor",  "Test",
+                "-Xstdout", stdout.getPath(),
+                "-classpath", testClasses.getPath(),
+                new File(testSrc, "Test.java").getPath());
+        boolean ok = compare(stdout, new File(testSrc, "Test.out"));
+        if (!ok)
+            throw new Exception("differences found");
+    }
+
+    static void run_javac(String... args) throws IOException, InterruptedException {
+        File javaHome = new File(System.getProperty("java.home"));
+        if (javaHome.getName().equals("jre"))
+            javaHome = javaHome.getParentFile();
+        File javac = new File(new File(javaHome, "bin"), "javac");
+
+        List<String> opts = new ArrayList<>();
+        opts.add(javac.getPath());
+
+        String toolOpts = System.getProperty("test.tool.vm.opts");
+        if (toolOpts != null && !"".equals(toolOpts.trim())) {
+            opts.addAll(Arrays.asList(toolOpts.trim().split("[\\s]+")));
+        }
+        opts.addAll(Arrays.asList(args));
+        System.out.println("exec: " + opts);
+        ProcessBuilder pb = new ProcessBuilder(opts);
+        pb.redirectErrorStream();
+        Process p = pb.start();
+        try (BufferedReader r = new BufferedReader(new InputStreamReader(p.getInputStream()))) {
+            String line;
+            while ((line = r.readLine()) != null)
+                System.out.println();
+        }
+        int rc = p.waitFor();
+        if (rc != 0)
+            System.out.println("javac exited, rc=" + rc);
+    }
+
+    static boolean compare(File a, File b) throws IOException {
+        List<String> aLines = Files.readAllLines(a.toPath(), Charset.defaultCharset());
+        List<String> bLines = Files.readAllLines(b.toPath(), Charset.defaultCharset());
+        System.out.println(a + ": " + aLines.size() + " lines");
+        System.out.println(b + ": " + bLines.size() + " lines");
+        return aLines.equals(bLines);
+    }
+}
diff --git a/langtools/test/tools/javac/quid/T6999438.out b/langtools/test/tools/javac/quid/T6999438.out
index cd62668..04fdcfa 100644
--- a/langtools/test/tools/javac/quid/T6999438.out
+++ b/langtools/test/tools/javac/quid/T6999438.out
@@ -1,4 +1,4 @@
-T6999438.java:8:9: compiler.err.illegal.char: 35
+T6999438.java:8:8: compiler.err.expected: token.identifier
 T6999438.java:8:10: compiler.err.illegal.start.of.type
 T6999438.java:8:25: compiler.err.expected: token.identifier
 T6999438.java:8:26: compiler.err.expected: ';'
diff --git a/langtools/test/tools/javac/resolve/Candidate.java b/langtools/test/tools/javac/resolve/Candidate.java
new file mode 100644
index 0000000..a36208b
--- /dev/null
+++ b/langtools/test/tools/javac/resolve/Candidate.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+ at Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
+ at interface Candidate {
+    /**
+     * the candidate position (line/col of the method call for which this candidate
+     * is a potential overload candidate)
+     */
+    Pos pos() default @Pos(userDefined=false);
+    /**
+     * resolution phases for which this candidate is applicable
+     */
+    Phase[] applicable() default { };
+    /**
+     * is this candidate the most specific (in the resolution phases for which it
+     * is also applicable)
+     */
+    boolean mostSpecific() default false;
+    /**
+     * this candidate inferred signature (in the resolution phases for which it
+     * is also applicable, in case it corresponds to a generic method)
+     */
+    String sig() default "";
+}
+
+enum Phase {
+    BASIC("BASIC"),
+    BOX("BOX"),
+    VARARGS("VARARITY");
+
+    final String javacString;
+
+    private Phase(String javacString) {
+        this.javacString = javacString;
+    }
+
+    static Phase fromString(String s) {
+        for (Phase phase : Phase.values()) {
+            if (phase.javacString.equals(s)) {
+                return phase;
+            }
+        }
+        throw new AssertionError("Invalid resolution phase string " + s);
+    }
+}
diff --git a/langtools/test/tools/javac/resolve/Pos.java b/langtools/test/tools/javac/resolve/Pos.java
new file mode 100644
index 0000000..d778536
--- /dev/null
+++ b/langtools/test/tools/javac/resolve/Pos.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+ at Target(ElementType.ANNOTATION_TYPE)
+ at interface Pos {
+    long line() default -1;
+    long col() default -1;
+    boolean userDefined() default true;
+}
\ No newline at end of file
diff --git a/langtools/test/tools/javac/resolve/ResolveHarness.java b/langtools/test/tools/javac/resolve/ResolveHarness.java
new file mode 100644
index 0000000..609b3d8
--- /dev/null
+++ b/langtools/test/tools/javac/resolve/ResolveHarness.java
@@ -0,0 +1,475 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 7098660
+ * @summary Write better overload resolution/inference tests
+ * @library ../lib
+ * @build JavacTestingAbstractProcessor ResolveHarness
+ * @run main ResolveHarness
+ */
+
+import com.sun.source.util.JavacTask;
+import com.sun.tools.javac.api.ClientCodeWrapper.DiagnosticSourceUnwrapper;
+import com.sun.tools.javac.code.Type.MethodType;
+import com.sun.tools.javac.util.JCDiagnostic;
+
+import java.io.File;
+import java.util.Set;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.tools.Diagnostic;
+import javax.tools.Diagnostic.Kind;
+import javax.tools.DiagnosticListener;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
+
+import static javax.tools.StandardLocation.*;
+
+public class ResolveHarness implements javax.tools.DiagnosticListener<JavaFileObject> {
+
+    static int nerrors = 0;
+
+    static final JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
+    static final StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null);
+
+    public static void main(String[] args) throws Exception {
+        fm.setLocation(SOURCE_PATH,
+                Arrays.asList(new File(System.getProperty("test.src"), "tests")));
+        for (JavaFileObject jfo : fm.list(SOURCE_PATH, "", Collections.singleton(JavaFileObject.Kind.SOURCE), true)) {
+            new ResolveHarness(jfo).check();
+        }
+        if (nerrors > 0) {
+            throw new AssertionError("Errors were found");
+        }
+    }
+
+
+    JavaFileObject jfo;
+    DiagnosticProcessor[] diagProcessors;
+    Map<ElementKey, Candidate> candidatesMap = new HashMap<ElementKey, Candidate>();
+    Set<String> declaredKeys = new HashSet<>();
+    List<Diagnostic<? extends JavaFileObject>> diags = new ArrayList<>();
+    List<ElementKey> seenCandidates = new ArrayList<>();
+
+    protected ResolveHarness(JavaFileObject jfo) {
+        this.jfo = jfo;
+        this.diagProcessors = new DiagnosticProcessor[] {
+            new VerboseResolutionNoteProcessor(),
+            new VerboseDeferredInferenceNoteProcessor(),
+            new ErrorProcessor()
+        };
+    }
+
+    protected void check() throws Exception {
+        String[] options = {
+            "-XDshouldStopPolicy=ATTR",
+            "-XDverboseResolution=success,failure,applicable,inapplicable,deferred-inference"
+        };
+
+        AbstractProcessor[] processors = { new ResolveCandidateFinder(), null };
+
+        @SuppressWarnings("unchecked")
+        DiagnosticListener<? super JavaFileObject>[] diagListeners =
+                new DiagnosticListener[] { new DiagnosticHandler(false), new DiagnosticHandler(true) };
+
+        for (int i = 0 ; i < options.length ; i ++) {
+            JavacTask ct = (JavacTask)comp.getTask(null, fm, diagListeners[i],
+                    Arrays.asList(options[i]), null, Arrays.asList(jfo));
+            if (processors[i] != null) {
+                ct.setProcessors(Collections.singleton(processors[i]));
+            }
+            ct.analyze();
+        }
+
+        //check diags
+        for (Diagnostic<? extends JavaFileObject> diag : diags) {
+            for (DiagnosticProcessor proc : diagProcessors) {
+                if (proc.matches(diag)) {
+                    proc.process(diag);
+                    break;
+                }
+            }
+        }
+        //check all candidates have been used up
+        for (Map.Entry<ElementKey, Candidate> entry : candidatesMap.entrySet()) {
+            if (!seenCandidates.contains(entry.getKey())) {
+                error("Redundant @Candidate annotation on method " + entry.getKey().elem);
+            }
+        }
+    }
+
+    public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+        diags.add(diagnostic);
+    }
+
+    Candidate getCandidateAtPos(Element methodSym, long line, long col) {
+        Candidate c = candidatesMap.get(new ElementKey(methodSym));
+        if (c != null) {
+            Pos pos = c.pos();
+            if (!pos.userDefined() ||
+                    (pos.line() == line && pos.col() == col)) {
+                seenCandidates.add(new ElementKey(methodSym));
+                return c;
+            }
+        } else {
+            error("Missing @Candidate annotation on method " + methodSym);
+        }
+        return null;
+    }
+
+    void checkSig(Candidate c, Element methodSym, MethodType mtype) {
+        if (c.sig().length() > 0 && !c.sig().equals(mtype.toString())) {
+            error("Inferred type mismatch for method: " + methodSym);
+        }
+    }
+
+    protected void error(String msg) {
+        nerrors++;
+        System.err.printf("Error occurred while checking file: %s\nreason: %s\n", jfo.getName(), msg);
+    }
+
+    /**
+     * Base class for diagnostic processor. It provides methods for matching and
+     * processing a given diagnostic object (overridden by subclasses).
+     */
+    abstract class DiagnosticProcessor {
+
+        List<String> codes;
+        Diagnostic.Kind kind;
+
+        public DiagnosticProcessor(Kind kind, String... codes) {
+            this.codes = Arrays.asList(codes);
+            this.kind = kind;
+        }
+
+        abstract void process(Diagnostic<? extends JavaFileObject> diagnostic);
+
+        boolean matches(Diagnostic<? extends JavaFileObject> diagnostic) {
+            return (codes.isEmpty() || codes.contains(diagnostic.getCode())) &&
+                    diagnostic.getKind() == kind;
+        }
+
+        JCDiagnostic asJCDiagnostic(Diagnostic<? extends JavaFileObject> diagnostic) {
+            if (diagnostic instanceof JCDiagnostic) {
+                return (JCDiagnostic)diagnostic;
+            } else if (diagnostic instanceof DiagnosticSourceUnwrapper) {
+                return ((DiagnosticSourceUnwrapper)diagnostic).d;
+            } else {
+                throw new AssertionError("Cannot convert diagnostic to JCDiagnostic: " + diagnostic.getClass().getName());
+            }
+        }
+
+        List<JCDiagnostic> subDiagnostics(Diagnostic<? extends JavaFileObject> diagnostic) {
+            JCDiagnostic diag = asJCDiagnostic(diagnostic);
+            if (diag instanceof JCDiagnostic.MultilineDiagnostic) {
+                return ((JCDiagnostic.MultilineDiagnostic)diag).getSubdiagnostics();
+            } else {
+                throw new AssertionError("Cannot extract subdiagnostics: " + diag.getClass().getName());
+            }
+        }
+    }
+
+    /**
+     * Processor for verbose resolution notes generated by javac. The processor
+     * checks that the diagnostic is associated with a method declared by
+     * a class annotated with the special @TraceResolve marker annotation. If
+     * that's the case, all subdiagnostics (one for each resolution candidate)
+     * are checked against the corresponding @Candidate annotations, using
+     * a VerboseCandidateSubdiagProcessor.
+     */
+    class VerboseResolutionNoteProcessor extends DiagnosticProcessor {
+
+        VerboseResolutionNoteProcessor() {
+            super(Kind.NOTE,
+                    "compiler.note.verbose.resolve.multi",
+                    "compiler.note.verbose.resolve.multi.1");
+        }
+
+        @Override
+        void process(Diagnostic<? extends JavaFileObject> diagnostic) {
+            Element siteSym = getSiteSym(diagnostic);
+            if (siteSym.getAnnotation(TraceResolve.class) == null) {
+                return;
+            }
+            int candidateIdx = 0;
+            for (JCDiagnostic d : subDiagnostics(diagnostic)) {
+                boolean isMostSpecific = candidateIdx++ == mostSpecific(diagnostic);
+                VerboseCandidateSubdiagProcessor subProc =
+                        new VerboseCandidateSubdiagProcessor(isMostSpecific, phase(diagnostic), success(diagnostic));
+                if (subProc.matches(d)) {
+                    subProc.process(d);
+                } else {
+                    throw new AssertionError("Bad subdiagnostic: " + d.getCode());
+                }
+            }
+        }
+
+        Element getSiteSym(Diagnostic<? extends JavaFileObject> diagnostic) {
+            return (Element)asJCDiagnostic(diagnostic).getArgs()[1];
+        }
+
+        int mostSpecific(Diagnostic<? extends JavaFileObject> diagnostic) {
+            return success(diagnostic) ?
+                    (Integer)asJCDiagnostic(diagnostic).getArgs()[2] : -1;
+        }
+
+        boolean success(Diagnostic<? extends JavaFileObject> diagnostic) {
+            return diagnostic.getCode().equals("compiler.note.verbose.resolve.multi");
+        }
+
+        Phase phase(Diagnostic<? extends JavaFileObject> diagnostic) {
+            return Phase.fromString(asJCDiagnostic(diagnostic).getArgs()[3].toString());
+        }
+    }
+
+    /**
+     * Processor for verbose resolution subdiagnostic notes generated by javac.
+     * The processor checks that the details of the overload candidate
+     * match against the info contained in the corresponding @Candidate
+     * annotation (if any).
+     */
+    class VerboseCandidateSubdiagProcessor extends DiagnosticProcessor {
+
+        boolean mostSpecific;
+        Phase phase;
+        boolean success;
+
+        public VerboseCandidateSubdiagProcessor(boolean mostSpecific, Phase phase, boolean success) {
+            super(Kind.OTHER,
+                    "compiler.misc.applicable.method.found",
+                    "compiler.misc.applicable.method.found.1",
+                    "compiler.misc.not.applicable.method.found");
+            this.mostSpecific = mostSpecific;
+            this.phase = phase;
+            this.success = success;
+        }
+
+        @Override
+        void process(Diagnostic<? extends JavaFileObject> diagnostic) {
+            Element methodSym = methodSym(diagnostic);
+            Candidate c = getCandidateAtPos(methodSym,
+                    asJCDiagnostic(diagnostic).getLineNumber(),
+                    asJCDiagnostic(diagnostic).getColumnNumber());
+            if (c == null) {
+                return; //nothing to check
+            }
+
+            if (c.applicable().length == 0 && c.mostSpecific()) {
+                error("Inapplicable method cannot be most specific " + methodSym);
+            }
+
+            if (isApplicable(diagnostic) != Arrays.asList(c.applicable()).contains(phase)) {
+                error("Invalid candidate's applicability " + methodSym);
+            }
+
+            if (success) {
+                for (Phase p : c.applicable()) {
+                    if (phase.ordinal() < p.ordinal()) {
+                        error("Invalid phase " + p + " on method " + methodSym);
+                    }
+                }
+            }
+
+            if (Arrays.asList(c.applicable()).contains(phase)) { //applicable
+                if (c.mostSpecific() != mostSpecific) {
+                    error("Invalid most specific value for method " + methodSym);
+                }
+                MethodType mtype = getSig(diagnostic);
+                if (mtype != null) {
+                    checkSig(c, methodSym, mtype);
+                }
+            }
+        }
+
+        boolean isApplicable(Diagnostic<? extends JavaFileObject> diagnostic) {
+            return !diagnostic.getCode().equals("compiler.misc.not.applicable.method.found");
+        }
+
+        Element methodSym(Diagnostic<? extends JavaFileObject> diagnostic) {
+            return (Element)asJCDiagnostic(diagnostic).getArgs()[1];
+        }
+
+        MethodType getSig(Diagnostic<? extends JavaFileObject> diagnostic) {
+            JCDiagnostic details = (JCDiagnostic)asJCDiagnostic(diagnostic).getArgs()[2];
+            if (details == null) {
+                return null;
+            } else if (details instanceof JCDiagnostic) {
+                return details.getCode().equals("compiler.misc.full.inst.sig") ?
+                        (MethodType)details.getArgs()[0] : null;
+            } else {
+                throw new AssertionError("Bad diagnostic arg: " + details);
+            }
+        }
+    }
+
+    /**
+     * Processor for verbose deferred inference notes generated by javac. The
+     * processor checks that the inferred signature for a given generic method
+     * call corresponds to the one (if any) declared in the @Candidate annotation.
+     */
+    class VerboseDeferredInferenceNoteProcessor extends DiagnosticProcessor {
+
+        public VerboseDeferredInferenceNoteProcessor() {
+            super(Kind.NOTE, "compiler.note.deferred.method.inst");
+        }
+
+        @Override
+        void process(Diagnostic<? extends JavaFileObject> diagnostic) {
+            Element methodSym = methodSym(diagnostic);
+            Candidate c = getCandidateAtPos(methodSym,
+                    asJCDiagnostic(diagnostic).getLineNumber(),
+                    asJCDiagnostic(diagnostic).getColumnNumber());
+            MethodType sig = sig(diagnostic);
+            if (c != null && sig != null) {
+                checkSig(c, methodSym, sig);
+            }
+        }
+
+        Element methodSym(Diagnostic<? extends JavaFileObject> diagnostic) {
+            return (Element)asJCDiagnostic(diagnostic).getArgs()[0];
+        }
+
+        MethodType sig(Diagnostic<? extends JavaFileObject> diagnostic) {
+            return (MethodType)asJCDiagnostic(diagnostic).getArgs()[1];
+        }
+    }
+
+    /**
+     * Processor for all error diagnostics; if the error key is not declared in
+     * the test file header, the processor reports an error.
+     */
+    class ErrorProcessor extends DiagnosticProcessor {
+
+        public ErrorProcessor() {
+            super(Diagnostic.Kind.ERROR);
+        }
+
+        @Override
+        void process(Diagnostic<? extends JavaFileObject> diagnostic) {
+            if (!declaredKeys.contains(diagnostic.getCode())) {
+                error("Unexpected compilation error key '" + diagnostic.getCode() + "'");
+            }
+        }
+    }
+
+    @SupportedAnnotationTypes({"Candidate","TraceResolve"})
+    class ResolveCandidateFinder extends JavacTestingAbstractProcessor {
+
+        @Override
+        public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+            if (roundEnv.processingOver())
+                return true;
+
+            TypeElement traceResolveAnno = elements.getTypeElement("TraceResolve");
+            TypeElement candidateAnno = elements.getTypeElement("Candidate");
+
+            if (!annotations.contains(traceResolveAnno)) {
+                error("no @TraceResolve annotation found in test class");
+            }
+
+            if (!annotations.contains(candidateAnno)) {
+                error("no @candidate annotation found in test class");
+            }
+
+            for (Element elem: roundEnv.getElementsAnnotatedWith(traceResolveAnno)) {
+                TraceResolve traceResolve = elem.getAnnotation(TraceResolve.class);
+                declaredKeys.addAll(Arrays.asList(traceResolve.keys()));
+            }
+
+            for (Element elem: roundEnv.getElementsAnnotatedWith(candidateAnno)) {
+                candidatesMap.put(new ElementKey(elem), elem.getAnnotation(Candidate.class));
+            }
+            return true;
+        }
+    }
+
+    class ElementKey {
+
+        String key;
+        Element elem;
+
+        public ElementKey(Element elem) {
+            this.elem = elem;
+            this.key = computeKey(elem);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj instanceof ElementKey) {
+                ElementKey other = (ElementKey)obj;
+                return other.key.equals(key);
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return key.hashCode();
+        }
+
+        String computeKey(Element e) {
+            StringBuilder buf = new StringBuilder();
+            while (e != null) {
+                buf.append(e.toString());
+                e = e.getEnclosingElement();
+            }
+            buf.append(jfo.getName());
+            return buf.toString();
+        }
+
+        @Override
+        public String toString() {
+            return "Key{"+key+"}";
+        }
+    }
+
+    class DiagnosticHandler implements DiagnosticListener<JavaFileObject> {
+
+        boolean shouldRecordDiags;
+
+        DiagnosticHandler(boolean shouldRecordDiags) {
+            this.shouldRecordDiags = shouldRecordDiags;
+        }
+
+        public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+            if (shouldRecordDiags)
+                diags.add(diagnostic);
+        }
+
+    }
+}
diff --git a/langtools/test/tools/javac/resolve/TraceResolve.java b/langtools/test/tools/javac/resolve/TraceResolve.java
new file mode 100644
index 0000000..ddc8399
--- /dev/null
+++ b/langtools/test/tools/javac/resolve/TraceResolve.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+ at Target(ElementType.TYPE)
+ at interface TraceResolve {
+    String[] keys() default {};
+}
diff --git a/langtools/test/tools/javac/resolve/tests/BoxedReturnTypeInference.java b/langtools/test/tools/javac/resolve/tests/BoxedReturnTypeInference.java
new file mode 100644
index 0000000..dcde256
--- /dev/null
+++ b/langtools/test/tools/javac/resolve/tests/BoxedReturnTypeInference.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+ at TraceResolve
+class BoxedReturnTypeInference {
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Byte", mostSpecific=true)
+    static <B> B m_byte() { return null; }
+
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Short", mostSpecific=true)
+    static <S> S m_short() { return null; }
+
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Integer", mostSpecific=true)
+    static <I> I m_int() { return null; }
+
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Long", mostSpecific=true)
+    static <L> L m_long() { return null; }
+
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Float", mostSpecific=true)
+    static <F> F m_float() { return null; }
+
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Double", mostSpecific=true)
+    static <D> D m_double() { return null; }
+
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Character", mostSpecific=true)
+    static <C> C m_char() { return null; }
+
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Boolean", mostSpecific=true)
+    static <Z> Z m_bool() { return null; }
+
+    {
+        Byte b = m_byte();
+        Short s = m_short();
+        Integer i = m_int();
+        Long l = m_long();
+        Float f = m_float();
+        Double d = m_double();
+        Character c= m_char();
+        Boolean z = m_bool();
+    }
+}
diff --git a/langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceOverInferred.java b/langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceOverInferred.java
new file mode 100644
index 0000000..843169c
--- /dev/null
+++ b/langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceOverInferred.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+ at TraceResolve
+class PrimitiveOverReference {
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_byte(byte b) {}
+    @Candidate
+    static void m_byte(Byte b) {}
+    @Candidate
+    static <B> void m_byte(B b) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_short(short s) {}
+    @Candidate
+    static void m_short(Short s) {}
+    @Candidate
+    static <S> void m_short(S s) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_int(int i) {}
+    @Candidate
+    static void m_int(Integer i) {}
+    @Candidate
+    static <I> void m_int(I i) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_long(long l) {}
+    @Candidate
+    static void m_long(Long l) {}
+    @Candidate
+    static <L> void m_long(L l) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_float(float f) {}
+    @Candidate
+    static void m_float(Float f) {}
+    @Candidate
+    static <F> void m_float(F f) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_double(double d) {}
+    @Candidate
+    static void m_double(Double d) {}
+    @Candidate
+    static <D> void m_double(D d) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_char(char c) {}
+    @Candidate
+    static void m_char(Character c) {}
+    @Candidate
+    static <C> void m_char(C c) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_bool(boolean z) {}
+    @Candidate
+    static void m_bool(Boolean z) {}
+    @Candidate
+    static <Z> void m_bool(Z z) {}
+
+    {
+        m_byte((byte)0);
+        m_short((short)0);
+        m_int(0);
+        m_long(0L);
+        m_float(0.0f);
+        m_double(0.0);
+        m_char('?');
+        m_bool(false);
+    }
+}
diff --git a/langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceOverVarargs.java b/langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceOverVarargs.java
new file mode 100644
index 0000000..a07909e
--- /dev/null
+++ b/langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceOverVarargs.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+ at TraceResolve
+class PrimitiveOverReference {
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_byte(byte b) {}
+    @Candidate
+    static void m_byte(Byte b) {}
+    @Candidate
+    static void m_byte(byte... b) {}
+    @Candidate
+    static void m_byte(Byte... b) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_short(short s) {}
+    @Candidate
+    static void m_short(Short s) {}
+    @Candidate
+    static void m_short(short... s) {}
+    @Candidate
+    static void m_short(Short... s) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_int(int i) {}
+    @Candidate
+    static void m_int(Integer i) {}
+    @Candidate
+    static void m_int(int... i) {}
+    @Candidate
+    static void m_int(Integer... i) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_long(long l) {}
+    @Candidate
+    static void m_long(Long l) {}
+    @Candidate
+    static void m_long(long... l) {}
+    @Candidate
+    static void m_long(Long... l) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_float(float f) {}
+    @Candidate
+    static void m_float(Float f) {}
+    @Candidate
+    static void m_float(float... f) {}
+    @Candidate
+    static void m_float(Float... f) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_double(double d) {}
+    @Candidate
+    static void m_double(Double d) {}
+    @Candidate
+    static void m_double(double... d) {}
+    @Candidate
+    static void m_double(Double... d) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_char(char c) {}
+    @Candidate
+    static void m_char(Character c) {}
+    @Candidate
+    static void m_char(char... c) {}
+    @Candidate
+    static void m_char(Character... c) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_bool(boolean z) {}
+    @Candidate
+    static void m_bool(Boolean z) {}
+    @Candidate
+    static void m_bool(boolean... z) {}
+    @Candidate
+    static void m_bool(Boolean... z) {}
+
+    {
+        m_byte((byte)0);
+        m_short((short)0);
+        m_int(0);
+        m_long(0L);
+        m_float(0.0f);
+        m_double(0.0);
+        m_char('?');
+        m_bool(false);
+    }
+}
diff --git a/langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java b/langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java
new file mode 100644
index 0000000..80ac69d
--- /dev/null
+++ b/langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+ at TraceResolve(keys={"compiler.err.ref.ambiguous"})
+class PrimitiveOverReferenceVarargsAmbiguous {
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_byte(byte... b) {}
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_byte(Byte... b) {}
+
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_short(short... s) {}
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_short(Short... s) {}
+
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_int(int... i) {}
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_int(Integer... i) {}
+
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_long(long... l) {}
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_long(Long... l) {}
+
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_float(float... f) {}
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_float(Float... f) {}
+
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_double(double... d) {}
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_double(Double... d) {}
+
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_char(char... c) {}
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_char(Character... c) {}
+
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_bool(boolean... z) {}
+    @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+    static void m_bool(Boolean... z) {}
+
+    {
+        m_byte((byte)0);
+        m_short((short)0);
+        m_int(0);
+        m_long(0L);
+        m_float(0.0f);
+        m_double(0.0);
+        m_char('?');
+        m_bool(false);
+    }
+}
diff --git a/langtools/test/tools/javac/resolve/tests/PrimitiveOverload.java b/langtools/test/tools/javac/resolve/tests/PrimitiveOverload.java
new file mode 100644
index 0000000..752b697
--- /dev/null
+++ b/langtools/test/tools/javac/resolve/tests/PrimitiveOverload.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+ at TraceResolve
+class PrimitiveOverload {
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_byte(byte b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_byte(short b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_byte(int b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_byte(long b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_byte(float b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_byte(double b) {}
+
+    @Candidate
+    static void m_short(byte b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_short(short b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_short(int b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_short(long b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_short(float b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_short(double b) {}
+
+    @Candidate
+    static void m_int(byte b) {}
+    @Candidate
+    static void m_int(short b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_int(int b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_int(long b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_int(float b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_int(double b) {}
+
+    @Candidate
+    static void m_long(byte b) {}
+    @Candidate
+    static void m_long(short b) {}
+    @Candidate
+    static void m_long(int b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_long(long b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_long(float b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_long(double b) {}
+
+    @Candidate
+    static void m_float(byte b) {}
+    @Candidate
+    static void m_float(short b) {}
+    @Candidate
+    static void m_float(int b) {}
+    @Candidate
+    static void m_float(long b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_float(float b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_float(double b) {}
+
+    @Candidate
+    static void m_double(byte b) {}
+    @Candidate
+    static void m_double(short b) {}
+    @Candidate
+    static void m_double(int b) {}
+    @Candidate
+    static void m_double(long b) {}
+    @Candidate
+    static void m_double(float b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_double(double b) {}
+
+    {
+        m_byte((byte)0);
+        m_short((short)0);
+        m_int(0);
+        m_long(0L);
+        m_float(0.0f);
+        m_double(0.0);
+    }
+}
diff --git a/langtools/test/tools/javac/resolve/tests/PrimitiveReturnTypeInference.java b/langtools/test/tools/javac/resolve/tests/PrimitiveReturnTypeInference.java
new file mode 100644
index 0000000..04a1506
--- /dev/null
+++ b/langtools/test/tools/javac/resolve/tests/PrimitiveReturnTypeInference.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+ at TraceResolve
+class PrimitiveReturnTypeInference {
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Byte", mostSpecific=true)
+    static <B> B m_byte() { return null; }
+
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Short", mostSpecific=true)
+    static <S> S m_short() { return null; }
+
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Integer", mostSpecific=true)
+    static <I> I m_int() { return null; }
+
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Long", mostSpecific=true)
+    static <L> L m_long() { return null; }
+
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Float", mostSpecific=true)
+    static <F> F m_float() { return null; }
+
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Double", mostSpecific=true)
+    static <D> D m_double() { return null; }
+
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Character", mostSpecific=true)
+    static <C> C m_char() { return null; }
+
+    @Candidate(applicable=Phase.BASIC, sig="()java.lang.Boolean", mostSpecific=true)
+    static <Z> Z m_bool() { return null; }
+
+    {
+        byte b = m_byte();
+        short s = m_short();
+        int i = m_int();
+        long l = m_long();
+        float f = m_float();
+        double d = m_double();
+        char c= m_char();
+        boolean z = m_bool();
+    }
+}
diff --git a/langtools/test/tools/javac/resolve/tests/ReferenceOverInferred.java b/langtools/test/tools/javac/resolve/tests/ReferenceOverInferred.java
new file mode 100644
index 0000000..ed68773
--- /dev/null
+++ b/langtools/test/tools/javac/resolve/tests/ReferenceOverInferred.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+ at TraceResolve
+class PrimitiveOverInferred {
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_byte(Byte b) {}
+    @Candidate(applicable=Phase.BOX, sig="(java.lang.Byte)void")
+    static <B> void m_byte(B b) {}
+
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_short(Short s) {}
+    @Candidate(applicable=Phase.BOX, sig="(java.lang.Short)void")
+    static <S> void m_short(S s) {}
+
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_int(Integer i) {}
+    @Candidate(applicable=Phase.BOX, sig="(java.lang.Integer)void")
+    static <I> void m_int(I i) {}
+
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_long(Long l) {}
+    @Candidate(applicable=Phase.BOX, sig="(java.lang.Long)void")
+    static <L> void m_long(L l) {}
+
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_float(Float f) {}
+    @Candidate(applicable=Phase.BOX, sig="(java.lang.Float)void")
+    static <F> void m_float(F f) {}
+
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_double(Double d) {}
+    @Candidate(applicable=Phase.BOX, sig="(java.lang.Double)void")
+    static <D> void m_double(D d) {}
+
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_char(Character c) {}
+    @Candidate(applicable=Phase.BOX, sig="(java.lang.Character)void")
+    static <C> void m_char(C c) {}
+
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_bool(Boolean z) {}
+    @Candidate(applicable=Phase.BOX, sig="(java.lang.Boolean)void")
+    static <Z> void m_bool(Z z) {}
+
+    {
+        m_byte((byte)0);
+        m_short((short)0);
+        m_int(0);
+        m_long(0L);
+        m_float(0.0f);
+        m_double(0.0);
+        m_char('?');
+        m_bool(false);
+    }
+}
diff --git a/langtools/test/tools/javac/resolve/tests/ReferenceOverVarargs.java b/langtools/test/tools/javac/resolve/tests/ReferenceOverVarargs.java
new file mode 100644
index 0000000..c089e2d
--- /dev/null
+++ b/langtools/test/tools/javac/resolve/tests/ReferenceOverVarargs.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+ at TraceResolve
+class ReferenceOverVarargs {
+
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_byte(Byte b) {}
+    @Candidate
+    static void m_byte(byte... b) {}
+    @Candidate
+    static void m_byte(Byte... b) {}
+
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_short(Short s) {}
+    @Candidate
+    static void m_short(short... s) {}
+    @Candidate
+    static void m_short(Short... s) {}
+
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_int(Integer i) {}
+    @Candidate
+    static void m_int(int... i) {}
+    @Candidate
+    static void m_int(Integer... i) {}
+
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_long(Long l) {}
+    @Candidate
+    static void m_long(long... l) {}
+    @Candidate
+    static void m_long(Long... l) {}
+
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_float(Float f) {}
+    @Candidate
+    static void m_float(float... f) {}
+    @Candidate
+    static void m_float(Float... f) {}
+
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_double(Double d) {}
+    @Candidate
+    static void m_double(double... d) {}
+    @Candidate
+    static void m_double(Double... d) {}
+
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_char(Character c) {}
+    @Candidate
+    static void m_char(char... c) {}
+    @Candidate
+    static void m_char(Character... c) {}
+
+    @Candidate(applicable=Phase.BOX, mostSpecific=true)
+    static void m_bool(Boolean z) {}
+    @Candidate
+    static void m_bool(boolean... z) {}
+    @Candidate
+    static void m_bool(Boolean... z) {}
+
+    {
+        m_byte((byte)0);
+        m_short((short)0);
+        m_int(0);
+        m_long(0L);
+        m_float(0.0f);
+        m_double(0.0);
+        m_char('?');
+        m_bool(false);
+    }
+}
diff --git a/langtools/test/tools/javac/resolve/tests/ReferenceOverload.java b/langtools/test/tools/javac/resolve/tests/ReferenceOverload.java
new file mode 100644
index 0000000..578bc51
--- /dev/null
+++ b/langtools/test/tools/javac/resolve/tests/ReferenceOverload.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+ at TraceResolve
+class ReferenceOverload {
+
+    static class A {}
+    static class B extends A {}
+    static class C extends B {}
+    static class D extends C {}
+    static class E extends D {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_A(A a) {}
+    @Candidate
+    static void m_A(B a) {}
+    @Candidate
+    static void m_A(C a) {}
+    @Candidate
+    static void m_A(D a) {}
+    @Candidate
+    static void m_A(E a) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_B(A b) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_B(B b) {}
+    @Candidate
+    static void m_B(C b) {}
+    @Candidate
+    static void m_B(D b) {}
+    @Candidate
+    static void m_B(E b) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_C(A c) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_C(B c) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_C(C c) {}
+    @Candidate
+    static void m_C(D c) {}
+    @Candidate
+    static void m_C(E c) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_D(A d) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_D(B d) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_D(C d) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_D(D d) {}
+    @Candidate
+    static void m_D(E d) {}
+
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_E(A e) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_E(B e) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_E(C e) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=false)
+    static void m_E(D e) {}
+    @Candidate(applicable=Phase.BASIC, mostSpecific=true)
+    static void m_E(E e) {}
+
+    {
+        m_A((A)null);
+        m_B((B)null);
+        m_C((C)null);
+        m_D((D)null);
+        m_E((E)null);
+    }
+}
diff --git a/langtools/test/tools/javac/tree/AbstractTreeScannerTest.java b/langtools/test/tools/javac/tree/AbstractTreeScannerTest.java
index b0fe687..1d5ec84 100644
--- a/langtools/test/tools/javac/tree/AbstractTreeScannerTest.java
+++ b/langtools/test/tools/javac/tree/AbstractTreeScannerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -274,7 +274,7 @@ public abstract class AbstractTreeScannerTest {
         return fields;
     }
     // where
-    Map<Integer, Set<Field>> map = new HashMap<Integer,Set<Field>>();
+    Map<JCTree.Tag, Set<Field>> map = new HashMap<JCTree.Tag,Set<Field>>();
 
     /** Get the line number for the primary position for a tree.
      * The code is intended to be simple, although not necessarily efficient.
diff --git a/langtools/test/tools/javac/tree/DocCommentToplevelTest.java b/langtools/test/tools/javac/tree/DocCommentToplevelTest.java
new file mode 100644
index 0000000..ff23602
--- /dev/null
+++ b/langtools/test/tools/javac/tree/DocCommentToplevelTest.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 7096014
+ * @summary Javac tokens should retain state
+ */
+
+import com.sun.source.tree.*;
+import com.sun.source.util.*;
+import com.sun.tools.javac.tree.JCTree;
+
+import java.net.URI;
+import java.util.*;
+import javax.tools.*;
+
+
+public class DocCommentToplevelTest {
+
+    enum PackageKind {
+        HAS_PKG("package pkg;"),
+        NO_PKG("");
+
+        String pkgStr;
+
+        PackageKind(String pkgStr) {
+            this.pkgStr = pkgStr;
+        }
+    }
+
+    enum ImportKind {
+        ZERO(""),
+        ONE("import java.lang.*;"),
+        TWO("import java.lang.*; import java.util.*;");
+
+        String importStr;
+
+        ImportKind(String importStr) {
+            this.importStr = importStr;
+        }
+    }
+
+    enum ModifierKind {
+        DEFAULT(""),
+        PUBLIC("public");
+
+        String modStr;
+
+        ModifierKind(String modStr) {
+            this.modStr = modStr;
+        }
+    }
+
+    enum ToplevelDocKind {
+        HAS_DOC("/** Toplevel! */"),
+        NO_DOC("");
+
+        String docStr;
+
+        ToplevelDocKind(String docStr) {
+            this.docStr = docStr;
+        }
+    }
+
+    static int errors;
+    static int checks;
+
+    public static void main(String... args) throws Exception {
+        //create default shared JavaCompiler - reused across multiple compilations
+        JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
+        StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null);
+
+        for (PackageKind pk : PackageKind.values()) {
+            for (ImportKind ik : ImportKind.values()) {
+                for (ModifierKind mk1 : ModifierKind.values()) {
+                    for (ModifierKind mk2 : ModifierKind.values()) {
+                        for (ToplevelDocKind tdk : ToplevelDocKind.values()) {
+                            new DocCommentToplevelTest(pk, ik, mk1, mk2, tdk).run(comp, fm);
+                        }
+                    }
+                }
+            }
+        }
+
+        if (errors > 0)
+            throw new AssertionError(errors + " errors found");
+
+        System.out.println(checks + " checks were made");
+    }
+
+    PackageKind pk;
+    ImportKind ik;
+    ModifierKind mk1;
+    ModifierKind mk2;
+    ToplevelDocKind tdk;
+    JavaSource source;
+
+    DocCommentToplevelTest(PackageKind pk, ImportKind ik, ModifierKind mk1, ModifierKind mk2, ToplevelDocKind tdk) {
+        this.pk = pk;
+        this.ik = ik;
+        this.mk1 = mk1;
+        this.mk2 = mk2;
+        this.tdk = tdk;
+        source = new JavaSource();
+    }
+
+    void run(JavaCompiler comp, JavaFileManager fm) throws Exception {
+        JavacTask task = (JavacTask)comp.getTask(null, fm, null, Arrays.asList("-printsource"), null, Arrays.asList(source));
+        for (CompilationUnitTree cu: task.parse()) {
+            check(cu);
+        }
+    }
+
+    void check(CompilationUnitTree cu) {
+        checks++;
+
+        new TreeScanner<ClassTree,Void>() {
+
+            Map<JCTree, String> docComments;
+
+            @Override
+            public ClassTree visitCompilationUnit(CompilationUnitTree node, Void unused) {
+                docComments = ((JCTree.JCCompilationUnit)node).docComments;
+                boolean expectedComment = tdk == ToplevelDocKind.HAS_DOC &&
+                        (pk != PackageKind.NO_PKG || ik != ImportKind.ZERO);
+                boolean foundComment = docComments.get(node) != null;
+                if (expectedComment != foundComment) {
+                    error("Unexpected comment " + docComments.get(node) + " on toplevel");
+                }
+                return super.visitCompilationUnit(node, null);
+            }
+
+            @Override
+            public ClassTree visitClass(ClassTree node, Void unused) {
+                boolean expectedComment = tdk == ToplevelDocKind.HAS_DOC &&
+                        pk == PackageKind.NO_PKG && ik == ImportKind.ZERO &&
+                        node.getSimpleName().toString().equals("First");
+                boolean foundComment = docComments.get(node) != null;
+                if (expectedComment != foundComment) {
+                    error("Unexpected comment " + docComments.get(node) + " on class " + node.getSimpleName());
+                }
+                return super.visitClass(node, unused);
+            }
+        }.scan(cu, null);
+    }
+
+    void error(String msg) {
+        System.err.println("Error: " + msg);
+        System.err.println("Source: " + source.source);
+        errors++;
+    }
+
+    class JavaSource extends SimpleJavaFileObject {
+
+        String template = "#D\n#P\n#I\n" +
+                          "#M1 class First { }\n" +
+                          "#M2 class Second { }\n";
+
+        String source;
+
+        public JavaSource() {
+            super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+            source = template.replace("#P", pk.pkgStr)
+                             .replace("#I", ik.importStr)
+                             .replace("#M1", mk1.modStr)
+                             .replace("#M2", mk2.modStr)
+                             .replace("#D", tdk.docStr);
+        }
+
+        @Override
+        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+            return source;
+        }
+    }
+}
diff --git a/langtools/test/tools/javac/tree/TreePosTest.java b/langtools/test/tools/javac/tree/TreePosTest.java
index bb6e466..08cdf15 100644
--- a/langtools/test/tools/javac/tree/TreePosTest.java
+++ b/langtools/test/tools/javac/tree/TreePosTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,6 +73,7 @@ import com.sun.source.tree.CompilationUnitTree;
 import com.sun.source.util.JavacTask;
 import com.sun.tools.javac.api.JavacTool;
 import com.sun.tools.javac.code.Flags;
+import com.sun.tools.javac.parser.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
 import com.sun.tools.javac.tree.JCTree.JCNewClass;
@@ -80,6 +81,7 @@ import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
 import com.sun.tools.javac.tree.TreeInfo;
 import com.sun.tools.javac.tree.TreeScanner;
 
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
 import static com.sun.tools.javac.util.Position.NOPOS;
 
 /**
@@ -291,6 +293,14 @@ public class TreePosTest {
         errors++;
     }
 
+    /**
+     * Names for tree tags.
+     */
+    private static String getTagName(JCTree.Tag tag) {
+        String name = tag.name();
+        return (name == null) ? "??" : name;
+    }
+
     /** Number of files that have been analyzed. */
     int fileCount;
     /** Number of errors reported. */
@@ -312,8 +322,6 @@ public class TreePosTest {
     Set<File> excludeFiles = new HashSet<File>();
     /** Set of tag names to be excluded from analysis. */
     Set<String> excludeTags = new HashSet<String>();
-    /** Table of printable names for tree tag values. */
-    TagNames tagNames = new TagNames();
 
     /**
      * Main class for testing assertions concerning tree positions for tree nodes.
@@ -337,7 +345,7 @@ public class TreePosTest {
                 // there is no corresponding source text.
                 // Redundant semicolons in a class definition can cause empty
                 // initializer blocks with no positions.
-                if ((self.tag == JCTree.MODIFIERS || self.tag == JCTree.BLOCK)
+                if ((self.tag == MODIFIERS || self.tag == BLOCK)
                         && self.pos == NOPOS) {
                     // If pos is NOPOS, so should be the start and end positions
                     check("start == NOPOS", encl, self, self.start == NOPOS);
@@ -359,15 +367,15 @@ public class TreePosTest {
                     //    e.g.    int[][] a = new int[2][];
                     check("encl.start <= start", encl, self, encl.start <= self.start);
                     check("start <= pos", encl, self, self.start <= self.pos);
-                    if (!(self.tag == JCTree.TYPEARRAY
-                            && (encl.tag == JCTree.VARDEF ||
-                                encl.tag == JCTree.METHODDEF ||
-                                encl.tag == JCTree.TYPEARRAY))) {
+                    if (!(self.tag == TYPEARRAY
+                            && (encl.tag == VARDEF ||
+                                encl.tag == METHODDEF ||
+                                encl.tag == TYPEARRAY))) {
                         check("encl.pos <= start || end <= encl.pos",
                                 encl, self, encl.pos <= self.start || self.end <= encl.pos);
                     }
                     check("pos <= end", encl, self, self.pos <= self.end);
-                    if (!(self.tag == JCTree.TYPEARRAY && encl.tag == JCTree.TYPEARRAY)) {
+                    if (!(self.tag == TYPEARRAY && encl.tag == TYPEARRAY)) {
                         check("end <= encl.end", encl, self, self.end <= encl.end);
                     }
                 }
@@ -388,7 +396,7 @@ public class TreePosTest {
             if ((tree.mods.flags & Flags.ENUM) != 0) {
                 scan(tree.mods);
                 if (tree.init != null) {
-                    if (tree.init.getTag() == JCTree.NEWCLASS) {
+                    if (tree.init.hasTag(NEWCLASS)) {
                         JCNewClass init = (JCNewClass) tree.init;
                         if (init.args != null && init.args.nonEmpty()) {
                             scan(init.args);
@@ -404,11 +412,11 @@ public class TreePosTest {
 
         boolean check(Info encl, Info self) {
             if (excludeTags.size() > 0) {
-                if (encl != null && excludeTags.contains(tagNames.get(encl.tag))
-                        || excludeTags.contains(tagNames.get(self.tag)))
+                if (encl != null && excludeTags.contains(getTagName(encl.tag))
+                        || excludeTags.contains(getTagName(self.tag)))
                     return false;
             }
-            return tags.size() == 0 || tags.contains(tagNames.get(self.tag));
+            return tags.size() == 0 || tags.contains(getTagName(self.tag));
         }
 
         void check(String label, Info encl, Info self, boolean ok) {
@@ -428,7 +436,7 @@ public class TreePosTest {
         }
 
         JavaFileObject sourcefile;
-        Map<JCTree, Integer> endPosTable;
+        EndPosTable endPosTable;
         Info encl;
 
     }
@@ -439,13 +447,13 @@ public class TreePosTest {
     private class Info {
         Info() {
             tree = null;
-            tag = JCTree.ERRONEOUS;
+            tag = ERRONEOUS;
             start = 0;
             pos = 0;
             end = Integer.MAX_VALUE;
         }
 
-        Info(JCTree tree, Map<JCTree, Integer> endPosTable) {
+        Info(JCTree tree, EndPosTable endPosTable) {
             this.tree = tree;
             tag = tree.getTag();
             start = TreeInfo.getStartPos(tree);
@@ -455,46 +463,17 @@ public class TreePosTest {
 
         @Override
         public String toString() {
-            return tagNames.get(tree.getTag()) + "[start:" + start + ",pos:" + pos + ",end:" + end + "]";
+            return getTagName(tree.getTag()) + "[start:" + start + ",pos:" + pos + ",end:" + end + "]";
         }
 
         final JCTree tree;
-        final int tag;
+        final JCTree.Tag tag;
         final int start;
         final int pos;
         final int end;
     }
 
     /**
-     * Names for tree tags.
-     * javac does not provide an API to convert tag values to strings, so this class uses
-     * reflection to determine names of public static final int values in JCTree.
-     */
-    private static class TagNames {
-        String get(int tag) {
-            if (map == null) {
-                map = new HashMap<Integer, String>();
-                Class c = JCTree.class;
-                for (Field f : c.getDeclaredFields()) {
-                    if (f.getType().equals(int.class)) {
-                        int mods = f.getModifiers();
-                        if (Modifier.isPublic(mods) && Modifier.isStatic(mods) && Modifier.isFinal(mods)) {
-                            try {
-                                map.put(f.getInt(null), f.getName());
-                            } catch (IllegalAccessException e) {
-                            }
-                        }
-                    }
-                }
-            }
-            String name = map.get(tag);
-            return (name == null) ? "??" : name;
-        }
-
-        private Map<Integer, String> map;
-    }
-
-    /**
      * Thrown when errors are found parsing a java file.
      */
     private static class ParseException extends Exception {
@@ -719,7 +698,7 @@ public class TreePosTest {
 
             void setInfo(Info info) {
                 this.info = info;
-                tagName.setText(tagNames.get(info.tag));
+                tagName.setText(getTagName(info.tag));
                 start.setText(String.valueOf(info.start));
                 pos.setText(String.valueOf(info.pos));
                 end.setText(String.valueOf(info.end));
diff --git a/langtools/test/tools/javac/util/T6597678.java b/langtools/test/tools/javac/util/T6597678.java
index 0f3b022..8ac585e 100644
--- a/langtools/test/tools/javac/util/T6597678.java
+++ b/langtools/test/tools/javac/util/T6597678.java
@@ -41,6 +41,7 @@ import javax.tools.Diagnostic;
 import com.sun.tools.javac.processing.JavacProcessingEnvironment;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.JavacMessages;
+import com.sun.tools.javac.util.Log;
 
 @SupportedOptions("WriterString")
 public class T6597678 extends JavacTestingAbstractProcessor {
@@ -78,7 +79,10 @@ public class T6597678 extends JavacTestingAbstractProcessor {
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         Context context = ((JavacProcessingEnvironment) processingEnv).getContext();
-        PrintWriter out = ((JavacProcessingEnvironment) processingEnv).getWriter();
+        Log log = Log.instance(context);
+        PrintWriter noteOut = log.getWriter(Log.WriterKind.NOTICE);
+        PrintWriter warnOut = log.getWriter(Log.WriterKind.WARNING);
+        PrintWriter errOut  = log.getWriter(Log.WriterKind.ERROR);
         Locale locale = context.get(Locale.class);
         JavacMessages messages = context.get(JavacMessages.messagesKey);
 
@@ -86,13 +90,20 @@ public class T6597678 extends JavacTestingAbstractProcessor {
         if (round == 1) {
             initialLocale = locale;
             initialMessages = messages;
-            initialWriter = out;
-
-            checkEqual("writerString", out.toString().intern(), options.get("WriterString").intern());
+            initialNoteWriter = noteOut;
+            initialWarnWriter = warnOut;
+            initialErrWriter  = errOut;
+
+            String writerStringOpt = options.get("WriterString").intern();
+            checkEqual("noteWriterString", noteOut.toString().intern(), writerStringOpt);
+            checkEqual("warnWriterString", warnOut.toString().intern(), writerStringOpt);
+            checkEqual("errWriterString",  errOut.toString().intern(),  writerStringOpt);
         } else {
             checkEqual("locale", locale, initialLocale);
             checkEqual("messages", messages, initialMessages);
-            checkEqual("writer", out, initialWriter);
+            checkEqual("noteWriter", noteOut, initialNoteWriter);
+            checkEqual("warnWriter", warnOut, initialWarnWriter);
+            checkEqual("errWriter",  errOut,  initialErrWriter);
         }
 
         return true;
@@ -109,5 +120,7 @@ public class T6597678 extends JavacTestingAbstractProcessor {
     int round = 0;
     Locale initialLocale;
     JavacMessages initialMessages;
-    PrintWriter initialWriter;
+    PrintWriter initialNoteWriter;
+    PrintWriter initialWarnWriter;
+    PrintWriter initialErrWriter;
 }
diff --git a/langtools/test/tools/javac/varargs/7097436/T7097436.java b/langtools/test/tools/javac/varargs/7097436/T7097436.java
new file mode 100644
index 0000000..cf64baa
--- /dev/null
+++ b/langtools/test/tools/javac/varargs/7097436/T7097436.java
@@ -0,0 +1,18 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug     7097436
+ * @summary  ClassCastException occurs in assignment expressions without any heap pollutions
+ * @compile/fail/ref=T7097436.out -Xlint:varargs -Werror -XDrawDiagnostics T7097436.java
+ */
+
+import java.util.List;
+
+class T7097436 {
+    @SafeVarargs
+    static void m(List<String>... ls) {
+        Object o = ls; //warning
+        Object[] oArr = ls; //warning
+        String s = ls; // no warning
+        Integer[] iArr = ls; // no warning
+    }
+}
diff --git a/langtools/test/tools/javac/varargs/7097436/T7097436.out b/langtools/test/tools/javac/varargs/7097436/T7097436.out
new file mode 100644
index 0000000..6428cdf
--- /dev/null
+++ b/langtools/test/tools/javac/varargs/7097436/T7097436.out
@@ -0,0 +1,6 @@
+T7097436.java:13:20: compiler.warn.varargs.unsafe.use.varargs.param: ls
+T7097436.java:14:25: compiler.warn.varargs.unsafe.use.varargs.param: ls
+T7097436.java:15:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.util.List<java.lang.String>[], java.lang.String
+T7097436.java:16:26: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.util.List<java.lang.String>[], java.lang.Integer[]
+2 errors
+2 warnings
diff --git a/langtools/test/tools/javac/varargs/warning/Warn5.java b/langtools/test/tools/javac/varargs/warning/Warn5.java
index be7618f..966cefa 100644
--- a/langtools/test/tools/javac/varargs/warning/Warn5.java
+++ b/langtools/test/tools/javac/varargs/warning/Warn5.java
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug     6993978
+ * @bug     6993978 7097436
  * @summary Project Coin: Annotation to reduce varargs warnings
  * @author  mcimadamore
  * @run main Warn5
@@ -31,8 +31,8 @@
 import com.sun.source.util.JavacTask;
 import com.sun.tools.javac.api.JavacTool;
 import java.net.URI;
-import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.EnumSet;
 import javax.tools.Diagnostic;
 import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
@@ -95,7 +95,6 @@ public class Warn5 {
         METHOD("void m"),
         CONSTRUCTOR("Test");
 
-
         String name;
 
         MethodKind(String name) {
@@ -155,33 +154,16 @@ public class Warn5 {
         }
     }
 
-    static class JavaSource extends SimpleJavaFileObject {
-
-        String template = "import com.sun.tools.javac.api.*;\n" +
-                          "import java.util.List;\n" +
-                          "class Test {\n" +
-                          "   static void test(Object o) {}\n" +
-                          "   static void testArr(Object[] o) {}\n" +
-                          "   #T \n #S #M { #B }\n" +
-                          "}\n";
-
-        String source;
-
-        public JavaSource(TrustMe trustMe, SuppressLevel suppressLevel, ModifierKind modKind,
-                MethodKind methKind, SignatureKind meth, BodyKind body) {
-            super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
-            source = template.replace("#T", trustMe.anno).
-                    replace("#S", suppressLevel.getSuppressAnno()).
-                    replace("#M", meth.getSignature(modKind, methKind)).
-                    replace("#B", body.body);
-        }
-
-        @Override
-        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
-            return source;
-        }
+    enum WarningKind {
+        UNSAFE_BODY,
+        UNSAFE_DECL,
+        MALFORMED_SAFEVARARGS,
+        REDUNDANT_SAFEVARARGS;
     }
 
+    // Create a single file manager and reuse it for each compile to save time.
+    static StandardJavaFileManager fm = JavacTool.create().getStandardFileManager(null, null, null);
+
     public static void main(String... args) throws Exception {
         for (SourceLevel sourceLevel : SourceLevel.values()) {
             for (XlintOption xlint : XlintOption.values()) {
@@ -191,14 +173,14 @@ public class Warn5 {
                             for (MethodKind methKind : MethodKind.values()) {
                                 for (SignatureKind sig : SignatureKind.values()) {
                                     for (BodyKind body : BodyKind.values()) {
-                                        test(sourceLevel,
+                                        new Warn5(sourceLevel,
                                                 xlint,
                                                 trustMe,
                                                 suppressLevel,
                                                 modKind,
                                                 methKind,
                                                 sig,
-                                                body);
+                                                body).test();
                                     }
                                 }
                             }
@@ -209,90 +191,140 @@ public class Warn5 {
         }
     }
 
-    // Create a single file manager and reuse it for each compile to save time.
-    static StandardJavaFileManager fm = JavacTool.create().getStandardFileManager(null, null, null);
+    final SourceLevel sourceLevel;
+    final XlintOption xlint;
+    final TrustMe trustMe;
+    final SuppressLevel suppressLevel;
+    final ModifierKind modKind;
+    final MethodKind methKind;
+    final SignatureKind sig;
+    final BodyKind body;
+    final JavaSource source;
+    final DiagnosticChecker dc;
+
+    public Warn5(SourceLevel sourceLevel, XlintOption xlint, TrustMe trustMe, SuppressLevel suppressLevel, ModifierKind modKind, MethodKind methKind, SignatureKind sig, BodyKind body) {
+        this.sourceLevel = sourceLevel;
+        this.xlint = xlint;
+        this.trustMe = trustMe;
+        this.suppressLevel = suppressLevel;
+        this.modKind = modKind;
+        this.methKind = methKind;
+        this.sig = sig;
+        this.body = body;
+        this.source = new JavaSource();
+        this.dc = new DiagnosticChecker();
+    }
 
-    static void test(SourceLevel sourceLevel, XlintOption xlint, TrustMe trustMe, SuppressLevel suppressLevel,
-            ModifierKind modKind, MethodKind methKind, SignatureKind sig, BodyKind body) throws Exception {
+    void test() throws Exception {
         final JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
-        JavaSource source = new JavaSource(trustMe, suppressLevel, modKind, methKind, sig, body);
-        DiagnosticChecker dc = new DiagnosticChecker();
         JavacTask ct = (JavacTask)tool.getTask(null, fm, dc,
                 Arrays.asList(xlint.getXlintOption(), "-source", sourceLevel.sourceKey), null, Arrays.asList(source));
         ct.analyze();
-        check(sourceLevel, dc, source, xlint, trustMe,
-                suppressLevel, modKind, methKind, sig, body);
+        check();
     }
 
-    static void check(SourceLevel sourceLevel, DiagnosticChecker dc, JavaSource source,
-            XlintOption xlint, TrustMe trustMe, SuppressLevel suppressLevel, ModifierKind modKind,
-            MethodKind methKind, SignatureKind meth, BodyKind body) {
+    void check() {
 
-        boolean hasPotentiallyUnsafeBody = sourceLevel == SourceLevel.JDK_7 &&
+        EnumSet<WarningKind> expectedWarnings = EnumSet.noneOf(WarningKind.class);
+
+        if (sourceLevel == SourceLevel.JDK_7 &&
                 trustMe == TrustMe.TRUST &&
                 suppressLevel != SuppressLevel.VARARGS &&
                 xlint != XlintOption.NONE &&
-                meth.isVarargs && !meth.isReifiableArg && body.hasAliasing &&
-                (methKind == MethodKind.CONSTRUCTOR || (methKind == MethodKind.METHOD && modKind != ModifierKind.NONE));
+                sig.isVarargs && !sig.isReifiableArg && body.hasAliasing &&
+                (methKind == MethodKind.CONSTRUCTOR || (methKind == MethodKind.METHOD && modKind != ModifierKind.NONE))) {
+            expectedWarnings.add(WarningKind.UNSAFE_BODY);
+        }
 
-        boolean hasPotentiallyPollutingDecl = sourceLevel == SourceLevel.JDK_7 &&
+        if (sourceLevel == SourceLevel.JDK_7 &&
                 trustMe == TrustMe.DONT_TRUST &&
-                meth.isVarargs &&
-                !meth.isReifiableArg &&
-                xlint == XlintOption.ALL;
+                sig.isVarargs &&
+                !sig.isReifiableArg &&
+                xlint == XlintOption.ALL) {
+            expectedWarnings.add(WarningKind.UNSAFE_DECL);
+        }
 
-        boolean hasMalformedAnnoInDecl = sourceLevel == SourceLevel.JDK_7 &&
+        if (sourceLevel == SourceLevel.JDK_7 &&
                 trustMe == TrustMe.TRUST &&
-                (!meth.isVarargs ||
-                (modKind == ModifierKind.NONE && methKind == MethodKind.METHOD));
+                (!sig.isVarargs ||
+                (modKind == ModifierKind.NONE && methKind == MethodKind.METHOD))) {
+            expectedWarnings.add(WarningKind.MALFORMED_SAFEVARARGS);
+        }
 
-        boolean hasRedundantAnnoInDecl = sourceLevel == SourceLevel.JDK_7 &&
+        if (sourceLevel == SourceLevel.JDK_7 &&
                 trustMe == TrustMe.TRUST &&
                 xlint != XlintOption.NONE &&
                 suppressLevel != SuppressLevel.VARARGS &&
                 (modKind != ModifierKind.NONE || methKind == MethodKind.CONSTRUCTOR) &&
-                meth.isVarargs &&
-                meth.isReifiableArg;
+                sig.isVarargs &&
+                sig.isReifiableArg) {
+            expectedWarnings.add(WarningKind.REDUNDANT_SAFEVARARGS);
+        }
 
-        if (hasPotentiallyUnsafeBody != dc.hasPotentiallyUnsafeBody ||
-                hasPotentiallyPollutingDecl != dc.hasPotentiallyPollutingDecl ||
-                hasMalformedAnnoInDecl != dc.hasMalformedAnnoInDecl ||
-                hasRedundantAnnoInDecl != dc.hasRedundantAnnoInDecl) {
+        if (!expectedWarnings.containsAll(dc.warnings) ||
+                !dc.warnings.containsAll(expectedWarnings)) {
             throw new Error("invalid diagnostics for source:\n" +
                     source.getCharContent(true) +
                     "\nOptions: " + xlint.getXlintOption() +
-                    "\nExpected potentially unsafe body warning: " + hasPotentiallyUnsafeBody +
-                    "\nExpected potentially polluting decl warning: " + hasPotentiallyPollutingDecl +
-                    "\nExpected malformed anno error: " + hasMalformedAnnoInDecl +
-                    "\nExpected redundant anno warning: " + hasRedundantAnnoInDecl +
-                    "\nFound potentially unsafe body warning: " + dc.hasPotentiallyUnsafeBody +
-                    "\nFound potentially polluting decl warning: " + dc.hasPotentiallyPollutingDecl +
-                    "\nFound malformed anno error: " + dc.hasMalformedAnnoInDecl +
-                    "\nFound redundant anno warning: " + dc.hasRedundantAnnoInDecl);
+                    "\nExpected warnings: " + expectedWarnings +
+                    "\nFound warnings: " + dc.warnings);
+        }
+    }
+
+    class JavaSource extends SimpleJavaFileObject {
+
+        String template = "import com.sun.tools.javac.api.*;\n" +
+                          "import java.util.List;\n" +
+                          "class Test {\n" +
+                          "   static void test(Object o) {}\n" +
+                          "   static void testArr(Object[] o) {}\n" +
+                          "   #T \n #S #M { #B }\n" +
+                          "}\n";
+
+        String source;
+
+        public JavaSource() {
+            super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+            source = template.replace("#T", trustMe.anno).
+                    replace("#S", suppressLevel.getSuppressAnno()).
+                    replace("#M", sig.getSignature(modKind, methKind)).
+                    replace("#B", body.body);
+        }
+
+        @Override
+        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+            return source;
         }
     }
 
-    static class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> {
+    class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> {
 
-        boolean hasPotentiallyUnsafeBody = false;
-        boolean hasPotentiallyPollutingDecl = false;
-        boolean hasMalformedAnnoInDecl = false;
-        boolean hasRedundantAnnoInDecl = false;
+        EnumSet<WarningKind> warnings = EnumSet.noneOf(WarningKind.class);
 
         public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
             if (diagnostic.getKind() == Diagnostic.Kind.WARNING) {
                     if (diagnostic.getCode().contains("unsafe.use.varargs.param")) {
-                        hasPotentiallyUnsafeBody = true;
+                        setWarning(WarningKind.UNSAFE_BODY);
                     } else if (diagnostic.getCode().contains("redundant.trustme")) {
-                        hasRedundantAnnoInDecl = true;
+                        setWarning(WarningKind.REDUNDANT_SAFEVARARGS);
                     }
             } else if (diagnostic.getKind() == Diagnostic.Kind.MANDATORY_WARNING &&
                     diagnostic.getCode().contains("varargs.non.reifiable.type")) {
-                hasPotentiallyPollutingDecl = true;
+                setWarning(WarningKind.UNSAFE_DECL);
             } else if (diagnostic.getKind() == Diagnostic.Kind.ERROR &&
                     diagnostic.getCode().contains("invalid.trustme")) {
-                hasMalformedAnnoInDecl = true;
+                setWarning(WarningKind.MALFORMED_SAFEVARARGS);
             }
         }
+
+        void setWarning(WarningKind wk) {
+            if (!warnings.add(wk)) {
+                throw new AssertionError("Duplicate warning of kind " + wk + " in source:\n" + source);
+            }
+        }
+
+        boolean hasWarning(WarningKind wk) {
+            return warnings.contains(wk);
+        }
     }
 }
diff --git a/langtools/test/tools/javac/warnings/7090499/T7090499.java b/langtools/test/tools/javac/warnings/7090499/T7090499.java
new file mode 100644
index 0000000..205a7fa
--- /dev/null
+++ b/langtools/test/tools/javac/warnings/7090499/T7090499.java
@@ -0,0 +1,37 @@
+/**
+ * @test /nodynamiccopyright/
+ * @bug 7094099
+ * @summary -Xlint:rawtypes
+ * @compile/fail/ref=T7090499.out -XDrawDiagnostics -Xlint:rawtypes T7090499.java
+ */
+
+
+class T7090499<E> {
+
+    static class B<X> {}
+
+    class A<X> {
+        class X {}
+        class Z<Y> {}
+    }
+
+    T7090499 t = new T7090499() { //raw warning (2)
+
+        A.X x1;//raw warning
+        A.Z z1;//raw warning
+
+        T7090499.B<Integer> b1;//ok
+        T7090499.B b2;//raw warning
+
+        A<String>.X x2;//ok
+        A<String>.Z<Integer> z2;//ok
+        A<B>.Z<A<B>> z3;//raw warning (2)
+
+        void test(Object arg1, B arg2) {//raw warning
+            boolean b = arg1 instanceof A;//ok
+            Object a = (A)arg1;//ok
+            A a2 = new A() {};//raw warning (2)
+            a2.new Z() {};//raw warning
+        }
+    };
+}
diff --git a/langtools/test/tools/javac/warnings/7090499/T7090499.out b/langtools/test/tools/javac/warnings/7090499/T7090499.out
new file mode 100644
index 0000000..1ff9e16
--- /dev/null
+++ b/langtools/test/tools/javac/warnings/7090499/T7090499.out
@@ -0,0 +1,17 @@
+T7090499.java:18:5: compiler.warn.raw.class.use: T7090499, T7090499<E>
+T7090499.java:18:22: compiler.warn.raw.class.use: T7090499, T7090499<E>
+T7090499.java:20:10: compiler.warn.raw.class.use: T7090499.A.X, T7090499<E>.A<X>.X
+T7090499.java:21:10: compiler.warn.raw.class.use: T7090499.A.Z, T7090499<E>.A<X>.Z<Y>
+T7090499.java:24:17: compiler.warn.raw.class.use: T7090499.B, T7090499.B<X>
+T7090499.java:26:10: compiler.err.improperly.formed.type.inner.raw.param
+T7090499.java:27:10: compiler.err.improperly.formed.type.inner.raw.param
+T7090499.java:28:18: compiler.warn.raw.class.use: T7090499.B, T7090499.B<X>
+T7090499.java:28:17: compiler.err.improperly.formed.type.inner.raw.param
+T7090499.java:28:11: compiler.warn.raw.class.use: T7090499.B, T7090499.B<X>
+T7090499.java:28:10: compiler.err.improperly.formed.type.inner.raw.param
+T7090499.java:30:32: compiler.warn.raw.class.use: T7090499.B, T7090499.B<X>
+T7090499.java:33:13: compiler.warn.raw.class.use: T7090499.A, T7090499<E>.A<X>
+T7090499.java:33:24: compiler.warn.raw.class.use: T7090499.A, T7090499<E>.A<X>
+T7090499.java:34:20: compiler.warn.raw.class.use: T7090499.A.Z, T7090499<E>.A<X>.Z<Y>
+4 errors
+11 warnings

-- 
jigsaw packaging

